diff options
1977 files changed, 19870 insertions, 48719 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bfcc6a7f2b..bcc7189d16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,9 +141,7 @@ jobs: if [[ ${{ steps.get_deps.outputs.response }} == "" ]] ; then printf 'None\n' else - printf '```\n' - printf '%s' ${{ steps.get_deps.outputs.response }} | sed 's/\\n/\n/g' | sort - printf '```\n' + printf '%s' ${{ steps.get_deps.outputs.response }} | sed 's/\\n/\n/g' | sort | sed 's/^/- [ ] /' fi } > comment-output shell: diff --git a/ChangeLog.txt b/ChangeLog.txt index 63333fcea1..26ee9b3a1e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,697 @@ +Sat May 18 00:00:04 UTC 2024 +academic/fet: Updated for version 6.19.5. +academic/plus42: Updated for version 1.1.10. +audio/cmus: Updated for version 2.11.0. +audio/mixxx: Updated for version 2.4.0. +audio/ncspot: Updated for version 1.1.1. +desktop/bibata-cursor-theme: Added (Bibata Cursor Theme). +desktop/dolphin-megasync: Updated for version 5.2.1.0. +desktop/fvwm3: Update script. +desktop/gnome-shell: Disable building tests. +desktop/ideviceinstaller: Updated for version 1.1.1. +desktop/lxpanel: Updated for version 20230918_633a2d4. +desktop/mint-l-icons: Updated for version 1.7.0. +desktop/mint-themes: Update for 2.1.6 (+new maintainer) +desktop/mint-x-icons: Updated for version 1.6.8. +desktop/mint-y-icons: Update for 1.7.5 (+new maintainer) +desktop/mousam: Update for 1.2.0 +desktop/mutter: Disable building tests. +desktop/river: Mark as x86_64. +desktop/sun: Updated for version 1.6.2. +desktop/thunar-megasync: Updated for version 5.2.1.0. +development/Bottleneck: Removed unused. +development/OpenJDK11: Updated for version 11.0.23. +development/OpenJDK17: Updated for version 17.0.10. +development/OpenJDK21: Added (Java Development Kit). +development/aws-cdk: Updated for version 2.142.0. +development/cargo-c: Updated for version 0.9.32. +development/github-cli: Updated for version 2.49.2 +development/gtest: Change the cmake file install routine. +development/hugo: Updated for version 0.126.1. +development/liberica-jdk-bin: Updated for version 21.0.3+12. +development/neovim: Updated for version 0.10.0. +development/poedit: Updated for version 3.4.4. +development/postman: Updated for version 11.1.0. +development/pre-commit: Updated for version 3.7.1. +development/pyenchant: Updated for version 3.2.2. +development/pyvim: Updated for version 3.0.3. +development/qb64pe: Updated for version 3.13.0. +development/rust16: Updated for version 1.78.0. +development/tig: Updated for version 2.5.10. +development/tkdiff: Updated for version 5.7 +development/tstoolbox: Removed unused. +development/xxd-standalone: Updated for version 9.1.0404. +games/galaxyv2: Fix .info. +games/term2048: Removed unused. +games/xemu: Fix MD5SUM. +graphics/CairoSVG: Updated for version 2.7.1. +graphics/dblatex: Updated for version 0.3.12. +ham/codec2: Updated for version 1.2.0. +ham/freedv: Updated for version 1.9.9.1. +ham/gridtracker: Updated for version 1.24.0504. +ham/lpcnetfreedv: Added (Neural Network Plugin for freedv). +ham/lpcnetfreedv: Updated README. +ham/qlog: Updated for version 0.35.1. +libraries/LucenePlusPlus: Updated for version 3.0.9. +libraries/PrettyTable: Updated for version 3.10.0. +libraries/libdisplay-info: Remove proper source folder on rebuild +libraries/libslirp: Updated for version 4.8.0. +libraries/libtorrent-rasterbar: Fix building on -current. +libraries/libvterm: Update script. +libraries/python-xlrd: Updated for version 2.0.1. +libraries/qt5gtk2: Added (gtk2 integration plugin). +libraries/qt6gtk2: Added (gtk2 integration plugin). +libraries/webkit2gtk4.1: Updated for version 2.44.2. +libraries/webkit2gtk: Updated for version 2.44.2. +misc/bitwarden-desktop: updated for 2024.4.3 +misc/open-simh: Fix permission. +misc/open-simh: Updated for version 20240315_ffe537a. +multimedia/MuseScore: Updated for version 4.3.0. +multimedia/kodi: Forgot to bump BUILD number +multimedia/obs-studio: Add patch to fix 32bit build +multimedia/videomass: Updated for version 5.0.13. +network/brave-browser: Updated for version 1.66.110. +network/dillo: Updated for version 3.1.0. +network/discord: Version bump to 0.0.54 +network/dropbox: Updated for version 199.4.6287. +network/ipcalc-ng: Added (IP calculator). +network/jitsi-meet-desktop: Updated for version 2024.5.0 +network/libvma: Added (socket accelerator library). +network/lldpd: Updated for version 1.0.18. +network/mosh: Fix download URL. +network/newsboat: Updated for version 2.35. +network/ocserv: Updated for version 1.3.0. +network/opera: Updated for version 110.0.5130.23. +network/signal-desktop: Updated for version 7.9.0. +network/slack: Updated for version 4.38.121. +network/squid: Updated for version 6.9. +network/tailscale: Updated for version 1.66.3. +network/tor-browser: Updated for version 13.0.15. +network/turbolift: Removed unused. +network/unbound: Updated for version 1.20.0. +network/vivaldi: Updated for version 6.7.3329.31. +network/weathercli: Removed unused. +network/wireshark: Updated for version 4.2.5. +network/zerotier-one: Added (ZeroTier One VPN). +office/pandoc: Updated for version 3.2. +perl/perl-SNMP-Info: Updated for version 3.970001. +python/PyColorizer: Removed unused. +python/PyGithub: Removed unused. +python/PyInstaller: Removed unused. +python/argh: Removed unused. +python/args: Removed unused. +python/chump: Removed unused. +python/clint: Removed unused. +python/colorama: Updated for version 0.4.6. +python/colorclass: Removed unused. +python/django-debug-toolbar: Updated for version 4.3.0. +python/fabric: Removed unused. +python/gunicorn: Updated for version 22.0.0. +python/jedi: Removed unused. +python/kaptan: Updated for version 0.6.0. +python/mando: Removed unused. +python/minidb: Updated for version 2.0.8. +python/monty: Updated for version 2024.5.15. +python/more-itertools: Updated script & email. +python/numpydoc: Updated for version 1.7.0. +python/path.py: Removed unused. +python/pendulum: Removed unused. +python/pilkit: Removed unused. +python/pillowfight: Removed unused. +python/prompt_toolkit: Removed unused. +python/purl: Removed unused. +python/pyfiglet: Updated for version 1.0.2. +python/python-PySnooper: Updated for version 1.2.0. +python/python2-swiftclient: Removed unused. +python/python2-unicodecsv: Removed unused. +python/python3-PyMuPDF: Updated for version 1.24.3. +python/python3-aksharamukha: Updated for version 2.2.2. +python/python3-astroid: Updated for version 3.2.0. +python/python3-babelfish: Updated for version 0.6.1. +python/python3-boto3: Update for 1.34.99 +python/python3-dill: Updated for version 0.3.8. +python/python3-isort: Updated for version 5.13.2. +python/python3-keyring: Update for 25.2.1 +python/python3-marisa-trie: Updated for version 1.1.1. +python/python3-psycopg3: Updated for version 3.1.19. +python/python3-pylint: Updated for version 3.2.0. +python/python3-pytube: Updated for version 15.0.0. +python/python3-regex: Update for 2024.5.15 +python/python3-schedule: Updated for version 1.2.1. +python/python3-simple-term-menu: Updated for version 1.6.4. +python/python3-tinydb: Updated for version 4.8.0. +python/python3-websockets: Updated for version 12.0. +python/python3-wrapt: Updated for version 1.16.0. +python/python3-xmldiff: Updated for version 2.7.0. +python/requirements-detector: Removed unused. +python/tox: Removed unused. +python/virtualenv-clone: Updated for version 0.5.7. +python/virtualenvwrapper: Removed unused. +python/waitress: Removed unused. +system/FreeFileSync: Fix permission. +system/FreeFileSync: Updated for version 13.6. +system/Iosevka-aile: Updated for version 30.0.1. +system/Iosevka-etoile: Updated for version 30.0.1. +system/conky: Updated for version 1.21.0. +system/fastfetch: Updated for version 2.12.0. +system/fwupd: Updated for version 1.9.19. +system/intel-microcode: Update for version 20240514 +system/jenkins: Updated for version 2.452.1. +system/mongodb: Switch to binary release. +system/nvidia-driver: Updated for version 550.78. +system/nvidia-kernel: Updated for version 550.78. +system/nvidia-legacy470-kernel: Update patch for current. +system/nvidia-open-kernel: Updated for version 550.78. +system/readpe: Updated for version 20240427_d94c794 +system/sarasa-gothic: Updated for version 1.0.12. +system/sbpkg: Updated for version 1.0.9. +system/stressapptest: Fix build on i586. ++--------------------------+ +Sat May 11 01:13:15 UTC 2024 +academic/gri: Updated for version 2.12.7 +academic/magic: Updated for version 8.3.474. +academic/openboard: Updated for version 1.7.1. +audio/audacity: Fix the manual install routine. +desktop/nwg-displays: Updated for version 0.3.18. +desktop/nwg-panel: Updated for version 0.9.31. +desktop/nwg-shell-config: Updated for version 0.5.37. +development/actionlint: Updated for version 1.7.0. +development/atasm: Updated for version 1.25. +development/aws-cdk: Updated for version 2.141.0. +development/composer: Updated for version 2.7.6 +development/d-tools: Updated for version 2.108.1 +development/dmd: Updated for version 2.108.1 +development/gedit-plugins: New maintainer. +development/gedit: New maintainer. +development/gtest: Rework libraries installation. +development/hipSYCL: Fix github tarball handling. +development/hugo: Updated for version 0.125.7. +development/kotlin: Updated for version 1.9.24. +development/nodejs: Updated for version 20.13.1. +development/php82: Updated for version 8.2.19 +development/poedit: Updated for version 3.4.3. +development/postman: Updated for version 11.0.4 +development/protoc-gen-go: Update for 1.34.1 +development/pycharm: Updated for version 2024.1.1.241.15989.155. +development/regina-rexx: Updated for version 3.9.6. +development/sbcl: Updated for version 2.4.4 +development/sbt: Updated for version 1.10.0 +development/vscode-bin: Updated for version 1.89.1. +games/LucasChess: Updated for version R2.14g. +games/galaxyv2: Updated info file. +gis/OWSLib: Updates. +libraries/botocore: Updated for version 1.34.99. +libraries/folly: Removed (FTBFS). +libraries/googlebenchmark: Updated for version 1.8.3. +libraries/libbassmidi: Use DOWNLOAD mirror. +libraries/libgedit-amtk: New maintainer. +libraries/libgedit-gtksourceview: New maintainer. +libraries/libtecla: Build with max 1 job. +libraries/python3-plumbum: Updated for version 1.8.3. +libraries/simde: Updated for version 0.8.2 +libraries/tepl: New maintainer. +libraries/tree-sitter: Updated for version 0.22.6 +libraries/uriparser: Updated for version 0.9.8. +libraries/wxWidgets: Updated for version 3.2.4.1. +multimedia/inputstream.adaptive: Updated for version 21.4.6. +multimedia/inputstream.adaptive: Updated for version 21.4.7. +multimedia/kodi: Use system dependencies. +multimedia/vgmplay: Fix github tarball handling. +multimedia/vokoscreenNG: Fix qmake6 invocation. +network/awscli: Updated for version 1.32.99. +network/brave-browser: Updated for version 1.65.132. +network/discord: Version bump to 0.0.53 +network/gallery-dl: Updated for version 1.26.9. +network/gnome-bluetooth: New maintainer. +network/ircd-hybrid: Updated for version 20240506_e813b4f. +network/opera: Updated for version 109.0.5097.80. +network/signal-desktop: Updated for version 7.8.0. +network/slack: Updated for version 4.38.115. +network/tailscale: Updated for version 1.66.1. +network/telegram: Updated for version 5.0.1. +network/vivaldi: Updated for version 6.7.3329.24. +network/yle-dl: Updated for version 20240429. +office/bibtex2html: Removed (FTBFS). +office/impressive: Updated for version 0.13.2. +office/keepassxc: Updated for version 2.7.8. +perl/perl-CPAN-Requirements-Dynamic: Added (dynamic prerequisites). +perl/perl-Meta-Requirements-Range: Added (version requirements). +perl/perl-Module-Build-Tiny: Update dep. +perl/perlbrew: Updated for version 0.98. +python/cryptography: Updated for version 42.0.7. +python/pluggy: Removed (renamed to python2-pluggy) +python/pymongo: Updated for version 4.7.2. +python/python3-Flask-Cors: Updated for version 4.0.1. +python/python3-argcomplete: Updated for version 3.3.0. +python/python3-backports_tarfile: Updated for version 1.1.1. +python/python3-blinker: Updated for version 1.8.2. +python/python3-cheroot: Updated for version 10.0.1. +python/python3-django: Updated for version 4.2.13. +python/python3-dogpile.cache: Version bump to 1.3.3 +python/python3-enlighten: Updated for version 1.12.4. +python/python3-exceptiongroup: Updated for version 1.2.1. +python/python3-flask-paginate: Updated for version 2024.4.12. +python/python3-fontmake: Updated for version 3.9.0. +python/python3-fonttools: Updated for version 4.51.0. +python/python3-geventhttpclient: Fix build. +python/python3-glyphslib: Updated for version 6.7.1. +python/python3-jaraco.collections: Updated for version 5.0.1. +python/python3-jaraco.functools: Updated for version 4.0.1. +python/python3-langcodes: Updated for version 3.4.0. +python/python3-language-data: Updated for version 1.2.0. +python/python3-libtmux: Updated for version 0.37.0. +python/python3-orjson: Updated for version 3.10.3. +python/python3-pdm: Version bump to 2.15.2 +python/python3-pipx: Updated for version 1.5.0. +python/python3-pydantic-core: Updated for version 2.18.2. +python/python3-pydantic: Updated for version 2.7.1. +python/python3-pyproject-metadata: Updated for version 0.8.0. +python/python3-regex: Updated for version 2024.5.10. +python/python3-setuptools-opt: Updated for version 69.5.1. +python/python3-tenacity: Update for 8.3.0 +python/python3-tomlkit: Update for 0.12.5 +python/python3-trove-classifiers: Updated for version 2024.4.10. +python/python3-ufo2ft: Updated for version 3.2.1. +python/python3-uharfbuzz: Updated for version 0.39.1. +python/python3-userpath: Updated for version 1.9.2. +python/python3-websocket-client: Updated for version 1.8.0. +python/s3transfer: Updated for version 0.10.1. +python/werkzeug: Updated for version 3.0.3. +system/Iosevka-aile: Updated for version 30.0.0. +system/Iosevka-etoile: Updated for version 30.0.0. +system/distrobox: Updated for version 1.7.2.1. +system/fastfetch: Updated for version 2.11.5. +system/fd: Updated for version 10.1.0. +system/fzf: Updated for version 0.52.0. +system/locust: Updated for version 2.27.0. +system/mongodb: Updated for version 7.0.9. +system/netdata: Updated for version 1.45.4. +system/onefetch: Updated for version 2.21.0. +system/openzfs: Update for version 2.2.4 +system/prometheus: Updated for version 2.52.0. +system/sarasa-gothic: Updated for version 1.0.11. +system/slpkg: Updated for version 5.0.8. +system/tmuxp: Updated for version 1.47.0. +system/ttf-lato: Updated for version 2.015. +system/xvfb-run: Updated for version 21.1.12. ++--------------------------+ +Sat May 4 14:46:17 UTC 2024 +academic/Gridcoin-Research: Updated for version 5.4.8.0 +academic/R: Updated for version 4.4.0. +academic/bcftools +academic/copasi: Updated for version 4.43.288. +academic/fet: Updated for version 6.19.4. +academic/pspp: Updated for version 2.0.1. +academic/samtools:Upgrade to 1.20 +academic/smath-studio: Updated for version 1.1.8763 +academic/stellarsolver: Mark for x86_64 only. +audio/ardour: Updated for version 8.6.0. +audio/audacity: Updated for version 3.5.1. +audio/openvino-plugins-ai-audacity: Added (AI-enabled effects, generators, and analyzers for Audacity). +audio/rack: Updated for version 2.5.1. +audio/yabridge: Mark for i586 only. +desktop/BlockstreamGreen: Updated for version 2.0.4. +desktop/Matcha-gtk-theme: Update for 2024_05_01 +desktop/arc-theme: Updated for version 20221218. +desktop/buku: Updated for version 4.9. +desktop/nwg-displays: Updated for version 0.3.17. +desktop/nwg-panel: Updated for version 0.9.28. +desktop/papirus-icon-theme: Updated for version 20240501. +desktop/waybar: Remove dep. +development/Bear: Fix BUILD and remove dep. +development/Bear: Fix build. +development/Bear: Updated for version 3.1.3. +development/avrdude: Updated for version 7.3. +development/aws-cdk: Updated for version 2.140.0. +development/bluefish: Updated for version 2.2.15 +development/github-cli: Updated for version 2.49.0 +development/gitlab-cli: Updated for version 1.40.0. +development/heroku-cli: Updated for version 8.11.5. +development/hhvm: Removed (maintainer request). +development/hipSYCL: Fix MD5SUM. +development/jdk11: Updated for version 11.0.22. +development/jupyter-nbconvert: Update for 7.16.4 +development/kForth-32: Mark for i586 only. +development/kForth-64: Mark for x86_64 only. +development/liberica-jdk-bin: Update script. +development/mold: Updated for version 2.31.0. +development/mongodb-compass: Updated for version 1.43.0. +development/mongodb-shell: Updated for version 2.2.5. +development/openjdk7: Mark for x86_64. +development/openjdk8: Mark for x86_64. +development/protoc-gen-go: Update for 1.34.0 +development/pylint: Update script. +development/rust16: Updated for version 1.77.2. +development/sqlcl: Updated for version 24.1.0.087.0929. +development/sqldeveloper: Updated for version 23.1.1.345.2114. +development/stablediffusion-pipelines-cpp: Removed (maintainer). +development/stablediffusion-pipelines-cpp: Update script. +development/textadept: Updated for version 12.4. +development/vscode-bin: Updated for version 1.89.0. +development/whisper.cpp: Update script. +games/Mindustry: Repackage instead of Gradle build +games/PrismLauncher: Updated for version 8.3. +games/ags: Updated for version 3.6.1.24. +games/ddnet: Updated for version 18.2. +games/dwarffortress: Updated for version 0.50.13. +games/freeciv: updated for version 3.1.1 +games/gzdoom: Mark for x86_64 only. +games/lbreakouthd: Updated for version 1.1.8. +games/melonds: Mark for x86_64. +games/openttd: Updated for version 14.0. +games/planetblupi: updated for version 1.15.1 +games/quakespasm: Updated for version 0.96.1. +games/wesnoth: Updated for version 1.18.0 +games/xemu: Mark for x86_64. +games/zsnes: Mark for i586 only. +gis/gpxsee: Updated for version 13.19. +gis/osgEarth: Remove dep. +graphics/FSPViewer: Fix stripping binary. +graphics/graphviz: updated for version 11.0.0 +graphics/hugin: gzip patch. +graphics/ueberzugpp: Remove dep. +graphics/veles: Require updated rust for 32bit build. +graphics/wine-nine-standalone: Mark for i586 only. +ham/cm256cc: Updated for version 1.1.1. +ham/dab_lib: Updated for version 20240428.229149eb. +ham/libsigmf: Updated for version 20240428.299dc8f9. +ham/mbelib: Updated for version 20240428.9a04ed5c. +ham/qlog: Updated for version 0.35.0. +ham/sdrangel: Updated for version 7.20.0. +ham/sgp4: Updated for version 20240428.6a448b48. +libraries/CLI11: Updated for version 2.4.2. +libraries/ell: Updated for version 0.65. +libraries/goffice: Updated for version 0.10.57. +libraries/grpc: Update for 1.63.0 +libraries/htslib: upgrade to 1.20 +libraries/libbass: Fixed MD5SUM. +libraries/libcpuid: Updated for version 0.6.5. +libraries/libfaketime: Updated for version 0.9.10. +libraries/libliftoff: Update MD5SUM and script. +libraries/librepfunc: Updated for version 1.10.0. +libraries/libtecla: Mark x86_64 only. +libraries/libtorch-cxx11-abi-shared-with-deps: Removed (pytorch). +libraries/libxmlb: Updated for version 0.3.19. +libraries/lua-readline: Removed (upstream no longer exists). +libraries/mimalloc: Updated for version 2.1.4 +libraries/nng: Updated for version 1.8.0. +libraries/opencl-amd: Mark for x86_64 only. +libraries/openvdb: Mark for x86_64. +libraries/openvino: Updated for version 2024.1.0. +libraries/pcl: Updated for version 1.14.0 +libraries/pytorch: Added (machine learning library). +libraries/rapidjson: Fix FTBFS with gtest installed + new maintainer +libraries/spdlog: Updated for version 1.14.1. +libraries/tclws: Fixed MD5SUM. +libraries/yascreen: Updated for version 1.99. +misc/fcitx5-chinese-addons: Disable Qt6. +misc/par2cmdline-tbb: Update DEP. +misc/yubioath-desktop: Updated for version 5.1.0. +multimedia/droidcam: Updated for version 2.1.3. +multimedia/kodi: Remove dep. +multimedia/sfnt2woff: Update project HOMEPAGE and DOWNLOAD. +multimedia/shine: Updated for version ab5e352_20230101. +multimedia/uavs3d: Updated for version 1fd0491_20230223. +multimedia/vgmplay: Update script. +multimedia/vvenc: Updated for version 1.11.1. +multimedia/w_scan_cpp: Updated for internal version vdr-2.6.7. +multimedia/winff: Updated for version 1.6.4. +multimedia/xavs2: Mark for x86_64 only. +network/QuiteRSS: Update DOWNLOAD. +network/argus-clients: Fix script. +network/bpfmon: Updated for version 2.52. +network/brave-browser: brave-browser: update 1.65.126 +network/cacti: Updated for version 1.2.26. +network/davmail: Updated for version 6.2.2. +network/discord: Updated for version 0.0.52. +network/dnsproxy-bin: Updated for version 0.71.1. +network/drawterm: Fix MD5SUM. +network/dropbear: Updated for version 2024.85. +network/dropbox: Updated for version 197.4.7629. +network/freedownloadmanager: Updated for version 6.20.0.5510. +network/goimapnotify: Updated for version 2.3.15. +network/hylafax+: Updated for version 7.0.8. +network/kismet: Updated for version 20240430. +network/monkey: Updated DOWNLOAD. +network/movgrab: Updated for version 3.1.2. +network/mptcpd: Added (Multipath TCP management). +network/mullvadvpn-app: Updated for version 2024.2. +network/neomutt: Updated for version 20240425. +network/nessus: Updated for version 10.7.2. +network/nextcloud-desktop: Updated for version 3.13.0. +network/ngrok: Update MD5SUM. +network/owncloud-server: Update DOWNLOAD. +network/phppgadmin: Updated for version 7.14.7 +network/purple-hangouts: Removed (Google shut it down). +network/signal-desktop: Updated for version 7.7.0. +network/telegram: Updated for version 5.0.0. +network/translate: Add missing dependency. +network/viber: Updated for version 21.8.0.11. +network/vimb: Update dependencies. +network/vivaldi: Updated for version 6.7.3329.21. +network/xmrig: Updated for version 6.21.3. +office/1password: Fix MD5SUM. +office/LibreOffice: Updated for version 24.2.3.2 +office/calibre-bin: Updated for version 7.10.0. +office/gnumeric: Updated for version 1.12.57. +office/krop: Updates. +office/libreoffice-helppack: Updated for version 24.2.3. +office/libreoffice-langpack: Updated for version 24.2.3. +office/libreoffice: Updated for version 24.2.3. +office/lotus123: Mark for i586 only. +office/xtrkcad: Updated for version 5.3.0GA. +perl/perl-Locale-Codes: Updated for version 3.78 +perl/perl-Locale-Msgfmt: Removed (FTBFS). +perl/perl-Module-Build-Tiny: Updated for version 0.048. +perl/perl-Module-Install: Updated for version 1.21 +perl/perl-Module-Manifest: Updated for version 1.09. +perl/perl-Net-DNS-SEC: Updated for version 1.24. +perl/perl-PDF-API2: Updated for version 2.045 +perl/perl-Test-Script: Removed (FTBFS). +perl/perl-WWW-Curl: Update curl patch. +perl/perl-YAML-Tiny: Updated for version 1.74 +perl/perl-html-form: Updated for version 6.11. +python/certbot-dns-cloudflare: Updated for version 2.10.0 +python/pyPdf: Removed (use python3-pypdf). +python/pytest: Update dep. +python/python-mysql-replication: Updated for version 1.0.8. +python/python2-pluggy: Added (python2 version of pluggy). +python/python3-ZConfig: Updated for version 4.1. +python/python3-astroid: Updated for version 3.1.0. +python/python3-cairocffi: updated for version 1.7.0 +python/python3-cloudflare: Updated for version 2.9.14 +python/python3-filelock: Updated for version 3.14.0. +python/python3-grpcio: Update for 1.63.0 +python/python3-identify: Updated for version 2.5.36. +python/python3-joblib: Updated for version 1.4.2. +python/python3-keyring: Update for 25.2.0 +python/python3-librosa: Updated for version 0.10.2. +python/python3-paste: updated for version 3.10.0 +python/python3-paste: updated for version 3.10.1 +python/python3-pdm-backend: Updated for version 2.3.0. +python/python3-plotly: Update for 5.22.0 +python/python3-pylint: Updated for version 3.1.0. +python/python3-pypdf: Added (PDF Library). +python/python3-pytest: Updated for version 8.2.0. +python/python3-regex: Update for 2024.4.28 +python/python3-threadpoolctl: Updated for version 3.5.0. +python/python3-virtualenv: Updated for version 20.26.1. +python/python3-wurlitzer: Update for 3.1.0 +python/tox: Update dep. +ruby/ruby-build: Updated for version 20240501. +system/CPU-X: Updated for version 5.0.4. +system/Solaar: Fix building on -current. +system/alacritty: Updated for version 0.13.2. +system/apple-fonts-NY: Update MD5SUM. +system/apple-fonts-SF: Update MD5SUM. +system/apptainer: Make setuid configurable. +system/btop: Updated for version 1.3.2. +system/conky: Updated for version 1.20.2. +system/courier-screenplay: Update MD5SUM. +system/cpmtools: Fixed MD5SUM. +system/distrobox: Updated for version 1.7.2.0. +system/docker-buildx: Updated for version 0.14.0. +system/docker-compose: Updated for version 2.27.0. +system/efi-sync: Added (EFI auto update). +system/efitools: Fix build. +system/fastfetch: Updated for version 2.10.2. +system/fzf: Updated for version 0.51.0. +system/inotify-info: Updated for version 0.0.1. +system/limine: Updated for version 7.4.1 +system/openzfs: removed unnecessary configure arguments +system/pacemaker: Fixed MD5SUM. +system/qemu: Update dependencies to allow offline build +system/slackrepo-hints: Updated for version 20240503. +system/sysdig: Updated for version 0.36.1. +system/ti99sim: Fix build when ARCH is set in the environment. +system/ttf-babelstone-cjk: Updated for version 1.1. +system/ttf-xo-fonts: Updates. +system/usermin: Updated for version 2.010. +system/webmin: Updated for version 2.111. +system/xarchiver: Updated for version 0.5.4.23 ++--------------------------+ +Sat Apr 27 02:29:53 UTC 2024 +academic/cadabra2: Updated for version 2.4.5.7. +academic/nco: Updated for version 5.2.4. +audio/lxmusic: Switch to gtk+3 by default. +desktop/adapta-gtk-theme: Removed (project ended development). +desktop/dunst: Updated for version 1.11.0 +desktop/durden: Fix MD5SUM. +desktop/dwmblocks: Update for 20240420 +desktop/e16.theme.pack: Fix MD5SUM. +desktop/gtklock-playerctl-module: Updated for version 3.0.0. +desktop/gtklock-powerbar-module: Updated for version 3.0.0. +desktop/gtklock-userinfo-module: Updated for version 3.0.0. +desktop/gtklock: Updated for version 3.0.0. +desktop/libqtxdg: Update for 3.12.0 +desktop/lxappearance-obconf: Add a fix for gtk+3. +desktop/lxappearance: Switch to gtk+3 by default, add a license. +desktop/lxpanel: Switch to gtk+3 by default. +desktop/mwm-utils: Update DOWNLOAD and MD5SUM. +desktop/neutrality-cursor-theme: Added (XCursor mouse cursors theme). +desktop/nwg-shell-config: Updated for version 0.5.36. +desktop/nwg-shell: Updated for version 0.5.34. +desktop/oomox: Updated for version 1.15.1. +desktop/wlsunset: Updated for version 0.4.0. +development/OpenCL-CLHPP: Added (OpenCLTM API C++ bindings). +development/acpica: Updated for version 20240321 +development/aws-cdk: Updated for version 2.139.0. +development/composer: Updated for version 2.7.4 +development/edb-debugger: Updated for version 1.5.0. +development/eovim: Update DEP. +development/gdb-dashboard: Updated for version 20240131. +development/gsoap: Updated for version 2.8.132 +development/inform: Fix MD5SUM. +development/jupyter_server_terminals: Update for 0.5.3 +development/kdiff: Update MD5SUM. +development/oneTBB: Fix building python support. +development/stablediffusion-pipelines-cpp: Added (C++ library). +development/stablediffusion-pipelines-cpp: Mark as x86_64 only. +development/uftrace: Updated for version 20240410_17df844 +development/valgrind: Updated for version 3.23.0. +development/whisper.cpp: Added (OpenAI's Whisper model in C/C++). +development/whisper.cpp: Use LIBDIRSUFFIX. +development/xmake: Updated for version 2.9.1. +games/PyLotRO: Removed (FTBFS and upstream no longer updated) +games/atari_8bit_utils: Added (Atari 8-bit utilities). +games/boosteroid: Fix MD5SUM. +games/scid_vs_pc: Fixed MD5SUM. +gis/eccodes/Updated for version 2.35.0. +gis/saga-gis: Updated for version 9.4.0. +graphics/Blender: Remove no longer necessary patch for 32bit builds +graphics/FSPViewer: Fixed MD5SUM. +graphics/XnViewMP: Fixed MD5SUM. +graphics/converseen: Fix build. +graphics/converseen: Updated for version 0.12.2.3. +graphics/gimp-wideangle-plugin: Fix build. +graphics/hugin: Patch to work with newer boost. +graphics/qcustomplot: Updates. +ham/qlog: Fixed MD5SUM. +ham/satdump: Updated for version 1.1.4. +libraries/ell: Added (embedded linux library). +libraries/grpc: Update for 1.62.2 +libraries/gtk-session-lock: Added (screen locker). +libraries/libbpg: Updated for version 0.9.8. +libraries/libfabric: Updated for version 1.21.0. +libraries/libfm: Switch to gtk+3 by default. +libraries/libgusb: Updated for version 0.4.9. +libraries/libheif: Fix build with libsvtav1 2.0.0. +libraries/libqtpas: Switch to lazarus 3.2-0. +libraries/libtorch-cxx11-abi-shared-with-deps: Only for x86_64. +libraries/lxqt-build-tools: Edit HOMEPAGE +libraries/lxqt-qtplugin: Update for 1.4.1 +libraries/openvino: Added (AI toolkit). +libraries/openvino: Fix 32bit build. +libraries/openvino: Include ittapi. +libraries/scafacos: Remove -j option. +libraries/td_lib: Add .pc file to package. +misc/bitwarden-desktop: updated for 2024.4.1 +misc/sigrok-firmware-fx2lafw: Fix building with SDCC >= 4.2.3 +multimedia/intel-media-driver: Mark for x86_64 only. +multimedia/kvazaar: Updated for version 2.3.1. +multimedia/spot: Updated for version 0.4.0. +multimedia/svt-av1: Updated for version 2.0.0. +network/argus-clients: Updated version to 3.0.8.4 +network/discord: Version bump to 0.0.51 +network/dnsproxy-bin: Updated for version 0.71.0. +network/enet: Updated for version 1.3.18 +network/fail2ban: Fix some rotated filenames/bash_competion stuff. +network/ngrok: Updated for version 3.8.0 +network/noip-duc: Added (Dynamic DNS Client). +network/opera: Updated for version 109.0.5097.59. +network/opera: Updated for version 109.0.5097.68. +network/signal-desktop: Updated for version 7.6.0. +network/teamviewer: Updated for version 15.53.6. +network/tor-browser: Fix build for i586. +network/vmware-horizon-client: Updated for version 2312.1_8.12.1_23543969. +network/xmrig: Updated for version 6.21.2. +network/zoom-linux: Updated for version 6.0.2.4680 +office/epr: Added (CLI Epub Reader). +office/semantik: Updated for version 1.2.11. +perl/perl-ExtUtils-Config: Updated for versoin 0.009. +perl/perl-ExtUtils-InstallPaths: Updated for version 0.013. +perl/perl-Mojolicious: Updated for version 9.36. +python/PyPy3: updated for version 7.3.16 +python/PyPy: updated for version 7.3.16 +python/mypy: Updated for version 1.10.0. +python/pypy3: updated for version 7.3.16 +python/pypy: updated for version 7.3.16 +python/python3-PyMuPDF: Updated for version 1.24.2. +python/python3-aiohttp: Updated for version 3.9.5. +python/python3-bsdiff4: Added (binary diffs). +python/python3-dulwich: updated for version 0.22.1 +python/python3-findpython: Version bump to 0.6.1 +python/python3-flake8_annotations: Added (type annotation checks). +python/python3-grpcio: Update for 1.62.2 +python/python3-pdm-backend: Version bump to 2.2.1 +python/python3-pdm: Version bump to 2.15.0 +python/python3-pdm: Version bump to 2.15.1 +python/python3-platformdirs: Version bump to 4.2.1 +python/python3-pluggy: Version bump to 1.5.0 +python/python3-pytest: Version bump to 8.1.2 +python/python3-reportlab: Updated for version 4.2.0. +python/python3-textdistance: Update for 4.6.2 +python/python3-tox: Version bump to 4.15.0 +python/python3-unearth: Version bump to 0.15.2 +python/python3-virtualenv: Version bump to 20.26.0 +python/terminado: Update for 0.18.1 +ruby/ruby-build: Updated for version 20240423. +system/B-em: Updated for version 20240306_5557a36. New versioning scheme. +system/FreeFileSync: Updated info file, download location. +system/Iosevka-aile: Updated for version 29.2.1. +system/Iosevka-etoile: Updated for version 29.2.1. +system/fnt: Updated for version 1.6. +system/greetd: Updated for version 0.10.0. +system/kitty: Updated for version 0.34.1 +system/limine: Updated for version 7.4.0 +system/lxdm: Build agains PAM, cleanups. +system/lxinput: Switch to gtk+3 by default. +system/lxrandr: Switch to gtk+3 by default. +system/lxsession: Switch to gtk+3 by default. +system/lxtask: Switch to gtk+3 by default. +system/lxterminal: Switch to gtk+3 by default. +system/numactl: Updated for version 2.0.17. +system/nvidia-driver: Updated for version 550.76. +system/nvidia-fabricmanager: Added (proprietary binary). +system/nvidia-kernel: Updated for version 550.76. +system/nvidia-open-kernel: Updated for version 550.76. +system/pcmanfm: Switch to gtk+3 by default. +system/polychromatic: Updated for version 0.8.4. +system/prometheus: Updated to version 2.51.2 +system/pv: updated for version 1.8.9 +system/qtxdg-tools: Update for 3.12.0 +system/redis-py: updated for version 5.0.4 +system/rewise: Updated for version 0.2.0. +system/sarasa-gothic: Updated for version 1.0.10. +system/testdisk: New maintainer. +system/ttf-babelstone-tibetan: Updated for version 10.011. +system/virtualbox-addons: Updated for version 6.1.50 +system/virtualbox-extension-pack: Updated for version 6.1.50 +system/virtualbox-kernel: Updated for version 6.1.50 +system/virtualbox: Updated for version 6.1.50 +system/wine-staging: Updated for version 9.7. +system/xen: Updated for version 4.18.2. ++--------------------------+ Sat Apr 20 14:15:42 UTC 2024 academic/cadabra2: Updated for version 2.4.5.6. academic/kissat: Added (SAT solver). @@ -1,3 +1,19 @@ +SBo-git - slackbuilds repository for slackware-current +- - - + +this is an unofficial fork of master branch from slackbuilds.org's +git repository (http://slackbuilds.org/cgit/slackbuilds/). + +here I put my unofficial mods to their slackbuilds to run on +slackware-current with sbopkg (http://www.sbopkg.org). + +Check https://github.com/Ponce/slackbuilds/wiki for additional informations. + +See https://github.com/Ponce/slackbuilds/wiki/configuring-the-current-repository-with-sbopkg +for instructions on how to use this repository with sbopkg. + +original README from slackbuilds.org follows: +--------------------------------------------- See https://slackbuilds.org/howto/ for instructions on how to use the contents of this directory. diff --git a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild index 9a04eb6fc4..7ef6e2ceba 100644 --- a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild +++ b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Gridcoin-Research -VERSION=${VERSION:-5.4.7.0} +VERSION=${VERSION:-5.4.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/Gridcoin-Research/Gridcoin-Research.info b/academic/Gridcoin-Research/Gridcoin-Research.info index a28295c32f..8db3ea0b94 100644 --- a/academic/Gridcoin-Research/Gridcoin-Research.info +++ b/academic/Gridcoin-Research/Gridcoin-Research.info @@ -1,8 +1,8 @@ PRGNAM="Gridcoin-Research" -VERSION="5.4.7.0" +VERSION="5.4.8.0" HOMEPAGE="https://gridcoin.us/" -DOWNLOAD="https://github.com/gridcoin-community/Gridcoin-Research/archive/5.4.7.0/Gridcoin-Research-5.4.7.0.tar.gz" -MD5SUM="8c42dfd8deaa754d78aa248785e724b0" +DOWNLOAD="https://github.com/gridcoin-community/Gridcoin-Research/archive/5.4.8.0/Gridcoin-Research-5.4.8.0.tar.gz" +MD5SUM="69a861f7eca09f6142c8e737744ad9fd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/academic/Gridcoin-Research/README b/academic/Gridcoin-Research/README index 2fc9a1a4f5..53cc2f8645 100644 --- a/academic/Gridcoin-Research/README +++ b/academic/Gridcoin-Research/README @@ -34,6 +34,6 @@ release notes on https://github.com/gridcoin-community/Gridcoin-Research/releases ** NOTE: ** -This is a MANDATORY upgrade for versions 5.4.5 and below to fix an +While this is a LEISURE update, you are highly encouraged to upgrade. +Included are additonal fixes and improvements releated to the recent inadvertent fork as a result of an inadvertent protocol change. -If you are already on 5.4.6 this upgrade is "leisure." diff --git a/academic/R/R.SlackBuild b/academic/R/R.SlackBuild index 3ee98369fc..97b5d3a22b 100644 --- a/academic/R/R.SlackBuild +++ b/academic/R/R.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=R -VERSION=${VERSION:-4.3.3} +VERSION=${VERSION:-4.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/R/R.info b/academic/R/R.info index 45cf892f94..6c12168093 100644 --- a/academic/R/R.info +++ b/academic/R/R.info @@ -1,8 +1,8 @@ PRGNAM="R" -VERSION="4.3.3" +VERSION="4.4.0" HOMEPAGE="https://www.r-project.org/" -DOWNLOAD="https://cran.r-project.org/src/base/R-4/R-4.3.3.tar.xz" -MD5SUM="5602f5996107c346dba12a16e866d2e2" +DOWNLOAD="https://cran.r-project.org/src/base/R-4/R-4.4.0.tar.xz" +MD5SUM="647ef3e012e9cf36a187db64a6082217" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/academic/bcftools/bcftools.SlackBuild b/academic/bcftools/bcftools.SlackBuild index b7a8433557..ad6f5d7181 100644 --- a/academic/bcftools/bcftools.SlackBuild +++ b/academic/bcftools/bcftools.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for bcftools -# Copyright 2017-2023 Rob van Nues # All rights reserved. +# Copyright 2017-2024 Rob van Nues # All rights reserved. # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bcftools -VERSION=${VERSION:-1.19} -HTSLIBV=${HTSLIBV:-1.19} +VERSION=${VERSION:-1.20} +HTSLIBV=${HTSLIBV:-1.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/bcftools/bcftools.info b/academic/bcftools/bcftools.info index 1998ed001c..84e5bb039b 100644 --- a/academic/bcftools/bcftools.info +++ b/academic/bcftools/bcftools.info @@ -1,8 +1,8 @@ PRGNAM="bcftools" -VERSION="1.19" +VERSION="1.20" HOMEPAGE="http://www.htslib.org" -DOWNLOAD="https://github.com/samtools/bcftools/releases/download/1.19/bcftools-1.19.tar.bz2" -MD5SUM="9b4e8be279024d19f36bbaad1d2bdb41" +DOWNLOAD="https://github.com/samtools/bcftools/releases/download/1.20/bcftools-1.20.tar.bz2" +MD5SUM="5cfb124c7d9e4db6c5a4e6080a2f27f8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="htslib" diff --git a/academic/bedtools/bedtools.SlackBuild b/academic/bedtools/bedtools.SlackBuild index 78b678111f..19307cc286 100644 --- a/academic/bedtools/bedtools.SlackBuild +++ b/academic/bedtools/bedtools.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bedtools DIRNAM=bedtools2 -VERSION=${VERSION:-2.31.0} +VERSION=${VERSION:-2.31.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/bedtools/bedtools.info b/academic/bedtools/bedtools.info index 31f2e1b4da..ceec5617fd 100644 --- a/academic/bedtools/bedtools.info +++ b/academic/bedtools/bedtools.info @@ -1,8 +1,8 @@ PRGNAM="bedtools" -VERSION="2.31.0" +VERSION="2.31.1" HOMEPAGE="http://bedtools.readthedocs.org/" -DOWNLOAD="https://github.com/arq5x/bedtools2/releases/download/v2.31.0/bedtools-2.31.0.tar.gz" -MD5SUM="d840193968e345947b076eaa322a9420" +DOWNLOAD="https://github.com/arq5x/bedtools2/releases/download/v2.31.1/bedtools-2.31.1.tar.gz" +MD5SUM="d1eb463c07c0753a4ee3af614b2ae387" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/academic/cadabra2/cadabra2.SlackBuild b/academic/cadabra2/cadabra2.SlackBuild index dff731aad7..0172ff5550 100644 --- a/academic/cadabra2/cadabra2.SlackBuild +++ b/academic/cadabra2/cadabra2.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cadabra2 -VERSION=${VERSION:-2.4.5.6} +VERSION=${VERSION:-2.4.5.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/cadabra2/cadabra2.info b/academic/cadabra2/cadabra2.info index 54385565de..2bd6e73540 100644 --- a/academic/cadabra2/cadabra2.info +++ b/academic/cadabra2/cadabra2.info @@ -1,8 +1,8 @@ PRGNAM="cadabra2" -VERSION="2.4.5.6" +VERSION="2.4.5.7" HOMEPAGE="https://cadabra.science" -DOWNLOAD="https://github.com/kpeeters/cadabra2/archive/2.4.5.6/cadabra2-2.4.5.6.tar.gz" -MD5SUM="769833ed91bb6999cdf86bd3f26710a7" +DOWNLOAD="https://github.com/kpeeters/cadabra2/archive/2.4.5.7/cadabra2-2.4.5.7.tar.gz" +MD5SUM="0114198388cc3d11e7318a1319b46aae" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-matplotlib python3-gmpy2 python3-sympy" diff --git a/academic/copasi/copasi.SlackBuild b/academic/copasi/copasi.SlackBuild index 0a6da4fcfd..732cd916d9 100644 --- a/academic/copasi/copasi.SlackBuild +++ b/academic/copasi/copasi.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=copasi -VERSION=${VERSION:-4.42.284} +VERSION=${VERSION:-4.43.288} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/copasi/copasi.info b/academic/copasi/copasi.info index 75e1b966a6..2840e1662d 100644 --- a/academic/copasi/copasi.info +++ b/academic/copasi/copasi.info @@ -1,10 +1,10 @@ PRGNAM="copasi" -VERSION="4.42.284" +VERSION="4.43.288" HOMEPAGE="https://copasi.org" -DOWNLOAD="https://github.com/copasi/COPASI/releases/download/Build-284/COPASI-4.42.284-Linux-32bit.sh" -MD5SUM="66ae94a23f8d7745835e3639f1c567f6" -DOWNLOAD_x86_64="https://github.com/copasi/COPASI/releases/download/Build-284/COPASI-4.42.284-Linux-64bit.sh" -MD5SUM_x86_64="87f09230f64ea4c69a6695963e4f2594" +DOWNLOAD="https://github.com/copasi/COPASI/releases/download/Build-288/COPASI-4.43.288-Linux-32bit.sh" +MD5SUM="2eb1afccd0697ab7b75a1177e89ce15b" +DOWNLOAD_x86_64="https://github.com/copasi/COPASI/releases/download/Build-288/COPASI-4.43.288-Linux-64bit.sh" +MD5SUM_x86_64="cf48d9dd2672f1ba676ddc457b71c91d" REQUIRES="" MAINTAINER="Pedro Mendes" EMAIL="pedro@gepasi.org" diff --git a/academic/fet/fet.SlackBuild b/academic/fet/fet.SlackBuild index 6962abec49..44e787e45d 100644 --- a/academic/fet/fet.SlackBuild +++ b/academic/fet/fet.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fet -VERSION=${VERSION:-6.19.3} +VERSION=${VERSION:-6.19.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/fet/fet.info b/academic/fet/fet.info index 2093219a59..d18c2b5bff 100644 --- a/academic/fet/fet.info +++ b/academic/fet/fet.info @@ -1,8 +1,8 @@ PRGNAM="fet" -VERSION="6.19.3" +VERSION="6.19.5" HOMEPAGE="https://www.lalescu.ro/liviu/fet/" -DOWNLOAD="https://www.lalescu.ro/liviu/fet/download/fet-6.19.3.tar.bz2" -MD5SUM="5af48c9d1fdf303d7f2ed8ec306a257d" +DOWNLOAD="https://www.lalescu.ro/liviu/fet/download/fet-6.19.5.tar.bz2" +MD5SUM="f950f70c9a697fa3ddec344b562a4037" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/academic/gri/UTF8patch.README b/academic/gri/UTF8patch.README deleted file mode 100644 index f30c7c969b..0000000000 --- a/academic/gri/UTF8patch.README +++ /dev/null @@ -1,19 +0,0 @@ -Compilation of gri breaks on doc/gri.texi with current tex-info. - -"It is because Texinfo 6.7 changed the default input encoding to UTF-8 -and the input is in ISO-8859-1. The easiest way to fix this would be to -convert the input file to UTF-8, but you could also add -"@documentencoding ISO-8859-1" to the file." -(from email correspondence with texinfo developers) - -The patchfile 'gri-texinfo-6.7patch.txt' set the whole file to ISO-8859-1 -and does not alter the contributor's name. - - -The other patchfile, 'texinfo-utf8.patch', was generated by Matteo Bernardini -(http://cgit.ponce.cc/slackbuilds/commit/?h=gri), and changes the accented o in the name. - -Either patch allows compilation of gri. - -see: -https://www.linuxquestions.org/questions/slackware-14/sbo-scripts-not-building-on-current-read-1st-post-pls-4175561999/page142.html#post6049662
\ No newline at end of file diff --git a/academic/gri/gri-texinfo-6.7patch.txt b/academic/gri/gri-texinfo-6.7patch.txt deleted file mode 100644 index f9b2dedf91..0000000000 --- a/academic/gri/gri-texinfo-6.7patch.txt +++ /dev/null @@ -1,10 +0,0 @@ -diff -Naur gri-2.12.23/doc/gri.texi gri-2.12.23-new/doc/gri.texi ---- gri-2.12.23/doc/gri.texi 2017-08-24 15:31:52.000000000 +0100 -+++ gri-2.12.23-new/doc/gri.texi 2019-10-22 16:13:33.476840964 +0100 -@@ -1,5 +1,5 @@ - \input texinfo -- -+@documentencoding ISO-8859-1 - @c - @comment *** Start of HTML stuff *** - @comment # HTML support, via comments in texinfo: diff --git a/academic/gri/gri.SlackBuild b/academic/gri/gri.SlackBuild index baa6a4e266..a611905cbe 100644 --- a/academic/gri/gri.SlackBuild +++ b/academic/gri/gri.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gri -# Copyright 2018-2019 Rob van Nues +# Copyright 2018-2024 Rob van Nues # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gri -VERSION=${VERSION:-2.12.23} +VERSION=${VERSION:-2.12.27} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -79,10 +76,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -#with thanks to Gavin Smith -patch -p1 < $CWD/gri-texinfo-6.7patch.txt -#with thanks to Matteo Bernardini -#patch -p1 < $CWD/texinfo-utf8.patch aclocal autoconf @@ -96,8 +89,6 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -#with thanks to Matteo Bernardini -#see: https://www.linuxquestions.org/questions/slackware-14/sbo-scripts-not-building-on-current-read-1st-post-pls-4175561999/page142.html#post6049662 make -j1 make -j1 install DESTDIR=$PKG @@ -116,7 +107,7 @@ rm $PKG/usr/info/*.info-[1-3] mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS AUTHOR-NOTES ChangeLog THANKS README NEWS INSTALL DISCUSSION-error-levels COPYING copyright.txt \ + AUTHORS AUTHOR-NOTES ChangeLog THANKS README NEWS DISCUSSION-error-levels COPYING copyright.txt \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/academic/gri/gri.info b/academic/gri/gri.info index 6e4ee42dde..df28f646ba 100644 --- a/academic/gri/gri.info +++ b/academic/gri/gri.info @@ -1,8 +1,8 @@ PRGNAM="gri" -VERSION="2.12.23" +VERSION="2.12.27" HOMEPAGE="https://sourceforge.net/p/gri/wiki/Home/" -DOWNLOAD="https://github.com/dankelley/gri/archive/v2.12.23/gri-2.12.23.tar.gz" -MD5SUM="7594140fdd1ea1ccf890c2d7ede0e1e9" +DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/gri/gri-2.12.27.tar.gz" +MD5SUM="30579bafcfe274939c0c50cb9d66a7d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/academic/gri/texinfo-utf8.patch b/academic/gri/texinfo-utf8.patch deleted file mode 100644 index b63573de33..0000000000 --- a/academic/gri/texinfo-utf8.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gri-2.12.23.orig/doc/gri.texi gri-2.12.23/doc/gri.texi ---- gri-2.12.23.orig/doc/gri.texi 2017-08-24 16:31:52.000000000 +0200 -+++ gri-2.12.23/doc/gri.texi 2019-10-22 15:39:51.666151000 +0200 -@@ -19277,7 +19277,7 @@ - Thomas Larsen, - @cindex Thomas Larsen (contributor) - @cindex contributor, Thomas Larsen --Alejandro L�pez-Valencia, -+Alejandro Lopez-Valencia, - @cindex Alejandro Lopez-Valencia (contributor) - @cindex contributor, Alejandro Lopez-Valencia - Kawamura Masao,
\ No newline at end of file diff --git a/academic/magic/magic.SlackBuild b/academic/magic/magic.SlackBuild index 73f7640cfc..241f4f9e2e 100644 --- a/academic/magic/magic.SlackBuild +++ b/academic/magic/magic.SlackBuild @@ -2,6 +2,8 @@ # Slackware build script for magic # Written by Mauricio Martinez <eigenfilter {at} gmail [dot] com> +# +# Updated 05/01/2024 by Alfredo Tomasini <alto . tom @ gmail . com > # THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF @@ -17,7 +19,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=magic -VERSION=${VERSION:-8.0.211} +VERSION=${VERSION:-8.3.474} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -30,9 +32,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -71,6 +70,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# change the final installation from /usr/lib to usr/lib64 +if [[ "$VERSION" =~ "8.3" ]] && [ "$ARCH" = "x86_64" ] +then +sed -i ' +/^ *INSTALL_LIBDIR *= /{ +s#.*## +i\ +INSTALL_LIBDIR = @DIST_DIR@/lib64 +} ' scripts/defs.mak.in +fi +# exit + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -88,8 +99,11 @@ make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +mv $PKG/usr/share/man $PKG/usr/ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +chmod -R 0644 $PKG/usr/man/*/*.gz +rm -rf $PKG/usr/share mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/academic/magic/magic.info b/academic/magic/magic.info index 5dba84cc65..13a82a5f60 100644 --- a/academic/magic/magic.info +++ b/academic/magic/magic.info @@ -1,8 +1,8 @@ PRGNAM="magic" -VERSION="8.0.211" +VERSION="8.3.474" HOMEPAGE="http://opencircuitdesign.com/magic/" -DOWNLOAD="http://opencircuitdesign.com/magic/archive/magic-8.0.211.tgz" -MD5SUM="caa066a415fe219afab7a80c5948ac49" +DOWNLOAD="http://opencircuitdesign.com/magic/archive/magic-8.3.474.tgz" +MD5SUM="6aabec0c7727f774af49bbb6abb2bdab" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/academic/nco/nco.SlackBuild b/academic/nco/nco.SlackBuild index 202f45a72e..706e1316ed 100644 --- a/academic/nco/nco.SlackBuild +++ b/academic/nco/nco.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nco -VERSION=${VERSION:-5.2.2} +VERSION=${VERSION:-5.2.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/nco/nco.info b/academic/nco/nco.info index a532879aeb..b6064e2b16 100644 --- a/academic/nco/nco.info +++ b/academic/nco/nco.info @@ -1,8 +1,8 @@ PRGNAM="nco" -VERSION="5.2.2" +VERSION="5.2.4" HOMEPAGE="http://nco.sf.net" -DOWNLOAD="https://github.com/nco/nco/archive/5.2.2/nco-5.2.2.tar.gz" -MD5SUM="5baea71f85e0344cc1d74244ac8441b6" +DOWNLOAD="https://github.com/nco/nco/archive/5.2.4/nco-5.2.4.tar.gz" +MD5SUM="b46ed9dcdc1a2c857811cb5698a0460c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="netcdf udunits antlr2" diff --git a/academic/openboard/openboard.SlackBuild b/academic/openboard/openboard.SlackBuild index d244896916..46af39058c 100644 --- a/academic/openboard/openboard.SlackBuild +++ b/academic/openboard/openboard.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=openboard SRCNAM=OpenBoard -VERSION=${VERSION:-1.7.0} +VERSION=${VERSION:-1.7.1} SRCVER=$(echo $VERSION | tr _ -) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/academic/openboard/openboard.info b/academic/openboard/openboard.info index 20a8614784..a21a6369a0 100644 --- a/academic/openboard/openboard.info +++ b/academic/openboard/openboard.info @@ -1,8 +1,8 @@ PRGNAM="openboard" -VERSION="1.7.0" +VERSION="1.7.1" HOMEPAGE="https://github.com/OpenBoard-org/OpenBoard/" -DOWNLOAD="https://github.com/OpenBoard-org/OpenBoard/archive/v1.7.0/OpenBoard-1.7.0.tar.gz" -MD5SUM="8e4b9780efffbd1adca5582fa161fd7e" +DOWNLOAD="https://github.com/OpenBoard-org/OpenBoard/archive/v1.7.1/OpenBoard-1.7.1.tar.gz" +MD5SUM="338d19d5fd281bf3c9a3bdfa51c2d241" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libpaper libass x264 libfdk-aac" diff --git a/academic/plus42/plus42.SlackBuild b/academic/plus42/plus42.SlackBuild index c89279a774..4901b8843b 100644 --- a/academic/plus42/plus42.SlackBuild +++ b/academic/plus42/plus42.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=plus42 -VERSION=${VERSION:-1.1.9} +VERSION=${VERSION:-1.1.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/plus42/plus42.info b/academic/plus42/plus42.info index 45e08e71d5..f15c8dccc2 100644 --- a/academic/plus42/plus42.info +++ b/academic/plus42/plus42.info @@ -1,8 +1,8 @@ PRGNAM="plus42" -VERSION="1.1.9" +VERSION="1.1.10" HOMEPAGE="https://www.thomasokken.com/plus42" -DOWNLOAD="https://github.com/thomasokken/plus42desktop/archive/v1.1.9/plus42-1.1.9.tar.gz" -MD5SUM="a06f497124bc6b0e03d2f46c15097faa" +DOWNLOAD="https://github.com/thomasokken/plus42desktop/archive/v1.1.10/plus42-1.1.10.tar.gz" +MD5SUM="9c2731bf823967f55d3b51130dd205e6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/academic/pspp/pspp.SlackBuild b/academic/pspp/pspp.SlackBuild index 17b31eb664..efd42d80ce 100644 --- a/academic/pspp/pspp.SlackBuild +++ b/academic/pspp/pspp.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pspp -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-2.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/pspp/pspp.info b/academic/pspp/pspp.info index 702e496e28..7c293f4bc2 100644 --- a/academic/pspp/pspp.info +++ b/academic/pspp/pspp.info @@ -1,8 +1,8 @@ PRGNAM="pspp" -VERSION="2.0.0" +VERSION="2.0.1" HOMEPAGE="http://www.gnu.org/software/pspp/" -DOWNLOAD="http://mirrors.nav.ro/gnu/pspp/pspp-2.0.0.tar.gz" -MD5SUM="11f5949311bfe66a44999b9d7db6c99b" +DOWNLOAD="http://mirrors.nav.ro/gnu/pspp/pspp-2.0.1.tar.gz" +MD5SUM="0933860d7d511dac67277ef4829263ce" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="spread-sheet-widget" diff --git a/academic/samtools/samtools.SlackBuild b/academic/samtools/samtools.SlackBuild index 7efbaf3288..4f39dce0d0 100644 --- a/academic/samtools/samtools.SlackBuild +++ b/academic/samtools/samtools.SlackBuild @@ -25,14 +25,14 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=samtools -VERSION=${VERSION:-1.19.2} -HTSLIBV=${HTSLIBV:-1.19.1} +VERSION=${VERSION:-1.20} +HTSLIBV=${HTSLIBV:-1.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -# Some applications still rely on the legacy samtools API instead of using htslib -# exclusively, in that case, install the headers in /usr/include/bam and the static +# Some applications still rely on the legacy samtools API instead of using htslib +# exclusively, in that case, install the headers in /usr/include/bam and the static # libbam library as well by declaring (uncommenting): #SAMLIB="yes" # and commenting out: @@ -122,9 +122,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS LICENSE README NEWS.md examples \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS LICENSE README NEWS.md examples $PKG/usr/doc/$PRGNAM-$VERSION cp $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/academic/samtools/samtools.info b/academic/samtools/samtools.info index eef9473b1e..40df7ba546 100644 --- a/academic/samtools/samtools.info +++ b/academic/samtools/samtools.info @@ -1,8 +1,8 @@ PRGNAM="samtools" -VERSION="1.19.2" +VERSION="1.20" HOMEPAGE="http://www.htslib.org" -DOWNLOAD="https://github.com/samtools/samtools/releases/download/1.19.2/samtools-1.19.2.tar.bz2" -MD5SUM="318492d95f5d8cef697442d1be996b77" +DOWNLOAD="https://github.com/samtools/samtools/releases/download/1.20/samtools-1.20.tar.bz2" +MD5SUM="e33f429b57324a55e5cbe0ef9f3a094e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="htslib" diff --git a/academic/smath-studio/smath-studio.SlackBuild b/academic/smath-studio/smath-studio.SlackBuild index 4b26c719c3..e6b4740429 100644 --- a/academic/smath-studio/smath-studio.SlackBuild +++ b/academic/smath-studio/smath-studio.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=smath-studio -VERSION=${VERSION:-1.0.8348} +VERSION=${VERSION:-1.1.8763} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/smath-studio/smath-studio.desktop b/academic/smath-studio/smath-studio.desktop index 6b41e1fe8d..2af6903742 100644 --- a/academic/smath-studio/smath-studio.desktop +++ b/academic/smath-studio/smath-studio.desktop @@ -7,5 +7,5 @@ GenericName=Computer algebra system Comment=Symbolic computation software Icon=smath-studio Exec=smath-studio -Categories=Education; +Categories=Science;Education;Math MimeType= diff --git a/academic/smath-studio/smath-studio.info b/academic/smath-studio/smath-studio.info index bc40d92965..c10558c6b9 100644 --- a/academic/smath-studio/smath-studio.info +++ b/academic/smath-studio/smath-studio.info @@ -1,9 +1,9 @@ PRGNAM="smath-studio" -VERSION="1.0.8348" +VERSION="1.1.8763" HOMEPAGE="https://smath.info" -DOWNLOAD="https://smath.com/file/Lw2xA/SMathStudioDesktop.1_0_8348.Mono.tar.gz \ +DOWNLOAD="https://smath.info/en-US/files/Download/w3XHB/SMathStudioDesktop.1_1_8763.Mono.tar.gz \ http://ponce.cc/slackware/sources/repo/SMathStudio.Icons.zip" -MD5SUM="4ae9109f910c0085eeb8c193f3ad1c10 \ +MD5SUM="0e3c05eb81a82dbcce2ef04904624b2b \ 1dd3ff0477b5c3c57fb815320a387643" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/academic/stellarium/stellarium.SlackBuild b/academic/stellarium/stellarium.SlackBuild index fa3ce9900c..18b68389b1 100644 --- a/academic/stellarium/stellarium.SlackBuild +++ b/academic/stellarium/stellarium.SlackBuild @@ -122,6 +122,7 @@ cd build -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DPREFER_SYSTEM_INDILIB=NO \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/academic/stellarsolver/README b/academic/stellarsolver/README deleted file mode 100644 index 7bf9e1a087..0000000000 --- a/academic/stellarsolver/README +++ /dev/null @@ -1,11 +0,0 @@ -stellarsolver Astrometric Plate Solver - -stellarsolver is a cross platform SEP-based star extractor and -astrometry.net-based internal astrometric solver. Also refered to as -Plate solving or Astrometric calibration of an astronomical image, -this is a technique used in astronomy and applied on celestial images. -the astrometric solution it is possible to calculate the celestial -coordinates of any object on the image or synchronize the telescope -mount or satellite pointing position to the center of the image taken. - -stellarsolver is required to compile Kstars with INDI support. diff --git a/academic/stellarsolver/doinst.sh b/academic/stellarsolver/doinst.sh deleted file mode 100644 index 19b813d022..0000000000 --- a/academic/stellarsolver/doinst.sh +++ /dev/null @@ -1,7 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 -fi diff --git a/academic/stellarsolver/slack-desc b/academic/stellarsolver/slack-desc deleted file mode 100644 index c56b7376e3..0000000000 --- a/academic/stellarsolver/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -stellarsolver: stellarsolver (Astrometric Plate Solver) -stellarsolver: -stellarsolver: stellarsolver is a cross platform SEP-based star extractor and -stellarsolver: astrometry.net-based internal astrometric solver. -stellarsolver: -stellarsolver: -stellarsolver: -stellarsolver: https://github.com/rlancaste/stellarsolver -stellarsolver: -stellarsolver: -stellarsolver: diff --git a/academic/stellarsolver/stellarsolver.SlackBuild b/academic/stellarsolver/stellarsolver.SlackBuild deleted file mode 100644 index 8dec189d67..0000000000 --- a/academic/stellarsolver/stellarsolver.SlackBuild +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/bash - -# Slackware build script for stellarsolver - -# Copyright 2022 Edward W. Koenig, Vancouver, WA, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=stellarsolver -VERSION=${VERSION:-2.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -case "$ARCH" in - x86_64) ;; - arm*) ;; - *) echo "Unsupported ARCH '$ARCH'"; exit 1 ;; -esac - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -mkdir -p build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_TESTER=ON .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/academic/stellarsolver/stellarsolver.info b/academic/stellarsolver/stellarsolver.info deleted file mode 100644 index e9d567c16f..0000000000 --- a/academic/stellarsolver/stellarsolver.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="stellarsolver" -VERSION="2.4" -HOMEPAGE="https://github.com/rlancaste/stellarsolver" -DOWNLOAD="https://github.com/rlancaste/stellarsolver/archive/2.4/stellarsolver-2.4.tar.gz" -MD5SUM="a4a92e7c2dc296d7fcbc814134d45886" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="wcslib" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@linuxgalaxy.org" diff --git a/accessibility/flite/flite.SlackBuild b/accessibility/flite/flite.SlackBuild index ee743fdacc..da0382f814 100644 --- a/accessibility/flite/flite.SlackBuild +++ b/accessibility/flite/flite.SlackBuild @@ -144,6 +144,7 @@ done # "cd -", as they don't nest. ( cd doc # build the HTML docs. + sed -i -e "s|html/flite\ |html/flite_html |" -e "s|html/flite\;|html/flite_html;|" -e "s|html/flite/|html/flite_html/|" Makefile make $PRGNAM.html ( cd html diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild index 63f72ba036..8dfad24c8d 100644 --- a/audio/ardour/ardour.SlackBuild +++ b/audio/ardour/ardour.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for ardour # Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2018-2023 Matteo Bernardini, Pisa, Italy +# Copyright 2018-2024 Matteo Bernardini, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ardour -VERSION=${VERSION:-8.1.0} +VERSION=${VERSION:-8.6.0} MAJVER=$(echo $VERSION | cut -d. -f1) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,9 +61,6 @@ else TARGET="$ARCH" fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.$PKGTYPE" exit 0 @@ -88,8 +85,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + -# Thanks to fourtysixandtwo for pointing at this upstream pull request! -patch -p1 < $CWD/libxml2-2.12-fix.patch +sed -i "s|env\ python|env\ python3|" waf wscript CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info index c68b2e5110..5a1196d197 100644 --- a/audio/ardour/ardour.info +++ b/audio/ardour/ardour.info @@ -1,8 +1,8 @@ PRGNAM="ardour" -VERSION="8.1.0" +VERSION="8.6.0" HOMEPAGE="http://ardour.org" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/Ardour-8.1.0.tar.bz2" -MD5SUM="278d59f3343057124989acbbf67d7f15" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/Ardour-8.6.0.tar.bz2" +MD5SUM="b3f176e79f14988c7b42479214c15184" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="aubio jack liblo liblrdf rubberband suil cwiid lilv vst3sdk" diff --git a/audio/ardour/libxml2-2.12-fix.patch b/audio/ardour/libxml2-2.12-fix.patch deleted file mode 100644 index 00ebd0f4e2..0000000000 --- a/audio/ardour/libxml2-2.12-fix.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e995daa37529715214c6c4a2587e4134aaaba02f Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@tiptoe.de> -Date: Fri, 17 Nov 2023 23:26:06 +0100 -Subject: [PATCH] Fix failure to build with libxml2 version 2.12 - -This declared some xmlError pointers const, which probably was always -assumed, but not made explicit. - -Signed-off-by: Nils Philippsen <nils@tiptoe.de> ---- - gtk2_ardour/ardour_ui.cc | 8 ++++++-- - libs/pbd/xml++.cc | 2 +- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc -index 54ed79ea83d..77ddbbe99ca 100644 ---- a/gtk2_ardour/ardour_ui.cc -+++ b/gtk2_ardour/ardour_ui.cc -@@ -255,7 +255,7 @@ libxml_generic_error_func (void* /* parsing_context*/, - - static void - libxml_structured_error_func (void* /* parsing_context*/, -- xmlErrorPtr err) -+ const xmlError *err) - { - string msg; - -@@ -403,7 +403,11 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) - /* stop libxml from spewing to stdout/stderr */ - - xmlSetGenericErrorFunc (this, libxml_generic_error_func); -- xmlSetStructuredErrorFunc (this, libxml_structured_error_func); -+ -+ /* Cast to xmlStructuredErrorFunc to cope with different constness in different -+ * versions of libxml2. */ -+ -+ xmlSetStructuredErrorFunc (this, (xmlStructuredErrorFunc)libxml_structured_error_func); - - /* Set this up early */ - -diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc -index 5c57ad8395d..1f5a85772f6 100644 ---- a/libs/pbd/xml++.cc -+++ b/libs/pbd/xml++.cc -@@ -170,7 +170,7 @@ XMLTree::write() const - result = xmlSaveFormatFileEnc(_filename.c_str(), doc, "UTF-8", 1); - #ifndef NDEBUG - if (result == -1) { -- xmlErrorPtr xerr = xmlGetLastError (); -+ const xmlError *xerr = xmlGetLastError (); - if (!xerr) { - std::cerr << "unknown XML error during xmlSaveFormatFileEnc()." << std::endl; - } else { diff --git a/audio/ardour/vendor_qm-dsp.patch b/audio/ardour/vendor_qm-dsp.patch deleted file mode 100644 index f8265fd6e4..0000000000 --- a/audio/ardour/vendor_qm-dsp.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git i/libs/qm-dsp/wscript w/libs/qm-dsp/wscript -index 775098e06b..13f6b9410a 100644 ---- i/libs/qm-dsp/wscript -+++ w/libs/qm-dsp/wscript -@@ -23,17 +23,10 @@ def options(opt): - autowaf.set_options(opt) - - def configure(conf): -- if conf.is_defined('USE_EXTERNAL_LIBS'): -- conf.check_cxx(header_name="base/Pitch.h", mandatory=True) -- conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True) -- else: -- conf.load('compiler_cxx') -- autowaf.configure(conf) -+ conf.load('compiler_cxx') -+ autowaf.configure(conf) - - def build(bld): -- if bld.is_defined('USE_EXTERNAL_LIBS'): -- return -- - # Host Library - obj = bld(features = 'c cxx cxxstlib') - obj.source = ''' -diff --git i/wscript w/wscript -index 1c9bb1ff5d..95d377d8a7 100644 ---- i/wscript -+++ w/wscript -@@ -1041,8 +1041,6 @@ def configure(conf): - - if Options.options.use_external_libs: - conf.define('USE_EXTERNAL_LIBS', 1) -- conf.env.append_value( -- 'CXXFLAGS', '-I' + Options.options.qm_dsp_include) - - if Options.options.boost_include != '': - conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include) diff --git a/audio/audacity/README b/audio/audacity/README index 3e3b5b0653..9edf3fedb1 100644 --- a/audio/audacity/README +++ b/audio/audacity/README @@ -5,9 +5,12 @@ digital recordings, edit Ogg, MP3, and WAV sound files, and much more. Optional dependencies (autodetected) are jack, ladspa_sdk, soundtouch, twolame, vamp-plugin-sdk and vst3sdk. -The manual is packaged with the application only if you pass the script -the additional option +The offline html manual will be packaged with the application and put +in the /usr/doc/audacity-* directory only if you pass the script the +additional option MANUAL=yes +From the application you will be able only to access the online manual +with the default browser when selecting manual from the menu. NOTE: for audacity to build/run wxWidgets needs to be built with support for gtk+3 (it won't work if you build it against qt). diff --git a/audio/audacity/audacity.SlackBuild b/audio/audacity/audacity.SlackBuild index ddaee0e1a0..488b455298 100644 --- a/audio/audacity/audacity.SlackBuild +++ b/audio/audacity/audacity.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for audacity # Copyright 2006-2010 Chess Griffin <chess@chessgriffin.com> -# Copyright 2011-2023 Matteo Bernardini <ponce@slackbuilds.org> +# Copyright 2011-2024 Matteo Bernardini <ponce@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -34,8 +34,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=audacity -VERSION=${VERSION:-3.4.2} -MANVER=${MANVER:-3.4.2} +VERSION=${VERSION:-3.5.1} +MANVER=${MANVER:-3.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -94,6 +94,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i 's|^#include "allegro.h"|#include "portsmf/allegro.h"|' libraries/lib-note-track/WrapAllegro.h + mkdir -p build cd build cmake \ @@ -155,14 +157,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION rm -fr $PKG/usr/share/doc cp LICENSE.* README.* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -# Before changing the version just check the path inside of the zip: -# the index file must be located to /usr/share/audacity/help/manual/index.html if [ "${MANUAL:-no}" = "yes" ]; then - mkdir -p $PKG/usr/share/$PRGNAM/help - cd $PKG/usr/share/$PRGNAM/help - unzip $CWD/$PRGNAM-manual-$VERSION.zip - mv $PRGNAM-manual-$VERSION manual + ( cd $PKG/usr/doc/$PRGNAM-$VERSION + tar xf $CWD/$PRGNAM-manual-$VERSION.tar.gz + chown -R root:root help ) fi mkdir -p $PKG/install diff --git a/audio/audacity/audacity.info b/audio/audacity/audacity.info index 407e0201a9..e958eb685d 100644 --- a/audio/audacity/audacity.info +++ b/audio/audacity/audacity.info @@ -1,10 +1,10 @@ PRGNAM="audacity" -VERSION="3.4.2" +VERSION="3.5.1" HOMEPAGE="https://www.audacityteam.org" -DOWNLOAD="https://github.com/audacity/audacity/releases/download/Audacity-3.4.2/audacity-sources-3.4.2.tar.gz \ - https://github.com/audacity/audacity/releases/download/Audacity-3.4.2/audacity-manual-3.4.2.zip" -MD5SUM="f8f96e980b5a880e5be4cd066662b290 \ - fba06b370931a6f0b1a69f5e8a922ab5" +DOWNLOAD="https://github.com/audacity/audacity/releases/download/Audacity-3.5.1/audacity-sources-3.5.1.tar.gz \ + https://github.com/audacity/audacity/releases/download/Audacity-3.5.1/audacity-manual-3.5.1.tar.gz" +MD5SUM="42d866855b2563dc0ec50b9c38476a0d \ + 237e90933f6367311dcc81a5dd53d075" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libsbsms lilv portaudio portmidi portsmf rapidjson soxr suil wxWidgets" diff --git a/audio/cmus/README b/audio/cmus/README index c804621b44..f5f7c1eb0c 100644 --- a/audio/cmus/README +++ b/audio/cmus/README @@ -4,4 +4,4 @@ cmus is a small and fast text mode music player for Linux and many other UNIX like operating systems. Optional dependencies (autodetected) are musepack-tools, faad2, -libmp4v2. +jack and libmp4v2. diff --git a/audio/cmus/cmus.SlackBuild b/audio/cmus/cmus.SlackBuild index 41e8195a1a..43223d2cfc 100644 --- a/audio/cmus/cmus.SlackBuild +++ b/audio/cmus/cmus.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for cmus # Copyright (c) 2008-2010, Antonio Hernández Blas <hba.nihilismus@gmail.com> -# Copyright 2013-2022, Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2024, Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cmus -VERSION=${VERSION:-2.10.0} +VERSION=${VERSION:-2.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/audio/cmus/cmus.info b/audio/cmus/cmus.info index 38db697f26..bcf98c0e8a 100644 --- a/audio/cmus/cmus.info +++ b/audio/cmus/cmus.info @@ -1,8 +1,8 @@ PRGNAM="cmus" -VERSION="2.10.0" +VERSION="2.11.0" HOMEPAGE="https://cmus.github.io" -DOWNLOAD="https://github.com/cmus/cmus/archive/v2.10.0/cmus-2.10.0.tar.gz" -MD5SUM="299c09a91024bc81418353743943bfae" +DOWNLOAD="https://github.com/cmus/cmus/archive/v2.11.0/cmus-2.11.0.tar.gz" +MD5SUM="6c4137c6994d26f95a3bceff4fc17047" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/audio/deadbeef/deadbeef.SlackBuild b/audio/deadbeef/deadbeef.SlackBuild index 544b0cf46e..b920c057ce 100644 --- a/audio/deadbeef/deadbeef.SlackBuild +++ b/audio/deadbeef/deadbeef.SlackBuild @@ -101,6 +101,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-shared \ --disable-gtk2 \ + --disable-adplug \ --build=$ARCH-slackware-linux make V=1 diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild index f55fb75477..eadb51e8cd 100644 --- a/audio/guitarix/guitarix.SlackBuild +++ b/audio/guitarix/guitarix.SlackBuild @@ -89,6 +89,8 @@ if [ "${LV2:-yes}" = "no" ]; then LV2OPT=--no-lv2 fi +for i in $CWD/patches/*; do patch -p2 < $i ; done + # grrr, -DNDEBUG doesn't get added to the flags automatically... LIBDIR="/usr/lib${LIBDIRSUFFIX}" ./waf configure \ diff --git a/audio/guitarix/patches/always_inline.patch b/audio/guitarix/patches/always_inline.patch new file mode 100644 index 0000000000..940649f11c --- /dev/null +++ b/audio/guitarix/patches/always_inline.patch @@ -0,0 +1,22 @@ +diff --git a/trunk/src/ladspa/ladspa_guitarix.cpp b/trunk/src/ladspa/ladspa_guitarix.cpp +index 1fccffb3..85c3a766 100644 +--- a/trunk/src/ladspa/ladspa_guitarix.cpp ++++ b/trunk/src/ladspa/ladspa_guitarix.cpp +@@ -16,8 +16,6 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#define always_inline inline __attribute__((always_inline)) +- + #include <stdlib.h> + #include <string.h> + #include <ladspa.h> +@@ -34,6 +32,8 @@ + #include "gx_faust_plugins.h" + #include "../plugins/pluginlib.h" + ++#define always_inline inline __attribute__((always_inline)) ++ + #include "faust/gx_ampout_ladspa.cc" + #include "faust/gx_outputlevel_ladspa.cc" + diff --git a/audio/guitarix/patches/gcc-13.patch b/audio/guitarix/patches/gcc-13.patch new file mode 100644 index 0000000000..90681810b1 --- /dev/null +++ b/audio/guitarix/patches/gcc-13.patch @@ -0,0 +1,12 @@ +diff --git a/trunk/src/LV2/DSP/gx_common.h b/trunk/src/LV2/DSP/gx_common.h +index 71108442..ea230e34 100644 +--- a/trunk/src/LV2/DSP/gx_common.h ++++ b/trunk/src/LV2/DSP/gx_common.h +@@ -28,6 +28,7 @@ + #include <iostream> + #include <cstring> + #include <unistd.h> ++#include <cstdint> + + ///////////////////////// DENORMAL PROTECTION WITH SSE ///////////////// + diff --git a/audio/lxmusic/0001-Use-themed-icon.patch b/audio/lxmusic/0001-Use-themed-icon.patch new file mode 100644 index 0000000000..c94db18874 --- /dev/null +++ b/audio/lxmusic/0001-Use-themed-icon.patch @@ -0,0 +1,49 @@ +From f4c172d9c61700aa1f26ccaa154aa0d66093bb8f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com> +Date: Sun, 2 May 2021 13:50:30 +0200 +Subject: [PATCH] Use themed icon + +Also put the icon under the hicolor icon hierarchy. +--- + data/Makefile.am | 2 +- + src/lxmusic.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/Makefile.am b/data/Makefile.am +index c7679de..f612733 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -4,7 +4,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + desktopdir=$(datadir)/applications + + icon_DATA=lxmusic.png +-icondir=$(datadir)/pixmaps ++icondir=$(datadir)/icons/hicolor/128x128/apps + + man_MANS = lxmusic.1 + +diff --git a/src/lxmusic.c b/src/lxmusic.c +index 60efc61..5e55aa4 100644 +--- a/src/lxmusic.c ++++ b/src/lxmusic.c +@@ -265,7 +265,7 @@ void on_about(GtkWidget* mi, gpointer data) + + about = gtk_about_dialog_new(); + gtk_about_dialog_set_program_name( (GtkAboutDialog*)about, "LXMusic" ); +- gtk_about_dialog_set_logo((GtkAboutDialog*)about, gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR"/pixmaps/lxmusic.png", NULL)); ++ gtk_about_dialog_set_logo_icon_name((GtkAboutDialog*)about, "lxmusic"); + gtk_about_dialog_set_version( (GtkAboutDialog*)about, VERSION ); + gtk_about_dialog_set_authors( (GtkAboutDialog*)about, authors ); + gtk_about_dialog_set_artists( (GtkAboutDialog*)about, artists ); +@@ -2395,7 +2395,7 @@ static void setup_ui() + gtk_builder_connect_signals(builder, NULL); + + /* window icon */ +- gtk_window_set_icon_from_file(GTK_WINDOW(main_win), PACKAGE_DATA_DIR"/pixmaps/lxmusic.png", NULL ); ++ gtk_window_set_icon_name(GTK_WINDOW(main_win), "lxmusic"); + + gtk_window_set_default_size(GTK_WINDOW(main_win), win_width, win_height); + /* this can trigger signal handler and show or hide the playlist. */ +-- +2.31.1 + diff --git a/audio/lxmusic/README b/audio/lxmusic/README index 7173dd227a..25bb3cf063 100644 --- a/audio/lxmusic/README +++ b/audio/lxmusic/README @@ -3,3 +3,7 @@ lxmusic (minimalist music player for LXDE) LXMusic is based on xmms2, which is lightweight and has server/client design. LXMusic has very few features, it can do nothing more than just playing a list of music files. + +if you want to build this for gtk+2 pass to the script the switch + + GTK3=no diff --git a/audio/lxmusic/lxmusic.SlackBuild b/audio/lxmusic/lxmusic.SlackBuild index c888d1f44b..80e0e10aca 100644 --- a/audio/lxmusic/lxmusic.SlackBuild +++ b/audio/lxmusic/lxmusic.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxmusic VERSION=${VERSION:-0.4.7} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -67,6 +67,8 @@ else LIBDIRSUFFIX="" fi +WITHGTK3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && WITHGTK3="" + set -e rm -rf $PKG @@ -82,7 +84,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -sh autogen.sh || true +patch -p1 < $CWD/0001-Use-themed-icon.patch + +autoreconf -fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -93,17 +97,19 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --mandir=/usr/man \ + $WITHGTK3 \ --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG +install -m 0644 -D $CWD/$PRGNAM.appdata.xml $PKG/usr/share/metainfo/$PRGNAM.appdata.xml + find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION || true +cp -a COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION || true cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/audio/lxmusic/lxmusic.appdata.xml b/audio/lxmusic/lxmusic.appdata.xml new file mode 100644 index 0000000000..e61040536a --- /dev/null +++ b/audio/lxmusic/lxmusic.appdata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop-application"> + <id>org.lxde.lxmusic</id> + <launchable type="desktop-id">lxmusic.desktop</launchable> + <name>LXMusic</name> + <summary>Play your music files easily</summary> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0</project_license> + <developer_name>LXDE team</developer_name> + <description> + <p>LXMusic is the minimalist music player for LXDE. It is a graphical user interface (GUI) for the audio player xmms2, which is lightweight and incorporates a server/client design. LXMusic is simple to operate: the user can build multiple playlists of audio files (and xmms2-supported audio streams), and LXMusic plays a selected playlist. A wide variety of audio formats can be played by LXMusic by installing the appropriate xmms2 plugins.</p> + </description> + <screenshots> + <screenshot type="default"> + <image>https://wiki.lxde.org/en/images/7/73/LXSMusic.png</image> + </screenshot> + </screenshots> + <url type="bugtracker">https://sourceforge.net/p/lxde/bugs/search/?q=labels:lxmusic</url> + <url type="homepage">https://www.lxde.org/</url> + <translation type="gettext">lxmusic</translation> +</component> diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild index 05d95e62b7..e30a7a4e1d 100644 --- a/audio/mixxx/mixxx.SlackBuild +++ b/audio/mixxx/mixxx.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for mixxx # Copyright 2011 Elvio "HelLViS69" Basello <hellvis69@gmail.com> -# Copyright 2018-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2018-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mixxx -VERSION=${VERSION:-2.3.6} +VERSION=${VERSION:-2.4.0} KEYFVER=${KEYFVER:-2.2.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -91,7 +91,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release .. + -DCMAKE_BUILD_TYPE=Release -W no-dev .. make make install DESTDIR=$PKG cd .. diff --git a/audio/mixxx/mixxx.info b/audio/mixxx/mixxx.info index cde9885a16..2480fb1032 100644 --- a/audio/mixxx/mixxx.info +++ b/audio/mixxx/mixxx.info @@ -1,12 +1,12 @@ PRGNAM="mixxx" -VERSION="2.3.6" +VERSION="2.4.0" HOMEPAGE="https://www.mixxx.org" -DOWNLOAD="https://github.com/mixxxdj/mixxx/archive/2.3.6/mixxx-2.3.6.tar.gz \ +DOWNLOAD="https://github.com/mixxxdj/mixxx/archive/2.4.0/mixxx-2.4.0.tar.gz \ https://github.com/mixxxdj/libkeyfinder/archive/v2.2.6/libkeyfinder-2.2.6.zip" -MD5SUM="4a8e6aa35bec7240a02f27afa65754d5 \ +MD5SUM="441718dbdf47df91a353c73dd67737f6 \ 8a6f2a59265aa16fbbd532b83fa45541" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="chromaprint faad2 hidapi libmodplug libmp4v2 libshout lilv opencore-amr portaudio portmidi protobuf3 rubberband" +REQUIRES="chromaprint faad2 googlebenchmark hidapi libmodplug libmp4v2 libshout lilv microsoft-gsl opencore-amr portaudio portmidi protobuf3 rubberband" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/audio/musepack-tools/musepack-tools.SlackBuild b/audio/musepack-tools/musepack-tools.SlackBuild index 06f77c23ee..46c11ba3e8 100644 --- a/audio/musepack-tools/musepack-tools.SlackBuild +++ b/audio/musepack-tools/musepack-tools.SlackBuild @@ -69,7 +69,7 @@ patch -p1 < $CWD/musepack-tools-465-fno-common.patch mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -Wno-error=incompatible-pointer-types" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/audio/ncspot/ncspot-misc-1.1.0.tar b/audio/ncspot/ncspot-misc-1.1.1.tar Binary files differindex a441111696..42122ef0a6 100644 --- a/audio/ncspot/ncspot-misc-1.1.0.tar +++ b/audio/ncspot/ncspot-misc-1.1.1.tar diff --git a/audio/ncspot/ncspot.SlackBuild b/audio/ncspot/ncspot.SlackBuild index 40d7d93c19..d516a05cef 100644 --- a/audio/ncspot/ncspot.SlackBuild +++ b/audio/ncspot/ncspot.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ncspot -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/audio/ncspot/ncspot.info b/audio/ncspot/ncspot.info index 343da387fa..b0446652fb 100644 --- a/audio/ncspot/ncspot.info +++ b/audio/ncspot/ncspot.info @@ -1,7 +1,7 @@ PRGNAM="ncspot" -VERSION="1.1.0" +VERSION="1.1.1" HOMEPAGE="https://github.com/hrkfdn/ncspot" -DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.0/ncspot-1.1.0.tar.gz \ +DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.1/ncspot-1.1.1.tar.gz \ https://static.crates.io/crates/addr2line/addr2line-0.21.0.crate \ https://static.crates.io/crates/adler/adler-1.0.2.crate \ https://static.crates.io/crates/aes/aes-0.6.0.crate \ @@ -9,72 +9,68 @@ DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.0/ncspot-1.1.0.tar.gz \ https://static.crates.io/crates/aes-soft/aes-soft-0.6.4.crate \ https://static.crates.io/crates/aesni/aesni-0.10.0.crate \ https://static.crates.io/crates/ahash/ahash-0.8.11.crate \ - https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.2.crate \ + https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.3.crate \ https://static.crates.io/crates/alsa/alsa-0.6.0.crate \ https://static.crates.io/crates/alsa-sys/alsa-sys-0.3.1.crate \ https://static.crates.io/crates/android-tzdata/android-tzdata-0.1.1.crate \ https://static.crates.io/crates/android_system_properties/android_system_properties-0.1.5.crate \ - https://static.crates.io/crates/anstream/anstream-0.6.13.crate \ - https://static.crates.io/crates/anstyle/anstyle-1.0.6.crate \ - https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.3.crate \ - https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.2.crate \ - https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.2.crate \ - https://static.crates.io/crates/arboard/arboard-3.3.2.crate \ - https://static.crates.io/crates/async-broadcast/async-broadcast-0.5.1.crate \ + https://static.crates.io/crates/anstream/anstream-0.6.14.crate \ + https://static.crates.io/crates/anstyle/anstyle-1.0.7.crate \ + https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.4.crate \ + https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.3.crate \ + https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.3.crate \ + https://static.crates.io/crates/arboard/arboard-3.4.0.crate \ https://static.crates.io/crates/async-broadcast/async-broadcast-0.7.0.crate \ - https://static.crates.io/crates/async-channel/async-channel-2.2.0.crate \ - https://static.crates.io/crates/async-executor/async-executor-1.8.0.crate \ - https://static.crates.io/crates/async-fs/async-fs-1.6.0.crate \ - https://static.crates.io/crates/async-io/async-io-1.13.0.crate \ - https://static.crates.io/crates/async-io/async-io-2.3.1.crate \ - https://static.crates.io/crates/async-lock/async-lock-2.8.0.crate \ + https://static.crates.io/crates/async-channel/async-channel-2.2.1.crate \ + https://static.crates.io/crates/async-executor/async-executor-1.11.0.crate \ + https://static.crates.io/crates/async-fs/async-fs-2.1.2.crate \ + https://static.crates.io/crates/async-io/async-io-2.3.2.crate \ https://static.crates.io/crates/async-lock/async-lock-3.3.0.crate \ - https://static.crates.io/crates/async-process/async-process-1.8.1.crate \ - https://static.crates.io/crates/async-process/async-process-2.1.0.crate \ - https://static.crates.io/crates/async-recursion/async-recursion-1.0.5.crate \ - https://static.crates.io/crates/async-signal/async-signal-0.2.5.crate \ - https://static.crates.io/crates/async-task/async-task-4.7.0.crate \ - https://static.crates.io/crates/async-trait/async-trait-0.1.77.crate \ + https://static.crates.io/crates/async-process/async-process-2.2.2.crate \ + https://static.crates.io/crates/async-recursion/async-recursion-1.1.1.crate \ + https://static.crates.io/crates/async-signal/async-signal-0.2.6.crate \ + https://static.crates.io/crates/async-task/async-task-4.7.1.crate \ + https://static.crates.io/crates/async-trait/async-trait-0.1.80.crate \ https://static.crates.io/crates/atomic-waker/atomic-waker-1.1.2.crate \ - https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \ - https://static.crates.io/crates/backtrace/backtrace-0.3.69.crate \ + https://static.crates.io/crates/autocfg/autocfg-1.3.0.crate \ + https://static.crates.io/crates/backtrace/backtrace-0.3.71.crate \ https://static.crates.io/crates/base64/base64-0.13.1.crate \ https://static.crates.io/crates/base64/base64-0.21.7.crate \ + https://static.crates.io/crates/base64/base64-0.22.1.crate \ https://static.crates.io/crates/bindgen/bindgen-0.69.4.crate \ https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \ - https://static.crates.io/crates/bitflags/bitflags-2.4.2.crate \ + https://static.crates.io/crates/bitflags/bitflags-2.5.0.crate \ https://static.crates.io/crates/block/block-0.1.6.crate \ https://static.crates.io/crates/block-buffer/block-buffer-0.9.0.crate \ https://static.crates.io/crates/block-buffer/block-buffer-0.10.4.crate \ - https://static.crates.io/crates/blocking/blocking-1.5.1.crate \ - https://static.crates.io/crates/bumpalo/bumpalo-3.15.3.crate \ - https://static.crates.io/crates/bytecount/bytecount-0.6.7.crate \ - https://static.crates.io/crates/bytemuck/bytemuck-1.14.3.crate \ + https://static.crates.io/crates/block2/block2-0.5.0.crate \ + https://static.crates.io/crates/blocking/blocking-1.6.0.crate \ + https://static.crates.io/crates/bumpalo/bumpalo-3.16.0.crate \ + https://static.crates.io/crates/bytemuck/bytemuck-1.15.0.crate \ https://static.crates.io/crates/byteorder/byteorder-1.5.0.crate \ - https://static.crates.io/crates/bytes/bytes-1.5.0.crate \ - https://static.crates.io/crates/cc/cc-1.0.89.crate \ + https://static.crates.io/crates/bytes/bytes-1.6.0.crate \ + https://static.crates.io/crates/cc/cc-1.0.97.crate \ https://static.crates.io/crates/cesu8/cesu8-1.1.0.crate \ https://static.crates.io/crates/cexpr/cexpr-0.6.0.crate \ https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \ https://static.crates.io/crates/cfg_aliases/cfg_aliases-0.1.1.crate \ - https://static.crates.io/crates/chrono/chrono-0.4.34.crate \ + https://static.crates.io/crates/chrono/chrono-0.4.38.crate \ https://static.crates.io/crates/cipher/cipher-0.2.5.crate \ https://static.crates.io/crates/clang-sys/clang-sys-1.7.0.crate \ - https://static.crates.io/crates/clap/clap-4.5.1.crate \ - https://static.crates.io/crates/clap_builder/clap_builder-4.5.1.crate \ - https://static.crates.io/crates/clap_complete/clap_complete-4.5.1.crate \ + https://static.crates.io/crates/clap/clap-4.5.4.crate \ + https://static.crates.io/crates/clap_builder/clap_builder-4.5.2.crate \ + https://static.crates.io/crates/clap_complete/clap_complete-4.5.2.crate \ https://static.crates.io/crates/clap_lex/clap_lex-0.7.0.crate \ https://static.crates.io/crates/clap_mangen/clap_mangen-0.2.20.crate \ - https://static.crates.io/crates/clipboard-win/clipboard-win-5.2.0.crate \ - https://static.crates.io/crates/color_quant/color_quant-1.1.0.crate \ - https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \ - https://static.crates.io/crates/combine/combine-4.6.6.crate \ - https://static.crates.io/crates/concurrent-queue/concurrent-queue-2.4.0.crate \ - https://static.crates.io/crates/cookie/cookie-0.17.0.crate \ - https://static.crates.io/crates/cookie_store/cookie_store-0.20.0.crate \ + https://static.crates.io/crates/clipboard-win/clipboard-win-5.3.1.crate \ + https://static.crates.io/crates/colorchoice/colorchoice-1.0.1.crate \ + https://static.crates.io/crates/combine/combine-4.6.7.crate \ + https://static.crates.io/crates/concurrent-queue/concurrent-queue-2.5.0.crate \ + https://static.crates.io/crates/cookie/cookie-0.18.1.crate \ + https://static.crates.io/crates/cookie_store/cookie_store-0.21.0.crate \ https://static.crates.io/crates/core-foundation/core-foundation-0.9.4.crate \ https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.6.crate \ - https://static.crates.io/crates/core-graphics/core-graphics-0.23.1.crate \ + https://static.crates.io/crates/core-graphics/core-graphics-0.23.2.crate \ https://static.crates.io/crates/core-graphics-types/core-graphics-types-0.1.3.crate \ https://static.crates.io/crates/coreaudio-rs/coreaudio-rs-0.10.0.crate \ https://static.crates.io/crates/coreaudio-sys/coreaudio-sys-0.2.15.crate \ @@ -98,40 +94,36 @@ DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.0/ncspot-1.1.0.tar.gz \ https://static.crates.io/crates/darling_macro/darling_macro-0.13.4.crate \ https://static.crates.io/crates/darling_macro/darling_macro-0.20.8.crate \ https://static.crates.io/crates/deranged/deranged-0.3.11.crate \ - https://static.crates.io/crates/derivative/derivative-2.2.0.crate \ - https://static.crates.io/crates/derive-new/derive-new-0.5.9.crate \ + https://static.crates.io/crates/derive-new/derive-new-0.6.0.crate \ https://static.crates.io/crates/digest/digest-0.9.0.crate \ https://static.crates.io/crates/digest/digest-0.10.7.crate \ https://static.crates.io/crates/dirs-next/dirs-next-1.0.2.crate \ https://static.crates.io/crates/dirs-next/dirs-next-2.0.0.crate \ https://static.crates.io/crates/dirs-sys-next/dirs-sys-next-0.1.2.crate \ https://static.crates.io/crates/dlib/dlib-0.5.2.crate \ - https://static.crates.io/crates/downcast-rs/downcast-rs-1.2.0.crate \ - https://static.crates.io/crates/either/either-1.10.0.crate \ - https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.33.crate \ + https://static.crates.io/crates/downcast-rs/downcast-rs-1.2.1.crate \ + https://static.crates.io/crates/either/either-1.11.0.crate \ + https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.34.crate \ https://static.crates.io/crates/endi/endi-1.1.0.crate \ https://static.crates.io/crates/enum-map/enum-map-2.7.3.crate \ https://static.crates.io/crates/enum-map-derive/enum-map-derive-0.17.0.crate \ - https://static.crates.io/crates/enum_dispatch/enum_dispatch-0.3.12.crate \ + https://static.crates.io/crates/enum_dispatch/enum_dispatch-0.3.13.crate \ https://static.crates.io/crates/enumflags2/enumflags2-0.7.9.crate \ https://static.crates.io/crates/enumflags2_derive/enumflags2_derive-0.7.9.crate \ https://static.crates.io/crates/enumset/enumset-1.1.3.crate \ https://static.crates.io/crates/enumset_derive/enumset_derive-0.8.1.crate \ https://static.crates.io/crates/equivalent/equivalent-1.0.1.crate \ - https://static.crates.io/crates/errno/errno-0.3.8.crate \ + https://static.crates.io/crates/errno/errno-0.3.9.crate \ https://static.crates.io/crates/error-code/error-code-3.2.0.crate \ - https://static.crates.io/crates/event-listener/event-listener-2.5.3.crate \ - https://static.crates.io/crates/event-listener/event-listener-3.1.0.crate \ https://static.crates.io/crates/event-listener/event-listener-4.0.3.crate \ - https://static.crates.io/crates/event-listener/event-listener-5.2.0.crate \ + https://static.crates.io/crates/event-listener/event-listener-5.3.0.crate \ https://static.crates.io/crates/event-listener-strategy/event-listener-strategy-0.4.0.crate \ - https://static.crates.io/crates/event-listener-strategy/event-listener-strategy-0.5.0.crate \ - https://static.crates.io/crates/fastrand/fastrand-1.9.0.crate \ - https://static.crates.io/crates/fastrand/fastrand-2.0.1.crate \ + https://static.crates.io/crates/event-listener-strategy/event-listener-strategy-0.5.2.crate \ + https://static.crates.io/crates/fastrand/fastrand-2.1.0.crate \ https://static.crates.io/crates/fdeflate/fdeflate-0.3.4.crate \ https://static.crates.io/crates/fern/fern-0.6.2.crate \ https://static.crates.io/crates/fixedbitset/fixedbitset-0.4.2.crate \ - https://static.crates.io/crates/flate2/flate2-1.0.28.crate \ + https://static.crates.io/crates/flate2/flate2-1.0.30.crate \ https://static.crates.io/crates/fnv/fnv-1.0.7.crate \ https://static.crates.io/crates/foreign-types/foreign-types-0.3.2.crate \ https://static.crates.io/crates/foreign-types/foreign-types-0.5.0.crate \ @@ -144,82 +136,84 @@ DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.0/ncspot-1.1.0.tar.gz \ https://static.crates.io/crates/futures-core/futures-core-0.3.30.crate \ https://static.crates.io/crates/futures-executor/futures-executor-0.3.30.crate \ https://static.crates.io/crates/futures-io/futures-io-0.3.30.crate \ - https://static.crates.io/crates/futures-lite/futures-lite-1.13.0.crate \ - https://static.crates.io/crates/futures-lite/futures-lite-2.2.0.crate \ + https://static.crates.io/crates/futures-lite/futures-lite-2.3.0.crate \ https://static.crates.io/crates/futures-macro/futures-macro-0.3.30.crate \ https://static.crates.io/crates/futures-sink/futures-sink-0.3.30.crate \ https://static.crates.io/crates/futures-task/futures-task-0.3.30.crate \ https://static.crates.io/crates/futures-util/futures-util-0.3.30.crate \ https://static.crates.io/crates/generic-array/generic-array-0.14.7.crate \ https://static.crates.io/crates/gethostname/gethostname-0.4.3.crate \ - https://static.crates.io/crates/getrandom/getrandom-0.2.12.crate \ + https://static.crates.io/crates/getrandom/getrandom-0.2.15.crate \ https://static.crates.io/crates/gimli/gimli-0.28.1.crate \ https://static.crates.io/crates/glob/glob-0.3.1.crate \ - https://static.crates.io/crates/h2/h2-0.3.24.crate \ + https://static.crates.io/crates/h2/h2-0.4.4.crate \ https://static.crates.io/crates/half/half-1.8.3.crate \ https://static.crates.io/crates/hashbrown/hashbrown-0.12.3.crate \ - https://static.crates.io/crates/hashbrown/hashbrown-0.14.3.crate \ + https://static.crates.io/crates/hashbrown/hashbrown-0.14.5.crate \ https://static.crates.io/crates/headers/headers-0.3.9.crate \ https://static.crates.io/crates/headers-core/headers-core-0.2.0.crate \ https://static.crates.io/crates/heck/heck-0.4.1.crate \ https://static.crates.io/crates/hermit-abi/hermit-abi-0.3.9.crate \ https://static.crates.io/crates/hex/hex-0.4.3.crate \ https://static.crates.io/crates/hmac/hmac-0.11.0.crate \ + https://static.crates.io/crates/home/home-0.5.9.crate \ https://static.crates.io/crates/http/http-0.2.12.crate \ + https://static.crates.io/crates/http/http-1.1.0.crate \ https://static.crates.io/crates/http-body/http-body-0.4.6.crate \ + https://static.crates.io/crates/http-body/http-body-1.0.0.crate \ + https://static.crates.io/crates/http-body-util/http-body-util-0.1.1.crate \ https://static.crates.io/crates/httparse/httparse-1.8.0.crate \ https://static.crates.io/crates/httpdate/httpdate-1.0.3.crate \ https://static.crates.io/crates/hyper/hyper-0.14.28.crate \ + https://static.crates.io/crates/hyper/hyper-1.3.1.crate \ https://static.crates.io/crates/hyper-proxy/hyper-proxy-0.9.1.crate \ - https://static.crates.io/crates/hyper-tls/hyper-tls-0.5.0.crate \ + https://static.crates.io/crates/hyper-tls/hyper-tls-0.6.0.crate \ + https://static.crates.io/crates/hyper-util/hyper-util-0.1.3.crate \ https://static.crates.io/crates/iana-time-zone/iana-time-zone-0.1.60.crate \ https://static.crates.io/crates/iana-time-zone-haiku/iana-time-zone-haiku-0.1.2.crate \ https://static.crates.io/crates/ident_case/ident_case-1.0.1.crate \ - https://static.crates.io/crates/idna/idna-0.3.0.crate \ https://static.crates.io/crates/idna/idna-0.5.0.crate \ - https://static.crates.io/crates/image/image-0.24.9.crate \ + https://static.crates.io/crates/image/image-0.25.1.crate \ https://static.crates.io/crates/indexmap/indexmap-1.9.3.crate \ - https://static.crates.io/crates/indexmap/indexmap-2.2.5.crate \ + https://static.crates.io/crates/indexmap/indexmap-2.2.6.crate \ https://static.crates.io/crates/instant/instant-0.1.12.crate \ - https://static.crates.io/crates/io-lifetimes/io-lifetimes-1.0.11.crate \ https://static.crates.io/crates/ioctl-rs/ioctl-rs-0.2.0.crate \ https://static.crates.io/crates/ipnet/ipnet-2.9.0.crate \ + https://static.crates.io/crates/is_terminal_polyfill/is_terminal_polyfill-1.70.0.crate \ https://static.crates.io/crates/itertools/itertools-0.12.1.crate \ - https://static.crates.io/crates/itoa/itoa-1.0.10.crate \ + https://static.crates.io/crates/itoa/itoa-1.0.11.crate \ https://static.crates.io/crates/jni/jni-0.19.0.crate \ https://static.crates.io/crates/jni-sys/jni-sys-0.3.0.crate \ - https://static.crates.io/crates/jobserver/jobserver-0.1.28.crate \ + https://static.crates.io/crates/jobserver/jobserver-0.1.31.crate \ https://static.crates.io/crates/jpeg-decoder/jpeg-decoder-0.3.1.crate \ https://static.crates.io/crates/js-sys/js-sys-0.3.69.crate \ https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \ https://static.crates.io/crates/lazycell/lazycell-1.3.0.crate \ https://static.crates.io/crates/lewton/lewton-0.10.2.crate \ - https://static.crates.io/crates/libc/libc-0.2.153.crate \ - https://static.crates.io/crates/libloading/libloading-0.8.2.crate \ + https://static.crates.io/crates/libc/libc-0.2.154.crate \ + https://static.crates.io/crates/libloading/libloading-0.8.3.crate \ https://static.crates.io/crates/libm/libm-0.2.8.crate \ https://static.crates.io/crates/libpulse-binding/libpulse-binding-2.28.1.crate \ https://static.crates.io/crates/libpulse-simple-binding/libpulse-simple-binding-2.28.1.crate \ https://static.crates.io/crates/libpulse-simple-sys/libpulse-simple-sys-1.21.1.crate \ https://static.crates.io/crates/libpulse-sys/libpulse-sys-1.21.0.crate \ - https://static.crates.io/crates/libredox/libredox-0.0.1.crate \ + https://static.crates.io/crates/libredox/libredox-0.1.3.crate \ https://static.crates.io/crates/librespot-audio/librespot-audio-0.4.2.crate \ https://static.crates.io/crates/librespot-core/librespot-core-0.4.2.crate \ https://static.crates.io/crates/librespot-metadata/librespot-metadata-0.4.2.crate \ https://static.crates.io/crates/librespot-playback/librespot-playback-0.4.2.crate \ https://static.crates.io/crates/librespot-protocol/librespot-protocol-0.4.2.crate \ - https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.3.8.crate \ https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.13.crate \ - https://static.crates.io/crates/lock_api/lock_api-0.4.11.crate \ + https://static.crates.io/crates/lock_api/lock_api-0.4.12.crate \ https://static.crates.io/crates/log/log-0.4.21.crate \ https://static.crates.io/crates/mac-notification-sys/mac-notification-sys-0.6.1.crate \ https://static.crates.io/crates/mach/mach-0.3.2.crate \ https://static.crates.io/crates/malloc_buf/malloc_buf-0.0.6.crate \ https://static.crates.io/crates/maplit/maplit-1.0.2.crate \ https://static.crates.io/crates/maybe-async/maybe-async-0.2.10.crate \ - https://static.crates.io/crates/memchr/memchr-2.7.1.crate \ + https://static.crates.io/crates/memchr/memchr-2.7.2.crate \ https://static.crates.io/crates/memoffset/memoffset-0.6.5.crate \ - https://static.crates.io/crates/memoffset/memoffset-0.7.1.crate \ - https://static.crates.io/crates/memoffset/memoffset-0.9.0.crate \ + https://static.crates.io/crates/memoffset/memoffset-0.9.1.crate \ https://static.crates.io/crates/mime/mime-0.3.17.crate \ https://static.crates.io/crates/minimal-lexical/minimal-lexical-0.2.1.crate \ https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.2.crate \ @@ -232,23 +226,22 @@ DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.0/ncspot-1.1.0.tar.gz \ https://static.crates.io/crates/ndk-macro/ndk-macro-0.3.0.crate \ https://static.crates.io/crates/ndk-sys/ndk-sys-0.3.0.crate \ https://static.crates.io/crates/nix/nix-0.23.2.crate \ - https://static.crates.io/crates/nix/nix-0.26.4.crate \ https://static.crates.io/crates/nix/nix-0.28.0.crate \ https://static.crates.io/crates/nom/nom-7.1.3.crate \ - https://static.crates.io/crates/notify-rust/notify-rust-4.10.0.crate \ + https://static.crates.io/crates/notify-rust/notify-rust-4.11.0.crate \ https://static.crates.io/crates/num/num-0.2.1.crate \ - https://static.crates.io/crates/num/num-0.4.1.crate \ + https://static.crates.io/crates/num/num-0.4.3.crate \ https://static.crates.io/crates/num-bigint/num-bigint-0.2.6.crate \ - https://static.crates.io/crates/num-bigint/num-bigint-0.4.4.crate \ + https://static.crates.io/crates/num-bigint/num-bigint-0.4.5.crate \ https://static.crates.io/crates/num-complex/num-complex-0.2.4.crate \ - https://static.crates.io/crates/num-complex/num-complex-0.4.5.crate \ + https://static.crates.io/crates/num-complex/num-complex-0.4.6.crate \ https://static.crates.io/crates/num-conv/num-conv-0.1.0.crate \ https://static.crates.io/crates/num-derive/num-derive-0.3.3.crate \ https://static.crates.io/crates/num-integer/num-integer-0.1.46.crate \ - https://static.crates.io/crates/num-iter/num-iter-0.1.44.crate \ + https://static.crates.io/crates/num-iter/num-iter-0.1.45.crate \ https://static.crates.io/crates/num-rational/num-rational-0.2.4.crate \ - https://static.crates.io/crates/num-rational/num-rational-0.4.1.crate \ - https://static.crates.io/crates/num-traits/num-traits-0.2.18.crate \ + https://static.crates.io/crates/num-rational/num-rational-0.4.2.crate \ + https://static.crates.io/crates/num-traits/num-traits-0.2.19.crate \ https://static.crates.io/crates/num_cpus/num_cpus-1.16.0.crate \ https://static.crates.io/crates/num_enum/num_enum-0.5.11.crate \ https://static.crates.io/crates/num_enum_derive/num_enum_derive-0.5.11.crate \ @@ -256,6 +249,12 @@ DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.0/ncspot-1.1.0.tar.gz \ https://static.crates.io/crates/numtoa/numtoa-0.1.0.crate \ https://static.crates.io/crates/objc/objc-0.2.7.crate \ https://static.crates.io/crates/objc-foundation/objc-foundation-0.1.1.crate \ + https://static.crates.io/crates/objc-sys/objc-sys-0.3.3.crate \ + https://static.crates.io/crates/objc2/objc2-0.5.1.crate \ + https://static.crates.io/crates/objc2-app-kit/objc2-app-kit-0.2.0.crate \ + https://static.crates.io/crates/objc2-core-data/objc2-core-data-0.2.0.crate \ + https://static.crates.io/crates/objc2-encode/objc2-encode-4.0.1.crate \ + https://static.crates.io/crates/objc2-foundation/objc2-foundation-0.2.0.crate \ https://static.crates.io/crates/objc_id/objc_id-0.1.1.crate \ https://static.crates.io/crates/object/object-0.32.2.crate \ https://static.crates.io/crates/oboe/oboe-0.4.6.crate \ @@ -266,29 +265,30 @@ DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.0/ncspot-1.1.0.tar.gz \ https://static.crates.io/crates/openssl/openssl-0.10.64.crate \ https://static.crates.io/crates/openssl-macros/openssl-macros-0.1.1.crate \ https://static.crates.io/crates/openssl-probe/openssl-probe-0.1.5.crate \ - https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.101.crate \ + https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.102.crate \ https://static.crates.io/crates/ordered-stream/ordered-stream-0.2.0.crate \ https://static.crates.io/crates/os_pipe/os_pipe-1.1.5.crate \ https://static.crates.io/crates/owning_ref/owning_ref-0.4.1.crate \ https://static.crates.io/crates/pancurses/pancurses-0.17.0.crate \ https://static.crates.io/crates/parking/parking-2.2.0.crate \ https://static.crates.io/crates/parking_lot/parking_lot-0.11.2.crate \ - https://static.crates.io/crates/parking_lot/parking_lot-0.12.1.crate \ + https://static.crates.io/crates/parking_lot/parking_lot-0.12.2.crate \ https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.8.6.crate \ - https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.9.crate \ + https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.10.crate \ https://static.crates.io/crates/parse_duration/parse_duration-2.1.1.crate \ https://static.crates.io/crates/pbkdf2/pbkdf2-0.8.0.crate \ https://static.crates.io/crates/pdcurses-sys/pdcurses-sys-0.7.1.crate \ https://static.crates.io/crates/percent-encoding/percent-encoding-2.3.1.crate \ - https://static.crates.io/crates/petgraph/petgraph-0.6.4.crate \ - https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.13.crate \ + https://static.crates.io/crates/petgraph/petgraph-0.6.5.crate \ + https://static.crates.io/crates/pin-project/pin-project-1.1.5.crate \ + https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.1.5.crate \ + https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.14.crate \ https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \ https://static.crates.io/crates/piper/piper-0.2.1.crate \ https://static.crates.io/crates/pkg-config/pkg-config-0.3.30.crate \ https://static.crates.io/crates/platform-dirs/platform-dirs-0.3.0.crate \ https://static.crates.io/crates/png/png-0.17.13.crate \ - https://static.crates.io/crates/polling/polling-2.8.0.crate \ - https://static.crates.io/crates/polling/polling-3.5.0.crate \ + https://static.crates.io/crates/polling/polling-3.7.0.crate \ https://static.crates.io/crates/portaudio-rs/portaudio-rs-0.3.2.crate \ https://static.crates.io/crates/portaudio-sys/portaudio-sys-0.1.1.crate \ https://static.crates.io/crates/powerfmt/powerfmt-0.2.0.crate \ @@ -296,55 +296,50 @@ DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.0/ncspot-1.1.0.tar.gz \ https://static.crates.io/crates/priority-queue/priority-queue-1.4.0.crate \ https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-1.3.1.crate \ https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-3.1.0.crate \ - https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.78.crate \ + https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.82.crate \ https://static.crates.io/crates/protobuf/protobuf-2.28.0.crate \ https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.28.0.crate \ https://static.crates.io/crates/protobuf-codegen-pure/protobuf-codegen-pure-2.28.0.crate \ - https://static.crates.io/crates/quick-xml/quick-xml-0.30.0.crate \ https://static.crates.io/crates/quick-xml/quick-xml-0.31.0.crate \ - https://static.crates.io/crates/quote/quote-1.0.35.crate \ + https://static.crates.io/crates/quote/quote-1.0.36.crate \ https://static.crates.io/crates/rand/rand-0.8.5.crate \ https://static.crates.io/crates/rand_chacha/rand_chacha-0.3.1.crate \ https://static.crates.io/crates/rand_core/rand_core-0.6.4.crate \ https://static.crates.io/crates/rand_distr/rand_distr-0.4.3.crate \ https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.16.crate \ - https://static.crates.io/crates/redox_syscall/redox_syscall-0.4.1.crate \ + https://static.crates.io/crates/redox_syscall/redox_syscall-0.5.1.crate \ https://static.crates.io/crates/redox_termios/redox_termios-0.1.3.crate \ - https://static.crates.io/crates/redox_users/redox_users-0.4.4.crate \ - https://static.crates.io/crates/regex/regex-1.10.3.crate \ + https://static.crates.io/crates/redox_users/redox_users-0.4.5.crate \ + https://static.crates.io/crates/regex/regex-1.10.4.crate \ https://static.crates.io/crates/regex-automata/regex-automata-0.4.6.crate \ - https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \ - https://static.crates.io/crates/reqwest/reqwest-0.11.24.crate \ - https://static.crates.io/crates/ring/ring-0.17.8.crate \ + https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.3.crate \ + https://static.crates.io/crates/reqwest/reqwest-0.12.4.crate \ https://static.crates.io/crates/rodio/rodio-0.15.0.crate \ https://static.crates.io/crates/roff/roff-0.2.1.crate \ - https://static.crates.io/crates/rspotify/rspotify-0.12.0.crate \ - https://static.crates.io/crates/rspotify-http/rspotify-http-0.12.0.crate \ - https://static.crates.io/crates/rspotify-macros/rspotify-macros-0.12.0.crate \ - https://static.crates.io/crates/rspotify-model/rspotify-model-0.12.0.crate \ - https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.23.crate \ + https://static.crates.io/crates/rspotify/rspotify-0.13.1.crate \ + https://static.crates.io/crates/rspotify-http/rspotify-http-0.13.1.crate \ + https://static.crates.io/crates/rspotify-macros/rspotify-macros-0.13.1.crate \ + https://static.crates.io/crates/rspotify-model/rspotify-model-0.13.1.crate \ + https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.24.crate \ https://static.crates.io/crates/rustc-hash/rustc-hash-1.1.0.crate \ https://static.crates.io/crates/rustc_version/rustc_version-0.4.0.crate \ - https://static.crates.io/crates/rustix/rustix-0.37.27.crate \ - https://static.crates.io/crates/rustix/rustix-0.38.31.crate \ - https://static.crates.io/crates/rustls/rustls-0.21.10.crate \ - https://static.crates.io/crates/rustls-pemfile/rustls-pemfile-1.0.4.crate \ - https://static.crates.io/crates/rustls-webpki/rustls-webpki-0.101.7.crate \ - https://static.crates.io/crates/rustversion/rustversion-1.0.14.crate \ - https://static.crates.io/crates/ryu/ryu-1.0.17.crate \ + https://static.crates.io/crates/rustix/rustix-0.38.34.crate \ + https://static.crates.io/crates/rustls-pemfile/rustls-pemfile-2.1.2.crate \ + https://static.crates.io/crates/rustls-pki-types/rustls-pki-types-1.7.0.crate \ + https://static.crates.io/crates/rustversion/rustversion-1.0.16.crate \ + https://static.crates.io/crates/ryu/ryu-1.0.18.crate \ https://static.crates.io/crates/same-file/same-file-1.0.6.crate \ https://static.crates.io/crates/schannel/schannel-0.1.23.crate \ https://static.crates.io/crates/scoped-tls/scoped-tls-1.0.1.crate \ https://static.crates.io/crates/scopeguard/scopeguard-1.2.0.crate \ - https://static.crates.io/crates/sct/sct-0.7.1.crate \ - https://static.crates.io/crates/security-framework/security-framework-2.9.2.crate \ - https://static.crates.io/crates/security-framework-sys/security-framework-sys-2.9.1.crate \ - https://static.crates.io/crates/semver/semver-1.0.22.crate \ - https://static.crates.io/crates/serde/serde-1.0.197.crate \ + https://static.crates.io/crates/security-framework/security-framework-2.11.0.crate \ + https://static.crates.io/crates/security-framework-sys/security-framework-sys-2.11.0.crate \ + https://static.crates.io/crates/semver/semver-1.0.23.crate \ + https://static.crates.io/crates/serde/serde-1.0.201.crate \ https://static.crates.io/crates/serde_cbor/serde_cbor-0.11.2.crate \ - https://static.crates.io/crates/serde_derive/serde_derive-1.0.197.crate \ - https://static.crates.io/crates/serde_json/serde_json-1.0.114.crate \ - https://static.crates.io/crates/serde_repr/serde_repr-0.1.18.crate \ + https://static.crates.io/crates/serde_derive/serde_derive-1.0.201.crate \ + https://static.crates.io/crates/serde_json/serde_json-1.0.117.crate \ + https://static.crates.io/crates/serde_repr/serde_repr-0.1.19.crate \ https://static.crates.io/crates/serde_spanned/serde_spanned-0.6.5.crate \ https://static.crates.io/crates/serde_urlencoded/serde_urlencoded-0.7.1.crate \ https://static.crates.io/crates/sha-1/sha-1-0.9.8.crate \ @@ -355,56 +350,55 @@ DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.0/ncspot-1.1.0.tar.gz \ https://static.crates.io/crates/shlex/shlex-1.3.0.crate \ https://static.crates.io/crates/signal-hook/signal-hook-0.3.17.crate \ https://static.crates.io/crates/signal-hook-mio/signal-hook-mio-0.2.3.crate \ - https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.1.crate \ + https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.2.crate \ https://static.crates.io/crates/simd-adler32/simd-adler32-0.3.7.crate \ https://static.crates.io/crates/slab/slab-0.4.9.crate \ - https://static.crates.io/crates/smallvec/smallvec-1.13.1.crate \ - https://static.crates.io/crates/socket2/socket2-0.4.10.crate \ - https://static.crates.io/crates/socket2/socket2-0.5.6.crate \ - https://static.crates.io/crates/spin/spin-0.9.8.crate \ + https://static.crates.io/crates/smallvec/smallvec-1.13.2.crate \ + https://static.crates.io/crates/socket2/socket2-0.5.7.crate \ + https://static.crates.io/crates/socks/socks-0.3.4.crate \ https://static.crates.io/crates/stable_deref_trait/stable_deref_trait-1.2.0.crate \ https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate \ https://static.crates.io/crates/stdweb/stdweb-0.1.3.crate \ https://static.crates.io/crates/strsim/strsim-0.10.0.crate \ - https://static.crates.io/crates/strsim/strsim-0.11.0.crate \ - https://static.crates.io/crates/strum/strum-0.25.0.crate \ - https://static.crates.io/crates/strum/strum-0.26.1.crate \ - https://static.crates.io/crates/strum_macros/strum_macros-0.25.3.crate \ - https://static.crates.io/crates/strum_macros/strum_macros-0.26.1.crate \ + https://static.crates.io/crates/strsim/strsim-0.11.1.crate \ + https://static.crates.io/crates/strum/strum-0.26.2.crate \ + https://static.crates.io/crates/strum_macros/strum_macros-0.26.2.crate \ https://static.crates.io/crates/subtle/subtle-2.4.1.crate \ https://static.crates.io/crates/syn/syn-1.0.109.crate \ - https://static.crates.io/crates/syn/syn-2.0.52.crate \ + https://static.crates.io/crates/syn/syn-2.0.61.crate \ https://static.crates.io/crates/sync_wrapper/sync_wrapper-0.1.2.crate \ https://static.crates.io/crates/system-configuration/system-configuration-0.5.1.crate \ https://static.crates.io/crates/system-configuration-sys/system-configuration-sys-0.5.0.crate \ - https://static.crates.io/crates/tauri-winrt-notification/tauri-winrt-notification-0.1.3.crate \ + https://static.crates.io/crates/tauri-winrt-notification/tauri-winrt-notification-0.2.1.crate \ https://static.crates.io/crates/tempfile/tempfile-3.10.1.crate \ https://static.crates.io/crates/term_size/term_size-0.3.2.crate \ https://static.crates.io/crates/termion/termion-1.5.6.crate \ - https://static.crates.io/crates/thiserror/thiserror-1.0.57.crate \ - https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.57.crate \ + https://static.crates.io/crates/thiserror/thiserror-1.0.60.crate \ + https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.60.crate \ https://static.crates.io/crates/thread-id/thread-id-4.2.1.crate \ https://static.crates.io/crates/tiff/tiff-0.9.1.crate \ - https://static.crates.io/crates/time/time-0.3.34.crate \ + https://static.crates.io/crates/time/time-0.3.36.crate \ https://static.crates.io/crates/time-core/time-core-0.1.2.crate \ - https://static.crates.io/crates/time-macros/time-macros-0.2.17.crate \ + https://static.crates.io/crates/time-macros/time-macros-0.2.18.crate \ https://static.crates.io/crates/tinyvec/tinyvec-1.6.0.crate \ https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.1.crate \ - https://static.crates.io/crates/tokio/tokio-1.36.0.crate \ + https://static.crates.io/crates/tokio/tokio-1.37.0.crate \ https://static.crates.io/crates/tokio-macros/tokio-macros-2.2.0.crate \ https://static.crates.io/crates/tokio-native-tls/tokio-native-tls-0.3.1.crate \ - https://static.crates.io/crates/tokio-stream/tokio-stream-0.1.14.crate \ - https://static.crates.io/crates/tokio-util/tokio-util-0.7.10.crate \ - https://static.crates.io/crates/toml/toml-0.8.10.crate \ + https://static.crates.io/crates/tokio-stream/tokio-stream-0.1.15.crate \ + https://static.crates.io/crates/tokio-util/tokio-util-0.7.11.crate \ + https://static.crates.io/crates/toml/toml-0.8.12.crate \ https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.5.crate \ https://static.crates.io/crates/toml_edit/toml_edit-0.19.15.crate \ https://static.crates.io/crates/toml_edit/toml_edit-0.21.1.crate \ - https://static.crates.io/crates/toml_edit/toml_edit-0.22.6.crate \ + https://static.crates.io/crates/toml_edit/toml_edit-0.22.12.crate \ + https://static.crates.io/crates/tower/tower-0.4.13.crate \ + https://static.crates.io/crates/tower-layer/tower-layer-0.3.2.crate \ https://static.crates.io/crates/tower-service/tower-service-0.3.2.crate \ https://static.crates.io/crates/tracing/tracing-0.1.40.crate \ https://static.crates.io/crates/tracing-attributes/tracing-attributes-0.1.27.crate \ https://static.crates.io/crates/tracing-core/tracing-core-0.1.32.crate \ - https://static.crates.io/crates/tree_magic_mini/tree_magic_mini-3.0.3.crate \ + https://static.crates.io/crates/tree_magic_mini/tree_magic_mini-3.1.4.crate \ https://static.crates.io/crates/try-lock/try-lock-0.2.5.crate \ https://static.crates.io/crates/typenum/typenum-1.17.0.crate \ https://static.crates.io/crates/uds_windows/uds_windows-1.1.0.crate \ @@ -412,16 +406,14 @@ DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.0/ncspot-1.1.0.tar.gz \ https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \ https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.23.crate \ https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.11.0.crate \ - https://static.crates.io/crates/unicode-width/unicode-width-0.1.11.crate \ - https://static.crates.io/crates/untrusted/untrusted-0.9.0.crate \ - https://static.crates.io/crates/ureq/ureq-2.9.1.crate \ + https://static.crates.io/crates/unicode-width/unicode-width-0.1.12.crate \ + https://static.crates.io/crates/ureq/ureq-2.9.7.crate \ https://static.crates.io/crates/url/url-2.5.0.crate \ https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \ - https://static.crates.io/crates/uuid/uuid-1.7.0.crate \ + https://static.crates.io/crates/uuid/uuid-1.8.0.crate \ https://static.crates.io/crates/vcpkg/vcpkg-0.2.15.crate \ https://static.crates.io/crates/vergen/vergen-3.2.0.crate \ https://static.crates.io/crates/version_check/version_check-0.9.4.crate \ - https://static.crates.io/crates/waker-fn/waker-fn-1.1.1.crate \ https://static.crates.io/crates/walkdir/walkdir-2.5.0.crate \ https://static.crates.io/crates/want/want-0.3.1.crate \ https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \ @@ -438,58 +430,57 @@ DOWNLOAD="https://github.com/hrkfdn/ncspot/archive/v1.1.0/ncspot-1.1.0.tar.gz \ https://static.crates.io/crates/wayland-scanner/wayland-scanner-0.31.1.crate \ https://static.crates.io/crates/wayland-sys/wayland-sys-0.31.1.crate \ https://static.crates.io/crates/web-sys/web-sys-0.3.69.crate \ - https://static.crates.io/crates/webpki-roots/webpki-roots-0.25.4.crate \ https://static.crates.io/crates/weezl/weezl-0.1.8.crate \ https://static.crates.io/crates/winapi/winapi-0.3.9.crate \ https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ - https://static.crates.io/crates/winapi-util/winapi-util-0.1.6.crate \ + https://static.crates.io/crates/winapi-util/winapi-util-0.1.8.crate \ https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ - https://static.crates.io/crates/windows/windows-0.51.1.crate \ - https://static.crates.io/crates/windows-core/windows-core-0.51.1.crate \ + https://static.crates.io/crates/windows/windows-0.56.0.crate \ https://static.crates.io/crates/windows-core/windows-core-0.52.0.crate \ + https://static.crates.io/crates/windows-core/windows-core-0.56.0.crate \ + https://static.crates.io/crates/windows-implement/windows-implement-0.56.0.crate \ + https://static.crates.io/crates/windows-interface/windows-interface-0.56.0.crate \ + https://static.crates.io/crates/windows-result/windows-result-0.1.1.crate \ https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \ https://static.crates.io/crates/windows-sys/windows-sys-0.52.0.crate \ https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \ - https://static.crates.io/crates/windows-targets/windows-targets-0.52.4.crate \ + https://static.crates.io/crates/windows-targets/windows-targets-0.52.5.crate \ + https://static.crates.io/crates/windows-version/windows-version-0.1.1.crate \ https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \ - https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.52.4.crate \ + https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.52.5.crate \ https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \ - https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.52.4.crate \ + https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.52.5.crate \ https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \ - https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.52.4.crate \ + https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.52.5.crate \ + https://static.crates.io/crates/windows_i686_gnullvm/windows_i686_gnullvm-0.52.5.crate \ https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \ - https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.52.4.crate \ + https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.52.5.crate \ https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \ - https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.52.4.crate \ + https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.52.5.crate \ https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \ - https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.4.crate \ + https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.5.crate \ https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \ - https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.4.crate \ + https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.5.crate \ https://static.crates.io/crates/winnow/winnow-0.5.40.crate \ - https://static.crates.io/crates/winnow/winnow-0.6.5.crate \ + https://static.crates.io/crates/winnow/winnow-0.6.8.crate \ https://static.crates.io/crates/winreg/winreg-0.5.1.crate \ - https://static.crates.io/crates/winreg/winreg-0.50.0.crate \ - https://static.crates.io/crates/wl-clipboard-rs/wl-clipboard-rs-0.8.0.crate \ - https://static.crates.io/crates/x11rb/x11rb-0.13.0.crate \ - https://static.crates.io/crates/x11rb-protocol/x11rb-protocol-0.13.0.crate \ + https://static.crates.io/crates/winreg/winreg-0.52.0.crate \ + https://static.crates.io/crates/wl-clipboard-rs/wl-clipboard-rs-0.8.1.crate \ + https://static.crates.io/crates/x11rb/x11rb-0.13.1.crate \ + https://static.crates.io/crates/x11rb-protocol/x11rb-protocol-0.13.1.crate \ https://static.crates.io/crates/xdg-home/xdg-home-1.1.0.crate \ https://static.crates.io/crates/xi-unicode/xi-unicode-0.3.0.crate \ - https://static.crates.io/crates/zbus/zbus-3.15.1.crate \ - https://static.crates.io/crates/zbus/zbus-4.1.2.crate \ - https://static.crates.io/crates/zbus_macros/zbus_macros-3.15.1.crate \ - https://static.crates.io/crates/zbus_macros/zbus_macros-4.1.2.crate \ - https://static.crates.io/crates/zbus_names/zbus_names-2.6.1.crate \ + https://static.crates.io/crates/zbus/zbus-4.2.1.crate \ + https://static.crates.io/crates/zbus_macros/zbus_macros-4.2.1.crate \ https://static.crates.io/crates/zbus_names/zbus_names-3.0.0.crate \ https://static.crates.io/crates/zerocopy/zerocopy-0.6.6.crate \ - https://static.crates.io/crates/zerocopy/zerocopy-0.7.32.crate \ + https://static.crates.io/crates/zerocopy/zerocopy-0.7.34.crate \ https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.6.6.crate \ - https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.7.32.crate \ - https://static.crates.io/crates/zvariant/zvariant-3.15.1.crate \ - https://static.crates.io/crates/zvariant/zvariant-4.0.2.crate \ - https://static.crates.io/crates/zvariant_derive/zvariant_derive-3.15.1.crate \ - https://static.crates.io/crates/zvariant_derive/zvariant_derive-4.0.2.crate \ - https://static.crates.io/crates/zvariant_utils/zvariant_utils-1.1.0.crate" -MD5SUM="6c65933888dd01548d0778520e073025 \ + https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.7.34.crate \ + https://static.crates.io/crates/zvariant/zvariant-4.1.0.crate \ + https://static.crates.io/crates/zvariant_derive/zvariant_derive-4.1.0.crate \ + https://static.crates.io/crates/zvariant_utils/zvariant_utils-1.1.1.crate" +MD5SUM="59b527de601ebce9c54880a9c27f74d1 \ 55e15000c4c210f0bb2aca6f38fbe424 \ 669215548c64019c08c92b2c1afd3deb \ bd53a9f0ec43690f84e8c96bba8e538d \ @@ -497,72 +488,68 @@ MD5SUM="6c65933888dd01548d0778520e073025 \ b14b12cd0e866930de1993132c85705b \ 58a6326364dbe6f5168f3f3a341f360e \ adbb51e40b28255c49b2ad1d956eff19 \ - 95e5f8d0b7ab37171b8d3118542ba06a \ + 03b2d126766ed746706241b4c7487654 \ bd278d96770173a5298bea9ebdba03f7 \ 730ff1a5c2f3becc07743810ad47e66e \ e0a03581a6aea080315323651f272d65 \ bf23cd323c33a8c283c41bb9b79e4ce4 \ - d1dbe19a84ecc8388654099d69c77b09 \ - dff7c2613686577772e6eaeaf76d6f5c \ - e188f6de00a35235da008cd39e1a003d \ - b06d6c6d9a7bdcdd9bf78f20f2d08f01 \ - 87cc1a50f0dcc09d7223df42eae95119 \ - 02dbac65797f899e59b670f509b37957 \ - 0a9683d589167088b7d5519666a5e326 \ + 0d18959173d080ec965717de7f03c2ec \ + d48caa65882ee9fe77a1f4e3ac950bad \ + ba1d5bf0cf548d5d0114ec4bfb1dd138 \ + a688249621bfca8c4ad27908d5291a9e \ + cef83f13a54d5e9c22e468d266243ae3 \ + e1603878430d080aa8d6cabb07c85054 \ 41a931ff48b0f085b38926fd31396eab \ - 7b940fd276ee0bd5da6e16833b6d783c \ - 60e2db3f9e5fd2e325f5a28f6ced0cc8 \ - 42908f71e8d117a5e514de14d1bf5963 \ - 85e67aace07fa2fc176e690c75109365 \ - d63a2ab8c4c66f06878a96ceea4feca0 \ - f50aaa27a2bbd416782ea6b61cd81315 \ + 8f820ef4e5de227aae6884dda8dce68b \ + 6cec428770e6b047fe480bd0bff1b414 \ + fa070b3f3b3a71823d9410e5004d3466 \ + 8fc35648ea95eb88a354d4a95a07ea42 \ 559877ca7fc385e26a5254e7419412c6 \ - bf10e845ce70eb1feb9bbc05b6d4d7be \ - 590056e464cc18dffcf9a84f1fe12879 \ - 8bca24dc9cea888011800d36f762a396 \ - bebdbb31b24c90e4fdc7968e49ae1878 \ - 4acda95b55f5362a5c53a26cf076161f \ - 3ea0c87cfee0860b38e12742efe2dc17 \ + 8eb288542901d3ebfdb1dfba391b3c74 \ + 2e76f09d03d84f1402ef456531cda0ab \ + e53ef539e04d3812a4d620ddff0fc08d \ + e09416c884027b94479fc254f8d2388e \ + 1b41868d6e1277abee3b6c84a7b7ff83 \ 6a44afda654777d2930b93366bdfc7f3 \ - 05d77ef52e90ad161fdd41b252420467 \ - 66c5beb5a77eccb0d86ce626651f393b \ + 88a8c7336f056de768ee2966cefd8303 \ + cacc6bd5d3b1a38d103a212e0dbaebcc \ 3d192a852cb456a965c5d64db624c915 \ 5a5f45206802441161524e1be576da1f \ + 20084c4c04bcc06fd3d7ff662deca706 \ 642196aa024beee3b8f83c3c71528820 \ a295edb6953237ebbdfa8e731229f9a3 \ - fcc84166b0f45067743bd0820f1d92e5 \ + f3406374808b01be3a263666aa9aa2f5 \ ea2d23ceb9f98853a7dffc6c02884464 \ c7fbaf61245dc847237ab7c72b3ee9ea \ 023b03cf9968b29253a5dfe62051008d \ - e4c2006f438a7eeace52a686a4d90d79 \ - 9a7b66d167ea264f4fda963b2ccee838 \ - d2ff6bc07572bd5842794cc70cc0733a \ - 476b6ffe1effc465c5b9d5eb063af237 \ + e8a72907e5e7c97515e36e1c7a317dab \ + a99d6f13c4bbe56b60ce2f9d9526a269 \ + a3c12a0b2ddb55ec1b245f9950e7bdf1 \ + 74970f806fd0f2ab972f077ee2b7e5d7 \ 45339d90b2b3a4f123af5ec459954102 \ - 51ed49380bb7d086c005208e805983b2 \ - 1941c034bb6efb3523f246a5ff1112ca \ + 722cab9ebe9eb019d5c3b400325de876 \ + e067072ed6fff1a90d001706c2f4505e \ 267fc4a374516caa7ab495f0c607c1b4 \ 10b68ba1e7093d889e9198dcd0ea2a3e \ 74634128440dbc3766bda76fdf0aaa05 \ 126712a51ed2962e587048a634186390 \ - fefbf0a0ea213d77e9605d7a964dbd4d \ + a84898c2e50fd6cfe7d068a1d6d4b5fe \ 5184822d3fd9f30dfa4bc922ffa4143c \ 888f3db20a6784c43e1d68bb8ca2f9a0 \ - 807b6a0fee200b06efd32b586e9c529f \ - 281d3199e921f43b4f03e4981ae28b55 \ - 31f09812c68c3d67e0abc29ebcf74f1a \ + ec573c80325dcb85a463103cf3878a73 \ + 6a7300e86333500f11f30e3e20e68808 \ + 4703ffb8b0409bcc4aff2642a748a9ce \ f780b94573a4c3e9261b0ef07ace6529 \ d7e22f14f70a89ab8c77f414dc75ecc3 \ - 46b3440d1234533559e080fd0103cd68 \ - ee1260862a62c0d8824b664a1abda7b8 \ - 010f6d0e98cc2a2b99907a23c6cd6bbc \ - 8b15d333a98fc02a34909961900246a4 \ - 59e2ac3afb27356dae5b252b6792e73c \ - 4254d3926f37c740bf561723fdb67c5f \ - ab62201369a3a5a80b6c37d29d2ec4af \ + 1054513eff74a8a84c121af2ea2da924 \ + cc59747acec0a70d3cf7e121b19dd403 \ + aba1d13503196d9a767b260913f1401f \ + d1f70680f36b13b74bab20250fb2f26f \ + 2bbef48469a5a6d3f7b8e93dbc0b40a4 \ + ae8cab082d8e9df363d04f91561712b4 \ 4d7e3bc6c42f8a875a87246ed14d9948 \ d7624e4ff046ae83eda8e82d90887bdb \ - 1f2aefb269a8a9d8a86160c67a10c0b0 \ + 780c7d64e5295fc16c5afecd00007265 \ 58ee9a40577f5086ec1f22dc238b9c60 \ 092c01b71d220e9e742d1ce83040f9ba \ 564bfd1bde6d304cca218266b6d0277d \ @@ -586,40 +573,36 @@ MD5SUM="6c65933888dd01548d0778520e073025 \ 6129e036328e2ec678c8d5d9be3c5e59 \ c8419b154d047b3b874ee0b90b0f7413 \ d022bc79e1931c2bd4ebbe65cf3d2309 \ - 59978ef7bcea7bc55e24d06a2d32a32c \ - 82b01392ec0b278bdfc549514900d778 \ + a09f4a3274ea28a2ae68c2757965c319 \ 493a2f042d86baa5c6bac75202c64554 \ 3d62bfbbe08bdcee55fcb8cda85554d9 \ e8f53be89a66884dbb2cf3f6b55d41a9 \ 3681f813c502d911e9eea940dddd26a5 \ 056c8d712ee146347c412b72f4077b2f \ 7c8ef8b5fc652fa97d3629d1ec8b18e8 \ - 09b520d03e86d50e3ac39d856d5aec32 \ - cfa0423cdca197fe5e67129d7e0bb6a8 \ - 5f9a3a8b7213c055342b2f423a213b3a \ + 8a1dbc6f2dff64198e1763751f4f05fd \ + 55b0203d6ebdccee692697e82cf5556a \ + 9a25a5393856f8a0bbc14d82e27414a6 \ 4d130437f158a1172eea060632265cd5 \ 44c9dbaeb0f1bf1f20e0a183b8c664e1 \ 8973f5974bd59f81ad2fffbd8d947af9 \ - 47dfd4745e5add37102091a51877dc52 \ + 8a6423be63449516e688249c2e3bb910 \ bc366f3a65a6503ee17b809a33cba38a \ 65e9d87bb0e146a256971ee567decd43 \ 330fe3773176c641a8538f1cd1bfbe79 \ 10a3fc85c72d5b31ef2cc7d67fe955fc \ bdf329a72ecd0605c296f25e53136706 \ - 349e0ae5420f0b7e6ff835cd03cc7428 \ + bcd5fd8c2b279da10b5a4d7b67eb555e \ 33a8d2c2fcb7b68857c0c1278bf05f50 \ - 65934957ea79137686ded549467e1329 \ - d35d620cdadc14088709fa48f53a6001 \ 91b29dfbb9dfe1320493e45f3e27a89f \ - 94f6cb8fee58109a0820a165fab6fe6d \ + ca985b25824287d17f114f94b25df7b5 \ 44e892b391b9b0b73c12e579da410648 \ - e02a5f8c4fec387f6fa2932ff98669ba \ - 06e723078de46119c270eea21ec4344e \ - 80e1c1b89d858c93fc5946b4a8266504 \ + f7e39a817594c22ef2609187c43dff9c \ + b27485fa46bf04821c8c08402b708432 \ b1e2ff2b24e7c0840bb0cb1174beedfd \ 90dd7e5de8d668d26234ac4e308ef6a2 \ a1e1c92075e77d61acf61a094a68fa61 \ - 110e56f20886997bc288b6fea8617ce1 \ + a2e693fc79c126e6f9ae430c39d58617 \ 8dab3b3ec00dc56cffde0b0c410d47b5 \ 78c898fdaa3968e23904bf8538c4a271 \ 24210500b0b946ed658dd20037cdf5b4 \ @@ -632,82 +615,84 @@ MD5SUM="6c65933888dd01548d0778520e073025 \ 44df381323008413e1624a79c6975ca8 \ 9633f45ef555c994bba8f8ad04735fff \ bb90dd58c7107a6f586b04588404b0ff \ - c5aab47b001d43b71b542984f783b4b3 \ - a7253a50bf5054e85dae5bd8aae62bf2 \ + f0af2a791144dfe21d284bcc00f7fa38 \ c410caa0c9f52fcf9da29688e3ea2974 \ 163296a9672a36cb46d9a78bae592c66 \ 259efb88f74fd1612ea748f3347ff56d \ e667ddded881e4892208a3ea7087c655 \ 64a6d8fe0c9a450bcefa41894e17d7ac \ cbb52c723c94c83804912cde945b4510 \ - ba5684833f6b40a3aa32ae4989c40f79 \ + 3c67481b4433a3219846e41d09aaeaa9 \ fbc6f6d82084b19c006198508b1ac489 \ 2d6d28ec311884da69bcaf320ada8ad5 \ - f8d17c98def1d7d057d2f5da3d29bc9b \ + 86085ccd348bb3897f39b13b5cf79ecc \ 798b266cb07604d172afab782e1967a2 \ 1b41b97d982520b7364a87a39e2a1ed8 \ - 3451a2e54a12d567bbb1bf2815aedc37 \ + 0339cc04f4471f002e421e2328a86bf5 \ eb37edaaef79a17689ada175773bde59 \ 0372a8de508e57da4d4869f058bcb630 \ b92fa50f56a1e06a7f1bf665442d4a73 \ 4daeb6abd6951210bed659c3c1ea01b4 \ 1d3e530a3410fc95a6987d70f84a6332 \ 656eb112c9634812796a81803b04a3e6 \ + d81f9251921f8a289dcf69fe4ccc3788 \ fb46b88c5cbf8bfe28124af1794f3934 \ + ac93fe50bd04f323645dfa04955aa298 \ 54cbd8850aebe933b8f1214d8e916d1e \ + b2f491f27aa784c5c868fc1f7f915c17 \ + ab6f20dc7b2faff4a2d9f9055b1571ae \ 92968aee56cb2f162a55008fedddbb78 \ 580b311bafe0447ebc9ca2e646d9b0e7 \ 4b1be643ffa9aa296972683f97bb34bf \ + 67d707a00d2c674895918d0a88c9d019 \ 31667fab2083c342c85bb51c2cba6d58 \ - 6540f0c2d7dce570f06661292fc68cab \ + f654fdede1434dc135c78e50a1233e25 \ + f711e3c5b59783b30558a7a4810320b5 \ 7810a6b901a77b30a16e7f123685e173 \ 87b1b7cb12ef4dfe842c212b98263048 \ fe77a3f609b6fd8d5b08f3b2ef14d2ad \ - c3425a02781d0bb3c4f8d5d025d12266 \ b5305bde14813da51d536a9df564db69 \ - 785764aa3ae2b351594278ed45a69aa6 \ + e6845317d6f1b581637ed0b77b1e8aea \ 11ce8b5f52cd315e8f52985b834b87eb \ - 39ee9c142fcb9be5b41be73e42260979 \ + 75d480d43a87d733f9f497c647f7d973 \ 5f153f7135dceb02f88266121c836b4e \ - c6612f34c3ee98ced239da95fbede236 \ 916bae8326e21f1d60fa9cba2b7dfbcb \ 411fc2fb6b6fac5d46a936f2d3001478 \ + ce2ecc3cf8d25a886a51fc7d66503a87 \ cbafbdc811ecda2c59593e87a05c219f \ - 0403f58e42c94609207c40a310cfe78a \ + 5d87e8530342ef2a980b1c96dafd27f0 \ b30ef1414dde99d96e89aeea2b3fc094 \ 73272fe4aadb91d550dca8fc7ead8bf7 \ - 62156c0c6bde4f8190c611a461eb482a \ + 8fc0caa52d204a532f3ec02ad55b9305 \ df8968a2a066697d5ccb744045c09c7f \ c6be9100355c6e77cf37c76ade56baa4 \ fba3b040a55c01be7376d3dd5c4d4920 \ 23cc9e52c52465f5b225e62ab7cc3457 \ d3d110551104b00b42c9920958939391 \ - 49d77531898b3d7846b149c0fb4788c4 \ - 9fb61cabd114c5f7c8f96f9b9ed6bcb3 \ + 0bc840b564ce2b698189d5b204538624 \ + 99d57b23f1a7878ef7220513f49db015 \ 23fb13a7f6fb7b25a42d71c3bcaa5d7c \ 39e24edc88ded15828011f4455116a20 \ 7e360efaf354a846028b68a3ad67b207 \ fb0e90d52a58a9fb647cbf79789ec227 \ 7af851b9d8f8aa3b9bc26459d7395a81 \ - 4d3764b253ae871241c2f327e519f382 \ + b928626f9e8328e4085fc27cfc640c19 \ d5619cd692cdf95bddb994fa4351e4a5 \ 2ba6cd31b6ef69fdcbec450eb07fb2ed \ 1a9824f887b3ef3150c93c087bbb10fb \ 067ca67cf5dc5d2eb25c03e491ceb395 \ bd13e165196e3470237b852d347cbb9b \ - 18fa61f2d92d4df309c67cb3f3197987 \ f2d8f01a4e5c5236ab55240d09c6e82f \ - cc1b0e90e372869ad03ef40bd53fa30f \ + eb44c81f81e4aecdbdbafeac9c0fdcab \ 5a376ab3f01ed9e90e8d71e1d5fa6ae7 \ 2bc947f73c658b9ca3e144783373a790 \ 7b3195612bc6090f0fa759e747a9e91c \ 7c81e7a61ec172a229d6fdbc553e883d \ 47580fad08273a52e998f84ef404912e \ 171bb701365ec4b0c12ae5387e034c16 \ - f8cc1978aae22df3e656d12810cdf994 \ + e90235c862e9e1fabe9f569bcfbd9692 \ 76124c2327f642cddf19a4aa50cbcb7d \ - 48e7cc866f45af55ea3f627e29a2cd98 \ - fb6241893b457ed69fae5c1ae19920da \ + 1fb91af1c97373201990f1baedc58c35 \ dfdf2484a5545f51cf6b1f5f23b9f92e \ 8b708bc4b33c5e1683467444c9ed41b0 \ 86aa81f2561682f16c0be376294bf9d3 \ @@ -720,23 +705,22 @@ MD5SUM="6c65933888dd01548d0778520e073025 \ 97b832ecaac0eee2b644fd42f2931160 \ b235f97b3139681d61419166e7c00e3c \ e3bd46e4620b19864b2dd3542bb14c1c \ - 44ab2701d152b855941648698cd7a99e \ fef6cd95c83025d64b8cb50171a4bb74 \ f17aecb8887cf0ecd823623160aed7db \ - 14017f7cf47619397b11104a761ca762 \ + 76dc907eba3076e09ac1114a526bfcf7 \ d69aa359a9e7dd2d67a7b7712e30a19e \ - 4c6b07250677950599d8461c02c2ee83 \ + 8927630752c4318c97736c12ed667301 \ 6b1db46a36bc0dc590270d2c952d30c4 \ - 29dc2c0d8955325173a3f13b2b00833d \ + 2dd9caaa8243e400e523bda863c900aa \ 25a9c25700c416af66082afbd9187bb7 \ - 8702331f43664665d6019e53fb05ca40 \ + f66a5e0697395109481ae9afd83db471 \ 5b5de6cffe4726037a5ec6d6931c80f3 \ 56c34619687723fa3fc23213471e8545 \ 1b3093a865e51ce798ed79054dd3d829 \ - 8ad48d1336afbeb5562e93f89b7fdaad \ + 0fbab0ba3ce58941898919fa3d0bae4b \ 99e024622d98dc28a8a5f37afccaf20a \ - 00ebf3254ed74711c1f6717de3012350 \ - a06099d8d1b082ec6ee23c44750873ca \ + 15353118e83f5e3c77cb725af8340add \ + e092b3abcc54806f2a35889d725bf95f \ d443cbf9907b31a0f396fb13489d6cd0 \ 9838a94728692023a816e8474aee7e7c \ 8ba62f467422d88e28a22b24c1e277b1 \ @@ -744,6 +728,12 @@ MD5SUM="6c65933888dd01548d0778520e073025 \ bbda7e9c572f651774dfdb0006b9f085 \ b4dcac855af5df71f3383d86c4a96b78 \ aecd889de42c8168e1bc97a6f2720d8f \ + 1ae1271765836d43a297bc90e1627241 \ + 977dd1b29905266183c597c7a5098476 \ + ca5b82f3f1947878d8c7b37c4888d954 \ + dc121f4e838b7225ee3382c147ea8a82 \ + 216ad5c2a82af09ea52cd4529e0f8966 \ + b6fe971a49c79dd8448eeb3acff74448 \ fd9aa273ad560dedd00ddcf3dbe808ce \ 0d98aaf27d3cace75f9959c04b910891 \ 980c225025b646fa54a9450d22688ad0 \ @@ -754,29 +744,30 @@ MD5SUM="6c65933888dd01548d0778520e073025 \ f4c1fe0f183ec61db569aeb437c6f9cd \ 28d34115cfbbe0e8f80333591f2cdd84 \ 907244c0d3791f3f981c7cc8e4cad0a3 \ - bd529be225f8352d7e6cab8410bd2b38 \ + 663a7dc80c4a8280f108a350bca1f125 \ 481cc7357cb8bfd6a728e7b47dee84b1 \ e26046d4c188c53f09b6880de7bccab0 \ 6fb245ba04d6859fadef5fe22806355b \ ef6fc33d718cd6aa793a60f884d62611 \ 1c81a692573ebbe22b81c1107d0ab518 \ 12e4ba5909e1f30b9142932571eaa4da \ - 1be45f99109d447849f4244b58c5a470 \ + 9d6c117b30034665155c9e6852b86e88 \ b1713fb3ae03d434680cff5fb4c14144 \ - 7502c2f15026ee3e6a01f57b92942771 \ + fe316e1d51e3dff1e0455d0142dd37e4 \ d27d4ebe09da25387352db8f3621fc40 \ cf2f0435bd5b5111fea46e8d9dc6522d \ fbb87d3e5015e2ac193545f18bc5d20f \ 0ba30a94d7b8865c23e86d4d64e5b91e \ - 0e6a13dccbf3729783caace05fc8d8d4 \ - ffc7c4e1b2639ba6c8579a1c47c5f97c \ + aa64b5603b047aa734216db62286aac8 \ + 44f053408a962a7844f01f5489605a0f \ + 7e85eab95cabf5f5345db3ab007fb4a9 \ + a9a6ce6cd4b12f9c4f6840df87d5da0d \ 07c75fec267864bcbb800ca7709ceae2 \ 564286699e80741f7c24b16c9a1a5f58 \ 524ffd7a9b5b25c4d388686a5dde5cac \ 84dacc478522497f5c7264c62a2c83ac \ 263a4e4ee967b56a460b6b717fa53279 \ - 343b2fab0e168b874bc0d070034988b5 \ - fcba02c71b8f53c0667a7c4e4a5b68b2 \ + d47be980af799d61ef5a73fb82a202c8 \ 1262dd2afb9bbb47b9075ead3102da9e \ ec96d03983725371e10bd4dad4fdd232 \ 30eb4de1c1a3bd214d7649b891abf444 \ @@ -784,55 +775,50 @@ MD5SUM="6c65933888dd01548d0778520e073025 \ 232374820c8ad89ff8d4727d98222c18 \ b5012003220ca5bf1512946914dfe295 \ c755ef59e7394470f9e06673f7e02e2a \ - 76570d89c59a2d7221c27bab424b299a \ + ce98002a9f935f415642f31f4b40360a \ 5770ccff26d6481010ab6c6006cda25a \ c2a8746886f9f7bcc8fb9dd539183e44 \ 4785f3ef9f313f11aae87120112c45b6 \ - fc70d4884e65f1c29086807a9aaad534 \ 5d249ea25d57d9e5b051a504a2f62a62 \ - 0358b31bf59c7915bb03f9e66f2d1ea3 \ + 7267e731f46f52edb7b5304b60982cf4 \ ee7a5f842c39bc47c474196e83b0df5f \ e30085994bbeb4b7f4895d48216d5476 \ a1626b8f4d165b1b60d960862eba4cf0 \ a661e92ffd6cb9f0893126e3cde3fffc \ 16111f31a29feae4ce4a324b83dc0189 \ - ff1d093069cfc9eb161907e17a51208b \ + ea6dadf813d422419f900efa67ed9170 \ 59f71fb230b688cb167ec6d7510ae861 \ - bca57d7079177ca0aa651d452c7099fe \ - 6ddcf897328f065168420b7d4ea9d43b \ + a4e0e59afbc3890b4a0a8d9a0ca1b8d4 \ + e19600513eaf0823f25a621088b44d2c \ 520b920d0c711ec1a17fb19a6060446a \ - 91b60a71d44302a8b05bd398eca56c37 \ - 50a30360838e0a7289c65d73899e5dd1 \ - 2a22c24f8afff411e1cbe0e6c0d79e7f \ + 5ff02ce05f7f204690c26cb20f3cf2d0 \ + b29c183ddd63a60f51b0bf214d9fa4b1 \ ee620998fafcd5665f24897e37c0d57e \ ca991859381ef2ddc2b3306de05c242c \ - 4c489260b3b01caa3901a23aa4f57258 \ - 8daad07a5889fe87dc2d4be645301ff5 \ - de5ea2456d3104ab687ad77aa8c6aa73 \ - f5c88262d4e12f16a433665b23b83394 \ - 24fcbc2986fad09b25c9a4f9aef0a9e4 \ + 44a24f25cc194657b0e339a10d65915e \ + f0c24c0d01acc4fcfa57f193edc8daf0 \ + 237693976d463e6437133dcd135ca74c \ + cbece4c808cdeaa21c9970174a8c6fd0 \ + b400c455aaf7d3e6a216261f07c4bc93 \ 7b1261ea730a9314bc9bcdf4a379bf98 \ fdf3aa5e1f6c33e4f68b0f7b08e1e94e \ - 44eb6c30c79e4213a42dc2d1c1f3d345 \ - 223719dc10025228707d8d5aa14e401b \ - 476b7b02dd072cb41c6dc20db1c69d67 \ - 64f80235e287a272c4f841791884a1de \ - 9a668fb72cd7aeefb4e48fc37bdc0a4e \ - a4363e082ec4ca1af8152bd344a5c771 \ - feefd8369d6dd6a0f269bbed1b921349 \ + b815e6cf70bcc3512ffbef7f6dea8c5f \ + c16e8027d2f6a84b07637ed9dd6a46e6 \ + c0abb1df9f07ef70253f95a0ad566009 \ + 9f6db3aa8f4f64c7853ced37e2ea60ab \ + 56de037d755aeb0b45169991f9567cd7 \ 2d8d8b377d144f5e32b4f65a69eb0b24 \ 6a0950fa3775d755dbbdbd24a2841786 \ b898bcf321bba46ecd15c9279cdbb290 \ f1358be8c98b98837cbd2cf51e75f8b3 \ - c5a05bb3260e6a4b5d61cf78618f6021 \ - 151939b0b34c1580b44863b7713be586 \ - 2acfe0c857811f38afc675dd79f308e2 \ - 7b1ab65edc77a1bd7cfd8f03cd889831 \ - 956ace3f4e2b8a6ac55aa74549cc38de \ + f2d5c07279f3211547a4dec14c8826c3 \ + 93531fb0a9b2cc7341256576d957ec11 \ + d3ccccba78e5375faf8e543884f9e84e \ + 56cebb7cbd387fb6fcb185d4b72440fd \ 30f8c7ce8e7a3a98039d34a07556435d \ - e8b93865e80b67f03df2faa417960b88 \ - 1d870838320d2810817ade2a17fcc4f8 \ - 954a19d3469bee5e680c189a1e0ecf36 \ + a8cd06e4032cfe9218e3479e668a950b \ + 1dcfa87e4c034a897f0a10437a7cce36 \ + 901c258136ce9147131deb202e1535ad \ fa0d5d4e1e3bd20a9ca9aef473fc3665 \ 47151b766b6b73e638fabe6fae7b723d \ 82078b82ed1c52aac9552a39ead691a0 \ @@ -843,56 +829,55 @@ MD5SUM="6c65933888dd01548d0778520e073025 \ 6c623a8eed8450399ec323a72e96855c \ f60ab8537f924a65fbc0961e958d375b \ cd23eb9bc45514102af9b76e333230fb \ - 22e95901b912671da26457ac33e36a23 \ + a77d5770902a4260009320daafd1fff2 \ d0116882bd495f2b993495a8cf01f6fe \ 5d8c25fc51ffebca67935516c2325860 \ - f50e12db5ae8860e3f067d5dcb4471a6 \ - e23a09ecbf1aab486b90dfbc3bbae657 \ - e0a2eb3573e89a1462cb180fd0a326cd \ - ae0a9c293bf6cb72cd62d6b9486356c0 \ + 50d5a501f911bb592f0dce2d052c2aa8 \ + 746d5deb23a67c019e5b2381d76d4afa \ + 245be6692a21ca8527b683b40aecac9b \ 5988bad1543264a9f48b542192e7de9a \ c9defe80406280bcfce4ecf31c0200b3 \ 43661dc16a38eb42bd49a11b9f00d6f4 \ 82d98dc87dc8503400aa095f5aa70f13 \ - 5a9054761bf275878e3c4076192d5472 \ - 3976bcb8ccfe5f63e4c38209370a0de7 \ - 147ff9f83a8957d3df2dbf9a121a11bf \ - 32e55c2eba46e10f03866a9afd566925 \ - d868a5163f2e713ca212427046411a6a \ + fbe5da24bd1beef6125107ee41118187 \ + e1fac99a8b538b7287b8ab102a839e81 \ + 6bf382b1603c01669d5da08d7e85b5a7 \ 8e053c23f1d36fbf3f276fbf501e3e35 \ 64d9f46e9ba78f68c30c486be3d8b7df \ - bafef11d01f57d9b8e4043afe2e7dd10 \ + 5042ab676ff539148d32c7790f06b826 \ d9794aa522094bdd0f66c045c29e5d01 \ d2cef4c78c44c8513136a8b07d648824 \ a84637b0865bd9435a575d770f4fea30 \ - 8a02ec02d5f1593a2c7f2c8e00a05d3b \ + cd808ebf70116572373bdb8c96ff3a33 \ 449c7bb37fc298d2026fbf2855eb8db0 \ 73d602cc41e3e431bf4fabd129ae1616 \ 5e7f9a17d31e264f87d3e14b85d7da3f \ - af0bfde5ad7ef68ed7f8d04313a13950 \ - 8b109346f72a6b3e0533d1353485cca0 \ + 560fd15286d078feffbe7c191892e19d \ + 812d3b8ae5a3c5b4bb75e8666c8c742e \ cae621bc9543182ab86f71b8601a318b \ 4d878f78fc54e274f89bd4731ae605b4 \ - 00a1017b4831ad4073be63ee145f37f1 \ + 19e6e4e45004e2b023e49e37c34b4e31 \ 7818a75208424a6d05d1d868559f0adf \ - 4875c5068f17bbcd90afbff582925a0a \ + cbfa351bd29e3779266c82b3996fc9ab \ 5f0470696baaa4e5953bddbf196998f9 \ c678a7da0ee4b850ebde0474144a0415 \ - 759422d0679eee4aa65d7c4d224fa125 \ + 7d6059d699479e0b6a99ce0281522217 \ bf33e2d27126b29c8a9b1239c688a424 \ 9e2f7831d5c7d8bd2f430984e47c3065 \ - d5b02c8c30ea46cda73eba99f89ae6e2 \ - 075e0746cd75038f031f06f1ff00e2d1 \ - 12533e93ee8b113fe3bc8fb55f2c9567 \ + a23c6e2b033c888211095a15ca9ac553 \ + 96a097939f4cb00c978f840a89dd45bf \ + cc14d30a8e3aa6f3d0a54311fca6acaa \ 9aecd5ff283534a21d7cd51266abfe89 \ 467f480ef05d416ac677d12315214f59 \ 0cb504a1438dd87648b18def4b0e6e10 \ - 27a195c54703c601cc2050347b4c97cd \ + 13ec7a52fc82eb309183c6b2d484e2de \ + 3fc11d6bd687ec52943fa02d9a5de916 \ + 92975a97c15daa2a21006b0932ce733c \ 60d7c3a9f75ac64cffbb9ccda7c1c8e5 \ 0a906c03436ec2dcc4c311c21fee0da2 \ 9dd610282e23bbd40016697350c1babb \ a6655e5e9845cb569991e87b5b38a1fc \ - bd5c630b1c9e06074ea101f5133c26ed \ + 6bec8c664a07a03bc4486f1576328cfe \ 6f09120aa341d58ea072539176058a00 \ 6ebb8deee5a5a0d1c26b20eeee1926b3 \ 1bb0f07f67939ce667f8f1a000dbec38 \ @@ -900,16 +885,14 @@ MD5SUM="6c65933888dd01548d0778520e073025 \ ca65153603a1a7240bbd9d2ce19f2d67 \ 97fa43aa1afabd1f5f3d1070389b42ba \ 43bd6ad524e583eaa8c071dbb01f11ae \ - 908ec8a89821b72f3a35726bab24461f \ - 674e5a6b49cf5e0ebb1d6cc85f6ec786 \ - 23b29676b5f70e5155a2502f20f8d21e \ + 01bce66c98792940b4f022307b2962d0 \ + e1c475bcc83eb4ccfb6f99c0697e5aef \ e547b0e754cd61f24f9ef8c9e26fcd95 \ ceee1159c41351d05f4cf705490867b3 \ - 4e0e5834b7c5634e2465cb1779f78b33 \ + 5b2aec3424fb46f4d089b6552cae7075 \ e900a384ac7dbb320fe6a7279fbfef89 \ c4769705079e88d68739e6089e8769a3 \ d18d362345c4fe512ef67b738b239fb8 \ - daf3b42c3d8b457bfdaf677ae13316ef \ f38b27b8c9625110a51293658f1cc014 \ 4daa973c57624dc3d88eaa49dd86d3e1 \ e972ea58ec203bfa6c79c1207852298b \ @@ -926,57 +909,56 @@ MD5SUM="6c65933888dd01548d0778520e073025 \ d9cf61d9a5387dcbb3bf017aebaf2bf7 \ 7da33160ff24759809edd61619a4a69f \ 50fd776efcd20b40eb7ec5bec9c2d1cf \ - 7198f477e642b5dc850d79193fa86b6c \ 3463b870b51ee10369d6b1a5139ad166 \ 0498c4a11448bfc35dc7bb2caa64c753 \ db96b50050277bf05a3c68534bbb9586 \ - 306c0281447d1876e8220007b7a7e053 \ + dbdd24e240e42c6852910e7504285712 \ 09de9d01e7331ff3da11f58be8bef0df \ - 1447eb72d5d00bdc8a8dd897cd327541 \ - d343f3cc25259c518e594b7bcd4f144b \ + 8e18e49c80bbc5b6184ee392ca7571ba \ 6fea8456dac26da1a185af6b0318dce1 \ + 58f8e58043e4149e7865129d3c312eeb \ + 737a9cd2cca5c8d6f21ecdd0fff2b2ec \ + b86b7fd51d42769f5732b29db9274996 \ + 23eaf0b79be986ae249edd0dedce9221 \ f2797ade0e36f1e5d6be9d11b5076582 \ 2376de634160158ece40c4bc2ab3eb41 \ 24c64817e85ef77765ed0f26c31c9b4c \ - da06678965a6a18bd802a4dfc0ff16a6 \ + 940f8708332e8e3720266a7bce4d761d \ + 692aff2a4d76b7a87371e979eef79089 \ dae6d89034a6988042fd8be4cf5e037d \ - 37de98e52a65c26a9ea5d1c64ac70ff7 \ + 967cf93762a3bc25e18d0b8b7e811b84 \ de2839e16d9d7a9fd1c397da62f62b4a \ - 08d0a285a0002da66dd555876cf0b278 \ + 0bc2062598ed9d8ed536e27fddd81ce7 \ e0c35ffb8cfdb74a39bf799811f79304 \ - b6834054fd9736252087791fdda2e73a \ + a35e6187f2f41e601cf885c279ebb43e \ + 183b6a856fadbc8f21a6c53ca81155c9 \ d990172b607020701f9e84ca8e1c043c \ - 05b3e5d30c79a17e5c14c64f092326fe \ + cc1f120172ea435e8ac1e813435bc630 \ 0a68848588e847ceccf504891584d00b \ - af0110497c2fc215c55297232f3e6665 \ + 1dbfec917710e57b574e92effa934924 \ 45b469ad607b912256b7c80141fa2d17 \ - b08b96f50cdba558c550c985252c3fd6 \ + 3817cf594b24311c4ea944398a58a48d \ 7799baff9a5664205d9110a2624e8989 \ - ff740ff52ecfd509004f54630f94c3e4 \ + 7cc8e977768423992930663aadcc43dd \ cb7c86af4d8a969d849c6fce363af240 \ - 89f70cb8305108cc51ccde5569760d5b \ + 02cb8ba99b348c44b987aaa5499cc98c \ d9c86ac3f5060d384d3a4c3f99fdadeb \ - f7ee9de65306cc4e1f8ce02790ca089e \ - e4fe06b53cab3e3f938840d0ecbf1afe \ - ff16c9daa9afa7ba1d5334699700b042 \ - ee9610aac4f0c37e3a31f6cea6fb8ff9 \ + 3aa6fd0d30e89ae0fef20f01efe44f9d \ + 3bfcdb23ee30fe972b0e5a45c2661171 \ + bc25ca609cd5a0a7a7846af8cef5afa9 \ + c8e2f2d9f920fc5fea78b95ae7e57082 \ 1538a3a38f01bc0c3feacd388c08e6c4 \ a78d9b7d812b68bc4b27b4f23d46ced1 \ - 290c6e1116739bf913f975e773587991 \ - 5e82713512eaa4ce4b66b35f932d51dc \ - e2e4bdb10d6906d4fc5749e479a41a72 \ - adaa5cd45c593594b33d96625e78f8dd \ - b8a58b61e73e507fc099136f4e4046cc \ + baca0d25e5a07c4ba2e7adf6202041ed \ + 9f03cf3a961d2752203763aca7e2f478 \ 9804ba2a6ac5353c7a651d09ad899374 \ 59a504c234f588bcd3f9a3d58bc2af2d \ - ae2ca148274c581aa6ee8a8e292ca2af \ + bcfc5a71fb6f68251e902c25965cb543 \ 11edfb7c5b9632ac9d68eca218a2965c \ - 936257597fbe2fd02d954a5db53c687a \ - d4d2a993a6a9916a44780ba76e1e61f2 \ - 582865c907b71aaa2cb1d2e4cc7cee3e \ - a4149bf57b2bfaecdf6462ca7165ed9f \ - 69855ab7cf78a4c7b486c0cb9ea4b85c \ - 462bbe36736866157a452bc111b5aa6f" + 7a0544d66994f37702f6bd998c31d9da \ + 3a9fcb5fbcbbd59f183105eaf49d2e8a \ + c4c2218b53cfa6c2a9dd8894ae22a349 \ + 9b88ddcd35fb230049cf54d7c80b61ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="rust16" diff --git a/audio/openvino-plugins-ai-audacity/README b/audio/openvino-plugins-ai-audacity/README new file mode 100644 index 0000000000..d4111dc4cf --- /dev/null +++ b/audio/openvino-plugins-ai-audacity/README @@ -0,0 +1,16 @@ +A set of AI-enabled effects, generators, and analyzers for Audacity. + +These AI features run 100% locally on your PC -- no internet connection +necessary! +OpenVINO is used to run AI models on supported accelerators found on +the user's system such as CPU, GPU, and NPU. + +Due to the size of the openvino models, currently only two of the +effects are provided with this build: + -Music Separation -- Separate a mono or stereo track into individual + stems -- Drums, Bass, Vocals, & Other Instruments. + -Noise Suppression -- Removes background noise from an audio sample. + + +whisper.cpp needs to be build against openvino to pick it up as +dependency. diff --git a/audio/openvino-plugins-ai-audacity/openvino-plugins-ai-audacity.SlackBuild b/audio/openvino-plugins-ai-audacity/openvino-plugins-ai-audacity.SlackBuild new file mode 100644 index 0000000000..84ec8619dd --- /dev/null +++ b/audio/openvino-plugins-ai-audacity/openvino-plugins-ai-audacity.SlackBuild @@ -0,0 +1,158 @@ +#!/bin/bash + +# Slackware build script for openvino-plugins-ai-audacity + +# Copyright 2024 Johannes Schoepfer, Germany +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=openvino-plugins-ai-audacity +VERSION=${VERSION:-3.5.1} +VERSION_SRC="${VERSION}-R2" +VERSION_AUDACITY=3.5.1 +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION_SRC +tar xvf $CWD/$PRGNAM-$VERSION_SRC.tar.gz +cd $PRGNAM-$VERSION_SRC + +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} + -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + + +tar vxf $CWD/audacity-sources-$VERSION_AUDACITY.tar.gz + +cat << EOF >> audacity-sources-$VERSION_AUDACITY/modules/CMakeLists.txt +add_subdirectory(mod-openvino) +EOF +mv mod-openvino audacity-sources-$VERSION_AUDACITY/modules/ + +source /usr/share/openvino/setupvars.sh + +cd audacity-sources-$VERSION_AUDACITY + sed -i 's|^#include "allegro.h"|#include "portsmf/allegro.h"|' libraries/lib-note-track/WrapAllegro.h + mkdir build + cd build + unshare -n cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $RPATH $LDPATH" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS $RPATH $LDPATH" \ + -DAUDACITY_BUILD_LEVEL=2 \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DHAVE_VISIBILITY=1" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -DHAVE_VISIBILITY=1" \ + -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL="on" \ + -Daudacity_use_twolame="off" \ + -Daudacity_use_ladspa="off" \ + -Daudacity_use_soundtouch="off" \ + -Daudacity_use_vamp="off" \ + -Daudacity_has_vst3="off" \ + -Daudacity_use_expat="system" \ + -Daudacity_use_lame="off" \ + -Daudacity_use_ffmpeg="off" \ + -Daudacity_conan_enabled="off" \ + -Daudacity_has_networking="off" \ + -Daudacity_has_crashreports="off" \ + -Daudacity_has_updates_check="off" \ + -Daudacity_has_sentry_reporting="off" \ + -Daudacity_obey_system_dependencies="on" \ + -Daudacity_lib_preference="system" \ + -Daudacity_use_wxwidgets="system" \ + -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config \ + -DwxWidgets_wxrc_EXECUTABLE=/usr/bin/wxrc \ + -DCMAKE_BUILD_TYPE=Release .. + make mod-openvino + make install/strip DESTDIR=$PKG/tmpxxx + mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/audacity/modules + mv $PKG/tmpxxx/usr/lib$LIBDIRSUFFIX/audacity/modules/mod-openvino.so $PKG/usr/lib$LIBDIRSUFFIX/audacity/modules/mod-openvino.so + patchelf --add-rpath "$INTEL_OPENVINO_DIR/runtime/lib/intel64/" $PKG/usr/lib$LIBDIRSUFFIX/audacity/modules/mod-openvino.so + rm -rf $PKG/tmpxxx + cd .. +cd .. + +# Provide openvino models +mkdir -p $PKG/usr/lib/openvino-models +unzip $CWD/deepfilternet2.zip -d $PKG/usr/lib/openvino-models +unzip $CWD/deepfilternet3.zip -d $PKG/usr/lib/openvino-models +cp $CWD/htdemucs_v4.bin $PKG/usr/lib/openvino-models +cp $CWD/htdemucs_v4.xml $PKG/usr/lib/openvino-models + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.txt README.md doc/feature_doc $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/audio/openvino-plugins-ai-audacity/openvino-plugins-ai-audacity.info b/audio/openvino-plugins-ai-audacity/openvino-plugins-ai-audacity.info new file mode 100644 index 0000000000..007adbf4e1 --- /dev/null +++ b/audio/openvino-plugins-ai-audacity/openvino-plugins-ai-audacity.info @@ -0,0 +1,20 @@ +PRGNAM="openvino-plugins-ai-audacity" +VERSION="3.5.1" +HOMEPAGE="https://github.com/intel/openvino-plugins-ai-audacity/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/intel/openvino-plugins-ai-audacity/archive/v3.5.1-R2/openvino-plugins-ai-audacity-3.5.1-R2.tar.gz \ + https://github.com/audacity/audacity/releases/download/Audacity-3.5.1/audacity-sources-3.5.1.tar.gz \ + https://huggingface.co/Intel/demucs-openvino/resolve/main/htdemucs_v4.xml \ + https://huggingface.co/Intel/demucs-openvino/resolve/main/htdemucs_v4.bin \ + https://huggingface.co/Intel/deepfilternet-openvino/resolve/main/deepfilternet2.zip \ + https://huggingface.co/Intel/deepfilternet-openvino/resolve/main/deepfilternet3.zip" +MD5SUM_x86_64="3a8159867cf264afc280ab836ef848f9 \ + 42d866855b2563dc0ec50b9c38476a0d \ + aa7fcbb6980d83683902ac48c53116be \ + 1d1fbf4673bd956b3c13879555fa0ad2 \ + c17382730bdef35c325df210a1ff3d4b \ + dfaca36bb422a37a299e4f328e1b6843" +REQUIRES="audacity pytorch whisper.cpp" +MAINTAINER="Johannes Schoepfer" +EMAIL="slackbuilds@schoepfer.info" diff --git a/audio/openvino-plugins-ai-audacity/slack-desc b/audio/openvino-plugins-ai-audacity/slack-desc new file mode 100644 index 0000000000..a5be7b7654 --- /dev/null +++ b/audio/openvino-plugins-ai-audacity/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +openvino-plugins-ai-audacity: openvino-plugins-ai-audacity (AI Plugins for Audacity) +openvino-plugins-ai-audacity: +openvino-plugins-ai-audacity: A set of AI-enabled effects, generators, and analyzers for Audacity +openvino-plugins-ai-audacity: +openvino-plugins-ai-audacity: +openvino-plugins-ai-audacity: +openvino-plugins-ai-audacity: +openvino-plugins-ai-audacity: +openvino-plugins-ai-audacity: +openvino-plugins-ai-audacity: https://github.com/intel/openvino-plugins-ai-audacity/ +openvino-plugins-ai-audacity: diff --git a/audio/rack/rack.SlackBuild b/audio/rack/rack.SlackBuild index d782b51e9c..438b5e58bf 100644 --- a/audio/rack/rack.SlackBuild +++ b/audio/rack/rack.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=rack SRCNAM=Rack2Free -VERSION=${VERSION:-2.4.1} +VERSION=${VERSION:-2.5.1} SRCDIR=RackFree-$VERSION BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/audio/rack/rack.info b/audio/rack/rack.info index 89d3f94faa..6ae407805c 100644 --- a/audio/rack/rack.info +++ b/audio/rack/rack.info @@ -1,8 +1,8 @@ PRGNAM="rack" -VERSION="2.4.1" +VERSION="2.5.1" HOMEPAGE="https://vcvrack.com" -DOWNLOAD="https://vcvrack.com/downloads/RackFree-2.4.1-lin-x64.zip" -MD5SUM="23a13e50f617bc483ca2eb64d48d3b56" +DOWNLOAD="https://vcvrack.com/downloads/RackFree-2.5.1-lin-x64.zip" +MD5SUM="ca3a5ec5f1f9a3f948269e731cb73330" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jack" diff --git a/audio/wireplumber/README b/audio/wireplumber/README deleted file mode 100644 index 15a585ead1..0000000000 --- a/audio/wireplumber/README +++ /dev/null @@ -1,25 +0,0 @@ -Wireplumber - Session / policy manager implementation for PipeWire - -WirePlumber is a modular session / policy manager for PipeWire and a -GObject-based high-level library that wraps PipeWire’s API, -providing convenience for writing the daemon’s modules as well as -external tools for managing PipeWire. - -The WirePlumber daemon implements the session & policy management -service. It follows a modular design, having plugins that implement -the actual management functionality. - -The WirePlumber Library provides API that allows you to extend the -WirePlumber daemon, to write management or status tools for PipeWire -(apps that don’t do actual media streaming) and to write custom -session managers for embedded devices. - - -Replacement of pipewire-media : -Based on what P. Volkerding did for pulseaudio/pipewire -There are 2 scripts to enable/disable wireplumber, in /usr/sbin : -- wireplumber-enable.sh -- wireplumber-disable.sh - -For the changes to take effect : -logout / login diff --git a/audio/wireplumber/doinst.sh b/audio/wireplumber/doinst.sh deleted file mode 100644 index 9018c147db..0000000000 --- a/audio/wireplumber/doinst.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Toss redundant sample files: -for file in wireplumber.desktop ; do - cmp etc/xdg/autostart/${file} etc/xdg/autostart/${file}.sample 2> /dev/null && rm etc/xdg/autostart/${file}.sample -done - diff --git a/audio/wireplumber/slack-desc b/audio/wireplumber/slack-desc deleted file mode 100644 index 18f46d565b..0000000000 --- a/audio/wireplumber/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -wireplumber: wireplumber (Session / policy manager implementation for PipeWire) -wireplumber: -wireplumber: WirePlumber is a modular session / policy manager for -wireplumber: PipeWire and a GObject-based high-level library -wireplumber: that wraps PipeWire's API, providing convenience for writini -wireplumber: the daemon's modules as well as external tools for managing PipeWire. -wireplumber: It follows a modular design, having plugins that implement the actual -wireplumber: management functionality. -wireplumber: -wireplumber: https://gitlab.com/pipewire/wireplumber -wireplumber: diff --git a/audio/wireplumber/wireplumber-disable.sh b/audio/wireplumber/wireplumber-disable.sh deleted file mode 100644 index 9a7c8d14f0..0000000000 --- a/audio/wireplumber/wireplumber-disable.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# This script will attempt to disable pipewire as the default audio server, -# changing it back to pulseaudio. - -# Remove or rename the XDG autostart files: -for file in /etc/xdg/autostart/wireplumber.desktop ; do - if [ -r ${file}.sample ]; then - rm -f $file - elif [ -r $file ]; then - mv ${file} ${file}.sample - fi -done - -# Condition: check if pipewire is enabled -if [ -f /etc/xdg/autostart/pipewire.desktop ] ; then - # Enable pipewire-media-session.desktop: - if grep -q "^Hidden=true$" /etc/xdg/autostart/pipewire-media-session.desktop ; then - grep -v "^Hidden=true$" /etc/xdg/autostart/pipewire-media-session.desktop > /etc/xdg/autostart/pipewire-media-session.desktop.new - mv /etc/xdg/autostart/pipewire-media-session.desktop.new /etc/xdg/autostart/pipewire-media-session.desktop - fi - - echo "Pipewire Media Session enabled as media session server." - if ps ax | grep -q wireplumber ; then - echo - echo "You may need to stop running daemon/wireplumber processes." - echo "The clean way is to run these commands as the user that owns the processes:" - echo "/usr/bin/daemon --pidfiles=~/.run --name=wireplumber --stop" - echo - echo "The quick and dirty way if nothing else on the machine is using the daemon" - echo "utility is to issue this command:" - echo "killall daemon" - fi -fi - diff --git a/audio/wireplumber/wireplumber-enable.sh b/audio/wireplumber/wireplumber-enable.sh deleted file mode 100644 index 1aac9d4ae1..0000000000 --- a/audio/wireplumber/wireplumber-enable.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# This script will attempt to enable wireplumber as the default media session server. - -# Condition: check if pipewire is enabled -if [ -f /etc/xdg/autostart/pipewire.desktop ] ; then - - # Rename the XDG autostart files: - for file in /etc/xdg/autostart/wireplumber.desktop.sample ; do - if [ -r $file ]; then - mv $file /etc/xdg/autostart/$(basename $file .sample) - fi - done - - # Disable pipewire-media-session.desktop: - if ! grep -q "^Hidden=true$" /etc/xdg/autostart/pipewire-media-session.desktop ; then - echo "Hidden=true" >> /etc/xdg/autostart/pipewire-media-session.desktop - fi - echo "Wireplumber enabled as system media session server." -else - echo "Pipewire is disabled" - echo "you must enable pipewire first : /usr/sbin/pipewire-enable.sh" -fi diff --git a/audio/wireplumber/wireplumber.SlackBuild b/audio/wireplumber/wireplumber.SlackBuild deleted file mode 100644 index 4ab13c4501..0000000000 --- a/audio/wireplumber/wireplumber.SlackBuild +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/bash - -# Copyright 2022, marav, Paris, FR -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=wireplumber -VERSION=${VERSION:-0.4.7} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z || exit 1 -cd $PRGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -# Set options to build with or without documentation / introspection -# These options are disabled by default -WITHDOC=${WITHDOC:-no} -WITHINTROSPEC=${WITHINTROSPEC:-no} - -if [ $WITHDOC == "no" ]; then - DOC_OPTION="-Ddoc=disabled" - else - DOC_OPTION="-Ddoc=auto" -fi - -if [ $WITHINTROSPEC == "no" ]; then - INTROSPEC_OPTION="-Dintrospection=disabled" - else - INTROSPEC_OPTION="-Dintrospection=auto" -fi - -# Configure, build, and install: -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -mkdir meson-build -cd meson-build -meson setup \ - --prefix=/usr \ - --libdir=lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/libexec \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --includedir=/usr/include \ - --datadir=/usr/share \ - --mandir=/usr/man \ - -Dsystem-lua=true \ - -Dsystemd=disabled \ - -Dsystemd-user-service=false \ - $DOC_OPTION \ - $INTROSPEC_OPTION \ - .. - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -# Add sample configuation files: -mkdir -p $PKG/etc/xdg/autostart -cp -a $CWD/wireplumber.desktop.sample $PKG/etc/xdg/autostart -chown root:root $PKG/etc/xdg/autostart/* -chmod 644 $PKG/etc/xdg/autostart/* - -mkdir -p $PKG/usr/sbin -cp -a $CWD/wireplumber-disable.sh $PKG/usr/sbin -cp -a $CWD/wireplumber-enable.sh $PKG/usr/sbin -chown root:root $PKG/usr/sbin/wireplumber-disable.sh $PKG/usr/sbin/wireplumber-enable.sh -chmod 755 $PKG/usr/sbin/wireplumber-disable.sh $PKG/usr/sbin/wireplumber-enable.sh - -# Strip binaries: -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - LICENSE NEWS.rst README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE - diff --git a/audio/wireplumber/wireplumber.desktop.sample b/audio/wireplumber/wireplumber.desktop.sample deleted file mode 100644 index d3ebdea2d3..0000000000 --- a/audio/wireplumber/wireplumber.desktop.sample +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Wireplumber -Comment=Start the Wireplumber -Exec=/usr/bin/daemon -frB --pidfiles=~/.run --name=wireplumber /usr/bin/wireplumber -Terminal=false -Type=Application -X-GNOME-Autostart-Phase=Initialization -X-KDE-autostart-after=pipewire -X-KDE-autostart-phase=1 diff --git a/audio/wireplumber/wireplumber.info b/audio/wireplumber/wireplumber.info deleted file mode 100644 index adb52a1b33..0000000000 --- a/audio/wireplumber/wireplumber.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wireplumber" -VERSION="0.4.7" -HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" -DOWNLOAD="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.7/wireplumber-0.4.7.tar.gz" -MD5SUM="9e63d8944f91b6a4646a736b1f1db251" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="lua53" -MAINTAINER="marav" -EMAIL="marav8@free.fr" diff --git a/audio/yabridge/yabridge.info b/audio/yabridge/yabridge.info index b5c35ef898..34ee3a893a 100644 --- a/audio/yabridge/yabridge.info +++ b/audio/yabridge/yabridge.info @@ -7,7 +7,7 @@ DOWNLOAD="https://github.com/robbert-vdh/yabridge/archive/5.1.0/yabridge-5.1.0.t MD5SUM="2383d67c9089a4fda8ae311baaa8fe3b \ f9e2185ea8cdfbdc4d99c4a5f5e4d426 \ a58876a05ac16ada09f750a4b8564443" -DOWNLOAD_x86_64="" +DOWNLOAD_x86_64="UNSUPPORTED" MD5SUM_x86_64="" REQUIRES="%README% wine-staging asio bitsery function2 ghc_filesystem tomlplusplus rust16" MAINTAINER="Martin Bångens" diff --git a/desktop/BlockstreamGreen/BlockstreamGreen.SlackBuild b/desktop/BlockstreamGreen/BlockstreamGreen.SlackBuild index 9a18f60302..7a00deeaf3 100644 --- a/desktop/BlockstreamGreen/BlockstreamGreen.SlackBuild +++ b/desktop/BlockstreamGreen/BlockstreamGreen.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=BlockstreamGreen -VERSION=${VERSION:-1.2.9} +VERSION=${VERSION:-2.0.4} SRC=BlockstreamGreen-x86_64.AppImage BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/BlockstreamGreen/BlockstreamGreen.info b/desktop/BlockstreamGreen/BlockstreamGreen.info index 03805d808d..c9525e5ad2 100644 --- a/desktop/BlockstreamGreen/BlockstreamGreen.info +++ b/desktop/BlockstreamGreen/BlockstreamGreen.info @@ -1,10 +1,10 @@ PRGNAM="BlockstreamGreen" -VERSION="1.2.9" +VERSION="2.0.4" HOMEPAGE="https://blockstream.com/green/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/Blockstream/green_qt/releases/download/release_1.2.9/BlockstreamGreen-x86_64.AppImage" -MD5SUM_x86_64="0444b34b2a25b953efafa6ab3cabeacd" +DOWNLOAD_x86_64="https://github.com/Blockstream/green_qt/releases/download/release_2.0.4/BlockstreamGreen-x86_64.AppImage" +MD5SUM_x86_64="953c3a04a8dd95ac7762472e94edff55" REQUIRES="" MAINTAINER="David Ferrone" EMAIL="zapwai@gmail.com" diff --git a/desktop/Matcha-gtk-theme/Matcha-gtk-theme.SlackBuild b/desktop/Matcha-gtk-theme/Matcha-gtk-theme.SlackBuild index 300bd92de0..2819e88f64 100644 --- a/desktop/Matcha-gtk-theme/Matcha-gtk-theme.SlackBuild +++ b/desktop/Matcha-gtk-theme/Matcha-gtk-theme.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="Matcha-gtk-theme" -SRCVER=${SRCVER:-2023-10-30} -VERSION=${VERSION:-2023_10_30} +SRCVER=${SRCVER:-2024-05-01} +VERSION=${VERSION:-2024_05_01} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/Matcha-gtk-theme/Matcha-gtk-theme.info b/desktop/Matcha-gtk-theme/Matcha-gtk-theme.info index 225abb1e26..2d0eb5bbd3 100644 --- a/desktop/Matcha-gtk-theme/Matcha-gtk-theme.info +++ b/desktop/Matcha-gtk-theme/Matcha-gtk-theme.info @@ -1,8 +1,8 @@ PRGNAM="Matcha-gtk-theme" -VERSION="2023_10_30" +VERSION="2024_05_01" HOMEPAGE="https://github.com/vinceliuice/Matcha-gtk-theme" -DOWNLOAD="https://github.com/vinceliuice/Matcha-gtk-theme/archive/2023-10-30/Matcha-gtk-theme-2023-10-30.tar.gz" -MD5SUM="3c08f4271dec2846a0ffedc0d6ed5aec" +DOWNLOAD="https://github.com/vinceliuice/Matcha-gtk-theme/archive/2024-05-01/Matcha-gtk-theme-2024-05-01.tar.gz" +MD5SUM="208cef85926ab3eb27d3ab6dc4ff7d23" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/adapta-gtk-theme/README b/desktop/adapta-gtk-theme/README deleted file mode 100644 index ac189afbb3..0000000000 --- a/desktop/adapta-gtk-theme/README +++ /dev/null @@ -1,15 +0,0 @@ -adapta-gtk-theme (Gtk+ theme) - -adapta-gtk-theme is an adaptive Gtk+ theme based on Material Design -Guidelines. - -For OpenBox users: - -Compton is the famous stand-alone compositor that works well with the -Openbox window-manager. This package provides the recommended -configuration file compton.conf in the Adapta/openbox-3 directory. - -Just copy this file into your ~/.config folder and restart compton. - -To properly work, this suggests the optional dependencies: -ttf-noto, ttf-roboto. diff --git a/desktop/adapta-gtk-theme/adapta-gtk-theme.SlackBuild b/desktop/adapta-gtk-theme/adapta-gtk-theme.SlackBuild deleted file mode 100644 index 673e04d7ca..0000000000 --- a/desktop/adapta-gtk-theme/adapta-gtk-theme.SlackBuild +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash -# -# Slackware build script for adapta-gtk-theme. -# -# Copyright 2016-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. -# 2020 Jan Filip Chadima <jfch@jagda.eu" -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for any purpose -# with or without fee is hereby granted, provided that the above copyright -# notice and this permission notice appear in all copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=adapta-gtk-theme -VERSION=${VERSION:-3.95.0.11} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Well... we still using old glib... -sed -i "s|2\.48.0|2.46.2|" configure.ac - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ - -./autogen.sh \ - --enable-parallel \ - --enable-gtk_legacy \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp COPYING LICENSE_CC_BY_SA4 README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/desktop/adapta-gtk-theme/adapta-gtk-theme.info b/desktop/adapta-gtk-theme/adapta-gtk-theme.info deleted file mode 100644 index d6830d5e99..0000000000 --- a/desktop/adapta-gtk-theme/adapta-gtk-theme.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="adapta-gtk-theme" -VERSION="3.95.0.11" -HOMEPAGE="https://github.com/adapta-project/adapta-gtk-theme/" -DOWNLOAD="https://github.com/adapta-project/adapta-gtk-theme/archive/3.95.0.11/adapta-gtk-theme-3.95.0.11.tar.gz" -MD5SUM="5608c26b6169a561fc5a714d1230f561" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="murrine inkscape" -MAINTAINER="Jan Filip Chadima" -EMAIL="jfch@jagda.eu" diff --git a/desktop/adapta-gtk-theme/doinst.sh b/desktop/adapta-gtk-theme/doinst.sh deleted file mode 100644 index 401d987795..0000000000 --- a/desktop/adapta-gtk-theme/doinst.sh +++ /dev/null @@ -1,15 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/glib-2.0/schemas ]; then - if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 - fi -fi diff --git a/desktop/adapta-gtk-theme/slack-desc b/desktop/adapta-gtk-theme/slack-desc deleted file mode 100644 index 5c85b87288..0000000000 --- a/desktop/adapta-gtk-theme/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -adapta-gtk-theme: adapta-gtk-theme (Gtk+ theme) -adapta-gtk-theme: -adapta-gtk-theme: adapta-gtk-theme is an adaptive Gtk+ theme based on Material Design -adapta-gtk-theme: Guidelines. -adapta-gtk-theme: -adapta-gtk-theme: home page: https://github.com/adapta-project/adapta-gtk-theme/ -adapta-gtk-theme: -adapta-gtk-theme: -adapta-gtk-theme: -adapta-gtk-theme: -adapta-gtk-theme: diff --git a/desktop/arc-theme/arc-theme.SlackBuild b/desktop/arc-theme/arc-theme.SlackBuild index 8b5bf58ebb..1e5fd96b8e 100644 --- a/desktop/arc-theme/arc-theme.SlackBuild +++ b/desktop/arc-theme/arc-theme.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for "arc-theme". # Copyright 2016 Marcel Saegebarth <marc@mos6581.de> +# Copyright 2024 Philip van der Hoeven <philip@vd-hoeven.nl> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -27,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=arc-theme -VERSION=${VERSION:-20201121_81130a2} +VERSION=${VERSION:-20221218} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -66,9 +67,6 @@ else LIBDIRSUFFIX="" fi -gnome_shell="--disable-gnome-shell" ; [[ $(which gnome-shell) ]] && gnome_shell="" -cinnamon="--disable-cinnamon" ; [[ $(which cinnamon-session) ]] && cinnamon="" - set -e rm -rf $PKG @@ -84,23 +82,33 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sed -i "s|export-png=|export-type=png --export-filename=|" common/*/*.am || exit 1 - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./autogen.sh \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - $gnome_shell \ - $cinnamon \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG +THEMES="gtk2,gtk3,gtk4,metacity,plank,unity,xfwm" + +# Check for gnome and cinnamon +type -P gnome-shell >/dev/null && THEMES+=",gnome-shell" +type -P cinnamon-session >/dev/null && THEMES+=",cinnamon" + +# Build transparent theme +mkdir build +cd build + meson setup .. \ + --prefix=/usr \ + -Dthemes=$THEMES + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. + +# Build solid theme +rm -rf build +mkdir build +cd build + meson setup .. \ + --prefix=/usr \ + -Dtransparency=false \ + -Dthemes=$THEMES + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING HACKING.md README.md $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/desktop/arc-theme/arc-theme.info b/desktop/arc-theme/arc-theme.info index 37e8664521..e0226cf701 100644 --- a/desktop/arc-theme/arc-theme.info +++ b/desktop/arc-theme/arc-theme.info @@ -1,10 +1,10 @@ PRGNAM="arc-theme" -VERSION="20201121_81130a2" +VERSION="20221218" HOMEPAGE="https://github.com/jnsh/arc-theme" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/arc-theme-20201121_81130a2.tar.xz" -MD5SUM="bffd762770faf368ad2849534c5e3ad4" +DOWNLOAD="https://github.com/jnsh/arc-theme/releases/download/20221218/arc-theme-20221218.tar.xz" +MD5SUM="ac268a1603e85e9a1c8fd07f04f92cc1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="inkscape murrine optipng" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" +REQUIRES="murrine" +MAINTAINER="Philip van der Hoeven" +EMAIL="philip@vd-hoeven.nl" diff --git a/desktop/bibata-cursor-theme/README b/desktop/bibata-cursor-theme/README new file mode 100644 index 0000000000..e76c673be2 --- /dev/null +++ b/desktop/bibata-cursor-theme/README @@ -0,0 +1,8 @@ +Bibata is an open source, compact, and material designed cursor set that +aims to improve the cursor experience for users. It is one of the most +popular cursor sets in the Linux community and is now available for free +on Windows as well, with multiple color and size options. Its goal is to +offer personalized cursors to users. + +This SlackBuild only repackages the binary. It does not compile the +source tarball. diff --git a/libraries/html5lib/html5lib.SlackBuild b/desktop/bibata-cursor-theme/bibata-cursor-theme.SlackBuild index fa754e8b25..1dfae174eb 100644 --- a/libraries/html5lib/html5lib.SlackBuild +++ b/desktop/bibata-cursor-theme/bibata-cursor-theme.SlackBuild @@ -1,10 +1,8 @@ #!/bin/bash -# Slackware build script for html5lib +# Slackware build script for bibata-cursor-theme -# Copyright 2023 Steven Voges <Oregon, USA> -# Copyright 2017-2018 Larry Hajali <larryhaja[at]gmail[dot]com> -# Written by Šime Ramov <s@ramov.com> +# Copyright 2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,19 +24,14 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=html5lib -VERSION=${VERSION:-1.1} +PRGNAM=bibata-cursor-theme +VERSION=${VERSION:-2.0.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi +SRCNAM=Bibata +ARCH=noarch if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" @@ -54,9 +47,12 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP + +# Extract tarball at the new $PRGNAM-$VERSION folder (ex. bibata-2.0.6) rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +mkdir $PRGNAM-$VERSION cd $PRGNAM-$VERSION +tar xvf $CWD/$SRCNAM.tar.xz chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -64,20 +60,22 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# Move the extracted icon files to $PKG/usr/share/icons +mkdir -p $PKG/usr/share/icons +mv Bibata* $PKG/usr/share/icons mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.rst LICENSE PKG-INFO \ - $PKG/usr/doc/$PRGNAM-$VERSION +mv LICENSE $PKG/usr/doc/$PRGNAM-$VERSION # Move the LICENSE file instead of copying it cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# After moving all the files within the tarball, remove the $PRGNAM-$VERSION folder +cd $TMP && rmdir $PRGNAM-$VERSION + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG +find . -type l \ + -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \ + sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/desktop/bibata-cursor-theme/bibata-cursor-theme.info b/desktop/bibata-cursor-theme/bibata-cursor-theme.info new file mode 100644 index 0000000000..2597daea25 --- /dev/null +++ b/desktop/bibata-cursor-theme/bibata-cursor-theme.info @@ -0,0 +1,10 @@ +PRGNAM="bibata-cursor-theme" +VERSION="2.0.6" +HOMEPAGE="https://github.com/ful1e5/Bibata_Cursor" +DOWNLOAD="https://github.com/ful1e5/Bibata_Cursor/releases/download/v2.0.6/Bibata.tar.xz" +MD5SUM="991936d5522269e101267e9d2c3ce840" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu@protonmail.com" diff --git a/desktop/bibata-cursor-theme/slack-desc b/desktop/bibata-cursor-theme/slack-desc new file mode 100644 index 0000000000..2633c39f1e --- /dev/null +++ b/desktop/bibata-cursor-theme/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +bibata-cursor-theme: bibata-cursor-theme (Material Based Cursor Theme) +bibata-cursor-theme: +bibata-cursor-theme: Bibata is an open source, compact, and material designed cursor set +bibata-cursor-theme: that aims to improve the cursor experience for users. It is one of the +bibata-cursor-theme: most popular cursor sets in the Linux community and is now available +bibata-cursor-theme: for free on Windows as well, with multiple color and size options. Its +bibata-cursor-theme: goal is to offer personalized cursors to users. +bibata-cursor-theme: +bibata-cursor-theme: +bibata-cursor-theme: +bibata-cursor-theme: diff --git a/desktop/buku/buku.SlackBuild b/desktop/buku/buku.SlackBuild index 582fae6e37..d793e0db50 100644 --- a/desktop/buku/buku.SlackBuild +++ b/desktop/buku/buku.SlackBuild @@ -4,7 +4,7 @@ # # Copyright 2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. # Copyright 2019-2021 Andrew Clemons, Wellington New Zealand -# Copyright 2022-2023 Andrew Clemons, Tokyo Japan +# Copyright 2022-2024 Andrew Clemons, Tokyo Japan # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=buku -VERSION=${VERSION:-4.8} +VERSION=${VERSION:-4.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -49,20 +49,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG diff --git a/desktop/buku/buku.info b/desktop/buku/buku.info index 62d587b8a9..317170e488 100644 --- a/desktop/buku/buku.info +++ b/desktop/buku/buku.info @@ -1,8 +1,8 @@ PRGNAM="buku" -VERSION="4.8" +VERSION="4.9" HOMEPAGE="https://github.com/jarun/buku" -DOWNLOAD="https://github.com/jarun/buku/archive/v4.8/buku-4.8.tar.gz" -MD5SUM="63cf5e007af3eaa8f7b07b8c70e12112" +DOWNLOAD="https://github.com/jarun/buku/archive/v4.9/buku-4.9.tar.gz" +MD5SUM="0c5de4443843f3cc6215566a82bb2c88" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="BeautifulSoup4 cryptography html5lib" diff --git a/desktop/dolphin-megasync/dolphin-megasync.SlackBuild b/desktop/dolphin-megasync/dolphin-megasync.SlackBuild index d9804bea4e..6a1d78c404 100644 --- a/desktop/dolphin-megasync/dolphin-megasync.SlackBuild +++ b/desktop/dolphin-megasync/dolphin-megasync.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dolphin-megasync SRCNAM=MEGAsync -VERSION=${VERSION:-4.7.2.0} +VERSION=${VERSION:-5.2.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,10 +73,9 @@ cd $SRCNAM-${VERSION}_Linux # prepare source mkdir -p build -# Apply Arch patch (Thanks to Arch) -patch -p2 -i $CWD/kf5.patch --verbose || extit 1 -mv src/MEGAShellExtDolphin/CMakeLists.txt src/MEGAShellExtDolphin/CMakeLists.txt.old -mv src/MEGAShellExtDolphin/CMakeLists_kde5.txt src/MEGAShellExtDolphin/CMakeLists.txt +# fix kf5 INSTALL PATH +cp src/MEGAShellExtDolphin/CMakeLists.txt src/MEGAShellExtDolphin/CMakeLists.txt.old +patch -p1 -i $CWD/kf5_5.2.1.0_Linux.patch --verbose || exit 1 chown -R root:root . find -L . \ diff --git a/desktop/dolphin-megasync/dolphin-megasync.info b/desktop/dolphin-megasync/dolphin-megasync.info index ecb9348136..37b855903d 100644 --- a/desktop/dolphin-megasync/dolphin-megasync.info +++ b/desktop/dolphin-megasync/dolphin-megasync.info @@ -1,10 +1,10 @@ PRGNAM="dolphin-megasync" -VERSION="4.7.2.0" +VERSION="5.2.1.0" HOMEPAGE="https://github.com/meganz/MEGAsync/" -DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.7.2.0_Linux/MEGAsync-4.7.2.0_Linux.tar.gz" -MD5SUM="b1734bf785e279dd0d01d8ff254c7587" +DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v5.2.1.0_Linux/MEGAsync-5.2.1.0_Linux.tar.gz" +MD5SUM="ec6e327ea4d45853455fbf23e1fcd62d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="MEGAsync" MAINTAINER="JW(Shinichi Abe)" EMAIL="shin1.abe@nifty.com" diff --git a/desktop/dolphin-megasync/kf5.patch b/desktop/dolphin-megasync/kf5.patch deleted file mode 100644 index 3f773ddeef..0000000000 --- a/desktop/dolphin-megasync/kf5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/MEGAsync/src/MEGAShellExtDolphin/CMakeLists_kde5.txt b/MEGAsync/src/MEGAShellExtDolphin/CMakeLists_kde5.txt -@@ -64,4 +64,4 @@ target_link_libraries(${MEGASYNCPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWid - - #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/megasync-plugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) - install(FILES megasync-plugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) --install(TARGETS ${MEGASYNCPLUGIN} DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/plugins) -+install(TARGETS ${MEGASYNCPLUGIN} DESTINATION ${PLUGIN_INSTALL_DIR}) - -diff --git a/MEGAsync/src/MEGAShellExtDolphin/megasync-plugin.moc b/src/MEGAShellExtDolphin/megasync-plugin.moc -deleted file mode 100644 -index e69de29b..00000000 - diff --git a/desktop/dolphin-megasync/kf5_5.2.1.0_Linux.patch b/desktop/dolphin-megasync/kf5_5.2.1.0_Linux.patch new file mode 100644 index 0000000000..f00b80103d --- /dev/null +++ b/desktop/dolphin-megasync/kf5_5.2.1.0_Linux.patch @@ -0,0 +1,8 @@ +--- MEGAsync-5.2.1.0_Linux/src/MEGAShellExtDolphin/CMakeLists.txt 2024-04-17 20:25:54.000000000 +0900 ++++ MEGAsync-5.2.1.0_Linux.New/src/MEGAShellExtDolphin/CMakeLists.txt 2024-05-10 19:38:46.571062863 +0900 +@@ -58,4 +58,4 @@ + target_link_libraries(${MEGASYNCPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets) + + install(FILES megasync-plugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +-install(TARGETS ${MEGASYNCPLUGIN} DESTINATION ${CMAKE_INSTALL_LIBDIR}/qt5/plugins) ++install(TARGETS ${MEGASYNCPLUGIN} DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/desktop/dunst/dunst.SlackBuild b/desktop/dunst/dunst.SlackBuild index 37dbc84429..4ce590a46e 100644 --- a/desktop/dunst/dunst.SlackBuild +++ b/desktop/dunst/dunst.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2014-2021 S. S. Bolokanar, Bulgaria <bolokanar@bulgars.org> +# Copyright 2014-2021 S. S. Bolokanar, Bulgaria <bolokanar@bulgarsociety.org> # С. С. Болоканаръ, България # All rights reserved. # @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dunst -VERSION=${VERSION:-1.10.0} +VERSION=${VERSION:-1.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/dunst/dunst.info b/desktop/dunst/dunst.info index 706de3ce97..6f4d586078 100644 --- a/desktop/dunst/dunst.info +++ b/desktop/dunst/dunst.info @@ -1,10 +1,10 @@ PRGNAM="dunst" -VERSION="1.10.0" +VERSION="1.11.0" HOMEPAGE="https://dunst-project.org/" -DOWNLOAD="https://github.com/dunst-project/dunst/archive/v1.10.0/dunst-1.10.0.tar.gz" -MD5SUM="691f34ed84de67a2ef88d6bcd13d68f2" +DOWNLOAD="https://github.com/dunst-project/dunst/archive/v1.11.0/dunst-1.11.0.tar.gz" +MD5SUM="0faf54c38db9efab32c302d122a55a13" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="S. S. Bolokanar" -EMAIL="bolokanar@bulgars.org" +EMAIL="bolokanar@bulgarsociety.org" diff --git a/desktop/durden/durden.info b/desktop/durden/durden.info index 8b6f01c575..9e0e422cb4 100644 --- a/desktop/durden/durden.info +++ b/desktop/durden/durden.info @@ -2,7 +2,7 @@ PRGNAM="durden" VERSION="0.6.1" HOMEPAGE="https://durden.arcan-fe.com" DOWNLOAD="https://github.com/letoram/durden/archive/0.6.1/durden-0.6.1.tar.gz" -MD5SUM="9d9bacafe2d906cd8968c96317e61e67" +MD5SUM="f7eaf8fbbd6ebf118ba883f0ba3afe00" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="arcan" diff --git a/desktop/dwmblocks/dwmblocks.SlackBuild b/desktop/dwmblocks/dwmblocks.SlackBuild index 92f4da7fcc..ad7fccb5c9 100644 --- a/desktop/dwmblocks/dwmblocks.SlackBuild +++ b/desktop/dwmblocks/dwmblocks.SlackBuild @@ -25,13 +25,13 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dwmblocks -VERSION=${VERSION:-20240319} +VERSION=${VERSION:-20240420} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} SRCNAM=dwmblocks-async -COMMIT=${COMMIT:-8ebe985db8c0818e6316b8b4b82e20d6f680c017} +COMMIT=${COMMIT:-fe538a7a2fc52e991a553bd76719735141658844} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/desktop/dwmblocks/dwmblocks.info b/desktop/dwmblocks/dwmblocks.info index 4dfb1956e8..7b85216818 100644 --- a/desktop/dwmblocks/dwmblocks.info +++ b/desktop/dwmblocks/dwmblocks.info @@ -1,8 +1,8 @@ PRGNAM="dwmblocks" -VERSION="20240319" +VERSION="20240420" HOMEPAGE="https://github.com/UtkarshVerma/dwmblocks-async" -DOWNLOAD="https://github.com/UtkarshVerma/dwmblocks-async/archive/8ebe985/dwmblocks-async-8ebe985db8c0818e6316b8b4b82e20d6f680c017.tar.gz" -MD5SUM="a20824ce2b71beb6c804a4ca19632aa8" +DOWNLOAD="https://github.com/UtkarshVerma/dwmblocks-async/archive/fe538a7/dwmblocks-async-fe538a7a2fc52e991a553bd76719735141658844.tar.gz" +MD5SUM="40155bf796f0be1799853bb51bf77963" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/e16.theme.pack/e16.theme.pack.SlackBuild b/desktop/e16.theme.pack/e16.theme.pack.SlackBuild index 872ed39b12..bde235cd64 100644 --- a/desktop/e16.theme.pack/e16.theme.pack.SlackBuild +++ b/desktop/e16.theme.pack/e16.theme.pack.SlackBuild @@ -32,9 +32,6 @@ PKGTYPE=${PKGTYPE:-tgz} ARCH=noarch -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -102,7 +99,7 @@ for subdir in */* ; do done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/e16.theme.pack/e16.theme.pack.info b/desktop/e16.theme.pack/e16.theme.pack.info index e6e5411203..901d182ebe 100644 --- a/desktop/e16.theme.pack/e16.theme.pack.info +++ b/desktop/e16.theme.pack/e16.theme.pack.info @@ -2,7 +2,7 @@ PRGNAM="e16.theme.pack" VERSION="1.0.3" HOMEPAGE="https://sourceforge.net/projects/e16-theme-pack/" DOWNLOAD="https://sourceforge.net/projects/e16-theme-pack/files/e16.theme.pack-1.0.3.tar.gz" -MD5SUM="119f1d1739f5c9b888d9148541f38e64" +MD5SUM="e9cd22b44d13ede16cb042a4a3569a52" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz b/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz Binary files differnew file mode 100644 index 0000000000..10d31a2603 --- /dev/null +++ b/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz diff --git a/desktop/fvwm3/fvwm3.SlackBuild b/desktop/fvwm3/fvwm3.SlackBuild index de7467eaa6..b9a6827b5b 100644 --- a/desktop/fvwm3/fvwm3.SlackBuild +++ b/desktop/fvwm3/fvwm3.SlackBuild @@ -70,6 +70,11 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +# rename perl libraries to avoid collisions with the stock fvwm +# borrowed from ALT Linux +# https://git.altlinux.org/gears/f/fvwm3.git?a=blob_plain;f=0001-rename-perl-fvwm.patch +zcat $CWD/0001-rename-perl-fvwm.patch.gz | patch -p2 + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -77,6 +82,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/fvwm3/fvwm3.info b/desktop/fvwm3/fvwm3.info index dfcc538c99..942791e618 100644 --- a/desktop/fvwm3/fvwm3.info +++ b/desktop/fvwm3/fvwm3.info @@ -1,8 +1,8 @@ PRGNAM="fvwm3" VERSION="1.1.0" HOMEPAGE="https://github.com/fvwmorg/fvwm3" -DOWNLOAD="https://github.com/fvwmorg/fvwm3/releases/download/1.1.0/fvwm3-1.1.0.tar.gz" -MD5SUM="35c38bbdc97f9efac0271f3c7ec5a0c3" +DOWNLOAD="https://github.com/fvwmorg/fvwm3/archive/1.1.0/fvwm3-1.1.0.tar.gz" +MD5SUM="033cb2740c12b5acd406d75271dd1317" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="google-go-lang" diff --git a/desktop/gnome-shell/gnome-shell.SlackBuild b/desktop/gnome-shell/gnome-shell.SlackBuild index 06eb31e9e7..42d18f2289 100644 --- a/desktop/gnome-shell/gnome-shell.SlackBuild +++ b/desktop/gnome-shell/gnome-shell.SlackBuild @@ -29,12 +29,15 @@ # Slackware's gsettings-desktop-schemas-40.0. Then we install the 41.0 schemas # in a alternate location, compile them, and show gnome-shell where they are # using XDG_DATA_DIRS at runtime with a wrapper script. +# +# Modified May 10, 2024 - Disable building tests to drop mutter's +# xvfb-run dependency. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gnome-shell VERSION=${VERSION:-41.9} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -143,7 +146,8 @@ cd build --prefix=/usr \ --sysconfdir=/etc \ -Dstrip=true \ - -Dsystemd=false + -Dsystemd=false \ + -Dtests=false "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install cd .. diff --git a/desktop/gtklock-playerctl-module/gtklock-playerctl-module.SlackBuild b/desktop/gtklock-playerctl-module/gtklock-playerctl-module.SlackBuild index 006af47fba..3ecb6a571c 100644 --- a/desktop/gtklock-playerctl-module/gtklock-playerctl-module.SlackBuild +++ b/desktop/gtklock-playerctl-module/gtklock-playerctl-module.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gtklock-playerctl-module -# Copyright 2023 Jay Lanagan (j@lngn.net), Detroit, MI, USA. +# Copyright 2023-2024 Jay Lanagan (j@lngn.net), Detroit, MI, USA. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gtklock-playerctl-module -VERSION=${VERSION:-2.0.1} +VERSION=${VERSION:-3.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/gtklock-playerctl-module/gtklock-playerctl-module.info b/desktop/gtklock-playerctl-module/gtklock-playerctl-module.info index 997f8b158c..7531a97c9f 100644 --- a/desktop/gtklock-playerctl-module/gtklock-playerctl-module.info +++ b/desktop/gtklock-playerctl-module/gtklock-playerctl-module.info @@ -1,8 +1,8 @@ PRGNAM="gtklock-playerctl-module" -VERSION="2.0.1" +VERSION="3.0.0" HOMEPAGE="https://github.com/jovanlanik/gtklock-playerctl-module" -DOWNLOAD="https://github.com/jovanlanik/gtklock-playerctl-module/archive/v2.0.1/gtklock-playerctl-module-2.0.1.tar.gz" -MD5SUM="d886ef3220236e48379e058f6ea63936" +DOWNLOAD="https://github.com/jovanlanik/gtklock-playerctl-module/archive/v3.0.0/gtklock-playerctl-module-3.0.0.tar.gz" +MD5SUM="4356cd3a802c53c2ef089ac9e3ec7b8f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtklock playerctl" diff --git a/desktop/gtklock-powerbar-module/gtklock-powerbar-module.SlackBuild b/desktop/gtklock-powerbar-module/gtklock-powerbar-module.SlackBuild index 1af4bc79c7..077e243e30 100644 --- a/desktop/gtklock-powerbar-module/gtklock-powerbar-module.SlackBuild +++ b/desktop/gtklock-powerbar-module/gtklock-powerbar-module.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gtklock-powerbar-module -# Copyright 2023 Jay Lanagan (j@lngn.net), Detroit, MI, USA. +# Copyright 2023-2024 Jay Lanagan (j@lngn.net), Detroit, MI, USA. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gtklock-powerbar-module -VERSION=${VERSION:-2.0.1} +VERSION=${VERSION:-3.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/gtklock-powerbar-module/gtklock-powerbar-module.info b/desktop/gtklock-powerbar-module/gtklock-powerbar-module.info index 314c28167a..a5aebddda1 100644 --- a/desktop/gtklock-powerbar-module/gtklock-powerbar-module.info +++ b/desktop/gtklock-powerbar-module/gtklock-powerbar-module.info @@ -1,8 +1,8 @@ PRGNAM="gtklock-powerbar-module" -VERSION="2.0.1" +VERSION="3.0.0" HOMEPAGE="https://github.com/jovanlanik/gtklock-powerbar-module" -DOWNLOAD="https://github.com/jovanlanik/gtklock-powerbar-module/archive/v2.0.1/gtklock-powerbar-module-2.0.1.tar.gz" -MD5SUM="b8f48f929a787a30a89610c3b89a8735" +DOWNLOAD="https://github.com/jovanlanik/gtklock-powerbar-module/archive/v3.0.0/gtklock-powerbar-module-3.0.0.tar.gz" +MD5SUM="517b72dc7d48ab5d2e6cdbc024118539" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtklock" diff --git a/desktop/gtklock-userinfo-module/gtklock-userinfo-module.SlackBuild b/desktop/gtklock-userinfo-module/gtklock-userinfo-module.SlackBuild index bcda83e643..059429300c 100644 --- a/desktop/gtklock-userinfo-module/gtklock-userinfo-module.SlackBuild +++ b/desktop/gtklock-userinfo-module/gtklock-userinfo-module.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gtklock-userinfo-module -# Copyright 2023 Jay Lanagan (j@lngn.net), Detroit, MI, USA. +# Copyright 2023-2024 Jay Lanagan (j@lngn.net), Detroit, MI, USA. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gtklock-userinfo-module -VERSION=${VERSION:-2.1.0} +VERSION=${VERSION:-3.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/gtklock-userinfo-module/gtklock-userinfo-module.info b/desktop/gtklock-userinfo-module/gtklock-userinfo-module.info index cbdc5c3fbe..bf14a56597 100644 --- a/desktop/gtklock-userinfo-module/gtklock-userinfo-module.info +++ b/desktop/gtklock-userinfo-module/gtklock-userinfo-module.info @@ -1,8 +1,8 @@ PRGNAM="gtklock-userinfo-module" -VERSION="2.1.0" +VERSION="3.0.0" HOMEPAGE="https://github.com/jovanlanik/gtklock-userinfo-module" -DOWNLOAD="https://github.com/jovanlanik/gtklock-userinfo-module/archive/v2.1.0/gtklock-userinfo-module-2.1.0.tar.gz" -MD5SUM="0aa43eb2af974e57b9b2b4a9e904f247" +DOWNLOAD="https://github.com/jovanlanik/gtklock-userinfo-module/archive/v3.0.0/gtklock-userinfo-module-3.0.0.tar.gz" +MD5SUM="ee894431fe6302ed0902fdd64bcb31d2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README% gtklock mugshot" diff --git a/desktop/gtklock/gtklock.SlackBuild b/desktop/gtklock/gtklock.SlackBuild index 7bcc1c46db..80fb93a9be 100644 --- a/desktop/gtklock/gtklock.SlackBuild +++ b/desktop/gtklock/gtklock.SlackBuild @@ -10,7 +10,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gtklock -VERSION=${VERSION:-2.1.0} +VERSION=${VERSION:-3.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -61,28 +61,35 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -# 20230407 bkw: sed surgery. Slackware 15.0 doesn't have a pkg-config -# pam.pc, so we have to remove it from LIBS, then add -lpam to LDLIBS. -# Also, use our CFLAGS, fix the man page path, and install to /usr, -# not /usr/local. -sed -i -e '/^LIBS\>/s,\<pam\>,,' \ - -e '/^LDLIBS\>/s,$, -lpam,' \ - -e "/-std=/s,= ,= $SLKCFLAGS ," \ - -e 's,share/man,man,g' \ - -e 's,usr/local,usr,g' \ - makefile - -make -strip $PRGNAM -make install DESTDIR=$PKG -gzip $PKG/usr/man/man?/* +mkdir -p meson-build +cd meson-build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson setup .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc + +"${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # It's a config file, so make it .new rename lock lock.new $PKG/etc/pam.d/$PRGNAM +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKGDOC -cp -a LICENSE README* $PKGDOC +cp -a LICENSE README.md $PKGDOC cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/gtklock/gtklock.info b/desktop/gtklock/gtklock.info index 991a7633d0..ad123e6a4f 100644 --- a/desktop/gtklock/gtklock.info +++ b/desktop/gtklock/gtklock.info @@ -1,10 +1,10 @@ PRGNAM="gtklock" -VERSION="2.1.0" +VERSION="3.0.0" HOMEPAGE="https://github.com/jovanlanik/gtklock/" -DOWNLOAD="https://github.com/jovanlanik/gtklock/archive/v2.1.0/gtklock-2.1.0.tar.gz" -MD5SUM="479d24e6d283e154cb4aa84beff645f3" +DOWNLOAD="https://github.com/jovanlanik/gtklock/archive/v3.0.0/gtklock-3.0.0.tar.gz" +MD5SUM="c8545d13ec005aac659257010b20d6a1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gtk-layer-shell scdoc" +REQUIRES="gtk-layer-shell gtk-session-lock scdoc" MAINTAINER="Jay Lanagan" EMAIL="j@lngn.net" diff --git a/desktop/ideviceinstaller/ideviceinstaller.SlackBuild b/desktop/ideviceinstaller/ideviceinstaller.SlackBuild index e1f9fbeeba..15650ab0be 100644 --- a/desktop/ideviceinstaller/ideviceinstaller.SlackBuild +++ b/desktop/ideviceinstaller/ideviceinstaller.SlackBuild @@ -6,7 +6,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ideviceinstaller -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -84,7 +84,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING README.md NEWS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/ideviceinstaller/ideviceinstaller.info b/desktop/ideviceinstaller/ideviceinstaller.info index 20e971ab62..d018bb455d 100644 --- a/desktop/ideviceinstaller/ideviceinstaller.info +++ b/desktop/ideviceinstaller/ideviceinstaller.info @@ -1,8 +1,8 @@ PRGNAM="ideviceinstaller" -VERSION="1.1.0" +VERSION="1.1.1" HOMEPAGE="http://www.libimobiledevice.org" -DOWNLOAD="http://www.libimobiledevice.org/downloads/ideviceinstaller-1.1.0.tar.bz2" -MD5SUM="20bd74111c1e8bf7ce393f8f0919263c" +DOWNLOAD="https://github.com/libimobiledevice/ideviceinstaller/releases/download/1.1.1/ideviceinstaller-1.1.1.tar.bz2" +MD5SUM="824b1c6bcb2fab6a0788945c019f83be" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/libqtxdg/libqtxdg.SlackBuild b/desktop/libqtxdg/libqtxdg.SlackBuild index c4cda99824..7d4f1f175d 100644 --- a/desktop/libqtxdg/libqtxdg.SlackBuild +++ b/desktop/libqtxdg/libqtxdg.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libqtxdg # Copyright 2018 Egor Zayats, Minsk Belarus -# Copyright 2022-2023 Isaac Yu <isaacyu@protonmail.com> +# Copyright 2022-2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libqtxdg -VERSION=${VERSION:-3.11.0} +VERSION=${VERSION:-3.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/libqtxdg/libqtxdg.info b/desktop/libqtxdg/libqtxdg.info index 8950ec872c..77003be19b 100644 --- a/desktop/libqtxdg/libqtxdg.info +++ b/desktop/libqtxdg/libqtxdg.info @@ -1,8 +1,8 @@ PRGNAM="libqtxdg" -VERSION="3.11.0" +VERSION="3.12.0" HOMEPAGE="https://lxqt.org" -DOWNLOAD="https://github.com/lxqt/libqtxdg/releases/download/3.11.0/libqtxdg-3.11.0.tar.xz" -MD5SUM="1dfe393914a1e29c3b0d684bff8189f4" +DOWNLOAD="https://github.com/lxqt/libqtxdg/releases/download/3.12.0/libqtxdg-3.12.0.tar.xz" +MD5SUM="6cb85091630b7d84278b2430e92a62bb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lxqt-build-tools" diff --git a/desktop/lxappearance-obconf/lxappearance-obconf.SlackBuild b/desktop/lxappearance-obconf/lxappearance-obconf.SlackBuild index bd58521f3f..abf6ead9e6 100644 --- a/desktop/lxappearance-obconf/lxappearance-obconf.SlackBuild +++ b/desktop/lxappearance-obconf/lxappearance-obconf.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for lxappearance-obconf -# Copyright 2011-2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2011-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxappearance-obconf -VERSION=${VERSION:-0.2.3} -BUILD=${BUILD:-3} +VERSION=${VERSION:-20231122_f663dca} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/desktop/lxappearance-obconf/lxappearance-obconf.info b/desktop/lxappearance-obconf/lxappearance-obconf.info index 637f4999f8..cf056cca0d 100644 --- a/desktop/lxappearance-obconf/lxappearance-obconf.info +++ b/desktop/lxappearance-obconf/lxappearance-obconf.info @@ -1,8 +1,8 @@ PRGNAM="lxappearance-obconf" -VERSION="0.2.3" +VERSION="20231122_f663dca" HOMEPAGE="https://lxde.org/" -DOWNLOAD="http://downloads.sf.net/lxde/lxappearance-obconf-0.2.3.tar.xz" -MD5SUM="ae0076d489aa786f5d573f7ff592a4ab" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/lxappearance-obconf-20231122_f663dca.tar.xz" +MD5SUM="68ffd90cffb6acb1ce701fa9090987d3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lxappearance openbox" diff --git a/desktop/lxappearance/README b/desktop/lxappearance/README index 47945eed39..2636aec429 100644 --- a/desktop/lxappearance/README +++ b/desktop/lxappearance/README @@ -4,8 +4,8 @@ change the theme, icons, and fonts used by applications easily. If you want to build this without dbus support (ex. you are building not to use this inside of LXDE) pass to the script the switch: - DBUS=no + DBUS=no -If you want to build this for GTK+3, pass to the script the switch +If you want to build this for gtk+2, pass to the script the switch - GTK3=yes + GTK3=no diff --git a/desktop/lxappearance/lxappearance.SlackBuild b/desktop/lxappearance/lxappearance.SlackBuild index d9ccdad1a1..cceb060b56 100644 --- a/desktop/lxappearance/lxappearance.SlackBuild +++ b/desktop/lxappearance/lxappearance.SlackBuild @@ -1,14 +1,31 @@ #!/bin/bash # Slackware build script for LXAppearance - -# Originally by "majk" <majk@konstelacioj.info> +# Copyright 2019-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxappearance VERSION=${VERSION:-0.6.3} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -20,9 +37,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -46,13 +60,9 @@ else LIBDIRSUFFIX="" fi -DBUS=${DBUS:-yes} -DBUS_SUPPORT="--enable-dbus" -[ "$DBUS" = "no" ] && DBUS_SUPPORT="" - +DBUS_SUPPORT="--enable-dbus" ; [ "${DBUS:-yes}" = "no" ] && DBUS_SUPPORT="" -WITHGTK3="" -[ "${GTK3:-no}" = "yes" ] && WITHGTK3="--enable-gtk3" +WITHGTK3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && WITHGTK3="" set -e diff --git a/desktop/lxpanel/README b/desktop/lxpanel/README index 14dd8a5e8a..1874d5d900 100644 --- a/desktop/lxpanel/README +++ b/desktop/lxpanel/README @@ -1 +1,7 @@ LXPanel is a NETWM/EWMH compliant lightweight X11 desktop panel. + +If you want to build this for gtk+2, pass to the script the switch + + GTK3=no + +you will need the additional dependency keybinder in this case. diff --git a/desktop/lxpanel/lxpanel.SlackBuild b/desktop/lxpanel/lxpanel.SlackBuild index d1fd7184d5..7ef88cb5ef 100644 --- a/desktop/lxpanel/lxpanel.SlackBuild +++ b/desktop/lxpanel/lxpanel.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for lxpanel # (C) 2008 Michael Wagner <lapinours@web.de> -# Copyright 2011-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2011-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxpanel -VERSION=${VERSION:-0.10.1} +VERSION=${VERSION:-20230918_633a2d4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -67,6 +64,8 @@ else LIBDIRSUFFIX="" fi +WITHGTK3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && WITHGTK3="" + DOCS="AUTHORS COPYING ChangeLog README" set -e @@ -84,21 +83,24 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sh autogen.sh || true +for i in $CWD/patches/* ; do patch -p1 < $i ; done + +./autogen.sh || true -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ --sysconfdir=/etc \ - --enable-man \ + --enable-debug=no \ --mandir=/usr/man \ --program-prefix= \ --program-suffix= \ --with-plugins=all \ --disable-silent-rules \ + $WITHGTK3 \ --build=$ARCH-slackware-linux make diff --git a/desktop/lxpanel/lxpanel.info b/desktop/lxpanel/lxpanel.info index acef8470ba..5dc89ae13f 100644 --- a/desktop/lxpanel/lxpanel.info +++ b/desktop/lxpanel/lxpanel.info @@ -1,10 +1,10 @@ PRGNAM="lxpanel" -VERSION="0.10.1" +VERSION="20230918_633a2d4" HOMEPAGE="https://wiki.lxde.org/en/LXPanel" -DOWNLOAD="https://downloads.sf.net/lxde/lxpanel-0.10.1.tar.xz" -MD5SUM="c922d044789c3d7ae028f0e80dea18b0" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/lxpanel-20230918_633a2d4.tar.xz" +MD5SUM="e8b042e60c977c70eda52caf0f61b6b7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="keybinder libfm" +REQUIRES="libfm" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/desktop/lxpanel/patches/lxpanel-0.10.1-fix-pager-panel-width.patch b/desktop/lxpanel/patches/lxpanel-0.10.1-fix-pager-panel-width.patch new file mode 100644 index 0000000000..4d53fc8f78 --- /dev/null +++ b/desktop/lxpanel/patches/lxpanel-0.10.1-fix-pager-panel-width.patch @@ -0,0 +1,37 @@ +From b46e3a39786a5be04bf9cc3844dd184308cd7495 Mon Sep 17 00:00:00 2001 +From: Ben Walsh <b@wumpster.com> +Date: Sat, 6 Jun 2020 10:38:15 +0100 +Subject: [PATCH] Specify GTK_REQUEST_CONSTANT_SIZE. Fixes #773. + +--- + src/panel.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/panel.c b/src/panel.c +index da9e718b..b52fc796 100644 +--- a/src/panel.c ++++ b/src/panel.c +@@ -293,6 +293,12 @@ lxpanel_get_preferred_height (GtkWidget *widget, + if (natural_height) + *natural_height = requisition.height; + } ++ ++static GtkSizeRequestMode ++lxpanel_get_request_mode (GtkWidget *widget) ++{ ++ return GTK_SIZE_REQUEST_CONSTANT_SIZE; ++} + #endif + + static void lxpanel_size_allocate(GtkWidget *widget, GtkAllocation *a) +@@ -413,6 +419,7 @@ static void lxpanel_class_init(PanelToplevelClass *klass) + #if GTK_CHECK_VERSION(3, 0, 0) + widget_class->get_preferred_width = lxpanel_get_preferred_width; + widget_class->get_preferred_height = lxpanel_get_preferred_height; ++ widget_class->get_request_mode = lxpanel_get_request_mode; + #else + widget_class->size_request = lxpanel_size_request; + #endif +-- +2.27.0 + diff --git a/desktop/mint-l-icons/mint-l-icons.SlackBuild b/desktop/mint-l-icons/mint-l-icons.SlackBuild index 4f4a48a110..ee47da42a2 100644 --- a/desktop/mint-l-icons/mint-l-icons.SlackBuild +++ b/desktop/mint-l-icons/mint-l-icons.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="mint-l-icons" -VERSION=${VERSION:-1.6.7} +VERSION=${VERSION:-1.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,6 +50,9 @@ cd $PKG tar xvf $CWD/$PRGNAM"_"$VERSION.tar.xz --strip-components=1 \ $PRGNAM/usr/ +# Remove broken relative symlinks +find $PKG/usr/share/icons -xtype l -delete + # install docs & license ( cd $PKG/usr/doc/$PRGNAM-$VERSION @@ -71,4 +74,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG +find . -type l \ + -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \ + sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/desktop/mint-l-icons/mint-l-icons.info b/desktop/mint-l-icons/mint-l-icons.info index 9ef71c53b7..a589db4e9c 100644 --- a/desktop/mint-l-icons/mint-l-icons.info +++ b/desktop/mint-l-icons/mint-l-icons.info @@ -1,8 +1,8 @@ PRGNAM="mint-l-icons" -VERSION="1.6.7" +VERSION="1.7.0" HOMEPAGE="https://github.com/linuxmint/mint-l-icons" -DOWNLOAD="http://packages.linuxmint.com/pool/main/m/mint-l-icons/mint-l-icons_1.6.7.tar.xz" -MD5SUM="f616ca7d9d674b4a2bed754161706a32" +DOWNLOAD="http://packages.linuxmint.com/pool/main/m/mint-l-icons/mint-l-icons_1.7.0.tar.xz" +MD5SUM="1157ca18c1e537ffdd80f50774a7a504" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/mint-themes/mint-themes.SlackBuild b/desktop/mint-themes/mint-themes.SlackBuild index 599febad42..a26c379e2b 100644 --- a/desktop/mint-themes/mint-themes.SlackBuild +++ b/desktop/mint-themes/mint-themes.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for mint-themes # Copyright 2017 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA +# Copyright 2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,16 +26,13 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="mint-themes" -VERSION=${VERSION:-2.0.9} +VERSION=${VERSION:-2.1.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} ARCH=noarch -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -48,10 +46,10 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION cd $TMP -tar xvf $CWD/$PRGNAM"_"$VERSION.tar.xz -cd $PRGNAM +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -64,9 +62,6 @@ make mkdir -p $PKG/usr/share/themes cp -a usr $PKG -#delete unneeded .gitkeep files -#find $PKG -name .gitkeep -type f -delete - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a debian/{changelog,copyright} $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/desktop/mint-themes/mint-themes.info b/desktop/mint-themes/mint-themes.info index 9c03e501ce..817a336565 100644 --- a/desktop/mint-themes/mint-themes.info +++ b/desktop/mint-themes/mint-themes.info @@ -1,10 +1,10 @@ PRGNAM="mint-themes" -VERSION="2.0.9" +VERSION="2.1.6" HOMEPAGE="https://github.com/linuxmint/mint-themes" -DOWNLOAD="http://packages.linuxmint.com/pool/main/m/mint-themes/mint-themes_2.0.9.tar.xz" -MD5SUM="99e4946904044258b0b3bce4b1f96fa8" +DOWNLOAD="https://github.com/linuxmint/mint-themes/archive/2.1.6/mint-themes-2.1.6.tar.gz" +MD5SUM="d8d5619858a3565cdd48c49e29537b1b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="mint-x-icons mint-y-icons" -MAINTAINER="M.Dinslage" -EMAIL="daedra1980@gmail.com" +REQUIRES="" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu@protonmail.com" diff --git a/desktop/mint-x-icons/mint-x-icons.SlackBuild b/desktop/mint-x-icons/mint-x-icons.SlackBuild index 28a4722bc0..c4204d9f8c 100644 --- a/desktop/mint-x-icons/mint-x-icons.SlackBuild +++ b/desktop/mint-x-icons/mint-x-icons.SlackBuild @@ -25,16 +25,13 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="mint-x-icons" -VERSION=${VERSION:-1.6.4} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.6.8} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} ARCH=noarch -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -53,6 +50,9 @@ cd $PKG tar xvf $CWD/$PRGNAM"_"$VERSION.tar.xz --strip-components=1 \ $PRGNAM/usr/ +# Remove broken relative symlinks +find $PKG/usr/share/icons -xtype l -delete + # install docs & license ( cd $PKG/usr/doc/$PRGNAM-$VERSION @@ -74,4 +74,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG +find . -type l \ + -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \ + sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/desktop/mint-x-icons/mint-x-icons.info b/desktop/mint-x-icons/mint-x-icons.info index f2136ba27f..e645895cdf 100644 --- a/desktop/mint-x-icons/mint-x-icons.info +++ b/desktop/mint-x-icons/mint-x-icons.info @@ -1,8 +1,8 @@ PRGNAM="mint-x-icons" -VERSION="1.6.4" +VERSION="1.6.8" HOMEPAGE="https://github.com/linuxmint/mint-x-icons" -DOWNLOAD="http://packages.linuxmint.com/pool/main/m/mint-x-icons/mint-x-icons_1.6.4.tar.xz" -MD5SUM="d83fd66f7f553a1dead256024a33217d" +DOWNLOAD="http://packages.linuxmint.com/pool/main/m/mint-x-icons/mint-x-icons_1.6.8.tar.xz" +MD5SUM="4887c13001dc77a73a57c89fb67b9b89" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/mint-y-icons/icons/22/edit-clear-all.svg b/desktop/mint-y-icons/icons/22/edit-clear-all.svg new file mode 120000 index 0000000000..cc1037fce4 --- /dev/null +++ b/desktop/mint-y-icons/icons/22/edit-clear-all.svg @@ -0,0 +1 @@ +edit-clear-list.svg
\ No newline at end of file diff --git a/desktop/mint-y-icons/icons/22/edit-clear-list.svg b/desktop/mint-y-icons/icons/22/edit-clear-list.svg new file mode 100644 index 0000000000..2139b086e0 --- /dev/null +++ b/desktop/mint-y-icons/icons/22/edit-clear-list.svg @@ -0,0 +1,8 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 22 22"> + <defs> + <style id="current-color-scheme" type="text/css"> + .ColorScheme-Text { color:#404040; } .ColorScheme-Highlight { color:#5294e2; } + </style> + </defs> + <path style="fill:currentColor" class="ColorScheme-Text" d="M 8.0292969 1.0625 C 4.1759969 1.0625 1.0605469 4.17785 1.0605469 8.03125 C 1.0605469 11.88455 4.1758969 15 8.0292969 15 C 11.882597 15 14.998047 11.88465 14.998047 8.03125 C 14.998047 4.17795 11.882697 1.0625 8.0292969 1.0625 z M 5 5.0039062 L 6 5.0039062 C 6.27614 5.0039062 6.53779 5.1041862 6.71875 5.2851562 L 8 6.5625 L 9.28125 5.2851562 C 9.46125 5.1041563 9.7219531 5.0039062 10.001953 5.0039062 L 11.001953 5.0039062 L 11.001953 6.0039062 C 11.001953 6.2800462 10.901663 6.5416862 10.720703 6.7226562 L 9.4394531 8 L 10.720703 9.2851562 C 10.901663 9.4661263 11.003323 9.7277663 11.001953 10.003906 L 11.001953 11.003906 L 10.001953 11.003906 C 9.7258131 11.003906 9.4641631 10.903626 9.2832031 10.722656 L 8.0019531 9.4375 L 6.7207031 10.722656 C 6.5407031 10.902656 6.28 11.001953 6 11.001953 L 5 11.001953 L 5 10.001953 C 5 9.7258131 5.10029 9.4641731 5.28125 9.2832031 L 6.5625 7.9980469 L 5.28125 6.7207031 C 5.10125 6.5407031 5.0019531 6.2779531 5.0019531 6.0019531 L 5 5.0039062 z" transform="translate(3 3)"/> +</svg> diff --git a/desktop/mint-y-icons/icons/22/edit-find.svg b/desktop/mint-y-icons/icons/22/edit-find.svg new file mode 100644 index 0000000000..f82cd7216b --- /dev/null +++ b/desktop/mint-y-icons/icons/22/edit-find.svg @@ -0,0 +1,8 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 22 22"> + <defs> + <style id="current-color-scheme" type="text/css"> + .ColorScheme-Text { color:#404040; } .ColorScheme-Highlight { color:#5294e2; } + </style> + </defs> + <path style="fill:currentColor" class="ColorScheme-Text" d="M 6.4902344 0.99609375 C 3.4613344 0.99609375 0.99023438 3.4706937 0.99023438 6.4960938 C 0.99023438 9.5214938 3.4613344 11.996094 6.4902344 11.996094 C 7.6422344 11.996094 8.7279444 11.638254 9.6152344 11.027344 L 13.302734 14.714844 A 1.0055 1.0055 0 1 0 14.708984 13.277344 L 11.021484 9.5898438 C 11.632274 8.7038438 12.021484 7.6459938 12.021484 6.4960938 C 12.021484 3.4706937 9.5190344 0.99609375 6.4902344 0.99609375 z M 6.4902344 2.9960938 C 8.4376344 2.9960938 9.9902344 4.5508938 9.9902344 6.4960938 C 9.9902344 8.4411937 8.4376344 9.9960938 6.4902344 9.9960938 C 4.5428344 9.9960938 2.9902344 8.4411937 2.9902344 6.4960938 C 2.9902344 4.5508938 4.5428344 2.9960938 6.4902344 2.9960938 z" transform="translate(3 3)"/> +</svg> diff --git a/desktop/mint-y-icons/icons/22/process-stop.svg b/desktop/mint-y-icons/icons/22/process-stop.svg new file mode 100644 index 0000000000..ab9d63c413 --- /dev/null +++ b/desktop/mint-y-icons/icons/22/process-stop.svg @@ -0,0 +1,8 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 22 22"> + <defs> + <style id="current-color-scheme" type="text/css"> + .ColorScheme-Text { color:#404040; } .ColorScheme-Highlight { color:#5294e2; } + </style> + </defs> + <path style="fill:currentColor" class="ColorScheme-Text" d="M 5.2167969 1 L 4.9042969 1.28125 L 1.2792969 4.90625 L 0.99804688 5.21875 L 0.99804688 10.78125 L 1.2792969 11.09375 L 4.9042969 14.71875 L 5.2167969 15 L 10.779297 15 L 11.091797 14.71875 L 14.716797 11.09375 L 14.998047 10.78125 L 14.998047 5.21875 L 14.716797 4.90625 L 11.091797 1.28125 L 10.779297 1 L 5.2167969 1 z M 5.9980469 3 L 9.9980469 3 L 12.998047 6 L 12.998047 10 L 9.9980469 13 L 5.9980469 13 L 2.9980469 10 L 2.9980469 6 L 5.9980469 3 z M 6.4355469 4 L 3.9980469 6.4375 L 3.9980469 9.5625 L 6.4355469 12 L 9.5605469 12 L 11.998047 9.5625 L 11.998047 6.4375 L 9.5605469 4 L 6.4355469 4 z" transform="translate(3 3)"/> +</svg> diff --git a/desktop/mint-y-icons/mint-y-icons.SlackBuild b/desktop/mint-y-icons/mint-y-icons.SlackBuild index d9c3b98948..e78f4a3a73 100644 --- a/desktop/mint-y-icons/mint-y-icons.SlackBuild +++ b/desktop/mint-y-icons/mint-y-icons.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for mint-y-icons # Copyright 2017 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA +# Copyright 2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,16 +26,13 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="mint-y-icons" -VERSION=${VERSION:-1.6.4} +VERSION=${VERSION:-1.7.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} ARCH=noarch -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -50,14 +48,27 @@ rm -rf $PKG mkdir -p $TMP $PKG/usr/doc/$PRGNAM-$VERSION $OUTPUT cd $PKG # tar directly into $PKG -tar xvf $CWD/$PRGNAM"_"$VERSION.tar.xz --strip-components=1 \ - $PRGNAM/usr/ +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --strip-components=1 \ + $PRGNAM-$VERSION/usr/ + +# Remove broken relative symlinks +find $PKG/usr/share/icons -xtype l -delete + +# Add missing icons for BleachBit +# This fix does not apply to the Mint-Y theme itself +COLORS=( Aqua Blue Cyan Grey Navy Orange Pink Purple Red Sand Teal Yaru ) +for COLOR in ${COLORS[@]}; do + cp $CWD/icons/22/edit-find.svg $PKG/usr/share/icons/Mint-Y-$COLOR/places/22/edit-find.svg + cp $CWD/icons/22/edit-clear-all.svg $PKG/usr/share/icons/Mint-Y-$COLOR/places/22/edit-clear-all.svg + cp $CWD/icons/22/edit-clear-list.svg $PKG/usr/share/icons/Mint-Y-$COLOR/places/22/edit-clear-list.svg + cp $CWD/icons/22/process-stop.svg $PKG/usr/share/icons/Mint-Y-$COLOR/places/22/process-stop.svg +done # install docs & license ( cd $PKG/usr/doc/$PRGNAM-$VERSION - tar xvf $CWD/$PRGNAM"_"$VERSION.tar.xz --strip-components=2 \ - $PRGNAM/debian/{changelog,copyright} + tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --strip-components=2 \ + $PRGNAM-$VERSION/debian/{changelog,copyright} ) chown -R root:root . @@ -74,4 +85,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG +find . -type l \ + -printf '( cd %h ; rm -rf %f )\n( cd %h ; ln -sf %l %f )\n' -delete | \ + sed 's,cd \./,cd ,' >> $PKG/install/doinst.sh /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/desktop/mint-y-icons/mint-y-icons.info b/desktop/mint-y-icons/mint-y-icons.info index 46029f327d..aa2f767b9d 100644 --- a/desktop/mint-y-icons/mint-y-icons.info +++ b/desktop/mint-y-icons/mint-y-icons.info @@ -1,10 +1,10 @@ PRGNAM="mint-y-icons" -VERSION="1.6.4" +VERSION="1.7.5" HOMEPAGE="https://github.com/linuxmint/mint-y-icons" -DOWNLOAD="http://packages.linuxmint.com/pool/main/m/mint-y-icons/mint-y-icons_1.6.4.tar.xz" -MD5SUM="870f0e75a5e511ab811bdea524bb6e64" +DOWNLOAD="https://github.com/linuxmint/mint-y-icons/archive/1.7.5/mint-y-icons-1.7.5.tar.gz" +MD5SUM="86b16e58907da7e84fceb7888afde0d2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="M.Dinslage" -EMAIL="daedra1980@gmail.com" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu@protonmail.com" diff --git a/desktop/mousam/load_from_data.patch b/desktop/mousam/load_from_data.patch index 16b1c244d0..7488a457d2 100644 --- a/desktop/mousam/load_from_data.patch +++ b/desktop/mousam/load_from_data.patch @@ -1,6 +1,6 @@ --- a/src/main.py +++ b/src/main.py -@@ -45,7 +45,7 @@ +@@ -49,7 +49,7 @@ Priority = Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION with open(CSS_PATH+'style.css', 'r') as css_file: css = bytes(css_file.read(), 'utf-8') diff --git a/desktop/mousam/mousam.SlackBuild b/desktop/mousam/mousam.SlackBuild index 68d07229aa..09a0402ed4 100644 --- a/desktop/mousam/mousam.SlackBuild +++ b/desktop/mousam/mousam.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mousam -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/mousam/mousam.info b/desktop/mousam/mousam.info index 02516d40cf..1702e11d0f 100644 --- a/desktop/mousam/mousam.info +++ b/desktop/mousam/mousam.info @@ -1,8 +1,8 @@ PRGNAM="mousam" -VERSION="1.1.0" +VERSION="1.2.0" HOMEPAGE="https://github.com/amit9838/mousam" -DOWNLOAD="https://github.com/amit9838/mousam/archive/v1.1.0/mousam-1.1.0.tar.gz" -MD5SUM="2e9ea97e40d7841bed25ff58b38377dd" +DOWNLOAD="https://github.com/amit9838/mousam/archive/v1.2.0/mousam-1.2.0.tar.gz" +MD5SUM="dad38a3f58ca07865e53b523c9d0d21a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libadwaita python3-meson-opt" diff --git a/desktop/mutter/mutter.SlackBuild b/desktop/mutter/mutter.SlackBuild index d57ff05fa9..1ec4f377d4 100644 --- a/desktop/mutter/mutter.SlackBuild +++ b/desktop/mutter/mutter.SlackBuild @@ -21,12 +21,15 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Modified May 9, 2024 - Disable building tests to drop the +# xvfb-run dependency. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mutter VERSION=${VERSION:-41.9} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -94,7 +97,8 @@ cd build --sysconfdir=/etc \ -Dstrip=true \ -Dprofiler=false \ - -Dsystemd=false + -Dsystemd=false \ + -Dtests=false "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install cd .. diff --git a/desktop/mutter/mutter.info b/desktop/mutter/mutter.info index d804b8f983..2fbecac9dd 100644 --- a/desktop/mutter/mutter.info +++ b/desktop/mutter/mutter.info @@ -5,6 +5,6 @@ DOWNLOAD="https://download.gnome.org/sources/mutter/41/mutter-41.9.tar.xz" MD5SUM="450ca77637be962cb8bd35bd1c3dec98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gnome-settings-daemon xvfb-run" +REQUIRES="gnome-settings-daemon" MAINTAINER="Bob Funk" EMAIL="bobfunk11@gmail.com" diff --git a/desktop/mwm-utils/mwm-utils.SlackBuild b/desktop/mwm-utils/mwm-utils.SlackBuild index 8f1a308543..49983abdbb 100644 --- a/desktop/mwm-utils/mwm-utils.SlackBuild +++ b/desktop/mwm-utils/mwm-utils.SlackBuild @@ -25,6 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mwm-utils +SRCNAM=emwm-utils VERSION=${VERSION:-1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -66,9 +67,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/desktop/mwm-utils/mwm-utils.info b/desktop/mwm-utils/mwm-utils.info index 6434ea9f6f..f18bd42e5b 100644 --- a/desktop/mwm-utils/mwm-utils.info +++ b/desktop/mwm-utils/mwm-utils.info @@ -1,8 +1,8 @@ PRGNAM="mwm-utils" VERSION="1.0" HOMEPAGE="https://fastestcode.org/emwm.html" -DOWNLOAD="https://github.com/alx210/mwm-utils/archive/v1.0/mwm-utils-1.0.tar.gz" -MD5SUM="a7d796a1196b027a5e8749aaac0b6994" +DOWNLOAD="https://github.com/alx210/emwm-utils/archive/v1.0/emwm-utils-1.0.tar.gz" +MD5SUM="6a29ee475fe5f7ebc10b364b8253198c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/neutrality-cursor-theme/README b/desktop/neutrality-cursor-theme/README new file mode 100644 index 0000000000..ef09ff57af --- /dev/null +++ b/desktop/neutrality-cursor-theme/README @@ -0,0 +1,4 @@ +X11 cursors based on the Neutral and Neutral++ cursor themes. + +Note that these cursors have a fixed size of 24 pixels and are not +suited for HiDPI displays. diff --git a/system/nvidia-firmware/nvidia-firmware.SlackBuild b/desktop/neutrality-cursor-theme/neutrality-cursor-theme.SlackBuild index 95d6a9a646..e68c2658ad 100644 --- a/system/nvidia-firmware/nvidia-firmware.SlackBuild +++ b/desktop/neutrality-cursor-theme/neutrality-cursor-theme.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for nvidia-firmware +# Slackware build script for neutrality-cursor-theme -# Copyright 2015, 2018 Hunter Sezen California, USA +# Copyright 2024 rc_05 <contact@rc-05.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,33 +24,34 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=nvidia-firmware -VERSION=${VERSION:-325.15} +PRGNAM=neutrality-cursor-theme +VERSION=${VERSION:-20240413} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +GIT_COMMIT=c4d4ab6 ARCH=noarch +SRCNAM=${PRGNAM%%-cursor-theme}-2024-04-13-${GIT_COMMIT} -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 fi TMP=${TMP:-/tmp/SBo} -SRC=$TMP/$PRGNAM-$VERSION PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -eu +set -e -rm -rf $PKG $SRC -mkdir -p $TMP $SRC $PKG $OUTPUT -cd $SRC -sh $CWD/NVIDIA-Linux-x86-$VERSION.run --extract-only +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir $PRGNAM-$VERSION +cd $PRGNAM-$VERSION +tar xvf $CWD/$SRCNAM.tar.gz chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -58,10 +59,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python $CWD/extract_firmware.py - -mkdir -p $PKG/lib/firmware/nouveau/ -cp -av nv* vuc-* $PKG/lib/firmware/nouveau/ +mkdir -p $PKG/usr/share/icons +cp -a * $PKG/usr/share/icons mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/desktop/neutrality-cursor-theme/neutrality-cursor-theme.info b/desktop/neutrality-cursor-theme/neutrality-cursor-theme.info new file mode 100644 index 0000000000..ccec8a080d --- /dev/null +++ b/desktop/neutrality-cursor-theme/neutrality-cursor-theme.info @@ -0,0 +1,10 @@ +PRGNAM="neutrality-cursor-theme" +VERSION="20240413" +HOMEPAGE="https://github.com/EBADBEEF/neutrality-cursors" +DOWNLOAD="https://github.com/EBADBEEF/neutrality-cursors/releases/download/neutrality-2024-04-13-c4d4ab6/neutrality-2024-04-13-c4d4ab6.tar.gz" +MD5SUM="bf00b47b68e21a62b71c43d839837e73" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="rc_05" +EMAIL="contact@rc-05.com" diff --git a/python/sphinxcontrib-applehelp/slack-desc b/desktop/neutrality-cursor-theme/slack-desc index 5a5f518716..d096ef08e6 100644 --- a/python/sphinxcontrib-applehelp/slack-desc +++ b/desktop/neutrality-cursor-theme/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -sphinxcontrib-applehelp: sphinxcontrib-applehelp (Sphinx extension) -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: sphinxcontrib-applehelp is a Sphinx extension to create Apple help -sphinxcontrib-applehelp: books. -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: -sphinxcontrib-applehelp: +neutrality-cursor-theme: neutrality-cursor-theme (XCursor theme) +neutrality-cursor-theme: +neutrality-cursor-theme: XCursor theme, based on the Neutral and Neutral++ projects. +neutrality-cursor-theme: +neutrality-cursor-theme: Homepage: https://github.com/EBADBEEF/neutrality-cursors +neutrality-cursor-theme: +neutrality-cursor-theme: +neutrality-cursor-theme: +neutrality-cursor-theme: +neutrality-cursor-theme: +neutrality-cursor-theme: diff --git a/desktop/nwg-displays/nwg-displays.SlackBuild b/desktop/nwg-displays/nwg-displays.SlackBuild index 66372a4210..c55d8693d6 100644 --- a/desktop/nwg-displays/nwg-displays.SlackBuild +++ b/desktop/nwg-displays/nwg-displays.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for nwg-displays -# Copyright 2023 Jay Lanagan (j@lngn.net), Detroit, MI, USA. +# Copyright 2023-2024 Jay Lanagan (j@lngn.net), Detroit, MI, USA. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nwg-displays -VERSION=${VERSION:-0.3.16} +VERSION=${VERSION:-0.3.18} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/nwg-displays/nwg-displays.info b/desktop/nwg-displays/nwg-displays.info index 67f4173ceb..9919dc3c55 100644 --- a/desktop/nwg-displays/nwg-displays.info +++ b/desktop/nwg-displays/nwg-displays.info @@ -1,8 +1,8 @@ PRGNAM="nwg-displays" -VERSION="0.3.16" +VERSION="0.3.18" HOMEPAGE="https://github.com/nwg-piotr/nwg-displays/" -DOWNLOAD="https://github.com/nwg-piotr/nwg-displays/archive/v0.3.16/nwg-displays-0.3.16.tar.gz" -MD5SUM="9bf04d6d1f6cc0b94e5548bc59355926" +DOWNLOAD="https://github.com/nwg-piotr/nwg-displays/archive/v0.3.18/nwg-displays-0.3.18.tar.gz" +MD5SUM="7b58a6efdec984446125e3243107960f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtk-layer-shell i3ipc wlr-randr" diff --git a/desktop/nwg-panel/nwg-panel.SlackBuild b/desktop/nwg-panel/nwg-panel.SlackBuild index 78cff94a2f..b56826de95 100644 --- a/desktop/nwg-panel/nwg-panel.SlackBuild +++ b/desktop/nwg-panel/nwg-panel.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nwg-panel -VERSION=${VERSION:-0.9.27} +VERSION=${VERSION:-0.9.31} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/nwg-panel/nwg-panel.info b/desktop/nwg-panel/nwg-panel.info index 4b6eebdc6d..5e00f8b3c7 100644 --- a/desktop/nwg-panel/nwg-panel.info +++ b/desktop/nwg-panel/nwg-panel.info @@ -1,8 +1,8 @@ PRGNAM="nwg-panel" -VERSION="0.9.27" +VERSION="0.9.31" HOMEPAGE="https://github.com/nwg-piotr/nwg-panel/" -DOWNLOAD="https://github.com/nwg-piotr/nwg-panel/archive/v0.9.27/nwg-panel-0.9.27.tar.gz" -MD5SUM="0a1b3233e889aef64296336f18559681" +DOWNLOAD="https://github.com/nwg-piotr/nwg-panel/archive/v0.9.31/nwg-panel-0.9.31.tar.gz" +MD5SUM="29a2eb28ff652a50e10a08453c6775f2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="brightnessctl nwg-icon-picker playerctl python3-psutil i3ipc python3-dasbus python3-netifaces SwayNotificationCenter wlr-randr ddcutil" diff --git a/desktop/nwg-shell-config/nwg-shell-config.SlackBuild b/desktop/nwg-shell-config/nwg-shell-config.SlackBuild index dd4b410135..3f6f700b4e 100644 --- a/desktop/nwg-shell-config/nwg-shell-config.SlackBuild +++ b/desktop/nwg-shell-config/nwg-shell-config.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nwg-shell-config -VERSION=${VERSION:-0.5.34} +VERSION=${VERSION:-0.5.37} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/nwg-shell-config/nwg-shell-config.info b/desktop/nwg-shell-config/nwg-shell-config.info index 927e3a5d83..fb70164479 100644 --- a/desktop/nwg-shell-config/nwg-shell-config.info +++ b/desktop/nwg-shell-config/nwg-shell-config.info @@ -1,9 +1,9 @@ PRGNAM="nwg-shell-config" -VERSION="0.5.34" +VERSION="0.5.37" HOMEPAGE="https://github.com/nwg-piotr/nwg-shell-config/" -DOWNLOAD="https://github.com/nwg-piotr/nwg-shell-config/archive/v0.5.34/nwg-shell-config-0.5.34.tar.gz \ +DOWNLOAD="https://github.com/nwg-piotr/nwg-shell-config/archive/v0.5.37/nwg-shell-config-0.5.37.tar.gz \ https://slackware.lngn.net/pub/source/nwg-shell-config/Antu_distributor-logo-slackware.svg" -MD5SUM="6c172243cc1a1147d63ad90c8a4caf9d \ +MD5SUM="fab38e753e1a89924b5228a13e26a40a \ bae7126cf7fbb634e09ddedd861a133d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/desktop/nwg-shell/nwg-shell.SlackBuild b/desktop/nwg-shell/nwg-shell.SlackBuild index ed565334b8..4d06bc8821 100644 --- a/desktop/nwg-shell/nwg-shell.SlackBuild +++ b/desktop/nwg-shell/nwg-shell.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nwg-shell -VERSION=${VERSION:-0.5.33} +VERSION=${VERSION:-0.5.34} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -78,7 +78,7 @@ cd $PRGNAM-$VERSION chown -R root:root . # patches removing refs to systemctl & replaced w/ loginctl & disable updater -patch -Np1 -i $CWD/defaults.patch || exit 1 +patch -Np1 -i $CWD/slackware.diff || exit 1 find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/desktop/nwg-shell/nwg-shell.info b/desktop/nwg-shell/nwg-shell.info index aa1eea1783..bf256e983b 100644 --- a/desktop/nwg-shell/nwg-shell.info +++ b/desktop/nwg-shell/nwg-shell.info @@ -1,8 +1,8 @@ PRGNAM="nwg-shell" -VERSION="0.5.33" +VERSION="0.5.34" HOMEPAGE="https://nwg-piotr.github.io/nwg-shell/" -DOWNLOAD="https://github.com/nwg-piotr/nwg-shell/releases/download/v0.5.33/nwg-shell-v0.5.33.tar.gz" -MD5SUM="031b04c24624f97aca27e673f8a88822" +DOWNLOAD="https://github.com/nwg-piotr/nwg-shell/releases/download/v0.5.34/nwg-shell-v0.5.34.tar.gz" +MD5SUM="3cfa51cb7d68c5d93a58c69a738e9857" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="foot grim jq brightnessctl papirus-icon-theme slurp gtklock-playerctl-module gtklock-powerbar-module gtklock-userinfo-module swappy sway swayidle swaylock wl-clipboard azote gopsuinfo nwg-bar nwg-clipman nwg-dock nwg-menu nwg-look nwg-panel nwg-readme-browser nwg-shell-config nwg-shell-wallpapers nwg-wrapper nwg-displays python3-autotiling xdg-desktop-portal-wlr" diff --git a/desktop/nwg-shell/defaults.patch b/desktop/nwg-shell/slackware.diff index 0a12f7aee7..e5bdf83ece 100644 --- a/desktop/nwg-shell/defaults.patch +++ b/desktop/nwg-shell/slackware.diff @@ -1,6 +1,6 @@ diff -ur a/nwg_shell/installer.py b/nwg_shell/installer.py ---- a/nwg_shell/installer.py 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/installer.py 2024-02-07 21:45:22.562125401 -0500 +--- a/nwg_shell/installer.py 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/installer.py 2024-04-23 08:06:15.320307748 -0400 @@ -173,7 +173,7 @@ print(" This script installs/overwrites configs and style sheets ") print(" for sway, Hyprland and nwg-shell components. ") @@ -15,7 +15,7 @@ diff -ur a/nwg_shell/installer.py b/nwg_shell/installer.py if "editor" not in s or not s["editor"]: - for cmd in ["mousepad", "atom", "emacs", "gedit", "geany", "kate", "vim"]: -+ for cmd in ["mousepad", "emacs", "joe", "kate", "vim"]: ++ for cmd in ["mousepad", "atom", "emacs", "gedit", "joe", "kate", "vim"]: if is_command(cmd): s["editor"] = cmd break @@ -31,8 +31,8 @@ diff -ur a/nwg_shell/installer.py b/nwg_shell/installer.py subprocess.call("sudo reboot", shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT) diff -ur a/nwg_shell/main.py b/nwg_shell/main.py ---- a/nwg_shell/main.py 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/main.py 2024-02-07 21:45:22.562125401 -0500 +--- a/nwg_shell/main.py 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/main.py 2024-04-23 08:06:35.004983477 -0400 @@ -10,7 +10,6 @@ print(" nwg-shell-installer -a [-hypr] installs All configs from scratch; [-hypr] includes Hyprland configs") print(" nwg-shell-installer -w [-hypr] installs configs from scratch w/ no dialogs; [-hypr] includes Hyprland configs") @@ -42,8 +42,8 @@ diff -ur a/nwg_shell/main.py b/nwg_shell/main.py diff -ur a/nwg_shell/skel/config/foot/foot.ini b/nwg_shell/skel/config/foot/foot.ini ---- a/nwg_shell/skel/config/foot/foot.ini 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/foot/foot.ini 2024-02-07 21:45:22.562125401 -0500 +--- a/nwg_shell/skel/config/foot/foot.ini 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/foot/foot.ini 2024-04-23 08:06:57.188618092 -0400 @@ -2,7 +2,7 @@ # shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) @@ -54,8 +54,8 @@ diff -ur a/nwg_shell/skel/config/foot/foot.ini b/nwg_shell/skel/config/foot/foot # app-id=foot # title=foot diff -ur a/nwg_shell/skel/config/hypr/hyprland.conf b/nwg_shell/skel/config/hypr/hyprland.conf ---- a/nwg_shell/skel/config/hypr/hyprland.conf 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/hypr/hyprland.conf 2024-02-07 21:45:22.562125401 -0500 +--- a/nwg_shell/skel/config/hypr/hyprland.conf 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/hypr/hyprland.conf 2024-04-23 08:07:58.307611735 -0400 @@ -17,8 +17,7 @@ # exec = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 @@ -67,8 +67,8 @@ diff -ur a/nwg_shell/skel/config/hypr/hyprland.conf b/nwg_shell/skel/config/hypr # # Include settings generated by nwg-shell-config diff -ur a/nwg_shell/skel/config/nwg-bar/bar.json b/nwg_shell/skel/config/nwg-bar/bar.json ---- a/nwg_shell/skel/config/nwg-bar/bar.json 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/nwg-bar/bar.json 2024-02-07 21:45:22.563125383 -0500 +--- a/nwg_shell/skel/config/nwg-bar/bar.json 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/nwg-bar/bar.json 2024-04-23 08:13:11.595459991 -0400 @@ -11,12 +11,12 @@ }, { @@ -86,8 +86,8 @@ diff -ur a/nwg_shell/skel/config/nwg-bar/bar.json b/nwg_shell/skel/config/nwg-ba ] \ No newline at end of file diff -ur a/nwg_shell/skel/config/nwg-bar/hyprland.json b/nwg_shell/skel/config/nwg-bar/hyprland.json ---- a/nwg_shell/skel/config/nwg-bar/hyprland.json 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/nwg-bar/hyprland.json 2024-02-07 21:45:22.563125383 -0500 +--- a/nwg_shell/skel/config/nwg-bar/hyprland.json 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/nwg-bar/hyprland.json 2024-04-23 08:13:32.787113097 -0400 @@ -11,12 +11,12 @@ }, { @@ -105,53 +105,53 @@ diff -ur a/nwg_shell/skel/config/nwg-bar/hyprland.json b/nwg_shell/skel/config/n ] \ No newline at end of file diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-0 b/nwg_shell/skel/config/nwg-panel/hyprland-0 ---- a/nwg_shell/skel/config/nwg-panel/hyprland-0 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/nwg-panel/hyprland-0 2024-02-07 21:45:22.564125365 -0500 +--- a/nwg_shell/skel/config/nwg-panel/hyprland-0 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/nwg-panel/hyprland-0 2024-04-23 08:14:52.432809425 -0400 @@ -84,11 +84,11 @@ }, { "name": "Restart", -- "cmd": "systemctl reboot" -+ "cmd": "loginctl reboot" +- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\"" ++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\"" }, { "name": "Shutdown", -- "cmd": "systemctl -i poweroff" -+ "cmd": "loginctl -i poweroff" +- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"" ++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"" } ] }, diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-1 b/nwg_shell/skel/config/nwg-panel/hyprland-1 ---- a/nwg_shell/skel/config/nwg-panel/hyprland-1 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/nwg-panel/hyprland-1 2024-02-07 21:45:22.564125365 -0500 +--- a/nwg_shell/skel/config/nwg-panel/hyprland-1 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/nwg-panel/hyprland-1 2024-04-23 08:14:58.944702840 -0400 @@ -86,11 +86,11 @@ }, { "name": "Restart", -- "cmd": "systemctl reboot" -+ "cmd": "loginctl reboot" +- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\"" ++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\"" }, { "name": "Shutdown", -- "cmd": "systemctl -i poweroff" -+ "cmd": "loginctl -i poweroff" +- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"" ++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"" } ] }, diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-2 b/nwg_shell/skel/config/nwg-panel/hyprland-2 ---- a/nwg_shell/skel/config/nwg-panel/hyprland-2 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/nwg-panel/hyprland-2 2024-02-07 21:45:22.564125365 -0500 +--- a/nwg_shell/skel/config/nwg-panel/hyprland-2 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/nwg-panel/hyprland-2 2024-04-23 08:15:06.752575048 -0400 @@ -83,11 +83,11 @@ }, { "name": "Restart", -- "cmd": "systemctl reboot" -+ "cmd": "loginctl reboot" +- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\"" ++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\"" }, { "name": "Shutdown", -- "cmd": "systemctl -i poweroff" -+ "cmd": "loginctl -i poweroff" +- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"" ++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"" } ] }, @@ -167,70 +167,70 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-2 b/nwg_shell/skel/config/nw "file-manager": "thunar", "height": 0, diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-3 b/nwg_shell/skel/config/nwg-panel/hyprland-3 ---- a/nwg_shell/skel/config/nwg-panel/hyprland-3 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/nwg-panel/hyprland-3 2024-02-07 21:45:22.564125365 -0500 +--- a/nwg_shell/skel/config/nwg-panel/hyprland-3 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/nwg-panel/hyprland-3 2024-04-23 08:15:15.176437171 -0400 @@ -82,11 +82,11 @@ }, { "name": "Restart", -- "cmd": "systemctl reboot" -+ "cmd": "loginctl reboot" +- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\"" ++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\"" }, { "name": "Shutdown", -- "cmd": "systemctl -i poweroff" -+ "cmd": "loginctl -i poweroff" +- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"" ++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"" } ] }, diff -ur a/nwg_shell/skel/config/nwg-panel/preset-0 b/nwg_shell/skel/config/nwg-panel/preset-0 ---- a/nwg_shell/skel/config/nwg-panel/preset-0 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/nwg-panel/preset-0 2024-02-07 21:45:22.564125365 -0500 +--- a/nwg_shell/skel/config/nwg-panel/preset-0 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/nwg-panel/preset-0 2024-04-23 08:15:23.410302403 -0400 @@ -85,11 +85,11 @@ }, { "name": "Restart", -- "cmd": "systemctl reboot" -+ "cmd": "loginctl reboot" +- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\"" ++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\"" }, { "name": "Shutdown", -- "cmd": "systemctl -i poweroff" -+ "cmd": "loginctl -i poweroff" +- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"" ++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"" } ] }, diff -ur a/nwg_shell/skel/config/nwg-panel/preset-1 b/nwg_shell/skel/config/nwg-panel/preset-1 ---- a/nwg_shell/skel/config/nwg-panel/preset-1 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/nwg-panel/preset-1 2024-02-07 21:45:22.564125365 -0500 +--- a/nwg_shell/skel/config/nwg-panel/preset-1 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/nwg-panel/preset-1 2024-04-23 08:15:31.000178183 -0400 @@ -87,11 +87,11 @@ }, { "name": "Restart", -- "cmd": "systemctl reboot" -+ "cmd": "loginctl reboot" +- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\"" ++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\"" }, { "name": "Shutdown", -- "cmd": "systemctl -i poweroff" -+ "cmd": "loginctl -i poweroff" +- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"" ++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"" } ] }, diff -ur a/nwg_shell/skel/config/nwg-panel/preset-2 b/nwg_shell/skel/config/nwg-panel/preset-2 ---- a/nwg_shell/skel/config/nwg-panel/preset-2 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/nwg-panel/preset-2 2024-02-07 21:45:22.564125365 -0500 +--- a/nwg_shell/skel/config/nwg-panel/preset-2 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/nwg-panel/preset-2 2024-04-23 08:15:38.024063224 -0400 @@ -99,11 +99,11 @@ }, { "name": "Restart", -- "cmd": "systemctl reboot" -+ "cmd": "loginctl reboot" +- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\"" ++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\"" }, { "name": "Shutdown", -- "cmd": "systemctl -i poweroff" -+ "cmd": "loginctl -i poweroff" +- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"" ++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"" } ] }, @@ -246,25 +246,25 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/preset-2 b/nwg_shell/skel/config/nwg- "file-manager": "thunar", "height": 0, diff -ur a/nwg_shell/skel/config/nwg-panel/preset-3 b/nwg_shell/skel/config/nwg-panel/preset-3 ---- a/nwg_shell/skel/config/nwg-panel/preset-3 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/nwg-panel/preset-3 2024-02-07 21:45:22.564125365 -0500 +--- a/nwg_shell/skel/config/nwg-panel/preset-3 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/nwg-panel/preset-3 2024-04-23 08:15:45.775936353 -0400 @@ -83,11 +83,11 @@ }, { "name": "Restart", -- "cmd": "systemctl reboot" -+ "cmd": "loginctl reboot" +- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\"" ++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\"" }, { "name": "Shutdown", -- "cmd": "systemctl -i poweroff" -+ "cmd": "loginctl -i poweroff" +- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"" ++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"" } ] }, diff -ur a/nwg_shell/skel/config/sway/autostart b/nwg_shell/skel/config/sway/autostart ---- a/nwg_shell/skel/config/sway/autostart 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/sway/autostart 2024-02-07 21:45:22.564125365 -0500 +--- a/nwg_shell/skel/config/sway/autostart 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/sway/autostart 2024-04-23 08:16:45.765954548 -0400 @@ -6,8 +6,6 @@ exec_always nwg-autotiling exec_always nwg-drawer -r -s preset-0.css -term foot -ft @@ -275,8 +275,8 @@ diff -ur a/nwg_shell/skel/config/sway/autostart b/nwg_shell/skel/config/sway/aut exec_always nwg-screenshot-applet exec_always nwg-shell-config -s diff -ur a/nwg_shell/skel/config/sway/config b/nwg_shell/skel/config/sway/config ---- a/nwg_shell/skel/config/sway/config 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/config/sway/config 2024-02-07 21:45:22.564125365 -0500 +--- a/nwg_shell/skel/config/sway/config 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/config/sway/config 2024-04-23 08:18:36.244146606 -0400 @@ -36,10 +36,9 @@ ############### Autostart ################## @@ -291,18 +291,18 @@ diff -ur a/nwg_shell/skel/config/sway/config b/nwg_shell/skel/config/sway/config ### Turn off screen on lid closed diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings b/nwg_shell/skel/data/nwg-shell-config/settings ---- a/nwg_shell/skel/data/nwg-shell-config/settings 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/data/nwg-shell-config/settings 2024-02-07 21:45:22.565125347 -0500 +--- a/nwg_shell/skel/data/nwg-shell-config/settings 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/data/nwg-shell-config/settings 2024-04-23 08:20:04.961694894 -0400 @@ -18,9 +18,9 @@ "browser": "", - "pb-exit": "swaymsg exit", + "pb-exit": "nwg-dialog -p exit-sway -c \"swaymsg exit\"", "pb-lock": "nwg-lock", -- "pb-poweroff": "systemctl -i poweroff", -- "pb-reboot": "systemctl reboot", -- "pb-sleep": "systemctl suspend", -+ "pb-poweroff": "loginctl poweroff", -+ "pb-reboot": "loginctl reboot", -+ "pb-sleep": "loginctl suspend", +- "pb-poweroff": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"", +- "pb-reboot": "nwg-dialog -p reboot -c \"systemctl reboot\"", +- "pb-sleep": "nwg-dialog -p sleep -c \"systemctl suspend\"", ++ "pb-poweroff": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"", ++ "pb-reboot": "nwg-dialog -p reboot -c \"loginctl reboot\"", ++ "pb-sleep": "nwg-dialog -p sleep -c \"loginctl suspend\"", "panel-preset": "preset-0", "panel-custom": "", "show-on-startup": false, @@ -313,7 +313,7 @@ diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings b/nwg_shell/skel/data/n - "gtklock-poweroff-command": "systemctl -i poweroff", - "gtklock-reboot-command": "systemctl reboot", - "gtklock-suspend-command": "systemctl suspend", -+ "gtklock-poweroff-command": "loginctl poweroff", ++ "gtklock-poweroff-command": "loginctl -i poweroff", + "gtklock-reboot-command": "loginctl reboot", + "gtklock-suspend-command": "loginctl suspend", "gtklock-time-format": "%H:%M:%S", @@ -326,22 +326,22 @@ diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings b/nwg_shell/skel/data/n } \ No newline at end of file diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland b/nwg_shell/skel/data/nwg-shell-config/settings-hyprland ---- a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland 2024-02-04 20:54:31.000000000 -0500 -+++ b/nwg_shell/skel/data/nwg-shell-config/settings-hyprland 2024-02-07 21:45:22.565125347 -0500 +--- a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland 2024-04-18 20:06:36.000000000 -0400 ++++ b/nwg_shell/skel/data/nwg-shell-config/settings-hyprland 2024-04-23 08:20:16.632503931 -0400 @@ -16,9 +16,9 @@ "show-on-startup": false, - "pb-exit": "hyprctl dispatch exit", + "pb-exit": "nwg-dialog -p exit-hyprland -c \"hyprctl dispatch exit\"", "pb-lock": "nwg-lock", -- "pb-poweroff": "systemctl -i poweroff", -- "pb-reboot": "systemctl reboot", -- "pb-sleep": "systemctl suspend", -+ "pb-poweroff": "loginctl poweroff", -+ "pb-reboot": "loginctl reboot", -+ "pb-sleep": "loginctl suspend", +- "pb-poweroff": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"", +- "pb-reboot": "nwg-dialog -p reboot -c \"systemctl reboot\"", +- "pb-sleep": "nwg-dialog -p sleep -c \"systemctl suspend\"", ++ "pb-poweroff": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"", ++ "pb-reboot": "nwg-dialog -p reboot -c \"loginctl reboot\"", ++ "pb-sleep": "nwg-dialog -p sleep -c \"loginctl suspend\"", "gen-use-settings": true, "gen-border_size": 1, "gen-no_border_on_floating": false, -@@ -103,7 +103,7 @@ +@@ -104,7 +104,7 @@ "lockscreen-custom-cmd": "", "lockscreen-timeout": 1200, "screenshot": true, @@ -350,14 +350,14 @@ diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland b/nwg_shell/sk "sleep-timeout": 1800, "resume-cmd": "", "before-sleep": "", -@@ -128,13 +128,13 @@ +@@ -129,13 +129,13 @@ "gtklock-logout-command": "swaymsg exit", "gtklock-playerctl": false, "gtklock-powerbar": false, - "gtklock-poweroff-command": "systemctl -i poweroff", - "gtklock-reboot-command": "systemctl reboot", - "gtklock-suspend-command": "systemctl suspend", -+ "gtklock-poweroff-command": "loginctl poweroff", ++ "gtklock-poweroff-command": "loginctl -i poweroff", + "gtklock-reboot-command": "loginctl reboot", + "gtklock-suspend-command": "loginctl suspend", "gtklock-time-format": "%H:%M:%S", diff --git a/desktop/oomox/oomox.SlackBuild b/desktop/oomox/oomox.SlackBuild index b91a8c5312..8b11241b52 100644 --- a/desktop/oomox/oomox.SlackBuild +++ b/desktop/oomox/oomox.SlackBuild @@ -25,7 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=oomox -VERSION=${VERSION:-1.7.0.6} +SRCNAM=themix-gui +VERSION=${VERSION:-1.15.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +41,6 @@ MATERIAVER=${MATERIAVER:-20180922} OOMOXVER=${OOMOXVER:-1.9.1} OOMOXIFYVER=${OOMOXIFYVER:-1.0.1} -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -57,9 +55,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -83,7 +81,7 @@ tar xvf $CWD/archdroid-icon-theme-$ARCHDROIDVER.tar.gz --strip-components=1 \ -C $PKG/opt/oomox/plugins/icons_archdroid tar xvf $CWD/base16-builder-$BASE16VER.tar.gz --strip-components=1 \ - -C $PKG/opt/oomox/plugins/import_base16/base16-data + -C $PKG/opt/oomox/plugins/base16 tar xvf $CWD/gnome-colors-icon-theme-$GNOMECOLORSVER.tar.gz --strip-components=1 \ -C $PKG/opt/oomox/plugins/icons_gnomecolors @@ -92,11 +90,12 @@ tar xvf $CWD/gnome-colors-icon-theme-$GNOMECOLORSVER.tar.gz --strip-components=1 mv gnome-colors gnome-colors-icon-theme ) tar xvf $CWD/oomoxify-$OOMOXIFYVER.tar.gz --strip-components=1 \ - -C $PKG/opt/oomox/plugins/oomoxify + -C $PKG/opt/oomox/plugins/export_oomoxify tar xvf $CWD/materia-theme-$MATERIAVER.tar.gz --strip-components=1 \ -C $PKG/opt/oomox/plugins/theme_materia/materia-theme +mkdir -p $PKG/opt/oomox/plugins/theme_oomox/gtk-theme tar xvf $CWD/$PRGNAM-gtk-theme-$OOMOXVER.tar.gz --strip-components=1 \ -C $PKG/opt/oomox/plugins/theme_oomox/gtk-theme @@ -130,12 +129,6 @@ mkdir -p $PKG/usr/share/icons/hicolor/symbolic/apps cp -a packaging/com.github.themix_project.Oomox-symbolic.svg \ $PKG/usr/share/icons/hicolor/symbolic/apps/com.github.themix_project.Oomox-symbolic.svg -for SIZE in 16 24 32 48 512; do - mkdir -p $PKG/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps - cp -a packaging/com.github.themix_project.Oomox-$SIZE.png \ - $PKG/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/com.github.themix_project.Oomox.png -done - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a CREDITS LICENSE README.md \ $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/desktop/oomox/oomox.info b/desktop/oomox/oomox.info index 3fc36e26d6..da6301fcd6 100644 --- a/desktop/oomox/oomox.info +++ b/desktop/oomox/oomox.info @@ -1,7 +1,7 @@ PRGNAM="oomox" -VERSION="1.7.0.6" -HOMEPAGE="https://github.com/themix-project/oomox" -DOWNLOAD="https://github.com/themix-project/oomox/archive/1.7.0.6/oomox-1.7.0.6.tar.gz \ +VERSION="1.15.1" +HOMEPAGE="https://github.com/themix-project/themix-gui" +DOWNLOAD="https://github.com/themix-project/themix-gui/archive/1.15.1/themix-gui-1.15.1.tar.gz \ https://github.com/NicoHood/arc-theme/archive/7ff5b36c287fd50a5910a67a255a3d6bec58b679/arc-theme-7ff5b36c287fd50a5910a67a255a3d6bec58b679.tar.gz \ https://github.com/themix-project/archdroid-icon-theme/archive/1.0.2/archdroid-icon-theme-1.0.2.tar.gz \ https://github.com/base16-builder/base16-builder/archive/d022b9daa5c233a08a8d3b94fd534a3041e3a8c1/base16-builder-d022b9daa5c233a08a8d3b94fd534a3041e3a8c1.tar.gz \ @@ -9,7 +9,7 @@ DOWNLOAD="https://github.com/themix-project/oomox/archive/1.7.0.6/oomox-1.7.0.6. https://github.com/nana-4/materia-theme/archive/v20180922/materia-theme-20180922.tar.gz \ https://github.com/themix-project/oomox-gtk-theme/archive/1.9.1/oomox-gtk-theme-1.9.1.tar.gz \ https://github.com/themix-project/oomoxify/archive/1.0.1/oomoxify-1.0.1.tar.gz" -MD5SUM="08e01a074e13fa391d13c77c332047e2 \ +MD5SUM="7776c9a8b5088703c2a9ab35e4532f9a \ a0f38b1c341198a81408379907a0ca4b \ cb669130685dcbf03a8f7f5738c71dc6 \ 38fc51a55c798032266c03ee82461119 \ diff --git a/desktop/oomox/slack-desc b/desktop/oomox/slack-desc index e05c63d671..90c54b9ff2 100644 --- a/desktop/oomox/slack-desc +++ b/desktop/oomox/slack-desc @@ -13,7 +13,7 @@ oomox: variations of a Oomox (Numix-based), Materia and Arc themes (GTK2, oomox: GTK3, Cinnamon, GNOME, Openbox, Xfwm), Gnome-Colors and Archdroid oomox: icon themes. oomox: -oomox: Homepage: https://github.com/themix-project/oomox +oomox: Homepage: https://github.com/themix-project/themix-gui oomox: oomox: oomox: diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild index 36d3f279e6..80501d9f46 100644 --- a/desktop/openbox/openbox.SlackBuild +++ b/desktop/openbox/openbox.SlackBuild @@ -102,6 +102,8 @@ find -L . \ # Convert openbox-xdg-autostart from python2 to python3 patch -p1 < $CWD/py2-to-py3.patch +for i in $CWD/patches/* ; do patch -p1 < $i ; done + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/openbox/patches/917204_undecorated_maximized_no_border.patch b/desktop/openbox/patches/917204_undecorated_maximized_no_border.patch new file mode 100644 index 0000000000..915cc1ea9a --- /dev/null +++ b/desktop/openbox/patches/917204_undecorated_maximized_no_border.patch @@ -0,0 +1,22 @@ +Description: Removed top border on undecorated maximized windows +Author: Valentin Blot <debian-devel@valentinblot.org> +Origin: other +Bug-Debian: https://bugs.debian.org/917204 +Forwarded: no +Last-Update: 2018-12-23 + +--- a/openbox/frame.c ++++ b/openbox/frame.c +@@ -585,12 +585,6 @@ void frame_adjust_area(ObFrame *self, gb + + if (self->decorations & OB_FRAME_DECOR_TITLEBAR) + self->size.top += ob_rr_theme->title_height + self->bwidth; +- else if (self->max_horz && self->max_vert) { +- /* A maximized and undecorated window needs a border on the +- top of the window to let the user still undecorate/unmaximize the +- window via the client menu. */ +- self->size.top += self->bwidth; +- } + + if (self->decorations & OB_FRAME_DECOR_HANDLE && + ob_rr_theme->handle_height > 0) diff --git a/desktop/openbox/patches/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch b/desktop/openbox/patches/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch new file mode 100644 index 0000000000..ef68d31213 --- /dev/null +++ b/desktop/openbox/patches/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch @@ -0,0 +1,50 @@ +From 9ed6fdd71890c5cc43747f105382d5677e5d37e7 Mon Sep 17 00:00:00 2001 +From: pldubouilh <pldubouilh@gmail.com> +Date: Fri, 17 Mar 2023 18:23:47 +0100 +Subject: [PATCH] Fix list traversal issue in client_calc_layer + +The calls to client_calc_layer_internal can modify stacking_list, which +can cause us to follow dangling ->next pointers (either by the pointer +itself already being freed, or it pointing to a freed area). Avoid this +by copying the list first, the goal is to visit every client in the list +once so this should be fine. +--- + openbox/client.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/openbox/client.c b/openbox/client.c +index 7168b2407..b8264587c 100644 +--- a/openbox/client.c ++++ b/openbox/client.c +@@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self) + void client_calc_layer(ObClient *self) + { + GList *it; ++ /* the client_calc_layer_internal calls below modify stacking_list, ++ so we have to make a copy to iterate over */ ++ GList *list = g_list_copy(stacking_list); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* find the windows in the fullscreen layer, and mark them not-visited */ +@@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self) + client_calc_layer_internal(self); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* now recalc any windows in the fullscreen layer which have not +@@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self) + !WINDOW_AS_CLIENT(it->data)->visited) + client_calc_layer_internal(it->data); + } ++ ++ g_list_free(it); + } + + gboolean client_should_show(ObClient *self) diff --git a/desktop/openbox/patches/debian-887908.patch b/desktop/openbox/patches/debian-887908.patch new file mode 100644 index 0000000000..2c8794ed7f --- /dev/null +++ b/desktop/openbox/patches/debian-887908.patch @@ -0,0 +1,31 @@ +Description: Fix toggled hover and pressed images masks not loaded +Author: "E. Serradilla" <eserradi@gmx.com> +Debian-Bugs: https://bugs.debian.org/887908 + +--- a/obrender/theme.c ++++ b/obrender/theme.c +@@ -1494,8 +1494,10 @@ static void read_button_styles(XrmDataba + READ_BUTTON_MASK_COPY(disabled, btn->unpressed_mask); + READ_BUTTON_MASK_COPY(hover, btn->unpressed_mask); + if (toggled_mask) { +- READ_BUTTON_MASK_COPY(pressed_toggled, btn->unpressed_toggled_mask); +- READ_BUTTON_MASK_COPY(hover_toggled, btn->unpressed_toggled_mask); ++ g_snprintf(name, 128, "%s_toggled_pressed.xbm", btnname); ++ READ_MASK_COPY(name, btn->pressed_toggled_mask, btn->unpressed_toggled_mask); ++ g_snprintf(name, 128, "%s_toggled_hover.xbm", btnname); ++ READ_MASK_COPY(name, btn->hover_toggled_mask, btn->unpressed_toggled_mask); + } + + #define READ_BUTTON_APPEARANCE(typedots, type, fallback) \ +@@ -1532,8 +1534,8 @@ static void read_button_styles(XrmDataba + READ_BUTTON_APPEARANCE("disabled", disabled, 0); + READ_BUTTON_APPEARANCE("hover", hover, 0); + if (toggled_mask) { +- READ_BUTTON_APPEARANCE("unpressed.toggled", unpressed_toggled, 1); +- READ_BUTTON_APPEARANCE("pressed.toggled", pressed_toggled, 0); +- READ_BUTTON_APPEARANCE("hover.toggled", hover_toggled, 0); ++ READ_BUTTON_APPEARANCE("toggled.unpressed", unpressed_toggled, 1); ++ READ_BUTTON_APPEARANCE("toggled.pressed", pressed_toggled, 0); ++ READ_BUTTON_APPEARANCE("toggled.hover", hover_toggled, 0); + } + } diff --git a/desktop/papirus-icon-theme/doinst.sh.gz b/desktop/papirus-icon-theme/doinst.sh.gz Binary files differindex da9bfee95f..4095c32b36 100644 --- a/desktop/papirus-icon-theme/doinst.sh.gz +++ b/desktop/papirus-icon-theme/doinst.sh.gz diff --git a/desktop/papirus-icon-theme/papirus-icon-theme.SlackBuild b/desktop/papirus-icon-theme/papirus-icon-theme.SlackBuild index d55b5d4558..db9dd02e82 100644 --- a/desktop/papirus-icon-theme/papirus-icon-theme.SlackBuild +++ b/desktop/papirus-icon-theme/papirus-icon-theme.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for papirus-icon-theme # Copyright 2018 Azure Zanculmarktum <zanculmarktum@gmail.com> -# Updates/Maintenance 2023 Jay Lanagan (j@lngn.net), Detroit, MI. +# Updates/Maintenance 2023-2024 Jay Lanagan (j@lngn.net), Detroit, MI. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=papirus-icon-theme -VERSION=${VERSION:-20240201} +VERSION=${VERSION:-20240501} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/papirus-icon-theme/papirus-icon-theme.info b/desktop/papirus-icon-theme/papirus-icon-theme.info index 36d932a399..b32f471113 100644 --- a/desktop/papirus-icon-theme/papirus-icon-theme.info +++ b/desktop/papirus-icon-theme/papirus-icon-theme.info @@ -1,8 +1,8 @@ PRGNAM="papirus-icon-theme" -VERSION="20240201" +VERSION="20240501" HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme" -DOWNLOAD="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20240201/papirus-icon-theme-20240201.tar.gz" -MD5SUM="9e0578bb5d87b8b56fad12e4150cb4a7" +DOWNLOAD="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20240501/papirus-icon-theme-20240501.tar.gz" +MD5SUM="9ff1f17bef26332ae4a22552a566b437" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/river/river.SlackBuild b/desktop/river/river.SlackBuild index 48e4dfffef..51ee4bcd52 100644 --- a/desktop/river/river.SlackBuild +++ b/desktop/river/river.SlackBuild @@ -24,10 +24,10 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=river -VERSION=${VERSION:-0.1.3} +PRGNAM=river +VERSION=${VERSION:-0.1.3} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then @@ -43,9 +43,9 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -61,7 +61,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -76,8 +76,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -DESTDIR=$PKG zig build install -Drelease-safe -Dxwayland -Dman-pages \ ---prefix '/usr' +DESTDIR=$PKG zig build install -Drelease-safe -Dxwayland -Dman-pages -Dcpu=baseline \ +--prefix '/usr' cp -r $PKG/usr/share/man /$PKG/usr/man rm -r $PKG/usr/share/man diff --git a/desktop/river/river.info b/desktop/river/river.info index cb6c4bc8cc..8ab1d35b65 100644 --- a/desktop/river/river.info +++ b/desktop/river/river.info @@ -1,10 +1,10 @@ PRGNAM="river" VERSION="0.1.3" HOMEPAGE="https://github.com/riverwm/river" -DOWNLOAD="https://github.com/riverwm/river/releases/download/v0.1.3/river-0.1.3.tar.gz" -MD5SUM="12b1caba61c9e174bc17f76940d3a2c0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/riverwm/river/releases/download/v0.1.3/river-0.1.3.tar.gz" +MD5SUM_x86_64="12b1caba61c9e174bc17f76940d3a2c0" REQUIRES="wlroots zig" MAINTAINER="Damian Perticone" EMAIL="mjolnirdam@gmail.com" diff --git a/desktop/sun/sun.SlackBuild b/desktop/sun/sun.SlackBuild index ed30f5c3d9..8b1e188539 100644 --- a/desktop/sun/sun.SlackBuild +++ b/desktop/sun/sun.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sun -VERSION=${VERSION:-1.6.0} +VERSION=${VERSION:-1.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/sun/sun.info b/desktop/sun/sun.info index fe151f8c96..c218c6b12d 100644 --- a/desktop/sun/sun.info +++ b/desktop/sun/sun.info @@ -1,8 +1,8 @@ PRGNAM="sun" -VERSION="1.6.0" +VERSION="1.6.2" HOMEPAGE="https://dslackw.gitlab.io/sun" -DOWNLOAD="https://gitlab.com/dslackw/sun/-/archive/1.6.0/sun-1.6.0.tar.gz" -MD5SUM="b0dc5f38d68e056c00052d2b494665a4" +DOWNLOAD="https://gitlab.com/dslackw/sun/-/archive/1.6.2/sun-1.6.2.tar.gz" +MD5SUM="06875ba5633252d88876c77e7f147e73" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-build" diff --git a/desktop/thunar-megasync/thunar-megasync.SlackBuild b/desktop/thunar-megasync/thunar-megasync.SlackBuild index 9296544a2a..e3a0adab42 100644 --- a/desktop/thunar-megasync/thunar-megasync.SlackBuild +++ b/desktop/thunar-megasync/thunar-megasync.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=thunar-megasync SRCNAM=MEGAsync -VERSION=${VERSION:-4.7.2.0} +VERSION=${VERSION:-5.2.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/thunar-megasync/thunar-megasync.info b/desktop/thunar-megasync/thunar-megasync.info index fb68199deb..bf2bdbbb53 100644 --- a/desktop/thunar-megasync/thunar-megasync.info +++ b/desktop/thunar-megasync/thunar-megasync.info @@ -1,10 +1,10 @@ PRGNAM="thunar-megasync" -VERSION="4.7.2.0" +VERSION="5.2.1.0" HOMEPAGE="https://github.com/meganz/MEGAsync/" -DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.7.2.0_Linux/MEGAsync-4.7.2.0_Linux.tar.gz" -MD5SUM="b1734bf785e279dd0d01d8ff254c7587" +DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v5.2.1.0_Linux/MEGAsync-5.2.1.0_Linux.tar.gz" +MD5SUM="ec6e327ea4d45853455fbf23e1fcd62d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="MEGAsync" MAINTAINER="JW(Shinichi Abe)" EMAIL="shin1.abe@nifty.com" diff --git a/desktop/waybar/waybar.info b/desktop/waybar/waybar.info index 67f541fe93..6c16a84b42 100644 --- a/desktop/waybar/waybar.info +++ b/desktop/waybar/waybar.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Alexays/Waybar/archive/0.9.20/Waybar-0.9.20.tar.gz" MD5SUM="3c736fb5a28b14ed327e72e93f193cdf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jsoncpp scdoc fmt spdlog date gtk-layer-shell" +REQUIRES="jsoncpp scdoc spdlog date gtk-layer-shell" MAINTAINER="Damian Perticone" EMAIL="mjolnirdam@gmail.com" diff --git a/desktop/wlsunset/wlsunset.SlackBuild b/desktop/wlsunset/wlsunset.SlackBuild index 67e77805c2..cde42f1e4c 100644 --- a/desktop/wlsunset/wlsunset.SlackBuild +++ b/desktop/wlsunset/wlsunset.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wlsunset -# Copyright 2022 Jay Lanagan (j@lngn.net), Detroit, MI, USA. +# Copyright 2022-2024 Jay Lanagan (j@lngn.net), Detroit, MI, USA. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wlsunset -VERSION=${VERSION:-0.3.0} +VERSION=${VERSION:-0.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/wlsunset/wlsunset.info b/desktop/wlsunset/wlsunset.info index 6186e6cfc2..347ba887a4 100644 --- a/desktop/wlsunset/wlsunset.info +++ b/desktop/wlsunset/wlsunset.info @@ -1,8 +1,8 @@ PRGNAM="wlsunset" -VERSION="0.3.0" +VERSION="0.4.0" HOMEPAGE="https://git.sr.ht/~kennylevinsen/wlsunset" -DOWNLOAD="https://git.sr.ht/~kennylevinsen/wlsunset/archive/0.3.0.tar.gz" -MD5SUM="0ffd8d9bb235f5decf050f41e9154e5d" +DOWNLOAD="https://git.sr.ht/~kennylevinsen/wlsunset/archive/0.4.0.tar.gz" +MD5SUM="668e2f9b47b4f51eaf2b0706fe363123" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/wmMoonClock/wmMoonClock.SlackBuild b/desktop/wmMoonClock/wmMoonClock.SlackBuild index ad279b4d47..36a1b24ca4 100644 --- a/desktop/wmMoonClock/wmMoonClock.SlackBuild +++ b/desktop/wmMoonClock/wmMoonClock.SlackBuild @@ -66,7 +66,7 @@ find -L . \ cd Src mkdir -p $PKG/usr/{bin,man/man1} make \ - CFLAGS="$SLKCFLAGS -fcommon" \ + CFLAGS="$SLKCFLAGS -fcommon -fpermissive" \ INCDIR="-I/usr/include/X11" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" make install DESTDIR=$PKG/usr diff --git a/desktop/wmSun/wmSun.SlackBuild b/desktop/wmSun/wmSun.SlackBuild index 810df47905..a0294ded55 100644 --- a/desktop/wmSun/wmSun.SlackBuild +++ b/desktop/wmSun/wmSun.SlackBuild @@ -65,7 +65,7 @@ find -L . \ cd wmSun mkdir -p $PKG/usr/{bin,man/man1} make \ - COPTS="$SLKCFLAGS -fcommon" \ + COPTS="$SLKCFLAGS -fcommon -fpermissive" \ INCDIR="-I/usr/include/X11" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" make install DESTDIR=$PKG/usr diff --git a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild index f075e52868..b2484290c4 100644 --- a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild +++ b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xfce4-cpugraph-plugin -VERSION=${VERSION:-1.2.6} +VERSION=${VERSION:-1.2.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info index e12ac4a63b..a0837ac60c 100644 --- a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info +++ b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-cpugraph-plugin" -VERSION="1.2.6" +VERSION="1.2.7" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.6.tar.bz2" -MD5SUM="5598a55557cd03583b1867432dc51039" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.7.tar.bz2" +MD5SUM="0480611899650e2d4304d13e0e0dda77" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild index 9486471dbb..260088327d 100644 --- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild +++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xfce4-sensors-plugin -VERSION=${VERSION:-1.4.3} +VERSION=${VERSION:-1.4.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info index 67196fa56a..d3d9fb0eb8 100644 --- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info +++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-sensors-plugin" -VERSION="1.4.3" +VERSION="1.4.4" HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.3.tar.bz2" -MD5SUM="e55dfea49b0c5e9edf068db3b8398240" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.4.tar.bz2" +MD5SUM="0684f0f86e2edfb306086445478f7bbd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild b/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild index 3f7a010194..e4644a9955 100644 --- a/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild +++ b/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild @@ -79,6 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i -e "s|XDT_CHECK_PACKAGE(\[GLIB\], \[glib-2.0\], \[2.16\])|XDT_CHECK_PACKAGE(\[GLIB\], \[glib-2.0\], \[2.26\])|" configure.ac.in + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./autogen.sh \ diff --git a/development/Bear/Bear.SlackBuild b/development/Bear/Bear.SlackBuild index b05f008f7e..5ee668e122 100644 --- a/development/Bear/Bear.SlackBuild +++ b/development/Bear/Bear.SlackBuild @@ -25,7 +25,7 @@ cd "$(dirname "$0")" ; CWD=$(pwd) PRGNAM=Bear -VERSION=${VERSION:-3.1.1} +VERSION=${VERSION:-3.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -70,6 +70,7 @@ cd "$PRGNAM-$VERSION" chown -R root:root . chmod -R u+w,go+r-w,a-s . +patch -p1 < $CWD/fcc90e43eebe9250abeeb81aab429053864da325.patch INSTPREFIX='/usr' cmake \ diff --git a/development/Bear/Bear.info b/development/Bear/Bear.info index 806bbb151f..59893d6079 100644 --- a/development/Bear/Bear.info +++ b/development/Bear/Bear.info @@ -1,10 +1,10 @@ PRGNAM="Bear" -VERSION="3.1.1" +VERSION="3.1.3" HOMEPAGE="https://github.com/rizsotto/Bear" -DOWNLOAD="https://github.com/rizsotto/Bear/archive/3.1.1/Bear-3.1.1.tar.gz" -MD5SUM="1eccc34705eac635aa7408c6c01aef86" +DOWNLOAD="https://github.com/rizsotto/Bear/archive/3.1.3/Bear-3.1.3.tar.gz" +MD5SUM="95dd52be536907a672df211de22fa15c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="grpc fmt spdlog nlohmann_json" +REQUIRES="grpc spdlog nlohmann_json" MAINTAINER="Ivan Kovmir" EMAIL="i@kovmir.eu" diff --git a/development/Bear/fcc90e43eebe9250abeeb81aab429053864da325.patch b/development/Bear/fcc90e43eebe9250abeeb81aab429053864da325.patch new file mode 100644 index 0000000000..3d760041bd --- /dev/null +++ b/development/Bear/fcc90e43eebe9250abeeb81aab429053864da325.patch @@ -0,0 +1,34 @@ +From fcc90e43eebe9250abeeb81aab429053864da325 Mon Sep 17 00:00:00 2001 +From: Ruben Carlo Benante <rcb@beco.cc> +Date: Thu, 28 Mar 2024 23:29:41 -0300 +Subject: [PATCH] always_print_primitive_fields only if GOOGLE_PROTOBUF_VERSION + < 5026000 ref #566 + +--- + source/intercept/source/collect/db/EventsDatabaseWriter.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/source/intercept/source/collect/db/EventsDatabaseWriter.cc b/source/intercept/source/collect/db/EventsDatabaseWriter.cc +index 0403a1ae..bd30cb29 100644 +--- a/source/intercept/source/collect/db/EventsDatabaseWriter.cc ++++ b/source/intercept/source/collect/db/EventsDatabaseWriter.cc +@@ -21,6 +21,8 @@ + #include "libsys/Errors.h" + + #include <google/protobuf/util/json_util.h> ++#include <google/protobuf/stubs/common.h> ++ + #include <fmt/format.h> + + #include <sys/types.h> +@@ -36,7 +38,9 @@ namespace { + JsonPrintOptions create_print_options() { + JsonPrintOptions print_options; + print_options.add_whitespace = false; +- print_options.always_print_primitive_fields = true; ++#if GOOGLE_PROTOBUF_VERSION < 5026000 ++ print_options.always_print_primitive_fields = true; ++#endif + print_options.preserve_proto_field_names = true; + print_options.always_print_enums_as_ints = false; + return print_options; diff --git a/development/Bottleneck/Bottleneck.SlackBuild b/development/Bottleneck/Bottleneck.SlackBuild deleted file mode 100644 index 9cab519df3..0000000000 --- a/development/Bottleneck/Bottleneck.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for Bottleneck - -# Copyright 2014-2017 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=Bottleneck -VERSION=${VERSION:-1.2.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE PKG-INFO *.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/Bottleneck/Bottleneck.info b/development/Bottleneck/Bottleneck.info deleted file mode 100644 index 265b83e0dc..0000000000 --- a/development/Bottleneck/Bottleneck.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="Bottleneck" -VERSION="1.2.1" -HOMEPAGE="https://kwgoodman.github.io/bottleneck-doc/" -DOWNLOAD="https://pypi.python.org/packages/05/ae/cedf5323f398ab4e4ff92d6c431a3e1c6a186f9b41ab3e8258dff786a290/Bottleneck-1.2.1.tar.gz" -MD5SUM="7fbe5f1194b2717dd8482da3679c0270" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python2-numpy" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/development/Bottleneck/README b/development/Bottleneck/README deleted file mode 100644 index a923769876..0000000000 --- a/development/Bottleneck/README +++ /dev/null @@ -1,6 +0,0 @@ -Bottleneck is a collection of fast NumPy array functions written in -Cython. - -Optional dependencies: - SciPy: portions of benchmark suite - tox, virtualenv: run unit tests across multiple python/numpy versions diff --git a/development/Bottleneck/slack-desc b/development/Bottleneck/slack-desc deleted file mode 100644 index 4358200654..0000000000 --- a/development/Bottleneck/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -Bottleneck: Bottleneck (Fast NumPy array functions) -Bottleneck: -Bottleneck: Bottleneck is a collection of fast NumPy array functions -Bottleneck: written in Cython. -Bottleneck: -Bottleneck: Homepage: https://kwgoodman.github.io/bottleneck-doc/ -Bottleneck: -Bottleneck: -Bottleneck: -Bottleneck: -Bottleneck: diff --git a/python/python3-editables/python3-editables.SlackBuild b/development/OpenCL-CLHPP/OpenCL-CLHPP.SlackBuild index 2c8681fccb..4dbb527d40 100644 --- a/python/python3-editables/python3-editables.SlackBuild +++ b/development/OpenCL-CLHPP/OpenCL-CLHPP.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for python3-editables +# Slackware build script for OpenCL-CLHPP -# Copyright 2022-23 fourtysixandtwo <fourtysixandtwo@sliderr.net> +# Copyright 2024 Johannes Schoepfer, Germany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,9 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=python3-editables -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.5} +PRGNAM=OpenCL-CLHPP +VERSION=${VERSION:-2023.12.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,19 +49,16 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" elif [ "$ARCH" = "aarch64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e @@ -70,21 +66,29 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z -cd $SRCNAM-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z +cd $PRGNAM-$VERSION + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ + -o -perm 511 \) -exec chmod 755 {} + -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl +mkdir -p build +cd build + cmake \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TESTING=OFF \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/development/OpenCL-CLHPP/OpenCL-CLHPP.info b/development/OpenCL-CLHPP/OpenCL-CLHPP.info new file mode 100644 index 0000000000..9f16074a85 --- /dev/null +++ b/development/OpenCL-CLHPP/OpenCL-CLHPP.info @@ -0,0 +1,10 @@ +PRGNAM="OpenCL-CLHPP" +VERSION="2023.12.14" +HOMEPAGE="https://github.com/KhronosGroup/" +DOWNLOAD="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v2023.12.14/OpenCL-CLHPP-2023.12.14.tar.gz" +MD5SUM="5efb45d5a8830271ac24fcef4a2e7df6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Johannes Schoepfer" +EMAIL="slackbuilds@schoepfer.info" diff --git a/development/OpenCL-CLHPP/README b/development/OpenCL-CLHPP/README new file mode 100644 index 0000000000..23a0bc3861 --- /dev/null +++ b/development/OpenCL-CLHPP/README @@ -0,0 +1 @@ +C++ bindings for OpenCL. diff --git a/python/python3-glad/slack-desc b/development/OpenCL-CLHPP/slack-desc index 459c4a5157..27d39d199f 100644 --- a/python/python3-glad/slack-desc +++ b/development/OpenCL-CLHPP/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -python3-glad: python3-glad (Python binding for GLAD Loader-Generator) -python3-glad: -python3-glad: GLAD is a Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator -python3-glad: based on the official specifications for multiple languages. -python3-glad: -python3-glad: -python3-glad: -python3-glad: -python3-glad: -python3-glad: -python3-glad: +OpenCL-CLHPP: OpenCL-CLHPP (OpenCL API C++ bindings) +OpenCL-CLHPP: +OpenCL-CLHPP: C++ bindings for OpenCL. +OpenCL-CLHPP: +OpenCL-CLHPP: +OpenCL-CLHPP: +OpenCL-CLHPP: +OpenCL-CLHPP: +OpenCL-CLHPP: +OpenCL-CLHPP: https://github.com/KhronosGroup/OpenCL-CLHPP/ +OpenCL-CLHPP: diff --git a/development/OpenJDK11/OpenJDK11.SlackBuild b/development/OpenJDK11/OpenJDK11.SlackBuild index 95c93e24f5..c8f24532fc 100644 --- a/development/OpenJDK11/OpenJDK11.SlackBuild +++ b/development/OpenJDK11/OpenJDK11.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=OpenJDK11 -VERSION=${VERSION:-11.0.18} +VERSION=${VERSION:-11.0.23} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -127,12 +127,13 @@ sh configure \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-giflib=system \ - --with-harfbuzz=system \ + --with-harfbuzz=bundled \ --with-lcms=system \ --with-libjpeg=system \ --with-libpng=system \ - --with-zlib=system \ + --with-zlib=bundled \ --disable-precompiled-headers \ + --enable-libffi-bundling \ --enable-unlimited-crypto \ --disable-warnings-as-errors \ --with-native-debug-symbols=none \ @@ -189,6 +190,14 @@ mv ja_JP.UTF-8 ja ) find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# Thanks to AlienBOB for this part! +# Generate a cacerts file from the certificates installed by ca-certificates +# in Slackware - the "cacerts" in the OpenJDK sources may be outdated. +# This requires 'trust' program from p11-kit: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/security/cacerts +trust extract --format=java-cacerts --filter=ca-anchors --purpose=server-auth \ + $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/security/cacerts + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ LICENSE ADDITIONAL_LICENSE_INFO ASSEMBLY_EXCEPTION README.md \ diff --git a/development/OpenJDK11/OpenJDK11.info b/development/OpenJDK11/OpenJDK11.info index d77c11e528..64b635534f 100644 --- a/development/OpenJDK11/OpenJDK11.info +++ b/development/OpenJDK11/OpenJDK11.info @@ -1,16 +1,16 @@ PRGNAM="OpenJDK11" -VERSION="11.0.18" +VERSION="11.0.23" HOMEPAGE="https://openjdk.java.net/" -DOWNLOAD="https://github.com/openjdk/jdk11u/archive/jdk-11.0.18-ga/jdk11u-jdk-11.0.18-ga.tar.gz \ +DOWNLOAD="https://github.com/openjdk/jdk11u/archive/jdk-11.0.23-ga/jdk11u-jdk-11.0.23-ga.tar.gz \ https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-10.0.2/OpenJDK-10.0.2+13-i686-bin.tar.xz \ http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/jtreg-6.1-1.tar.xz" -MD5SUM="a7b663f0618e3d7e4eefc4b5e0f097b0 \ +MD5SUM="933114e589ecd40ac69eb56f05cfc8ba \ d66af9a4303ce9d0c93c92945048e361 \ e3389e74678dcf707b5b3d5ec6c7510d" -DOWNLOAD_x86_64="https://github.com/openjdk/jdk11u/archive/jdk-11.0.18-ga/jdk11u-jdk-11.0.18-ga.tar.gz \ +DOWNLOAD_x86_64="https://github.com/openjdk/jdk11u/archive/jdk-11.0.23-ga/jdk11u-jdk-11.0.23-ga.tar.gz \ https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-10.0.2/OpenJDK-10.0.2+13-x86_64-bin.tar.xz \ http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/jtreg-6.1-1.tar.xz" -MD5SUM_x86_64="a7b663f0618e3d7e4eefc4b5e0f097b0 \ +MD5SUM_x86_64="933114e589ecd40ac69eb56f05cfc8ba \ a550f9e2aa1e8437346bb52a7b36052e \ e3389e74678dcf707b5b3d5ec6c7510d" REQUIRES="" diff --git a/development/OpenJDK11/README b/development/OpenJDK11/README index bb738313e4..428b766aa8 100644 --- a/development/OpenJDK11/README +++ b/development/OpenJDK11/README @@ -5,7 +5,7 @@ developing, testing, and running programs written in Java. This script builds the package from source using the packages listed in the .info file (the source tarball plus a binary of the prevous version to bootstrap from), so it is not necessary to have a jdk -package installed to build this package. +package installed to build this package. (See BIG FAT NOTE below.) By default, the source package uses all available cores to build the package, but this can be controlled by passing CORES=<x> to the script. @@ -28,5 +28,10 @@ saved in $TMP/jtreg-reports if you want to review them. After installing this package you will need to logout/login to your machine as it will add new files to the /etc/profile.d folder. +BIG FAT NOTE: If you have ANY JDK installed (jdk, zulu-openjdk, +OpenJDK, etc.), you MUST first uninstall it, then logout/login to +clear the JAVA_HOME folder from your $PATH in order to build this +package, otherwise the build will fail. + MANY thanks to the BLFS community for maintaining 32-bit builds of the -later versions of OpenJDK we use for bootstrapping. +later versions of OpenJDK 10 we use for bootstrapping. diff --git a/development/OpenJDK17/OpenJDK17.SlackBuild b/development/OpenJDK17/OpenJDK17.SlackBuild index bcbb342ab9..fb25bfff3a 100644 --- a/development/OpenJDK17/OpenJDK17.SlackBuild +++ b/development/OpenJDK17/OpenJDK17.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=OpenJDK17 -VERSION=${VERSION:-17.0.6} +VERSION=${VERSION:-17.0.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -87,7 +87,7 @@ export BOOT_JAVA=$TMP/$BSDIR # Unpack the jtreg package to run the tests: if [ "${TESTS:-no}" = "yes" ]; then rm -rf $TMP/jtreg{,-reports} - tar xvf $CWD/jtreg-6.1+1.tar.gz + tar xvf $CWD/jtreg-7.3.1+1.tar.gz JTREG="--with-jtreg=$TMP/jtreg" else JTREG="" @@ -132,12 +132,13 @@ sh configure \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-giflib=system \ - --with-harfbuzz=system \ + --with-harfbuzz=bundled \ --with-lcms=system \ --with-libjpeg=system \ --with-libpng=system \ - --with-zlib=system \ + --with-zlib=bundled \ --disable-precompiled-headers \ + --enable-libffi-bundling \ --enable-unlimited-crypto \ --disable-warnings-as-errors \ --with-native-debug-symbols=none \ @@ -189,6 +190,14 @@ mv $PKG/usr/lib$LIBDIRSUFFIX/java/man $PKG/usr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +#Thanks AlienBOB for this part! +# Generate a cacerts file from the certificates installed by ca-certificates +# in Slackware - the "cacerts" in the OpenJDK sources may be outdated. +# This requires 'trust' program from p11-kit: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/security/cacerts +trust extract --format=java-cacerts --filter=ca-anchors --purpose=server-auth \ + $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/security/cacerts + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ LICENSE ADDITIONAL_LICENSE_INFO ASSEMBLY_EXCEPTION README.md \ diff --git a/development/OpenJDK17/OpenJDK17.info b/development/OpenJDK17/OpenJDK17.info index 6e511f4559..5a7f7b3341 100644 --- a/development/OpenJDK17/OpenJDK17.info +++ b/development/OpenJDK17/OpenJDK17.info @@ -1,18 +1,18 @@ PRGNAM="OpenJDK17" -VERSION="17.0.6" +VERSION="17.0.10" HOMEPAGE="https://openjdk.java.net/" -DOWNLOAD="https://github.com/openjdk/jdk17u/archive/jdk-17.0.6-ga/jdk17u-jdk-17.0.6-ga.tar.gz \ - http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/OpenJDK-16.0.2-ga-linux-i586-bin.tar.xz \ - https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-17.0.1/jtreg-6.1+1.tar.gz" -MD5SUM="b1e04cf1feec28c6d5aa2e3315d21bcf \ +DOWNLOAD="https://github.com/openjdk/jdk17u/archive/jdk-17.0.10-ga/jdk17u-jdk-17.0.10-ga.tar.gz \ + https://slackware.uk/people/alien/slackbuilds/openjdk17/build/sources/OpenJDK-16.0.2-ga-linux-i586-bin.tar.xz \ + https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-21.0.2/jtreg-7.3.1+1.tar.gz" +MD5SUM="622d3d09c98173b875d839339fabe99f \ 1122a0355d0f85af1f4458965661d37f \ - 49e6bfa2506e96f461a01f9421a0961c" -DOWNLOAD_x86_64="https://github.com/openjdk/jdk17u/archive/jdk-17.0.6-ga/jdk17u-jdk-17.0.6-ga.tar.gz \ - http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/OpenJDK-16.0.2-ga-linux-x86_64-bin.tar.xz \ - https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-17.0.1/jtreg-6.1+1.tar.gz" -MD5SUM_x86_64="b1e04cf1feec28c6d5aa2e3315d21bcf \ + 0038551ecaf37d0cd99832217f79e56d" +DOWNLOAD_x86_64="https://github.com/openjdk/jdk17u/archive/jdk-17.0.10-ga/jdk17u-jdk-17.0.10-ga.tar.gz \ + https://slackware.uk/people/alien/slackbuilds/openjdk17/build/sources/OpenJDK-16.0.2-ga-linux-x86_64-bin.tar.xz \ + https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-21.0.2/jtreg-7.3.1+1.tar.gz" +MD5SUM_x86_64="622d3d09c98173b875d839339fabe99f \ 5a78816bed3c90f4552dc2163282faca \ - 49e6bfa2506e96f461a01f9421a0961c" + 0038551ecaf37d0cd99832217f79e56d" REQUIRES="" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/development/OpenJDK17/README b/development/OpenJDK17/README index d3c65f9fc0..38d5533c40 100644 --- a/development/OpenJDK17/README +++ b/development/OpenJDK17/README @@ -5,7 +5,7 @@ developing, testing, and running programs written in Java. This script builds the package from source using the packages listed in the .info file (the source tarball plus a binary of the prevous version to bootstrap from), so it is not necessary to have a jdk -package installed to build this package. +package installed to build this package. (See BIG FAT NOTE below.) By default, the source package uses all available cores to build the package, but this can be controlled by passing CORES=<x> to the script. @@ -22,11 +22,13 @@ removed before running this script. To test the build, pass TESTS=yes. This will unpack the jtreg package to run the tests. You should expect to see somewhere in the area of -about 30 to 40 failures and about a dozen errors. The reports will be -saved in $TMP/jtreg-reports if you want to review them. +about 40 failures and about a dozen errors. The reports will be saved +in $TMP/jtreg-reports if you want to review them. After installing this package you will need to logout/login to your machine as it will add new files to the /etc/profile.d folder. -MANY thanks to the BLFS community for maintaining 32-bit builds of the -later versions of OpenJDK we use for bootstrapping. +BIG FAT NOTE: If you have ANY JDK installed (jdk, zulu-openjdk, +OpenJDK, etc.), you MUST first uninstall it, then logout/login to +clear the JAVA_HOME folder from your $PATH in order to build this +package, otherwise the build will fail. diff --git a/development/OpenJDK21/OpenJDK21.SlackBuild b/development/OpenJDK21/OpenJDK21.SlackBuild new file mode 100644 index 0000000000..8816ca0da3 --- /dev/null +++ b/development/OpenJDK21/OpenJDK21.SlackBuild @@ -0,0 +1,253 @@ +#!/bin/bash + +# Slackware build script for OpenJDK21 LTS + +# Copyright 2024 Lenard Spencer, Orlando, Florida, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=OpenJDK21 +VERSION=${VERSION:-21.0.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm; echo "$ARCH is not supported, aborting."; exit 1 ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf jdk21u-jdk-$VERSION-ga +tar xvf $CWD/jdk21u-jdk-$VERSION-ga.tar.gz + +# Building openjdk from source requires bootstrapping from either a +# current or previous version of the (open)jdk binary installation. +# Extract the OpenJDK20 binary to bootstrap +if [ "$ARCH" = "x86_64" ]; then + export BSDIR="OpenJDK-20.0.2-ga-linux-x86_64-bin" + rm -rf $BSDIR + tar xvf $CWD/OpenJDK-20.0.2-ga-linux-x86_64-bin.tar.xz +else + export BSDIR="OpenJDK-20.0.2-ga-linux-i586-bin" + rm -rf $BSDIR + tar xvf $CWD/OpenJDK-20.0.2-ga-linux-i586-bin.tar.xz +fi + +export BOOT_JAVA=$TMP/$BSDIR + +# Unpack the jtreg package to run the tests: +if [ "${TESTS:-no}" = "yes" ]; then + rm -rf $TMP/jtreg{,-reports} + tar xvf $CWD/jtreg-7.3.1+1.tar.gz + JTREG="--with-jtreg=$TMP/jtreg" +else + JTREG="" +fi + +cd jdk21u-jdk-${VERSION}-ga +echo "Setting permissions (this may take a while so be patient)" +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +unset JAVA_HOME # recommended by upstream + +if [ "${USE_CCACHE:-no}" = "yes" ]; then + USECCACHE="--enable-ccache" +else + USECCACHE="" +fi + +# By default, the OpenJDK21 build uses all available cpu cores. +# We can override that here with the CORES= switch. +if [ "${CORES:-""}" ]; then + JVAL="$(echo $CORES | grep -o "[0-9]")" || true + [ -n "$JVAL" ] && SJOBS="--with-jobs=$JVAL" + TJOBS=$JVAL +else + SJOBS="" + TJOBS="$(expr $(nproc) + 1)" +fi + +sh configure \ + --with-boot-jdk=${BOOT_JAVA} \ + --with-extra-cflags="$SLKCFLAGS" \ + --with-extra-cxxflags="$SLKCFLAGS" \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --with-giflib=system \ + --with-harfbuzz=system \ + --with-lcms=system \ + --with-libjpeg=system \ + --with-libpng=system \ + --with-zlib=system \ + --disable-precompiled-headers \ + --enable-libffi-bundling \ + --enable-unlimited-crypto \ + --disable-warnings-as-errors \ + --with-native-debug-symbols=none \ + $SJOBS \ + $USECCACHE \ + $JTREG \ + --build=$ARCH-slackware-linux + +unset MAKEFLAGS # causes the build to fail if set +make bootcycle-images + +# Test the build using jtreg (thanks BLFS): +if [ "$TESTS" = "yes" ]; then + export JT_JAVA=$(echo $TMP/jdk21u-jdk-${VERSION}-ga/build/*/jdk) + mkdir -p $TMP/jtreg-reports + $TMP/jtreg/bin/jtreg -jdk:$JT_JAVA -automatic -ignore:quiet -v1 \ + -r:$TMP/jtreg-reports -avm -conc:$TJOBS test/jdk:tier1 test/langtools:tier1 \ + || true + unset JT_JAVA +fi + +# make install does not respect DESTDIR, so we must move the image: +mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/java +cp -a build/*/images/jdk/* $PKG/usr/lib$LIBDIRSUFFIX/java + +for s in 16 24 32 48; do + install -vDm644 src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \ + $PKG/usr/share/icons/hicolor/${s}x${s}/apps/java.png +done +# the 24x24 icon is missized, so we fix it here: +cp $CWD/java.png $PKG/usr/share/icons/hicolor/24x24/apps + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Create some necessary symlinks: +( cd $PKG/usr/lib$LIBDIRSUFFIX +ln -sf java $PRGNAM-$VERSION +ln -sf java/lib/libjawt.so +ln -sf java/lib/server/libjvm.so +ln -sf java/lib/libjava.so +ln -sf java/lib/libawt.so +ln -sf java/lib/libawt_xawt.so +ln -sf java/lib/libverify.so +) + +# Move man pages and compress: +mv $PKG/usr/lib$LIBDIRSUFFIX/java/man $PKG/usr +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +#Thanks AlienBOB for this part! +# Generate a cacerts file from the certificates installed by ca-certificates +# in Slackware - the "cacerts" in the OpenJDK sources may be outdated. +# This requires 'trust' program from p11-kit: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/security/cacerts +trust extract --format=java-cacerts --filter=ca-anchors --purpose=server-auth \ + $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/security/cacerts + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + LICENSE ADDITIONAL_LICENSE_INFO ASSEMBLY_EXCEPTION README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +( cd $PKG/usr/doc/$PRGNAM-$VERSION +ln -s ../../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/legal +ln -s ../../lib${LIBDIRSUFFIX}/$PRGNAM-$VERSION/release +) + +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +# Create desktop entries (Thanks BLFS): +mkdir -p $PKG/usr/share/applications +cat > $PKG/usr/share/applications/openjdk-java.desktop << EOF +[Desktop Entry] +Name=OpenJDK ${VERSION} Runtime +Comment=OpenJDK Java ${VERSION} Runtime +Exec=/usr/lib${LIBDIRSUFFIX}/java/bin/java -jar +Terminal=false +Type=Application +Icon=java +MimeType=application/x-java-archive;application/java-archive;application/x-jar; +NoDisplay=true +EOF + +cat > $PKG/usr/share/applications/openjdk-jconsole.desktop << EOF +[Desktop Entry] +Name=OpenJDK Java ${VERSION} Console +Comment=OpenJDK ${VERSION} Console +Keywords=java;console;monitoring +Exec=/usr/lib${LIBDIRSUFFIX}/java/bin/jconsole +Terminal=false +Type=Application +Icon=java +Categories=System; +EOF + +# Create /etc/profile.d scripts: +mkdir -p $PKG/etc/profile.d +cat > $PKG/etc/profile.d/jdk21.sh << EOF +export JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/java +export PATH=\${PATH}:\${JAVA_HOME}/bin +EOF + +cat > $PKG/etc/profile.d/jdk21.csh << EOF +setenv JAVA_HOME /usr/lib${LIBDIRSUFFIX}/java +setenv PATH \${PATH}:\${JAVA_HOME}/bin +EOF +chmod 755 $PKG/etc/profile.d/* + +mkdir -p $PKG/install +cat $CWD/doinst.sh > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/OpenJDK21/OpenJDK21.info b/development/OpenJDK21/OpenJDK21.info new file mode 100644 index 0000000000..4a883f5811 --- /dev/null +++ b/development/OpenJDK21/OpenJDK21.info @@ -0,0 +1,18 @@ +PRGNAM="OpenJDK21" +VERSION="21.0.3" +HOMEPAGE="https://openjdk.java.net/" +DOWNLOAD="https://github.com/openjdk/jdk21u/archive/jdk-21.0.3-ga/jdk21u-jdk-21.0.3-ga.tar.gz \ + http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/OpenJDK-20.0.2-ga-linux-i586-bin.tar.xz \ + https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-21.0.2/jtreg-7.3.1+1.tar.gz" +MD5SUM="d93fe3298131763cdc6c09702325e9ab \ + 5003cd54ea62d4f10e2f1cfa6dfae890 \ + 0038551ecaf37d0cd99832217f79e56d" +DOWNLOAD_x86_64="https://github.com/openjdk/jdk21u/archive/jdk-21.0.3-ga/jdk21u-jdk-21.0.3-ga.tar.gz \ + http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/OpenJDK-20.0.2-ga-linux-x86_64-bin.tar.xz \ + https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-21.0.2/jtreg-7.3.1+1.tar.gz" +MD5SUM_x86_64="d93fe3298131763cdc6c09702325e9ab \ + ac9a6afd411d7206c94d23a86d8b1cd3 \ + 0038551ecaf37d0cd99832217f79e56d" +REQUIRES="" +MAINTAINER="Lenard Spencer" +EMAIL="lenardrspencer@gmail.com" diff --git a/development/OpenJDK21/README b/development/OpenJDK21/README new file mode 100644 index 0000000000..2a42e2f8b5 --- /dev/null +++ b/development/OpenJDK21/README @@ -0,0 +1,37 @@ +OpenJDK21 is an open source implementation of version 21 (LTS) of the +Java Development Kit, Standard Edition. It includes tools for +developing, testing, and running programs written in Java. + +This script builds the package from source using the packages listed +in the .info file (the source tarball plus a binary of the prevous +version to bootstrap from), so it is not necessary to have a jdk +package installed to build this package. (See BIG FAT NOTE below.) + +By default, the source package uses all available cores to build the +package, but this can be controlled by passing CORES=<x> to the script. +It is HIGHLY recommended to use all available cores as a single-core +build can take quite a while, especially on slower machines. +NOTE: The build normally fails with MAKEFLAGS set, but this script +tempararily unsets so it can proceed. + +The source is also able to use ccache to speed up rebuilds. To enable +this, pass USE_CCACHE=yes to the script. NOTE: Some other SBo scripts +recommend creating cc/c++/gcc/g++ symlinks to ccache in /usr/local/bin +to use ccache, but this build fails on that, so make sure they are +removed before running this script. + +To test the build, pass TESTS=yes. This will unpack the jtreg package +to run the tests. You should expect to see somewhere in the area of +about 2 dozen failures and about 2 dozen errors. The reports will be +saved in $TMP/jtreg-reports if you want to review them. + +After installing this package you will need to logout/login to your +machine as it will add new files to the /etc/profile.d folder. + +NOTE: This needs almost 4 GB of storage to build, so if space on your +/tmp is limited, you may want to adjust $TMP to another partition. + +BIG FAT NOTE: If you have ANY JDK installed (jdk, zulu-openjdk, +OpenJDK, etc.), you MUST first uninstall it, then logout/login to +clear the JAVA_HOME folder from your $PATH in order to build this +package, otherwise the build will fail. diff --git a/misc/fcitx5/doinst.sh b/development/OpenJDK21/doinst.sh index 138e27de17..39ec34e32e 100644 --- a/misc/fcitx5/doinst.sh +++ b/development/OpenJDK21/doinst.sh @@ -1,13 +1,15 @@ + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi diff --git a/development/OpenJDK21/java.png b/development/OpenJDK21/java.png Binary files differnew file mode 100644 index 0000000000..0c41d652a3 --- /dev/null +++ b/development/OpenJDK21/java.png diff --git a/development/protobuf3/slack-desc b/development/OpenJDK21/slack-desc index 440a1c6d9a..2f00ed7f6b 100644 --- a/development/protobuf3/slack-desc +++ b/development/OpenJDK21/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -protobuf3: protobuf3 (Google's data interchange format) -protobuf3: -protobuf3: Protocol Buffers are Google's language-neutral, platform-neutral, -protobuf3: extensible mechanism for serializing structured data. -protobuf3: -protobuf3: This package contains protobuf API version 3. -protobuf3: -protobuf3: -protobuf3: Project URL: https://github.com/google/protobuf -protobuf3: -protobuf3: +OpenJDK21: OpenJDK21 (open implementation of JDK 21 LTS) +OpenJDK21: +OpenJDK21: OpenJDK21 is an open source implementation of version 21 (LTS) of +OpenJDK21: the Java Development Kit, Standard Edition. It includes tools for +OpenJDK21: developing, testing, and running programs written in Java. +OpenJDK21: +OpenJDK21: +OpenJDK21: +OpenJDK21: +OpenJDK21: homepage: https://OpenJDK.java.net/ +OpenJDK21: diff --git a/development/Sphinx/README b/development/Sphinx/README deleted file mode 100644 index e3f923a7f7..0000000000 --- a/development/Sphinx/README +++ /dev/null @@ -1,5 +0,0 @@ -Sphinx is a tool that translates a set of reStructuredText -source files into various output formats, including HTML, ePub, -LaTeX and plain text. Sphinx was originally created for the Python -documentation, but it has excellent facilities for the documentation -of software projects in a range of languages. diff --git a/development/Sphinx/Sphinx.SlackBuild b/development/Sphinx/Sphinx.SlackBuild deleted file mode 100644 index 330564c274..0000000000 --- a/development/Sphinx/Sphinx.SlackBuild +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash - -# Slackware build script for Sphinx - -# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2013 Mikko Värri, Finland -# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=Sphinx -SRCNAM=Sphinx -VERSION=${VERSION:-5.3.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -# lower Pygments required version -sed -i '/Pygments>=/ s/2.12/2.10.0/' pyproject.toml - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS CHANGES EXAMPLES LICENSE README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/Sphinx/Sphinx.info b/development/Sphinx/Sphinx.info deleted file mode 100644 index 9d05ca57e9..0000000000 --- a/development/Sphinx/Sphinx.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="Sphinx" -VERSION="5.3.0" -HOMEPAGE="http://www.sphinx-doc.org" -DOWNLOAD="https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-5.3.0.tar.gz" -MD5SUM="b752f7b0177865a36cbcdcef4ac80cd4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="alabaster imagesize python3-babel snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp sphinxcontrib-htmlhelp sphinxcontrib-jsmath sphinxcontrib-qthelp sphinxcontrib-serializinghtml python-importlib_metadata" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/development/abseil-cpp/README b/development/abseil-cpp/README deleted file mode 100644 index b1b90760e1..0000000000 --- a/development/abseil-cpp/README +++ /dev/null @@ -1,2 +0,0 @@ -Abseil is an open-source collection of C++ code designed to augment the -C++ standard library. diff --git a/development/abseil-cpp/abseil-cpp.SlackBuild b/development/abseil-cpp/abseil-cpp.SlackBuild deleted file mode 100644 index 5b823e7e09..0000000000 --- a/development/abseil-cpp/abseil-cpp.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -# Slackware build script for abseil-cpp - -# Copyright 2024 Isaac Yu <isaacyu@protonmail.com> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=abseil-cpp -VERSION=${VERSION:-20240116.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DNDEBUG" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_CXX_STANDARD=17 \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CONTRIBUTING.md FAQ.md LICENSE README.md UPGRADES.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/abseil-cpp/abseil-cpp.info b/development/abseil-cpp/abseil-cpp.info deleted file mode 100644 index 8274f19690..0000000000 --- a/development/abseil-cpp/abseil-cpp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="abseil-cpp" -VERSION="20240116.2" -HOMEPAGE="https://abseil.io" -DOWNLOAD="https://github.com/abseil/abseil-cpp/archive/20240116.2/abseil-cpp-20240116.2.tar.gz" -MD5SUM="f2c807858166b0a8ce4f679b17111335" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Isaac Yu" -EMAIL="isaacyu@protonmail.com" diff --git a/development/abseil-cpp/slack-desc b/development/abseil-cpp/slack-desc deleted file mode 100644 index cd4106eb18..0000000000 --- a/development/abseil-cpp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -abseil-cpp: abseil-cpp (Abseil C++ Common Libraries) -abseil-cpp: -abseil-cpp: Abseil is an open-source collection of C++ code designed to augment -abseil-cpp: the C++ standard library. -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: diff --git a/development/acpica/acpica.SlackBuild b/development/acpica/acpica.SlackBuild index 7ba1a39095..4e206ac843 100644 --- a/development/acpica/acpica.SlackBuild +++ b/development/acpica/acpica.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for acpica -# Copyright 2008-2023 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2024 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=acpica -VERSION=${VERSION:-20230331} +VERSION=${VERSION:-20240321} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/acpica/acpica.info b/development/acpica/acpica.info index 1b3f810767..446adea3af 100644 --- a/development/acpica/acpica.info +++ b/development/acpica/acpica.info @@ -1,8 +1,8 @@ PRGNAM="acpica" -VERSION="20230331" +VERSION="20240321" HOMEPAGE="http://www.acpica.org" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/acpica-unix-20230331.tar.gz" -MD5SUM="9610f97f23389bbe72c75a4c1bd6442f" +DOWNLOAD="https://github.com/acpica/acpica/files/14718333/acpica-unix-20240321.tar.gz" +MD5SUM="835f7d1167ea44a2fdf67d1d008a2224" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/actionlint/actionlint.SlackBuild b/development/actionlint/actionlint.SlackBuild index 3b534d19d3..bac69a9e6e 100644 --- a/development/actionlint/actionlint.SlackBuild +++ b/development/actionlint/actionlint.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=actionlint -VERSION=${VERSION:-1.6.27} +VERSION=${VERSION:-1.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -83,8 +83,8 @@ for DEPENDENCY in fatih/color/1.16.0 \ done mkdir -p vendor/golang.org/x -for DEPENDENCY in sync/0.6.0 \ - sys/0.17.0 ; do +for DEPENDENCY in sync/0.7.0 \ + sys/0.20.0 ; do DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f1)" DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f2)" @@ -123,7 +123,7 @@ github.com/rivo/uniseg # github.com/robfig/cron/v3 v3.0.1 ## explicit; go 1.12 github.com/robfig/cron/v3 -# github.com/yuin/goldmark v1.7.0 +# github.com/yuin/goldmark v1.7.1 ## explicit; go 1.19 github.com/yuin/goldmark github.com/yuin/goldmark/ast @@ -134,11 +134,11 @@ github.com/yuin/goldmark/renderer github.com/yuin/goldmark/renderer/html github.com/yuin/goldmark/text github.com/yuin/goldmark/util -# golang.org/x/sync v0.6.0 +# golang.org/x/sync v0.7.0 ## explicit; go 1.18 golang.org/x/sync/errgroup golang.org/x/sync/semaphore -# golang.org/x/sys v0.17.0 +# golang.org/x/sys v0.20.0 ## explicit; go 1.18 golang.org/x/sys/execabs golang.org/x/sys/unix diff --git a/development/actionlint/actionlint.info b/development/actionlint/actionlint.info index 0db6a7419b..50d39d5ad3 100644 --- a/development/actionlint/actionlint.info +++ b/development/actionlint/actionlint.info @@ -1,7 +1,7 @@ PRGNAM="actionlint" -VERSION="1.6.27" +VERSION="1.7.0" HOMEPAGE="https://github.com/rhysd/actionlint" -DOWNLOAD="https://github.com/rhysd/actionlint/archive/v1.6.27/actionlint-1.6.27.tar.gz \ +DOWNLOAD="https://github.com/rhysd/actionlint/archive/v1.7.0/actionlint-1.7.0.tar.gz \ https://github.com/fatih/color/archive/v1.16.0/color-1.16.0.tar.gz \ https://github.com/google/go-cmp/archive/v0.6.0/go-cmp-0.6.0.tar.gz \ https://github.com/mattn/go-colorable/archive/v0.1.13/go-colorable-0.1.13.tar.gz \ @@ -10,10 +10,10 @@ DOWNLOAD="https://github.com/rhysd/actionlint/archive/v1.6.27/actionlint-1.6.27. https://github.com/rivo/uniseg/archive/v0.4.7/uniseg-0.4.7.tar.gz \ https://github.com/robfig/cron/archive/v3.0.1/cron-3.0.1.tar.gz \ https://github.com/yuin/goldmark/archive/v1.7.0/goldmark-1.7.0.tar.gz \ - https://github.com/golang/sync/archive/v0.6.0/sync-0.6.0.tar.gz \ - https://github.com/golang/sys/archive/v0.17.0/sys-0.17.0.tar.gz \ + https://github.com/golang/sync/archive/v0.7.0/sync-0.7.0.tar.gz \ + https://github.com/golang/sys/archive/v0.20.0/sys-0.20.0.tar.gz \ https://github.com/go-yaml/yaml/archive/v3.0.1/yaml-3.0.1.tar.gz" -MD5SUM="e4df3137469434768968d93861158a9f \ +MD5SUM="b51bcbdf5d69b621266d32b84535130d \ 3f3abb1b34a6f54dc26255395d425271 \ 5f88097e0cfd038e6f44c80c3580fa78 \ ac74020d881d4966e33ab6580f509aeb \ @@ -22,8 +22,8 @@ MD5SUM="e4df3137469434768968d93861158a9f \ 3751c82dd342cd5823703910b9da173d \ 6165823364bc3bd568d3a6a1dee6c2cb \ 2668b89123f9a0acccf8a9a89d0679e4 \ - 85888b0694f3bcbe23e64ced0c3446c7 \ - fff45f6edce665d4ab42a18817bb212d \ + 7a89be834b4d9fa79e57d6f6024bc1aa \ + 7b645e9b79a0c60a4272df2e6cc9a5f3 \ 3653fca1491a8b432d590ed3dab3aa77" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/development/atasm/0001-Fix-the-compiling-under-Linux-Mac.patch b/development/atasm/0001-Fix-the-compiling-under-Linux-Mac.patch new file mode 100644 index 0000000000..ec9a977b92 --- /dev/null +++ b/development/atasm/0001-Fix-the-compiling-under-Linux-Mac.patch @@ -0,0 +1,34 @@ +From 08296d7cc2697696f2e6098e619f316baaebc626 Mon Sep 17 00:00:00 2001 +From: CycoZA <peter@cerebus.co.za> +Date: Sun, 5 May 2024 16:29:52 +0200 +Subject: [PATCH] Fix the compiling under Linux/Mac + +--- + src/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 74971d1..d0b5cff 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -19,7 +19,7 @@ UNIX = -DUNIX + #CFLAGS = -g -Wall $(USEZ) $(DOS) $(UNIX) $(ARCH) + CFLAGS = -Wall $(USEZ) $(DOS) $(UNIX) -O3 -fomit-frame-pointer $(ARCH) + +-L = $(ZLIB) ++L = $(ZLIB) -lm + CC = gcc + DESTDIR = /usr/local/bin + MANDIR = /usr/local/man/man1 +@@ -30,7 +30,7 @@ DOCDIR = /usr/local/doc/atasm + + all: prog + +-OBJS = asm.o symbol.o parser.o setparse.o state.o dimage.o inc_path.o crc32.o atasm_err.o state2.o ++OBJS = asm.o symbol.o parser.o setparse.o state.o dimage.o inc_path.o crc32.o atasm_err.o state2.o parse_float.o setfloatparse.o + + asm.o: ops.h directive.h symbol.h inc_path.h atasm_err.h + atasm_err.o: atasm_err.h symbol.h +-- +2.35.8 + diff --git a/development/atasm/README b/development/atasm/README index 5a818ce548..92865c4ed1 100644 --- a/development/atasm/README +++ b/development/atasm/README @@ -4,8 +4,3 @@ ATasm is a 6502 command-line cross-assembler that is compatible with the original Mac/65 macroassembler released by OSS software. Code development can now be performed using modern editors and compiles with lightning speed. - -This build has been updated for version 1.07d (the last beta -release), but it's still possible to build 1.06 (last stable release) -by downloading the 1.06 source and setting VERSION=1.06 in the -environment. diff --git a/development/atasm/atasm.SlackBuild b/development/atasm/atasm.SlackBuild index 7923307007..3079667d35 100644 --- a/development/atasm/atasm.SlackBuild +++ b/development/atasm/atasm.SlackBuild @@ -6,6 +6,8 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20240505 bkw: update for v1.25. + # 20240207 bkw: # - update for v1.23, which is a maintained fork from a new dev. @@ -18,7 +20,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=atasm -VERSION=${VERSION:-1.23} +VERSION=${VERSION:-1.25} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -60,8 +62,15 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz \ --exclude='*.exe' --exclude='*.sln' --exclude="*.vcx*" cd $PRGNAM-$VERSION chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + + +# this patch is from upstream git. +patch -p1 < $CWD/0001-Fix-the-compiling-under-Linux-Mac.patch + +# this patch has been submitted to upstream, should be in the next +# release. +patch -p1 < $CWD/gcc11fix.diff DOCDIR=/usr/doc/$PRGNAM-$VERSION diff --git a/development/atasm/atasm.info b/development/atasm/atasm.info index 73aee354f6..66fac87aa8 100644 --- a/development/atasm/atasm.info +++ b/development/atasm/atasm.info @@ -1,8 +1,8 @@ PRGNAM="atasm" -VERSION="1.23" +VERSION="1.25" HOMEPAGE="https://github.com/CycoPH/atasm/" -DOWNLOAD="https://github.com/CycoPH/atasm/archive/V1.23/atasm-1.23.tar.gz" -MD5SUM="8530e6c68b9c0d68dee592ac24f0b247" +DOWNLOAD="https://github.com/CycoPH/atasm/archive/V1.25/atasm-1.25.tar.gz" +MD5SUM="566b3c902941210966dc02ee0606b853" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/atasm/gcc11fix.diff b/development/atasm/gcc11fix.diff new file mode 100644 index 0000000000..e3f7946d75 --- /dev/null +++ b/development/atasm/gcc11fix.diff @@ -0,0 +1,26 @@ +diff --git a/src/setfloatparse.c b/src/setfloatparse.c +index 3bf78b8..61c1569 100644 +--- a/src/setfloatparse.c ++++ b/src/setfloatparse.c +@@ -41,7 +41,7 @@ float fnums[64]; + extern int get_dotname(char* src, char* dst); + extern symbol* validate_symbol(char* str); + +-char* parse_string; ++static char* parse_string; + /*=========================================================================* + function floatlex() + +diff --git a/src/setparse.c b/src/setparse.c +index 07904c5..fb4fc66 100644 +--- a/src/setparse.c ++++ b/src/setparse.c +@@ -36,7 +36,7 @@ int yyparse(); + extern int rval; + int vnum, nums[64]; + +-char *parse_string; ++static char *parse_string; + /*=========================================================================* + function yylex() + diff --git a/development/avrdude/avrdude.SlackBuild b/development/avrdude/avrdude.SlackBuild index 374837ed45..58d9a69ccc 100644 --- a/development/avrdude/avrdude.SlackBuild +++ b/development/avrdude/avrdude.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=avrdude -VERSION=${VERSION:-7.2} +VERSION=${VERSION:-7.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/avrdude/avrdude.info b/development/avrdude/avrdude.info index 96b1392200..dcf472fae4 100644 --- a/development/avrdude/avrdude.info +++ b/development/avrdude/avrdude.info @@ -1,8 +1,8 @@ PRGNAM="avrdude" -VERSION="7.2" +VERSION="7.3" HOMEPAGE="http://www.nongnu.org/avrdude/" -DOWNLOAD="https://github.com/avrdudes/avrdude/archive/v7.2/avrdude-7.2.tar.gz" -MD5SUM="9b423eab6d04e7dff1897cb183a78b87" +DOWNLOAD="https://github.com/avrdudes/avrdude/archive/v7.3/avrdude-7.3.tar.gz" +MD5SUM="5ff78f7dad276a0fb2808e300b3eb1bf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/aws-cdk/aws-cdk.SlackBuild b/development/aws-cdk/aws-cdk.SlackBuild index f535c766e4..f321fc5bc9 100644 --- a/development/aws-cdk/aws-cdk.SlackBuild +++ b/development/aws-cdk/aws-cdk.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=aws-cdk -VERSION=${VERSION:-2.138.0} +VERSION=${VERSION:-2.142.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/aws-cdk/aws-cdk.info b/development/aws-cdk/aws-cdk.info index c6d7fdec18..c23aaf368f 100644 --- a/development/aws-cdk/aws-cdk.info +++ b/development/aws-cdk/aws-cdk.info @@ -1,8 +1,8 @@ PRGNAM="aws-cdk" -VERSION="2.138.0" +VERSION="2.142.0" HOMEPAGE="https://github.com/aws/aws-cdk" -DOWNLOAD="https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.138.0.tgz" -MD5SUM="38bc13b8280a18cba3efb82f298a36d2" +DOWNLOAD="https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.142.0.tgz" +MD5SUM="3b9c566dc3605bb4c26baf8dd6de7427" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="nodejs awscli" diff --git a/development/bazel/abseil-missing-stdint.patch b/development/bazel/abseil-missing-stdint.patch new file mode 100644 index 0000000000..725a8925a3 --- /dev/null +++ b/development/bazel/abseil-missing-stdint.patch @@ -0,0 +1,10 @@ +--- abseil-cpp.orig/absl/strings/internal/str_format/extension.h ++++ abseil-cpp/absl/strings/internal/str_format/extension.h +@@ -26,6 +26,7 @@ + #include "absl/base/port.h" + #include "absl/meta/type_traits.h" + #include "absl/strings/internal/str_format/output.h" ++#include <cstdint> + #include "absl/strings/string_view.h" + + namespace absl { diff --git a/development/bazel/apply-abseil-stdint.patch b/development/bazel/apply-abseil-stdint.patch new file mode 100644 index 0000000000..b5065aa1b6 --- /dev/null +++ b/development/bazel/apply-abseil-stdint.patch @@ -0,0 +1,13 @@ +--- distdir_deps.bzl.orig 2023-09-05 16:10:13.000617742 +0900 ++++ distdir_deps.bzl 2023-09-05 16:10:42.471484181 +0900 +@@ -163,6 +163,10 @@ + }, + "com_google_absl": { + "archive": "20211102.0.tar.gz", ++ "patch_args": ["-p1"], ++ "patches": [ ++ "//:abseil-missing-stdint.patch" ++ ], + "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", + "urls": [ + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", diff --git a/development/bazel/bazel.SlackBuild b/development/bazel/bazel.SlackBuild index 846294510c..2095aa1644 100644 --- a/development/bazel/bazel.SlackBuild +++ b/development/bazel/bazel.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bazel VERSION=${VERSION:-5.4.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,6 +76,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Missing include. +patch -p0 < $CWD/apply-abseil-stdint.patch +cp $CWD/abseil-missing-stdint.patch . + # Export environmental variables # Please change JAVA_HOME if not using zulu-openjdk11 export JAVA_HOME=/usr/lib$LIBDIRSUFFIX/zulu-openjdk11 diff --git a/development/bluefish/bluefish.SlackBuild b/development/bluefish/bluefish.SlackBuild index c5e73fabf3..35ae07435c 100644 --- a/development/bluefish/bluefish.SlackBuild +++ b/development/bluefish/bluefish.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bluefish -VERSION=${VERSION:-2.2.14} +VERSION=${VERSION:-2.2.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/bluefish/bluefish.info b/development/bluefish/bluefish.info index aa041ccaa5..f45bde7a11 100644 --- a/development/bluefish/bluefish.info +++ b/development/bluefish/bluefish.info @@ -1,8 +1,8 @@ PRGNAM="bluefish" -VERSION="2.2.14" +VERSION="2.2.15" HOMEPAGE="http://bluefish.openoffice.nl/index.html" -DOWNLOAD="https://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.14.tar.bz2" -MD5SUM="c99b6b1ba3e3e70b032936182bb0b387" +DOWNLOAD="https://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.15.tar.bz2" +MD5SUM="48018bcfef0faeceb66b0f2d814ded03" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/cargo-c/cargo-c.SlackBuild b/development/cargo-c/cargo-c.SlackBuild index 0bedec0d8f..0ebf0604a4 100644 --- a/development/cargo-c/cargo-c.SlackBuild +++ b/development/cargo-c/cargo-c.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cargo-c -VERSION=${VERSION:-0.9.31} +VERSION=${VERSION:-0.9.32} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/cargo-c/cargo-c.info b/development/cargo-c/cargo-c.info index 0b6684576c..10f7ecec6d 100644 --- a/development/cargo-c/cargo-c.info +++ b/development/cargo-c/cargo-c.info @@ -1,21 +1,21 @@ PRGNAM="cargo-c" -VERSION="0.9.31" +VERSION="0.9.32" HOMEPAGE="https://github.com/lu-zero/cargo-c/" -DOWNLOAD="https://github.com/lu-zero/cargo-c/archive/v0.9.31/cargo-c-0.9.31.tar.gz \ - https://github.com/lu-zero/cargo-c/releases/download/v0.9.31/Cargo.lock \ +DOWNLOAD="https://github.com/lu-zero/cargo-c/archive/v0.9.32/cargo-c-0.9.32.tar.gz \ + https://github.com/lu-zero/cargo-c/releases/download/v0.9.32/Cargo.lock \ https://static.crates.io/crates/adler/adler-1.0.2.crate \ https://static.crates.io/crates/ahash/ahash-0.8.11.crate \ https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.3.crate \ - https://static.crates.io/crates/allocator-api2/allocator-api2-0.2.16.crate \ + https://static.crates.io/crates/allocator-api2/allocator-api2-0.2.18.crate \ https://static.crates.io/crates/annotate-snippets/annotate-snippets-0.10.2.crate \ - https://static.crates.io/crates/anstream/anstream-0.6.13.crate \ - https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.3.crate \ - https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.2.crate \ - https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.2.crate \ - https://static.crates.io/crates/anstyle/anstyle-1.0.6.crate \ - https://static.crates.io/crates/anyhow/anyhow-1.0.81.crate \ - https://static.crates.io/crates/arc-swap/arc-swap-1.7.0.crate \ - https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \ + https://static.crates.io/crates/anstream/anstream-0.6.14.crate \ + https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.4.crate \ + https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.3.crate \ + https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.3.crate \ + https://static.crates.io/crates/anstyle/anstyle-1.0.7.crate \ + https://static.crates.io/crates/anyhow/anyhow-1.0.82.crate \ + https://static.crates.io/crates/arc-swap/arc-swap-1.7.1.crate \ + https://static.crates.io/crates/autocfg/autocfg-1.3.0.crate \ https://static.crates.io/crates/base16ct/base16ct-0.2.0.crate \ https://static.crates.io/crates/base64/base64-0.21.7.crate \ https://static.crates.io/crates/base64ct/base64ct-1.6.0.crate \ @@ -25,33 +25,33 @@ DOWNLOAD="https://github.com/lu-zero/cargo-c/archive/v0.9.31/cargo-c-0.9.31.tar. https://static.crates.io/crates/block-buffer/block-buffer-0.10.4.crate \ https://static.crates.io/crates/bstr/bstr-1.9.1.crate \ https://static.crates.io/crates/btoi/btoi-0.4.3.crate \ - https://static.crates.io/crates/bumpalo/bumpalo-3.15.4.crate \ - https://static.crates.io/crates/bytes/bytes-1.5.0.crate \ + https://static.crates.io/crates/bumpalo/bumpalo-3.16.0.crate \ + https://static.crates.io/crates/bytes/bytes-1.6.0.crate \ https://static.crates.io/crates/bytesize/bytesize-1.3.0.crate \ - https://static.crates.io/crates/cargo-credential-libsecret/cargo-credential-libsecret-0.4.3.crate \ - https://static.crates.io/crates/cargo-credential-macos-keychain/cargo-credential-macos-keychain-0.4.3.crate \ - https://static.crates.io/crates/cargo-credential-wincred/cargo-credential-wincred-0.4.3.crate \ + https://static.crates.io/crates/cargo-credential-libsecret/cargo-credential-libsecret-0.4.4.crate \ + https://static.crates.io/crates/cargo-credential-macos-keychain/cargo-credential-macos-keychain-0.4.4.crate \ + https://static.crates.io/crates/cargo-credential-wincred/cargo-credential-wincred-0.4.4.crate \ https://static.crates.io/crates/cargo-credential/cargo-credential-0.4.4.crate \ https://static.crates.io/crates/cargo-platform/cargo-platform-0.1.8.crate \ - https://static.crates.io/crates/cargo-util-schemas/cargo-util-schemas-0.2.0.crate \ - https://static.crates.io/crates/cargo-util/cargo-util-0.2.10.crate \ - https://static.crates.io/crates/cargo/cargo-0.78.0.crate \ + https://static.crates.io/crates/cargo-util-schemas/cargo-util-schemas-0.3.0.crate \ + https://static.crates.io/crates/cargo-util/cargo-util-0.2.11.crate \ + https://static.crates.io/crates/cargo/cargo-0.79.0.crate \ https://static.crates.io/crates/cbindgen/cbindgen-0.26.0.crate \ - https://static.crates.io/crates/cc/cc-1.0.90.crate \ + https://static.crates.io/crates/cc/cc-1.0.96.crate \ https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \ - https://static.crates.io/crates/clap/clap-4.5.3.crate \ + https://static.crates.io/crates/clap/clap-4.5.4.crate \ https://static.crates.io/crates/clap_builder/clap_builder-4.5.2.crate \ - https://static.crates.io/crates/clap_derive/clap_derive-4.5.3.crate \ + https://static.crates.io/crates/clap_derive/clap_derive-4.5.4.crate \ https://static.crates.io/crates/clap_lex/clap_lex-0.7.0.crate \ - https://static.crates.io/crates/clru/clru-0.6.1.crate \ - https://static.crates.io/crates/color-print-proc-macro/color-print-proc-macro-0.3.5.crate \ - https://static.crates.io/crates/color-print/color-print-0.3.5.crate \ - https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \ + https://static.crates.io/crates/clru/clru-0.6.2.crate \ + https://static.crates.io/crates/color-print-proc-macro/color-print-proc-macro-0.3.6.crate \ + https://static.crates.io/crates/color-print/color-print-0.3.6.crate \ + https://static.crates.io/crates/colorchoice/colorchoice-1.0.1.crate \ https://static.crates.io/crates/const-oid/const-oid-0.9.6.crate \ https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.6.crate \ https://static.crates.io/crates/core-foundation/core-foundation-0.9.4.crate \ https://static.crates.io/crates/cpufeatures/cpufeatures-0.2.12.crate \ - https://static.crates.io/crates/crates-io/crates-io-0.40.0.crate \ + https://static.crates.io/crates/crates-io/crates-io-0.40.1.crate \ https://static.crates.io/crates/crc32fast/crc32fast-1.4.0.crate \ https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.12.crate \ https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.5.crate \ @@ -62,87 +62,87 @@ DOWNLOAD="https://github.com/lu-zero/cargo-c/archive/v0.9.31/cargo-c-0.9.31.tar. https://static.crates.io/crates/ct-codecs/ct-codecs-1.1.1.crate \ https://static.crates.io/crates/curl-sys/curl-sys-0.4.72+curl-8.6.0.crate \ https://static.crates.io/crates/curl/curl-0.4.46.crate \ - https://static.crates.io/crates/der/der-0.7.8.crate \ + https://static.crates.io/crates/der/der-0.7.9.crate \ https://static.crates.io/crates/deranged/deranged-0.3.11.crate \ https://static.crates.io/crates/digest/digest-0.10.7.crate \ https://static.crates.io/crates/dunce/dunce-1.0.4.crate \ https://static.crates.io/crates/ecdsa/ecdsa-0.16.9.crate \ https://static.crates.io/crates/ed25519-compact/ed25519-compact-2.1.1.crate \ - https://static.crates.io/crates/either/either-1.10.0.crate \ + https://static.crates.io/crates/either/either-1.11.0.crate \ https://static.crates.io/crates/elliptic-curve/elliptic-curve-0.13.8.crate \ - https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.33.crate \ + https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.34.crate \ https://static.crates.io/crates/equivalent/equivalent-1.0.1.crate \ https://static.crates.io/crates/erased-serde/erased-serde-0.4.4.crate \ https://static.crates.io/crates/errno/errno-0.3.8.crate \ https://static.crates.io/crates/fallible-iterator/fallible-iterator-0.3.0.crate \ https://static.crates.io/crates/fallible-streaming-iterator/fallible-streaming-iterator-0.1.9.crate \ https://static.crates.io/crates/faster-hex/faster-hex-0.9.0.crate \ - https://static.crates.io/crates/fastrand/fastrand-2.0.1.crate \ + https://static.crates.io/crates/fastrand/fastrand-2.1.0.crate \ https://static.crates.io/crates/ff/ff-0.13.0.crate \ - https://static.crates.io/crates/fiat-crypto/fiat-crypto-0.2.7.crate \ + https://static.crates.io/crates/fiat-crypto/fiat-crypto-0.2.8.crate \ https://static.crates.io/crates/filetime/filetime-0.2.23.crate \ - https://static.crates.io/crates/flate2/flate2-1.0.28.crate \ + https://static.crates.io/crates/flate2/flate2-1.0.30.crate \ https://static.crates.io/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate \ https://static.crates.io/crates/foreign-types/foreign-types-0.3.2.crate \ https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.2.1.crate \ https://static.crates.io/crates/generic-array/generic-array-0.14.7.crate \ - https://static.crates.io/crates/getrandom/getrandom-0.2.12.crate \ + https://static.crates.io/crates/getrandom/getrandom-0.2.14.crate \ https://static.crates.io/crates/git2-curl/git2-curl-0.19.0.crate \ https://static.crates.io/crates/git2/git2-0.18.3.crate \ - https://static.crates.io/crates/gix-actor/gix-actor-0.29.1.crate \ - https://static.crates.io/crates/gix-attributes/gix-attributes-0.21.1.crate \ + https://static.crates.io/crates/gix-actor/gix-actor-0.30.0.crate \ + https://static.crates.io/crates/gix-attributes/gix-attributes-0.22.2.crate \ https://static.crates.io/crates/gix-bitmap/gix-bitmap-0.2.11.crate \ https://static.crates.io/crates/gix-chunk/gix-chunk-0.4.8.crate \ https://static.crates.io/crates/gix-command/gix-command-0.3.6.crate \ - https://static.crates.io/crates/gix-commitgraph/gix-commitgraph-0.23.2.crate \ + https://static.crates.io/crates/gix-commitgraph/gix-commitgraph-0.24.2.crate \ https://static.crates.io/crates/gix-config-value/gix-config-value-0.14.6.crate \ - https://static.crates.io/crates/gix-config/gix-config-0.33.1.crate \ - https://static.crates.io/crates/gix-credentials/gix-credentials-0.23.1.crate \ + https://static.crates.io/crates/gix-config/gix-config-0.34.0.crate \ + https://static.crates.io/crates/gix-credentials/gix-credentials-0.24.2.crate \ https://static.crates.io/crates/gix-date/gix-date-0.8.5.crate \ - https://static.crates.io/crates/gix-diff/gix-diff-0.39.1.crate \ - https://static.crates.io/crates/gix-discover/gix-discover-0.28.1.crate \ - https://static.crates.io/crates/gix-features/gix-features-0.37.2.crate \ - https://static.crates.io/crates/gix-filter/gix-filter-0.8.1.crate \ - https://static.crates.io/crates/gix-fs/gix-fs-0.9.1.crate \ - https://static.crates.io/crates/gix-glob/gix-glob-0.15.1.crate \ + https://static.crates.io/crates/gix-diff/gix-diff-0.40.0.crate \ + https://static.crates.io/crates/gix-discover/gix-discover-0.29.0.crate \ + https://static.crates.io/crates/gix-features/gix-features-0.38.1.crate \ + https://static.crates.io/crates/gix-filter/gix-filter-0.9.0.crate \ + https://static.crates.io/crates/gix-fs/gix-fs-0.10.2.crate \ + https://static.crates.io/crates/gix-glob/gix-glob-0.16.2.crate \ https://static.crates.io/crates/gix-hash/gix-hash-0.14.2.crate \ https://static.crates.io/crates/gix-hashtable/gix-hashtable-0.5.2.crate \ - https://static.crates.io/crates/gix-ignore/gix-ignore-0.10.1.crate \ - https://static.crates.io/crates/gix-index/gix-index-0.28.2.crate \ - https://static.crates.io/crates/gix-lock/gix-lock-12.0.1.crate \ + https://static.crates.io/crates/gix-ignore/gix-ignore-0.11.2.crate \ + https://static.crates.io/crates/gix-index/gix-index-0.29.0.crate \ + https://static.crates.io/crates/gix-lock/gix-lock-13.1.1.crate \ https://static.crates.io/crates/gix-macros/gix-macros-0.1.4.crate \ - https://static.crates.io/crates/gix-negotiate/gix-negotiate-0.11.1.crate \ - https://static.crates.io/crates/gix-object/gix-object-0.40.1.crate \ - https://static.crates.io/crates/gix-odb/gix-odb-0.56.1.crate \ - https://static.crates.io/crates/gix-pack/gix-pack-0.46.1.crate \ - https://static.crates.io/crates/gix-packetline-blocking/gix-packetline-blocking-0.17.3.crate \ + https://static.crates.io/crates/gix-negotiate/gix-negotiate-0.12.0.crate \ + https://static.crates.io/crates/gix-object/gix-object-0.41.0.crate \ + https://static.crates.io/crates/gix-odb/gix-odb-0.57.0.crate \ + https://static.crates.io/crates/gix-pack/gix-pack-0.47.0.crate \ + https://static.crates.io/crates/gix-packetline-blocking/gix-packetline-blocking-0.17.4.crate \ https://static.crates.io/crates/gix-packetline/gix-packetline-0.17.5.crate \ https://static.crates.io/crates/gix-path/gix-path-0.10.7.crate \ - https://static.crates.io/crates/gix-pathspec/gix-pathspec-0.5.1.crate \ + https://static.crates.io/crates/gix-pathspec/gix-pathspec-0.6.0.crate \ https://static.crates.io/crates/gix-prompt/gix-prompt-0.8.4.crate \ - https://static.crates.io/crates/gix-protocol/gix-protocol-0.43.1.crate \ + https://static.crates.io/crates/gix-protocol/gix-protocol-0.44.2.crate \ https://static.crates.io/crates/gix-quote/gix-quote-0.4.12.crate \ - https://static.crates.io/crates/gix-ref/gix-ref-0.40.1.crate \ - https://static.crates.io/crates/gix-refspec/gix-refspec-0.21.1.crate \ - https://static.crates.io/crates/gix-revision/gix-revision-0.25.1.crate \ - https://static.crates.io/crates/gix-revwalk/gix-revwalk-0.11.1.crate \ + https://static.crates.io/crates/gix-ref/gix-ref-0.41.0.crate \ + https://static.crates.io/crates/gix-refspec/gix-refspec-0.22.0.crate \ + https://static.crates.io/crates/gix-revision/gix-revision-0.26.0.crate \ + https://static.crates.io/crates/gix-revwalk/gix-revwalk-0.12.0.crate \ https://static.crates.io/crates/gix-sec/gix-sec-0.10.6.crate \ - https://static.crates.io/crates/gix-submodule/gix-submodule-0.7.1.crate \ - https://static.crates.io/crates/gix-tempfile/gix-tempfile-12.0.1.crate \ - https://static.crates.io/crates/gix-trace/gix-trace-0.1.8.crate \ - https://static.crates.io/crates/gix-transport/gix-transport-0.40.1.crate \ - https://static.crates.io/crates/gix-traverse/gix-traverse-0.36.2.crate \ - https://static.crates.io/crates/gix-url/gix-url-0.26.1.crate \ - https://static.crates.io/crates/gix-utils/gix-utils-0.1.11.crate \ + https://static.crates.io/crates/gix-submodule/gix-submodule-0.8.0.crate \ + https://static.crates.io/crates/gix-tempfile/gix-tempfile-13.1.1.crate \ + https://static.crates.io/crates/gix-trace/gix-trace-0.1.9.crate \ + https://static.crates.io/crates/gix-transport/gix-transport-0.41.2.crate \ + https://static.crates.io/crates/gix-traverse/gix-traverse-0.37.0.crate \ + https://static.crates.io/crates/gix-url/gix-url-0.27.3.crate \ + https://static.crates.io/crates/gix-utils/gix-utils-0.1.12.crate \ https://static.crates.io/crates/gix-validate/gix-validate-0.8.4.crate \ - https://static.crates.io/crates/gix-worktree/gix-worktree-0.29.1.crate \ - https://static.crates.io/crates/gix/gix-0.57.1.crate \ + https://static.crates.io/crates/gix-worktree/gix-worktree-0.30.0.crate \ + https://static.crates.io/crates/gix/gix-0.58.0.crate \ https://static.crates.io/crates/glob/glob-0.3.1.crate \ https://static.crates.io/crates/globset/globset-0.4.14.crate \ https://static.crates.io/crates/group/group-0.13.0.crate \ https://static.crates.io/crates/hashbrown/hashbrown-0.12.3.crate \ - https://static.crates.io/crates/hashbrown/hashbrown-0.14.3.crate \ - https://static.crates.io/crates/hashlink/hashlink-0.8.4.crate \ + https://static.crates.io/crates/hashbrown/hashbrown-0.14.5.crate \ + https://static.crates.io/crates/hashlink/hashlink-0.9.0.crate \ https://static.crates.io/crates/heck/heck-0.4.1.crate \ https://static.crates.io/crates/heck/heck-0.5.0.crate \ https://static.crates.io/crates/hermit-abi/hermit-abi-0.3.9.crate \ @@ -156,28 +156,29 @@ DOWNLOAD="https://github.com/lu-zero/cargo-c/archive/v0.9.31/cargo-c-0.9.31.tar. https://static.crates.io/crates/ignore/ignore-0.4.22.crate \ https://static.crates.io/crates/im-rc/im-rc-15.1.0.crate \ https://static.crates.io/crates/indexmap/indexmap-1.9.3.crate \ - https://static.crates.io/crates/indexmap/indexmap-2.2.5.crate \ + https://static.crates.io/crates/indexmap/indexmap-2.2.6.crate \ https://static.crates.io/crates/is-terminal/is-terminal-0.4.12.crate \ + https://static.crates.io/crates/is_terminal_polyfill/is_terminal_polyfill-1.70.0.crate \ https://static.crates.io/crates/itertools/itertools-0.12.1.crate \ - https://static.crates.io/crates/itoa/itoa-1.0.10.crate \ - https://static.crates.io/crates/jobserver/jobserver-0.1.28.crate \ + https://static.crates.io/crates/itoa/itoa-1.0.11.crate \ + https://static.crates.io/crates/jobserver/jobserver-0.1.31.crate \ https://static.crates.io/crates/js-sys/js-sys-0.3.69.crate \ https://static.crates.io/crates/kstring/kstring-2.0.0.crate \ https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \ https://static.crates.io/crates/lazycell/lazycell-1.3.0.crate \ - https://static.crates.io/crates/libc/libc-0.2.153.crate \ + https://static.crates.io/crates/libc/libc-0.2.154.crate \ https://static.crates.io/crates/libgit2-sys/libgit2-sys-0.16.2+1.7.2.crate \ https://static.crates.io/crates/libloading/libloading-0.8.3.crate \ - https://static.crates.io/crates/libnghttp2-sys/libnghttp2-sys-0.1.9+1.58.0.crate \ - https://static.crates.io/crates/libsqlite3-sys/libsqlite3-sys-0.27.0.crate \ + https://static.crates.io/crates/libnghttp2-sys/libnghttp2-sys-0.1.10+1.61.0.crate \ + https://static.crates.io/crates/libsqlite3-sys/libsqlite3-sys-0.28.0.crate \ https://static.crates.io/crates/libssh2-sys/libssh2-sys-0.3.0.crate \ https://static.crates.io/crates/libz-sys/libz-sys-1.1.16.crate \ https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.13.crate \ - https://static.crates.io/crates/lock_api/lock_api-0.4.11.crate \ + https://static.crates.io/crates/lock_api/lock_api-0.4.12.crate \ https://static.crates.io/crates/log/log-0.4.21.crate \ https://static.crates.io/crates/matchers/matchers-0.1.0.crate \ https://static.crates.io/crates/maybe-async/maybe-async-0.2.10.crate \ - https://static.crates.io/crates/memchr/memchr-2.7.1.crate \ + https://static.crates.io/crates/memchr/memchr-2.7.2.crate \ https://static.crates.io/crates/memmap2/memmap2-0.9.4.crate \ https://static.crates.io/crates/minimal-lexical/minimal-lexical-0.2.1.crate \ https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.2.crate \ @@ -186,63 +187,64 @@ DOWNLOAD="https://github.com/lu-zero/cargo-c/archive/v0.9.31/cargo-c-0.9.31.tar. https://static.crates.io/crates/normpath/normpath-1.2.0.crate \ https://static.crates.io/crates/nu-ansi-term/nu-ansi-term-0.46.0.crate \ https://static.crates.io/crates/num-conv/num-conv-0.1.0.crate \ - https://static.crates.io/crates/num-traits/num-traits-0.2.18.crate \ + https://static.crates.io/crates/num-traits/num-traits-0.2.19.crate \ https://static.crates.io/crates/num_threads/num_threads-0.1.7.crate \ https://static.crates.io/crates/once_cell/once_cell-1.19.0.crate \ https://static.crates.io/crates/opener/opener-0.6.1.crate \ https://static.crates.io/crates/openssl-macros/openssl-macros-0.1.1.crate \ https://static.crates.io/crates/openssl-probe/openssl-probe-0.1.5.crate \ https://static.crates.io/crates/openssl-src/openssl-src-300.2.3+3.2.1.crate \ - https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.101.crate \ + https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.102.crate \ https://static.crates.io/crates/openssl/openssl-0.10.64.crate \ https://static.crates.io/crates/ordered-float/ordered-float-2.10.1.crate \ https://static.crates.io/crates/orion/orion-0.17.6.crate \ - https://static.crates.io/crates/os_info/os_info-3.8.1.crate \ + https://static.crates.io/crates/os_info/os_info-3.8.2.crate \ https://static.crates.io/crates/overload/overload-0.1.1.crate \ https://static.crates.io/crates/p384/p384-0.13.0.crate \ - https://static.crates.io/crates/parking_lot/parking_lot-0.12.1.crate \ - https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.9.crate \ + https://static.crates.io/crates/parking_lot/parking_lot-0.12.2.crate \ + https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.10.crate \ https://static.crates.io/crates/pasetors/pasetors-0.6.8.crate \ https://static.crates.io/crates/pathdiff/pathdiff-0.2.1.crate \ https://static.crates.io/crates/pem-rfc7468/pem-rfc7468-0.7.0.crate \ https://static.crates.io/crates/percent-encoding/percent-encoding-2.3.1.crate \ - https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.13.crate \ + https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.14.crate \ https://static.crates.io/crates/pkcs8/pkcs8-0.10.2.crate \ https://static.crates.io/crates/pkg-config/pkg-config-0.3.30.crate \ https://static.crates.io/crates/powerfmt/powerfmt-0.2.0.crate \ https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.17.crate \ https://static.crates.io/crates/primeorder/primeorder-0.13.6.crate \ - https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.79.crate \ + https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.81.crate \ https://static.crates.io/crates/prodash/prodash-28.0.0.crate \ - https://static.crates.io/crates/quote/quote-1.0.35.crate \ + https://static.crates.io/crates/quote/quote-1.0.36.crate \ https://static.crates.io/crates/rand/rand-0.8.5.crate \ https://static.crates.io/crates/rand_chacha/rand_chacha-0.3.1.crate \ https://static.crates.io/crates/rand_core/rand_core-0.6.4.crate \ https://static.crates.io/crates/rand_xoshiro/rand_xoshiro-0.6.0.crate \ https://static.crates.io/crates/redox_syscall/redox_syscall-0.4.1.crate \ + https://static.crates.io/crates/redox_syscall/redox_syscall-0.5.1.crate \ https://static.crates.io/crates/regex-automata/regex-automata-0.1.10.crate \ https://static.crates.io/crates/regex-automata/regex-automata-0.4.6.crate \ https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.29.crate \ - https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \ - https://static.crates.io/crates/regex/regex-1.10.3.crate \ + https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.3.crate \ + https://static.crates.io/crates/regex/regex-1.10.4.crate \ https://static.crates.io/crates/rfc6979/rfc6979-0.4.0.crate \ - https://static.crates.io/crates/rusqlite/rusqlite-0.30.0.crate \ - https://static.crates.io/crates/rustfix/rustfix-0.8.1.crate \ - https://static.crates.io/crates/rustix/rustix-0.38.32.crate \ + https://static.crates.io/crates/rusqlite/rusqlite-0.31.0.crate \ + https://static.crates.io/crates/rustfix/rustfix-0.8.2.crate \ + https://static.crates.io/crates/rustix/rustix-0.38.34.crate \ https://static.crates.io/crates/ryu/ryu-1.0.17.crate \ https://static.crates.io/crates/same-file/same-file-1.0.6.crate \ https://static.crates.io/crates/schannel/schannel-0.1.23.crate \ https://static.crates.io/crates/scopeguard/scopeguard-1.2.0.crate \ https://static.crates.io/crates/sec1/sec1-0.7.3.crate \ - https://static.crates.io/crates/security-framework-sys/security-framework-sys-2.9.1.crate \ - https://static.crates.io/crates/security-framework/security-framework-2.9.2.crate \ + https://static.crates.io/crates/security-framework-sys/security-framework-sys-2.10.0.crate \ + https://static.crates.io/crates/security-framework/security-framework-2.10.0.crate \ https://static.crates.io/crates/semver/semver-1.0.22.crate \ https://static.crates.io/crates/serde-untagged/serde-untagged-0.1.5.crate \ https://static.crates.io/crates/serde-value/serde-value-0.7.0.crate \ - https://static.crates.io/crates/serde/serde-1.0.197.crate \ - https://static.crates.io/crates/serde_derive/serde_derive-1.0.197.crate \ + https://static.crates.io/crates/serde/serde-1.0.200.crate \ + https://static.crates.io/crates/serde_derive/serde_derive-1.0.200.crate \ https://static.crates.io/crates/serde_ignored/serde_ignored-0.1.10.crate \ - https://static.crates.io/crates/serde_json/serde_json-1.0.114.crate \ + https://static.crates.io/crates/serde_json/serde_json-1.0.116.crate \ https://static.crates.io/crates/serde_spanned/serde_spanned-0.6.5.crate \ https://static.crates.io/crates/sha1/sha1-0.10.6.crate \ https://static.crates.io/crates/sha1_smol/sha1_smol-1.0.0.crate \ @@ -253,31 +255,32 @@ DOWNLOAD="https://github.com/lu-zero/cargo-c/archive/v0.9.31/cargo-c-0.9.31.tar. https://static.crates.io/crates/signature/signature-2.2.0.crate \ https://static.crates.io/crates/sized-chunks/sized-chunks-0.6.5.crate \ https://static.crates.io/crates/smallvec/smallvec-1.13.2.crate \ - https://static.crates.io/crates/socket2/socket2-0.5.6.crate \ + https://static.crates.io/crates/socket2/socket2-0.5.7.crate \ https://static.crates.io/crates/spki/spki-0.7.3.crate \ https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate \ - https://static.crates.io/crates/strsim/strsim-0.11.0.crate \ + https://static.crates.io/crates/strsim/strsim-0.11.1.crate \ https://static.crates.io/crates/subtle/subtle-2.5.0.crate \ - https://static.crates.io/crates/supports-hyperlinks/supports-hyperlinks-2.1.0.crate \ + https://static.crates.io/crates/supports-hyperlinks/supports-hyperlinks-3.0.0.crate \ + https://static.crates.io/crates/supports-unicode/supports-unicode-2.1.0.crate \ https://static.crates.io/crates/syn/syn-1.0.109.crate \ - https://static.crates.io/crates/syn/syn-2.0.53.crate \ + https://static.crates.io/crates/syn/syn-2.0.60.crate \ https://static.crates.io/crates/tar/tar-0.4.40.crate \ https://static.crates.io/crates/tempfile/tempfile-3.10.1.crate \ https://static.crates.io/crates/terminal_size/terminal_size-0.3.0.crate \ - https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.58.crate \ - https://static.crates.io/crates/thiserror/thiserror-1.0.58.crate \ + https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.59.crate \ + https://static.crates.io/crates/thiserror/thiserror-1.0.59.crate \ https://static.crates.io/crates/thread_local/thread_local-1.1.8.crate \ https://static.crates.io/crates/time-core/time-core-0.1.2.crate \ - https://static.crates.io/crates/time-macros/time-macros-0.2.17.crate \ - https://static.crates.io/crates/time/time-0.3.34.crate \ + https://static.crates.io/crates/time-macros/time-macros-0.2.18.crate \ + https://static.crates.io/crates/time/time-0.3.36.crate \ https://static.crates.io/crates/tinyvec/tinyvec-1.6.0.crate \ https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.1.crate \ https://static.crates.io/crates/toml/toml-0.5.11.crate \ https://static.crates.io/crates/toml/toml-0.8.12.crate \ https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.5.crate \ - https://static.crates.io/crates/toml_edit/toml_edit-0.21.1.crate \ - https://static.crates.io/crates/toml_edit/toml_edit-0.22.9.crate \ + https://static.crates.io/crates/toml_edit/toml_edit-0.22.12.crate \ https://static.crates.io/crates/tracing-attributes/tracing-attributes-0.1.27.crate \ + https://static.crates.io/crates/tracing-chrome/tracing-chrome-0.7.2.crate \ https://static.crates.io/crates/tracing-core/tracing-core-0.1.32.crate \ https://static.crates.io/crates/tracing-log/tracing-log-0.2.0.crate \ https://static.crates.io/crates/tracing-subscriber/tracing-subscriber-0.3.18.crate \ @@ -288,7 +291,7 @@ DOWNLOAD="https://github.com/lu-zero/cargo-c/archive/v0.9.31/cargo-c-0.9.31.tar. https://static.crates.io/crates/unicode-bom/unicode-bom-2.0.3.crate \ https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \ https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.23.crate \ - https://static.crates.io/crates/unicode-width/unicode-width-0.1.11.crate \ + https://static.crates.io/crates/unicode-width/unicode-width-0.1.12.crate \ https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.4.crate \ https://static.crates.io/crates/url/url-2.5.0.crate \ https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \ @@ -303,47 +306,48 @@ DOWNLOAD="https://github.com/lu-zero/cargo-c/archive/v0.9.31/cargo-c-0.9.31.tar. https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.92.crate \ https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.92.crate \ https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ - https://static.crates.io/crates/winapi-util/winapi-util-0.1.6.crate \ + https://static.crates.io/crates/winapi-util/winapi-util-0.1.8.crate \ https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ https://static.crates.io/crates/winapi/winapi-0.3.9.crate \ https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \ https://static.crates.io/crates/windows-sys/windows-sys-0.52.0.crate \ https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \ - https://static.crates.io/crates/windows-targets/windows-targets-0.52.4.crate \ + https://static.crates.io/crates/windows-targets/windows-targets-0.52.5.crate \ https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \ - https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.52.4.crate \ + https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.52.5.crate \ https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \ - https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.52.4.crate \ + https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.52.5.crate \ https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \ - https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.52.4.crate \ + https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.52.5.crate \ + https://static.crates.io/crates/windows_i686_gnullvm/windows_i686_gnullvm-0.52.5.crate \ https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \ - https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.52.4.crate \ + https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.52.5.crate \ https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \ - https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.52.4.crate \ + https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.52.5.crate \ https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \ - https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.4.crate \ + https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.5.crate \ https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \ - https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.4.crate \ + https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.5.crate \ https://static.crates.io/crates/winnow/winnow-0.5.40.crate \ - https://static.crates.io/crates/winnow/winnow-0.6.5.crate \ + https://static.crates.io/crates/winnow/winnow-0.6.7.crate \ https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.7.32.crate \ https://static.crates.io/crates/zerocopy/zerocopy-0.7.32.crate \ https://static.crates.io/crates/zeroize/zeroize-1.7.0.crate" -MD5SUM="f7e624cdaa1f6b526a2d18c9869396fd \ - 0a96518b9ae6d0012e935842fa22ac05 \ +MD5SUM="db2957cb8033cf0ee8d925847b7114ab \ + 494399e82d9792fa1cded90f665eee31 \ 669215548c64019c08c92b2c1afd3deb \ adbb51e40b28255c49b2ad1d956eff19 \ 03b2d126766ed746706241b4c7487654 \ - a2d3656a58d89472063fd35db901f137 \ + 001e9b87bf3af37bc588654f4a5b50c0 \ 3cc362a6cd343e7b3ee1200267648486 \ - d1dbe19a84ecc8388654099d69c77b09 \ - e188f6de00a35235da008cd39e1a003d \ - b06d6c6d9a7bdcdd9bf78f20f2d08f01 \ - 87cc1a50f0dcc09d7223df42eae95119 \ - dff7c2613686577772e6eaeaf76d6f5c \ - 8e8c387e63c67c1b8bc99587af1deabb \ - a9c93db6e2c5fbf79a369ffc71c9e4b4 \ - 05d77ef52e90ad161fdd41b252420467 \ + 0d18959173d080ec965717de7f03c2ec \ + ba1d5bf0cf548d5d0114ec4bfb1dd138 \ + a688249621bfca8c4ad27908d5291a9e \ + cef83f13a54d5e9c22e468d266243ae3 \ + d48caa65882ee9fe77a1f4e3ac950bad \ + ef033cf0c03253e394475714883e1f8d \ + a5f88692dcd3b16eed2f184509dce05b \ + 88a8c7336f056de768ee2966cefd8303 \ 5a1ece5125e266d39693587725f0270d \ 5a5f45206802441161524e1be576da1f \ bd4c0e123b65937461c135ff7030a44e \ @@ -353,33 +357,33 @@ MD5SUM="f7e624cdaa1f6b526a2d18c9869396fd \ 023b03cf9968b29253a5dfe62051008d \ db089af54479a055c39ca84bcf915f27 \ 841b2dfaad47fc76cd42a45e074a1e78 \ - 04420ad0e34cf71c5dd4e473934f8e54 \ - 51ed49380bb7d086c005208e805983b2 \ + a3c12a0b2ddb55ec1b245f9950e7bdf1 \ + 722cab9ebe9eb019d5c3b400325de876 \ 04c2dcc3c8184578320c53d63a07aed0 \ - 6e08c838df19fc939ee52d6c7c2e922c \ - 987dcd1487225f2ac47d57d48d1f1780 \ - f39311f33b2d912eaa1a529546844e4c \ + dfedd72f80181bf05a5a6e9ce19c0807 \ + 0479a37c76c3cb3f1893a95562d844c8 \ + 3bd2c32ebbc90648807f2bdfa80c4f4d \ f2c71238d869978b2892196a9879b9aa \ 704a72387b69a38dd7c18a6ebf85448d \ - 6fd617c0889b45a1885b5a3658327039 \ - 21792dda644ad24e702b5502b921295a \ - b1e001b7767ec70a420cd0ec4c5b0384 \ + dcf43bb384bfdddadd69c9b2fb9a0c7e \ + 76cb3c4fa6bd3a854e8b8b00175d9eb5 \ + 9fd3e68202602c041451366e3ef6cb0f \ 1f28e8d9b5c137d9e8d3265022051c34 \ - 3688fd97ff4600fa12dcba8623da73a3 \ + c914fb05ca24569c0670e1d25d8cc455 \ 74634128440dbc3766bda76fdf0aaa05 \ - b444496ca4d820b2c75bd6ca4f269126 \ + ec573c80325dcb85a463103cf3878a73 \ 6a7300e86333500f11f30e3e20e68808 \ - fae4ac14d3f6db474aad2d3c73649420 \ + 008b5f551130ca3eb7265bce27e0144b \ f780b94573a4c3e9261b0ef07ace6529 \ - b4b717e9ccaca16de32c52b11e851916 \ - 7cb2d9957e068e43a2de467b8db2687a \ - efc6173c78191136c3eb0bf9dfce813c \ - 010f6d0e98cc2a2b99907a23c6cd6bbc \ + 04baa08ff2d38dad4a10e7a27a9768d4 \ + 8916bb4ab39f22fa9651fe98c92faa5e \ + 603dc8e08934ea5ae9025f5456fa6679 \ + cc59747acec0a70d3cf7e121b19dd403 \ 6ed0aab506ad1ec23e34c6aec4efd1d7 \ d7624e4ff046ae83eda8e82d90887bdb \ 4d7e3bc6c42f8a875a87246ed14d9948 \ 162407e4c09897085d00344230f375a0 \ - 2dd85e0c82b1a2917d7ff8130fde9e7e \ + 253bc4d82e8e5e0de65b1e3f14852fbb \ 2cdf6f26459b770f7cf497cfba8eb5d4 \ 86c345cb693c291362662b0eb437af89 \ 396f4f63322338c26d76b2f638646178 \ @@ -390,87 +394,87 @@ MD5SUM="f7e624cdaa1f6b526a2d18c9869396fd \ 1fcb16ff3093c34c7265bb1be892096c \ 4a54687d3f58bbea098a3ea2b4b57983 \ 809c655613979bc5d65cb6d4afa24c91 \ - b0bf0c6d53543de6ba1644de4481b1b8 \ + dde85204706c20baed5d666258a08b74 \ d022bc79e1931c2bd4ebbe65cf3d2309 \ 3d62bfbbe08bdcee55fcb8cda85554d9 \ 09fbe9408a658ae3e5d294812af2bc65 \ 3ce1c12d6f46952c4a394c8c3bb9437e \ 857c96071a8fd39e7458707e9fae87b9 \ - cfa0423cdca197fe5e67129d7e0bb6a8 \ + 55b0203d6ebdccee692697e82cf5556a \ ffc9c1ed3a5f35182084b40ff2ff6111 \ - 5f9a3a8b7213c055342b2f423a213b3a \ + 9a25a5393856f8a0bbc14d82e27414a6 \ bdf329a72ecd0605c296f25e53136706 \ 49995a748235848f9c33176c5504b319 \ 349e0ae5420f0b7e6ff835cd03cc7428 \ 4abeb2b6db91c4964c17ec4bf24248f4 \ 7543e8639ad2e29866b522e20c35152a \ b4944c105ff1b8614beeb153e7179027 \ - 80e1c1b89d858c93fc5946b4a8266504 \ + b27485fa46bf04821c8c08402b708432 \ 108d90c246e09f46087613284e8651e7 \ - 3fa771519c7a8cea14ffc4668152e56b \ + a132fb3da286594492254671c102c178 \ bc4c2f203d616e83fae2c9648578c618 \ - 110e56f20886997bc288b6fea8617ce1 \ + a2e693fc79c126e6f9ae430c39d58617 \ 667e86b8b8d96ab4e9605627ce7dcc9a \ 78c898fdaa3968e23904bf8538c4a271 \ c3e51926c9853b714191ef1bec90e2ce \ 64a6d8fe0c9a450bcefa41894e17d7ac \ - ba5684833f6b40a3aa32ae4989c40f79 \ + 8fa6facea904eb4b4c8d2e4eded272fe \ 321f5643159fb34ad4d87084c504d9bd \ 87d341ff463ddced63e0706946cb665d \ - 7b3003ade101574486d4b61f3fd06440 \ - c253c9cba9205b08dc7fcee2ca7338b2 \ + c6ee43903c8a1e78558ecf1095c05a0b \ + f37c2af51761ee99148accc64a789dbc \ 101226d32a04adc0a4232050dbf85056 \ 0f5f5b1f9ebc3d31770c7ae2e33d409c \ 980abe4b3b80e451332e7f38105425d6 \ - 95c7cca83f8c240a8ccbf8ead761dac0 \ + 3b8e59515d02078032fbf89d2f7b47ec \ 2f1beb665ae673db2d89821a436b1cef \ - 188388caa9c0e7e6e1de8778f3084c2d \ - 04929d5ae6302ff18d485af35833d92d \ + c237209b29a919654fc3538f2426d8bf \ + d385aadea52b0f4a8dc48b5891f6fe44 \ e1aa1cf30530143595c6efaa1823731d \ - 49071faed6a52284044607e8806d1932 \ - d7ff4a6fab25468975161d118b33fd60 \ - ce980aee0f7936a3f525d6762bdc75a9 \ - c0f4447663cd3d5c9473074145df6318 \ - 41645c29af2416bcfaeed2ef9b99484e \ - 9f3ba9029fdec6d2be4b923d9c3af315 \ + 3c3d701d1047d2a37eee810b5a146c07 \ + 5793ff46c0edd83a8274d7d6a458e52a \ + fadaf8220f83f0ac4b8323919f2f5084 \ + c72e84b5f04c016393306cf897db5545 \ + a54b547b14359df46e6a059c7d955b42 \ + 67fe1df33f7a2b122066176117d068f5 \ 2180948a1fe17db88e9f97870234f87a \ adafc45a92f42b3377a06b041a2ab658 \ - 88ba1186b44c77fc2c997c77e9ec07af \ - f68d3698d2f4b549f82727ef2abb9ece \ - 6de9c68a31fe0ff46d436924b095ef5f \ + 1fa83fef2a7b9fc99c31de029f660d70 \ + 19f6d1e0850f62385e2b6d1159bb76ab \ + fd74cb12863c361e5e96d73cd7f4539e \ d22cc4f89be7e3d6325c040cb93d9065 \ - a772a494342d3b577ebfe90852b0e9af \ - 2fbf67ab3c4e7596a5419d2165c8dfbc \ - 909416e2b1af9a500850985790bebd32 \ - 8278593598c92b98a60b33b0ae53c675 \ - d1520e89eee5687482d00bbf693732ef \ + e78359e034175a92cee9cb960d5946e0 \ + 22d2e412ae1e73604085ecf1899f6d08 \ + 930613c5904ae90098dc8ae5ad7e98ee \ + a4ad7168104509e13195d4555688c808 \ + 985d331d661a642b72570dc2d9ce6fb3 \ 4ce5a3acd4d4ee81bad7f07e42757711 \ afb7f0126b110b2b69385e7da7b038ee \ - ab2c6c37bb00bf44d12cff63cdad7728 \ + f7d3408df16663599e28da43acb5adb8 \ 25fcb0da7848094d416789ad90eddd91 \ - 419f85a13991d6072db6da46deb83f0f \ + b386c839395d48024083126afff0d9a7 \ 539588dc3151dd1a2eafb1abc1b328e7 \ - 9620bb4866771ec75f3f176419376f39 \ - 791e86c7430bdfa8e2a76cd9cdbe391e \ - 74994ad33443873a63b061eac0adac8f \ - 9716cdd4163e2902784a9064cd8628f0 \ + 5d7bb02363173a4a5285626689d0b7a3 \ + 0b01b1d9a2898f4dcb1eebba1ba1ee66 \ + 80d4e218c534a7b76588373002228a1e \ + a621a928c1345658ba4db690a2826a8f \ a865ed2b74e73c390f769b702aa02713 \ - b2702560d88c43714d53891335ebeb20 \ - 27a63c3e09745c55f4ab3a8de0b58593 \ - 2853be6b1b40b0e9731893a50660915a \ - c20b2e4ccc7db52b89b4d29ace3def4e \ - 091dc00bafbeea35f691f8dabdad259f \ - c64841bc9eeb6d6492a67a8d182f3fce \ - e9ba7f6e1efec40f348488b04a50e5a6 \ + a8d06bee24cf02a8e6c73845a1792710 \ + 82efaf83a661ed30807897cac0c128b5 \ + 22c18c8034a833c91bb51cbd1433fd13 \ + 9d2c3afb626964c725a6e2f33576a457 \ + b17529a8cc93bb3ea4ea151212cff83c \ + 7ec3b6baf798700701969961379d9958 \ + 102dd5ccf7f0e35f281febc864643590 \ 6cf5295ccac485b29e978e762b0f3d8a \ - 6685f546d2f2d70fe902e96318d6a032 \ - cf1a36b1baf0f0447b7fbe0a52b3b1b8 \ + b95b9cd1e791f9fe4590cf5f6b8408aa \ + 2a6580149814f0e898252bfdae09d5b2 \ 2d6d28ec311884da69bcaf320ada8ad5 \ 423ea3c18df8759400c3d0a381738c64 \ 974e766c6583278ac82a83632b75b65e \ 1b41b97d982520b7364a87a39e2a1ed8 \ - 3451a2e54a12d567bbb1bf2815aedc37 \ - 650b9bf73e72b2a66246459f60386307 \ + 0339cc04f4471f002e421e2328a86bf5 \ + 012d0250764d796a09faaf9b7df13822 \ b92fa50f56a1e06a7f1bf665442d4a73 \ ce5935e8063a452913a61e5405b33cb9 \ 4daeb6abd6951210bed659c3c1ea01b4 \ @@ -484,28 +488,29 @@ MD5SUM="f7e624cdaa1f6b526a2d18c9869396fd \ b0e8879bc367bdad1fea51407ae22380 \ 25119b3f34f4d5298dade622e10a54c5 \ 11ce8b5f52cd315e8f52985b834b87eb \ - 39ee9c142fcb9be5b41be73e42260979 \ + 75d480d43a87d733f9f497c647f7d973 \ a5ff7ccb5fe4fc981cff7abfde30ae88 \ + ce2ecc3cf8d25a886a51fc7d66503a87 \ cbafbdc811ecda2c59593e87a05c219f \ - 0403f58e42c94609207c40a310cfe78a \ - 62156c0c6bde4f8190c611a461eb482a \ + 5d87e8530342ef2a980b1c96dafd27f0 \ + 8fc0caa52d204a532f3ec02ad55b9305 \ c6be9100355c6e77cf37c76ade56baa4 \ 0c07198f804f9c9788567f8c061acaec \ fba3b040a55c01be7376d3dd5c4d4920 \ 23cc9e52c52465f5b225e62ab7cc3457 \ - 49d77531898b3d7846b149c0fb4788c4 \ + 0bc840b564ce2b698189d5b204538624 \ 3ef859f6ec46e98447135f3cb47755f8 \ 99d57b23f1a7878ef7220513f49db015 \ - 34cea8121c95e0ea826272e0edf13522 \ - f5969d580be7a71a6de3dffe677b8d7c \ + d7931ae20ea0df9dca67aa870c5e578f \ + 60dfb05876b9242282ded82fc74db945 \ 73c81da3754295e39ea4a99517b1e794 \ ffe1925dad8c9453b418aa16e1acda97 \ f2d8f01a4e5c5236ab55240d09c6e82f \ - cc1b0e90e372869ad03ef40bd53fa30f \ + eb44c81f81e4aecdbdbafeac9c0fdcab \ 5a376ab3f01ed9e90e8d71e1d5fa6ae7 \ 29614f150859d094548bed37e78f586b \ 171bb701365ec4b0c12ae5387e034c16 \ - f8cc1978aae22df3e656d12810cdf994 \ + e90235c862e9e1fabe9f569bcfbd9692 \ 5cf346df4658ff1ab6c0b3b3dba48f75 \ 8b708bc4b33c5e1683467444c9ed41b0 \ 86aa81f2561682f16c0be376294bf9d3 \ @@ -514,63 +519,64 @@ MD5SUM="f7e624cdaa1f6b526a2d18c9869396fd \ e6e0e961c6fc0e678ec6ea74d5461f18 \ a56461a712a83abc691cf473d1835228 \ 5b5de6cffe4726037a5ec6d6931c80f3 \ - a06099d8d1b082ec6ee23c44750873ca \ + e092b3abcc54806f2a35889d725bf95f \ 4578b5cccbe636b7e5becdf5543b3802 \ 8390247ae7126c00e162732b249be9d7 \ fbd71c60eef7289eb6bcad7e74b20475 \ 28d34115cfbbe0e8f80333591f2cdd84 \ 907244c0d3791f3f981c7cc8e4cad0a3 \ b0fd71537a7c1d7433d62da2f5aa554e \ - bd529be225f8352d7e6cab8410bd2b38 \ + 663a7dc80c4a8280f108a350bca1f125 \ f4c1fe0f183ec61db569aeb437c6f9cd \ 71624c8a64c75744a95f02a09614f220 \ f8408c2543795bb080bebfba7e38e048 \ - 9fa1b00f9c3cd5edd42d4bab4f6fba1b \ + 936913c779b00c6355ffbbb53023dcae \ 03a7ad2814bd9dd34e0acec8ca4f855e \ 9822018c3ee7133a6f093f679d639da2 \ - 1be45f99109d447849f4244b58c5a470 \ - 7502c2f15026ee3e6a01f57b92942771 \ + 9d6c117b30034665155c9e6852b86e88 \ + fe316e1d51e3dff1e0455d0142dd37e4 \ 8bc06de4ec1fda57035d2bd07535d670 \ c40bb551772810d818857841ea389f1e \ a37720d4e4cbebd28ac9c7930137a9d6 \ 0ba30a94d7b8865c23e86d4d64e5b91e \ - ffc7c4e1b2639ba6c8579a1c47c5f97c \ + a9a6ce6cd4b12f9c4f6840df87d5da0d \ 54148ff5f2a4a6f4f1e857b0bf854bf0 \ 524ffd7a9b5b25c4d388686a5dde5cac \ 30eb4de1c1a3bd214d7649b891abf444 \ 5c69337d37e58a380e00eac9ce0373bb \ d226e4317502fe822b21daeda4d7488c \ - e0c30e3bc29a1b33c71f2823cd5b5365 \ + 11d049cc954c7a9744b9fa85d9596b0c \ 533608bb3b2587c0aa148dc36cc16429 \ - 0358b31bf59c7915bb03f9e66f2d1ea3 \ + 7267e731f46f52edb7b5304b60982cf4 \ ee7a5f842c39bc47c474196e83b0df5f \ e30085994bbeb4b7f4895d48216d5476 \ a1626b8f4d165b1b60d960862eba4cf0 \ ca0ecc8e22d810207704d4cd743ca657 \ ff1d093069cfc9eb161907e17a51208b \ + ea6dadf813d422419f900efa67ed9170 \ 95f4b6766a27d814b4e54d1ccb3b7fc9 \ 520b920d0c711ec1a17fb19a6060446a \ f2303650593b13e30a85e39d8c79c961 \ - 91b60a71d44302a8b05bd398eca56c37 \ - 6ddcf897328f065168420b7d4ea9d43b \ + 5ff02ce05f7f204690c26cb20f3cf2d0 \ + e19600513eaf0823f25a621088b44d2c \ 4320a9e82272686cb97d7af005f5360d \ - 61c44ef17c3f2d62c9e20da93938de0e \ - 09a0774f45802ba2d52c509ee196c64a \ - c74beacbda25822857d315b64c167575 \ + 624ea23761970724e7c0d8003ff6fffb \ + e64378421dba33744990aac9c90db7b0 \ + b815e6cf70bcc3512ffbef7f6dea8c5f \ feefd8369d6dd6a0f269bbed1b921349 \ 2d8d8b377d144f5e32b4f65a69eb0b24 \ 6a0950fa3775d755dbbdbd24a2841786 \ f1358be8c98b98837cbd2cf51e75f8b3 \ 46e0a2b34b2a6108cad9e2b1da756cab \ - 2acfe0c857811f38afc675dd79f308e2 \ - 151939b0b34c1580b44863b7713be586 \ + f973f3b7f174a2c9335eb0a8936c9c1a \ + 065b255ec9ba792962f17f8a15827cad \ 7b1ab65edc77a1bd7cfd8f03cd889831 \ 20a612b8e5e0daffd3319304c17b808f \ eeda11db8ced625011d8b88d36765321 \ - 956ace3f4e2b8a6ac55aa74549cc38de \ - e8b93865e80b67f03df2faa417960b88 \ + 9b1baf93cc8caada556e1c45a6f013e0 \ + ff73672601880795d1c901014787924f \ 597586743b4769a8f6c169803ad3bb2a \ - 1d870838320d2810817ade2a17fcc4f8 \ + ecf1e501541e064d3e96172bd0f3c709 \ fa0d5d4e1e3bd20a9ca9aef473fc3665 \ d7602381c0bc21d10603cc940a837b06 \ 74d8afce717ff89fb2cb5141f121782b \ @@ -581,31 +587,32 @@ MD5SUM="f7e624cdaa1f6b526a2d18c9869396fd \ a5f10909341dab15fcdee74b0409ec69 \ c51211275ff1e841326726837820eed9 \ 50d5a501f911bb592f0dce2d052c2aa8 \ - e0a2eb3573e89a1462cb180fd0a326cd \ + 746d5deb23a67c019e5b2381d76d4afa \ ae35a16ea73fc405f1cf50fa35b70ddd \ c9defe80406280bcfce4ecf31c0200b3 \ - 5a9054761bf275878e3c4076192d5472 \ + fbe5da24bd1beef6125107ee41118187 \ 24e0b498b23c398c49e3af66373c91cc \ - 9e3cf5ff1c239a3583482452f07f1085 \ + 82319ff2617041ec54d5eb3ff5f381e3 \ + bed0de4ae2958641be7a0c400c08fba6 \ 64d9f46e9ba78f68c30c486be3d8b7df \ - 285d82afae7d638437fd71f94cd1923e \ + 5f38b77f4cd61a26d90079aaf5ad2257 \ 08a17e86dfb5bf21d557636f2a545ebe \ 449c7bb37fc298d2026fbf2855eb8db0 \ b7eae58d7a80112442643ee2ff481ef7 \ - f443b2cca547d22f994c2dd99a6e5581 \ - 361668f9f11e4f0eba45f70c24fa8614 \ + 549e28333d27c21ea5b4931d71fbfe47 \ + 848b8298ddb081193244a66a875d5a8a \ 6739d2c377b9e20af9a23022e362aa33 \ 7818a75208424a6d05d1d868559f0adf \ - 4875c5068f17bbcd90afbff582925a0a \ - 00a1017b4831ad4073be63ee145f37f1 \ + cbfa351bd29e3779266c82b3996fc9ab \ + 19e6e4e45004e2b023e49e37c34b4e31 \ 5f0470696baaa4e5953bddbf196998f9 \ c678a7da0ee4b850ebde0474144a0415 \ b21820f2664242498beba7783b32bef4 \ cc14d30a8e3aa6f3d0a54311fca6acaa \ 9aecd5ff283534a21d7cd51266abfe89 \ - 0cb504a1438dd87648b18def4b0e6e10 \ - 1f128565bf0ce81bc03c3f52fb37ce69 \ + 13ec7a52fc82eb309183c6b2d484e2de \ 9dd610282e23bbd40016697350c1babb \ + 51534ecc7b99f6ba320b65ac2593f82f \ a6655e5e9845cb569991e87b5b38a1fc \ beede1fdd5ce9840d395abc905d8ab3e \ 7e2eeef14bb62adaf15f1e921538adaa \ @@ -616,7 +623,7 @@ MD5SUM="f7e624cdaa1f6b526a2d18c9869396fd \ c3d42808c0c5cc0283666964f83df775 \ ca65153603a1a7240bbd9d2ce19f2d67 \ 97fa43aa1afabd1f5f3d1070389b42ba \ - 908ec8a89821b72f3a35726bab24461f \ + 01bce66c98792940b4f022307b2962d0 \ 1fcc5c68ddd2899481f89c74a6f35ea6 \ e547b0e754cd61f24f9ef8c9e26fcd95 \ ceee1159c41351d05f4cf705490867b3 \ @@ -631,29 +638,30 @@ MD5SUM="f7e624cdaa1f6b526a2d18c9869396fd \ 4abb118b896b90518fc32602088933be \ dca59f56e652d010c754d42df104cd22 \ db96b50050277bf05a3c68534bbb9586 \ - 306c0281447d1876e8220007b7a7e053 \ + dbdd24e240e42c6852910e7504285712 \ 09de9d01e7331ff3da11f58be8bef0df \ 0498c4a11448bfc35dc7bb2caa64c753 \ f2797ade0e36f1e5d6be9d11b5076582 \ 2376de634160158ece40c4bc2ab3eb41 \ 24c64817e85ef77765ed0f26c31c9b4c \ - da06678965a6a18bd802a4dfc0ff16a6 \ + 940f8708332e8e3720266a7bce4d761d \ dae6d89034a6988042fd8be4cf5e037d \ - 37de98e52a65c26a9ea5d1c64ac70ff7 \ + 967cf93762a3bc25e18d0b8b7e811b84 \ de2839e16d9d7a9fd1c397da62f62b4a \ - 08d0a285a0002da66dd555876cf0b278 \ + 0bc2062598ed9d8ed536e27fddd81ce7 \ e0c35ffb8cfdb74a39bf799811f79304 \ - b6834054fd9736252087791fdda2e73a \ + a35e6187f2f41e601cf885c279ebb43e \ + 183b6a856fadbc8f21a6c53ca81155c9 \ d990172b607020701f9e84ca8e1c043c \ - 05b3e5d30c79a17e5c14c64f092326fe \ + cc1f120172ea435e8ac1e813435bc630 \ 0a68848588e847ceccf504891584d00b \ - af0110497c2fc215c55297232f3e6665 \ + 1dbfec917710e57b574e92effa934924 \ 45b469ad607b912256b7c80141fa2d17 \ - b08b96f50cdba558c550c985252c3fd6 \ + 3817cf594b24311c4ea944398a58a48d \ 7799baff9a5664205d9110a2624e8989 \ - ff740ff52ecfd509004f54630f94c3e4 \ + 7cc8e977768423992930663aadcc43dd \ cb7c86af4d8a969d849c6fce363af240 \ - 89f70cb8305108cc51ccde5569760d5b \ + 4c6e3d943a6db21b1f2e4574d7fc3548 \ 936257597fbe2fd02d954a5db53c687a \ ae2ca148274c581aa6ee8a8e292ca2af \ 4ca31ec33e1508b14d3445f19a16ba55" diff --git a/development/cargo-vendor-filterer/README b/development/cargo-vendor-filterer/README deleted file mode 100644 index 83f9687535..0000000000 --- a/development/cargo-vendor-filterer/README +++ /dev/null @@ -1,10 +0,0 @@ -cargo-vendor-filterer (Vendor rust libraries based on filters) - -cargo-vendor-filterer works like "cargo vendor", but supports filters -that allow excluding libraries one isn't interested in, like -libraries only needed on other platforms, etc. - -NOTE: -I've included a "cargo-mkvendored.sh" script to generate filtered -vendored sources for a rust or python/rust slackbuild. It needs to be -run from within a slackbuild directory. diff --git a/development/cargo-vendor-filterer/cargo-mkvendored.sh b/development/cargo-vendor-filterer/cargo-mkvendored.sh deleted file mode 100644 index 2664e9eec4..0000000000 --- a/development/cargo-vendor-filterer/cargo-mkvendored.sh +++ /dev/null @@ -1,139 +0,0 @@ -#!/bin/bash - -# Create $PRGNAM-vendored-sources-$VERSION-$VSBUILD.tar.xz -# Requires network access, but does not require root privilege. -# Requires that $PRGNAM's REQUIRES need to be installed first (rust16) -# and cargo-vendor-filterer installed to include just the linux deps -# -# Expects to be run within a slackbuild dir with the source archive -# already downloaded. -# -# Variables to use in your SlackBuild: -# VSBUILD # same use as BUILD but for vendored sources -# VSDIR=/sub/dir/ # (optional) alternate location in src for vendor dir -# -# Vendors sources for the following targets -# i686-unknown-linux-gnu -# x86_64-unknown-linux-gnu -# arm-unknown-linux-gnueabihf -# aarch64-unknown-linux-gnu - -INFO="$( echo *.info )" -if [ ! -e "$INFO" ]; then - echo "No (or multiple) .info file in current dir" 1>&2 - exit 1 -fi - -SBUILD="$( echo *.SlackBuild )" -if [ ! -e "$SBUILD" ]; then - echo "No (or multiple) .SlackBuild file in current dir" 1>&2 - exit 1 -fi - -CWD=$(pwd) -source ./$INFO - -INFOERR="variable not set, are you sure you have a valid *.info file?" -echo ${PRGNAM:?$INFOERR} -echo VERSION=${VERSION:?$INFOERR} - -set -e -WORKDIR=$( mktemp -d ) -cd $WORKDIR - -# don't depend on user's ~/.cargo -mkdir -p cargohome -export CARGO_HOME=$(pwd)/cargohome - -egrep "^BUILD=|^VSBUILD=|^VSDIR=|^SRCNAM=" $CWD/$SBUILD > sbvars -source ./sbvars - -# if no SRCNAM in slackbuild set to PRGNAM -SRCNAM=${SRCNAM:-$PRGNAM} - -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION/$VSDIR || exit 1 - -if [ ! -e "Cargo.toml" ]; then - echo "No Cargo.toml file in $SRCNAM-$VERSION dir" 1>&2 - exit 1 -elif [ -e "$CWD/Cargo-toml.patch" ]; then - echo "INFO: Applying Cargo.toml patch" - patch -Np1 < $CWD/Cargo-toml.patch -fi - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i686 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -# check if rust16 is installed -if [ ! -d /opt/rust16/bin ]; then - echo "ERROR: The rust16 slackbuild is required to be installed" - exit 1 -else - export PATH="/opt/rust16/bin:$PATH" - if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" - else - export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" - fi -fi - -# Configure cargo-vendor-filterer - cat << EOF >> Cargo.toml -[package.metadata.vendor-filter] -platforms = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabihf"] -all-features = true -exclude-crate-paths = [ - { name = "openssl-src", exclude = "openssl" }, -] -EOF - -if [ -f /usr/bin/cargo-vendor-filterer ]; then - echo "INFO: Creating filtered vendor libs tarball..." - /usr/bin/cargo-vendor-filterer -else - echo "WARNING: Creating unfiltered vendor libs tarball!" - cargo vendor -fi - -# build would fail if the .a files were removed -#find vendor -type f -a -name \*.a -print0 | xargs -0 rm -f - -mkdir -p .cargo - cat <<EOF >.cargo/config.toml -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" -EOF -cd - - -cd $WORKDIR -tar cvfJ $CWD/$SRCNAM-vendored-sources-$VERSION-$VSBUILD.tar.xz \ - $SRCNAM-$VERSION/$VSDIR/{vendor,.cargo} -md5sum $CWD/$SRCNAM-vendored-sources-$VERSION-$VSBUILD.tar.xz -cd $CWD -rm -rf $WORKDIR diff --git a/development/cargo-vendor-filterer/cargo-vendor-filterer.SlackBuild b/development/cargo-vendor-filterer/cargo-vendor-filterer.SlackBuild deleted file mode 100644 index 6cec63b571..0000000000 --- a/development/cargo-vendor-filterer/cargo-vendor-filterer.SlackBuild +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/bash - -# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2022 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2022 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20230925 46and2: Bump build, changes to mkvendored script. -# 20230927 46and2: 32-bit fix thanks to Eugene Carlson. Min ARCH=i686. -# 20240102 46and2: modify to use VSBUILD instead of BUILD for vendored sources -# above requested by Andrew Clemons to avoid CI issues -# -also added VSDIR option to included script, see cargo-mkvendored.sh -# 20240213 46and2: Fix FTB on arm - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=cargo-vendor-filterer -VERSION=${VERSION:-0.5.14} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} -VSBUILD=${VSBUILD:-1} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i686 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -if [ "$ARCH" = "arm" ]; then - TRIPLET="$ARCH-unknown-linux-gnueabihf" -else - TRIPLET="$ARCH-unknown-linux-gnu" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z -tar xvf $CWD/$PRGNAM-vendored-sources-$VERSION-$VSBUILD.tar.?z -cd $PRGNAM-$VERSION - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -export PATH="/opt/rust16/bin:$PATH" -if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" -else - export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" -fi - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -OPENSSL_NO_VENDOR=1 \ -cargo build \ - --offline \ - --release \ - --target $TRIPLET - -mkdir -p $PKG/usr/bin -install -m 755 target/$TRIPLET/release/cargo-vendor-filterer \ - $PKG/usr/bin/ - -# add script to generate filtered vendor sources -install -m 755 $CWD/cargo-mkvendored.sh $PKG/usr/bin/ - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.md LICENSE \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/cargo-vendor-filterer/cargo-vendor-filterer.info b/development/cargo-vendor-filterer/cargo-vendor-filterer.info deleted file mode 100644 index 4169ba09d6..0000000000 --- a/development/cargo-vendor-filterer/cargo-vendor-filterer.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="cargo-vendor-filterer" -VERSION="0.5.14" -HOMEPAGE="https://github.com/coreos/cargo-vendor-filterer" -DOWNLOAD="https://github.com/coreos/cargo-vendor-filterer/archive/v0.5.14/cargo-vendor-filterer-0.5.14.tar.gz \ - https://slackware.uk/~fourtysixandtwo/src/cargo-vendor-filterer-vendored-sources-0.5.14-1.tar.xz" -MD5SUM="f5b9df9adc3c9d05c5ad62529fe354f7 \ - ca7986322b63d02809d7acb48fca3f2c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="rust16" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/development/cargo-vendor-filterer/slack-desc b/development/cargo-vendor-filterer/slack-desc deleted file mode 100644 index 1c8d67c1ef..0000000000 --- a/development/cargo-vendor-filterer/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -cargo-vendor-filterer: cargo-vendor-filterer (Vendor rust libraries based on filters) -cargo-vendor-filterer: -cargo-vendor-filterer: cargo-vendor-filterer works like "cargo vendor", but supports filters -cargo-vendor-filterer: that allow excluding libraries one isn't interested in, like -cargo-vendor-filterer: libraries only needed on other platforms, etc. -cargo-vendor-filterer: -cargo-vendor-filterer: Homepage: https://github.com/coreos/cargo-vendor-filterer -cargo-vendor-filterer: -cargo-vendor-filterer: -cargo-vendor-filterer: -cargo-vendor-filterer: diff --git a/development/codelite/codelite.SlackBuild b/development/codelite/codelite.SlackBuild index a73a0361d7..8c14bbd4fd 100644 --- a/development/codelite/codelite.SlackBuild +++ b/development/codelite/codelite.SlackBuild @@ -7,8 +7,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=codelite -VERSION=${VERSION:-15.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-16.0.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/codelite/codelite.info b/development/codelite/codelite.info index c01b8a1ba5..04c9ae1ec9 100644 --- a/development/codelite/codelite.info +++ b/development/codelite/codelite.info @@ -1,8 +1,8 @@ PRGNAM="codelite" -VERSION="15.0" +VERSION="16.0.0" HOMEPAGE="http://www.codelite.org/" -DOWNLOAD="https://github.com/eranif/codelite/archive/15.0/codelite-15.0.tar.gz" -MD5SUM="1c54744ab0c9b5732087687ab17ab49d" +DOWNLOAD="https://github.com/eranif/codelite/archive/16.0.0/codelite-16.0.0.tar.gz" +MD5SUM="0141a38d2f686520d54fd19a6df0fac3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxGTK3" diff --git a/development/composer/composer.SlackBuild b/development/composer/composer.SlackBuild index 84013f58ce..072e41072a 100644 --- a/development/composer/composer.SlackBuild +++ b/development/composer/composer.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=composer -VERSION=${VERSION:-2.7.2} +VERSION=${VERSION:-2.7.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/composer/composer.info b/development/composer/composer.info index c9b71e90ba..7145b64562 100644 --- a/development/composer/composer.info +++ b/development/composer/composer.info @@ -1,8 +1,8 @@ PRGNAM="composer" -VERSION="2.7.2" +VERSION="2.7.6" HOMEPAGE="https://getcomposer.org/" -DOWNLOAD="https://getcomposer.org/download/2.7.2/composer.phar" -MD5SUM="08d63a50e98885a89cb95ad4fc934055" +DOWNLOAD="https://getcomposer.org/download/2.7.6/composer.phar" +MD5SUM="99bbca7200e714b01041ffee872b90b3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/d-tools/d-tools.SlackBuild b/development/d-tools/d-tools.SlackBuild index 0b3ddacf87..d8c5868716 100644 --- a/development/d-tools/d-tools.SlackBuild +++ b/development/d-tools/d-tools.SlackBuild @@ -25,12 +25,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d-tools -VERSION=${VERSION:-2.107.1} +VERSION=${VERSION:-2.108.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -DUB_VERSION=${DUB_VERSION:-1.36.0} +DUB_VERSION=${DUB_VERSION:-1.37.0} DSCANNER_VERSION=${DSCANNER_VERSION:-0.15.2} DCD_VERSION=${DCD_VERSION:-0.15.2} diff --git a/development/d-tools/d-tools.info b/development/d-tools/d-tools.info index c2daa8efff..c3dfbea000 100644 --- a/development/d-tools/d-tools.info +++ b/development/d-tools/d-tools.info @@ -1,12 +1,12 @@ PRGNAM="d-tools" -VERSION="2.107.1" +VERSION="2.108.1" HOMEPAGE="https://dlang.org" -DOWNLOAD="https://download.dlackware.com/hosted-sources/d-tools/dub-1.36.0.tar.gz \ - https://download.dlackware.com/hosted-sources/d-tools/tools-2.107.1.tar.gz \ +DOWNLOAD="https://download.dlackware.com/hosted-sources/d-tools/dub-1.37.0.tar.gz \ + https://download.dlackware.com/hosted-sources/d-tools/tools-2.108.1.tar.gz \ https://download.dlackware.com/hosted-sources/d-tools/D-Scanner-0.15.2.tar.xz \ https://download.dlackware.com/hosted-sources/d-tools/DCD-0.15.2.tar.xz" -MD5SUM="9bff7e4bd3a36bfa94ac4c379ddb6d97 \ - 64e3046784001583154f38ce856dfdf8 \ +MD5SUM="57f64ab05ad7150bf56425de2f952033 \ + dc565fe3910698b0e8e2cbe413feeb2b \ 2b805ef7e3c2d0951d0c27cb479be67a \ fe7c2b6664c34f45db40373a3cf3374a" DOWNLOAD_x86_64="" diff --git a/development/device-tree-compiler/device-tree-compiler.SlackBuild b/development/device-tree-compiler/device-tree-compiler.SlackBuild index 230558bc53..ec90a72173 100644 --- a/development/device-tree-compiler/device-tree-compiler.SlackBuild +++ b/development/device-tree-compiler/device-tree-compiler.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=device-tree-compiler -VERSION=${VERSION:-1.6.1} +VERSION=${VERSION:-20240314_1fad065} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -74,7 +74,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z cd $SRCNAM-$VERSION chown -R root:root . find -L . \ diff --git a/development/device-tree-compiler/device-tree-compiler.info b/development/device-tree-compiler/device-tree-compiler.info index a25d77bae3..7abd9adc2d 100644 --- a/development/device-tree-compiler/device-tree-compiler.info +++ b/development/device-tree-compiler/device-tree-compiler.info @@ -1,8 +1,8 @@ PRGNAM="device-tree-compiler" -VERSION="1.6.1" +VERSION="20240314_1fad065" HOMEPAGE="https://git.kernel.org/cgit/utils/dtc/dtc.git" -DOWNLOAD="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-1.6.1.tar.gz" -MD5SUM="19eef37196e99b659c402a29aac5ba59" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/dtc-20240314_1fad065.tar.xz" +MD5SUM="07a9149d834ac5e00ee1a31e49c5d063" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/dmd/dmd.SlackBuild b/development/dmd/dmd.SlackBuild index 60e0e00982..9857489f56 100644 --- a/development/dmd/dmd.SlackBuild +++ b/development/dmd/dmd.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dmd -VERSION=${VERSION:-2.107.1} +VERSION=${VERSION:-2.108.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/dmd/dmd.info b/development/dmd/dmd.info index f4989ee3b7..824510ffc5 100644 --- a/development/dmd/dmd.info +++ b/development/dmd/dmd.info @@ -1,8 +1,8 @@ PRGNAM="dmd" -VERSION="2.107.1" +VERSION="2.108.1" HOMEPAGE="https://dlang.org" -DOWNLOAD="https://downloads.dlang.org/releases/2.x/2.107.1/dmd.2.107.1.linux.tar.xz" -MD5SUM="3f6d0239e071a14050182693d9de8b4b" +DOWNLOAD="https://downloads.dlang.org/releases/2.x/2.108.1/dmd.2.108.1.linux.tar.xz" +MD5SUM="7222b99c101b2a847ce6b67fbb15d5c6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/edb-debugger/edb-debugger.SlackBuild b/development/edb-debugger/edb-debugger.SlackBuild index 738e0027cd..8dc8d3084c 100644 --- a/development/edb-debugger/edb-debugger.SlackBuild +++ b/development/edb-debugger/edb-debugger.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=edb-debugger -VERSION=${VERSION:-1.3.0} +VERSION=${VERSION:-1.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -96,6 +93,9 @@ cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a BUGS CHANGELOG COPYING README* TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/edb-debugger/edb-debugger.info b/development/edb-debugger/edb-debugger.info index 4e5052ab7d..cb2676b4e7 100644 --- a/development/edb-debugger/edb-debugger.info +++ b/development/edb-debugger/edb-debugger.info @@ -1,8 +1,8 @@ PRGNAM="edb-debugger" -VERSION="1.3.0" +VERSION="1.5.0" HOMEPAGE="http://codef00.com/projects#debugger" -DOWNLOAD="https://github.com/eteran/edb-debugger/releases/download/1.3.0/edb-debugger-1.3.0.tgz" -MD5SUM="8f718aae43d6b1e683ffe9e90f7cc984" +DOWNLOAD="https://github.com/eteran/edb-debugger/releases/download/1.5.0/edb-debugger-1.5.0.tgz" +MD5SUM="2ccf5f74dc26a7e49e648a849269f157" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="capstone" diff --git a/development/eovim/eovim.info b/development/eovim/eovim.info index ae1dd04d6b..fa162df701 100644 --- a/development/eovim/eovim.info +++ b/development/eovim/eovim.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/jeanguyomarch/eovim/archive/v0.2.0/eovim-0.2.0.tar. MD5SUM="9386331be9cbf2bf4910ccb794f47bdf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="efl neovim" +REQUIRES="efl neovim msgpack-c" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/development/gambas3/gambas-3.19.0-poppler-24.02.0.patch b/development/gambas3/gambas-3.19.0-poppler-24.02.0.patch new file mode 100644 index 0000000000..d97e579696 --- /dev/null +++ b/development/gambas3/gambas-3.19.0-poppler-24.02.0.patch @@ -0,0 +1,13 @@ +diff -Naur gambas-3.19.0.orig/gb.pdf/src/CPdfDocument.cpp gambas-3.19.0/gb.pdf/src/CPdfDocument.cpp +--- gambas-3.19.0.orig/gb.pdf/src/CPdfDocument.cpp 2024-02-16 00:33:51.000000000 +0100 ++++ gambas-3.19.0/gb.pdf/src/CPdfDocument.cpp 2024-02-17 12:14:47.937408267 +0100 +@@ -776,7 +776,8 @@ + BEGIN_PROPERTY(PDFINDEX_title) + + OutlineItem *item = CPDF_index_get(THIS->currindex); +- return_unicode_string(item->getTitle(), item->getTitleLength()); ++ const std::vector<Unicode> &title = item->getTitle(); ++ return_unicode_string(title.data(), title.size()); + + END_PROPERTY + diff --git a/development/gambas3/gambas3.SlackBuild b/development/gambas3/gambas3.SlackBuild index 5073e7b417..9b1548e7fb 100644 --- a/development/gambas3/gambas3.SlackBuild +++ b/development/gambas3/gambas3.SlackBuild @@ -82,6 +82,8 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 cd $SRCNAM-$VERSION chown -R root:root . +patch -p1 < $CWD/gambas-3.19.0-poppler-24.02.0.patch + ./reconf-all CFLAGS="$SLKCFLAGS" \ diff --git a/development/gdb-dashboard/gdb-dashboard.SlackBuild b/development/gdb-dashboard/gdb-dashboard.SlackBuild index e174c14715..36fd8afbe4 100644 --- a/development/gdb-dashboard/gdb-dashboard.SlackBuild +++ b/development/gdb-dashboard/gdb-dashboard.SlackBuild @@ -8,7 +8,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gdb-dashboard -VERSION=${VERSION:-0.17.2} +VERSION=${VERSION:-20240131} +COMMITVER="b96e429c0db4b35c38302dd8c6cd90c65152f211" BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -29,16 +30,15 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-wiki.tar.gz +rm -rf $PRGNAM-$COMMITV +tar xvf $CWD/$PRGNAM-$COMMITVER.tar.gz +cd $PRGNAM-$COMMITVER chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PRGNAM-wiki $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild install -D -m 644 .gdbinit $PKG/etc/gdbinit.d/dashboard.new diff --git a/development/gdb-dashboard/gdb-dashboard.info b/development/gdb-dashboard/gdb-dashboard.info index 443d64c56c..589f876789 100644 --- a/development/gdb-dashboard/gdb-dashboard.info +++ b/development/gdb-dashboard/gdb-dashboard.info @@ -1,8 +1,8 @@ PRGNAM="gdb-dashboard" -VERSION="0.17.2" +VERSION="20240131" HOMEPAGE="https://github.com/cyrus-and/gdb-dashboard" -DOWNLOAD="https://github.com/cyrus-and/gdb-dashboard/archive/v0.17.2/gdb-dashboard-0.17.2.tar.gz" -MD5SUM="15ba39e7349282964454fa34ab621806" +DOWNLOAD="https://github.com/cyrus-and/gdb-dashboard/archive/b96e429c0db4b35c38302dd8c6cd90c65152f211/gdb-dashboard-b96e429c0db4b35c38302dd8c6cd90c65152f211.tar.gz" +MD5SUM="c199d1b7c6f1d957ead27cff23402c77" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/gedit-plugins/gedit-plugins.info b/development/gedit-plugins/gedit-plugins.info index eeaf2263c1..7b6b7637af 100644 --- a/development/gedit-plugins/gedit-plugins.info +++ b/development/gedit-plugins/gedit-plugins.info @@ -6,5 +6,5 @@ MD5SUM="c5701ed546aceb6ebceac8749948c8f5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gedit" -MAINTAINER="Juan M. Lasca" -EMAIL="juanmlasca@gmail.com" +MAINTAINER="Bob Funk" +EMAIL="bobfunk11@gmail.com" diff --git a/development/gedit/gedit.info b/development/gedit/gedit.info index 00cfc14544..487d5ae11c 100644 --- a/development/gedit/gedit.info +++ b/development/gedit/gedit.info @@ -6,5 +6,5 @@ MD5SUM="74cc927f8c41e7ccd2352c90d1086974" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libpeas tepl gspell" -MAINTAINER="Juan M. Lasca" -EMAIL="juanmlasca@gmail.com" +MAINTAINER="Bob Funk" +EMAIL="bobfunk11@gmail.com" diff --git a/development/github-cli/github-cli.SlackBuild b/development/github-cli/github-cli.SlackBuild index 2049193371..b5d29e3a61 100644 --- a/development/github-cli/github-cli.SlackBuild +++ b/development/github-cli/github-cli.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=github-cli DEBNAM=gh -VERSION=${VERSION:-2.48.0} +VERSION=${VERSION:-2.49.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/github-cli/github-cli.info b/development/github-cli/github-cli.info index e2d9bb5726..7039925d0b 100644 --- a/development/github-cli/github-cli.info +++ b/development/github-cli/github-cli.info @@ -1,10 +1,10 @@ PRGNAM="github-cli" -VERSION="2.48.0" +VERSION="2.49.2" HOMEPAGE="https://cli.github.com/" -DOWNLOAD="https://github.com/cli/cli/releases/download/v2.48.0/gh_2.48.0_linux_386.deb" -MD5SUM="5183ca269bb9b242055871c7483a5426" -DOWNLOAD_x86_64="https://github.com/cli/cli/releases/download/v2.48.0/gh_2.48.0_linux_amd64.deb" -MD5SUM_x86_64="bd56f8bd78c1762e8f6d0a31a02a617f" +DOWNLOAD="https://github.com/cli/cli/releases/download/v2.49.2/gh_2.49.2_linux_386.deb" +MD5SUM="c1c2c08d79405b39c6d45aef6c97bad7" +DOWNLOAD_x86_64="https://github.com/cli/cli/releases/download/v2.49.2/gh_2.49.2_linux_amd64.deb" +MD5SUM_x86_64="5270cc18daefa28102c599f9a5b04e4e" REQUIRES="" MAINTAINER="Ebben Aries" EMAIL="slackbuilds@dscp.org" diff --git a/development/gitlab-cli/gitlab-cli.SlackBuild b/development/gitlab-cli/gitlab-cli.SlackBuild index 53406543b5..1d81f6fe3a 100644 --- a/development/gitlab-cli/gitlab-cli.SlackBuild +++ b/development/gitlab-cli/gitlab-cli.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gitlab-cli DEBNAM=glab -VERSION=${VERSION:-1.37.0} +VERSION=${VERSION:-1.40.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/gitlab-cli/gitlab-cli.info b/development/gitlab-cli/gitlab-cli.info index 26f732fcff..eb9f088c12 100644 --- a/development/gitlab-cli/gitlab-cli.info +++ b/development/gitlab-cli/gitlab-cli.info @@ -1,14 +1,14 @@ PRGNAM="gitlab-cli" -VERSION="1.37.0" +VERSION="1.40.0" HOMEPAGE="https://gitlab.com/gitlab-org/cli" -DOWNLOAD="https://gitlab.com/gitlab-org/cli/-/archive/v1.37.0/cli-v1.37.0.tar.gz \ - https://gitlab.com/gitlab-org/cli/-/releases/v1.37.0/downloads/glab_1.37.0_Linux_i386.deb" -MD5SUM="83e99040535ee1b6b3222ca4751913ba \ - ecee73526ca604c4702064fda4955b6a" -DOWNLOAD_x86_64="https://gitlab.com/gitlab-org/cli/-/archive/v1.37.0/cli-v1.37.0.tar.gz \ - https://gitlab.com/gitlab-org/cli/-/releases/v1.37.0/downloads/glab_1.37.0_Linux_x86_64.deb" -MD5SUM_x86_64="83e99040535ee1b6b3222ca4751913ba \ - 176a122cf49a586f817c54b52822319a" +DOWNLOAD="https://gitlab.com/gitlab-org/cli/-/archive/v1.40.0/cli-v1.40.0.tar.gz \ + https://gitlab.com/gitlab-org/cli/-/releases/v1.40.0/downloads/glab_1.40.0_Linux_i386.deb" +MD5SUM="211aea19fc88dbf6f21763e593ba2079 \ + 94ff62f6214017c6204178810c9ef7a4" +DOWNLOAD_x86_64="https://gitlab.com/gitlab-org/cli/-/archive/v1.40.0/cli-v1.40.0.tar.gz \ + https://gitlab.com/gitlab-org/cli/-/releases/v1.40.0/downloads/glab_1.40.0_Linux_x86_64.deb" +MD5SUM_x86_64="211aea19fc88dbf6f21763e593ba2079 \ + b5774bc5db8eaf3099e83f3a4a3c74bf" REQUIRES="" MAINTAINER="Diniz Bortolotto" EMAIL="diniz.bortolotto@gmail.com" diff --git a/development/gnuradio/gnuradio.SlackBuild b/development/gnuradio/gnuradio.SlackBuild index 619f7387f5..8f7b4c49df 100644 --- a/development/gnuradio/gnuradio.SlackBuild +++ b/development/gnuradio/gnuradio.SlackBuild @@ -81,6 +81,9 @@ find -L . \ # install docs in the right place sed -i "s|\${GR_DATA_DIR}/doc|doc|" CMakeLists.txt +# fix building with gcc >= 13.x +sed -i s/\#include\ \<cstdlib\>/\#include\ \<cstdlib\>\\n\#include\ \<cstdint\>/ ./gr-fec/include/gnuradio/fec/alist.h + mkdir -p build cd build cmake \ diff --git a/development/gsoap/gsoap.SlackBuild b/development/gsoap/gsoap.SlackBuild index 197e63dfe2..89be61470e 100644 --- a/development/gsoap/gsoap.SlackBuild +++ b/development/gsoap/gsoap.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gsoap -# Copyright 2009-2023 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2009-2024 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gsoap -VERSION=${VERSION:-2.8.127} +VERSION=${VERSION:-2.8.132} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/gsoap/gsoap.info b/development/gsoap/gsoap.info index 15b5c90320..891fdcf791 100644 --- a/development/gsoap/gsoap.info +++ b/development/gsoap/gsoap.info @@ -1,8 +1,8 @@ PRGNAM="gsoap" -VERSION="2.8.127" +VERSION="2.8.132" HOMEPAGE="http://gsoap2.sourceforge.net/" -DOWNLOAD="https://sources.liwjatan.org/gsoap/gsoap_2.8.127.zip" -MD5SUM="572272c38ce259c0c38afb4634fdddb1" +DOWNLOAD="https://sources.liwjatan.org/gsoap/gsoap_2.8.132.zip" +MD5SUM="b0b93960bba760b5749f2fef3d5c718a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/gtest/gtest.SlackBuild b/development/gtest/gtest.SlackBuild index 867de2d6e9..bf915c9da7 100644 --- a/development/gtest/gtest.SlackBuild +++ b/development/gtest/gtest.SlackBuild @@ -34,7 +34,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gtest SRCNAM=googletest VERSION=${VERSION:-1.12.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -111,13 +111,21 @@ install -m 0644 googletest/include/$PRGNAM/internal/custom/*.h \ $PKG/usr/include/$PRGNAM/internal/custom # install the libs and the pkgconfig files! -install -s -m 0755 build/lib/*.so $PKG/usr/lib$LIBDIRSUFFIX +for i in build/lib/*.so ; do + install -s -m 0755 $i $PKG/usr/lib$LIBDIRSUFFIX/$(basename $i .so).so.$VERSION + ln -s $(basename $i .so).so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/$(basename $i .so).so +done mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig for i in gmock gmock_main gtest gtest_main ; do sed "s| -lpthread||g" build/googletest/generated/${i}.pc \ > $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/${i}.pc done +# copy the cmake files +mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/cmake/GTest +find build/googletest/CMakeFiles/Export build/googletest/generated \ + -name *.cmake -exec cp {} $PKG/usr/lib$LIBDIRSUFFIX/cmake/GTest \; + mkdir -p $PKG/usr/src cp -R googlemock $PKG/usr/src cp -R googletest $PKG/usr/src diff --git a/development/heroku-cli/heroku-cli.SlackBuild b/development/heroku-cli/heroku-cli.SlackBuild index e1d8c3af76..a256e49e10 100644 --- a/development/heroku-cli/heroku-cli.SlackBuild +++ b/development/heroku-cli/heroku-cli.SlackBuild @@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=heroku-cli -VERSION=${VERSION:-8.11.0} +VERSION=${VERSION:-8.11.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -TARBALL=heroku-v8.11.0-a525d5e-linux-x64.tar.xz +TARBALL=heroku-v8.11.5-df5cd30-linux-x64.tar.xz if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/development/heroku-cli/heroku-cli.info b/development/heroku-cli/heroku-cli.info index 6ae07ce0b1..62703521da 100644 --- a/development/heroku-cli/heroku-cli.info +++ b/development/heroku-cli/heroku-cli.info @@ -1,10 +1,10 @@ PRGNAM="heroku-cli" -VERSION="8.11.0" +VERSION="8.11.5" HOMEPAGE="https://www.heroku.com/home" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://cli-assets.heroku.com/versions/8.11.0/a525d5e/heroku-v8.11.0-a525d5e-linux-x64.tar.xz" -MD5SUM_x86_64="e6ee7fb62ac489aef98155b8ed4057a1" +DOWNLOAD_x86_64="https://cli-assets.heroku.com/versions/8.11.5/df5cd30/heroku-v8.11.5-df5cd30-linux-x64.tar.xz" +MD5SUM_x86_64="fdb3118070d581bfc9c4670a205644a2" REQUIRES="" MAINTAINER="Diniz Bortolotto" EMAIL="diniz.bortolotto@gmail.com" diff --git a/development/hhvm/README b/development/hhvm/README deleted file mode 100644 index 2467669770..0000000000 --- a/development/hhvm/README +++ /dev/null @@ -1,59 +0,0 @@ -HHVM is an open-source virtual machine designed for executing programs -written in Hack and PHP. HHVM uses a just-in-time (JIT) compilation -approach to achieve superior performance while maintaining the -development flexibility that PHP provides. - -Hack is a programming language for HHVM. Hack reconciles the fast -development cycle of a dynamically typed language with the discipline -provided by static typing, while adding many features commonly found -in other modern programming languages. - -Please note that HHVM is unsupported on 32-bit OSes and there are no -current plans to ever add support. - -In order to start HHVM at boot and stop it properly at shutdown, -make sure rc.hhvm is executable and add the following lines to -your rc.d scripts: - - /etc/rc.d/rc.local - ================== - # Startup HHVM - if [ -x /etc/rc.d/rc.hhvm ]; then - /etc/rc.d/rc.hhvm start - fi - - /etc/rc.d/rc.local_shutdown - =========================== - # Stop HHVM - if [ -x /etc/rc.d/rc.hhvm ]; then - /etc/rc.d/rc.hhvm stop - fi - -HHVM ships an integrated web server, proxygen, which listens on port -9000 (though you can configure proxygen to make use of a different -port): https://docs.hhvm.com/hhvm/basic-usage/proxygen. - -Alternatively to reverse proxy, FastCGI is available, which uses Unix -sockets by default. If your web server isn't Apache make sure it has -write access to the socket file. You can create a new group and add -your web server user to this group or just use the main group of your -web server and start HHVM as following: - - hhvm_GROUP=apache /etc/rc.d/rc.hhvm start - -See https://docs.hhvm.com/hhvm/advanced-usage/fastCGI. - -To start a project you have to configure the type checker as well. -See the official documentation: -https://docs.hhvm.com/hack/getting-started/getting-started - -Basically you create an empty .hhconfig file in the root dir of your -project: - - touch .hhconfig - -and run: - - hh_client - -Happy Hacking! diff --git a/development/hhvm/doinst.sh b/development/hhvm/doinst.sh deleted file mode 100644 index 6979f0cdcf..0000000000 --- a/development/hhvm/doinst.sh +++ /dev/null @@ -1,20 +0,0 @@ -config() { - NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} -# Keep same perms on rc.hhvm.new: -if [ -e etc/rc.d/rc.hhvm ]; then - cp -a etc/rc.d/rc.hhvm etc/rc.d/rc.hhvm.new.incoming - cat etc/rc.d/rc.hhvm.new > etc/rc.d/rc.hhvm.new.incoming - mv etc/rc.d/rc.hhvm.new.incoming etc/rc.d/rc.hhvm.new -fi -config etc/rc.d/rc.hhvm.new -config etc/hhvm/server.ini.new -config etc/hhvm/php.ini.new diff --git a/development/hhvm/etc/php.ini b/development/hhvm/etc/php.ini deleted file mode 100644 index 5004b9fb11..0000000000 --- a/development/hhvm/etc/php.ini +++ /dev/null @@ -1 +0,0 @@ -extension_dir = /usr/lib64/hhvm/extensions diff --git a/development/hhvm/etc/rc.hhvm b/development/hhvm/etc/rc.hhvm deleted file mode 100644 index 049fb521d4..0000000000 --- a/development/hhvm/etc/rc.hhvm +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: hhvm -# Required-Start: $remote_fs $network -# Required-Stop: $remote_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Description: Starts the HHVM daemon -### END INIT INFO - -PIDFILE=/var/run/hhvm/pid -hhvm_SOCKET=/var/run/hhvm/sock -hhvm_GROUP=${hhvm_GROUP:-apache} -CONFIG_FILE="/etc/hhvm/server.ini" -SYSTEM_CONFIG_FILE="/etc/hhvm/php.ini" - -DAEMON_ARGS="--config ${SYSTEM_CONFIG_FILE} \ - --config ${CONFIG_FILE} \ - --user ${hhvm_GROUP} \ - -vPidFile=${PIDFILE}" - -do_stop () { - try=0 - - if [ ! -r $2 ]; then - echo "warning, no pid file found - HHVM is not running?" - exit 1 - fi - - PID=$(cat $2) - kill $1 $PID - - # Waiting for HHVM to shutdown - while test $try -lt 35 - do - if ps -p $PID | grep -q $PID - then - echo -n . - try=$(expr $try + 1) - sleep 1 - else - try='' - break - fi - done - - if [ -n "$try" ] - then - echo " failed. Use force-quit" - exit 1 - else - rm -f $2 - echo " done" - fi -} - -wait_for_pid () { - try=0 - - while test $try -lt 35 - do - if [ -f "$1" ] ; then - try='' - break - fi - - echo -n . - try=$(expr $try + 1) - sleep 1 - done - -} - -case "$1" in - start) - echo -n "Starting HHVM " - - if [ -r $PIDFILE ]; then - echo "warning, pid file found - HHVM is already running?" - exit 1 - fi - - mkdir -p $(dirname ${PIDFILE}) $(dirname ${hhvm_SOCKET}) - chown apache:apache $(dirname ${PIDFILE}) - - echo - /usr/bin/hhvm --mode daemon $DAEMON_ARGS - if [ "$?" != 0 ] - then - echo "Failed" - exit 1 - fi - - wait_for_pid $PIDFILE - - if [ -n "$try" ] ; then - echo " failed" - exit 1 - fi - - # Set the socket permissions if HHVM uses UDS - if [ -S "$hhvm_SOCKET" ] - then - chgrp $hhvm_GROUP $hhvm_SOCKET - fi - - echo " done" - ;; - - stop) - echo -n "Stopping HHVM " - - do_stop -QUIT $PIDFILE - ;; - - force-quit) - echo -n "Terminating HHVM " - - do_stop -TERM $PIDFILE - ;; - - status) - if [ ! -r $PIDFILE ] - then - echo "HHVM is stopped" - exit 0 - fi - - PID=$(cat $PIDFILE) - if ps -p $PID | grep -q $PID - then - echo "HHVM (pid $PID) is running..." - else - echo "HHVM dead but pid file exists" - fi - ;; - - restart) - sh $0 stop - sh $0 start - ;; - - reload) - echo -n "Reload service HHVM " - - if [ ! -r $PIDFILE ] - then - echo "warning, no pid file found - HHVM is not running?" - exit 1 - fi - - kill -USR2 $(cat $PIDFILE) - - echo " done" - ;; - - *) - echo "Usage: $0 {start|stop|status|restart|reload|force-quit}" >&2 - exit 1 - ;; - -esac diff --git a/development/hhvm/etc/server.ini b/development/hhvm/etc/server.ini deleted file mode 100644 index ce240979d4..0000000000 --- a/development/hhvm/etc/server.ini +++ /dev/null @@ -1,9 +0,0 @@ -pid = /var/run/hhvm/pid - -;hhvm.server.file_socket = /var/run/hhvm/sock -hhvm.server.port = 9000 -hhvm.server.type = proxygen -hhvm.server.default_document = index.hh -hhvm.log.use_log_file = true -hhvm.log.file = /var/log/hhvm/error.log -hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc diff --git a/development/hhvm/hhvm.SlackBuild b/development/hhvm/hhvm.SlackBuild deleted file mode 100644 index fadc3c030f..0000000000 --- a/development/hhvm/hhvm.SlackBuild +++ /dev/null @@ -1,209 +0,0 @@ -#!/bin/bash - -# Slackware build script for HHVM - -# Copyright 2015-2023 Eugene Wissner, Dachau, Germany -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=hhvm -VERSION=${VERSION:-4.168.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -OPAM_STAMP="1d2e919" -CARGO_BUILD="3" -FB_VERSION="2022.07.04.00" - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - echo "$ARCH is not supported." - exit 1 -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar Jxvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION - -mkdir -p hphp/hack/facebook hphp/hack/_build/opam -tar Jxvf $CWD/hack-switch-$OPAM_STAMP.tar.xz -C hphp/hack/_build/opam -tar Jxvf $CWD/cargo-home-$CARGO_BUILD.tar.xz -C hphp/hack/_build - -install -m 0755 -D $CWD/opam-2.1.0-x86_64-linux \ - third-party/opam/opamDownload-prefix/src/opam-2.1.0-x86_64-linux - -install -m 0644 -D $CWD/fmt-8.0.0.zip third-party/fmt/bundled_fmt-prefix/src/fmt-8.0.0.zip -unzip $CWD/fmt-8.0.0.zip -d third-party/fmt/bundled_fmt-prefix/src -mv third-party/fmt/bundled_fmt-prefix/src/fmt-8.0.0 third-party/fmt/bundled_fmt-prefix/src/bundled_fmt - -mkdir -p third-party/re2/bundled_re2-prefix/src/bundled_re2 -install -m 0644 -D $CWD/re2-2021-11-01.tar.gz third-party/re2/bundled_re2-prefix/src/re2-2021-11-01.tar.gz -tar zxvf $CWD/re2-2021-11-01.tar.gz \ - -C third-party/re2/bundled_re2-prefix/src/bundled_re2 \ - --strip-components=1 - -mkdir -p third-party/brotli/bundled_brotli-prefix/src/bundled_brotli -install -m 0644 -D $CWD/brotli-v1.0.9.tar.gz third-party/brotli/bundled_brotli-prefix/src/brotli-v1.0.9.tar.gz -tar zxvf $CWD/brotli-v1.0.9.tar.gz \ - -C third-party/brotli/bundled_brotli-prefix/src/bundled_brotli \ - --strip-components=1 - -mkdir -p third-party/rustc/bundled_rust-prefix/src/bundled_rust -install -m 0644 -D $CWD/rust-nightly-x86_64-unknown-linux-gnu.tar.gz \ - third-party/rustc/bundled_rust-prefix/src/rust-nightly-x86_64-unknown-linux-gnu.tar.gz -tar zxvf $CWD/rust-nightly-x86_64-unknown-linux-gnu.tar.gz \ - -C third-party/rustc/bundled_rust-prefix/src/bundled_rust \ - --strip-components=1 - -mkdir -p third-party/proxygen/bundled_proxygen-prefix/src/bundled_proxygen -install -m 0644 -D $CWD/proxygen-v${FB_VERSION}.tar.gz \ - third-party/proxygen/bundled_proxygen-prefix/src/proxygen-v${FB_VERSION}.tar.gz -tar zxvf $CWD/proxygen-v${FB_VERSION}.tar.gz \ - -C third-party/proxygen/bundled_proxygen-prefix/src/bundled_proxygen - -mkdir -p third-party/folly/bundled_folly-prefix/src/bundled_folly -install -m 0644 -D $CWD/folly-v${FB_VERSION}.tar.gz \ - third-party/folly/bundled_folly-prefix/src/folly-v${FB_VERSION}.tar.gz -tar zxvf $CWD/folly-v${FB_VERSION}.tar.gz \ - -C third-party/folly/bundled_folly-prefix/src/bundled_folly - -mkdir -p third-party/wangle/bundled_wangle-prefix/src/bundled_wangle -install -m 0644 -D $CWD/wangle-v${FB_VERSION}.tar.gz \ - third-party/wangle/bundled_wangle-prefix/src/wangle-v${FB_VERSION}.tar.gz -tar -zxvf $CWD/wangle-v${FB_VERSION}.tar.gz \ - -C third-party/wangle/bundled_wangle-prefix/src/bundled_wangle - -mkdir -p third-party/thrift/bundled_thrift-prefix/src/bundled_thrift -install -m 0644 -D $CWD/fbthrift-v${FB_VERSION}.tar.gz \ - third-party/thrift/bundled_thrift-prefix/src/fbthrift-v${FB_VERSION}.tar.gz -tar -zxvf $CWD/fbthrift-v${FB_VERSION}.tar.gz \ - -C third-party/thrift/bundled_thrift-prefix/src/bundled_thrift \ - --strip-components=1 - -mkdir -p third-party/mcrouter/bundled_mcrouter-prefix/src/bundled_mcrouter -install -m 0644 -D $CWD/mcrouter-v${FB_VERSION}.tar.gz \ - third-party/mcrouter/bundled_mcrouter-prefix/src/mcrouter-v${FB_VERSION}.tar.gz -tar -zxvf $CWD/mcrouter-v${FB_VERSION}.tar.gz \ - -C third-party/mcrouter/bundled_mcrouter-prefix/src/bundled_mcrouter \ - --strip-components=1 - -mkdir -p third-party/timelib/bundled_timelib-prefix/src/bundled_timelib -install -m 0644 -D $CWD/timelib-2021.07.tar.gz third-party/timelib/bundled_timelib-prefix/src/timelib-2021.07.tar.gz -tar -zxvf $CWD/timelib-2021.07.tar.gz \ - -C third-party/timelib/bundled_timelib-prefix/src/bundled_timelib \ - --strip-components=1 - -mkdir -p third-party/fizz/bundled_fizz-prefix/src/bundled_fizz -install -m 0644 -D $CWD/fizz-v${FB_VERSION}.tar.gz \ - third-party/fizz/bundled_fizz-prefix/src/fizz-v${FB_VERSION}.tar.gz -tar -zxvf $CWD/fizz-v${FB_VERSION}.tar.gz \ - -C third-party/fizz/bundled_fizz-prefix/src/bundled_fizz - -# The working directory is hphp/hack. -cat << EOF > hphp/hack/facebook/fetch_opam2_repo_hack.sh -!/bin/sh -cp $CWD/index-$OPAM_STAMP.tar.gz facebook/ -echo facebook/index-$OPAM_STAMP -EOF -chmod 0755 hphp/hack/facebook/fetch_opam2_repo_hack.sh - -patch -p1 --verbose -i $CWD/patches/0001-liburing.patch -patch -p1 --verbose -i $CWD/patches/0002-download.patch -patch -p1 --verbose -i $CWD/patches/0003-iquote.patch - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -export CMAKE_PREFIX_PATH=`pwd` -cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_STANDARD=17 \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DENABLE_MCROUTER=true \ - -DENABLE_EXTENSION_IMAGICK=false \ - -DNON_DISTRIBUTABLE_BUILD=true \ - -DENABLE_LD_GOLD=true \ - -DUSE_JEMALLOC=true \ - -DUSE_BUNDLED_TZDATA=OFF \ - -DFORCE_BUNDLED_LZ4=OFF \ - -DCAN_USE_SYSTEM_ZSTD=ON \ - -DMYSQL_UNIX_SOCK_ADDR=/var/run/mysqld/mysqld.sock \ - -DCMAKE_BUILD_TYPE=Release . -make || make -j1 -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/man -mv hphp/doc/man $PKG/usr/man/man1 -find $PKG/usr/man -type f -exec gzip -9 {} \; - -install -m 644 -D $CWD/etc/rc.hhvm $PKG/etc/rc.d/rc.hhvm.new -install -m 644 -D $CWD/etc/server.ini $PKG/etc/hhvm/server.ini.new -install -m 644 -D $CWD/etc/php.ini $PKG/etc/hhvm/php.ini.new - -mkdir -p $PKG/var/log/hhvm $PKG/usr/lib64/hhvm/extensions - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.md LICENSE* hphp/doc/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/hhvm/hhvm.info b/development/hhvm/hhvm.info deleted file mode 100644 index 5eaeddab22..0000000000 --- a/development/hhvm/hhvm.info +++ /dev/null @@ -1,40 +0,0 @@ -PRGNAM="hhvm" -VERSION="4.168.2" -HOMEPAGE="https://hhvm.com/" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://download.dlackware.com/hosted-sources/hhvm/hhvm-4.168.2.tar.xz \ - https://static.rust-lang.org/dist/2022-08-01/rust-nightly-x86_64-unknown-linux-gnu.tar.gz \ - https://download.dlackware.com/hosted-sources/hhvm/opam-2.1.0-x86_64-linux \ - https://download.dlackware.com/hosted-sources/hhvm/brotli-v1.0.9.tar.gz \ - https://download.dlackware.com/hosted-sources/hhvm/fmt-8.0.0.zip \ - https://download.dlackware.com/hosted-sources/hhvm/cargo-home-3.tar.xz \ - https://download.dlackware.com/hosted-sources/hhvm/index-1d2e919.tar.gz \ - https://download.dlackware.com/hosted-sources/hhvm/hack-switch-1d2e919.tar.xz \ - https://download.dlackware.com/hosted-sources/hhvm/fbthrift-v2022.07.04.00.tar.gz \ - https://download.dlackware.com/hosted-sources/hhvm/fizz-v2022.07.04.00.tar.gz \ - https://download.dlackware.com/hosted-sources/hhvm/folly-v2022.07.04.00.tar.gz \ - https://download.dlackware.com/hosted-sources/hhvm/mcrouter-v2022.07.04.00.tar.gz \ - https://download.dlackware.com/hosted-sources/hhvm/proxygen-v2022.07.04.00.tar.gz \ - https://download.dlackware.com/hosted-sources/hhvm/re2-2021-11-01.tar.gz \ - https://download.dlackware.com/hosted-sources/hhvm/timelib-2021.07.tar.gz \ - https://download.dlackware.com/hosted-sources/hhvm/wangle-v2022.07.04.00.tar.gz" -MD5SUM_x86_64="e28368785c9d9a450e535dfab58edd25 \ - 6c9d12670d6ef18be6da3e92ebe692e9 \ - 87d949d8dd93061c5f727094da67f315 \ - c2274f0c7af8470ad514637c35bcee7d \ - f6eb7f98a6aa09aa0102c0c931feec55 \ - e4fd7b7137880abf755c34d8bd53cb2c \ - 65d68e3ecb52e910245cb6d3a02d137f \ - 0eec01bc44b88f75ce6a0799b09b6e3b \ - ba0283a7a932e329852b0634765ea6f1 \ - 34e50ea874ba018c567409a02919f613 \ - 0b6de34c0ca84a4f89d72a3380de9391 \ - 0084e476218aeb9a03fa1a0e5d797522 \ - cc6c17ef5b582d8f602efce8a61a117e \ - 8db4cf198c296eb001b4bf7ac194e598 \ - 7b869e86c44b5a3d9296149285c8bd69 \ - 544011faeb62a328f8b92044f9adcf11" -REQUIRES="tbb glog libdwarf libmemcached double-conversion gflags" -MAINTAINER="Eugene Wissner" -EMAIL="belka@caraus.de" diff --git a/development/hhvm/patches/0001-liburing.patch b/development/hhvm/patches/0001-liburing.patch deleted file mode 100644 index 1369df0f0d..0000000000 --- a/development/hhvm/patches/0001-liburing.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/third-party/proxygen/bundled_proxygen-prefix/src/bundled_proxygen/proxygen/lib/services/WorkerThread.cpp 2022-06-16 13:33:00.766000000 +0200 -+++ b/third-party/proxygen/bundled_proxygen-prefix/src/bundled_proxygen/proxygen/lib/services/WorkerThread.cpp 2022-06-16 13:37:39.111000000 +0200 -@@ -17,7 +17,7 @@ - #include <glog/logging.h> - #include <signal.h> - --#if !FOLLY_MOBILE && __has_include(<liburing.h>) -+#if !FOLLY_MOBILE && false - - DEFINE_int32(pwt_io_uring_capacity, -1, "io_uring backend capacity"); - DEFINE_int32(pwt_io_uring_max_submit, 128, "io_uring backend max submit"); ---- a/third-party/folly/bundled_folly-prefix/src/bundled_folly/folly/experimental/io/IoUringBackend.h 2022-06-16 13:38:45.523000000 +0200 -+++ b/third-party/folly/bundled_folly-prefix/src/bundled_folly/folly/experimental/io/IoUringBackend.h 2022-06-16 13:43:08.748000000 +0200 -@@ -40,11 +40,7 @@ - #include <poll.h> - #endif - --#if __has_include(<liburing.h>) --#include <liburing.h> --#endif -- --#if __has_include(<liburing.h>) -+#if false - - namespace folly { - ---- a/third-party/folly/bundled_folly-prefix/src/bundled_folly/folly/experimental/io/IoUringBackend.cpp 2022-06-16 14:12:06.191000000 +0200 -+++ b/third-party/folly/bundled_folly-prefix/src/bundled_folly/folly/experimental/io/IoUringBackend.cpp 2022-06-16 14:09:28.887000000 +0200 -@@ -31,7 +31,7 @@ - #include <sys/timerfd.h> - #endif - --#if __has_include(<liburing.h>) -+#if false - - extern "C" FOLLY_ATTR_WEAK void eb_poll_loop_pre_hook(uint64_t* call_time); - extern "C" FOLLY_ATTR_WEAK void eb_poll_loop_post_hook( diff --git a/development/hhvm/patches/0002-download.patch b/development/hhvm/patches/0002-download.patch deleted file mode 100644 index 5693c55e74..0000000000 --- a/development/hhvm/patches/0002-download.patch +++ /dev/null @@ -1,247 +0,0 @@ ---- hhvm-4.168.2/third-party/libzip/CMakeLists.txt 2023-05-28 20:16:44.000000000 +0200 -+++ - 2023-06-01 19:10:40.449428587 +0200 -@@ -23,10 +23,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - LIBZIP_DOWNLOAD_ARGS -- SOURCE_URL -- "https://libzip.org/download/libzip-1.6.1.tar.gz" -- SOURCE_HASH -- "SHA256=06eb8e9141fd19e2788cabaea9c9c2fd4d488d9e1484eb474bbfcac78e7b1d88" - ) - - ExternalProject_Add( ---- hhvm-4.168.2/third-party/re2/CMakeLists.txt 2023-05-28 20:16:44.000000000 +0200 -+++ - 2023-06-01 19:10:40.453034229 +0200 -@@ -12,10 +12,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - RE2_SOURCE_ARGS -- SOURCE_URL -- "https://github.com/google/re2/archive/refs/tags/2021-11-01.tar.gz" -- SOURCE_HASH -- "SHA256=8c45f7fba029ab41f2a7e6545058d9eec94eef97ce70df58e92d85cfc08b4669" - FILENAME_PREFIX "re2-" - ) - ---- hhvm-4.168.2/third-party/zstd/CMakeLists.txt 2023-05-28 20:16:44.000000000 +0200 -+++ - 2023-06-01 19:10:40.454513420 +0200 -@@ -36,10 +36,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - ZSTD_DOWNLOAD_ARGS -- SOURCE_URL -- "https://github.com/facebook/zstd/releases/download/v1.4.9/zstd-1.4.9.tar.gz" -- SOURCE_HASH -- "SHA512=10d325c844be43f801c798158c6f1d1ab57401abf1e783e04f6b9e4ac0ba53cf487204fa3244370b1ade239d5f3a784bf1829e206c4ba61fdd9c2f4e9502b238" - ) - ExternalProject_Add( - bundled_zstd ---- hhvm-4.168.2/third-party/libsodium/CMakeLists.txt 2023-05-28 20:16:44.000000000 +0200 -+++ - 2023-06-01 19:10:40.456241341 +0200 -@@ -21,10 +21,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - LIBSODIUM_DOWNLOAD_ARGS -- SOURCE_URL -- "https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz" -- SOURCE_HASH -- "SHA512=17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef" - ) - - if (CMAKE_OSX_SYSROOT) ---- hhvm-4.168.2/third-party/brotli/CMakeLists.txt 2023-05-28 20:16:43.000000000 +0200 -+++ - 2023-06-01 19:10:40.458519062 +0200 -@@ -4,10 +4,6 @@ - include(HPHPFunctions) - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - BROTLI_SOURCE_ARGS -- SOURCE_URL -- "https://github.com/google/brotli/archive/refs/tags/v1.0.9.tar.gz" -- SOURCE_HASH -- "SHA256=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46" - FILENAME_PREFIX "brotli-" - ) - ---- hhvm-4.168.2/third-party/proxygen/CMakeLists.txt 2023-05-28 20:24:27.000000000 +0200 -+++ - 2023-06-01 19:10:40.460795033 +0200 -@@ -18,10 +18,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - PROXYGEN_SOURCE_ARGS -- SOURCE_URL -- "https://github.com/facebook/proxygen/releases/download/v2022.07.04.00/proxygen-v2022.07.04.00.tar.gz" -- SOURCE_HASH -- "SHA256=4de47545a5beb9f3ac2ccdd62ae9def112b3cc361bb71820b9306a04f4bb40e9" - ) - - ExternalProject_Add( ---- hhvm-4.168.2/third-party/wangle/CMakeLists.txt 2023-05-28 20:24:27.000000000 +0200 -+++ - 2023-06-01 19:10:40.463064724 +0200 -@@ -20,10 +20,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - WANGLE_SOURCE_ARGS -- SOURCE_URL -- "https://github.com/facebook/wangle/releases/download/v2022.07.04.00/wangle-v2022.07.04.00.tar.gz" -- SOURCE_HASH -- "SHA256=8c7b538f9e9d84162056d6dc757bea1d0d4c0978889469f10e9d05b1dc4e5a83" - ) - - ExternalProject_Add( ---- hhvm-4.168.2/third-party/thrift/CMakeLists.txt 2023-05-28 20:24:27.000000000 +0200 -+++ - 2023-06-01 19:10:40.465499515 +0200 -@@ -20,10 +20,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - THRIFT_SOURCE_ARGS -- SOURCE_URL -- "https://github.com/facebook/fbthrift/archive/refs/tags/v2022.07.04.00.tar.gz" -- SOURCE_HASH -- "SHA256=45e7ffb38655d9b518d28066f4276000a298990c7c32b9460ddb7a37f2af78bd" - FILENAME_PREFIX - "fbthrift-" - ) ---- hhvm-4.168.2/third-party/mcrouter/CMakeLists.txt 2023-05-28 20:24:27.000000000 +0200 -+++ - 2023-06-01 19:10:40.467849786 +0200 -@@ -5,9 +5,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - MCROUTER_DOWNLOAD_ARGS -- SOURCE_URL "https://github.com/facebook/mcrouter/archive/refs/tags/v2022.07.04.00.tar.gz" -- SOURCE_HASH "SHA256=7a2a0b44736e896c844c4f8c7697202cdebf7fa42dbb4b84931ee5036a46945c" -- # The tarball name is just the tag name, which can conflict in the cache - FILENAME_PREFIX "mcrouter-" - ) - ---- hhvm-4.168.2/third-party/double-conversion/CMakeLists.txt 2023-05-28 20:16:43.000000000 +0200 -+++ - 2023-06-01 19:10:40.470198057 +0200 -@@ -1,33 +1,7 @@ - include(ExternalProject) - include(HPHPFunctions) - --SET_HHVM_THIRD_PARTY_SOURCE_ARGS( -- DOUBLE_CONVERSION_DOWNLOAD_ARGS -- SOURCE_URL "https://github.com/google/double-conversion/archive/refs/tags/v3.0.1.tar.gz" -- SOURCE_HASH "SHA256=d400c86417df2980b60dc27ad68249dd124964738916d20cdc9c90b42de86490" -- # The tarball name is just the tag name, which can conflict in the cache -- FILENAME_PREFIX "double-conversion-" --) -- --ExternalProject_Add( -- bundled_double-conversion -- ${DOUBLE_CONVERSION_DOWNLOAD_ARGS} -- CMAKE_ARGS -- -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -- -DCMAKE_INSTALL_LIBDIR=lib -- -DCMAKE_INSTALL_INCLUDEDIR=include -- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -- -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -- EXCLUDE_FROM_ALL --) -- --option(FORCE_BUNDLED_DOUBLE_CONVERSION "Always use bundled double-conversion" OFF) --if(FORCE_BUNDLED_DOUBLE_CONVERSION) -- set(DOUBLE_CONVERSION_FOUND FALSE) --else() -- find_package(DoubleConversion) --endif() -+find_package(DoubleConversion) - - add_library(double-conversion INTERFACE) - if(DOUBLE_CONVERSION_FOUND) ---- hhvm-4.168.2/third-party/timelib/CMakeLists.txt 2023-05-28 20:16:44.000000000 +0200 -+++ - 2023-06-01 19:10:40.472727059 +0200 -@@ -6,9 +6,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - TIMELIB_DOWNLOAD_ARGS -- SOURCE_URL "https://github.com/derickr/timelib/archive/refs/tags/2021.07.tar.gz" -- SOURCE_HASH "SHA512=7bc56d20360937af10f63960e443cc8bd4d24c5369f697241e54da21465d4512bd16cfa6f0efcf2b847cc19781e1cecf93c9e19a1efa4f1a7012c9fa442eeabe" -- # Look for timelib-YYYY.MM.tar.gz in download cache, not just YYYY.MM.tar.gz - FILENAME_PREFIX "timelib-" - ) - ---- hhvm-4.168.2/third-party/oniguruma/CMakeLists.txt 2023-05-28 20:16:44.000000000 +0200 -+++ - 2023-06-01 19:10:40.474969410 +0200 -@@ -28,10 +28,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - ONIG_SOURCE_ARGS -- SOURCE_URL -- "https://github.com/kkos/oniguruma/releases/download/v6.9.5/onig-6.9.5.tar.gz" -- SOURCE_HASH -- "SHA512=2bdb24914e7069c6df9ab8a3d0190ddb58440d94b13860cdc36d259062ae0bc2aa85d564a4209ec596fc7ee47b0823d1b817d4f7ffcc3ea60e9870da84491dc1" - ) - - ExternalProject_add( ---- hhvm-4.168.2/third-party/fizz/CMakeLists.txt 2023-05-28 20:24:27.000000000 +0200 -+++ - 2023-06-01 19:10:40.477204211 +0200 -@@ -22,10 +22,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - FIZZ_SOURCE_ARGS -- SOURCE_URL -- "https://github.com/facebookincubator/fizz/releases/download/v2022.07.04.00/fizz-v2022.07.04.00.tar.gz" -- SOURCE_HASH -- "SHA256=48941c3726b99aa9b22480ff92cbe3715154df0a4330ad42485b3d7649167b76" - ) - - set( ---- hhvm-4.168.2/third-party/fmt/CMakeLists.txt 2023-05-28 20:24:27.000000000 +0200 -+++ - 2023-06-01 19:10:40.478716581 +0200 -@@ -3,10 +3,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - FMT_SOURCE_ARGS -- SOURCE_URL -- "https://github.com/fmtlib/fmt/releases/download/8.0.0/fmt-8.0.0.zip" -- SOURCE_HASH -- "SHA512=70848739642bebf2820d661e7547208445329325a0d8b5919d85f375d683c0f9bef763bc7e9d7823def15100134fd9a126a9e418223b20bf8d567e5084334778" - ) - - set(INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/fmt-prefix") ---- hhvm-4.168.2/third-party/rustc/CMakeLists.txt 2023-05-28 20:16:44.000000000 +0200 -+++ - 2023-06-01 19:10:40.480975123 +0200 -@@ -32,14 +32,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - RUST_DOWNLOAD_ARGS -- Linux_URL -- "https://static.rust-lang.org/dist/${RUST_NIGHTLY_VERSION}/rust-nightly-x86_64-unknown-linux-gnu.tar.gz" -- Darwin_URL -- "https://static.rust-lang.org/dist/${RUST_NIGHTLY_VERSION}/rust-nightly-x86_64-apple-darwin.tar.gz" -- Linux_HASH -- "SHA512=de136959121b4117ab31a9ae4c4b3c593d4fcdf9724bd0f62e8a4ab41becccfa4b8e92ebe1460d9be508986888b95b38620bb68b58496db89706760074b9585d" -- Darwin_HASH -- "SHA512=77beb1d67233d3954c2709a47c2513762e91e506041bb5ad8d0aad90124cb5a229dfc87e1fb767826f27a31b52520f148c52c2f3a595dac6e09a676c6e660462" - # The original filename doesn't contain any version information, so add the version information as a prefix to avoid cache collisions when updating later - FILENAME_PREFIX "rustc-${RUST_NIGHTLY_VERSION}-" - ) ---- hhvm-4.168.2/third-party/lz4/CMakeLists.txt 2023-05-28 20:16:44.000000000 +0200 -+++ - 2023-06-01 19:10:40.483215304 +0200 -@@ -21,10 +21,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - LZ4_DOWNLOAD_ARGS -- SOURCE_URL "https://github.com/lz4/lz4/archive/v1.9.2.tar.gz" -- SOURCE_HASH "SHA256=658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc" -- # By default, we'd look for v1.9.2.tar.gz in the cache - let's look for -- # lz4-v1.9.2 instead - FILENAME_PREFIX "lz4-" - ) - set(MAKE_ARGS CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} "MOREFLAGS=-fPIC ${ISYSROOT_FLAG}") ---- hhvm-4.168.2/third-party/folly/CMakeLists.txt 2023-05-28 20:24:27.000000000 +0200 -+++ - 2023-06-01 19:10:40.485574035 +0200 -@@ -3,10 +3,6 @@ - - SET_HHVM_THIRD_PARTY_SOURCE_ARGS( - FOLLY_SOURCE_ARGS -- SOURCE_URL -- "https://github.com/facebook/folly/releases/download/v2022.07.04.00/folly-v2022.07.04.00.tar.gz" -- SOURCE_HASH -- "SHA256=fff7caa4a230ac0b3ee88e383fa9ea1ee2b2f3f7611ae5b18c73a71a40ec0d43" - ) - - get_target_property(BOOST_INCLUDE_DIR boost INTERFACE_INCLUDE_DIRECTORIES) diff --git a/development/hhvm/patches/0003-iquote.patch b/development/hhvm/patches/0003-iquote.patch deleted file mode 100644 index e8a42ce09f..0000000000 --- a/development/hhvm/patches/0003-iquote.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/hphp/hack/CMakeLists.txt b/hphp/hack/CMakeLists.txt -index b1aec712dbb..831c46db9e4 100644 ---- a/hphp/hack/CMakeLists.txt -+++ b/hphp/hack/CMakeLists.txt -@@ -293,11 +293,8 @@ function(build_cxx_bridge NAME) - "${NAME}_rust_part" - ${CXX_BRIDGE_LINK_LIBS} - ) -- # `-iquote` is like `-I` (or target_include_directories()`), except: -- # - it takes precedence over `-I` -- # - it only applies to `#include "foo"`, not `#include <foo>` -- target_compile_options("${NAME}" INTERFACE "-iquote" "${RUST_FFI_BUILD_ROOT}") -- target_compile_options("${NAME}" PRIVATE "-iquote" "${GENERATED_CXXBRIDGE}") -+ target_include_directories("${NAME}" INTERFACE "${RUST_FFI_BUILD_ROOT}") -+ target_include_directories("${NAME}" PRIVATE "${GENERATED_CXXBRIDGE}") - endfunction() - - build_cxx_bridge( diff --git a/development/hhvm/slack-desc b/development/hhvm/slack-desc deleted file mode 100644 index 9d6bbdf91e..0000000000 --- a/development/hhvm/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -hhvm: hhvm (a virtual machine designed for executing Hack and PHP) -hhvm: -hhvm: HHVM uses a just-in-time (JIT) compilation approach to achieve -hhvm: superior performance while maintaining the development flexibility -hhvm: that PHP provides. -hhvm: -hhvm: Hack is a programming language for HHVM. -hhvm: -hhvm: -hhvm: Homepage: https://hhvm.com/ -hhvm: diff --git a/development/hipSYCL/hipSYCL.SlackBuild b/development/hipSYCL/hipSYCL.SlackBuild index 4ac3aa5df9..d6b7be1fcc 100644 --- a/development/hipSYCL/hipSYCL.SlackBuild +++ b/development/hipSYCL/hipSYCL.SlackBuild @@ -26,6 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=hipSYCL +SRCNAM=AdaptiveCpp VERSION=${VERSION:-0.9.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,9 +71,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -117,12 +118,12 @@ cd .. # fix for cmake files at wrong place. # Don't found another way to do it let's manually move them -mv $PKG/usr/lib/* $PKG/usr/lib${LIBDIRSUFFIX} - -# fix for the cmake files configured to use /lib/cmake path -sed -i 's#/lib/cmake#/lib'${LIBDIRSUFFIX}'/cmake#g' \ - $PKG/usr/lib${LIBDIRSUFFIX}/cmake/hipSYCL/hipsycl-config.cmake - +if [ -n "$LIBDIRSUFFIX" ] ; then + mv $PKG/usr/lib/* $PKG/usr/lib${LIBDIRSUFFIX} + # fix for the cmake files configured to use /lib/cmake path + sed -i 's#/lib/cmake#/lib'${LIBDIRSUFFIX}'/cmake#g' \ + $PKG/usr/lib${LIBDIRSUFFIX}/cmake/hipSYCL/hipsycl-config.cmake +fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a doc $PKG/usr/doc/$PRGNAM-$VERSION @@ -130,7 +131,6 @@ cp -a doc $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/usr/share/$PRGNAM-$VERSION cp -a examples $PKG/usr/share/$PRGNAM-$VERSION - # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la diff --git a/development/hipSYCL/hipSYCL.info b/development/hipSYCL/hipSYCL.info index d110044bc7..37670cd56f 100644 --- a/development/hipSYCL/hipSYCL.info +++ b/development/hipSYCL/hipSYCL.info @@ -1,8 +1,8 @@ PRGNAM="hipSYCL" VERSION="0.9.3" -HOMEPAGE="https://hipsycl.github.io" -DOWNLOAD="https://github.com/illuhad/hipSYCL/archive/v0.9.3/hipSYCL-0.9.3.tar.gz" -MD5SUM="47ce0e5ba85aec91494e2ea49bc12cf2" +HOMEPAGE="https://adaptivecpp.github.io/" +DOWNLOAD="https://github.com/AdaptiveCpp/AdaptiveCpp/archive/v0.9.3/AdaptiveCpp-0.9.3.tar.gz" +MD5SUM="2e213619c9a0e5761100166beec0a22e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/hugo/hugo.SlackBuild b/development/hugo/hugo.SlackBuild index 10d80c353a..91dfe48183 100644 --- a/development/hugo/hugo.SlackBuild +++ b/development/hugo/hugo.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=hugo -VERSION=${VERSION:-0.125.1} +VERSION=${VERSION:-0.126.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/hugo/hugo.info b/development/hugo/hugo.info index eb6622db67..e1a9401118 100644 --- a/development/hugo/hugo.info +++ b/development/hugo/hugo.info @@ -1,10 +1,10 @@ PRGNAM="hugo" -VERSION="0.125.1" +VERSION="0.126.1" HOMEPAGE="https://gohugo.io" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/gohugoio/hugo/releases/download/v0.125.1/hugo_extended_0.125.1_Linux-64bit.tar.gz" -MD5SUM_x86_64="f5c2d5b367b83da563bcca843d45f9df" +DOWNLOAD_x86_64="https://github.com/gohugoio/hugo/releases/download/v0.126.1/hugo_extended_0.126.1_Linux-64bit.tar.gz" +MD5SUM_x86_64="74d877b58c161e04718a9ab84ded12a1" REQUIRES="" MAINTAINER="Andrew Payne" EMAIL="phalange@komputermatrix.com" diff --git a/development/inform/inform.info b/development/inform/inform.info index 9cccec8441..388a4fe0ce 100644 --- a/development/inform/inform.info +++ b/development/inform/inform.info @@ -8,7 +8,7 @@ DOWNLOAD="https://slackware.uk/~urchlay/src/inform-6.41-r2.tar.gz \ MD5SUM="a38fc48ddf90fe8ac8c7a5c03322fe6e \ 0063968c3378636add1a0697b6d1fc16 \ b2635d3d61313bed286409500fc55bed \ - 5051762b361155ce61ed84924825a7c0" + 93fb0261ac9662a3e7cc2e7ed9469042" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/jdk11/README b/development/jdk11/README index 2b77c7fb6f..cdb6241f70 100644 --- a/development/jdk11/README +++ b/development/jdk11/README @@ -8,15 +8,14 @@ The JDK is a development environment for building applications, applets and components that can be deployed with the Java Platform Standard Edition Runtime Environment. -More details: -https://developer.oracle.com/java/ - This SlackBuild will repackage official Oracle JDK archive. You must accept the Oracle Technology Network License Agreement for Oracle Java SE to download this software -https://www.oracle.com/java/technologies/javase-jdk11-downloads.html +https://www.oracle.com/java/technologies/javase/jdk11-archive-downloads.html After installation you will need to log out from the system and log in back for environment variables get updated. Or just run "source /etc/profile" + +NOTE: This version of JDK is considered End of Life (EOL) diff --git a/development/jdk11/jdk11.SlackBuild b/development/jdk11/jdk11.SlackBuild index 272f86d660..bd17ab104e 100644 --- a/development/jdk11/jdk11.SlackBuild +++ b/development/jdk11/jdk11.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jdk11 -VERSION=${VERSION:-11.0.12} +VERSION=${VERSION:-11.0.22} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -61,8 +58,8 @@ LIBDIRSUFFIX=64 rm -rf $PKG mkdir -p $TMP $OUTPUT $PKG/{install,etc/profile.d,usr/{bin,lib${LIBDIRSUFFIX},doc/$PRGNAM-$VERSION,man/man1}} cd $PKG/usr/lib${LIBDIRSUFFIX} -tar -xvf $CWD/jdk-${VERSION}_linux*.tar.gz -mv $(tar -tf $CWD/jdk-${VERSION}_linux*.tar.gz | head -1 | cut -d/ -f1) $PRGNAM-$VERSION +tar -xvf $CWD/jdk-${VERSION}_linux-x64_bin.tar.gz +mv $(tar -tf $CWD/jdk-${VERSION}_linux-x64_bin.tar.gz | head -1 | cut -d/ -f1) $PRGNAM-$VERSION chown -R root:root $PRGNAM-$VERSION find -L $PRGNAM-$VERSION \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/development/jdk11/jdk11.info b/development/jdk11/jdk11.info index 61610c0225..9eacf2946b 100644 --- a/development/jdk11/jdk11.info +++ b/development/jdk11/jdk11.info @@ -1,10 +1,10 @@ PRGNAM="jdk11" -VERSION="11.0.12" +VERSION="11.0.22" HOMEPAGE="https://developer.oracle.com/java" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/11.0.12+8/f411702ca7704a54a79ead0c2e0942a3/jdk-11.0.12_linux-x64_bin.tar.gz?AuthParam=1630328792_80e3bfc8ea574dfdd3391fd65ea454d3" -MD5SUM_x86_64="ce9d5fecc743ab9f808415132938addb" +DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/11.0.22+9/8662aac2120442c2a89b1ee9c67d7069/jdk-11.0.22_linux-x64_bin.tar.gz" +MD5SUM_x86_64="1d0ca55b8121d35a69a4666ce49c5381" REQUIRES="" MAINTAINER="Igor Alexandrov" EMAIL="igor.alexandrov@outlook.com" diff --git a/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild b/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild index 104abca582..8e69e7f4bf 100644 --- a/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild +++ b/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild @@ -78,16 +78,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix /etc/jupyter path -sed 's|etc|/etc|' -i setup.cfg - -python3 setup.py install --root=$PKG +python -m build --wheel --no-isolation --skip-dependency-check +python -m installer --destdir=$PKG dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # Remove bundled mathjax2; replace with system mathjax2 -PYTHONPATH=$(python3 -c "from sysconfig import get_path; print(get_path('platlib'))") +PYTHONPATH=$(python3 -c "from sysconfig import get_path; print(get_path('purelib'))") rm -r $PKG/$PYTHONPATH/nbclassic/static/components/MathJax ln -sr /usr/share/mathjax2 $PKG/$PYTHONPATH/nbclassic/static/components/MathJax diff --git a/development/jupyter-nbconvert/jupyter-nbconvert.SlackBuild b/development/jupyter-nbconvert/jupyter-nbconvert.SlackBuild index 1704e25847..a9ae5d6c5c 100644 --- a/development/jupyter-nbconvert/jupyter-nbconvert.SlackBuild +++ b/development/jupyter-nbconvert/jupyter-nbconvert.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jupyter-nbconvert -VERSION=${VERSION:-7.16.3} +VERSION=${VERSION:-7.16.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/jupyter-nbconvert/jupyter-nbconvert.info b/development/jupyter-nbconvert/jupyter-nbconvert.info index 11ffff748f..27c49d870a 100644 --- a/development/jupyter-nbconvert/jupyter-nbconvert.info +++ b/development/jupyter-nbconvert/jupyter-nbconvert.info @@ -1,8 +1,8 @@ PRGNAM="jupyter-nbconvert" -VERSION="7.16.3" +VERSION="7.16.4" HOMEPAGE="https://jupyter.org/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nbconvert/nbconvert-7.16.3.tar.gz" -MD5SUM="3598dda22ab9fb316c55fdaa189ee2c7" +DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nbconvert/nbconvert-7.16.4.tar.gz" +MD5SUM="8cdc74f178e14c5f3dfeceda96ef8144" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-bleach python3-defusedxml jupyter-nbclient jupyterlab_pygments python3-mistune pandocfilters testpath BeautifulSoup4 tinycss2 python-importlib_metadata" diff --git a/development/jupyter_server_terminals/jupyter_server_terminals.SlackBuild b/development/jupyter_server_terminals/jupyter_server_terminals.SlackBuild index a3968f8eb1..5dad460068 100644 --- a/development/jupyter_server_terminals/jupyter_server_terminals.SlackBuild +++ b/development/jupyter_server_terminals/jupyter_server_terminals.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jupyter_server_terminals -VERSION=${VERSION:-0.5.0} +VERSION=${VERSION:-0.5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -47,20 +47,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG diff --git a/development/jupyter_server_terminals/jupyter_server_terminals.info b/development/jupyter_server_terminals/jupyter_server_terminals.info index 54ac177fdd..c7455eb88f 100644 --- a/development/jupyter_server_terminals/jupyter_server_terminals.info +++ b/development/jupyter_server_terminals/jupyter_server_terminals.info @@ -1,8 +1,8 @@ PRGNAM="jupyter_server_terminals" -VERSION="0.5.0" +VERSION="0.5.3" HOMEPAGE="https://jupyter.org/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jupyter_server_terminals/jupyter_server_terminals-0.5.0.tar.gz" -MD5SUM="8ae5d501df1900e9c19c61cb10c8bb9a" +DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jupyter_server_terminals/jupyter_server_terminals-0.5.3.tar.gz" +MD5SUM="eaf426639bf39bc218741079d7294abb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="terminado" diff --git a/development/kForth-32/kForth-32.info b/development/kForth-32/kForth-32.info index 3cb0cbc586..0cacea33cb 100644 --- a/development/kForth-32/kForth-32.info +++ b/development/kForth-32/kForth-32.info @@ -3,7 +3,7 @@ VERSION="2.4.3" HOMEPAGE="https://github.com/mynenik/kForth-32" DOWNLOAD="https://github.com/mynenik/kForth-32/archive/refs/tags/v2.4.3/kForth-32-2.4.3.tar.gz" MD5SUM="fe006640fadef2863063728a884f7cb7" -DOWNLOAD_x86_64="" +DOWNLOAD_x86_64="UNSUPPORTED" MD5SUM_x86_64="" REQUIRES="patchutils" MAINTAINER="Antonio Leal" diff --git a/development/kForth-64/kForth-64.info b/development/kForth-64/kForth-64.info index 4cf4f9c7f6..fb8d73297d 100644 --- a/development/kForth-64/kForth-64.info +++ b/development/kForth-64/kForth-64.info @@ -1,10 +1,10 @@ PRGNAM="kForth-64" VERSION="0.4.3" HOMEPAGE="https://github.com/mynenik/kForth-64" -DOWNLOAD="https://github.com/mynenik/kForth-64/archive/refs/tags/v0.4.3/kForth-64-0.4.3.tar.gz" -MD5SUM="44bc386a5ac16dacac44daa04aeba8af" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/mynenik/kForth-64/archive/refs/tags/v0.4.3/kForth-64-0.4.3.tar.gz" +MD5SUM_x86_64="44bc386a5ac16dacac44daa04aeba8af" REQUIRES="patchutils" MAINTAINER="Antonio Leal" EMAIL="antonio.leal@yahoo.com" diff --git a/development/kdiff3/kdiff3.info b/development/kdiff3/kdiff3.info index 49097a1177..847f9d5414 100644 --- a/development/kdiff3/kdiff3.info +++ b/development/kdiff3/kdiff3.info @@ -2,7 +2,7 @@ PRGNAM="kdiff3" VERSION="1.10.7" HOMEPAGE="https://apps.kde.org/kdiff3/" DOWNLOAD="https://download.kde.org/stable/kdiff3/kdiff3-1.10.7.tar.xz" -MD5SUM="2bb2d5e0745e7158a1720ef4dd1d7e40" +MD5SUM="5598064407e2e80f858e03cac8d3ff81" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/kotlin/kotlin.SlackBuild b/development/kotlin/kotlin.SlackBuild index db467e97a6..915aaf90b5 100644 --- a/development/kotlin/kotlin.SlackBuild +++ b/development/kotlin/kotlin.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kotlin SRCNAM=kotlin-compiler -VERSION=${VERSION:-1.9.23} +VERSION=${VERSION:-1.9.24} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/kotlin/kotlin.info b/development/kotlin/kotlin.info index fed61d9990..2d8a913a3f 100644 --- a/development/kotlin/kotlin.info +++ b/development/kotlin/kotlin.info @@ -1,8 +1,8 @@ PRGNAM="kotlin" -VERSION="1.9.23" +VERSION="1.9.24" HOMEPAGE="https://kotlinlang.org/" -DOWNLOAD="https://github.com/JetBrains/kotlin/releases/download/v1.9.23/kotlin-compiler-1.9.23.zip" -MD5SUM="737f1c4de43970cdfda915e311128f49" +DOWNLOAD="https://github.com/JetBrains/kotlin/releases/download/v1.9.24/kotlin-compiler-1.9.24.zip" +MD5SUM="d9d45b3970fa489d5beda3d5eaa8917a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="zulu-openjdk8 setconf" diff --git a/development/liberica-jdk-bin/liberica-jdk-bin.SlackBuild b/development/liberica-jdk-bin/liberica-jdk-bin.SlackBuild index db42532f47..40f05d729e 100644 --- a/development/liberica-jdk-bin/liberica-jdk-bin.SlackBuild +++ b/development/liberica-jdk-bin/liberica-jdk-bin.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=liberica-jdk-bin -VERSION=${VERSION:-21.0.3+10} +VERSION=${VERSION:-21.0.3+12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -67,11 +67,17 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; mkdir -p $PKG/etc/profile.d -for s in $PRGNAM.sh $PRGNAM.csh ; do - sed "s|/usr/lib|/usr/lib$LIBDIRSUFFIX/liberica-$JDKNAM|" $CWD/$s \ - > $PKG/etc/profile.d/$s - chmod 755 $PKG/etc/profile.d/$s -done +cat > $PKG/etc/profile.d/liberica-jdk-bin.csh << EOF +setenv JAVA_HOME /usr/lib${LIBDIRSUFFIX}/liberica-${JDKNAM} +setenv PATH \${PATH}:\${JAVA_HOME}/bin +EOF +cat > $PKG/etc/profile.d/liberica-jdk-bin.sh << EOF +export JAVA_HOME="/usr/lib${LIBDIRSUFFIX}/liberica-${JDKNAM}" +export PATH="\${PATH}:\${JAVA_HOME}/bin" +EOF + +chmod 0755 $PKG/etc/profile.d/liberica-jdk-bin.csh +chmod 0755 $PKG/etc/profile.d/liberica-jdk-bin.sh mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/liberica-jdk-bin/liberica-jdk-bin.csh b/development/liberica-jdk-bin/liberica-jdk-bin.csh deleted file mode 100644 index 19044c534a..0000000000 --- a/development/liberica-jdk-bin/liberica-jdk-bin.csh +++ /dev/null @@ -1,3 +0,0 @@ -setenv JAVA_HOME /usr/lib -setenv PATH ${PATH}:${JAVA_HOME}/bin -setenv MANPATH ${MANPATH}:${JAVA_HOME}/man diff --git a/development/liberica-jdk-bin/liberica-jdk-bin.info b/development/liberica-jdk-bin/liberica-jdk-bin.info index 5bd793fa9c..5e56a96f70 100644 --- a/development/liberica-jdk-bin/liberica-jdk-bin.info +++ b/development/liberica-jdk-bin/liberica-jdk-bin.info @@ -1,10 +1,10 @@ PRGNAM="liberica-jdk-bin" -VERSION="21.0.3+10" +VERSION="21.0.3+12" HOMEPAGE="https://github.com/bell-sw/Liberica" -DOWNLOAD="https://github.com/bell-sw/Liberica/releases/download/21.0.3+10/bellsoft-jdk21.0.3+10-linux-i586.tar.gz" -MD5SUM="301935070a134df1cd3de67d4c1cf506" -DOWNLOAD_x86_64="https://github.com/bell-sw/Liberica/releases/download/21.0.3+10/bellsoft-jdk21.0.3+10-linux-amd64.tar.gz" -MD5SUM_x86_64="2ee909ef18280bac206ed0b8209ae76e" +DOWNLOAD="https://github.com/bell-sw/Liberica/releases/download/21.0.3+12/bellsoft-jdk21.0.3+12-linux-i586.tar.gz" +MD5SUM="5af27da5d63e40fa3a6d19abaa93c0f6" +DOWNLOAD_x86_64="https://github.com/bell-sw/Liberica/releases/download/21.0.3+12/bellsoft-jdk21.0.3+12-linux-amd64.tar.gz" +MD5SUM_x86_64="dc876c90f8e3f30fab51e82fd947d251" REQUIRES="" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org" diff --git a/development/liberica-jdk-bin/liberica-jdk-bin.sh b/development/liberica-jdk-bin/liberica-jdk-bin.sh deleted file mode 100644 index 85556c6edd..0000000000 --- a/development/liberica-jdk-bin/liberica-jdk-bin.sh +++ /dev/null @@ -1,3 +0,0 @@ -export JAVA_HOME=/usr/lib -export PATH="${PATH}:${JAVA_HOME}/bin" -export MANPATH="${MANPATH}:${JAVA_HOME}/man" diff --git a/development/mold/mold.SlackBuild b/development/mold/mold.SlackBuild index c217619c76..cbe6e4223b 100644 --- a/development/mold/mold.SlackBuild +++ b/development/mold/mold.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mold -VERSION=${VERSION:-2.30.0} +VERSION=${VERSION:-2.31.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/mold/mold.info b/development/mold/mold.info index 7d13959d7b..bd11720a95 100644 --- a/development/mold/mold.info +++ b/development/mold/mold.info @@ -1,8 +1,8 @@ PRGNAM="mold" -VERSION="2.30.0" +VERSION="2.31.0" HOMEPAGE="https://github.com/rui314/mold" -DOWNLOAD="https://github.com/rui314/mold/archive/v2.30.0/mold-2.30.0.tar.gz" -MD5SUM="061da806be174abe79d87c3a439f982f" +DOWNLOAD="https://github.com/rui314/mold/archive/v2.31.0/mold-2.31.0.tar.gz" +MD5SUM="fdfcddefc039071f5a7611c051a8f5ea" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/mongodb-compass/mongodb-compass.SlackBuild b/development/mongodb-compass/mongodb-compass.SlackBuild index 5c873ce37c..2ff02c9e75 100644 --- a/development/mongodb-compass/mongodb-compass.SlackBuild +++ b/development/mongodb-compass/mongodb-compass.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mongodb-compass -VERSION=${VERSION:-1.42.5} +VERSION=${VERSION:-1.43.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/mongodb-compass/mongodb-compass.info b/development/mongodb-compass/mongodb-compass.info index 90f25cda2f..094ba74a33 100644 --- a/development/mongodb-compass/mongodb-compass.info +++ b/development/mongodb-compass/mongodb-compass.info @@ -1,10 +1,10 @@ PRGNAM="mongodb-compass" -VERSION="1.42.5" +VERSION="1.43.0" HOMEPAGE="https://www.mongodb.com/products/compass" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://downloads.mongodb.com/compass/mongodb-compass-1.42.5.x86_64.rpm" -MD5SUM_x86_64="fa91dafb9ec7d7e2f4b03d4b017f7687" +DOWNLOAD_x86_64="https://downloads.mongodb.com/compass/mongodb-compass-1.43.0.x86_64.rpm" +MD5SUM_x86_64="cfc514ba727bc235e3251f1a7e5ad3f2" REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/development/mongodb-shell/mongodb-shell.SlackBuild b/development/mongodb-shell/mongodb-shell.SlackBuild index aa40b02031..b84ddfcc0c 100644 --- a/development/mongodb-shell/mongodb-shell.SlackBuild +++ b/development/mongodb-shell/mongodb-shell.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mongodb-shell SRCNAM=mongosh -VERSION=${VERSION:-2.2.1} +VERSION=${VERSION:-2.2.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/mongodb-shell/mongodb-shell.info b/development/mongodb-shell/mongodb-shell.info index c797fc405b..d038dc6f30 100644 --- a/development/mongodb-shell/mongodb-shell.info +++ b/development/mongodb-shell/mongodb-shell.info @@ -1,10 +1,10 @@ PRGNAM="mongodb-shell" -VERSION="2.2.1" +VERSION="2.2.5" HOMEPAGE="https://www.mongodb.com/try/download/shell" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://downloads.mongodb.com/compass/mongosh-2.2.1-linux-x64.tgz" -MD5SUM_x86_64="524de3b897441d652bb8e33015b2b09a" +DOWNLOAD_x86_64="https://downloads.mongodb.com/compass/mongosh-2.2.5-linux-x64.tgz" +MD5SUM_x86_64="c49777d1e51002203e556a57f7d439c4" REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/development/neovim/README b/development/neovim/README index f5294d4ff6..f20d90a7a8 100644 --- a/development/neovim/README +++ b/development/neovim/README @@ -9,5 +9,3 @@ Optional run-time dependencies: * python3-neovim and python2-neovim: for python 3/2 plugin support; * xclip or xsel: for X11 clipboard support; * wl-clipboard: for clipboard support on wayland - -lua, lua-mpack, lua-lpeg, LuaBitOp are needed only at build time. diff --git a/development/neovim/neovim.SlackBuild b/development/neovim/neovim.SlackBuild index 09b6b4a417..2fc53993eb 100644 --- a/development/neovim/neovim.SlackBuild +++ b/development/neovim/neovim.SlackBuild @@ -27,11 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=neovim -VERSION=${VERSION:-0.9.5} -LuaJIT=03c31124cc3b521ef54fe398e10fa55660a5057d -luv="1.45.0-0" -luacompat53="0.9" -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.10.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,12 +74,25 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz mkdir -p $PRGNAM-$VERSION/.deps/build/src cd $PRGNAM-$VERSION/.deps/build/src -tar xvf $CWD/LuaJIT-$LuaJIT.tar.gz -mv LuaJIT-$LuaJIT luajit -tar xvf $CWD/luv-$luv.tar.gz -mv luv-$luv luv -tar xvf $CWD/lua-compat-5.3-$luacompat53.tar.gz -mv lua-compat-5.3-$luacompat53 lua-compat-5.3 +for d in LuaJIT-*.tar.gz luv-*.tar.gz lua-compat-5.3-*.tar.gz \ + tree-sitter-bash-*.tar.gz tree-sitter-c-*.tar.gz \ + tree-sitter-lua-*.tar.gz tree-sitter-markdown-*.tar.gz \ + tree-sitter-python-*.tar.gz tree-sitter-query-*.tar.gz \ + tree-sitter-vimdoc-*.tar.gz tree-sitter-vim-*.tar.gz +do + tar xvf $CWD/$d +done +mv LuaJIT-* luajit +mv luv-* luv +mv lua-compat-5.3-* lua_compat53 +mv tree-sitter-bash-* treesitter_bash +mv tree-sitter-c-* treesitter_c +mv tree-sitter-lua-* treesitter_lua +mv tree-sitter-markdown-* treesitter_markdown +mv tree-sitter-python-* treesitter_python +mv tree-sitter-query-* treesitter_query +mv tree-sitter-vimdoc-* treesitter_vimdoc +mv tree-sitter-vim-* treesitter_vim cd $TMP/$PRGNAM-$VERSION @@ -103,12 +113,11 @@ make \ -DUSE_EXISTING_SRC_DIR=ON \ -DUSE_BUNDLED=OFF \ -DUSE_BUNDLED_LUV=ON \ - -DUSE_BUNDLED_LUAJIT=ON" \ + -DUSE_BUNDLED_LUAJIT=ON \ + -DUSE_BUNDLED_TS_PARSERS=ON" \ CMAKE_BUILD_TYPE=Release make install DESTDIR=$PKG -rmdir $PKG/usr/lib${LIBDIRSUFFIX}/nvim $PKG/usr/lib${LIBDIRSUFFIX} - rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/development/neovim/neovim.info b/development/neovim/neovim.info index cc1632f7d2..6b5ac2b141 100644 --- a/development/neovim/neovim.info +++ b/development/neovim/neovim.info @@ -1,16 +1,32 @@ PRGNAM="neovim" -VERSION="0.9.5" +VERSION="0.10.0" HOMEPAGE="https://neovim.io" -DOWNLOAD="https://github.com/neovim/neovim/archive/v0.9.5/neovim-0.9.5.tar.gz \ - https://github.com/LuaJIT/LuaJIT/archive/03c3112/LuaJIT-03c31124cc3b521ef54fe398e10fa55660a5057d.tar.gz \ - https://github.com/luvit/luv/archive/1.45.0-0/luv-1.45.0-0.tar.gz \ - https://github.com/keplerproject/lua-compat-5.3/archive/v0.9/lua-compat-5.3-0.9.tar.gz" -MD5SUM="106932337799a21cf8d28d488c7fc702 \ - b795ec5d435b01e00d8378ace040c382 \ - dacbb69541c8d30705c5bb138cd204e0 \ - 7c0530123479804e40971b069ea6b0da" +DOWNLOAD="https://github.com/neovim/neovim/archive/v0.10.0/neovim-0.10.0.tar.gz \ + https://github.com/LuaJIT/LuaJIT/archive/75e92777988017fe47c5eb290998021bbf972d1f.tar.gz \ + https://github.com/luvit/luv/archive/1.48.0-2/luv-1.48.0-2.tar.gz \ + https://github.com/lunarmodules/lua-compat-5.3/archive/v0.13/lua-compat-5.3-0.13.tar.gz \ + https://github.com/tree-sitter/tree-sitter-bash/archive/v0.21.0/tree-sitter-bash-0.21.0.tar.gz \ + https://github.com/tree-sitter/tree-sitter-c/archive/v0.21.0/tree-sitter-c-0.21.0.tar.gz \ + https://github.com/tree-sitter-grammars/tree-sitter-lua/archive/v0.1.0/tree-sitter-lua-0.1.0.tar.gz \ + https://github.com/MDeiml/tree-sitter-markdown/archive/v0.2.3/tree-sitter-markdown-0.2.3.tar.gz \ + https://github.com/tree-sitter/tree-sitter-python/archive/v0.21.0/tree-sitter-python-0.21.0.tar.gz \ + https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.3.0/tree-sitter-query-0.3.0.tar.gz \ + https://github.com/neovim/tree-sitter-vimdoc/archive/v2.5.1/tree-sitter-vimdoc-2.5.1.tar.gz \ + https://github.com/neovim/tree-sitter-vim/archive/v0.4.0/tree-sitter-vim-0.4.0.tar.gz" +MD5SUM="b5ad54391b6a1a30930c1ab392d506ec \ + aee865a769321f40b28067c3568e92ef \ + 8efb4574249415a888a4197468529a9b \ + 4b53edbd6222230a50f58ca8f9a98d18 \ + 3afd19bcf08cfbc16a8d0ab8d6b59967 \ + 88647250b19636fe4d1a99456674d69a \ + 14eff66b003bb77623f111fe3528f224 \ + b6ea171a2c434992d9ddb965361513c2 \ + 229538336d4d052c301ea63cd33c8486 \ + f50c1885b101d392b106dac75bb0536e \ + 74b91692ada89a1e5904bc4d5f60943f \ + 8f3d1c3319673e20b83da6c23962dc45" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="lua-mpack lua-lpeg LuaBitOp msgpack-c-c libtermkey libvterm tree-sitter" +REQUIRES="lua-lpeg msgpack-c-c libtermkey libvterm tree-sitter" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org" diff --git a/development/nodejs/README b/development/nodejs/README deleted file mode 100644 index 19aa105720..0000000000 --- a/development/nodejs/README +++ /dev/null @@ -1,8 +0,0 @@ -Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. - -Node.js uses an event-driven, non-blocking I/O model that makes it -lightweight and efficient. Node.js' package ecosystem, npm, is the -largest ecosystem of open source libraries in the world. - -NOTE: This version uses an internal OpenSSL version instead of -the one provided in Slackware package. diff --git a/development/nodejs/nodejs.SlackBuild b/development/nodejs/nodejs.SlackBuild deleted file mode 100644 index ae3f7134e5..0000000000 --- a/development/nodejs/nodejs.SlackBuild +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# Slackware build script for nodejs -# Thanks to Audrius Kažukauskas - -# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org -# Willy Sudiarto Raharjo <willysr@slackbuilds.org> - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version, with the following exception: -# the text of the GPL license may be omitted. - -# This program is distributed in the hope that it will be useful, but -# without any warranty; without even the implied warranty of -# merchantability or fitness for a particular purpose. Compiling, -# interpreting, executing or merely reading the text of the program -# may result in lapses of consciousness and/or very being, up to and -# including the end of all existence and the Universe as we know it. -# See the GNU General Public License for more details. - -# You may have received a copy of the GNU General Public License -# along with this program (most likely, a file named COPYING). If -# not, see <https://www.gnu.org/licenses/>. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=nodejs -SRCNAM=node -VERSION=${VERSION:-20.12.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-v$VERSION -tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz -cd $SRCNAM-v$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -## Fix man page path. -sed -i 's|share/||' tools/install.py - -## Fix libdir for 64-bit. -sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py -sed -i "s/'lib'/'lib${LIBDIRSUFFIX}'/" \ - lib/module.js \ - lib/internal/modules/cjs/loader.js \ - deps/npm/lib/npm.js - -sed -i "s|math.h|cmath|" src/node_crypto.cc -./configure \ - --prefix=/usr \ - --shared-zlib \ - --shared-openssl \ - --ninja - -make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -## Add bash completion file for npm. -install -D -m 644 $CWD/npm.sh $PKG/usr/share/bash-completion/completions/npm - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/nodejs/nodejs.info b/development/nodejs/nodejs.info deleted file mode 100644 index bb0150cf94..0000000000 --- a/development/nodejs/nodejs.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nodejs" -VERSION="20.12.2" -HOMEPAGE="https://nodejs.org/" -DOWNLOAD="https://nodejs.org/dist/v20.12.2/node-v20.12.2.tar.gz" -MD5SUM="4b68baf3c2938a30a89603d24104e434" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/development/nodejs/npm.sh b/development/nodejs/npm.sh deleted file mode 100644 index 25bef2c17b..0000000000 --- a/development/nodejs/npm.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -###-begin-npm-completion-### -# -# npm command completion script -# -# Installation: npm completion >> ~/.bashrc (or ~/.zshrc) -# Or, maybe: npm completion > /usr/local/etc/bash_completion.d/npm -# - -if type complete &>/dev/null; then - _npm_completion () { - local words cword - if type _get_comp_words_by_ref &>/dev/null; then - _get_comp_words_by_ref -n = -n @ -w words -i cword - else - cword="$COMP_CWORD" - words=("${COMP_WORDS[@]}") - fi - - local si="$IFS" - IFS=$'\n' COMPREPLY=($(COMP_CWORD="$cword" \ - COMP_LINE="$COMP_LINE" \ - COMP_POINT="$COMP_POINT" \ - npm completion -- "${words[@]}" \ - 2>/dev/null)) || return $? - IFS="$si" - } - complete -o default -F _npm_completion npm -elif type compdef &>/dev/null; then - _npm_completion() { - local si=$IFS - compadd -- $(COMP_CWORD=$((CURRENT-1)) \ - COMP_LINE=$BUFFER \ - COMP_POINT=0 \ - npm completion -- "${words[@]}" \ - 2>/dev/null) - IFS=$si - } - compdef _npm_completion npm -elif type compctl &>/dev/null; then - _npm_completion () { - local cword line point words si - read -Ac words - read -cn cword - let cword-=1 - read -l line - read -ln point - si="$IFS" - IFS=$'\n' reply=($(COMP_CWORD="$cword" \ - COMP_LINE="$line" \ - COMP_POINT="$point" \ - npm completion -- "${words[@]}" \ - 2>/dev/null)) || return $? - IFS="$si" - } - compctl -K _npm_completion npm -fi -###-end-npm-completion-### diff --git a/development/oneTBB/includes.patch b/development/oneTBB/includes.patch new file mode 100644 index 0000000000..4e83198618 --- /dev/null +++ b/development/oneTBB/includes.patch @@ -0,0 +1,10 @@ +--- oneTBB-2021.6.0.orig/test/common/utils_assert.h 2023-07-24 20:21:49.362670251 +0900 ++++ oneTBB-2021.6.0/test/common/utils_assert.h 2023-07-24 20:22:27.350547548 +0900 +@@ -19,6 +19,7 @@ + + #include "config.h" + #include "utils_report.h" ++#include <cstdlib> + + #define REPORT_FATAL_ERROR REPORT + diff --git a/development/oneTBB/oneTBB.SlackBuild b/development/oneTBB/oneTBB.SlackBuild index 6194ca9225..6288ed11c3 100644 --- a/development/oneTBB/oneTBB.SlackBuild +++ b/development/oneTBB/oneTBB.SlackBuild @@ -77,14 +77,20 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Missing include +patch -p1 < $CWD/includes.patch +# Remove unused variables (upstream 17b7834, 274f68e) +patch -p1 < $CWD/unused.patch # enable Python if [ "${PYTHON:-no}" == "yes" ];then - OPTS="-DTBB4PY_BUILD" + OPTS="-DTBB4PY_BUILD=ON" fi mkdir -p build cd build +CC=/usr/bin/clang \ +CXX=/usr/bin/clang++ \ cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ diff --git a/development/oneTBB/unused.patch b/development/oneTBB/unused.patch new file mode 100644 index 0000000000..92ab7dd1be --- /dev/null +++ b/development/oneTBB/unused.patch @@ -0,0 +1,39 @@ +--- oneTBB-2021.6.0.orig/test/conformance/conformance_flowgraph.h 2023-12-17 14:34:12.234366082 +0900 ++++ oneTBB-2021.6.0/test/conformance/conformance_flowgraph.h 2023-12-17 15:27:02.512416476 +0900 +@@ -79,8 +79,9 @@ + template<typename V> + typename std::enable_if<!std::is_default_constructible<V>::value, std::vector<V>>::type get_values( test_push_receiver<V>& rr ) { + std::vector<V> messages; +- int val = 0; +- for(V tmp(0); rr.try_get(tmp); ++val) { ++ V tmp(0); ++ ++ while (rr.try_get(tmp)) { + messages.push_back(tmp); + } + return messages; +@@ -89,8 +90,9 @@ + template<typename V> + typename std::enable_if<std::is_default_constructible<V>::value, std::vector<V>>::type get_values( test_push_receiver<V>& rr ) { + std::vector<V> messages; +- int val = 0; +- for(V tmp; rr.try_get(tmp); ++val) { ++ V tmp; ++ ++ while (rr.try_get(tmp)) { + messages.push_back(tmp); + } + return messages; +--- oneTBB-2021.6.0.orig/test/conformance/conformance_join_node.cpp 2023-12-17 14:34:12.235366077 +0900 ++++ oneTBB-2021.6.0/test/conformance/conformance_join_node.cpp 2023-12-17 15:45:20.864114506 +0900 +@@ -28,8 +28,8 @@ + + std::vector<my_input_tuple> get_values( conformance::test_push_receiver<my_input_tuple>& rr ) { + std::vector<my_input_tuple> messages; +- int val = 0; +- for(my_input_tuple tmp(0, 0.f, input_msg(0)); rr.try_get(tmp); ++val) { ++ my_input_tuple tmp(0, 0.f, input_msg(0)); ++ while(rr.try_get(tmp)) { + messages.push_back(tmp); + } + return messages; diff --git a/development/openjdk7/openjdk7.info b/development/openjdk7/openjdk7.info index 1b5049b35b..92fc606bda 100644 --- a/development/openjdk7/openjdk7.info +++ b/development/openjdk7/openjdk7.info @@ -1,7 +1,9 @@ PRGNAM="openjdk7" VERSION="7u321" HOMEPAGE="https://openjdk.java.net" -DOWNLOAD="https://icedtea.classpath.org/download/source/icedtea-2.6.28.tar.xz \ +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://icedtea.classpath.org/download/source/icedtea-2.6.28.tar.xz \ https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/openjdk.tar.bz2 \ https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/corba.tar.bz2 \ https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/jaxp.tar.bz2 \ @@ -10,7 +12,7 @@ DOWNLOAD="https://icedtea.classpath.org/download/source/icedtea-2.6.28.tar.xz \ https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/langtools.tar.bz2 \ https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/hotspot.tar.bz2 \ https://archive.apache.org/dist/ant/binaries/apache-ant-1.9.16-bin.tar.bz2" -MD5SUM="11663b88a06f3461607c026510dd733a \ +MD5SUM_x86_64="11663b88a06f3461607c026510dd733a \ bcd48aa756a108cb437f07ed291436f9 \ 5c16e53e461cf640842cec44f9a6264a \ 9fe804632cfd4a47423a58a0171bc420 \ @@ -19,8 +21,6 @@ MD5SUM="11663b88a06f3461607c026510dd733a \ ebbc311a2aa8afdf1dd4e3d2b7f55aba \ c168159cc98db90a5d14b077e2c49ae9 \ 2a1ef0230e673b6da876a8fc9744b9a1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" REQUIRES="gcc5" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/development/openjdk8/README b/development/openjdk8/README index 3139fca714..148f6beaa4 100644 --- a/development/openjdk8/README +++ b/development/openjdk8/README @@ -7,9 +7,6 @@ that you have already installed as they may cause conflicts with the PATH, JAVA_HOME and MANPATH variables (this includes the 'openjdk7' dependency package -- you may wish to remove it after you're done.) -On 32-bit slackware you will need 'zulu-openjdk7' as dependency instead -of 'openjdk7'. You can use the former on 64-bit slackware too. - If you already have 'openjdk8' on your system (and are compiling a newer version, for example) you won't need any dependencies at all. diff --git a/development/openjdk8/openjdk8.info b/development/openjdk8/openjdk8.info index ee0977437d..2f8bfddcf8 100644 --- a/development/openjdk8/openjdk8.info +++ b/development/openjdk8/openjdk8.info @@ -1,12 +1,12 @@ PRGNAM="openjdk8" VERSION="8u392" HOMEPAGE="https://openjdk.java.net" -DOWNLOAD="https://icedtea.classpath.org/download/source/icedtea-3.29.0.tar.xz \ +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://icedtea.classpath.org/download/source/icedtea-3.29.0.tar.xz \ https://icedtea.classpath.org/download/drops/icedtea8/3.29.0/openjdk-git.tar.xz" -MD5SUM="2f4cdbee15aa0832b9f5bec2ea27289d\ +MD5SUM_x86_64="2f4cdbee15aa0832b9f5bec2ea27289d\ 3b34d935beaca314c974fea3089916d3" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" REQUIRES="openjdk7" MAINTAINER="Strahil Yordanov" EMAIL="strahilski@yahoo.com" diff --git a/development/pahole/README b/development/pahole/README deleted file mode 100644 index 364ff6ed67..0000000000 --- a/development/pahole/README +++ /dev/null @@ -1,2 +0,0 @@ -pahole shows data structure layouts encoded in debugging information -formats, DWARF and CTF being supported. diff --git a/development/pahole/pahole.SlackBuild b/development/pahole/pahole.SlackBuild deleted file mode 100644 index f5c2d97305..0000000000 --- a/development/pahole/pahole.SlackBuild +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/bash - -# Slackware build script for pahole - -# Copyright 2019-2023 xaizek <xaizek@posteo.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=pahole -VERSION=${VERSION:-1.26} -LIBBPF_VER="${LIBBPF_VER:-6597330c45d185381900037f0130712cd326ae59}" -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -rm -rf libbpf-$LIBBPF_VER -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z -tar xvf $CWD/libbpf-$LIBBPF_VER.tar.?z -rmdir $PRGNAM-$VERSION/lib/bpf -mv libbpf-$LIBBPF_VER $PRGNAM-$VERSION/lib/bpf -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# -DDW_LANG_Haskell is a workaround for macro rename in /usr/include/dwarf.h -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -DDW_LANG_Haskell=DW_LANG_Haskel" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -D__LIB="lib${LIBDIRSUFFIX}" \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mv $PKG/usr/share/man $PKG/usr/man - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -# README.ctracer seems to be the only useful README -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING NEWS README.ctracer \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/pahole/pahole.info b/development/pahole/pahole.info deleted file mode 100644 index b6abdb4d7a..0000000000 --- a/development/pahole/pahole.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="pahole" -VERSION="1.26" -HOMEPAGE="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/" -DOWNLOAD="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-1.26.tar.gz \ - https://github.com/libbpf/libbpf/archive/6597330c45d185381900037f0130712cd326ae59/libbpf-6597330c45d185381900037f0130712cd326ae59.tar.gz" -MD5SUM="03aac9eef5b52c5dde4dddb679616f12 \ - 85b09e49a18f70056886ab13487231fb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="xaizek" -EMAIL="xaizek@posteo.net" diff --git a/development/pahole/slack-desc b/development/pahole/slack-desc deleted file mode 100644 index 26f5300a20..0000000000 --- a/development/pahole/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pahole: pahole (shows and manipulates program's data structure layout) -pahole: -pahole: pahole shows data structure layouts encoded in debugging information -pahole: formats, DWARF and CTF being supported. -pahole: -pahole: This is useful for, among other things: optimizing important data -pahole: structures by reducing their size, figuring out what is the field -pahole: sitting at an offset from the start of a data structure, investigating -pahole: ABI changes and more generally understanding a new codebase you have -pahole: to work with. -pahole: diff --git a/development/php82/php82.SlackBuild b/development/php82/php82.SlackBuild index 91d979cd03..99b38a8960 100644 --- a/development/php82/php82.SlackBuild +++ b/development/php82/php82.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=php82 -VERSION=${VERSION:-8.2.18} +VERSION=${VERSION:-8.2.19} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/php82/php82.info b/development/php82/php82.info index dffebf29a8..8226919538 100644 --- a/development/php82/php82.info +++ b/development/php82/php82.info @@ -1,8 +1,8 @@ PRGNAM="php82" -VERSION="8.2.18" +VERSION="8.2.19" HOMEPAGE="https://www.php.net/" -DOWNLOAD="https://www.php.net/distributions/php-8.2.18.tar.xz" -MD5SUM="dc3afc0addb388cf9caf380488b6a689" +DOWNLOAD="https://www.php.net/distributions/php-8.2.19.tar.xz" +MD5SUM="97f3cc144fd6937cf44fbec5810eafe9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="postgresql" diff --git a/development/poedit/poedit.SlackBuild b/development/poedit/poedit.SlackBuild index 70c36d1907..684cc10a7a 100644 --- a/development/poedit/poedit.SlackBuild +++ b/development/poedit/poedit.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=poedit -VERSION=${VERSION:-3.4.2} +VERSION=${VERSION:-3.4.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/poedit/poedit.info b/development/poedit/poedit.info index ffc8994144..bb4254c3d5 100644 --- a/development/poedit/poedit.info +++ b/development/poedit/poedit.info @@ -1,8 +1,8 @@ PRGNAM="poedit" -VERSION="3.4.2" +VERSION="3.4.4" HOMEPAGE="https://www.poedit.net" -DOWNLOAD="https://github.com/vslavik/poedit/releases/download/v3.4.2-oss/poedit-3.4.2.tar.gz" -MD5SUM="511d05b0d5fff3ec6c254f7e76906446" +DOWNLOAD="https://github.com/vslavik/poedit/releases/download/v3.4.4-oss/poedit-3.4.4.tar.gz" +MD5SUM="3461a4ce906007a971ed204297871395" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxGTK3 LucenePlusPlus gtkspell3 webkit2gtk" diff --git a/development/postman/postman.SlackBuild b/development/postman/postman.SlackBuild index 6028f10d9b..264995e411 100644 --- a/development/postman/postman.SlackBuild +++ b/development/postman/postman.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=postman SRCDIR=Postman SRCNAM=linux -VERSION=${VERSION:-10.24.16} +VERSION=${VERSION:-11.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/postman/postman.info b/development/postman/postman.info index 05c011c7f7..51eea0e96a 100644 --- a/development/postman/postman.info +++ b/development/postman/postman.info @@ -1,10 +1,10 @@ PRGNAM="postman" -VERSION="10.24.16" +VERSION="11.1.0" HOMEPAGE="https://www.getpostman.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://dl.pstmn.io/download/version/10.24.16/linux64" -MD5SUM_x86_64="75fc2abf7e2115e05567f61145c49600" +DOWNLOAD_x86_64="https://dl.pstmn.io/download/version/11.1.0/linux64" +MD5SUM_x86_64="3203464c404b0daebba2f3792e2097e0" REQUIRES="" MAINTAINER="Ebben Aries" EMAIL="slackbuilds@dscp.org" diff --git a/development/pre-commit/pre-commit.SlackBuild b/development/pre-commit/pre-commit.SlackBuild index 9917f4c346..ed63930914 100644 --- a/development/pre-commit/pre-commit.SlackBuild +++ b/development/pre-commit/pre-commit.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pre-commit -VERSION=${VERSION:-3.7.0} +VERSION=${VERSION:-3.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/pre-commit/pre-commit.info b/development/pre-commit/pre-commit.info index 2fcdd09518..3ae97a85c7 100644 --- a/development/pre-commit/pre-commit.info +++ b/development/pre-commit/pre-commit.info @@ -1,8 +1,8 @@ PRGNAM="pre-commit" -VERSION="3.7.0" +VERSION="3.7.1" HOMEPAGE="https://pre-commit.com/" -DOWNLOAD="https://github.com/pre-commit/pre-commit/archive/v3.7.0/pre-commit-3.7.0.tar.gz" -MD5SUM="c79e85a9be40284c9b952ac6e6914d9d" +DOWNLOAD="https://github.com/pre-commit/pre-commit/archive/v3.7.1/pre-commit-3.7.1.tar.gz" +MD5SUM="71ac1bb00f99df0d7cab46f75df7034e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-cfgv python3-identify python3-virtualenv nodeenv" diff --git a/development/protobuf3/README b/development/protobuf3/README deleted file mode 100644 index c0fe34acc0..0000000000 --- a/development/protobuf3/README +++ /dev/null @@ -1,27 +0,0 @@ -protobuf3 (Google's data interchange format) - -Protocol buffers are a flexible, efficient, automated mechanism for -serializing structured data. - -This package contains protobuf API version 3. -It support the following language implementations: -* C++ -* Java -* Python -* Objective-C -* C# -* JavaNano -* JavaScript -* Ruby -* Go -* PHP (Alpha) - -The complete documentation for Protocol Buffers is available at: -https://developers.google.com/protocol-buffers/ - -Notes: -* The protobuf build (API version 2) has been removed from - SlackBuilds.org, because nothing uses it any longer and it - conflicted with this build. -* Protobuf3 enforces strict UTF-8 checking. - Parsing will fail if a string field contains non UTF-8 data. diff --git a/development/protobuf3/protobuf3.info b/development/protobuf3/protobuf3.info deleted file mode 100644 index c104c6b26b..0000000000 --- a/development/protobuf3/protobuf3.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="protobuf3" -VERSION="26.1" -HOMEPAGE="https://github.com/google/protobuf" -DOWNLOAD="https://github.com/google/protobuf/archive/v26.1/protobuf-26.1.tar.gz \ -https://files.pythonhosted.org/packages/d2/e5/7e22ca7201a6b1040aae7787d0fe6cd970311da376a86fdafa5182be1d1b/protobuf-5.26.1.tar.gz" -MD5SUM="6ad6edec05fd08477a442db77dbebf98 \ -8360a781926b9dac954678a823835d23" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="abseil-cpp python3-build python3-wheel" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/development/protobuf3/soversion.patch b/development/protobuf3/soversion.patch deleted file mode 100644 index 7e1b42de12..0000000000 --- a/development/protobuf3/soversion.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake -index 9b1de677b4f..276c99c489e 100644 ---- a/cmake/libprotobuf-lite.cmake -+++ b/cmake/libprotobuf-lite.cmake -@@ -30,6 +30,7 @@ if(protobuf_BUILD_SHARED_LIBS) - endif() - set_target_properties(libprotobuf-lite PROPERTIES - VERSION ${protobuf_VERSION} -+ SOVERSION ${protobuf_VERSION_MINOR} - OUTPUT_NAME ${LIB_PREFIX}protobuf-lite - DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") - add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite) -diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake -index aa3efc9a68a..0f34d20b97d 100644 ---- a/cmake/libprotobuf.cmake -+++ b/cmake/libprotobuf.cmake -@@ -33,6 +33,7 @@ if(protobuf_BUILD_SHARED_LIBS) - endif() - set_target_properties(libprotobuf PROPERTIES - VERSION ${protobuf_VERSION} -+ SOVERSION ${protobuf_VERSION_MINOR} - OUTPUT_NAME ${LIB_PREFIX}protobuf - DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") - add_library(protobuf::libprotobuf ALIAS libprotobuf) -diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake -index 72b4a1abb92..91e8bbeb04e 100644 ---- a/cmake/libprotoc.cmake -+++ b/cmake/libprotoc.cmake -@@ -24,6 +24,7 @@ endif() - set_target_properties(libprotoc PROPERTIES - COMPILE_DEFINITIONS LIBPROTOC_EXPORTS - VERSION ${protobuf_VERSION} -+ SOVERSION ${protobuf_VERSION_MINOR} - OUTPUT_NAME ${LIB_PREFIX}protoc - DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") - add_library(protobuf::libprotoc ALIAS libprotoc) diff --git a/development/protoc-gen-go/protoc-gen-go.SlackBuild b/development/protoc-gen-go/protoc-gen-go.SlackBuild index b8fa624af9..85333b7b8e 100644 --- a/development/protoc-gen-go/protoc-gen-go.SlackBuild +++ b/development/protoc-gen-go/protoc-gen-go.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=protoc-gen-go -VERSION=${VERSION:-1.33.0} +VERSION=${VERSION:-1.34.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/protoc-gen-go/protoc-gen-go.info b/development/protoc-gen-go/protoc-gen-go.info index 2d99015626..e6c6724805 100644 --- a/development/protoc-gen-go/protoc-gen-go.info +++ b/development/protoc-gen-go/protoc-gen-go.info @@ -1,8 +1,8 @@ PRGNAM="protoc-gen-go" -VERSION="1.33.0" +VERSION="1.34.1" HOMEPAGE="https://github.com/protocolbuffers/protobuf-go" -DOWNLOAD="https://github.com/protocolbuffers/protobuf-go/archive/v1.33.0/protobuf-go-1.33.0.tar.gz" -MD5SUM="7de0737359c575dcaa2c58cbc27cf93e" +DOWNLOAD="https://github.com/protocolbuffers/protobuf-go/archive/v1.34.1/protobuf-go-1.34.1.tar.gz" +MD5SUM="f9d0f7962aa60baba76f640e65250fe0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="google-go-lang" diff --git a/development/pycharm/pycharm.SlackBuild b/development/pycharm/pycharm.SlackBuild index d73da05139..c9cf006940 100644 --- a/development/pycharm/pycharm.SlackBuild +++ b/development/pycharm/pycharm.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pycharm EDITION=community -VERSION=${VERSION:-2024.1.241.14494.241} -SRCVER=$( echo $VERSION | cut -c1-6 ) +VERSION=${VERSION:-2024.1.1.241.15989.155} +SRCVER=$( echo $VERSION | cut -c1-8 ) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/pycharm/pycharm.info b/development/pycharm/pycharm.info index 051e66c6d9..c2038e09c1 100644 --- a/development/pycharm/pycharm.info +++ b/development/pycharm/pycharm.info @@ -1,8 +1,8 @@ PRGNAM="pycharm" -VERSION="2024.1.241.14494.241" +VERSION="2024.1.1.241.15989.155" HOMEPAGE="https://www.jetbrains.com/pycharm/" -DOWNLOAD="https://download.jetbrains.com/python/pycharm-community-2024.1.tar.gz" -MD5SUM="ecebc5c639e802745cb53209315c7188" +DOWNLOAD="https://download.jetbrains.com/python/pycharm-community-2024.1.1.tar.gz" +MD5SUM="ca87d11b635a42b5442f4903ca1b546f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/pyenchant/pyenchant.SlackBuild b/development/pyenchant/pyenchant.SlackBuild index dba3f6aead..d606436235 100644 --- a/development/pyenchant/pyenchant.SlackBuild +++ b/development/pyenchant/pyenchant.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for pyenchant # Written by vvoody <ydoovv@gmail.com> -# Copyright 2016-2017 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2016-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pyenchant -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-3.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -63,15 +63,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -# 20220215 bkw: our library is called libenchant-2.so, which setup.py -# isn't expecting. -sed -i '/find_library/s,"enchant","enchant-2",' enchant/_enchant.py - -python setup.py install --root=$PKG python3 setup.py install --root=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.txt README.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/development/pyenchant/pyenchant.info b/development/pyenchant/pyenchant.info index 013b0571d5..7af71555e3 100644 --- a/development/pyenchant/pyenchant.info +++ b/development/pyenchant/pyenchant.info @@ -1,8 +1,8 @@ PRGNAM="pyenchant" -VERSION="2.0.0" +VERSION="3.2.2" HOMEPAGE="https://github.com/rfk/pyenchant" -DOWNLOAD="https://pypi.python.org/packages/9e/54/04d88a59efa33fefb88133ceb638cdf754319030c28aadc5a379d82140ed/pyenchant-2.0.0.tar.gz" -MD5SUM="c224ea53e119b04116d5301e5027051c" +DOWNLOAD="https://files.pythonhosted.org/packages/b1/a3/86763b6350727ca81c8fcc5bb5bccee416e902e0085dc7a902c81233717e/pyenchant-3.2.2.tar.gz" +MD5SUM="15d45b7517c80cfa5d9fa636a88e0bf9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/pylint/pylint.SlackBuild b/development/pylint/pylint.SlackBuild index 8469fde965..36003d6637 100644 --- a/development/pylint/pylint.SlackBuild +++ b/development/pylint/pylint.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pylint VERSION=${VERSION:-1.7.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,6 +71,11 @@ find -L . \ python setup.py install --root=$PKG +# Rename executables to avoid conflicts with Python 3 version of pylint. +for executable in pylint epylint pyreverse symilar; do + mv $PKG/usr/bin/${executable}{,2} +done + mkdir -p ${PKG}/usr/doc/$PRGNAM-$VERSION rm -rf ${PKG}/usr/share diff --git a/development/pyvim/pyvim.SlackBuild b/development/pyvim/pyvim.SlackBuild index c9ae80e276..71261bfc9c 100644 --- a/development/pyvim/pyvim.SlackBuild +++ b/development/pyvim/pyvim.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pyvim -# Copyright 2015-2019 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2015-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pyvim -VERSION=${VERSION:-2.0.24} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.0.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,7 +79,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/development/pyvim/pyvim.info b/development/pyvim/pyvim.info index 0b462b6643..5805a90522 100644 --- a/development/pyvim/pyvim.info +++ b/development/pyvim/pyvim.info @@ -1,10 +1,10 @@ PRGNAM="pyvim" -VERSION="2.0.24" +VERSION="3.0.3" HOMEPAGE="https://github.com/jonathanslenders/pyvim" -DOWNLOAD="https://files.pythonhosted.org/packages/6e/85/47543120e478ddc5d31e447a7fed1fe4ac81cbb066ca623a2cc54f685dff/pyvim-2.0.24.tar.gz" -MD5SUM="6636d321f77c0c1b5eb9f547cf8d77e8" +DOWNLOAD="https://files.pythonhosted.org/packages/c3/31/04e144ec3a3a0303e3ef1ef9c6c1ec8a3b5ba9e88b98d21442d9152783c1/pyvim-3.0.3.tar.gz" +MD5SUM="eb7aec8e3c2b6e7b260366a6118493c0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="prompt_toolkit pyflakes python2-docopt" +REQUIRES="python3-prompt_toolkit python3-pyflakes python3-docopt" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/development/qb64pe/qb64pe-launcher b/development/qb64pe/qb64pe-launcher index 8729180619..b777e78547 100644 --- a/development/qb64pe/qb64pe-launcher +++ b/development/qb64pe/qb64pe-launcher @@ -1,6 +1,6 @@ #!/bin/sh -VERSION=3.12.0 +VERSION=3.13.0 DEST="$HOME/.config/qb64pe-$VERSION" if [ ! -d $DEST ] then diff --git a/development/qb64pe/qb64pe.SlackBuild b/development/qb64pe/qb64pe.SlackBuild index 4beaac60e4..a2ca32c19b 100644 --- a/development/qb64pe/qb64pe.SlackBuild +++ b/development/qb64pe/qb64pe.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for qb64pe (from qb64phoenix.com) -# Copyright 2024 Antonio Leal, Porto Salvo, Oeiras, Portugal +# Copyright 2023-2024 Antonio Leal, Porto Salvo, Oeiras, Portugal # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qb64pe -VERSION=${VERSION:-3.12.0} +VERSION=${VERSION:-3.13.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/qb64pe/qb64pe.info b/development/qb64pe/qb64pe.info index e0e7fe2c1a..ff376005e2 100644 --- a/development/qb64pe/qb64pe.info +++ b/development/qb64pe/qb64pe.info @@ -1,8 +1,8 @@ PRGNAM="qb64pe" -VERSION="3.12.0" +VERSION="3.13.0" HOMEPAGE="https://qb64phoenix.com/" -DOWNLOAD="https://github.com/QB64-Phoenix-Edition/QB64pe/archive/v3.12.0/QB64pe-3.12.0.tar.gz" -MD5SUM="f5e43d15462c169e619bc78d05d004a9" +DOWNLOAD="https://github.com/QB64-Phoenix-Edition/QB64pe/archive/v3.13.0/QB64pe-3.13.0.tar.gz" +MD5SUM="a4420fdf99ef1b4139103ac7390e149c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/regina-rexx/regina-rexx.SlackBuild b/development/regina-rexx/regina-rexx.SlackBuild index 4b2ecbf6c6..812d5e24f3 100644 --- a/development/regina-rexx/regina-rexx.SlackBuild +++ b/development/regina-rexx/regina-rexx.SlackBuild @@ -6,7 +6,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=regina-rexx -VERSION=${VERSION:-3.9.5} +VERSION=${VERSION:-3.9.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/regina-rexx/regina-rexx.info b/development/regina-rexx/regina-rexx.info index 410cbbbbf6..0dbe52f7d9 100644 --- a/development/regina-rexx/regina-rexx.info +++ b/development/regina-rexx/regina-rexx.info @@ -1,8 +1,8 @@ PRGNAM="regina-rexx" -VERSION="3.9.5" -HOMEPAGE="http://regina-rexx.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/regina-rexx/regina-rexx-3.9.5.tar.gz" -MD5SUM="cf87ed347677f751ecce14d751f03291" +VERSION="3.9.6" +HOMEPAGE="https://regina-rexx.sourceforge.net/" +DOWNLOAD="https://downloads.sourceforge.net/regina-rexx/regina-rexx-3.9.6.tar.gz" +MD5SUM="2fe487af607dadc3815b246bce7fa08d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/rust16/README b/development/rust16/README deleted file mode 100644 index 97cfbe0b15..0000000000 --- a/development/rust16/README +++ /dev/null @@ -1,21 +0,0 @@ -rust16 installs a limited set of Rust stable binaries to /opt/rust16. -This is to allow Rust-based SlackBuilds to build more recent versions -than would be possible with system Rust. - -To use the rust16 binaries in a SlackBuild, make the following export -statements: - -export PATH="/opt/rust16/bin:$PATH" -if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" -else - export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" -fi - -If your SlackBuild experiences build failures on 64-bit systems, please -ensure that the LIBDIRSUFFIX variable is set. - -rust16 is not intended as a substitute for rustup or for the Slackware -Rust package in terms of Rust development purposes. - -Separate downloads are available for i686 and x86_64. diff --git a/development/rust16/rust16.SlackBuild b/development/rust16/rust16.SlackBuild deleted file mode 100644 index 1029773a03..0000000000 --- a/development/rust16/rust16.SlackBuild +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/bash - -# Slackware build script for rust16 - -# Copyright 2023-2024 K. Eugene Carlson Tsukuba, Japan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=rust16 -SRCNAM=rust -VERSION=${VERSION:-1.76.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac - - if [ "$ARCH" = "i586" ]; then - if rustc -Vv | grep host | grep -q i686; then - ARCH=i686 - fi - fi -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -if [ "$ARCH" = "arm" ]; then - TRIPLET="$ARCH-unknown-linux-gnueabihf" -else - TRIPLET="$ARCH-unknown-linux-gnu" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION-$TRIPLET -tar xvf $CWD/$SRCNAM-$VERSION-$TRIPLET.tar.gz -cd $SRCNAM-$VERSION-$TRIPLET -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -./install.sh \ - --destdir=$PKG \ - --prefix="opt/rust16" \ - --disable-ldconfig \ - --without=rust-docs-json-preview,\ -rust-docs,\ -clippy-preview,\ -rls-preview,\ -llvm-tools-preview,\ -rust-analysis-$TRIPLET,\ -rust-analyzer-preview,\ -rust-demangler-preview,\ -rustfmt-preview - -find $PKG/opt/$PRGNAM/lib -type f -name "*.so" -exec chmod +x {} \; 2> /dev/null || true -# As of 1.76.0, stripping the libraries causes memory faults on Slackware64-15.0. -if [ $ARCH = "x86_64" ]; then - find $PKG -print0 | xargs -0 file | grep "executable" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -else - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -fi - -rm -f $PKG/opt/$PRGNAM/lib/rustlib/uninstall.sh -rm -f $PKG/opt/$PRGNAM/lib/rustlib/install.log -rm -f $PKG/opt/$PRGNAM/lib/rustlib/manifest-* -rm -f $PKG/opt/$PRGNAM/lib/rustlib/rust-installer-version -rm -f $PKG/opt/$PRGNAM/lib/rustlib/components - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - $PKG/opt/$PRGNAM/share/doc/* \ - COPYRIGHT LICENSE-APACHE LICENSE-MIT \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.sw - -# Nothing in share is needed at this point. -rm -rf $PKG/opt/$PRGNAM/share -# Don't need bash completions. -rm -rf $PKG/opt/$PRGNAM/etc -# Appropriate directory name for the lib dir. -[ -n "$LIBDIRSUFFIX" ] && mv $PKG/opt/$PRGNAM/lib $PKG/opt/$PRGNAM/lib$LIBDIRSUFFIX - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/rust16/rust16.info b/development/rust16/rust16.info deleted file mode 100644 index 588184a035..0000000000 --- a/development/rust16/rust16.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="rust16" -VERSION="1.76.0" -HOMEPAGE="https://rust-lang.org" -DOWNLOAD="https://static.rust-lang.org/dist/2024-02-08/rust-1.76.0-i686-unknown-linux-gnu.tar.gz \ - https://static.rust-lang.org/dist/2024-02-08/rust-1.76.0-arm-unknown-linux-gnueabihf.tar.gz" -MD5SUM="9d8fb8d9d18987d3c65e781fd916adfa \ - 3f27044b6d18155a3849ae3d3958faf5" -DOWNLOAD_x86_64="https://static.rust-lang.org/dist/2024-02-08/rust-1.76.0-x86_64-unknown-linux-gnu.tar.gz" -MD5SUM_x86_64="3d00cf0861b0eb28e7010663dc59b2ed" -REQUIRES="" -MAINTAINER="K. Eugene Carlson" -EMAIL="kvngncrlsn@gmail.com" diff --git a/development/rust16/slack-desc b/development/rust16/slack-desc deleted file mode 100644 index 59a492264e..0000000000 --- a/development/rust16/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -rust16: rust16 (Rust: a safe, concurrent, practical language) -rust16: -rust16: rust16 installs a limited set of up-to-date Rust stable binaries to -rust16: /opt/rust16 for use in SlackBuilds. -rust16: -rust16: -rust16: -rust16: -rust16: -rust16: -rust16: Homepage: https://rust-lang.org diff --git a/development/sbcl/sbcl.SlackBuild b/development/sbcl/sbcl.SlackBuild index 3e4610850e..2e16d13696 100644 --- a/development/sbcl/sbcl.SlackBuild +++ b/development/sbcl/sbcl.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sbcl -VERSION=${VERSION:-2.4.3} +VERSION=${VERSION:-2.4.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/sbcl/sbcl.info b/development/sbcl/sbcl.info index 609dc2a5d4..5415b92072 100644 --- a/development/sbcl/sbcl.info +++ b/development/sbcl/sbcl.info @@ -1,8 +1,8 @@ PRGNAM="sbcl" -VERSION="2.4.3" +VERSION="2.4.4" HOMEPAGE="http://www.sbcl.org/" -DOWNLOAD="http://downloads.sourceforge.net/sbcl/sbcl-2.4.3-source.tar.bz2" -MD5SUM="9e61f0d47571d465211c84464dfabb64" +DOWNLOAD="http://downloads.sourceforge.net/sbcl/sbcl-2.4.4-source.tar.bz2" +MD5SUM="2316e1ed55eafe6a34b6c7dd8ee34d72" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/sbt/sbt.SlackBuild b/development/sbt/sbt.SlackBuild index 844dd4883f..4df72d53c3 100644 --- a/development/sbt/sbt.SlackBuild +++ b/development/sbt/sbt.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sbt -VERSION=${VERSION:-1.9.7} +VERSION=${VERSION:-1.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/sbt/sbt.info b/development/sbt/sbt.info index 867692fdc3..879ea0f289 100644 --- a/development/sbt/sbt.info +++ b/development/sbt/sbt.info @@ -1,10 +1,10 @@ PRGNAM="sbt" -VERSION="1.9.7" +VERSION="1.10.0" HOMEPAGE="https://www.scala-sbt.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/sbt/sbt/releases/download/v1.9.7/sbt-1.9.7.tgz" -MD5SUM_x86_64="37153bc352c1109bbdc4512d65bf34ad" +DOWNLOAD_x86_64="https://github.com/sbt/sbt/releases/download/v1.10.0/sbt-1.10.0.tgz" +MD5SUM_x86_64="581a3a4b6922810bac3d00dd50be3f2e" REQUIRES="zulu-openjdk8" MAINTAINER="Julian Grinblat" EMAIL="julian@dotcore.co.il" diff --git a/development/splint/splint.SlackBuild b/development/splint/splint.SlackBuild index e7cf5025a8..1f0b956521 100644 --- a/development/splint/splint.SlackBuild +++ b/development/splint/splint.SlackBuild @@ -67,10 +67,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -automake --add-missing || true -autoreconf || true -automake --add-missing -autoreconf +autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/development/sqlcl/sqlcl.SlackBuild b/development/sqlcl/sqlcl.SlackBuild index 7c8a23a1e3..66a71bde10 100644 --- a/development/sqlcl/sqlcl.SlackBuild +++ b/development/sqlcl/sqlcl.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Slackware build script for Oracle SQL Developer Command Line @@ -25,17 +25,21 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sqlcl -VERSION=${VERSION:-23.3.0.270.1251} +VERSION=${VERSION:-24.1.0.087.0929} ARCH=${ARCH:-noarch} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 fi +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -62,10 +66,10 @@ find -L . \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/opt/sqlcl/*.md $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/opt/sqlcl/*.txt $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/opt/sqlcl/bin/*.md $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/opt/sqlcl/bin/*.txt $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/opt/sqlcl/*.md $PKG/usr/doc/$PRGNAM-$VERSION || true +mv $PKG/opt/sqlcl/*.txt $PKG/usr/doc/$PRGNAM-$VERSION || true +mv $PKG/opt/sqlcl/bin/*.md $PKG/usr/doc/$PRGNAM-$VERSION || true +mv $PKG/opt/sqlcl/bin/*.txt $PKG/usr/doc/$PRGNAM-$VERSION || true rm $PKG/opt/sqlcl/$VERSION || true diff --git a/development/sqlcl/sqlcl.info b/development/sqlcl/sqlcl.info index 5609cf1a22..ff6292f64e 100644 --- a/development/sqlcl/sqlcl.info +++ b/development/sqlcl/sqlcl.info @@ -1,8 +1,8 @@ PRGNAM="sqlcl" -VERSION="23.3.0.270.1251" +VERSION="24.1.0.087.0929" HOMEPAGE="https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/" -DOWNLOAD="https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-23.3.0.270.1251.zip" -MD5SUM="e96e38ffdf40cd8f8763052dfad3a127" +DOWNLOAD="https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-24.1.0.087.0929.zip" +MD5SUM="cc413282428dac100138918971113a26" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="zulu-openjdk11" diff --git a/development/sqldeveloper/sqldeveloper.SlackBuild b/development/sqldeveloper/sqldeveloper.SlackBuild index b175eec991..9eeab5d4cf 100644 --- a/development/sqldeveloper/sqldeveloper.SlackBuild +++ b/development/sqldeveloper/sqldeveloper.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Oracle SQL Developer -# Copyright 2015-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com> +# Copyright 2015-2024 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sqldeveloper -VERSION=${VERSION:-20.4.1.407.0006} +VERSION=${VERSION:-23.1.1.345.2114} ARCH=${ARCH:-noarch} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/sqldeveloper/sqldeveloper.info b/development/sqldeveloper/sqldeveloper.info index 85c55ba6ec..0e0ae16104 100644 --- a/development/sqldeveloper/sqldeveloper.info +++ b/development/sqldeveloper/sqldeveloper.info @@ -1,10 +1,10 @@ PRGNAM="sqldeveloper" -VERSION="20.4.1.407.0006" +VERSION="23.1.1.345.2114" HOMEPAGE="http://oracle.com/technetwork/developer-tools/sql-developer" -DOWNLOAD="http://download.oracle.com/otn/java/sqldeveloper/sqldeveloper-20.4.1.407.0006-no-jre.zip" -MD5SUM="041709f01de2c6d176f37132089b61b8" +DOWNLOAD="https://download.oracle.com/otn/java/sqldeveloper/sqldeveloper-23.1.1.345.2114-no-jre.zip" +MD5SUM="dc13da11f837a5f9c64187f52afb1ffe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="zulu-openjdk8" +REQUIRES="zulu-openjdk11" MAINTAINER="Giuseppe Di Terlizzi" EMAIL="giuseppe.diterlizzi@gmail.com" diff --git a/development/textadept/textadept.SlackBuild b/development/textadept/textadept.SlackBuild index b834636e3a..54486a6eed 100644 --- a/development/textadept/textadept.SlackBuild +++ b/development/textadept/textadept.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=textadept -VERSION=${VERSION:-12.3} +VERSION=${VERSION:-12.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -92,8 +92,8 @@ ln -s $CWD/*lua-5.4.6.tar.gz build/_deps/lua-5.4.6.tar.gz ln -s $CWD/*PDCurses-3.9.zip build/_deps/PDCurses-3.9.zip ln -s $CWD/*1.0.zip build/_deps/1.0.zip ln -s $CWD/*scinterm_5.0.zip build/_deps/scinterm_5.0.zip -ln -s $CWD/*scintilla541.tgz build/_deps/scintilla541.tgz -ln -s $CWD/*48a6fc9511ec67993e43ac7f5a33efc616b7ea32.zip build/_deps/48a6fc9511ec67993e43ac7f5a33efc616b7ea32.zip +ln -s $CWD/*scintilla550.tgz build/_deps/scintilla550.tgz +ln -s $CWD/*scintillua_6.3.zip build/_deps/scintillua_6.3.zip ln -s $CWD/*3.4.0.zip build/_deps/v3.4.0.zip ln -s $CWD/*libtermkey-0.22.tar.gz build/_deps/libtermkey-0.22.tar.gz cmake -S . -B build -D CMAKE_BUILD_TYPE=Release \ diff --git a/development/textadept/textadept.info b/development/textadept/textadept.info index 904460a663..e1a3e26a0f 100644 --- a/development/textadept/textadept.info +++ b/development/textadept/textadept.info @@ -1,7 +1,7 @@ PRGNAM="textadept" -VERSION="12.3" +VERSION="12.4" HOMEPAGE="https://foicica.com/textadept/" -DOWNLOAD="https://github.com/orbitalquark/textadept/archive/textadept_12.3/textadept-textadept_12.3.tar.gz \ +DOWNLOAD="https://github.com/orbitalquark/textadept/archive/textadept_12.4/textadept-textadept_12.4.tar.gz \ https://github.com/ThomasDickey/cdk-snapshots/archive/refs/tags/t20200923.tar.gz \ https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz \ https://www.scintilla.org/lexilla510.tgz \ @@ -11,11 +11,11 @@ DOWNLOAD="https://github.com/orbitalquark/textadept/archive/textadept_12.3/texta https://prdownloads.sourceforge.net/pdcurses/PDCurses-3.9.zip \ https://github.com/orbitalquark/lua-std-regex/archive/1.0.zip \ https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip \ - https://www.scintilla.org/scintilla541.tgz \ - https://github.com/orbitalquark/scintillua/archive/48a6fc9511ec67993e43ac7f5a33efc616b7ea32.zip \ + https://www.scintilla.org/scintilla550.tgz \ + https://github.com/orbitalquark/scintillua/archive/scintillua_6.3.zip \ https://github.com/itay-grudev/SingleApplication/archive/refs/tags/v3.4.0.zip \ https://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz" -MD5SUM="27020397bbe264b44e7fe96ba8177b7b \ +MD5SUM="4b7ac0d08f5aa001aa8275de19adb27c \ 0908cb133f473506a40807c0204a960a \ d718cd5a59438be666d1575855be72c3 \ 210fab20f43c7d77af7249fd50c2cdc1 \ @@ -25,8 +25,8 @@ MD5SUM="27020397bbe264b44e7fe96ba8177b7b \ 06d657aec0e655d5a335c5a5dc888ef3 \ c3314ca8c5be471888342efeee3a46d2 \ dd7c1f88dd42ae5f2113ba5fe0df2561 \ - d0d5b7944907b7eae125f132b17a80e8 \ - 88ebd6a8c79685c1d6339357faccc76e \ + 972f2fa44a886b19c62c779f458260e7 \ + 5ab1205f426f06f5fe7a67b692cf0bb1 \ 93b78904c173f13b88ce1398f8d8e576 \ 08bf514d59660391c3a21b3977a16c8c" DOWNLOAD_x86_64="" diff --git a/development/tig/tig.SlackBuild b/development/tig/tig.SlackBuild index 1c0d84306b..6f430cebb7 100644 --- a/development/tig/tig.SlackBuild +++ b/development/tig/tig.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tig -VERSION=${VERSION:-2.5.9} +VERSION=${VERSION:-2.5.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/tig/tig.info b/development/tig/tig.info index ad3ebe5898..f4f7b9c0b4 100644 --- a/development/tig/tig.info +++ b/development/tig/tig.info @@ -1,8 +1,8 @@ PRGNAM="tig" -VERSION="2.5.9" +VERSION="2.5.10" HOMEPAGE="https://jonas.github.io/tig/" -DOWNLOAD="https://github.com/jonas/tig/releases/download/tig-2.5.9/tig-2.5.9.tar.gz" -MD5SUM="54d0d7a17b75832eac632b6232f785fe" +DOWNLOAD="https://github.com/jonas/tig/releases/download/tig-2.5.10/tig-2.5.10.tar.gz" +MD5SUM="80822a6ed9f2accf13154a482ce72a05" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/tkdiff/tkdiff.SlackBuild b/development/tkdiff/tkdiff.SlackBuild index a76c0fd3b5..a3bc15a792 100644 --- a/development/tkdiff/tkdiff.SlackBuild +++ b/development/tkdiff/tkdiff.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tkdiff -VERSION=${VERSION:-5.6} +VERSION=${VERSION:-5.7} SRCVERSION=$( echo $VERSION | tr . - ) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/tkdiff/tkdiff.info b/development/tkdiff/tkdiff.info index 0c511b5401..b46a276c3c 100644 --- a/development/tkdiff/tkdiff.info +++ b/development/tkdiff/tkdiff.info @@ -1,8 +1,8 @@ PRGNAM="tkdiff" -VERSION="5.6" +VERSION="5.7" HOMEPAGE="https://sourceforge.net/projects/tkdiff/" -DOWNLOAD="https://sourceforge.net/projects/tkdiff/files/tkdiff/5.6/tkdiff-5-6.zip" -MD5SUM="69355922c7738efe9ec9203acef36e02" +DOWNLOAD="https://sourceforge.net/projects/tkdiff/files/tkdiff/5.7/tkdiff-5-7.zip" +MD5SUM="525a15b95cb8cda6e2dc97c04560d477" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/tstoolbox/README b/development/tstoolbox/README deleted file mode 100644 index d1d65afb57..0000000000 --- a/development/tstoolbox/README +++ /dev/null @@ -1,2 +0,0 @@ -The tstoolbox is a Python script to manipulate time-series on -the command line or by function calls within Python. diff --git a/development/tstoolbox/doinst.sh b/development/tstoolbox/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/development/tstoolbox/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/development/tstoolbox/tstoolbox.SlackBuild b/development/tstoolbox/tstoolbox.SlackBuild deleted file mode 100644 index d715facb12..0000000000 --- a/development/tstoolbox/tstoolbox.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for tstoolbox - -# Copyright 2014-2017 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=tstoolbox -VERSION=${VERSION:-11.35.19.17} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.rst LICENSE.txt PKG-INFO VERSION $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/tstoolbox/tstoolbox.info b/development/tstoolbox/tstoolbox.info deleted file mode 100644 index ad05c5bf8e..0000000000 --- a/development/tstoolbox/tstoolbox.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="tstoolbox" -VERSION="11.35.19.17" -HOMEPAGE="https://pypi.python.org/pypi/tstoolbox" -DOWNLOAD="https://pypi.python.org/packages/d6/70/57ce5cd3e36ac664b5c3eba5697c4d527232fe38b7404754bc3599c36f81/tstoolbox-11.35.19.17.tar.gz" -MD5SUM="34bc5b33ecf623b2909392e4f22353ed" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="pandas mando python2-matplotlib rst2ansi python2-scipy" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/development/uftrace/uftrace.SlackBuild b/development/uftrace/uftrace.SlackBuild index 56c2fa3604..37ffc58c34 100644 --- a/development/uftrace/uftrace.SlackBuild +++ b/development/uftrace/uftrace.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=uftrace -VERSION=${VERSION:-20240313_1919a15} -GITHASH=${GITHASH:-1919a15cd71dbb9fed4138923a1954c79b638796} +VERSION=${VERSION:-20240410_17df844} +GITHASH=${GITHASH:-17df844f1488a9a90e218b0a2ba19d1936e4cfb2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/uftrace/uftrace.info b/development/uftrace/uftrace.info index d8e5473764..068b5e0ee6 100644 --- a/development/uftrace/uftrace.info +++ b/development/uftrace/uftrace.info @@ -1,8 +1,8 @@ PRGNAM="uftrace" -VERSION="20240313_1919a15" +VERSION="20240410_17df844" HOMEPAGE="https://github.com/namhyung/uftrace" -DOWNLOAD="https://github.com/namhyung/uftrace/archive/1919a15/uftrace-1919a15cd71dbb9fed4138923a1954c79b638796.tar.gz" -MD5SUM="60a04a7e30278ce181475ef2751463da" +DOWNLOAD="https://github.com/namhyung/uftrace/archive/17df844/uftrace-17df844f1488a9a90e218b0a2ba19d1936e4cfb2.tar.gz" +MD5SUM="bd49c4c907e5fe013384e265d3e843d7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="capstone" diff --git a/development/unittest-cpp/unittest-cpp.SlackBuild b/development/unittest-cpp/unittest-cpp.SlackBuild index 061e9fea38..223216bb2e 100644 --- a/development/unittest-cpp/unittest-cpp.SlackBuild +++ b/development/unittest-cpp/unittest-cpp.SlackBuild @@ -84,7 +84,7 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=uninitialized" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/development/valgrind/README b/development/valgrind/README deleted file mode 100644 index 7e4eec3411..0000000000 --- a/development/valgrind/README +++ /dev/null @@ -1,19 +0,0 @@ -Valgrind is a framework for building dynamic analysis tools. There are -Valgrind tools that can automatically detect many memory management -and threading bugs, and profile your programs in detail. You can also -use Valgrind to build new tools. - -The Valgrind distribution currently includes six production-quality -tools: a memory error detector, two thread error detectors, a cache -and branch-prediction profiler, a call-graph generating cache and -branch-prediction profiler, and a heap profiler. It also includes -three experimental tools: a heap/stack/global array overrun detector, -a different kind of heap profiler, and a SimPoint basic block vector -generator. It runs on the following platforms: x86/Linux, AMD64/Linux, -PPC32/Linux, PPC64/Linux, ARM/Linux, x86/MacOSX and AMD64/MacOSX. - -Optional dependency: either mpich or openmpi. If one of these is -found, valgrind will include the MPI wrapper, which allows using -valgrind with software that uses the MPI message passing standard. -Note that only one of mpich or openmpi should be installed, as they -conflict with each other. diff --git a/development/valgrind/slack-desc b/development/valgrind/slack-desc deleted file mode 100644 index 5129787498..0000000000 --- a/development/valgrind/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -valgrind: valgrind (award-winning suite of tools for debugging) -valgrind: -valgrind: Valgrind is an award-winning suite of tools for debugging and -valgrind: profiling Linux programs. With the tools that come with Valgrind, -valgrind: you can automatically detect many memory management and threading -valgrind: bugs, avoiding hours of frustrating bug-hunting, making your -valgrind: programs more stable. You can also perform detailed profiling, -valgrind: to speed up and reduce memory use of your programs. -valgrind: -valgrind: -valgrind: diff --git a/development/valgrind/valgrind.SlackBuild b/development/valgrind/valgrind.SlackBuild deleted file mode 100644 index 5d8405d1b5..0000000000 --- a/development/valgrind/valgrind.SlackBuild +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# Slackware build script for valgrind -# Written by Kyle Guinn <elyk03@gmail.com> -# Updated by Peter Wang <novalazy@gmail.com> -# Maintained by Willy Sudiarto Raharjo <willysr@slackbuilds.org> - -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=valgrind -VERSION=${VERSION:-3.22.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - # The valgrind build system already passes -fpic - # and forcing -fPIC results in a build failure. - SLKCFLAGS="-O2" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# Do NOT strip the shared objects, as recommended by the developers. -find $PKG -print0 | xargs -0 file | grep -e "executable" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING* FAQ.txt NEWS README* \ - $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/doc/valgrind/html $PKG/usr/doc/$PRGNAM-$VERSION -# The doc directory is the only thing in $PKG/usr/share, and the only things -# left in it now are pdf and a ps doc files. They are large, so we won't keep -# them around. If you still want them, uncomment the line below. -# mv $PKG/usr/share/doc/valgrind/*.{ps,pdf} $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/valgrind/valgrind.info b/development/valgrind/valgrind.info deleted file mode 100644 index c524c1e987..0000000000 --- a/development/valgrind/valgrind.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="valgrind" -VERSION="3.22.0" -HOMEPAGE="http://www.valgrind.org/" -DOWNLOAD="http://sourceware.org/pub/valgrind/valgrind-3.22.0.tar.bz2" -MD5SUM="38ea14f567efa09687a822b33b4d9d60" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/development/vscode-bin/vscode-bin.SlackBuild b/development/vscode-bin/vscode-bin.SlackBuild index c543e3cce1..5f700890c9 100644 --- a/development/vscode-bin/vscode-bin.SlackBuild +++ b/development/vscode-bin/vscode-bin.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vscode-bin SRCNAM=code-stable -VERSION=${VERSION:-1.88.0} -SRCVER=1712150767 +VERSION=${VERSION:-1.89.1} +SRCVER=1715058993 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/vscode-bin/vscode-bin.info b/development/vscode-bin/vscode-bin.info index 47c077e1e1..cc2176c074 100644 --- a/development/vscode-bin/vscode-bin.info +++ b/development/vscode-bin/vscode-bin.info @@ -1,10 +1,10 @@ PRGNAM="vscode-bin" -VERSION="1.88.0" +VERSION="1.89.1" HOMEPAGE="https://code.visualstudio.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://vscode.download.prss.microsoft.com/dbazure/download/stable/5c3e652f63e798a5ac2f31ffd0d863669328dc4c/code-stable-x64-1712150767.tar.gz" -MD5SUM_x86_64="0caa975f650fbb425af202bfcfa15113" +DOWNLOAD_x86_64="https://vscode.download.prss.microsoft.com/dbazure/download/stable/dc96b837cf6bb4af9cd736aa3af08cf8279f7685/code-stable-x64-1715058993.tar.gz" +MD5SUM_x86_64="d36230c467c3a4f929881f3a61756971" REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/development/whisper.cpp/README b/development/whisper.cpp/README new file mode 100644 index 0000000000..2c0e887b33 --- /dev/null +++ b/development/whisper.cpp/README @@ -0,0 +1,16 @@ +High-performance inference of OpenAI's Whisper automatic speech +recognition (ASR) model: + + -Plain C/C++ implementation without dependencies + -Apple Silicon first-class citizen - optimized via ARM NEON, + Accelerate framework, Metal and Core ML + -AVX intrinsics support for x86 architectures + -VSX intrinsics support for POWER architectures + -Mixed F16 / F32 precision + -4-bit and 5-bit integer quantization support + -Zero memory allocations at runtime + -Support for CPU-only inference + -Efficient GPU support for NVIDIA + -Partial OpenCL GPU support via CLBlast + -OpenVINO Support + -C-style API diff --git a/python/python-zipp/slack-desc b/development/whisper.cpp/slack-desc index 0445035132..cb32483015 100644 --- a/python/python-zipp/slack-desc +++ b/development/whisper.cpp/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -python-zipp: python-zipp (pathlib-compatible Zipfile object wrapper) -python-zipp: -python-zipp: A pathlib-compatible Zipfile object wrapper. A backport of the Path -python-zipp: object. -python-zipp: -python-zipp: -python-zipp: -python-zipp: -python-zipp: -python-zipp: -python-zipp: +whisper.cpp: whisper.cpp (Port of OpenAI's Whisper model in C/C++) +whisper.cpp: +whisper.cpp: High-performance inference of OpenAI's Whisper automatic speech +whisper.cpp: recognition (ASR) model. +whisper.cpp: +whisper.cpp: +whisper.cpp: +whisper.cpp: +whisper.cpp: +whisper.cpp: https://github.com/ggerganov/whisper.cpp +whisper.cpp: diff --git a/libraries/fmt/fmt.SlackBuild b/development/whisper.cpp/whisper.cpp.SlackBuild index bc2a0b642c..3e0abaa2e2 100644 --- a/libraries/fmt/fmt.SlackBuild +++ b/development/whisper.cpp/whisper.cpp.SlackBuild @@ -1,9 +1,8 @@ #!/bin/bash -# Slackware build script for fmt +# Slackware build script for whisper.cpp -# Copyright 2022-2024 Steven Voges <Oregon, USA> -# Copyright 2019-2021 Hunter Sezen California, USA +# Copyright 2024 Johannes Schoepfer, Germany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=fmt -VERSION=${VERSION:-10.2.1} +PRGNAM=whisper.cpp +VERSION=${VERSION:-1.5.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -54,48 +53,57 @@ if [ "$ARCH" = "i586" ]; then elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi -set -eu +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} + -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + +source /usr/share/openvino/setupvars.sh mkdir -p build cd build +pwd cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_SKIP_RPATH=TRUE \ + -DWHISPER_OPENVINO=ON \ + -DWHISPER_OPENBLAS=ON \ + -Wno-dev \ -DCMAKE_BUILD_TYPE=Release .. make - make install DESTDIR=$PKG + make install/strip DESTDIR=$PKG cd .. -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | - grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +[ -n "$LIBDIRSUFFIX" ] && mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.md LICENSE \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION + cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/development/whisper.cpp/whisper.cpp.info b/development/whisper.cpp/whisper.cpp.info new file mode 100644 index 0000000000..50c19d2593 --- /dev/null +++ b/development/whisper.cpp/whisper.cpp.info @@ -0,0 +1,10 @@ +PRGNAM="whisper.cpp" +VERSION="1.5.5" +HOMEPAGE="https://github.com/ggerganov/whisper.cpp" +DOWNLOAD="https://github.com/ggerganov/whisper.cpp/archive/v1.5.5/whisper.cpp-1.5.5.tar.gz" +MD5SUM="a4c1d8283381a789c679d0b274ec6c64" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="openvino OpenBLAS" +MAINTAINER="Johannes Schoepfer" +EMAIL="slackbuilds@schoepfer.info" diff --git a/development/xmake/xmake.SlackBuild b/development/xmake/xmake.SlackBuild index a93ed455e4..86c296c444 100644 --- a/development/xmake/xmake.SlackBuild +++ b/development/xmake/xmake.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xmake -VERSION=${VERSION:-2.8.9} +VERSION=${VERSION:-2.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/xmake/xmake.info b/development/xmake/xmake.info index 6bb183ae48..cc9d1b89dc 100644 --- a/development/xmake/xmake.info +++ b/development/xmake/xmake.info @@ -1,8 +1,8 @@ PRGNAM="xmake" -VERSION="2.8.9" +VERSION="2.9.1" HOMEPAGE="https://xmake.io/" -DOWNLOAD="https://github.com/xmake-io/xmake/releases/download/v2.8.9/xmake-v2.8.9.tar.gz" -MD5SUM="2b38f0522c6a20efe605f024a7949799" +DOWNLOAD="https://github.com/xmake-io/xmake/releases/download/v2.9.1/xmake-v2.9.1.tar.gz" +MD5SUM="1878cfb6931dec869d8449b394bb6b2f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/xxd-standalone/xxd-standalone.SlackBuild b/development/xxd-standalone/xxd-standalone.SlackBuild index 6a9ce88b76..685bb8c932 100644 --- a/development/xxd-standalone/xxd-standalone.SlackBuild +++ b/development/xxd-standalone/xxd-standalone.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xxd-standalone -VERSION=${VERSION:-9.1.0094} +VERSION=${VERSION:-9.1.0404} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/xxd-standalone/xxd-standalone.info b/development/xxd-standalone/xxd-standalone.info index 0496648f3f..321b47e039 100644 --- a/development/xxd-standalone/xxd-standalone.info +++ b/development/xxd-standalone/xxd-standalone.info @@ -1,19 +1,19 @@ PRGNAM="xxd-standalone" -VERSION="9.1.0094" +VERSION="9.1.0404" HOMEPAGE="https://www.vim.org" -DOWNLOAD="https://raw.githubusercontent.com/vim/vim/v9.1.0094/src/xxd/xxd.c \ - https://raw.githubusercontent.com/vim/vim/v9.1.0094/src/xxd/Makefile \ - https://raw.githubusercontent.com/vim/vim/v9.1.0094/runtime/doc/xxd-fr.1 \ - https://raw.githubusercontent.com/vim/vim/v9.1.0094/runtime/doc/xxd-fr.UTF-8.1 \ - https://raw.githubusercontent.com/vim/vim/v9.1.0094/runtime/doc/xxd-it.1 \ - https://raw.githubusercontent.com/vim/vim/v9.1.0094/runtime/doc/xxd-it.UTF-8.1 \ - https://raw.githubusercontent.com/vim/vim/v9.1.0094/runtime/doc/xxd-ja.UTF-8.1 \ - https://raw.githubusercontent.com/vim/vim/v9.1.0094/runtime/doc/xxd-pl.1 \ - https://raw.githubusercontent.com/vim/vim/v9.1.0094/runtime/doc/xxd-pl.UTF-8.1 \ - https://raw.githubusercontent.com/vim/vim/v9.1.0094/runtime/doc/xxd-ru.1 \ - https://raw.githubusercontent.com/vim/vim/v9.1.0094/runtime/doc/xxd-ru.UTF-8.1 \ - https://raw.githubusercontent.com/vim/vim/v9.1.0094/runtime/doc/xxd.1" -MD5SUM="f8817c8b0a30df8b33c9d0705cb00264 \ +DOWNLOAD="https://raw.githubusercontent.com/vim/vim/v9.1.0404/src/xxd/xxd.c \ + https://raw.githubusercontent.com/vim/vim/v9.1.0404/src/xxd/Makefile \ + https://raw.githubusercontent.com/vim/vim/v9.1.0404/runtime/doc/xxd-fr.1 \ + https://raw.githubusercontent.com/vim/vim/v9.1.0404/runtime/doc/xxd-fr.UTF-8.1 \ + https://raw.githubusercontent.com/vim/vim/v9.1.0404/runtime/doc/xxd-it.1 \ + https://raw.githubusercontent.com/vim/vim/v9.1.0404/runtime/doc/xxd-it.UTF-8.1 \ + https://raw.githubusercontent.com/vim/vim/v9.1.0404/runtime/doc/xxd-ja.UTF-8.1 \ + https://raw.githubusercontent.com/vim/vim/v9.1.0404/runtime/doc/xxd-pl.1 \ + https://raw.githubusercontent.com/vim/vim/v9.1.0404/runtime/doc/xxd-pl.UTF-8.1 \ + https://raw.githubusercontent.com/vim/vim/v9.1.0404/runtime/doc/xxd-ru.1 \ + https://raw.githubusercontent.com/vim/vim/v9.1.0404/runtime/doc/xxd-ru.UTF-8.1 \ + https://raw.githubusercontent.com/vim/vim/v9.1.0404/runtime/doc/xxd.1" +MD5SUM="e175ae85bcbd13491e0105924623e648 \ cc78bcf8a54283993e9422741eb07558 \ 4d8334a32c068f4ff268091ea9136fd8 \ 967cc9a866a5528c5422674813d2161f \ @@ -24,7 +24,7 @@ MD5SUM="f8817c8b0a30df8b33c9d0705cb00264 \ 839b7221da6d5561be6d5cdf1feceab6 \ aaa4c5d7486c5d0fce9890b1bbeddeef \ 965aa6102b5bbd366369bf527aaa7649 \ - 3ecdae02363805096180bf297c001b53" + bee755487ab5ee7393fd48c043637c09" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/0ad-data/0ad-data.SlackBuild b/games/0ad-data/0ad-data.SlackBuild index f0e3c22489..c9a70929ef 100644 --- a/games/0ad-data/0ad-data.SlackBuild +++ b/games/0ad-data/0ad-data.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=0ad-data DATANAM=0ad -VERSION=${VERSION:-0.0.26} +VERSION=${VERSION:-r28035} RELEASE=${RELEASE:-alpha} ARCH=noarch BUILD=${BUILD:-1} diff --git a/games/0ad-data/0ad-data.info b/games/0ad-data/0ad-data.info index 6f9a2ab55c..6065c561ab 100644 --- a/games/0ad-data/0ad-data.info +++ b/games/0ad-data/0ad-data.info @@ -1,8 +1,8 @@ PRGNAM="0ad-data" -VERSION="0.0.26" +VERSION="r28035" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.26-alpha-unix-data.tar.xz" -MD5SUM="b023f0f7045dc020f97be6c0df9f9a7e" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/0ad-r28035-alpha-unix-data.tar.xz" +MD5SUM="103758c3fdd8df505d40f8d7eb3b039f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild index b6c52e7c61..d79e586be8 100644 --- a/games/0ad/0ad.SlackBuild +++ b/games/0ad/0ad.SlackBuild @@ -29,9 +29,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=0ad -VERSION=${VERSION:-0.0.26} +VERSION=${VERSION:-r28035} RELEASE=${RELEASE:-alpha} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} TMP=${TMP:-/tmp/SBo} @@ -93,10 +93,6 @@ export SDL2_CONFIG="/usr/bin/sdl2-config" mkdir -p cargoh export CARGO_HOME="$TMP/$PRGNAM-$VERSION-$RELEASE/cargoh" -#add patches for fmt>9.1.0 ie. 10.1.1 -sed -i 's/, header.GetType()/, static_cast<int>(header.GetType())/g' source/network/NetMessage.cpp -sed -i 's/, arrayType/, static_cast<int>(arrayType)/g' source/simulation2/serialization/BinarySerializer.cpp - # Fix boost names, include paths and remove isystem. commented stuff is fixed upstream already sed -i 's|-mt||g' build/premake/extern_libs5.lua || exit 1 #sed -i 's|/usr/local/include|/usr/include|' build/premake/{extern_libs5.lua,premake5.lua} || exit 1 @@ -113,6 +109,9 @@ sed -i 's|-isystem |-I|' build/premake/premake5/{src/tools/gcc.lua,tests/tools/t # have a root check, let's disable it. patch -p1 < $CWD/disable-root-check.patch +sed -i '/Pyrogenesis/i #include <iomanip>' source/ps/Util.cpp + +CXX=clang++ \ build/workspaces/update-workspaces.sh \ --without-pch \ --bindir=/usr/games \ diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info index 59eb4a4fdf..f1aaf3606a 100644 --- a/games/0ad/0ad.info +++ b/games/0ad/0ad.info @@ -1,10 +1,10 @@ PRGNAM="0ad" -VERSION="0.0.26" +VERSION="r28035" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.26-alpha-unix-build.tar.xz" -MD5SUM="d0d3ed10769dee2254aa196a9619bd57" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/0ad-r28035-alpha-unix-build.tar.xz" +MD5SUM="45c9ebe38e0578c6eade09da81b10105" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="0ad-data enet fmt gloox miniupnpc wxGTK3" +REQUIRES="0ad-data enet fmt gloox miniupnpc wxWidgets" MAINTAINER="Tim Dickson" EMAIL="dickson.tim@googlemail.com" diff --git a/games/LucasChess/Configuration.py b/games/LucasChess/Configuration.py index 3ba3ae4208..49fd4f2df3 100644 --- a/games/LucasChess/Configuration.py +++ b/games/LucasChess/Configuration.py @@ -61,7 +61,7 @@ def change_folder(nueva): class BoxRooms: def __init__(self, configuration): - self.file = os.path.join(configuration.carpeta_config, "boxrooms.pk") + self.file = Util.opj(configuration.carpeta_config, "boxrooms.pk") self._list = self.read() def read(self): @@ -90,22 +90,22 @@ class Configuration: self.carpetaBase = active_folder() - self.carpetaUsers = os.path.join(self.carpetaBase, "users") + self.carpetaUsers = Util.opj(self.carpetaBase, "users") self.first_run = False if user: Util.create_folder(self.carpetaUsers) - self.carpeta = os.path.join(self.carpetaUsers, str(user.number)) + self.carpeta = Util.opj(self.carpetaUsers, str(user.number)) Util.create_folder(self.carpeta) else: self.first_run = Util.create_folder(self.carpetaBase) self.carpeta = self.carpetaBase - self.carpeta_config = os.path.join(self.carpeta, "__Config__") + self.carpeta_config = Util.opj(self.carpeta, "__Config__") Util.create_folder(self.carpeta_config) - self.carpeta_results = os.path.join(self.carpeta, "Results") + self.carpeta_results = Util.opj(self.carpeta, "Results") Util.create_folder(self.carpeta_results) self.user = user @@ -156,10 +156,13 @@ class Configuration: self.x_director_icon = False self.x_direct_graphics = False + self.x_sizefont_messages = 14 + self.x_sizefont_infolabels = 11 + self.x_sizefont_players = 16 self.x_pgn_width = 348 - self.x_pgn_fontpoints = 10 + self.x_pgn_fontpoints = 11 self.x_pgn_rowheight = 24 self.x_pgn_withfigurines = True @@ -170,7 +173,7 @@ class Configuration: self.x_copy_ctrl = True # False = Alt C self.x_font_family = "" - self.x_font_points = 10 + self.x_font_points = 11 self.x_menu_points = 11 self.x_menu_bold = False @@ -200,6 +203,7 @@ class Configuration: self.x_analyzer_priority = Priorities.priorities.low self.x_analyzer_depth_ab = 24 self.x_analyzer_mstime_ab = 0 + self.x_analyzer_autorotate_ab = True self.x_analyzer_mstime_refresh_ab = 200 self.x_analyzer_activate_ab = False @@ -241,6 +245,8 @@ class Configuration: self.x_interval_replay = 1400 self.x_beep_replay = False + self.x_margin_pieces = 7 + self.x_engine_notbackground = False self.x_check_for_update = False @@ -267,7 +273,17 @@ class Configuration: self._dic_books = None - self.__theme_num = 2 + self.__theme_num = 1 # 1=red 2=old + + def get_folder_default(self, folder): + return folder if folder else self.carpeta + + def save_folder(self): + return self.get_folder_default(self.x_save_folder) + + def set_save_folder(self, folder): + self.x_save_folder = folder + self.graba() @property def dic_books(self): @@ -285,7 +301,7 @@ class Configuration: add_folder(Code.path_resource("Openings")) for engine in ("foxcub", "fox", "maia", "irina", "rodentii"): - add_folder(os.path.join(Code.folder_engines, engine)) + add_folder(Util.opj(Code.folder_engines, engine)) return self._dic_books def path_book(self, alias): @@ -321,13 +337,13 @@ class Configuration: } def folder_translations(self): - folder = os.path.join(self.carpetaBase, "Translations") + folder = Util.opj(self.carpetaBase, "Translations") if not os.path.isdir(folder): Util.create_folder(folder) return folder def carpeta_sounds(self): - return os.path.join(self.carpeta, "Sounds") + return Util.opj(self.carpeta, "Sounds") def relee_engines(self): self.dic_engines = OSEngines.read_engines(Code.folder_engines) @@ -349,13 +365,13 @@ class Configuration: return Code.path_resource("Gaviota") def folder_gaviota(self): - if not Util.exist_file(os.path.join(self.x_carpeta_gaviota, "kbbk.gtb.cp4")): + if not Util.exist_file(Util.opj(self.x_carpeta_gaviota, "kbbk.gtb.cp4")): self.x_carpeta_gaviota = self.carpeta_gaviota_defecto() self.graba() return self.x_carpeta_gaviota def pieces_gaviota(self): - if Util.exist_file(os.path.join(self.folder_gaviota(), "kbbkb.gtb.cp4")): + if Util.exist_file(Util.opj(self.folder_gaviota(), "kbbkb.gtb.cp4")): return 5 return 4 @@ -372,7 +388,7 @@ class Configuration: def language(self): tr_actual = self.translator() dlang = Code.path_resource("Locale") - fini = os.path.join(dlang, tr_actual, "lang.ini") + fini = Util.opj(dlang, tr_actual, "lang.ini") dic = Util.ini_dic(fini) return dic["NAME"] @@ -389,7 +405,7 @@ class Configuration: self.lee() self.relee_engines() self.rival = self.buscaRival(self.x_rival_inicial) - self.leeConfBoards() + self.read_conf_boards() def changeActiveFolder(self, nueva): change_folder(nueva) @@ -397,12 +413,12 @@ class Configuration: self.lee() def create_base_folder(self, folder): - folder = os.path.realpath(os.path.join(self.carpeta, folder)) + folder = os.path.realpath(Util.opj(self.carpeta, folder)) Util.create_folder(folder) return folder def file_competition_with_tutor(self): - return os.path.join(self.carpeta_results, "CompetitionWithTutor.db") + return Util.opj(self.carpeta_results, "CompetitionWithTutor.db") def folder_userdata(self): return self.carpeta @@ -431,37 +447,37 @@ class Configuration: self.write_variables("OPENING_LINES", dic) def file_mate(self, mate): - return os.path.join(self.carpeta_results, "Mate%d.pk" % mate) + return Util.opj(self.carpeta_results, "Mate%d.pk" % mate) def file_endings_gtb(self): - return os.path.join(self.carpeta_results, "EndingsGTB.db") + return Util.opj(self.carpeta_results, "EndingsGTB.db") def file_external_engines(self): - return os.path.join(self.carpeta_config, "ExtEngines.pk") + return Util.opj(self.carpeta_config, "ExtEngines.pk") def file_kibitzers(self): - return os.path.join(self.carpeta_config, "kibitzers.pk") + return Util.opj(self.carpeta_config, "kibitzers.pk") def file_adjournments(self): - return os.path.join(self.carpeta_config, "Adjournments.ddb") + return Util.opj(self.carpeta_config, "Adjournments.ddb") def file_index_polyglots(self): - return os.path.join(self.carpeta_config, "index_polyglots.pk") + return Util.opj(self.carpeta_config, "index_polyglots.pk") def file_pers_openings(self): - return os.path.join(self.carpeta_config, "persaperturas.pkd") + return Util.opj(self.carpeta_config, "persaperturas.pkd") def file_captures(self): - return os.path.join(self.carpeta_results, "Captures.db") + return Util.opj(self.carpeta_results, "Captures.db") def file_counts(self): - return os.path.join(self.carpeta_results, "Counts.db") + return Util.opj(self.carpeta_results, "Counts.db") def file_mate15(self): - return os.path.join(self.carpeta_results, "Mate15.db") + return Util.opj(self.carpeta_results, "Mate15.db") def file_coordinates(self): - return os.path.join(self.carpeta_results, "Coordinates.db") + return Util.opj(self.carpeta_results, "Coordinates.db") def folder_tactics(self): return self.create_base_folder("Tactics") @@ -470,7 +486,10 @@ class Configuration: return self.create_base_folder("Databases") def file_autosave(self): - return os.path.join(self.folder_databases(), "__Autosave__.lcdb") + return Util.opj(self.folder_databases(), "__Autosave__.lcdb") + + def file_selected_positions(self): + return Util.opj(self.folder_databases(), "__Selected Positions__.lcdb") def folder_databases_pgn(self): return self.create_base_folder("TemporaryDatabases") @@ -479,7 +498,7 @@ class Configuration: return self.create_base_folder("PolyglotsFactory") def opj_config(self, file): - return os.path.join(self.carpeta_config, file) + return Util.opj(self.carpeta_config, file) def file_video(self): return self.opj_config("confvid.pkd") @@ -507,7 +526,7 @@ class Configuration: def set_folders(self): - self.file = os.path.join(self.carpeta_config, "lk.pk2") + self.file = Util.opj(self.carpeta_config, "lk.pk2") self.is_first_time = not Util.exist_file(self.file) @@ -568,11 +587,11 @@ class Configuration: if not Util.exist_file(self.file_sounds()): Util.file_copy(Code.path_resource("IntFiles", "sounds.pkd"), self.file_sounds()) - self.folder_base_openings = os.path.join(self.carpeta, "OpeningLines") + self.folder_base_openings = Util.opj(self.carpeta, "OpeningLines") Util.create_folder(self.folder_base_openings) def file_colors(self): - return os.path.join(self.carpeta_config, "personal.colors") + return Util.opj(self.carpeta_config, "personal.colors") def compruebaBMT(self): if not Util.exist_file(self.ficheroBMT): @@ -641,7 +660,7 @@ class Configuration: li = [] for key, cm in self.dic_engines.items(): li.append((cm.nombre_ext(), key)) - li.sort(key=lambda x: x[0]) + li.sort(key=lambda x: x[0].upper()) return li def combo_engines_multipv10(self, minimo=10): # %# @@ -674,6 +693,8 @@ class Configuration: if x in dic: setattr(self, x, dic[x]) + if "x_sizefont_players" not in dic: + self.x_sizefont_players = self.x_sizefont_infolabels + 2 # self.palette = dic.get("PALETTE", self.palette) self.li_personalities = dic.get("PERSONALITIES", self.li_personalities) @@ -683,9 +704,10 @@ class Configuration: self.x_translator = x[:2] self.load_translation() - TrListas.ponPiecesLNG(self.x_pgn_english or self.translator() == "en") + TrListas.pon_pieces_lng(self.x_pgn_english or self.translator() == "en") Code.analysis_eval = AnalysisEval.AnalysisEval() + Code.factor_big_fonts = max(1.0, self.x_font_points / 11) IconosBase.icons.reset(self.x_style_icons) @@ -700,7 +722,7 @@ class Configuration: def get_favoritos(self): if self.li_favoritos is None: - file = os.path.join(self.carpeta_config, "Favoritos.pkd") + file = Util.opj(self.carpeta_config, "Favoritos.pkd") lista = Util.restore_pickle(file) if lista is None: lista = [] @@ -709,12 +731,12 @@ class Configuration: def save_favoritos(self, lista): self.li_favoritos = lista - file = os.path.join(self.carpeta_config, "Favoritos.pkd") + file = Util.opj(self.carpeta_config, "Favoritos.pkd") Util.save_pickle(file, lista) def load_translation(self): dlang = Code.path_resource("Locale") - fini = os.path.join(dlang, self.x_translator, "lang.ini") + fini = Util.opj(dlang, self.x_translator, "lang.ini") if not os.path.isfile(fini): self.x_translator = "en" Translate.install(self.x_translator) @@ -724,7 +746,7 @@ class Configuration: li = [] dlang = Code.path_resource("Locale") for uno in Util.listdir(dlang): - fini = os.path.join(dlang, uno.name, "lang.ini") + fini = Util.opj(dlang, uno.name, "lang.ini") if os.path.isfile(fini): dic = Util.ini_dic(fini) if others: @@ -771,7 +793,7 @@ class Configuration: self.x_lichess = elo def po_saved(self): - return os.path.join(self.folder_translations(), "%s.po" % self.x_translator) + return Util.opj(self.folder_translations(), "%s.po" % self.x_translator) def list_internal_engines(self): li = [cm for k, cm in self.dic_engines.items() if not cm.is_external] @@ -861,13 +883,13 @@ class Configuration: return self.engine_analyzer() def temporary_folder(self): - dirTmp = os.path.join(self.carpeta, "tmp") - Util.create_folder(dirTmp) - return dirTmp + dir_tmp = Util.opj(self.carpeta, "tmp") + Util.create_folder(dir_tmp) + return dir_tmp def ficheroTemporal(self, extension): - dirTmp = os.path.join(self.carpeta, "tmp") - return Util.temporary_file(dirTmp, extension) + dir_tmp = Util.opj(self.carpeta, "tmp") + return Util.temporary_file(dir_tmp, extension) def clean_tmp_folder(self): try: @@ -957,7 +979,7 @@ class Configuration: def change_theme_num(self, num): self.__theme_num = num - def leeConfBoards(self): + def read_conf_boards(self): with UtilSQL.DictSQL(self.ficheroConfBoards) as db: self.dic_conf_boards_pk = db.as_dictionary() if not ("BASE" in self.dic_conf_boards_pk): @@ -993,7 +1015,7 @@ class Configuration: db = UtilSQL.DictSQL(self.ficheroConfBoards) del db[key] db.close() - self.leeConfBoards() + self.read_conf_boards() return self.config_board(key, tamDef) def cambiaConfBoard(self, config_board): @@ -1002,14 +1024,14 @@ class Configuration: db = UtilSQL.DictSQL(self.ficheroConfBoards) self.dic_conf_boards_pk[xid] = db[xid] = config_board.graba() db.close() - self.leeConfBoards() + self.read_conf_boards() def config_board(self, xid, tam_def, padre="BASE"): if xid == "BASE": ct = ConfBoards.ConfigBoard(xid, tam_def) else: ct = ConfBoards.ConfigBoard(xid, tam_def, padre=padre) - ct.anchoPieza(tam_def) + ct.width_piece(tam_def) if xid in self.dic_conf_boards_pk: ct.lee(self.dic_conf_boards_pk[xid]) @@ -1034,10 +1056,7 @@ class Configuration: return dic def pgn_folder(self): - resp = self.x_save_pgn_folder - if not resp: - resp = self.carpeta - return resp + return self.get_folder_default(self.x_save_pgn_folder) def save_pgn_folder(self, new_folder): if self.x_save_pgn_folder != new_folder: diff --git a/games/LucasChess/LucasChess.SlackBuild b/games/LucasChess/LucasChess.SlackBuild index dfd10af1a3..56d316f738 100644 --- a/games/LucasChess/LucasChess.SlackBuild +++ b/games/LucasChess/LucasChess.SlackBuild @@ -30,11 +30,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=LucasChess -VERSION=${VERSION:-R2.11g} +VERSION=${VERSION:-R2.14g} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -SRCNAM=${SRCNAM:-LucasChessR2_11g_LINUX.sh} +SRCNAM=${SRCNAM:-LucasChessR2_14g_LINUX.sh} ARCHIVELINE=716 if [ -z "$ARCH" ]; then @@ -59,6 +59,18 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +LUCASGRP=${LUCASGRP:-lucaschess} +LUCASGID=${LUCASGID:-385} + +# Check for lucaschess group here +if ! getent group | grep -q ^${LUCASGRP}: 2>/dev/null; then + echo "You must have a ${LUCASGRP} group to run this script." + echo " # groupadd -g ${LUCASGID} ${LUCASGRP}" + echo "Then add your user to this group (then have them log out and back in):" + echo " # usermod -a -G ${LUCASGRP} your_username" + echo "Exiting..." ; exit 1 +fi + set -e rm -rf $PKG @@ -104,6 +116,12 @@ ln -sf Fox Fox.exe rm $PKG/opt/$PRGNAM-$VERSION/bin/Code/Config/Configuration.pyc cat $CWD/Configuration.py > $PKG/opt/$PRGNAM-$VERSION/bin/Code/Config/Configuration.py +# stockfish directory needs to be writable by ${LUCASGRP} group. This is for the +# setup step on first use where it detects the appropriate stockfish build for +# your system. +chgrp -R ${LUCASGRP} $PKG/opt/$PRGNAM-$VERSION +chmod g+w $PKG/opt/$PRGNAM-$VERSION/bin/OS/linux/Engines/stockfish + # Install desktop launcher sed "s/VERSION/${VERSION}/g" $CWD/LucasChessR.desktop.in \ > $PKG/usr/share/applications/LucasChessR.desktop diff --git a/games/LucasChess/LucasChess.info b/games/LucasChess/LucasChess.info index 28529562e7..7077fdde0c 100644 --- a/games/LucasChess/LucasChess.info +++ b/games/LucasChess/LucasChess.info @@ -1,10 +1,10 @@ PRGNAM="LucasChess" -VERSION="R2.11g" +VERSION="R2.14g" HOMEPAGE="https://lucaschess.pythonanywhere.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://downloads.sourceforge.net/project/lucaschessr/Version_R2/LucasChessR2_11g_LINUX.sh" -MD5SUM_x86_64="6e73747c9fb8170066bde5535fa37c99" +DOWNLOAD_x86_64="https://psychz.dl.sourceforge.net/project/lucaschessr/Version_R2/LucasChessR2_14g_LINUX.sh" +MD5SUM_x86_64="d7bbe8f59043244790ea380b246242e9" REQUIRES="" MAINTAINER="Daniel Prosser" EMAIL="dpross1100@msn.com" diff --git a/games/LucasChess/README b/games/LucasChess/README index b715c73478..32f5db3600 100644 --- a/games/LucasChess/README +++ b/games/LucasChess/README @@ -8,3 +8,8 @@ PGN files, and study openings. This SlackBuild repackages the binary distribution provided by upstream. It requires about 700 MB of space when installed. + +You will need a special group and to add at least the first user of +Lucas Chess to this group. By default, the group name is called +"lucaschess" with a group id of 385, but you can change this if you wish. +See the build script for more information. diff --git a/games/Mindustry/Mindustry.SlackBuild b/games/Mindustry/Mindustry.SlackBuild index 37e77316d5..cb88e69d20 100644 --- a/games/Mindustry/Mindustry.SlackBuild +++ b/games/Mindustry/Mindustry.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Mindustry VERSION=${VERSION:-146} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} SERVER=${SERVER:-yes} @@ -64,23 +64,12 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION 2>/dev/null -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -./gradlew --no-daemon dist -Pbuildversion=146 desktop:dist mkdir -p $PKG/usr/share/{$PRGNAM,applications} \ $PKG/usr/games -cp -a desktop/build/libs/$PRGNAM.jar \ +install -m 644 $CWD/$PRGNAM.jar \ $PKG/usr/share/$PRGNAM -cp -a core/assets/icons/icon_64.png \ +install -m 644 $CWD/$PRGNAM.png \ $PKG/usr/share/$PRGNAM/$PRGNAM.png # Create destop entry @@ -105,8 +94,7 @@ EOF chmod 755 $PKG/usr/games/$PRGNAM if [ "$SERVER" = "yes" ]; then - ./gradlew --no-daemon dist -Pbuildversion=146 server:dist - cp -a server/build/libs/server-release.jar \ + install -m 644 $CWD/server-release.jar \ $PKG/usr/share/$PRGNAM/$PRGNAM-server.jar # Create destop entry cat > $PKG/usr/share/applications/$PRGNAM-server.desktop <<EOF @@ -131,7 +119,6 @@ EOF fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.md LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/Mindustry/Mindustry.info b/games/Mindustry/Mindustry.info index f7349a2884..653ea3cbb9 100644 --- a/games/Mindustry/Mindustry.info +++ b/games/Mindustry/Mindustry.info @@ -3,8 +3,10 @@ VERSION="146" HOMEPAGE="https://mindustrygame.github.io/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/Anuken/Mindustry/archive/v146/Mindustry-146.tar.gz" -MD5SUM_x86_64="9da9f917ec9057d9e3b38134f3897478" +DOWNLOAD_x86_64="https://github.com/Anuken/Mindustry/releases/download/v146/Mindustry.jar \ + https://github.com/Anuken/Mindustry/releases/download/v146/server-release.jar" +MD5SUM_x86_64="26193b0d3bad4bc84e044cce19a456d7 \ + 7ddf0531d6abc46b4b8c978860179020" REQUIRES="zulu-openjdk17" MAINTAINER="Yth - Arnaud" EMAIL="yth@ythogtha.org" diff --git a/games/Mindustry/Mindustry.png b/games/Mindustry/Mindustry.png Binary files differnew file mode 100644 index 0000000000..a67eae01f3 --- /dev/null +++ b/games/Mindustry/Mindustry.png diff --git a/games/PrismLauncher/PrismLauncher.SlackBuild b/games/PrismLauncher/PrismLauncher.SlackBuild index 09a660bd7f..4a4aabc117 100644 --- a/games/PrismLauncher/PrismLauncher.SlackBuild +++ b/games/PrismLauncher/PrismLauncher.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=PrismLauncher -VERSION=${VERSION:-8.2} +VERSION=${VERSION:-8.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/PrismLauncher/PrismLauncher.info b/games/PrismLauncher/PrismLauncher.info index d68f250a41..1505c79f56 100644 --- a/games/PrismLauncher/PrismLauncher.info +++ b/games/PrismLauncher/PrismLauncher.info @@ -1,8 +1,8 @@ PRGNAM="PrismLauncher" -VERSION="8.2" +VERSION="8.3" HOMEPAGE="https://prismlauncher.org" -DOWNLOAD="https://github.com/PrismLauncher/PrismLauncher/releases/download/8.2/PrismLauncher-8.2.tar.gz" -MD5SUM="2455aec61b37898e21c3ea23498593c7" +DOWNLOAD="https://github.com/PrismLauncher/PrismLauncher/releases/download/8.3/PrismLauncher-8.3.tar.gz" +MD5SUM="6e3c44ebc64b2c2f6f9489185b021d57" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenJDK17 scdoc" diff --git a/games/PrismLauncher/README b/games/PrismLauncher/README index 1c39a4cf14..9abac1f587 100644 --- a/games/PrismLauncher/README +++ b/games/PrismLauncher/README @@ -8,8 +8,13 @@ A Microsoft or Mojang account that owns Minecraft is required to download and play the game through PrismLauncher. zulu-openjdk17 can be used instead of OpenJDK17, if one wishes to do -so. If you plan on using a version of Minecraft that is on version -1.16.5 or older, you will also have to install either openjdk8 or -zulu-openjdk8. If you have multiple versions of Java installed on your +so. Other versions of Java may be needed to run different versions of +Minecraft. + +1.20.5 or newer: zulu-openjdk21 +1.17 to 1.20.4: OpenJDK17 or zulu-openjdk17 +1.16 or older: openjdk8 or zulu-openjdk8 + +If you have multiple versions of Java installed on your system, make sure that your JAVA_HOME environment variable is pointed to OpenJDK17 when building PrismLauncher. diff --git a/games/PyLotRO/HTTPSConnectionFix.patch b/games/PyLotRO/HTTPSConnectionFix.patch deleted file mode 100644 index 96f6889037..0000000000 --- a/games/PyLotRO/HTTPSConnectionFix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- PyLotROLauncher/PyLotROUtils.py 2012-11-28 20:06:06.000000000 -0600 -+++ PyLotROLauncher/PyLotROUtils.py 2013-06-04 21:08:53.032626141 -0500 -@@ -37,6 +37,7 @@ - # If Python 3.0 is in use use http otherwise httplib - if sys.version_info[:2] < (3, 0): - from httplib import HTTPConnection, HTTPSConnection -+ import ssl, socket - from urllib import quote - else: - from http.client import HTTPConnection, HTTPSConnection -@@ -50,7 +51,10 @@ - else: - url = urlIn[8:].split("/")[0] - post = urlIn[8:].replace(url, "") -- return HTTPSConnection(url), post -+ conn = HTTPSConnection(url) -+ sock = socket.create_connection((conn.host, conn.port), conn.timeout, conn.source_address) -+ conn.sock = ssl.wrap_socket(sock, conn.key_file, conn.cert_file, ssl_version=ssl.PROTOCOL_TLSv1) -+ return conn, post - - def GetText(nodelist): - rc = "" diff --git a/games/PyLotRO/PyLotRO.SlackBuild b/games/PyLotRO/PyLotRO.SlackBuild deleted file mode 100644 index 7ed7653ec5..0000000000 --- a/games/PyLotRO/PyLotRO.SlackBuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -# Slackbuild for PyLotRO - -# Slackbuild is released under the Dog-on-Fire License: -# If use of this script causes your dog to catch on fire, -# you agree to send me five dollars. Or a picture -# of the dog on fire. -# Otherwise, you're on your own. I've tested the script -# on my own computer, and it hasn't broken anything. -# So if it does it on your computer, that falls in -# the realm of "Not my problem." -# -# Of course, if you'll send a bug report to the above -# email address, I may be able to see what you did -# wrong and prevent it from happening in the future. -# In which case, I may just send YOU five dollars. - -# Oh, and feel free to copy it and modify it as you -# see fit. Or as I see fit. Or as I fit. Although -# that is unlikely, as I am rather tall. - - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=PyLotRO -VERSION=${VERSION:-0.1.15} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -unzip $CWD/$PRGNAM-$VERSION.zip -mv $PRGNAM $PRGNAM-$VERSION -cd $PRGNAM-$VERSION - -patch -p0 < $CWD/HTTPSConnectionFix.patch - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -python setup.py build -python setup.py install --root $PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/games/PyLotRO/PyLotRO.info b/games/PyLotRO/PyLotRO.info deleted file mode 100644 index bc5d8424d2..0000000000 --- a/games/PyLotRO/PyLotRO.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="PyLotRO" -VERSION="0.1.15" -HOMEPAGE="https://sites.google.com/site/leeslinuxblog/installing-lotro-in-wine" -DOWNLOAD="https://sites.google.com/site/leeslinuxblog/PyLotRO-0.1.15.zip" -MD5SUM="0020630b0be1ae8cee075e994c4feb8d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="JK Wood" -EMAIL="joshuakwood[at]gmail.com" diff --git a/games/PyLotRO/README b/games/PyLotRO/README deleted file mode 100644 index cbed665fa7..0000000000 --- a/games/PyLotRO/README +++ /dev/null @@ -1,11 +0,0 @@ -PyLotRO is a launcher for The Lord of the Rings Online and Dungeons -and Dragons Online for Linux and Mac OSX. This application gives a -graphical interface that allows both starting and patching/updating -the game when installed in Wine. - -The homepage for PyLotRO disappeared some time ago, but no further -development appears to be necessary. - -PyLotRO does not have any extra build dependencies beyond those -present in a full install of Slackware, but wine is required to -actually play either LOTRO or DDO. diff --git a/games/PyLotRO/doinst.sh b/games/PyLotRO/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/games/PyLotRO/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/games/PyLotRO/slack-desc b/games/PyLotRO/slack-desc deleted file mode 100644 index 471a87d1b8..0000000000 --- a/games/PyLotRO/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -PyLotRO: PyLotRO (Python launcher of Lord of the Rings Online) -PyLotRO: -PyLotRO: PyLotRO is a launcher for the Lord of the Rings Online MMO written -PyLotRO: in Python. It allows patching and beginning the game under Linux -PyLotRO: when installed in wine. -PyLotRO: PyLotRO should also work with Dungeons and Dragons Online (DDO). -PyLotRO: -PyLotRO: Homepage: -PyLotRO: https://sites.google.com/site/leeslinuxblog/installing-lotro-in-wine -PyLotRO: -PyLotRO: diff --git a/games/ags/ags.SlackBuild b/games/ags/ags.SlackBuild index ab08d344b7..1ab3530198 100644 --- a/games/ags/ags.SlackBuild +++ b/games/ags/ags.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ags -VERSION=${VERSION:-3.6.1.23} +VERSION=${VERSION:-3.6.1.24} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/ags/ags.info b/games/ags/ags.info index f094e76463..18fe5ee3cf 100644 --- a/games/ags/ags.info +++ b/games/ags/ags.info @@ -1,8 +1,8 @@ PRGNAM="ags" -VERSION="3.6.1.23" +VERSION="3.6.1.24" HOMEPAGE="https://github.com/adventuregamestudio/ags" -DOWNLOAD="https://github.com/adventuregamestudio/ags/archive/v3.6.1.23/ags-3.6.1.23.tar.gz" -MD5SUM="a69283fea676a89fdc810519932857ca" +DOWNLOAD="https://github.com/adventuregamestudio/ags/archive/v3.6.1.24/ags-3.6.1.24.tar.gz" +MD5SUM="db1d9a58de8d0f17fb97ee9ff4734c08" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="SDL2_sound" diff --git a/games/astromenace/astromenace.SlackBuild b/games/astromenace/astromenace.SlackBuild index 111003453d..e1efecf581 100644 --- a/games/astromenace/astromenace.SlackBuild +++ b/games/astromenace/astromenace.SlackBuild @@ -79,6 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i s/\#include\ \<cmath\>/\#include\ \<cmath\>\\n\#include\ \<cstdint\>/ ./src/core/model3d/model3d.cpp + cmake ./ # create Makefile make # build game diff --git a/games/atari_8bit_utils/README b/games/atari_8bit_utils/README new file mode 100644 index 0000000000..29e003d4f2 --- /dev/null +++ b/games/atari_8bit_utils/README @@ -0,0 +1,90 @@ +This is a collection of Atari 8-bit utilities that I've written, +mostly back in the 90s, for managing files for an Atari on a +Linux system. Whether you're using a real Atari or an emulator, +these can be handy tools. + +ATRFS + +Want to mount an ATR image as a native file system in Linux? +Now you can! + +This uses FUSE to create a user-space file system that allows +reading and writing of Atari file systems in ATR image files. +This requires no special root privileges. + +The framework is designed to be modular, making it relatively +simple to add support for new Atari file systems. + +BASIC Autorun + +There are lots of AUTORUN.SYS files for running BASIC programs, +but what if BASIC isn't available? Well, this one will enable +BASIC first if it's disabled on an XL/XE system. +If it's a 400/800/1200XL, it will display "BASIC REQUIRED" +and hang. Also, the command text is stored in ATASCII, +so it's easy to edit the binary. + +SIO2Linux + +Pavel Machek made an initial attempt at communicating with the +Atari through an SIO2PC cable using Linux's serial port drivers. +He came up with a simple floppy emulator he called "femul.c" + +I rewrote that to add a bunch of features: +* No kernel modules. + Unlike the AtariSIO project, this is just a simple user-space + program that uses a serial port device. +* Create new dynamically sized images + Each image starts as a 3-sector image file, but grows to + accomodate the highest-numbered sector written. +* Mount your native file system as an Atari disk + It's read-only for now, and it doesn't support subdirectories, + but each file is mapped to a different starting sector, and + as that sector is read, it automatically maps in the rest of + the file. + +Binary load file analyzer + +This program will tell you all about your binary-load format Atari +files, and even clean them up if there are specific problems. +It runs under DOS and Unix. +It includes the option to dump the 6502 assembly. + +BASIC analyzer + +This program will parse the structure of a BASIC program. +The most common use would be to check if a file is a valid BASIC +file, in which case, just redirect the output to /dev/null and +it's BASIC if the program returns success. It will parse down +the the line level. Parsing out the individual tokens could be +done in the future. + +Disk image format conversions + +Want to convert between DCM and ATR? Want to turn an ATR disk image +into individual files on your native file system (even creating +subdirectories for MyDos images!)? Or convert a directory full of +files back into a disk image? Well, check out these programs: + +* atr2unix +* unix2atr +* dcmtoatr + +Disk manager (Atari-side sector editor and much more) + +Back in the mid 80's, I wrote a sector editor in BASIC. +Over several years, I incorporated additional features and +tools, as well as re-wrote various routines in assembly language +for speed. I should have released it back then, but now I've +gone back through it and added a few extra features. +I also re-worked all of the assembly language code. + +MyDOS Binary Load Menu + +There are plenty of menu programs that let you select from a +list of programs and execute one, but this one goes a step further. +It supports MyDOS subdirectories and is driven by the joystick, +so it's ideal for a huge disk image of games. +I wrote this in 1994 in BASIC and compiled it with ABC. + +-- adapted from original Preston Crow file diff --git a/development/protobuf3/protobuf3.SlackBuild b/games/atari_8bit_utils/atari_8bit_utils.SlackBuild index 8a37164a7b..e1bbf5aede 100644 --- a/development/protobuf3/protobuf3.SlackBuild +++ b/games/atari_8bit_utils/atari_8bit_utils.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for protobuf3 +# Slackware build script for atari_8bit_utils -# Copyright 2017-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2024 Antonio Leal, Porto Salvo, Oeiras, Portugal # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,18 +22,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=protobuf3 -VERSION=${VERSION:-26.1} +PRGNAM=atari_8bit_utils +VERSION=${VERSION:-20240328_58d9431} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} - -GTEST=googletest-release -GTESTVERSION=${GTESTVERSION:-1.8.1} - -SRCNAM=protobuf +TARBALL=${TARBALL:-58d9431dcb958918d5b68456f969d5c12bd75d40} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -54,26 +51,22 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION +rm -rf $PRGNAM-$TARBALL +tar xvfz $CWD/$PRGNAM-$TARBALL.tar.gz +cd $PRGNAM-$TARBALL + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -81,40 +74,41 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/soversion.patch - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -Dprotobuf_BUILD_TESTS=OFF \ - -Dprotobuf_ABSL_PROVIDER=package \ - -Dprotobuf_BUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -# Install the python bindings: -tar xvf $CWD/$SRCNAM-5.$VERSION.tar.gz -cd $SRCNAM-5.$VERSION -LDFLAGS+=" -L$TMP/$SRCNAM-$VERSION/build" \ -PROTOC="$TMP/$SRCNAM-$VERSION/build/protoc" \ -python3 -m build --wheel --no-isolation -python3 -m installer --destdir "$PKG" dist/*.whl +# Build proggies +cd atrfs +sed -i -e "s:CFLAGS = -g -O0 -W -Wall # -g and -O0 for easier gdb debugging:CFLAGS = $SLKCFLAGS:" Makefile +make +cd ../disasm +sed -i -e "s:CFLAGS = -g -O0 -W -Wall # -g and -O0 for easier gdb debugging:CFLAGS = $SLKCFLAGS:" Makefile +make cd .. - -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la +for f in `ls -1 *.c` + do gcc $SLKCFLAGS $f -o `basename $f .c` +done + +# Setup package files +mkdir -p $PKG/usr/bin +install -D -m0755 atrfs/atrfs $PKG/usr/bin/atrfs +install -D -m0755 disasm/disasm $PKG/usr/bin/disasm +for f in `ls -1 *.c` + do install -D -m0755 `basename $f .c` $PKG/usr/bin/`basename $f .c` +done find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.txt LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cp README $PKG/usr/doc/$PRGNAM-$VERSION +cp LICENSE $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/atrfs +cp atrfs/README.TXT $PKG/usr/doc/$PRGNAM-$VERSION/atrfs +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/disasm +cp disasm/README $PKG/usr/doc/$PRGNAM-$VERSION/disasm + +mkdir -p $PKG/usr/share/$PRGNAM +cp -avxu basic_autorun $PKG/usr/share/$PRGNAM/ +cp -avxu mydos_bmenu $PKG/usr/share/$PRGNAM/ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/games/atari_8bit_utils/atari_8bit_utils.info b/games/atari_8bit_utils/atari_8bit_utils.info new file mode 100644 index 0000000000..0ed4b7efbe --- /dev/null +++ b/games/atari_8bit_utils/atari_8bit_utils.info @@ -0,0 +1,10 @@ +PRGNAM="atari_8bit_utils" +VERSION="20240328_58d9431" +HOMEPAGE="https://github.com/pcrow/atari_8bit_utils" +DOWNLOAD="https://github.com/pcrow/atari_8bit_utils/archive/58d9431/atari_8bit_utils-58d9431dcb958918d5b68456f969d5c12bd75d40.tar.gz" +MD5SUM="b1dfc350e9e5d8dbf43a79a1c3a75947" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Antonio Leal" +EMAIL="antonioleal@yahoo.com" diff --git a/games/atari_8bit_utils/slack-desc b/games/atari_8bit_utils/slack-desc new file mode 100644 index 0000000000..4da5ac2582 --- /dev/null +++ b/games/atari_8bit_utils/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +atari_8bit_utils: atari_8bit_utils (utilities for atari 8bit machines/emulators) +atari_8bit_utils: +atari_8bit_utils: atari_8bit_utils contains a set of utilities by Preston Crow for +atari_8bit_utils: atari 8 bit machines or emulators such atari 400/800, XL, XE. +atari_8bit_utils: +atari_8bit_utils: among others: mount atr disks, or convert atr formats.. +atari_8bit_utils: +atari_8bit_utils: +atari_8bit_utils: Homepage at https://github.com/pcrow/atari_8bit_utils +atari_8bit_utils: +atari_8bit_utils: diff --git a/games/boosteroid/boosteroid.info b/games/boosteroid/boosteroid.info index 91385f61f4..94ee0450ca 100644 --- a/games/boosteroid/boosteroid.info +++ b/games/boosteroid/boosteroid.info @@ -4,7 +4,7 @@ HOMEPAGE="https://www.boosteroid.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" DOWNLOAD_x86_64="https://boosteroid.com/linux/installer/boosteroid-install-x64.deb" -MD5SUM_x86_64="8ea633524913a88a7dd078a9d82e189d" +MD5SUM_x86_64="936f6c2bd325ea8008fd3f4ac84251a0" REQUIRES="" MAINTAINER="Jake Day" EMAIL="jake@ninebysix.com" diff --git a/games/d1x-rebirth/d1x-rebirth.SlackBuild b/games/d1x-rebirth/d1x-rebirth.SlackBuild index f9b3e8f86c..f917151022 100644 --- a/games/d1x-rebirth/d1x-rebirth.SlackBuild +++ b/games/d1x-rebirth/d1x-rebirth.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d1x-rebirth SRCNAM=dxx-rebirth -VERSION=${VERSION:-20220130_7258b7f} +VERSION=${VERSION:-20230520_695e8b9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/d1x-rebirth/d1x-rebirth.info b/games/d1x-rebirth/d1x-rebirth.info index f20bb59a15..488e219d16 100644 --- a/games/d1x-rebirth/d1x-rebirth.info +++ b/games/d1x-rebirth/d1x-rebirth.info @@ -1,8 +1,8 @@ PRGNAM="d1x-rebirth" -VERSION="20220130_7258b7f" +VERSION="20230520_695e8b9" HOMEPAGE="https://www.dxx-rebirth.com/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20220130_7258b7f.tar.xz" -MD5SUM="0aacba8e78a9a5cb5e52a5802604b13f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20230520_695e8b9.tar.xz" +MD5SUM="20daa2377b7cd13ada79b12da2b762d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="physfs" diff --git a/games/d2x-rebirth/d2x-rebirth.SlackBuild b/games/d2x-rebirth/d2x-rebirth.SlackBuild index 0cafd4fd74..1145e2fe58 100644 --- a/games/d2x-rebirth/d2x-rebirth.SlackBuild +++ b/games/d2x-rebirth/d2x-rebirth.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d2x-rebirth SRCNAM=dxx-rebirth -VERSION=${VERSION:-20220130_7258b7f} +VERSION=${VERSION:-20230520_695e8b9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/d2x-rebirth/d2x-rebirth.info b/games/d2x-rebirth/d2x-rebirth.info index 4c1f7a9b2e..a35c67c150 100644 --- a/games/d2x-rebirth/d2x-rebirth.info +++ b/games/d2x-rebirth/d2x-rebirth.info @@ -1,8 +1,8 @@ PRGNAM="d2x-rebirth" -VERSION="20220130_7258b7f" +VERSION="20230520_695e8b9" HOMEPAGE="https://www.dxx-rebirth.com/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20220130_7258b7f.tar.xz" -MD5SUM="0aacba8e78a9a5cb5e52a5802604b13f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20230520_695e8b9.tar.xz" +MD5SUM="20daa2377b7cd13ada79b12da2b762d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="physfs" diff --git a/games/ddnet/ddnet.SlackBuild b/games/ddnet/ddnet.SlackBuild index 9c0505f297..4f29fbef88 100644 --- a/games/ddnet/ddnet.SlackBuild +++ b/games/ddnet/ddnet.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ddnet SRCNAM=DDNet -VERSION=${VERSION:-18.1} +VERSION=${VERSION:-18.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,6 +73,9 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/games/ddnet/ddnet.info b/games/ddnet/ddnet.info index 718eaa839f..069312d0bb 100644 --- a/games/ddnet/ddnet.info +++ b/games/ddnet/ddnet.info @@ -1,7 +1,7 @@ PRGNAM="ddnet" -VERSION="18.1" +VERSION="18.2" HOMEPAGE="https://ddnet.org/" -DOWNLOAD="https://ddnet.org/downloads/DDNet-18.1.tar.xz \ +DOWNLOAD="https://ddnet.org/downloads/DDNet-18.2.tar.xz \ https://static.crates.io/crates/cc/cc-1.0.73.crate \ https://static.crates.io/crates/cxx/cxx-1.0.71.crate \ https://static.crates.io/crates/cxxbridge-flags/cxxbridge-flags-1.0.71.crate \ @@ -11,7 +11,7 @@ DOWNLOAD="https://ddnet.org/downloads/DDNet-18.1.tar.xz \ https://static.crates.io/crates/quote/quote-1.0.20.crate \ https://static.crates.io/crates/syn/syn-1.0.98.crate \ https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.1.crate" -MD5SUM="248c4beb3f27b5f75c209e81cbbd563b \ +MD5SUM="4da22b3f95ba0c01b0b85e36dd03d604 \ 8e3a4d0980acef2c4e74485a45de29a9 \ fda5c633e604f175e07829961763f18f \ a8b59a9c52b44b92ec73248f3c85c608 \ diff --git a/games/dwarffortress/dwarffortress.SlackBuild b/games/dwarffortress/dwarffortress.SlackBuild index ff95029f94..69cc222af2 100644 --- a/games/dwarffortress/dwarffortress.SlackBuild +++ b/games/dwarffortress/dwarffortress.SlackBuild @@ -21,12 +21,10 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - cd $(dirname $0) ; CWD=$(pwd) - PRGNAM=dwarffortress -VERSION=${VERSION:-0.50.11} -SRCNAM=df_50_11_linux +VERSION=${VERSION:-0.50.13} +SRCNAM=df_50_13_linux SRCDIR=df_linux BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -45,14 +43,6 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - BITFLAG="32" -elif [ "$ARCH" = "x86_64" ]; then - BITFLAG="" -else - BITFLAG="" -fi - TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -65,7 +55,7 @@ cd $PKG mkdir opt opt/$PRGNAM cd opt/$PRGNAM -tar pxvf $CWD/$SRCNAM$BITFLAG.tar.bz2 +tar pxvf $CWD/$SRCNAM.tar.bz2 chown -R root:root . chmod -R 755 . diff --git a/games/dwarffortress/dwarffortress.info b/games/dwarffortress/dwarffortress.info index 0f70dfdd1c..16bc9356e3 100644 --- a/games/dwarffortress/dwarffortress.info +++ b/games/dwarffortress/dwarffortress.info @@ -1,8 +1,8 @@ PRGNAM="dwarffortress" -VERSION="0.50.11" +VERSION="0.50.13" HOMEPAGE="https://bay12games.com/dwarves/" -DOWNLOAD="https://bay12games.com/dwarves/df_50_11_linux.tar.bz2" -MD5SUM="2974f9f6c563547b4fd40a65f9919593" +DOWNLOAD="https://bay12games.com/dwarves/df_50_13_linux.tar.bz2" +MD5SUM="1f8f3eb59d41ed86dba8dc08cb38f4d1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/dwarffortress/slack-desc b/games/dwarffortress/slack-desc index 8f8e6d21fb..e0dace8895 100644 --- a/games/dwarffortress/slack-desc +++ b/games/dwarffortress/slack-desc @@ -8,7 +8,7 @@ |-----handy-ruler------------------------------------------------------| dwarffortress: dwarffortress (A single-player fantasy simulator adventure game) dwarffortress: -dwarffortress: Dwarf Fortress is a complex sandbox game created by Tarn Adams of +dwarffortress: Dwarf Fortress is a complex sandbox game created by Tarn Adams of dwarffortress: Bay 12 Games. The graphics are ASCII with various tilesets available. dwarffortress: In Fortress Mode, the player helps their dwarves survive by declaring dwarffortress: areas to collect food, create workshops, create defenses, etc. diff --git a/games/etlegacy/etlegacy.SlackBuild b/games/etlegacy/etlegacy.SlackBuild index 8e6f118c35..5320f26836 100644 --- a/games/etlegacy/etlegacy.SlackBuild +++ b/games/etlegacy/etlegacy.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Slackware build script for etlegacy -# Copyright 2013-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=etlegacy -VERSION=${VERSION:-2.81.1} +VERSION=${VERSION:-2.82.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/etlegacy/etlegacy.info b/games/etlegacy/etlegacy.info index abc9dc421a..83415083af 100644 --- a/games/etlegacy/etlegacy.info +++ b/games/etlegacy/etlegacy.info @@ -1,10 +1,10 @@ PRGNAM="etlegacy" -VERSION="2.81.1" +VERSION="2.82.0" HOMEPAGE="https://www.etlegacy.com" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.81.1-i386.tar.gz" -MD5SUM="0770c036845a6aae69e984d5403785c6" -DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.81.1-x86_64.tar.gz" -MD5SUM_x86_64="4ccc5fde6b993dc2a4387fd62dba204b" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.82.0-i386.tar.gz" +MD5SUM="0b1a73b1d0b30805d4990aff6067385b" +DOWNLOAD_x86_64="https://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.82.0-x86_64.tar.gz" +MD5SUM_x86_64="18fe1febf6fe32954a6d504b56b35d4a" REQUIRES="%README% etlegacy-data" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/games/freeciv/freeciv.SlackBuild b/games/freeciv/freeciv.SlackBuild index a5bf1ae724..30d0c9da5e 100644 --- a/games/freeciv/freeciv.SlackBuild +++ b/games/freeciv/freeciv.SlackBuild @@ -30,8 +30,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=freeciv -VERSION=${VERSION:-3.1.0} -SRCVERSION=${SRCVERSION:-3.1.0} +VERSION=${VERSION:-3.1.1} +SRCVERSION=${SRCVERSION:-3.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/freeciv/freeciv.info b/games/freeciv/freeciv.info index b57bd89161..18fd0b06ba 100644 --- a/games/freeciv/freeciv.info +++ b/games/freeciv/freeciv.info @@ -1,8 +1,8 @@ PRGNAM="freeciv" -VERSION="3.1.0" +VERSION="3.1.1" HOMEPAGE="http://www.freeciv.org" -DOWNLOAD="http://files.freeciv.org/stable/freeciv-3.1.0.tar.xz" -MD5SUM="c6d2a68f74f2fdecf7a793ee926129a4" +DOWNLOAD="http://files.freeciv.org/stable/freeciv-3.1.1.tar.xz" +MD5SUM="84cc920acf453fafad95ea16fa46a924" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/galaxyv2/galaxyv2.info b/games/galaxyv2/galaxyv2.info index aae9abaddf..b127f317d8 100644 --- a/games/galaxyv2/galaxyv2.info +++ b/games/galaxyv2/galaxyv2.info @@ -1,10 +1,10 @@ PRGNAM="galaxyv2" VERSION="1.86" HOMEPAGE="http://www.galaxy-forces.com/" -DOWNLOAD="https://downloads.sourceforge.net/project/galaxyv2/galaxyv2/galaxyv2_1.86/galaxyv2_1.86_src.zip" -MD5SUM="60bd8c4993c513eb91bffe221734a1a1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://downloads.sourceforge.net/project/galaxyv2/galaxyv2/galaxyv2_1.86/galaxyv2_1.86_src.zip" +MD5SUM_x86_64="60bd8c4993c513eb91bffe221734a1a1" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/games/gzdoom/README b/games/gzdoom/README index c9017e9818..30176aa78d 100644 --- a/games/gzdoom/README +++ b/games/gzdoom/README @@ -10,9 +10,3 @@ your system, try installing gzdoom-legacy instead. Note that gzdoom and gzdoom-legacy conflict: only install one or the other. See README_SBo.txt for optional runtime dependencies. - -Note to 32-bit users: gzdoom requires the SSE2 extension. If you -get "illegal instruction" errors when trying to run gzdoom, your -CPU doesn't have SSE2, and you should use gzdoom-legacy instead. -At this point (2022), there aren't that many non-SSE2 x86 CPUs still -in service, so probably this won't be a problem for you. diff --git a/games/gzdoom/gzdoom.info b/games/gzdoom/gzdoom.info index 96cbbf7bc5..83f1c39a2e 100644 --- a/games/gzdoom/gzdoom.info +++ b/games/gzdoom/gzdoom.info @@ -1,10 +1,10 @@ PRGNAM="gzdoom" VERSION="4.10.0" HOMEPAGE="http://gzdoom.drdteam.org/" -DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g4.10.0/gzdoom-g4.10.0.tar.gz" -MD5SUM="54d8348650b8693fb545b20538e019ad" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/coelckers/gzdoom/archive/g4.10.0/gzdoom-g4.10.0.tar.gz" +MD5SUM_x86_64="54d8348650b8693fb545b20538e019ad" REQUIRES="zmusic" MAINTAINER="B. Watson" EMAIL="urchlay@slackware.uk" diff --git a/games/higan/higan.SlackBuild b/games/higan/higan.SlackBuild index 39d9901f01..31cd37b92a 100644 --- a/games/higan/higan.SlackBuild +++ b/games/higan/higan.SlackBuild @@ -116,6 +116,8 @@ chown -R root:root . # for its support files if they're not found in ~/.local/share/higan. patch -p1 -i $CWD/higan-flags.diff patch -p1 -i $CWD/higan-paths.diff +# 20240131 KEC: gcc-13.x compatibility +patch -p1 -i $CWD/includes.diff # 20181212 bkw: audio system stuff. Upstream doesn't give us a way to # disable these on the make command line, but hacking this file works: diff --git a/games/higan/includes.diff b/games/higan/includes.diff new file mode 100644 index 0000000000..09b1a5bc2b --- /dev/null +++ b/games/higan/includes.diff @@ -0,0 +1,8 @@ +--- higan-106.orig/nall/arithmetic/natural.hpp 2024-01-31 09:12:37.166634947 +0900 ++++ higan-106/nall/arithmetic/natural.hpp 2024-01-31 09:12:58.147526383 +0900 +@@ -1,3 +1,5 @@ ++#include <stdexcept> ++ + #define ConcatenateType(Size) uint##Size##_t + #define DeclareType(Size) ConcatenateType(Size) + diff --git a/games/lbreakouthd/lbreakouthd.SlackBuild b/games/lbreakouthd/lbreakouthd.SlackBuild index 99f74b7cf2..00fb105958 100644 --- a/games/lbreakouthd/lbreakouthd.SlackBuild +++ b/games/lbreakouthd/lbreakouthd.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lbreakouthd -VERSION=${VERSION:-1.1.7} +VERSION=${VERSION:-1.1.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/lbreakouthd/lbreakouthd.info b/games/lbreakouthd/lbreakouthd.info index b075b57837..447090c0cb 100644 --- a/games/lbreakouthd/lbreakouthd.info +++ b/games/lbreakouthd/lbreakouthd.info @@ -1,8 +1,8 @@ PRGNAM="lbreakouthd" -VERSION="1.1.7" +VERSION="1.1.8" HOMEPAGE="https://lgames.sourceforge.io/LBreakoutHD/" -DOWNLOAD="https://sourceforge.net/projects/lgames/files/lbreakouthd/lbreakouthd-1.1.7.tar.gz" -MD5SUM="2525f94abb7383a4067b84f1ca44b92b" +DOWNLOAD="https://sourceforge.net/projects/lgames/files/lbreakouthd/lbreakouthd-1.1.8.tar.gz" +MD5SUM="d0af6085ca948059cb46145285c57b18" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/maelstrom/maelstrom.SlackBuild b/games/maelstrom/maelstrom.SlackBuild index 88cddc94c8..2a0fc29553 100644 --- a/games/maelstrom/maelstrom.SlackBuild +++ b/games/maelstrom/maelstrom.SlackBuild @@ -80,7 +80,7 @@ sed -i '/GAME_INSTALLDIR=.*games/s,/games,/share/games,' configure # on -current (and it does no harm on 14.2 either): sed -i 's,struct *button,struct b_utton,g' buttonlist.h -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/games/melonds/melonds.info b/games/melonds/melonds.info index 555f3cb883..70c8d2495a 100644 --- a/games/melonds/melonds.info +++ b/games/melonds/melonds.info @@ -1,10 +1,10 @@ PRGNAM="melonds" VERSION="0.9.5" HOMEPAGE="https://melonds.kuribo64.net" -DOWNLOAD="https://github.com/melonDS-emu/melonDS/archive/0.9.5/melonDS-0.9.5.tar.gz" -MD5SUM="23ee3637af072854371675b9e61ab96d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/melonDS-emu/melonDS/archive/0.9.5/melonDS-0.9.5.tar.gz" +MD5SUM_x86_64="23ee3637af072854371675b9e61ab96d" REQUIRES="libslirp" MAINTAINER="Steven Voges" EMAIL="svoges.sbo@gmail.com" diff --git a/games/micropolis/micropolis.SlackBuild b/games/micropolis/micropolis.SlackBuild index bd09100122..b964a874b9 100644 --- a/games/micropolis/micropolis.SlackBuild +++ b/games/micropolis/micropolis.SlackBuild @@ -93,7 +93,7 @@ run_make() { DOCDIR=$DOCDIR \ DATADIR=/usr/share/games/$PRGNAM \ BINDIR=/usr/games \ - SLKCFLAGS="$SLKCFLAGS -DTCL_IEEE_FP_MATH" \ + SLKCFLAGS="$SLKCFLAGS -DTCL_IEEE_FP_MATH -fpermissive" \ DESTDIR=$PKG \ "$@" } diff --git a/games/openttd/openttd.SlackBuild b/games/openttd/openttd.SlackBuild index f7e8f0912e..dcf0ae6f50 100644 --- a/games/openttd/openttd.SlackBuild +++ b/games/openttd/openttd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=openttd -VERSION=${VERSION:-13.4} +VERSION=${VERSION:-14.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/openttd/openttd.info b/games/openttd/openttd.info index 7ba1d9ef92..88fd22d9c2 100644 --- a/games/openttd/openttd.info +++ b/games/openttd/openttd.info @@ -1,11 +1,11 @@ PRGNAM="openttd" -VERSION="13.4" +VERSION="14.0" HOMEPAGE="http://www.openttd.org" -DOWNLOAD="https://cdn.openttd.org/openttd-releases/13.4/openttd-13.4-source.tar.xz \ +DOWNLOAD="https://cdn.openttd.org/openttd-releases/14.0/openttd-14.0-source.tar.xz \ https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip \ https://cdn.openttd.org/openmsx-releases/0.4.2/openmsx-0.4.2-all.zip \ https://cdn.openttd.org/opensfx-releases/1.0.3/opensfx-1.0.3-all.zip" -MD5SUM="ed42437a6f33e83b3e27f9ebd988efc4 \ +MD5SUM="f8244406ab5a1efcdf4fe8d173516a5a \ f3cd9de89db7caf37a2e5c4c70fb1304 \ 7f853e6b6e673268165a09265ed284b0 \ 4cd2a4f8b2e160f8754736beb4d31ccd" diff --git a/games/pioneer/gcc-14.diff b/games/pioneer/gcc-14.diff new file mode 100644 index 0000000000..f71de6c62b --- /dev/null +++ b/games/pioneer/gcc-14.diff @@ -0,0 +1,10 @@ +--- src/Input.h.orig 2024-05-18 09:08:26.973952781 +0900 ++++ src/Input.h 2024-05-18 09:08:44.313951316 +0900 +@@ -12,6 +12,7 @@ + #include <vector> + #include <map> + #include <string> ++#include <algorithm> + + class IniConfig; + diff --git a/games/pioneer/pioneer.SlackBuild b/games/pioneer/pioneer.SlackBuild index d7d399338f..3162d6de45 100644 --- a/games/pioneer/pioneer.SlackBuild +++ b/games/pioneer/pioneer.SlackBuild @@ -85,6 +85,8 @@ fi # Fix save compatibility (#5798). patch -p0 < $CWD/save-compat.diff +# GCC 14 compatibility. +patch -p0 < $CWD/gcc-14.diff GLEW=OFF LUA=OFF diff --git a/games/planetblupi/planetblupi.SlackBuild b/games/planetblupi/planetblupi.SlackBuild index 50fba689fc..3dcafa93b7 100644 --- a/games/planetblupi/planetblupi.SlackBuild +++ b/games/planetblupi/planetblupi.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=planetblupi -VERSION=${VERSION:-1.15.0} +VERSION=${VERSION:-1.15.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/planetblupi/planetblupi.info b/games/planetblupi/planetblupi.info index 38db5bb805..3b8b04b920 100644 --- a/games/planetblupi/planetblupi.info +++ b/games/planetblupi/planetblupi.info @@ -1,9 +1,9 @@ PRGNAM="planetblupi" -VERSION="1.15.0" +VERSION="1.15.1" HOMEPAGE="http://www.blupi.org/" -DOWNLOAD="https://github.com/blupi-games/planetblupi/archive/v1.15.0/planetblupi-1.15.0.tar.gz \ +DOWNLOAD="https://github.com/blupi-games/planetblupi/archive/v1.15.1/planetblupi-1.15.1.tar.gz \ https://github.com/libsdl-org/SDL_ttf/archive/release-2.20.2/SDL_ttf-release-2.20.2.tar.gz" -MD5SUM="25820360b1f778ff8232c63a6cc4e337 \ +MD5SUM="030fa1514b0e2fe2088aae9b9023e4f7 \ b584f806d65e9c5ced69b99b12828bee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch b/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch new file mode 100644 index 0000000000..9f8a1111e4 --- /dev/null +++ b/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch @@ -0,0 +1,374 @@ +From f42fa9a604f9f4faa1addd1b02c491cd0fe59736 Mon Sep 17 00:00:00 2001 +From: "grover92000@gmail.com" <grover92000@gmail.com> +Date: Sat, 20 Apr 2024 13:29:24 -0400 +Subject: [PATCH] Changes for boost-1.85 + +--- + src/core/common/avatarmanager.cpp | 49 +++++++++++++++++++ + src/core/common/loghelper_server.cpp | 4 ++ + src/engine/log.cpp | 4 ++ + src/engine/log.h | 4 ++ + .../qt/qttools/nonqthelper/nonqthelper.cpp | 8 +++ + src/net/common/clientstate.cpp | 19 +++++++ + src/net/common/clientthread.cpp | 4 ++ + src/net/common/downloaderthread.cpp | 8 +++ + src/net/common/serverlobbythread.cpp | 8 +++ + src/net/common/uploaderthread.cpp | 4 ++ + src/pokerth_server.cpp | 4 ++ + 11 files changed, 116 insertions(+) + +diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp +index d137a5c44..9b2f4abaa 100644 +--- a/src/core/common/avatarmanager.cpp ++++ b/src/core/common/avatarmanager.cpp +@@ -87,20 +87,36 @@ AvatarManager::Init(const string &dataDir, const string &cacheDir) + path tmpDataPath(dataDir); + { + boost::mutex::scoped_lock lock(m_cacheDirMutex); ++#if BOOST_VERSION < 108500 + m_cacheDir = tmpCachePath.directory_string(); ++#else ++ m_cacheDir = tmpCachePath.string(); ++#endif + } + { + boost::mutex::scoped_lock lock(m_avatarsMutex); ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").directory_string(), m_avatars); ++#else ++ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").string(), m_avatars); ++#endif + retVal = retVal && tmpRet; ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").directory_string(), m_avatars); ++#else ++ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").string(), m_avatars); ++#endif + retVal = retVal && tmpRet; + } + if (cacheDir.empty() || tmpCachePath.empty()) + LOG_ERROR("Cache directory was not set!"); + else { + boost::mutex::scoped_lock lock(m_cachedAvatarsMutex); ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory(tmpCachePath.directory_string(), m_cachedAvatars); ++#else ++ tmpRet = InternalReadDirectory(tmpCachePath.string(), m_cachedAvatars); ++#endif + retVal = retVal && tmpRet; + } + +@@ -113,7 +129,11 @@ AvatarManager::AddSingleAvatar(const std::string &fileName) + { + bool retVal = false; + path filePath(fileName); ++#if BOOST_VERSION < 108500 + string tmpFileName(filePath.file_string()); ++#else ++ string tmpFileName(filePath.string()); ++#endif + + if (!fileName.empty() && !tmpFileName.empty()) { + unsigned outFileSize = 0; +@@ -240,7 +260,11 @@ AvatarManager::GetAvatarFileType(const string &fileName) + AvatarFileType fileType; + + path filePath(fileName); ++#if BOOST_VERSION < 108500 + string ext(extension(filePath)); ++#else ++ string ext(filePath.extension().string()); ++#endif + if (boost::algorithm::iequals(ext, ".png")) + fileType = AVATAR_FILE_TYPE_PNG; + else if (boost::algorithm::iequals(ext, ".jpg") || boost::algorithm::iequals(ext, ".jpeg")) +@@ -362,7 +386,11 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil + if (IsValidAvatarFileType(avatarFileType, data, size)) { + path tmpPath(cacheDir); + tmpPath /= (md5buf.ToString() + ext); ++#if BOOST_VERSION < 108500 + string fileName(tmpPath.file_string()); ++#else ++ string fileName(tmpPath.string()); ++#endif + std::ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); + if (!o.fail()) { + o.write((const char *)data, size); +@@ -426,7 +454,11 @@ AvatarManager::RemoveOldAvatarCacheEntries() + } + try { + path cachePath(cacheDir); ++#if BOOST_VERSION < 108500 + cacheDir = cachePath.directory_string(); ++#else ++ cacheDir = cachePath.string(); ++#endif + // Never delete anything if we do not have a special cache dir set. + if (!cacheDir.empty()) { + boost::mutex::scoped_lock lock(m_cachedAvatarsMutex); +@@ -441,12 +473,20 @@ AvatarManager::RemoveOldAvatarCacheEntries() + while (i != end) { + bool keepFile = false; + path filePath(i->second); ++#if BOOST_VERSION < 108500 + string fileString(filePath.file_string()); ++#else ++ string fileString(filePath.string()); ++#endif + // Only consider files which are definitely in the cache dir. + if (fileString.size() > cacheDir.size() && fileString.substr(0, cacheDir.size()) == cacheDir) { + // Only consider files with MD5 as file name. + MD5Buf tmpBuf; ++#if BOOST_VERSION < 108500 + if (exists(filePath) && tmpBuf.FromString(basename(filePath))) { ++#else ++ if (exists(filePath) && tmpBuf.FromString(filePath.stem().string())) { ++#endif + timeMap.insert(TimeAvatarMap::value_type(last_write_time(filePath), i->first)); + keepFile = true; + } +@@ -520,10 +560,19 @@ AvatarManager::InternalReadDirectory(const std::string &dir, AvatarMap &avatars) + directory_iterator end; + + while (i != end) { ++#if BOOST_VERSION < 108500 + if (is_regular(i->status())) { + string md5sum(basename(i->path())); ++#else ++ if (is_regular_file(i->status())) { ++ string md5sum(i->path().stem().string()); ++#endif + MD5Buf md5buf; ++#if BOOST_VERSION < 108500 + string fileName(i->path().file_string()); ++#else ++ string fileName(i->path().string()); ++#endif + if (md5buf.FromString(md5sum)) { + // Only consider files with md5sum as name. + avatars.insert(AvatarMap::value_type(md5buf, fileName)); +diff --git a/src/core/common/loghelper_server.cpp b/src/core/common/loghelper_server.cpp +index a0d0350ed..f3e8366b2 100644 +--- a/src/core/common/loghelper_server.cpp ++++ b/src/core/common/loghelper_server.cpp +@@ -59,7 +59,11 @@ loghelper_init(const string &logDir, int logLevel) + path tmpLogFile(logDir); + tmpLogFile /= SERVER_MSG_LOG_FILE_NAME; + ++#if BOOST_VERSION < 108500 + g_logFile = tmpLogFile.directory_string(); ++#else ++ g_logFile = tmpLogFile.string(); ++#endif + g_logLevel = logLevel; + } + +diff --git a/src/engine/log.cpp b/src/engine/log.cpp +index 1f50fde2e..c6fe7f8e1 100644 +--- a/src/engine/log.cpp ++++ b/src/engine/log.cpp +@@ -84,7 +84,11 @@ Log::init() + mySqliteLogFileName /= string("pokerth-log-") + curDateTime + ".pdb"; + + // open sqlite-db ++#if BOOST_VERSION < 108500 + sqlite3_open(mySqliteLogFileName.directory_string().c_str(), &mySqliteLogDb); ++#else ++ sqlite3_open(mySqliteLogFileName.string().c_str(), &mySqliteLogDb); ++#endif + if( mySqliteLogDb != 0 ) { + + int i; +diff --git a/src/engine/log.h b/src/engine/log.h +index 7dbf2514d..0a79c5377 100644 +--- a/src/engine/log.h ++++ b/src/engine/log.h +@@ -73,7 +73,11 @@ class Log + + std::string getMySqliteLogFileName() + { ++#if BOOST_VERSION < 108500 + return mySqliteLogFileName.directory_string(); ++#else ++ return mySqliteLogFileName.string(); ++#endif + } + + private: +diff --git a/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp b/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp +index 2acfeeb45..bdc625b4a 100644 +--- a/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp ++++ b/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp +@@ -65,7 +65,15 @@ std::string + NonQtHelper::getDataPathStdString(const char *argv0) + { + boost::filesystem::path startPath(argv0); ++#if BOOST_VERSION < 108500 + startPath = startPath.remove_leaf(); ++#else ++ startPath = startPath.remove_filename(); ++#endif + startPath /= "data"; ++#if BOOST_VERSION < 108500 + return stringToUtf8(startPath.directory_string()); ++#else ++ return stringToUtf8(startPath.string()); ++#endif + } +diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp +index d7fc7285a..9d35e99ff 100644 +--- a/src/net/common/clientstate.cpp ++++ b/src/net/common/clientstate.cpp +@@ -211,7 +211,11 @@ ClientStateStartServerListDownload::Enter(boost::shared_ptr<ClientThread> client + } else { + // Download the server list. + boost::shared_ptr<DownloadHelper> downloader(new DownloadHelper); ++#if BOOST_VERSION < 108500 + downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.directory_string()); ++#else ++ downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.string()); ++#endif + ClientStateDownloadingServerList::Instance().SetDownloadHelper(downloader); + client->SetState(ClientStateDownloadingServerList::Instance()); + } +@@ -303,13 +307,24 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client) + path zippedServerListPath(context.GetCacheDir()); + zippedServerListPath /= context.GetServerListUrl().substr(context.GetServerListUrl().find_last_of('/') + 1); + path xmlServerListPath; ++#if BOOST_VERSION < 108500 + if (extension(zippedServerListPath) == ".z") { + xmlServerListPath = change_extension(zippedServerListPath, ""); ++#else ++ if (zippedServerListPath.extension().string() == ".z") { ++ xmlServerListPath = zippedServerListPath; ++ xmlServerListPath.replace_extension(""); ++#endif + + // Unzip the file using zlib. + try { ++#if BOOST_VERSION < 108500 + std::ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary); + std::ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc); ++#else ++ std::ifstream inFile(zippedServerListPath.string().c_str(), ios_base::in | ios_base::binary); ++ std::ofstream outFile(xmlServerListPath.string().c_str(), ios_base::out | ios_base::trunc); ++#endif + boost::iostreams::filtering_streambuf<boost::iostreams::input> in; + in.push(boost::iostreams::zlib_decompressor()); + in.push(inFile); +@@ -321,7 +336,11 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client) + xmlServerListPath = zippedServerListPath; + + // Parse the server address. ++#if BOOST_VERSION < 108500 + TiXmlDocument doc(xmlServerListPath.directory_string()); ++#else ++ TiXmlDocument doc(xmlServerListPath.string()); ++#endif + + if (doc.LoadFile()) { + client->ClearServerInfoMap(); +diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp +index dee5daf68..e24413d14 100644 +--- a/src/net/common/clientthread.cpp ++++ b/src/net/common/clientthread.cpp +@@ -977,7 +977,11 @@ ClientThread::GetCacheServerListFileName() + size_t pos = serverListUrl.find_last_of('/'); + if (!GetContext().GetCacheDir().empty() && !serverListUrl.empty() && pos != string::npos && ++pos < serverListUrl.length()) { + tmpServerListPath /= serverListUrl.substr(pos); ++#if BOOST_VERSION < 108500 + fileName = tmpServerListPath.directory_string(); ++#else ++ fileName = tmpServerListPath.string(); ++#endif + } + return fileName; + } +diff --git a/src/net/common/downloaderthread.cpp b/src/net/common/downloaderthread.cpp +index 56a9526ec..7984cb410 100644 +--- a/src/net/common/downloaderthread.cpp ++++ b/src/net/common/downloaderthread.cpp +@@ -96,7 +96,11 @@ DownloaderThread::Main() + // Previous download was finished. + if (m_curDownloadData) { + path filepath(m_curDownloadData->filename); ++#if BOOST_VERSION < 108500 + std::ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary); ++#else ++ std::ifstream instream(filepath.string().c_str(), ios_base::in | ios_base::binary); ++#endif + // Find out file size. + // Not fully portable, but works on win/linux/mac. + instream.seekg(0, ios_base::beg); +@@ -132,7 +136,11 @@ DownloaderThread::Main() + } + if (m_curDownloadData && !m_curDownloadData->filename.empty()) { + path filepath(m_curDownloadData->filename); ++#if BOOST_VERSION < 108500 + m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string()); ++#else ++ m_downloadHelper->Init(m_curDownloadData->address, filepath.string()); ++#endif + m_downloadInProgress = true; + } + } +diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp +index 1cb341eaa..d3964895d 100644 +--- a/src/net/common/serverlobbythread.cpp ++++ b/src/net/common/serverlobbythread.cpp +@@ -277,7 +277,11 @@ ServerLobbyThread::Init(const string &logDir) + boost::filesystem::path logPath(logDir); + if (!logDir.empty()) { + logPath /= SERVER_STATISTICS_FILE_NAME; ++#if BOOST_VERSION < 108500 + m_statisticsFileName = logPath.directory_string(); ++#else ++ m_statisticsFileName = logPath.string(); ++#endif + ReadStatisticsFile(); + } + } +@@ -1264,7 +1268,11 @@ ServerLobbyThread::HandleNetPacketAvatarEnd(boost::shared_ptr<SessionData> sessi + // Init finished - start session. + EstablishSession(session); + LOG_MSG("Client \"" << session->GetClientAddr() << "\" uploaded avatar \"" ++#if BOOST_VERSION < 108500 + << boost::filesystem::path(avatarFileName).file_string() << "\"."); ++#else ++ << boost::filesystem::path(avatarFileName).string() << "\"."); ++#endif + } else + SessionError(session, ERR_NET_WRONG_AVATAR_SIZE); + } +diff --git a/src/net/common/uploaderthread.cpp b/src/net/common/uploaderthread.cpp +index f1eefea6c..ecf1436d9 100644 +--- a/src/net/common/uploaderthread.cpp ++++ b/src/net/common/uploaderthread.cpp +@@ -94,7 +94,11 @@ UploaderThread::Main() + url += filepath.filename().string(); + #endif + } ++#if BOOST_VERSION < 108500 + m_uploadHelper->Init(url, filepath.file_string(), data.user, data.pwd, data.filesize, data.httpPost); ++#else ++ m_uploadHelper->Init(url, filepath.string(), data.user, data.pwd, data.filesize, data.httpPost); ++#endif + m_uploadInProgress = true; + } + } +diff --git a/src/pokerth_server.cpp b/src/pokerth_server.cpp +index 450a47e9d..1ee0db80e 100644 +--- a/src/pokerth_server.cpp ++++ b/src/pokerth_server.cpp +@@ -158,7 +158,11 @@ main(int argc, char *argv[]) + if (pidFile.empty()) { + path tmpPidPath(myConfig->readConfigString("LogDir")); + tmpPidPath /= "pokerth.pid"; ++#if BOOST_VERSION < 108500 + pidFile = tmpPidPath.directory_string(); ++#else ++ pidFile = tmpPidPath.string(); ++#endif + } + { + std::ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc); diff --git a/games/pokerth/pokerth.SlackBuild b/games/pokerth/pokerth.SlackBuild index 338635b115..456fff3fc5 100644 --- a/games/pokerth/pokerth.SlackBuild +++ b/games/pokerth/pokerth.SlackBuild @@ -88,6 +88,7 @@ find -L . \ patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch ) patch -p1 < $CWD/patches/pokerth-1.1.2-newer-protobuf.patch +patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.85.patch qmake-qt5 QMAKE_CFLAGS_ISYSTEM= -spec linux-g++ pokerth.pro make diff --git a/games/ppsspp/ppsspp.SlackBuild b/games/ppsspp/ppsspp.SlackBuild index cda92afb6c..7282983268 100644 --- a/games/ppsspp/ppsspp.SlackBuild +++ b/games/ppsspp/ppsspp.SlackBuild @@ -87,6 +87,10 @@ sed -i -e '/include(ccache)/d' CMakeLists.txt # set git-version sed -i "s/unknown/${VERSION}/" git-version.cmake +# Build the internal ffmpeg (it's the only one supported by upstream) +( cd ffmpeg + ./linux_x86-64.sh ) + if [ "${QT:-OFF}" = "ON" ]; then cmake -B build-qt \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -95,7 +99,6 @@ if [ "${QT:-OFF}" = "ON" ]; then -DCMAKE_SKIP_RPATH=TRUE \ -DUSING_QT_UI=ON \ -DUSE_SYSTEM_LIBZIP=ON \ - -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_DISCORD=OFF \ -DUSE_SYSTEM_ZSTD=ON \ -DCMAKE_BUILD_TYPE=Release @@ -111,7 +114,6 @@ cmake -B build-sdl \ -DCMAKE_SKIP_RPATH=TRUE \ -DUSING_QT_UI=OFF \ -DUSE_SYSTEM_LIBZIP=ON \ - -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_DISCORD=OFF \ -DUSE_SYSTEM_ZSTD=ON \ -DCMAKE_BUILD_TYPE=Release diff --git a/games/quakespasm/quakespasm.SlackBuild b/games/quakespasm/quakespasm.SlackBuild index 8139ffc37a..0e4695cd94 100644 --- a/games/quakespasm/quakespasm.SlackBuild +++ b/games/quakespasm/quakespasm.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for quakespasm -# Copyright 2018-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2018-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=quakespasm -VERSION=${VERSION:-0.95.1} +VERSION=${VERSION:-0.96.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/games/quakespasm/quakespasm.info b/games/quakespasm/quakespasm.info index 69473df54d..3b6dc64613 100644 --- a/games/quakespasm/quakespasm.info +++ b/games/quakespasm/quakespasm.info @@ -1,8 +1,8 @@ PRGNAM="quakespasm" -VERSION="0.95.1" +VERSION="0.96.1" HOMEPAGE="https://quakespasm.sourceforge.net" -DOWNLOAD="https://downloads.sourceforge.net/quakespasm/quakespasm-0.95.1.tar.gz" -MD5SUM="5445eaab666b1a8c229c4900dc9f8542" +DOWNLOAD="https://downloads.sourceforge.net/quakespasm/quakespasm-0.96.1.tar.gz" +MD5SUM="37ea60a01b5cc852ab7635df89496301" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/scid_vs_pc/scid_vs_pc.info b/games/scid_vs_pc/scid_vs_pc.info index 5209c294c9..2639301ee6 100644 --- a/games/scid_vs_pc/scid_vs_pc.info +++ b/games/scid_vs_pc/scid_vs_pc.info @@ -2,7 +2,7 @@ PRGNAM="scid_vs_pc" VERSION="4.24" HOMEPAGE="https://scidvspc.sourceforge.net/" DOWNLOAD="https://downloads.sourceforge.net/project/scidvspc/source/scid_vs_pc-4.24.tgz" -MD5SUM="3b7d710ac5ccd6ac3b72145328099349" +MD5SUM="8fbb32863f06beb1fe1e16edb4413089" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/snes9x/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch b/games/snes9x/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch new file mode 100644 index 0000000000..cb08f0d87a --- /dev/null +++ b/games/snes9x/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch @@ -0,0 +1,29 @@ +From 2afe4a11d43e8767cbeb90372177d4b580384e9a Mon Sep 17 00:00:00 2001 +From: BearOso <bearoso@gmail.com> +Date: Mon, 1 May 2023 11:38:54 -0500 +Subject: [PATCH] CI acting funky. See if this fixes it. + +--- + vulkan/vulkan_context.hpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/vulkan/vulkan_context.hpp b/vulkan/vulkan_context.hpp +index cfc29eda2..33ec20c5f 100644 +--- a/vulkan/vulkan_context.hpp ++++ b/vulkan/vulkan_context.hpp +@@ -7,6 +7,8 @@ + #undef WINVER + #define WINVER 0x599 + #endif ++#include <cstdio> ++#include <cstdint> + #include "vk_mem_alloc.hpp" + #include "vulkan/vulkan.hpp" + #include "vulkan_swapchain.hpp" +@@ -64,4 +66,4 @@ class Context + vk::CommandBuffer one_time_use_cmd; + }; + +-} // namespace Vulkan +\ No newline at end of file ++} // namespace Vulkan diff --git a/games/snes9x/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch b/games/snes9x/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch new file mode 100644 index 0000000000..af1866533e --- /dev/null +++ b/games/snes9x/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch @@ -0,0 +1,28 @@ +From b383b94c8c94e3a28b09e7dd3d72cac2a783ba55 Mon Sep 17 00:00:00 2001 +From: BearOso <bearoso@gmail.com> +Date: Sun, 30 Apr 2023 17:18:39 -0500 +Subject: [PATCH] slang: Fix CI build. + +--- + vulkan/slang_shader.hpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/vulkan/slang_shader.hpp b/vulkan/slang_shader.hpp +index 8af9f48d9..6e24bcd8d 100644 +--- a/vulkan/slang_shader.hpp ++++ b/vulkan/slang_shader.hpp +@@ -1,6 +1,7 @@ + #pragma once + #include <string> + #include <vector> ++#include <cstdint> + + struct SlangShader + { +@@ -101,4 +102,4 @@ struct SlangShader + int ubo_binding; + std::vector<Uniform> uniforms; + std::vector<Sampler> samplers; +-}; +\ No newline at end of file ++}; diff --git a/games/snes9x/snes9x.SlackBuild b/games/snes9x/snes9x.SlackBuild index ad26551806..a48e38a0a1 100644 --- a/games/snes9x/snes9x.SlackBuild +++ b/games/snes9x/snes9x.SlackBuild @@ -84,6 +84,9 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +patch -p1 < $CWD/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch +patch -p1 < $CWD/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch + WITHPULSE=yes if [ "$PULSE" = "no" ] || ! pkg-config --exists libpulse; then PULSEOPT="-DUSE_PULSEAUDIO=OFF" diff --git a/games/supertux/gcc12.patch b/games/supertux/gcc12.patch new file mode 100644 index 0000000000..f5e7392c3c --- /dev/null +++ b/games/supertux/gcc12.patch @@ -0,0 +1,11 @@ +diff -upr SuperTux-v0.6.3-Source.orig/external/partio_zip/zip_manager.cpp SuperTux-v0.6.3-Source/external/partio_zip/zip_manager.cpp +--- SuperTux-v0.6.3-Source.orig/external/partio_zip/zip_manager.cpp 2021-12-23 01:01:58.000000000 +0200 ++++ SuperTux-v0.6.3-Source/external/partio_zip/zip_manager.cpp 2022-06-13 15:20:45.305976668 +0300 +@@ -47,6 +47,7 @@ extern "C"{ + #include <stdexcept> + #include <cstring> + #include <string> ++#include <memory> + + #include "zip_manager.hpp" + diff --git a/games/supertux/missing-include-for-FLT_EPSILON.patch b/games/supertux/missing-include-for-FLT_EPSILON.patch new file mode 100644 index 0000000000..44bc370a74 --- /dev/null +++ b/games/supertux/missing-include-for-FLT_EPSILON.patch @@ -0,0 +1,13 @@ +diff --git a/src/supertux/game_session.cpp b/src/supertux/game_session.cpp +index 41de52e..a8ebfc9 100644 +--- a/src/supertux/game_session.cpp ++++ b/src/supertux/game_session.cpp +@@ -14,6 +14,8 @@ + // You should have received a copy of the GNU General Public License + // along with this program. If not, see <http://www.gnu.org/licenses/>. + ++#include <cfloat> ++ + #include "supertux/game_session.hpp" + + #include "audio/sound_manager.hpp" diff --git a/games/supertux/supertux.SlackBuild b/games/supertux/supertux.SlackBuild index a492e216aa..26795a4bbd 100644 --- a/games/supertux/supertux.SlackBuild +++ b/games/supertux/supertux.SlackBuild @@ -84,6 +84,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/gcc12.patch +patch -p1 < $CWD/missing-include-for-FLT_EPSILON.patch + mkdir -p build cd build cmake \ diff --git a/games/term2048/README b/games/term2048/README deleted file mode 100644 index c7315554d8..0000000000 --- a/games/term2048/README +++ /dev/null @@ -1,2 +0,0 @@ -2048 in your terminal. -Join the numbers and get to the 2048 tile! diff --git a/games/term2048/doinst.sh b/games/term2048/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/games/term2048/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/games/term2048/term2048.info b/games/term2048/term2048.info deleted file mode 100644 index 72361790be..0000000000 --- a/games/term2048/term2048.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="term2048" -VERSION="0.2.5" -HOMEPAGE="https://github.com/bfontaine/term2048" -DOWNLOAD="https://github.com/bfontaine/term2048/archive/0.2.5/term2048-0.2.5.tar.gz" -MD5SUM="e74772b2b92f7a8ce4b8afa9c0f8b9f1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="colorama" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/games/tome/aur-tome4.patch b/games/tome/aur-tome4.patch new file mode 100644 index 0000000000..7c24269af3 --- /dev/null +++ b/games/tome/aur-tome4.patch @@ -0,0 +1,457 @@ +diff -Naur orig/build/runner.lua new/build/runner.lua +--- orig/build/runner.lua 2014-05-19 10:42:12.000000000 +0200 ++++ new/build/runner.lua 2020-10-30 23:01:51.861023690 +0100 +@@ -24,28 +24,28 @@ + files { "../src/runner/main.c", "../src/getself.c" } + links { "m" } + +- configuration "linux" ++ filter "system:linux" + links { "dl", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + +- configuration "bsd" ++ filter "system:bsd" + links { "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "OPENGL32", "GLU32", "wsock32" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + linkoptions { "../src/windows/icon.res" } + +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + linkoptions { "-framework SDL", "-framework SDL_image", "-framework SDL_ttf", "-framework SDL_mixer", "-framework Cocoa", "-framework OpenGL" } + links { "IOKit" } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/t-engine ../t-engine", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/t-engine ../t-engine", } + + project "te4runner" +@@ -58,19 +58,19 @@ + files { "../src/runner/runner.c", "../src/physfs.c", "../src/auxiliar.c" } + links { "runner-physfs", "runner-lua", "m" } + +- configuration "linux" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } +- configuration "bsd" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } +- +- configuration "windows" +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:linux" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } ++ filter "system:bsd" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } ++ ++ filter "system:windows" ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/te4runner.tec ../", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/te4runner.tec ../", } + + project "runner-physfs" +@@ -83,13 +83,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL.framework/Headers" } + +diff -Naur orig/build/te4core.lua new/build/te4core.lua +--- orig/build/te4core.lua 2019-10-03 15:35:43.000000000 +0200 ++++ new/build/te4core.lua 2020-10-30 23:05:15.066698600 +0100 +@@ -40,11 +40,11 @@ + links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip", "te4-wfc", "utf8proc" } + if _OPTIONS.discord then defines { "DISCORD_TE4" } end + defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "TE4CORE_VERSION="..TE4CORE_VERSION } + buildoptions { "-O3" } + +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib64 "} end + + if _OPTIONS.relpath == "32" then defines{"TE4_RELPATH32"} end + if _OPTIONS.relpath == "64" then defines{"TE4_RELPATH64"} end +@@ -63,7 +63,7 @@ + prelinkcommands { "i686-pc-mingw32-ranlib ../bin/Debug/*.a" } + end + +- configuration "macosx" ++ filter "system:macosx" + files { "../src/mac/SDL*" } + includedirs { + "/System/Library/Frameworks/OpenGL.framework/Headers", +@@ -84,7 +84,7 @@ + "/usr/local/include", + "/usr/local/opt/libpng12/include", + } +- defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH='"/Library/Application Support/T-Engine/"']] } ++ defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH="/Library/Application Support/T-Engine/"]] } + linkoptions { + "-framework Cocoa", + "-framework OpenGL", +@@ -108,9 +108,9 @@ + targetdir "." + links { "IOKit" } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDL2main", "SDL2", "SDL2_ttf", "SDL2_image", "OpenAL32", "vorbisfile", "opengl32", "glu32", "wsock32", "png" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + if _OPTIONS.wincross then + prebuildcommands { "i686-pc-mingw32-windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + else +@@ -118,33 +118,33 @@ + end + linkoptions { "../src/windows/icon.res" } + linkoptions { "-mwindows" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + libdirs {"/opt/SDL-2.0/lib/"} + links { "dl", "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } + linkoptions { "-Wl,-E" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + if steamlin64 then steamlin64() end + +- configuration "bsd" ++ filter "system:bsd" + libdirs {"/usr/local/lib/"} + links { "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Debug/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Release/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +@@ -165,13 +165,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL2.framework/Headers" } + +@@ -230,7 +230,7 @@ + defines { "LJ_ABI_SOFTFP=0" } + end + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"', +@@ -238,7 +238,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/minilua ../src/luajit2/src/host/", } +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"', +@@ -332,7 +332,7 @@ + + files { "../src/luajit2/src/host/buildvm*.c" } + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"', +@@ -344,7 +344,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/buildvm ../src/luajit2/src/", } +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"', +@@ -367,7 +367,7 @@ + files { "../src/luajit2/src/*.c", "../src/luajit2/src/*.s", "../src/luajit2/src/lj_vm.s", "../src/luajit2/src/lj_bcdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_libdef.h", "../src/luajit2/src/lj_recdef.h", "../src/luajit2/src/lj_folddef.h" } + excludes { "../src/luajit2/src/buildvm*.c", "../src/luajit2/src/luajit.c", "../src/luajit2/src/ljamalg.c" } + +- configuration "linux" ++ filter "system:linux" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -381,7 +381,7 @@ + } + end + +- configuration "bsd" ++ filter "system:bsd" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -395,7 +395,7 @@ + } + end + +- configuration "macosx" ++ filter "system:macosx" + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ + "../src/luajit2/src/buildvm -m machasm -o ../src/luajit2/src/lj_vm.s", +@@ -407,7 +407,7 @@ + "../src/luajit2/src/buildvm -m folddef -o ../src/luajit2/src/lj_folddef.h ../src/luajit2/src/lj_opt_fold.c", + } + +- configuration "windows" ++ filter "system:windows" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -429,7 +429,7 @@ + targetname "luasocket" + buildoptions { "-O2" } + +- configuration "not windows" ++ filter "system:not windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -445,7 +445,7 @@ + "../src/luasocket/usocket.c", + "../src/luasocket/mime.c", + } +- configuration "windows" ++ filter "system:windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -583,21 +583,21 @@ + buildoptions { "-O3", "-std=c++11" } + cppconfig("web") + +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end + + files { "../src/web-cef3/*.cpp", } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "windows" ++ filter "system:windows" + defines { 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"} + libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"} + includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"} +@@ -619,19 +619,19 @@ + "../src/web-cef3/spawn.cpp", + } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "linux" ++ filter "system:linux" + buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"} + libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"} + includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"} + links { "cef", "cef_dll_wrapper" } +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib64 "} end + defines { 'SELFEXE_LINUX' } + end + +@@ -641,7 +641,7 @@ + + if _OPTIONS.discord and not _OPTIONS['discord-nolib'] then + project "te4-discord" +- configuration "linux" ++ filter "system:linux" + kind "SharedLib" + language "C++" + targetname "discord-rpc" +@@ -654,11 +654,11 @@ + files { "../src/discord-rpc/src/discord-rpc.cpp", "../src/discord-rpc/src/rpc_connection.cpp", "../src/discord-rpc/src/serialization.cpp", } + files { "../src/discord-rpc/src/connection_unix.cpp", "../src/discord-rpc/src/discord_register_linux.cpp", } + +- configuration "windows" ++ filter "system:windows" + kind "SharedLib" + -- Empty + +- configuration "macosx" ++ filter "system:macosx" + kind "SharedLib" + -- Empty + end +diff -Naur orig/premake5.lua new/premake5.lua +--- orig/premake5.lua 2019-09-13 11:46:14.000000000 +0200 ++++ new/premake5.lua 2020-10-30 23:04:41.500196031 +0100 +@@ -1,6 +1,6 @@ + dofile("build/options.lua") + +-solution "TEngine" ++workspace "TEngine" + configurations { "Debug", "Release" } + objdir "obj" + defines {"GLEW_STATIC"} +@@ -30,7 +30,7 @@ + } + else + includedirs { +- "/opt/SDL-2.0/include/SDL2", ++ "/usr/include/SDL2", + "/usr/include/GL", + } + end +@@ -42,7 +42,7 @@ + dofile("steamworks/build/steam-def.lua") + end + +-configuration "bsd" ++filter "system:bsd" + libdirs { + "/usr/local/lib", + } +@@ -51,7 +51,7 @@ + } + + if _OPTIONS.wincross then +-configuration "windows" ++filter "system:windows" + libdirs { + "/Test/xcompile/local//lib", + } +@@ -60,7 +60,7 @@ + "/Test/xcompile/local/include", + } + else +-configuration "windows" ++filter "system:windows" + libdirs { + "/c/code/SDL/lib", + } +@@ -72,7 +72,7 @@ + end + + cppconfig = function(what) +- if os.get() == "macosx" then ++ if os.target() == "macosx" then + if what == "web" then + buildoptions { "-stdlib=libstdc++" } + linkoptions { "-stdlib=libstdc++" } +@@ -84,9 +84,8 @@ + -- links { "stdc++" } + end + +-configuration "macosx" +- premake.gcc.cc = 'clang' +- premake.gcc.cxx = 'clang++' ++filter "system:macosx" ++ toolset("clang") + + buildoptions { "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk", "-mmacosx-version-min=10.7" } + includedirs { +@@ -95,9 +94,9 @@ + "/Library/Frameworks/SDL2_ttf.framework/Headers", + } + +-configuration "Debug" ++filter "Debug" + defines { } +- flags { "Symbols" } ++ symbols "On" + buildoptions { "-ggdb" } + -- buildoptions { "-O3" } + targetdir "bin/Debug" +@@ -105,9 +104,10 @@ + if _OPTIONS.pedantic then buildoptions { "-Wall" } end + defines {"TE4_LUA_ALLOW_GENERIC_IO"} + +-configuration "Release" ++filter "Release" + defines { "NDEBUG=1" } +- flags { "Optimize", "NoFramePointer" } ++ optimize "On" ++ omitframepointer "On" + buildoptions { "-O2" } + targetdir "bin/Release" + diff --git a/games/tome/tome.SlackBuild b/games/tome/tome.SlackBuild index 403559c078..b31b3aa0b6 100644 --- a/games/tome/tome.SlackBuild +++ b/games/tome/tome.SlackBuild @@ -79,11 +79,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -# correction of SDL2 headers directory -sed -i "s/opt\/SDL-2.0/usr/" premake4.lua +cp premake4.lua premake5.lua +patch -p1 < $CWD/aur-tome4.patch # build game -premake4 gmake +premake5 gmake env -u ARCH make find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/games/tome/tome.info b/games/tome/tome.info index 0c38f5245c..506961c8cf 100644 --- a/games/tome/tome.info +++ b/games/tome/tome.info @@ -5,6 +5,6 @@ DOWNLOAD="https://te4.org/dl/t-engine/t-engine4-src-1.7.6.tar.bz2" MD5SUM="31e78cd88b383a3a8667e2fd90abfd2b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="premake" +REQUIRES="premake5" MAINTAINER="Dimitris Zlatanidis" EMAIL="dslackw@gmail.com" diff --git a/games/warzone2100/warzone2100.SlackBuild b/games/warzone2100/warzone2100.SlackBuild index 5cf5a0cef6..f02e429b68 100644 --- a/games/warzone2100/warzone2100.SlackBuild +++ b/games/warzone2100/warzone2100.SlackBuild @@ -101,6 +101,7 @@ cd build -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DCMAKE_INSTALL_BINDIR=games \ + -DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF \ .. DESTDIR=$PKG cmake --build . --target install cd .. diff --git a/games/wesnoth/wesnoth.SlackBuild b/games/wesnoth/wesnoth.SlackBuild index 3af210423e..710a0892b0 100644 --- a/games/wesnoth/wesnoth.SlackBuild +++ b/games/wesnoth/wesnoth.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wesnoth -VERSION=${VERSION:-1.16.11} +VERSION=${VERSION:-1.18.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/wesnoth/wesnoth.info b/games/wesnoth/wesnoth.info index c64864bc2c..c25de4dc25 100644 --- a/games/wesnoth/wesnoth.info +++ b/games/wesnoth/wesnoth.info @@ -1,8 +1,8 @@ PRGNAM="wesnoth" -VERSION="1.16.11" +VERSION="1.18.0" HOMEPAGE="http://www.wesnoth.org" -DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.16.11.tar.bz2" -MD5SUM="926fce1f3b89e9cf409437a4b78802e6" +DOWNLOAD="http://downloads.sourceforge.net/wesnoth/wesnoth-1.18.0.tar.bz2" +MD5SUM="b475028bebe0168f46d5a452c4bc1c05" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/xemu/xemu.info b/games/xemu/xemu.info index 82ea280ea5..bda2968318 100644 --- a/games/xemu/xemu.info +++ b/games/xemu/xemu.info @@ -1,7 +1,9 @@ PRGNAM="xemu" VERSION="0.7.86" HOMEPAGE="https://xemu.app" -DOWNLOAD="https://github.com/mborgerson/xemu/archive/v0.7.86/xemu-0.7.86.tar.gz \ +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/mborgerson/xemu/archive/v0.7.86/xemu-0.7.86.tar.gz \ https://gitlab.com/qemu-project/berkeley-softfloat-3/-/archive/b64af41c3276f97f0e181920400ee056b9c88037/berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz \ https://gitlab.com/qemu-project/berkeley-testfloat-3/-/archive/5a59dcec19327396a011a17fd924aed4fec416b3/berkeley-testfloat-3-5a59dcec19327396a011a17fd924aed4fec416b3.tar.gz \ https://github.com/mborgerson/genconfig/archive/44bab849ce87fceafd74703bfcf2b61a1a1b738f/genconfig-44bab849ce87fceafd74703bfcf2b61a1a1b738f.tar.gz \ @@ -9,16 +11,14 @@ DOWNLOAD="https://github.com/mborgerson/xemu/archive/v0.7.86/xemu-0.7.86.tar.gz https://github.com/epezent/implot/archive/b47c8bacdbc78bc521691f70666f13924bb522ab/implot-b47c8bacdbc78bc521691f70666f13924bb522ab.tar.gz \ https://gitlab.com/qemu-project/keycodemapdb/-/archive/d21009b1c9f94b740ea66be8e48a1d8ad8124023/keycodemapdb-d21009b1c9f94b740ea66be8e48a1d8ad8124023.tar.gz \ https://github.com/abaire/nv2a_vsh_cpu/archive/d5a7308809a80e1b01b5c016127d4f1b91c8673b/nv2a_vsh_cpu-d5a7308809a80e1b01b5c016127d4f1b91c8673b.tar.gz" -MD5SUM="f5d4863774ec134b7a7eac371e5b45b6 \ +MD5SUM_x86_64="f5d4863774ec134b7a7eac371e5b45b6 \ 7fa778ee82a15c09162b66564455c01e \ 5627edcf7c64f95f50925784c806e4d9 \ f55989cc5fd27ee7cbf8addcec370275 \ 7f9dcf287b6e7c2fafcc2ffcd4e22c0a \ bc067af8983f58ff4fb492a5fc79dae6 \ - 109a1dc5d8c7ed5745a78e78a5cfd7f2 \ + 2766ec9d09dd7fa3aa94c318b5f5e3b3 \ cfb9f8a87e1b685ca10fe4e0992c76fe" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" REQUIRES="libslirp tomlplusplus" MAINTAINER="Steven Voges" EMAIL="svoges.sbo@gmail.com" diff --git a/games/zsnes/zsnes.info b/games/zsnes/zsnes.info index 4677393f02..facf966b21 100644 --- a/games/zsnes/zsnes.info +++ b/games/zsnes/zsnes.info @@ -3,7 +3,7 @@ VERSION="2.0.12" HOMEPAGE="https://github.com/xyproto/zsnes" DOWNLOAD="https://github.com/xyproto/zsnes/archive/2.0.12/zsnes-2.0.12.tar.gz" MD5SUM="6c28a252c887f1d697c1baa960a1db98" -DOWNLOAD_x86_64="" +DOWNLOAD_x86_64="UNSUPPORTED" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="B. Watson" diff --git a/gis/OWSLib/OWSLib.SlackBuild b/gis/OWSLib/OWSLib.SlackBuild index afdb8084e9..2386de2d22 100644 --- a/gis/OWSLib/OWSLib.SlackBuild +++ b/gis/OWSLib/OWSLib.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=OWSLib VERSION=${VERSION:-0.30.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,9 +76,12 @@ find -L . \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - + +# This removes code fragments depending on pytz, not required in -current +# thanks to Brent Spillner +# https://github.com/spillner/OWSLib/commit/1848bea97a9af6e2e5a69dad46af606c73cffb0c if [ -x /usr/bin/python3.11 ]; then - patch -p1 < $CWD/pytz-not-required.patch + patch -p1 < $CWD/remove_dependency_on_pytz.patch fi python3 setup.py install --root=$PKG diff --git a/gis/OWSLib/pytz-not-required.patch b/gis/OWSLib/pytz-not-required.patch deleted file mode 100644 index 03471b2d4d..0000000000 --- a/gis/OWSLib/pytz-not-required.patch +++ /dev/null @@ -1,13 +0,0 @@ -python-pytz has been removed from Slackware -current because -not needed with Python 3.11 -This patch prevents pip check from indicating the lack of -pytz as dependency required by OWSLib in -current ---- ./requirements.txt 2024-04-05 23:42:52.864498274 +0200 -+++ ./requirements.txt 2024-04-05 23:43:13.322499915 +0200 -@@ -1,6 +1,5 @@ - dataclasses; python_version < '3.7' - lxml - python-dateutil>=1.5 --pytz - pyyaml - requests>=1.0 diff --git a/gis/OWSLib/remove_dependency_on_pytz.patch b/gis/OWSLib/remove_dependency_on_pytz.patch new file mode 100644 index 0000000000..85d4f6ad43 --- /dev/null +++ b/gis/OWSLib/remove_dependency_on_pytz.patch @@ -0,0 +1,103 @@ +diff --git a/etc/RPM/python-owslib.spec b/etc/RPM/python-owslib.spec +index 96f8599de..8dfad75df 100644 +--- a/etc/RPM/python-owslib.spec ++++ b/etc/RPM/python-owslib.spec +@@ -25,7 +25,7 @@ BuildRequires: python-devel + BuildRequires: python-setuptools + BuildRequires: fdupes + Requires: python +-Requires: python-dateutil python-pytz ++Requires: python-dateutil + + %description + OWSLib is a Python package for client programming with Open Geospatial Consortium (OGC) web service (hence OWS) interface standards, and their related content models. +diff --git a/owslib/util.py b/owslib/util.py +index 7894aa729..c715b3ce0 100644 +--- a/owslib/util.py ++++ b/owslib/util.py +@@ -12,8 +12,7 @@ + import sys + from collections import OrderedDict + from dateutil import parser +-from datetime import datetime, timedelta +-import pytz ++from datetime import datetime, timedelta, tzinfo + from owslib.etree import etree, ParseError + from owslib.namespaces import Namespaces + from urllib.parse import urlsplit, urlencode, urlparse, parse_qs, urlunparse, parse_qsl +@@ -38,6 +37,20 @@ class ServiceException(Exception): + pass + + ++# Allows marking timestamps as UTC without pulling in all of Pytz ++class TimeZone_UTC(tzinfo): ++ def tzname(self, dt): ++ return "UTC" ++ ++ def utcoffset(self, dt): ++ return timedelta(0) ++ ++ def dst(self, dt): ++ return timedelta(0) ++ ++tz_utc = TimeZone_UTC() ++ ++ + # http://stackoverflow.com/questions/6256183/combine-two-dictionaries-of-dictionaries-python + def dict_union(d1, d2): + return dict((x, (dict_union(d1.get(x, {}), d2[x]) if isinstance(d2.get(x), dict) else d2.get(x, d1.get(x)))) +@@ -649,8 +662,7 @@ def extract_time(element): + except Exception: + att = testXMLValue(element.attrib.get('indeterminatePosition'), True) + if att and att == 'now': +- dt = datetime.utcnow() +- dt.replace(tzinfo=pytz.utc) ++ dt = datetime.utcnow().replace(tzinfo=tz_utc) + else: + dt = None + return dt +diff --git a/requirements.txt b/requirements.txt +index c1b2c09bd..1531aa42f 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,6 +1,5 @@ + dataclasses; python_version < '3.7' + lxml + python-dateutil>=1.5 +-pytz + pyyaml + requests>=1.0 +diff --git a/tests/doctests/sml_52n_network.txt b/tests/doctests/sml_52n_network.txt +index 010fbb6b5..94add7ddc 100644 +--- a/tests/doctests/sml_52n_network.txt ++++ b/tests/doctests/sml_52n_network.txt +@@ -3,7 +3,6 @@ Imports + >>> from tests.utils import resource_file + >>> from owslib.swe.sensor.sml import SensorML + >>> from dateutil import parser +- >>> import pytz + + Initialize + +diff --git a/tests/doctests/sml_ndbc_station.txt b/tests/doctests/sml_ndbc_station.txt +index bd2ecf3af..bda0e559a 100644 +--- a/tests/doctests/sml_ndbc_station.txt ++++ b/tests/doctests/sml_ndbc_station.txt +@@ -3,7 +3,7 @@ Imports + >>> from tests.utils import resource_file + >>> from owslib.swe.sensor.sml import SensorML + >>> from dateutil import parser +- >>> import pytz ++ >>> from owslib.util import TimeZone_UTC + + Initialize + +@@ -104,7 +104,7 @@ History + 2 + + >>> event = his[0] +- >>> parser.parse(event.date).replace(tzinfo=pytz.utc).isoformat() ++ >>> parser.parse(event.date).replace(tzinfo=TimeZone_UTC()).isoformat() + '2010-01-12T00:00:00+00:00' + >>> event.description + 'Deployment start event' diff --git a/gis/eccodes/eccodes.SlackBuild b/gis/eccodes/eccodes.SlackBuild index aac4868d11..a1b6a4602c 100644 --- a/gis/eccodes/eccodes.SlackBuild +++ b/gis/eccodes/eccodes.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=eccodes -VERSION=${VERSION:-2.34.1} +VERSION=${VERSION:-2.35.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/gis/eccodes/eccodes.info b/gis/eccodes/eccodes.info index 2beec3783e..b3ad7fd648 100644 --- a/gis/eccodes/eccodes.info +++ b/gis/eccodes/eccodes.info @@ -1,10 +1,10 @@ PRGNAM="eccodes" -VERSION="2.34.1" +VERSION="2.35.0" HOMEPAGE="https://confluence.ecmwf.int/display/ECC" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://confluence.ecmwf.int/download/attachments/45757960/eccodes-2.34.1-Source.tar.gz" -MD5SUM_x86_64="e87736db962053828e09d81610c2de93" +DOWNLOAD_x86_64="https://confluence.ecmwf.int/download/attachments/45757960/eccodes-2.35.0-Source.tar.gz" +MD5SUM_x86_64="39babf438f2e36641e78322ece62137a" REQUIRES="libaec" MAINTAINER="ArTourter" EMAIL="artourter@gmail.com" diff --git a/gis/gpxsee/doinst.sh b/gis/gpxsee/doinst.sh index daaf27f812..43c30eaca1 100644 --- a/gis/gpxsee/doinst.sh +++ b/gis/gpxsee/doinst.sh @@ -5,3 +5,10 @@ fi if [ -x /usr/bin/update-mime-database ]; then /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/gis/gpxsee/gpxsee.SlackBuild b/gis/gpxsee/gpxsee.SlackBuild index be7b61c536..435c3c1ca6 100644 --- a/gis/gpxsee/gpxsee.SlackBuild +++ b/gis/gpxsee/gpxsee.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gpxsee -VERSION=${VERSION:-13.18} +VERSION=${VERSION:-13.19} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/gis/gpxsee/gpxsee.info b/gis/gpxsee/gpxsee.info index 2fca84e828..d7051c0ef0 100644 --- a/gis/gpxsee/gpxsee.info +++ b/gis/gpxsee/gpxsee.info @@ -1,8 +1,8 @@ PRGNAM="gpxsee" -VERSION="13.18" +VERSION="13.19" HOMEPAGE="https://www.gpxsee.org/" -DOWNLOAD="https://github.com/tumic0/GPXSee/archive/13.18/GPXSee-13.18.tar.gz" -MD5SUM="edd35b435e1d1c1b6f89688927d56248" +DOWNLOAD="https://github.com/tumic0/GPXSee/archive/13.19/GPXSee-13.19.tar.gz" +MD5SUM="f7d73349bac597b58ca89a282b7e9e94" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/gis/opencpn/README b/gis/opencpn/README deleted file mode 100644 index 7b1dd96ad5..0000000000 --- a/gis/opencpn/README +++ /dev/null @@ -1,8 +0,0 @@ -OpenCPN is a free software (GPLv2) project to create a concise chart -plotter and navigation software, for use underway or as a planning -tool. OpenCPN is developed by a team of active sailors using real -world conditions for program testing and refinement. - -If you are upgrading or installing new, OpenCPN 5.2.x needs wxGTK3 -to be built with webkit support. So you will have to install -webkit2gtk, available here at SBo, then build and install wxGTK3. diff --git a/gis/opencpn/doinst.sh b/gis/opencpn/doinst.sh deleted file mode 100644 index 3d2e9538d1..0000000000 --- a/gis/opencpn/doinst.sh +++ /dev/null @@ -1,10 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/gis/opencpn/opencpn.SlackBuild b/gis/opencpn/opencpn.SlackBuild deleted file mode 100644 index 0204b254d9..0000000000 --- a/gis/opencpn/opencpn.SlackBuild +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/bash - -# Slackware build script for opencpn - -# Copyright 2021 Matt Dinslage, Springfield, MO -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=opencpn -VERSION=${VERSION:-5.2.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/OpenCPN-$VERSION.tar.gz -cd OpenCPN-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Fix LIBDIR -if [ "$ARCH" = "x86_64" ]; then - sed -i '0,/"i386"/{s/"i386"/"x86_64"/}' cmake/GetArch.cmake - sed -i '0,/"lib"/{s/"lib"/"lib64"/}' cmake/GetArch.cmake -fi - -# Fix MANDIR -sed -i 's,${PREFIX_DATA}/man/man1,/usr/man/man1,g' CMakeLists.txt - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DOPCPN_FORCE_GTK3=ON \ - -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config \ - -DBUNDLE_GSHHS=CRUDE \ - -DBUNDLE_TCDATA=ON \ - -DBUNDLE_DOCS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a INSTALL README data/doc/help_en_US.html data/license.txt $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share/doc -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -r $PKG/usr/share/icons/hicolor/* -mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps -cp $TMP/OpenCPN-$VERSION/src/bitmaps/other_svg_src/opencpn_logo.svg \ - $PKG/usr/share/icons/hicolor/scalable/apps/opencpn.svg - -mkdir -p $PKG/usr/share/pixmaps -convert $PKG/usr/share/icons/hicolor/scalable/apps/opencpn.svg -resize 256x256 \ - $PKG/usr/share/pixmaps/opencpn.png - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/opencpn/opencpn.info b/gis/opencpn/opencpn.info deleted file mode 100644 index a44554b6bb..0000000000 --- a/gis/opencpn/opencpn.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="opencpn" -VERSION="5.2.4" -HOMEPAGE="https://opencpn.org/" -DOWNLOAD="https://github.com/OpenCPN/OpenCPN/archive/v5.2.4/OpenCPN-5.2.4.tar.gz" -MD5SUM="9ca81bed7bca1706ecaac98a7578d6bb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gpsd tinyxml libmspack portaudio lsb-release webkit2gtk wxGTK3" -MAINTAINER="M.Dinslage" -EMAIL="daedra1980@gmail.com" diff --git a/gis/opencpn/slack-desc b/gis/opencpn/slack-desc deleted file mode 100644 index db7e4e4e3d..0000000000 --- a/gis/opencpn/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -opencpn: opencpn (A Chartplotter and GPS Navigation Software) -opencpn: -opencpn: OpenCPN is a free software (GPLv2) project to create a concise chart -opencpn: plotter and navigation software, for use underway or as a planning -opencpn: tool. OpenCPN is developed by a team of active sailors using real -opencpn: world conditions for program testing and refinement. -opencpn: -opencpn: -opencpn: -opencpn: -opencpn: diff --git a/gis/osgEarth/osgEarth.info b/gis/osgEarth/osgEarth.info index e46300338f..a5577fa633 100644 --- a/gis/osgEarth/osgEarth.info +++ b/gis/osgEarth/osgEarth.info @@ -5,6 +5,6 @@ DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/osgEarth MD5SUM="58de6c17ac7643a3ba30d978dc6f0e1b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="fmt gdal OpenSceneGraph protobuf3 rocksdb spdlog" +REQUIRES="gdal OpenSceneGraph protobuf3 rocksdb spdlog" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.com" diff --git a/gis/saga-gis/README b/gis/saga-gis/README index 25b4b6a1ad..f5bf96ff4e 100644 --- a/gis/saga-gis/README +++ b/gis/saga-gis/README @@ -21,22 +21,9 @@ WARNINGS: install the package wxWidgets (also available in Slackbuilds.org). If you have both wxGTK3 and wxWidgets installed in your system, make sure that wxWidgets is installed after wxGTK. -2) SAGA requires an ODBC driver in the system. It works both with - iODBC (installed with the libiodbc package (included in Slackware - 15.0) and unixODBC (installed from the SBo's slackbuild). The build - first searches for unixODBC then for iODBC. It fails if any driver - is found. These drivers are in conflict so, if you have installed - and then removed unixODBC, please make sure to reinstall libiodbc. - You should also consider that a package prebuilt in a Slackware - with unixODBC should not be installed in a system with iODBC (and - vice versa). -3) unixODBC is a required dependency in 32 bit systems: the source - code of SAGA conflicts with the code of a libiodbc header - (/usr/include/iodbcunix.h) and the build fails. This issue can be - overcome by installing unixODBC from the SBo's slackbuild. -4) For current users: the build of Python bindings fails since the - upgrade of swig package to version 4.2 in current (January 2024). - Therefore Saga with support to Python will be disabled in current - if the version of swig installed is earlier than 4.0.2. If you - require the support to Python you must downgrade swig to the version - released in Slackware 15.0. +2) SAGA requires an ODBC driver in the system. It works both with + iODBC (installed with the libiodbc package (included in Slackware + 15.0) and unixODBC (installed from the SBo's slackbuild). The build + first searches for unixODBC then for iODBC. +3) unixODBC is a required dependency in 32 bit systems since the + libiodbc headers cause a build failure during the compilation. diff --git a/gis/saga-gis/saga-gis.SlackBuild b/gis/saga-gis/saga-gis.SlackBuild index e02d2da421..62a6841dd0 100644 --- a/gis/saga-gis/saga-gis.SlackBuild +++ b/gis/saga-gis/saga-gis.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=saga-gis -VERSION=${VERSION:-9.3.2} +VERSION=${VERSION:-9.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,6 +81,22 @@ if [[ "$ARCH" = "i586" || "$ARCH" = "i686" ]] ; then fi fi +# if both unixODBCand and libiodbc are installed, SAGA set the +# first as default driver ODBC. This flag should prevent possible +# compilation failures since cmake does not find the correct +# path of unixODBC headers +ODBC="" +if pkg-config --exists odbc; then + ODBC="-DODBC_INCLUDE_DIR=/usr/include/unixodbc " +fi + +# Look if the system has PDAL installed +if pkg-config --exists pdal; then + WITHPDAL="" +else + WITHPDAL="-DWITH_TOOLS_PDAL=OFF " +fi + if [ -d /usr/share/cmake-3.29 ]; then # This prevents some cmake warnings in current CMAKE_POLICY="-DCMAKE_POLICY_DEFAULT_CMP0153=OLD " @@ -109,6 +125,8 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_MANDIR=/usr/man \ + $ODBC \ + $WITHPDAL \ $CMAKE_POLICY \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/gis/saga-gis/saga-gis.info b/gis/saga-gis/saga-gis.info index 62dd9d644b..7336a02902 100644 --- a/gis/saga-gis/saga-gis.info +++ b/gis/saga-gis/saga-gis.info @@ -1,8 +1,8 @@ PRGNAM="saga-gis" -VERSION="9.3.2" +VERSION="9.4.0" HOMEPAGE="http://www.saga-gis.org" -DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%209/SAGA%20-%209.3.2/saga-9.3.2.tar.gz" -MD5SUM="7880d0216e493dd6b9cbf7c9cf398889" +DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%209/SAGA%20-%209.4.0/saga-9.4.0.tar.gz" +MD5SUM="51c55b07450e343ac08cc9a1bd26014d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxWidgets" diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild index 93a62dc7a4..90999a35a7 100644 --- a/graphics/Blender/Blender.SlackBuild +++ b/graphics/Blender/Blender.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Blender -# Copyright 2015-2023 Christoph Willing, Brisbane Australia +# Copyright 2015-2024 Christoph Willing, Sydney Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,13 +25,13 @@ # 20220322 bkw: Modified by SlackBuilds.org, BUILD=2: # - make embree optional (makes it possible to build Blender on 32-bit, # since embree is 64-bit-only). -# - add patch to fix 32-bit compilation. +# - add patch to fix 32-bit compilation. (no longer needed) cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Blender VERSION=${VERSION:-3.3.10} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -106,9 +106,6 @@ sed -i -e '/#include <stdio.h>/a #include <iostream>' intern/locale/boost_locale sed -i -e '/#include "util\/windows.h"/a #include <system_error>' intern/cycles/util/thread.cpp sed -i -e '/#include <fstream>/a #include <cstdint>' extern/quadriflow/src/loader.cpp -# 20220322 bkw: 32-bit needs this -[ -z "$LIBDIRSUFFIX" ] && patch -p1 < $CWD/overloaded_min.diff - mkdir -p build cd build cmake ../ \ diff --git a/graphics/Blender/overloaded_min.diff b/graphics/Blender/overloaded_min.diff deleted file mode 100644 index 5612d01599..0000000000 --- a/graphics/Blender/overloaded_min.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur blender-3.0.1/intern/cycles/scene/hair.cpp blender-3.0.1.patched/intern/cycles/scene/hair.cpp ---- blender-3.0.1/intern/cycles/scene/hair.cpp 2021-10-27 15:21:51.000000000 -0400 -+++ blender-3.0.1.patched/intern/cycles/scene/hair.cpp 2022-03-22 14:54:15.181140060 -0400 -@@ -119,7 +119,7 @@ - { - /* Figure out which steps we need to fetch and their interpolation factor. */ - const size_t max_step = num_steps - 1; -- const size_t step = min((int)(time * max_step), max_step - 1); -+ const size_t step = min((int)(time * max_step), (int)(max_step - 1)); - const float t = time * max_step - step; - /* Fetch vertex coordinates. */ - float4 curr_keys[2]; -@@ -147,7 +147,7 @@ - { - /* Figure out which steps we need to fetch and their interpolation factor. */ - const size_t max_step = num_steps - 1; -- const size_t step = min((int)(time * max_step), max_step - 1); -+ const size_t step = min((int)(time * max_step), (int)(max_step - 1)); - const float t = time * max_step - step; - /* Fetch vertex coordinates. */ - float4 curr_keys[4]; -@@ -192,7 +192,7 @@ - float4 r_keys[2]) const - { - k0 = max(k0, 0); -- k1 = min(k1, num_keys - 1); -+ k1 = min((int)k1, (int)(num_keys - 1)); - const size_t center_step = ((num_steps - 1) / 2); - if (step == center_step) { - /* Center step: regular key location. */ -@@ -238,7 +238,7 @@ - float4 r_keys[4]) const - { - k0 = max(k0, 0); -- k3 = min(k3, num_keys - 1); -+ k3 = min((int)k3, (int)(num_keys - 1)); - const size_t center_step = ((num_steps - 1) / 2); - if (step == center_step) { - /* Center step: regular key location. */ -diff -Naur blender-3.0.1/intern/cycles/scene/mesh.cpp blender-3.0.1.patched/intern/cycles/scene/mesh.cpp ---- blender-3.0.1/intern/cycles/scene/mesh.cpp 2021-10-27 15:21:51.000000000 -0400 -+++ blender-3.0.1.patched/intern/cycles/scene/mesh.cpp 2022-03-22 15:35:52.169528851 -0400 -@@ -53,7 +53,7 @@ - { - /* Figure out which steps we need to fetch and their interpolation factor. */ - const size_t max_step = num_steps - 1; -- const size_t step = min((int)(time * max_step), max_step - 1); -+ const size_t step = min((int)(time * max_step), (int)(max_step - 1)); - const float t = time * max_step - step; - /* Fetch vertex coordinates. */ - float3 curr_verts[3]; diff --git a/graphics/CairoSVG/CairoSVG.SlackBuild b/graphics/CairoSVG/CairoSVG.SlackBuild index 6dc5c839b0..9a86e09364 100644 --- a/graphics/CairoSVG/CairoSVG.SlackBuild +++ b/graphics/CairoSVG/CairoSVG.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for CairoSVG -# Copyright 2014-2023 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=CairoSVG -VERSION=${VERSION:-2.7.0} +VERSION=${VERSION:-2.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/graphics/CairoSVG/CairoSVG.info b/graphics/CairoSVG/CairoSVG.info index 3cc38afe68..f22134b722 100644 --- a/graphics/CairoSVG/CairoSVG.info +++ b/graphics/CairoSVG/CairoSVG.info @@ -1,8 +1,8 @@ PRGNAM="CairoSVG" -VERSION="2.7.0" +VERSION="2.7.1" HOMEPAGE="https://cairosvg.org" -DOWNLOAD="https://files.pythonhosted.org/packages/a8/e1/a69d14425d125fcac173c68b445816d3a539bb95a09edd620108bdc9348e/CairoSVG-2.7.0.tar.gz" -MD5SUM="df4c6ffbc62103539afba05a253f3085" +DOWNLOAD="https://files.pythonhosted.org/packages/d5/e6/ec5900b724e3c44af7f6f51f719919137284e5da4aabe96508baec8a1b40/CairoSVG-2.7.1.tar.gz" +MD5SUM="97e0168e5715b2c3fa94c9767b82950a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-cairocffi cssselect2 python3-defusedxml" diff --git a/graphics/FSPViewer/FSPViewer.SlackBuild b/graphics/FSPViewer/FSPViewer.SlackBuild index 18c70fe43b..f55f8876f9 100644 --- a/graphics/FSPViewer/FSPViewer.SlackBuild +++ b/graphics/FSPViewer/FSPViewer.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=FSPViewer VERSION=${VERSION:-2.1.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -43,9 +43,6 @@ else exit 1 fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -64,6 +61,7 @@ tar xf $CWD/$PRGNAM-$VERSION-$SRCSUFFIX.tar.gz -C $PKG mkdir -p $PKG/usr/bin mv $PKG/FSPViewer$SRCSUFFIX $PKG/usr/bin +strip --strip-unneeded $PKG/usr/bin/FSPViewer$SRCSUFFIX mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/graphics/FSPViewer/FSPViewer.info b/graphics/FSPViewer/FSPViewer.info index 20682af298..b3fbbe3c46 100644 --- a/graphics/FSPViewer/FSPViewer.info +++ b/graphics/FSPViewer/FSPViewer.info @@ -4,7 +4,7 @@ HOMEPAGE="http://www.fsoft.it/FSPViewer/" DOWNLOAD="http://www.fsoft.it/FSPViewer/dwn-files/FSPViewer-2.1.0-32.tar.gz" MD5SUM="93f190434d3987d6bb7eafdfa006b5ae" DOWNLOAD_x86_64="http://www.fsoft.it/FSPViewer/dwn-files/FSPViewer-2.1.0-64.tar.gz" -MD5SUM_x86_64="86f9688c0a0c2ca26e432cd1790b2983" +MD5SUM_x86_64="ebe42fe03a99ed42657133137091fd16" REQUIRES="libpng-legacy12" MAINTAINER="junkyardsparkle" EMAIL="junkyardsparkle@yepmail.net" diff --git a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild index d225d48942..6da1de9ee3 100644 --- a/graphics/OpenCASCADE/OpenCASCADE.SlackBuild +++ b/graphics/OpenCASCADE/OpenCASCADE.SlackBuild @@ -107,7 +107,7 @@ cd build -DINSTALL_DIR_CMAKE=lib${LIBDIRSUFFIX}/cmake/opencascade \ -DINSTALL_DIR_DOC=doc/$PRGNAM-$VERSION \ -DUSE_GLES2=OFF \ - -DUSE_FFMPEG=ON \ + -DUSE_FFMPEG=OFF \ -DUSE_FREEIMAGE=${WITH_FREEIMAGE:-OFF} \ -DUSE_GL2PS=${WITH_GL2PS:-OFF} \ -DUSE_TBB=${WITH_TBB:-OFF} \ diff --git a/graphics/XnViewMP/XnViewMP.info b/graphics/XnViewMP/XnViewMP.info index da322c2aca..28724152a1 100644 --- a/graphics/XnViewMP/XnViewMP.info +++ b/graphics/XnViewMP/XnViewMP.info @@ -4,7 +4,7 @@ HOMEPAGE="https://www.xnview.com/en/xnviewmp/" DOWNLOAD="https://download.xnview.com/XnViewMP-linux.tgz" MD5SUM="17e8ab2a1de48c8d9bd5f4a42bfac83e" DOWNLOAD_x86_64="https://download.xnview.com/XnViewMP-linux-x64.tgz" -MD5SUM_x86_64="a4a8ec89ff10f16f3df7b86ea3e7f57a" +MD5SUM_x86_64="5cea53367f8c00025974b1236102732d" REQUIRES="" MAINTAINER="Melvin Mawhin" EMAIL="mmawhin@hotmail.com" diff --git a/graphics/converseen/converseen.SlackBuild b/graphics/converseen/converseen.SlackBuild index d22845f27b..27ed069f05 100644 --- a/graphics/converseen/converseen.SlackBuild +++ b/graphics/converseen/converseen.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=converseen -VERSION=${VERSION:-0.12.2.2} +VERSION=${VERSION:-0.12.2.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -91,7 +91,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/* cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/graphics/converseen/converseen.info b/graphics/converseen/converseen.info index 5fd33aad61..5d0d864c13 100644 --- a/graphics/converseen/converseen.info +++ b/graphics/converseen/converseen.info @@ -1,8 +1,8 @@ PRGNAM="converseen" -VERSION="0.12.2.2" +VERSION="0.12.2.3" HOMEPAGE="https://converseen.fasterland.net/" -DOWNLOAD="https://downloads.sourceforge.net/converseen/converseen-0.12.2.2.tar.bz2" -MD5SUM="49528b1583a84af9c1bd24fffce6709c" +DOWNLOAD="https://downloads.sourceforge.net/converseen/converseen-0.12.2.3.tar.bz2" +MD5SUM="8e00aaaeee81a52798e6fd9b2f29db98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/darktable/darktable.SlackBuild b/graphics/darktable/darktable.SlackBuild index 2c20db3062..f917d37bc3 100644 --- a/graphics/darktable/darktable.SlackBuild +++ b/graphics/darktable/darktable.SlackBuild @@ -87,6 +87,9 @@ find -L . \ #export CC=clang #export CXX=clang++ +# Patch for exiv2-0.28.1 +patch -p1 < $CWD/exiv2.patch + mkdir -p build cd build cmake \ diff --git a/graphics/darktable/exiv2.patch b/graphics/darktable/exiv2.patch new file mode 100644 index 0000000000..1be8577ae3 --- /dev/null +++ b/graphics/darktable/exiv2.patch @@ -0,0 +1,215 @@ +diff --git a/src/common/exif.cc b/src/common/exif.cc +index 484ebf2207..91ea8e64d0 100644 +--- a/src/common/exif.cc ++++ b/src/common/exif.cc +@@ -80,6 +80,11 @@ extern "C" { + + #define DT_XMP_EXIF_VERSION 5 + ++#if EXIV2_TEST_VERSION(0,28,0) ++#define AnyError Error ++#define toLong toInt64 ++#endif ++ + // persistent list of exiv2 tags. set up in dt_init() + static GList *exiv2_taglist = NULL; + +@@ -2658,39 +2663,39 @@ static GList *read_history_v2(Exiv2::XmpData &xmpData, const char *filename) + if(g_str_has_prefix(key_iter, "darktable:operation")) + { + current_entry->have_operation = TRUE; +- current_entry->operation = g_strdup(history->value().toString().c_str()); ++ current_entry->operation = g_strdup(history->toString().c_str()); + } + else if(g_str_has_prefix(key_iter, "darktable:num")) + { +- current_entry->num = history->value().toLong(); ++ current_entry->num = history->toLong(); + } + else if(g_str_has_prefix(key_iter, "darktable:enabled")) + { +- current_entry->enabled = history->value().toLong() == 1; ++ current_entry->enabled = history->toLong() == 1; + } + else if(g_str_has_prefix(key_iter, "darktable:modversion")) + { + current_entry->have_modversion = TRUE; +- current_entry->modversion = history->value().toLong(); ++ current_entry->modversion = history->toLong(); + } + else if(g_str_has_prefix(key_iter, "darktable:params")) + { + current_entry->have_params = TRUE; +- current_entry->params = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(), ++ current_entry->params = dt_exif_xmp_decode(history->toString().c_str(), history->size(), + ¤t_entry->params_len); + } + else if(g_str_has_prefix(key_iter, "darktable:multi_name")) + { +- current_entry->multi_name = g_strdup(history->value().toString().c_str()); ++ current_entry->multi_name = g_strdup(history->toString().c_str()); + } + else if(g_str_has_prefix(key_iter, "darktable:multi_priority")) + { +- current_entry->multi_priority = history->value().toLong(); ++ current_entry->multi_priority = history->toLong(); + } + else if(g_str_has_prefix(key_iter, "darktable:iop_order")) + { + // we ensure reading the iop_order as a high precision float +- string str = g_strdup(history->value().toString().c_str()); ++ string str = g_strdup(history->toString().c_str()); + static const std::locale& c_locale = std::locale("C"); + std::istringstream istring(str); + istring.imbue(c_locale); +@@ -2698,12 +2703,12 @@ static GList *read_history_v2(Exiv2::XmpData &xmpData, const char *filename) + } + else if(g_str_has_prefix(key_iter, "darktable:blendop_version")) + { +- current_entry->blendop_version = history->value().toLong(); ++ current_entry->blendop_version = history->toLong(); + } + else if(g_str_has_prefix(key_iter, "darktable:blendop_params")) + { +- current_entry->blendop_params = dt_exif_xmp_decode(history->value().toString().c_str(), +- history->value().size(), ++ current_entry->blendop_params = dt_exif_xmp_decode(history->toString().c_str(), ++ history->size(), + ¤t_entry->blendop_params_len); + } + } +@@ -2858,35 +2863,35 @@ static GList *read_masks_v3(Exiv2::XmpData &xmpData, const char *filename, const + // go on reading things into current_entry + if(g_str_has_prefix(key_iter, "darktable:mask_num")) + { +- current_entry->mask_num = history->value().toLong(); ++ current_entry->mask_num = history->toLong(); + } + else if(g_str_has_prefix(key_iter, "darktable:mask_id")) + { +- current_entry->mask_id = history->value().toLong(); ++ current_entry->mask_id = history->toLong(); + } + else if(g_str_has_prefix(key_iter, "darktable:mask_type")) + { +- current_entry->mask_type = history->value().toLong(); ++ current_entry->mask_type = history->toLong(); + } + else if(g_str_has_prefix(key_iter, "darktable:mask_name")) + { +- current_entry->mask_name = g_strdup(history->value().toString().c_str()); ++ current_entry->mask_name = g_strdup(history->toString().c_str()); + } + else if(g_str_has_prefix(key_iter, "darktable:mask_version")) + { +- current_entry->mask_version = history->value().toLong(); ++ current_entry->mask_version = history->toLong(); + } + else if(g_str_has_prefix(key_iter, "darktable:mask_points")) + { +- current_entry->mask_points = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(), ¤t_entry->mask_points_len); ++ current_entry->mask_points = dt_exif_xmp_decode(history->toString().c_str(), history->size(), ¤t_entry->mask_points_len); + } + else if(g_str_has_prefix(key_iter, "darktable:mask_nb")) + { +- current_entry->mask_nb = history->value().toLong(); ++ current_entry->mask_nb = history->toLong(); + } + else if(g_str_has_prefix(key_iter, "darktable:mask_src")) + { +- current_entry->mask_src = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(), ¤t_entry->mask_src_len); ++ current_entry->mask_src = dt_exif_xmp_decode(history->toString().c_str(), history->size(), ¤t_entry->mask_src_len); + } + + } +@@ -4060,7 +4065,11 @@ char *dt_exif_xmp_read_string(const int imgid) + std::string xmpPacket; + + Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename)); ++#if EXIV2_TEST_VERSION(0,28,0) ++ xmpPacket.assign(buf.c_str(), buf.size()); ++#else + xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_); ++#endif + Exiv2::XmpParser::decode(xmpData, xmpPacket); + // because XmpSeq or XmpBag are added to the list, we first have + // to remove these so that we don't end up with a string of duplicates +@@ -4076,7 +4085,11 @@ char *dt_exif_xmp_read_string(const int imgid) + std::string xmpPacket; + + Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename)); ++#if EXIV2_TEST_VERSION(0,28,0) ++ xmpPacket.assign(buf.c_str(), buf.size()); ++#else + xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_); ++#endif + Exiv2::XmpParser::decode(sidecarXmpData, xmpPacket); + + for(Exiv2::XmpData::const_iterator it = sidecarXmpData.begin(); it != sidecarXmpData.end(); ++it) +@@ -4204,7 +4217,11 @@ int dt_exif_xmp_attach_export(const int imgid, const char *filename, void *metad + std::string xmpPacket; + + Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename)); ++#if EXIV2_TEST_VERSION(0,28,0) ++ xmpPacket.assign(buf.c_str(), buf.size()); ++#else + xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_); ++#endif + Exiv2::XmpParser::decode(sidecarXmpData, xmpPacket); + + for(Exiv2::XmpData::const_iterator it = sidecarXmpData.begin(); it != sidecarXmpData.end(); ++it) +@@ -4371,7 +4388,7 @@ int dt_exif_xmp_attach_export(const int imgid, const char *filename, void *metad + catch(Exiv2::AnyError &e) + { + #if EXIV2_TEST_VERSION(0,27,0) +- if(e.code() == Exiv2::kerTooLargeJpegSegment) ++ if(e.code() == Exiv2::ErrorCode::kerTooLargeJpegSegment) + #else + if(e.code() == 37) + #endif +@@ -4437,7 +4454,11 @@ int dt_exif_xmp_write(const int imgid, const char *filename) + } + + Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(filename)); ++#if EXIV2_TEST_VERSION(0,28,0) ++ xmpPacket.assign(buf.c_str(), buf.size()); ++#else + xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_); ++#endif + Exiv2::XmpParser::decode(xmpData, xmpPacket); + // because XmpSeq or XmpBag are added to the list, we first have + // to remove these so that we don't end up with a string of duplicates +diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp +index f4d4d46e12..41bb021012 100644 +--- a/tools/basecurve/exif-wrapper.cpp ++++ b/tools/basecurve/exif-wrapper.cpp +@@ -19,6 +19,7 @@ + #include <exiv2/exif.hpp> + #include <exiv2/error.hpp> + #include <exiv2/image.hpp> ++#include <exiv2/version.hpp> + + #include <cstdio> + #include <cassert> +@@ -36,13 +37,21 @@ exif_get_ascii_datafield( + + try + { ++#if EXIV2_TEST_VERSION(0,28,0) ++ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename); ++#else + Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++#endif + assert(image.get() != 0); + image->readMetadata(); + + Exiv2::ExifData &exifData = image->exifData(); + ++#if EXIV2_TEST_VERSION(0,28,0) ++ Exiv2::Value::UniquePtr val = exifData[key].getValue(); ++#else + Exiv2::Value::AutoPtr val = exifData[key].getValue(); ++#endif + + if (val->typeId() != Exiv2::asciiString) + { diff --git a/graphics/dblatex/dblatex-0.3.4-build-fix.patch b/graphics/dblatex/dblatex-0.3.4-build-fix.patch deleted file mode 100644 index c9424d08bf..0000000000 --- a/graphics/dblatex/dblatex-0.3.4-build-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- setup.py.old 2012-11-08 20:33:26.224458028 +0100 -+++ setup.py 2012-11-08 20:33:41.656633881 +0100 -@@ -365,10 +365,7 @@ class Install(install): - raise OSError("not found: %s" % ", ".join(mis_stys)) - - def run(self): -- if self.install_layout == "deb": -- db = DebianInstaller(self) -- else: -- db = None -+ db = None - - if not(db) and not(self.nodeps): - try: diff --git a/graphics/dblatex/dblatex.SlackBuild b/graphics/dblatex/dblatex.SlackBuild index d3a96042c0..a178b128d4 100644 --- a/graphics/dblatex/dblatex.SlackBuild +++ b/graphics/dblatex/dblatex.SlackBuild @@ -7,8 +7,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dblatex -VERSION=${VERSION:-0.3.10} -BUILD=${BUILD:-2} +SRCNAM=dblatex3 +VERSION=${VERSION:-0.3.12} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -20,9 +21,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -51,9 +49,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.*z? -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -61,18 +59,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix build -patch -p0 -i $CWD/dblatex-0.3.4-build-fix.patch +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages -# latex in slackware 14.2 doesn't have this package -unzip "$CWD/bookmark.tds.zip" -cp -pav "./tex/latex/bookmark/" "./latex/" - -python setup.py build -python setup.py install --root=$PKG - -mv $PKG/usr/share/man $PKG/usr/ +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl +mv $PKG/usr/share/man $PKG/usr/man find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done diff --git a/graphics/dblatex/dblatex.info b/graphics/dblatex/dblatex.info index 9746c5632d..138af57d5a 100644 --- a/graphics/dblatex/dblatex.info +++ b/graphics/dblatex/dblatex.info @@ -1,12 +1,10 @@ PRGNAM="dblatex" -VERSION="0.3.10" -HOMEPAGE="http://dblatex.sourceforge.net/" -DOWNLOAD="https://downloads.sourceforge.net/dblatex/dblatex-0.3.10.tar.bz2 \ - https://mirrors.ctan.org/install/macros/latex/contrib/bookmark.tds.zip" -MD5SUM="437513c07101cefe5be3cbe83f313878 \ - c47d7e393fe4129df5bb7217abcc4676" +VERSION="0.3.12" +HOMEPAGE="https://dblatex.sourceforge.net/" +DOWNLOAD="https://sourceforge.net/projects/dblatex/files/dblatex/dblatex-0.3.12/dblatex3-0.3.12.tar.bz2" +MD5SUM="550adafd078432ff144b57d90c647714" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3-wheel python3-build texlive-extra" MAINTAINER="Vincent Batts" EMAIL="vbatts@hashbangbash.com" diff --git a/graphics/djview4/djview4.SlackBuild b/graphics/djview4/djview4.SlackBuild index ef2c76e027..1e17d62e23 100644 --- a/graphics/djview4/djview4.SlackBuild +++ b/graphics/djview4/djview4.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=djview4 -VERSION=${VERSION:-4.10.6} +VERSION=${VERSION:-4.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -75,7 +75,6 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/djview-$VERSION.tar.gz -mv djview-$VERSION djview4-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -84,10 +83,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -if [ "$QTDIR" == "/opt/kde3/lib/qt3" ]; then - QTDIR=$QT4DIR -fi +for i in $CWD/patches/* ; do patch -p1 < $i ; done + +autoreconf -fi +QMAKE=/usr/bin/qmake-qt5 \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/djview4/djview4.info b/graphics/djview4/djview4.info index 0352ccd371..57c567b276 100644 --- a/graphics/djview4/djview4.info +++ b/graphics/djview4/djview4.info @@ -1,8 +1,8 @@ PRGNAM="djview4" -VERSION="4.10.6" +VERSION="4.12" HOMEPAGE="http://djvu.sourceforge.net/djview4.html" -DOWNLOAD="https://sourceforge.net/projects/djvu/files/DjView/4.10/djview-4.10.6.tar.gz" -MD5SUM="f23205e9d04e4ee4c2324e1d0bae1d1f" +DOWNLOAD="https://downloads.sourceforge.net/djvu/djview-4.12.tar.gz" +MD5SUM="a91328d0fc949a97931511dcd983236b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/djview4/patches/0001-cross-build-pkg-config-info.patch b/graphics/djview4/patches/0001-cross-build-pkg-config-info.patch new file mode 100644 index 0000000000..2f2f46ea2c --- /dev/null +++ b/graphics/djview4/patches/0001-cross-build-pkg-config-info.patch @@ -0,0 +1,86 @@ +From: Helmut Grohne <helmutg@debian.org> +Date: Thu, 4 Jan 2018 08:48:09 +0100 +Subject: cross build pkg-config info + +Issue: djview4 FTCBFS: uses custom, broken macro AC_PROG_PKG_CONFIG +See: https://bugs.debian.org/886304 + +djview4 fails to cross build from source, because it uses the build +architecture pkg-config rather than the host architecture one. This is +due to its use of AC_PROG_PKG_CONFIG, which fails to consider +$ac_tool_prefix. After replacing the macro with the upstream macro +PKG_PROG_PKG_CONFIG (from pkg.m4 in pkg-config), the build continues a +bit further and uses the wrong qmake. I need to discuss the qmake issue +with the qt people. Can you apply the attached patch anyway and close +this bug report when doing so? That'd make the qmake failure immediately +visible and thus easier to discuss. +--- + config/acinclude.m4 | 26 ++------------------------ + configure.ac | 3 ++- + 2 files changed, 4 insertions(+), 25 deletions(-) + +diff --git a/config/acinclude.m4 b/config/acinclude.m4 +index 3c78d41..2912000 100644 +--- a/config/acinclude.m4 ++++ b/config/acinclude.m4 +@@ -168,28 +168,6 @@ TIFFOpen(0,0); + + + +- +-dnl ------------------------------------------------------------------ +-dnl @synopsis AC_PROG_PKG_CONFIG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +-dnl Sets output variables PKG_CONFIG +-dnl ------------------------------------------------------------------ +- +- +-AC_DEFUN([AC_PROG_PKG_CONFIG], +-[ +- AC_ARG_VAR(PKG_CONFIG,[Location of the pkg-config program.]) +- AC_ARG_VAR(PKG_CONFIG_PATH, [Path for pkg-config descriptors.]) +- AC_PATH_PROG(PKG_CONFIG, pkg-config) +- if test -z "$PKG_CONFIG" ; then +- ifelse([$2],,:,[$2]) +- else +- ifelse([$1],,:,[$1]) +- fi +-]) +- +- +- +- + dnl ------------------------------------------------------------------ + dnl @synopsis AC_PATH_DDJVUUAPI([action-if-found],[action-if-notfound]) + dnl Search for ddjvuapi. Defines HAVE_DDJVUAPI. +@@ -198,7 +176,7 @@ dnl ------------------------------------------------------------------ + + AC_DEFUN([AC_PATH_DDJVUAPI], + [ +- AC_REQUIRE([AC_PROG_PKG_CONFIG]) ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_ARG_VAR(DDJVUAPI_LIBS, [Libraries for ddjvuapi]) + AC_ARG_VAR(DDJVUAPI_CFLAGS, [Compilation flags for ddjvuapi]) + AC_MSG_CHECKING([for ddjvuapi]) +@@ -236,7 +214,7 @@ dnl ------------------------------------------------------------------ + + AC_DEFUN([AC_PATH_GLIB], + [ +- AC_REQUIRE([AC_PROG_PKG_CONFIG]) ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_ARG_VAR(GLIB_LIBS, [Libraries for glib-2.0]) + AC_ARG_VAR(GLIB_CFLAGS, [Compilation flags for glib-2.0]) + AC_MSG_CHECKING([for glib]) +diff --git a/configure.ac b/configure.ac +index 473a456..e93aee8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -172,7 +172,8 @@ AC_CHECK_FUNCS(sigaction strerror waitpid wait3) + # Packages + # ---------------------------------------- + +-AC_PROG_PKG_CONFIG([],[ ++PKG_PROG_PKG_CONFIG ++AS_IF([test -z "$PKG_CONFIG"],[ + AC_MSG_ERROR([Cannot find required program pkg-config.]) + ]) + diff --git a/graphics/djview4/patches/0002-debian-changes.patch b/graphics/djview4/patches/0002-debian-changes.patch new file mode 100644 index 0000000000..059ede331b --- /dev/null +++ b/graphics/djview4/patches/0002-debian-changes.patch @@ -0,0 +1,3606 @@ +This is an autogenerated patch header for a single-debian-patch file. The +delta against upstream is either kept as a single patch, or maintained +in some VCS, and exported as a single patch instead of more manageable +atomic patches. + +--- djview4-4.12.orig/README_translations ++++ djview4-4.12/README_translations +@@ -49,11 +49,12 @@ CONTRIBUTORS + + Translations for djview were contributed by: + +-djview_cs.ts Petr Pisar <petr.pisar@atlas.cz> +-djview_de.ts Marc Feld <mfeld@users.sourceforge.net> +-djview_es.ts Mike Molina <mmolina.unphysics@gmail.com> +-djview_fr.ts Leon Bottou <leonb@users.sourceforge.net> +-djview_ru.ts Alexander Potashev <aspotashev@gmail.com> +-djview_uk.ts Yuri Chornoivan <yurchor@ukr.net> +-djview_zh_CN/TW.ts Lee Chenhwa <leechenhwa@aim.com> ++djview_cs.ts Petr Pisar <petr.pisar@atlas.cz> ++djview_de.ts Marc Feld <mfeld@users.sourceforge.net> ++djview_es.ts Mike Molina <mmolina.unphysics@gmail.com> ++djview_fr.ts Leon Bottou <leonb@users.sourceforge.net> ++djview_ru.ts Alexander Potashev <aspotashev@gmail.com> ++djview_uk.ts Yuri Chornoivan <yurchor@ukr.net> ++djview_pl.ts Janusz S. Bień, Tomasz Świerczek <ijsbien@mimuw.edu.pl> ++djview_zh_CN/TW.ts Lee Chenhwa <leechenhwa@aim.com> + +--- djview4-4.12.orig/config/acinclude.m4 ++++ djview4-4.12/config/acinclude.m4 +@@ -272,7 +272,7 @@ Unsetting them is better than setting th + path=$QTDIR/bin:$PATH + fi + if test -z "$QMAKE" ; then +- AC_PATH_PROGS([QMAKE], [qmake], [], [$path]) ++ AC_PATH_TOOL([QMAKE], [qmake], [], [$path]) + fi + if test -z "$QMAKE" ; then + AC_MSG_ERROR([Cannot find the Qt program qmake. +@@ -327,7 +327,7 @@ If you define QMAKESPEC, make sure it is + altrcc="rcc-${qtversion}" + altlupdate="lupdate-${qtversion}" + altlrelease="lrelease-${qtversion}" +- else ++ elif test `basename "$QMAKE"` = qmake ; then + AC_MSG_CHECKING([for real qmake path]) + test -x "$QT_INSTALL_BINS/qmake" && QMAKE="$QT_INSTALL_BINS/qmake" + AC_MSG_RESULT([$QMAKE]) +--- djview4-4.12.orig/mac/make_djview_bundle.sh ++++ djview4-4.12/mac/make_djview_bundle.sh +@@ -79,55 +79,51 @@ run rmdir $bundle/bin || exit + run ln -s ./MacOS $bundle/bin || exit + run ln -s ./MacOS $bundle/plugins || exit + +-# copy needed homebrew libraries +-for lib in $(otool -L $bundle/MacOS/ddjvu | awk '/^\t/{print $1}') ; do +- case "$lib" in +- $BREWDIR/*) +- libname=$(basename "$lib") +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- esac +-done + + # copy needed qt plugins + ( cd "$QTDIR" ; \ + ls -1 plugins/{platforms,imageformats,styles,printsupport}/*.dylib | \ +- grep -v libqwebgl.dylib | \ +- grep -v _debug.dylib ) | \ ++ grep -v libqwebgl.dylib | \ ++ grep -v libqpdf.dylib | \ ++ grep -v libqsvg.dylib | \ ++ grep -v _debug.dylib ) | \ + while read plugin ; do + run mkdir -p $bundle/$(dirname "$plugin") || exit + run cp "$QTDIR/$plugin" $bundle/"$plugin" || exit + done + +- +- +-# copy needed libraries +-for loader in \ +- $bundle/MacOS/djview \ +- $bundle/MacOS/*/*.dylib +-do +- for lib in $(otool -L $loader | awk '/^\t/{print $1}') ++# copy needed libraries ++function getlibs() { ++ for loader in $* + do +- if [ $(basename "$lib") != $(basename "$loader") ] +- then +- case "$lib" in +- $BREWDIR/*) +- libname=$(basename "$lib") +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- @rpath/*) +- libname=$(basename "$lib") +- lib="$QTDIR/lib${lib/#@rpath//}" +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- $QTDIR/*) +- libname=$(basename "$lib") +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- esac +- fi ++ for lib in $(otool -L $loader | awk '/^\t/{print $1}') ++ do ++ if [ $(basename "$lib") != $(basename "$loader") ] ++ then ++ case "$lib" in ++ $BREWDIR/*) ++ libname=$(basename "$lib") ++ test -r "./$bundle/lib/$libname" || \ ++ run cp "$lib" "./$bundle/lib/$libname" || exit ;; ++ @rpath/*) ++ libname=$(basename "$lib") ++ lib="$QTDIR/lib${lib/#@rpath//}" ++ test -r "./$bundle/lib/$libname" || \ ++ run cp "$lib" "./$bundle/lib/$libname" || exit ;; ++ $QTDIR/*) ++ libname=$(basename "$lib") ++ test -r "./$bundle/lib/$libname" || \ ++ run cp "$lib" "./$bundle/lib/$libname" || exit ;; ++ esac ++ fi ++ done + done +-done ++} ++getlibs $bundle/MacOS/ddjvu ++getlibs $bundle/MacOS/djview ++getlibs $bundle/MacOS/*/*.dylib ++getlibs $bundle/lib/Qt* ++getlibs $bundle/lib/*.dylib + + # copy translations + languages=$(ls -1 ../src/*.qm | sed -e 's/^[^_]*_//' -e 's/\.qm$//') +--- djview4-4.12.orig/mac/make_djview_dmg.sh ++++ djview4-4.12/mac/make_djview_dmg.sh +@@ -1,6 +1,6 @@ + #!/bin/bash + +-dmgname="DjVuLibre-3.5.27+DjView-4.10.6-intel64" ++dmgname="DjVuLibre-3.5.28+DjView-4.12-intel64-3" + + cd $(dirname $0) + if ! test -d DjView.app ; then +--- djview4-4.12.orig/src/djview.am ++++ djview4-4.12/src/djview.am +@@ -57,3 +57,5 @@ qmake_ts += djview_zh_cn.ts + qmake_qm += djview_zh_cn.qm + qmake_ts += djview_zh_tw.ts + qmake_qm += djview_zh_tw.qm ++qmake_ts += djview_pl.ts ++qmake_qm += djview_pl.qm +--- djview4-4.12.orig/src/djview.pro ++++ djview4-4.12/src/djview.pro +@@ -141,3 +141,4 @@ TRANSLATIONS += djview_ru.ts + TRANSLATIONS += djview_es.ts + TRANSLATIONS += djview_zh_cn.ts + TRANSLATIONS += djview_zh_tw.ts ++TRANSLATIONS += djview_pl.ts +--- /dev/null ++++ djview4-4.12/src/djview_pl.ts +@@ -0,0 +1,3389 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="pl_PL"> ++<context> ++ <name>Generic</name> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="1034"/> ++ <source>thisLanguage</source> ++ <comment>Name of THIS language</comment> ++ <translation type="unfinished">Polski</translation> ++ </message> ++</context> ++<context> ++ <name>QApplication</name> ++ <message> ++ <location filename="djview.cpp" line="505"/> ++ <source>Option '-fix' is deprecated.</source> ++ <translation>Opcja '-fix' jest przestarzała.</translation> ++ </message> ++</context> ++<context> ++ <name>QDjView</name> ++ <message> ++ <location filename="djview.cpp" line="524"/> ++ <source>cannot open '%1'.</source> ++ <translation>nie można otworzyć '%1'.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="220"/> ++ <source>FitWidth</source> ++ <comment>zoomCombo</comment> ++ <translation>Dostosuj szerokość strony</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="221"/> ++ <source>FitPage</source> ++ <comment>zoomCombo</comment> ++ <translation>Dostosuj wielkość strony</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="222"/> ++ <source>Stretch</source> ++ <comment>zoomCombo</comment> ++ <translation>Rozciągnij</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="223"/> ++ <source>1:1</source> ++ <comment>zoomCombo</comment> ++ <translation>Wiernie (1:1)</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="224"/> ++ <source>300%</source> ++ <comment>zoomCombo</comment> ++ <translation>300%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="225"/> ++ <source>200%</source> ++ <comment>zoomCombo</comment> ++ <translation>200%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="226"/> ++ <source>150%</source> ++ <comment>zoomCombo</comment> ++ <translation>150%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="227"/> ++ <source>100%</source> ++ <comment>zoomCombo</comment> ++ <translation>100%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="228"/> ++ <source>75%</source> ++ <comment>zoomCombo</comment> ++ <translation>75%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="229"/> ++ <source>50%</source> ++ <comment>zoomCombo</comment> ++ <translation>50%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="237"/> ++ <source>Color</source> ++ <comment>modeCombo</comment> ++ <translation>Kolor</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="238"/> ++ <source>Stencil</source> ++ <comment>modeCombo</comment> ++ <translatorcomment>Translation not obvious, may be controversial</translatorcomment> ++ <translation>Maska</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="239"/> ++ <source>Foreground</source> ++ <comment>modeCombo</comment> ++ <translatorcomment>Loose controversial translation (~print layer)</translatorcomment> ++ <translation>Front</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="240"/> ++ <source>Background</source> ++ <comment>modeCombo</comment> ++ <translation>Tło</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="241"/> ++ <source>Hidden Text</source> ++ <comment>modeCombo</comment> ++ <translation>Tekst ukryty</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="455"/> ++ <source>&New</source> ++ <comment>File|</comment> ++ <translation>&Nowy</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="456"/> ++ <source>Ctrl+N</source> ++ <comment>File|New</comment> ++ <translation>Ctrl+N</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="458"/> ++ <source>Create a new DjView window.</source> ++ <translation>Otwórz nowe okno DjView.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="461"/> ++ <source>&Open</source> ++ <comment>File|</comment> ++ <translation>&Otwórz</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="462"/> ++ <source>Ctrl+O</source> ++ <comment>File|Open</comment> ++ <translation>Ctrl-O</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="464"/> ++ <source>Open a DjVu document.</source> ++ <translation>Otwórz dokument DjVu.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="467"/> ++ <source>Open &Location...</source> ++ <comment>File|</comment> ++ <translation>Otwórz &adres...</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="468"/> ++ <source>Open a remote DjVu document.</source> ++ <translation>Otwórz zdalny dokument DjVu.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="472"/> ++ <source>&Close</source> ++ <comment>File|</comment> ++ <translation>&Zamknij</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="473"/> ++ <source>Ctrl+W</source> ++ <comment>File|Close</comment> ++ <translation>Ctrl+W</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="475"/> ++ <source>Close this window.</source> ++ <translation>Zamknij to okno.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="478"/> ++ <source>&Quit</source> ++ <comment>File|</comment> ++ <translation>Za&kończ</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="479"/> ++ <source>Ctrl+Q</source> ++ <comment>File|Quit</comment> ++ <translation>Ctrl+Q</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="481"/> ++ <source>Close all windows and quit the application.</source> ++ <translation>Zamknij wszystkie okna i zakończ aplikację.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="484"/> ++ <source>Save &as...</source> ++ <comment>File|</comment> ++ <translation>Zapisz &jako...</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="485"/> ++ <source>Ctrl+S</source> ++ <comment>File|SaveAs</comment> ++ <translation>Ctrl+S</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="487"/> ++ <source>Save the DjVu document.</source> ++ <translation>Zapisz dokument DjVu.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="490"/> ++ <source>&Export as...</source> ++ <comment>File|</comment> ++ <translation>&Eksportuj jako...</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="491"/> ++ <source>Ctrl+E</source> ++ <comment>File|ExportAs</comment> ++ <translation>Ctrl+E</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="493"/> ++ <source>Export DjVu page or document to other formats.</source> ++ <translation>Eksportuj stronę lub cały dokument DjVu do innych formatów.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="496"/> ++ <source>&Print...</source> ++ <comment>File|</comment> ++ <translation>&Drukuj...</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="497"/> ++ <source>Ctrl+P</source> ++ <comment>File|Print</comment> ++ <translation>Ctrl+P</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="499"/> ++ <source>Print the DjVu document.</source> ++ <translation>Drukuj dokument DjVu.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="502"/> ++ <source>&Find...</source> ++ <comment>Edit|</comment> ++ <translation>&Znajdź...</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="503"/> ++ <source>Ctrl+F</source> ++ <comment>Edit|Find</comment> ++ <translation>Ctrl+F</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="505"/> ++ <source>Find text in the document.</source> ++ <translation>Znajdź tekst w dokumencie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="508"/> ++ <source>Find &Next</source> ++ <comment>Edit|</comment> ++ <translation>Znajdź &następny</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="509"/> ++ <source>F3</source> ++ <comment>Edit|Find Next</comment> ++ <translation>F3</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="510"/> ++ <source>Find next occurrence of search text in the document.</source> ++ <translation>Znajdź następne wystąpienie szukanego tekstu w dokumencie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="513"/> ++ <source>Find &Previous</source> ++ <comment>Edit|</comment> ++ <translation>Znajdź &poprzedni</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="514"/> ++ <source>Shift+F3</source> ++ <comment>Edit|Find Previous</comment> ++ <translation>Shift+F3</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="515"/> ++ <source>Find previous occurrence of search text in the document.</source> ++ <translation>Znajdź poprzednie wystąpienie szukanego tekstu w dokumencie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="518"/> ++ <source>&Select</source> ++ <comment>Edit|</comment> ++ <translation>&Wybierz</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="519"/> ++ <source>F2</source> ++ <comment>Edit|Select</comment> ++ <translation>F2</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="521"/> ++ <source>Select a rectangle in the document.</source> ++ <translation>Zaznacz prostokąt w dokumencie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="524"/> ++ <source>Zoom &In</source> ++ <comment>Zoom|</comment> ++ <translation>&Powiększ</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="526"/> ++ <source>Increase the magnification.</source> ++ <translation>Zwiększ powiększenie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="530"/> ++ <source>Zoom &Out</source> ++ <comment>Zoom|</comment> ++ <translation>&Zmniejsz</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="532"/> ++ <source>Decrease the magnification.</source> ++ <translation>Zmniejsz powiększenie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="536"/> ++ <source>Fit &Width</source> ++ <comment>Zoom|</comment> ++ <translation>Dostosuj &szerokość strony</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="537"/> ++ <source>Set magnification to fit page width.</source> ++ <translation>Dostosuj powiększenie do szerokości strony.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="542"/> ++ <source>Fit &Page</source> ++ <comment>Zoom|</comment> ++ <translation>Dostosuj wielość &trony</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="543"/> ++ <source>Set magnification to fit page.</source> ++ <translation>Dostosuj powiększenie do wielkości strony.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="548"/> ++ <source>One &to one</source> ++ <comment>Zoom|</comment> ++ <translation>Jeden &do jednego</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="549"/> ++ <source>Set full resolution magnification.</source> ++ <translation>Ustaw powiększenie zgodne z pełną rozdzielczością.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="554"/> ++ <source>&300%</source> ++ <comment>Zoom|</comment> ++ <translation>&300%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="555"/> ++ <source>Magnify 300%</source> ++ <translation>Powiększ 300%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="560"/> ++ <source>&200%</source> ++ <comment>Zoom|</comment> ++ <translation>&200%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="561"/> ++ <source>Magnify 20%</source> ++ <translation>Powiększ 20%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="566"/> ++ <source>&150%</source> ++ <comment>Zoom|</comment> ++ <translation>&150%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="567"/> ++ <source>Magnify 150%</source> ++ <translation>Powiększ 150%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="572"/> ++ <source>&100%</source> ++ <comment>Zoom|</comment> ++ <translation>&100%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="573"/> ++ <source>Magnify 100%</source> ++ <translation>Powiększ 100%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="578"/> ++ <source>&75%</source> ++ <comment>Zoom|</comment> ++ <translation>&75%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="579"/> ++ <source>Magnify 75%</source> ++ <translation>Powiększ 75%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="584"/> ++ <source>&50%</source> ++ <comment>Zoom|</comment> ++ <translation>&50%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="585"/> ++ <source>Magnify 50%</source> ++ <translation>Powiększ 50%</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="590"/> ++ <source>&First Page</source> ++ <comment>Go|</comment> ++ <translation>&Pierwsza strona</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="592"/> ++ <source>Jump to first document page.</source> ++ <translation>Przejdź do pierwszej strony dokumentu.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="597"/> ++ <source>&Next Page</source> ++ <comment>Go|</comment> ++ <translation>&Następna strona</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="599"/> ++ <source>Jump to next document page.</source> ++ <translation>Przejdź do następnej strony dokumentu.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="604"/> ++ <source>&Previous Page</source> ++ <comment>Go|</comment> ++ <translation>P&oprzednia strona</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="606"/> ++ <source>Jump to previous document page.</source> ++ <translation>Przejdź do poprzedniej strony dokumentu.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="611"/> ++ <source>&Last Page</source> ++ <comment>Go|</comment> ++ <translation>&Ostatnia strona</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="613"/> ++ <source>Jump to last document page.</source> ++ <translation>Przejdź do ostatniej strony dokumentu.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="618"/> ++ <source>&Backward</source> ++ <comment>Go|</comment> ++ <translation>&Wstecz</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="620"/> ++ <source>Backward in history.</source> ++ <translation>Cofnij się w historii.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="625"/> ++ <source>&Forward</source> ++ <comment>Go|</comment> ++ <translation>&Naprzód</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="627"/> ++ <source>Forward in history.</source> ++ <translation>Przejdź do przodu w historii.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="632"/> ++ <source>Rotate &Left</source> ++ <comment>Rotate|</comment> ++ <translation>Obróć w &lewo</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="634"/> ++ <source>Rotate page image counter-clockwise.</source> ++ <translation>Obróć obraz strony w kierunku przeciwnym do ruchu wskazówek zegara.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="639"/> ++ <source>Rotate &Right</source> ++ <comment>Rotate|</comment> ++ <translation>Obróć w &prawo</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="641"/> ++ <source>Rotate page image clockwise.</source> ++ <translation>Obróć obraz strony w kierunku ruchu wskazówek zegara.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="647"/> ++ <source>Set natural page orientation.</source> ++ <translation>Ustaw naturalna orientację strony.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="653"/> ++ <source>Turn page on its left side.</source> ++ <translation>Obróć stronę na lewy bok.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="659"/> ++ <source>Turn page upside-down.</source> ++ <translation>Obróć stronę do góry nogami.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="665"/> ++ <source>Turn page on its right side.</source> ++ <translation>Obróć stronę na prawy bok.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="670"/> ++ <source>&Information...</source> ++ <comment>Edit|</comment> ++ <translation>&Informacje...</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="671"/> ++ <source>Ctrl+I</source> ++ <comment>Edit|Information</comment> ++ <translation>Ctrl+I</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="672"/> ++ <source>Show information about the document encoding and structure.</source> ++ <translation>Pokaż informacje o kodowaniu dokumentu i jego strukturze.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="675"/> ++ <source>&Metadata...</source> ++ <comment>Edit|</comment> ++ <translation>&Metadane...</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="677"/> ++ <source>Ctrl+M</source> ++ <comment>Edit|Metadata</comment> ++ <translation>Ctrl+M</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="679"/> ++ <source>Show the document and page meta data.</source> ++ <translation>Pokaż metadane dokumentu i strony.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="684"/> ++ <source>&About DjView...</source> ++ <translation>&O DjView...</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="688"/> ++ <source>Show information about this program.</source> ++ <translation>Pokaż informacje o tym programie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="691"/> ++ <source>&Color</source> ++ <comment>Display|</comment> ++ <translation>&Kolor</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="692"/> ++ <source>Display everything.</source> ++ <translation>Wyświetl wszystkie warstwy.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="697"/> ++ <source>&Stencil</source> ++ <comment>Display|</comment> ++ <translation>&Maska</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="698"/> ++ <source>Only display the document bitonal stencil.</source> ++ <translation>Wyświetl tylko bitonalną maskę.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="704"/> ++ <source>&Foreground</source> ++ <comment>Display|</comment> ++ <translation>&Front</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="705"/> ++ <source>Only display the foreground layer.</source> ++ <translation>Wyświetl tylko warstwę frontową.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="711"/> ++ <source>&Background</source> ++ <comment>Display|</comment> ++ <translation>&Tło</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="712"/> ++ <source>Only display the background layer.</source> ++ <translation>Wyświetl tylko warstwę tła.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="718"/> ++ <source>&Hidden Text</source> ++ <comment>Display|</comment> ++ <translation>&Tekst ukryty</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="719"/> ++ <source>Overlay a representation of the hidden text layer.</source> ++ <translation>Nałóż na obraz reprezentację tekstu ukrytego.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="725"/> ++ <source>I&nvert Luminance</source> ++ <comment>View|</comment> ++ <translation>&Odwróć luminancję</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="726"/> ++ <source>Invert image luminance while preserving hue.</source> ++ <translation>Odwróć luminancję obrazu zachowując nasycenie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="730"/> ++ <source>Prefere&nces...</source> ++ <comment>Settings|</comment> ++ <translation>&Ustawienia...</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="732"/> ++ <source>Show the preferences dialog.</source> ++ <translation>Pokaż dialog ustawień.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="735"/> ++ <source>Show &Sidebar</source> ++ <comment>Settings|</comment> ++ <translation>Pokaż panel &boczny</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="736"/> ++ <source>F9</source> ++ <comment>Settings|Show sidebar</comment> ++ <translation>F9</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="738"/> ++ <source>Alt+Ctrl+S</source> ++ <comment>Settings|Show sidebar</comment> ++ <translation>Alt+Ctrl+S</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="740"/> ++ <source>Show/hide the side bar.</source> ++ <translation>Pokaż/ukryj panel boczny.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="744"/> ++ <source>Show &Toolbar</source> ++ <comment>Settings|</comment> ++ <translation>Pokaż pasek &narzędzi</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="745"/> ++ <source>F10</source> ++ <comment>Settings|Show toolbar</comment> ++ <translation>F10</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="747"/> ++ <source>Alt+Ctrl+T</source> ++ <comment>Settings|Show toolbar</comment> ++ <translation>Alt+Ctrl+T</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="749"/> ++ <source>Show/hide the standard tool bar.</source> ++ <translation>Pokaż/ukryj standardowy pasek narzędzi.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="752"/> ++ <source>Show Stat&usbar</source> ++ <comment>Settings|</comment> ++ <translation>Pokaż pasek &stanu</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="753"/> ++ <source>Show/hide the status bar.</source> ++ <translation>Pokaż/ukryj pasek stanu.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="755"/> ++ <source>Alt+Ctrl+/</source> ++ <comment>Settings|Show toolbar</comment> ++ <translation>Alt+Ctrl+/</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="761"/> ++ <source>&Full Screen</source> ++ <comment>View|</comment> ++ <translation>&Pełny ekran</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="762"/> ++ <source>F11</source> ++ <comment>View|FullScreen</comment> ++ <translation>F11</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="764"/> ++ <source>Meta+Ctrl+F</source> ++ <comment>View|FullScreen</comment> ++ <translation>Meta+Ctrl+F</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="767"/> ++ <source>Toggle full screen mode.</source> ++ <translation>Włącz lub wyłącz tryb pełnoekranowy.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="771"/> ++ <source>&Slide Show</source> ++ <comment>View|</comment> ++ <translation>&Pokaz slajdów</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="772"/> ++ <source>Shift+F11</source> ++ <comment>View|Slideshow</comment> ++ <translation>Shift+F11</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="774"/> ++ <source>Shift+Ctrl+F</source> ++ <comment>Settings|Show toolbar</comment> ++ <translation>Shift+Ctrl+F</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="777"/> ++ <source>Toggle slide show mode.</source> ++ <translation>Włącz lub wyłącz tryb pokazu slajdów.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="780"/> ++ <source>&Continuous</source> ++ <comment>Layout|</comment> ++ <translation>Wyświetlanie &ciągłe</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="782"/> ++ <source>F4</source> ++ <comment>Layout|Continuous</comment> ++ <translation>F4</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="783"/> ++ <source>Toggle continuous layout mode.</source> ++ <translation>Włącz lub wyłącz tryb wyświetlania ciągłego.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="787"/> ++ <source>Side &by Side</source> ++ <comment>Layout|</comment> ++ <translation>&Dwie strony obok siebie</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="789"/> ++ <source>F5</source> ++ <comment>Layout|SideBySide</comment> ++ <translation>F5</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="790"/> ++ <source>Toggle side-by-side layout mode.</source> ++ <translation>Włącz lub wyłącz wyświetlanie dwóch stron obok siebie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="794"/> ++ <source>Co&ver Page</source> ++ <comment>Layout|</comment> ++ <translation>Strona &tytułowa</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="798"/> ++ <source>F6</source> ++ <comment>Layout|CoverPage</comment> ++ <translation>F6</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="799"/> ++ <source>Show the cover page alone in side-by-side mode.</source> ++ <translation>Pokaż osobno stronę tytułową w trybie wyświetlania stron obok siebie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="803"/> ++ <source>&Right to Left</source> ++ <comment>Layout|</comment> ++ <translation>Z &prawej do lewej</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="807"/> ++ <source>Shift+F6</source> ++ <comment>Layout|RightToLeft</comment> ++ <translation>Shift+F6</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="808"/> ++ <source>Show pages right-to-left in side-by-side mode.</source> ++ <translation>Pokazuj strony od prawej do lewej w trybie obok siebie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="812"/> ++ <source>Copy &URL</source> ++ <comment>Edit|</comment> ++ <translation>Kopiuj &URL</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="813"/> ++ <source>Save an URL for the current page into the clipboard.</source> ++ <translation>Skopiuj do schowka URL bieżącej strony.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="814"/> ++ <source>Ctrl+C</source> ++ <comment>Edit|CopyURL</comment> ++ <translation>Ctrl+C</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="817"/> ++ <source>Copy &Outline</source> ++ <comment>Edit|</comment> ++ <translation>Kopiuj &zakładki</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="818"/> ++ <source>Save the djvused code for the outline into the clipboard.</source> ++ <translation>Skopiuj do schowka zakładki w formacie djvused.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="821"/> ++ <source>Copy &Annotations</source> ++ <comment>Edit|</comment> ++ <translation>Kopiuj &adnotacje</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="822"/> ++ <source>Save the djvused code for the page annotations into the clipboard.</source> ++ <translation>Skopiuj do schowka adnotacje w formacie djvused.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="835"/> ++ <source>&File</source> ++ <comment>File|</comment> ++ <translation>&Plik</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="841"/> ++ <source>Open &Recent</source> ++ <translation>Otwórz &poprzednie</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="855"/> ++ <source>&Edit</source> ++ <comment>Edit|</comment> ++ <translation>&Edytuj</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="864"/> ++ <source>&View</source> ++ <comment>View|</comment> ++ <translation>&Widok</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="865"/> ++ <location filename="qdjview.cpp" line="934"/> ++ <source>&Zoom</source> ++ <comment>View|Zoom</comment> ++ <translation>&Skaluj</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="879"/> ++ <location filename="qdjview.cpp" line="948"/> ++ <source>&Rotate</source> ++ <comment>View|Rotate</comment> ++ <translation>&Obróć</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="887"/> ++ <location filename="qdjview.cpp" line="956"/> ++ <source>&Display</source> ++ <comment>View|Display</comment> ++ <translation>&Pokaż</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="909"/> ++ <location filename="qdjview.cpp" line="929"/> ++ <source>&Go</source> ++ <comment>Go|</comment> ++ <translation>&Przejdź</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="917"/> ++ <source>&Settings</source> ++ <comment>Settings|</comment> ++ <translation>&Ustawienia</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="923"/> ++ <source>&Help</source> ++ <comment>Help|</comment> ++ <translation>&Pomoc</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1159"/> ++ <source>Control Left Mouse Button</source> ++ <translation>Control i lewy klawisz myszy</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1161"/> ++ <source>Right Mouse Button</source> ++ <translation>Prawy klawisz myszy</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1168"/> ++ <source><html><b>Selecting a rectangle.</b><br/> Once a rectangular area is selected, a popup menu lets you copy the corresponding text or image. Instead of using this tool, you can also hold %1 and use the Left Mouse Button.</html></source> ++ <translation><html><b>Zaznaczenie prostokąta.</b><br/>Po zaznaczeniu prostokąta pojawi się menu podręczne pozwalające skopiować odpowiedni tekst lub obraz. Zamiast używać tego sposobu, można również przytrzymać %1 i użyć lewego klawisza myszy.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1176"/> ++ <source><html><b>Zooming.</b><br/> Choose a zoom level for viewing the document. Zoom level 100% displays the document for a 100 dpi screen. Zoom levels <tt>Fit Page</tt> and <tt>Fit Width</tt> ensure that the full page or the page width fit in the window. </html></source> ++ <translation><html><b>Skalowanie.</b><br/> Wybierz stopień powiększenia lub zmniejszenia wyświetlanego dokumentu.Wartość 100% jest odpowiednia dla ekranu o rozdzielczości 100dpi. Wartości <tt>Dostosuj do strony</tt> i <tt>Dostosuj do szerokości</tt>gwarantują, że odpowiednio cała strona lub cała szerokość strony zmieszczą się w oknie. </html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1188"/> ++ <source><html><b>Rotating the pages.</b><br/> Choose to display pages in portrait or landscape mode. You can also turn them upside down.</html></source> ++ <translation><html><b>Obracanie strony.</b><br/> Wybór wyświetlania strony w trybie portretowym lub krajobrazowym. Można również obrócić stronę do góry nogami.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1195"/> ++ <source><html><b>Display mode.</b><br/> DjVu images compose a background layer and a foreground layer using a stencil. The display mode specifies with layers should be displayed.</html></source> ++ <translation><html><b>Tryb wyświetlania.</b><br/> Obrazy DjVu są tworzone z warstw frontu i tła za pomocą maski. Tryb wyświetlania określa, które warstwy będą wyświetlane.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1203"/> ++ <source><html><b>Navigating the document.</b><br/> The page selector lets you jump to any page by name and can be activated at any time by pressing Ctrl+G. The navigation buttons jump to the first page, the previous page, the next page, or the last page. </html></source> ++ <translation><html><b>Nawigacja w dokumencie.</b><br/> Selektor strony pozwala przejść do dowolnej strony i może być aktywowany w dowolnym momencie przez naciśnięcie CTRL+G. Przyciski nawigacyjne powodują przejście do pierwszej, poprzedniej, następnej lub ostatniej strony. </html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1212"/> ++ <source><html><b>Document and page information.</b><br> Display a dialog window for viewing encoding information pertaining to the document or to a specific page.</html></source> ++ <translation><html><b>Informacje o stronie i dokumentacje.</b><br> Pokaż okno dialogowe w celu wyświetlenia informacji o kodowaniu dotyczącej dokumentu lub konkretnej strony.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1218"/> ++ <source><html><b>Document and page metadata.</b><br> Display a dialog window for viewing metadata pertaining to the document or to a specific page.</html></source> ++ <translation><html><b>Metadane dokumentu i strony.</b><br> Pokaż okno dialogowe w celu wyświetlenia metadanych dotyczących dokumentu lub konkretnej strony.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1224"/> ++ <source><html><b>Continuous layout.</b><br/> Display all the document pages arranged vertically inside the scrollable document viewing area.</html></source> ++ <translation><html><b>Wyświetlanie ciągłe.</b><br/> Wyświetl wszystkie strony dokumentu ustawione pionowe wewnątrz przewijalnego obszaru wyświetlania.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1229"/> ++ <source><html><b>Side by side layout.</b><br/> Display pairs of pages side by side inside the scrollable document viewing area.</html></source> ++ <translation><html><b>Wyświetlanie stron obok siebie.</b><br/> Wyświetlaj dwie strony obok siebie wewnątrz przewijalnego obszaru wyświetlania.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1234"/> ++ <source><html><b>Page information.</b><br/> Display information about the page located under the cursor: the sequential page number, the page size in pixels, and the page resolution in dots per inch. </html></source> ++ <translation><html><b>Informacja o stronie.</b><br/> Wyświetl informacje o stronie znajdującej się pod kursorem: numer kolejny, rozmiar strony w pikselach i rozdzielczość strony w punktach na cal. </html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1240"/> ++ <source><html><b>Cursor information.</b><br/> Display the position of the mouse cursor expressed in page coordinates. </html></source> ++ <translation><html><b>Informacja o kursorze.</b><br/> Wyświetl pozycję kursora wyrażoną we współrzędnych strony. </html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1245"/> ++ <source><html><b>Document viewing area.</b><br/> This is the main display area for the DjVu document. <ul><li>Arrows and page keys to navigate the document.</li><li>Space and BackSpace to read the document.</li><li>Keys <tt>+</tt> <tt>-</tt> <tt>[</tt> <tt>]</tt> to zoom or rotate the document.</li><li>Left Mouse Button for panning and selecting links.</li><li>%3 for displaying the contextual menu.</li><li>%1 Left Mouse Button for selecting text or images.</li><li>%2 for popping the magnification lens.</li></ul></html></source> ++ <translation><html><b>Obszar wyświetlania dokumentu.</b><br/> To jest główny obszar wyświetlania dokumentu DjVu. <ul><li>Klawisze strzałek i strony nawigują w dokumencie.</li><li>Space i BackSpace przewijają dokument.</li><li>Klawisze <tt>+</tt> <tt>-</tt> <tt>[</tt> <tt>]</tt> skalują lub obracają dokument.</li><li>Lewy klawisz myszy pozycjonuje i wybiera.hiperłącza</li><li>%3 wyświetla menu kontekstowe.</li><li>%1 lewy klawisz myszy wybiera tekst lub obraz.</li><li>%2 uaktywnia lupę.</li></ul></html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1258"/> ++ <source><html><b>Document viewing area.</b><br/> This is the main display area for the DjVu document. But you must first open a DjVu document to see anything.</html></source> ++ <translation><html><b>Obszar wyświetlania dokumentu.</b><br/> To jest główny obszar wyświetlania dokumentu DjVu. Aby cokolwiek zobaczyć trzeba najpierw otworzyć jakiś dokument DjVu.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1597"/> ++ <source>Option '%1' requires boolean argument.</source> ++ <translation>Opcja '%1' wymaga argumentu boolowskiego.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1604"/> ++ <source>Illegal value '%2' for option '%1'.</source> ++ <translation>Niepoprawna wartość '%2' dla opcji '%1'.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1722"/> ++ <source>Toolbar option '%1' is not implemented.</source> ++ <translation>Opcja paska narzędziowego '%1' nie jest zaimplementowana.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1735"/> ++ <source>Toolbar option '%1' is not recognized.</source> ++ <translation>Opcja paska narzędzi '%1' nie jest rozpoznana.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="1781"/> ++ <location filename="qdjview.cpp" line="1788"/> ++ <source>Option '%1' requires a standalone viewer.</source> ++ <translation>Opcja '%1' wymaga samodzielnej przeglądarki.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2053"/> ++ <source>Deprecated option '%1'</source> ++ <translation>Przestarzała opcja '%1'</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2101"/> ++ <source>Option '%1' is not implemented.</source> ++ <translation>Opcja '%1' nie jest zaimplementowana.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2106"/> ++ <source>Option '%1' is not recognized.</source> ++ <translation>Opcja '%1' nie jest rozpoznana.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2383"/> ++ <location filename="qdjview.cpp" line="2688"/> ++ <source>DjView</source> ++ <translation>DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2554"/> ++ <source>Thumbnails</source> ++ <translation>Miniaturki</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2561"/> ++ <source>Outline</source> ++ <translation>Zakładki</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2568"/> ++ <source>Find</source> ++ <translation>Znajdź</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2708"/> ++ <source>Cannot open file '%1'.</source> ++ <translation>Nie można otworzyć pliku '%1'.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2709"/> ++ <source>Opening DjVu file</source> ++ <translation>Otwieranie pliku DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2806"/> ++ <source>Cannot open URL '%1'.</source> ++ <translation>Nie można otworzyć URL '%1'.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2807"/> ++ <source>Opening DjVu document</source> ++ <translation>Otwieranie dokumentu DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2824"/> ++ <source>Certificate validation error - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Błąd weryfikacji certyfikatu - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2825"/> ++ <source><html> %1 Do you want to continue anyway? </html></source> ++ <translation><html> %1 Czy chcesz mimo to kontynuować? </html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2903"/> ++ <source>Cannot find page numbered: %1</source> ++ <translation>Nie można znaleźć strony o numerze: %1</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2935"/> ++ <location filename="qdjview.cpp" line="2965"/> ++ <source>Cannot find page named: %1</source> ++ <translation>Nie można znaleźć strony nazwanej %1</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3179"/> ++ <source>Unrecognized sidebar options '%1'.</source> ++ <translation>Nierozpoznana opcja panelu bocznego '%1'.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3242"/> ++ <location filename="qdjview.cpp" line="3278"/> ++ <source>Print - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Drukuj - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3243"/> ++ <source><html> This file was served with printing restrictions. Do you want to print it anyway?</html></source> ++ <translation><html> Ten plik został udostępniony z ograniczeniami drukowania. Czy drukować mimo tego?</html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3258"/> ++ <location filename="qdjview.cpp" line="3298"/> ++ <source>Save - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Zapisz - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3259"/> ++ <source><html> This file was served with saving restrictions. Do you want to save it anyway?</html></source> ++ <translation><html> Ten plik został udostępniony z ograniczeniami zapisywania. Czy zapisać mimo tego?</html></translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3317"/> ++ <source>Export - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Eksport - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3589"/> ++ <source>Text files</source> ++ <comment>save filter</comment> ++ <translation>Pliki tekstowe</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3590"/> ++ <location filename="qdjview.cpp" line="3637"/> ++ <source>All files</source> ++ <comment>save filter</comment> ++ <translation>Wszystkie pliki</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3591"/> ++ <source>Save Text - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Zapisz tekst - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3607"/> ++ <location filename="qdjview.cpp" line="3652"/> ++ <location filename="qdjview.cpp" line="3672"/> ++ <source>Error - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Błąd - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3608"/> ++ <location filename="qdjview.cpp" line="3673"/> ++ <source>Cannot write file '%1'. ++%2.</source> ++ <translation>Nie można zapisać pliku '%1'. ++%2.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3634"/> ++ <source>%1 files (*.%2);;</source> ++ <comment>save image filter</comment> ++ <translatorcomment>Translation depends on the numer: 1 plik, 2 pliki, 5 plików,..,101 plik etc.</translatorcomment> ++ <translation>%1 plików (*.%2);;</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3638"/> ++ <source>Save Image - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Zapisz obraz - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3653"/> ++ <source>Cannot determine file format. ++Filename '%1' has no suffix.</source> ++ <translation>Nie można rozpoznać formatu pliku. ++Nazwa pliku '%1' nie ma rozszerzenia.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3666"/> ++ <source>Image format %1 not supported.</source> ++ <translation>Format obrazu %1 nie jest obsługiwany.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3894"/> ++ <source>Cannot decode page %1.</source> ++ <translation>Nie można zdekodować strony %1.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3896"/> ++ <source>Cannot decode document.</source> ++ <translation>Nie można zdekodować dokumentu.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="3898"/> ++ <source>Decoding DjVu document</source> ++ <translation>Dekodowanie dokumentu DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4031"/> ++ <source> P%1/%2 %3x%4 %5dpi </source> ++ <translation> P%1/%2 %3x%4 %5dpi </translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4038"/> ++ <source> x=%1 y=%2 </source> ++ <translation> x=%1 y=%2 </translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4042"/> ++ <source> %3x%4+%1+%2 </source> ++ <translation> %3x%4+%1+%2 </translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4117"/> ++ <source>Go: 1 page forward.</source> ++ <translation>Przejdź: 1 strona naprzód.</translation> ++ </message> ++ <message numerus="yes"> ++ <location filename="qdjview.cpp" line="4118"/> ++ <source>Go: %n pages forward.</source> ++ <translation> ++ <numerusform>Przejdź: %n strona naprzód.</numerusform> ++ <numerusform>Przejdź: %n strony naprzód.</numerusform> ++ <numerusform>Przejdź: %n stron naprzód.</numerusform> ++ </translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4120"/> ++ <source>Go: 1 page backward.</source> ++ <translation>Przejdź: 1 strona wstecz.</translation> ++ </message> ++ <message numerus="yes"> ++ <location filename="qdjview.cpp" line="4121"/> ++ <source>Go: %n pages backward.</source> ++ <translation> ++ <numerusform>Przejdź: %n strona wstecz.</numerusform> ++ <numerusform>Przejdź: %n strony wstecz.</numerusform> ++ <numerusform>Przejdź: %n stron wstecz.</numerusform> ++ </translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4124"/> ++ <location filename="qdjview.cpp" line="4126"/> ++ <source>Go: page %1.</source> ++ <translation>Przejdź: strona %1.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4128"/> ++ <source>Go: %1</source> ++ <translation>Przejdź: %1</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4130"/> ++ <source> (in other window.)</source> ++ <translation> (w osobnym oknie.)</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4219"/> ++ <source>Cannot resolve link '%1'</source> ++ <translation>Nie działa hiperłącze '%1'</translation> ++ </message> ++ <message numerus="yes"> ++ <location filename="qdjview.cpp" line="4242"/> ++ <source>%n characters</source> ++ <translation> ++ <numerusform>%n znak</numerusform> ++ <numerusform>%n znaki</numerusform> ++ <numerusform>%n znaków</numerusform> ++ </translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4247"/> ++ <source>Copy text (%1)</source> ++ <translation>Kopiuj tekst (%1)</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4248"/> ++ <source>Save text as...</source> ++ <translation>Zapisz tekst jako...</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4251"/> ++ <source>Copy text into the clipboard.</source> ++ <translation>Skopiuj tekst do schowka.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4252"/> ++ <source>Save text into a file.</source> ++ <translation>Zapisz tekst w pliku.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4254"/> ++ <source>Copy image (%1x%2 pixels)</source> ++ <translation>Kopiuj obraz (%1x%2 piksele)</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4256"/> ++ <source>Save image as...</source> ++ <translation>Zapisz obraz jako...</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4257"/> ++ <source>Copy image into the clipboard.</source> ++ <translation>Skopiuj obraz do schowka.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4258"/> ++ <source>Save image into a file.</source> ++ <translation>Zapisz obraz w pliku.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4260"/> ++ <source>Zoom to rectangle</source> ++ <translation>Powiększ zaznaczenie</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4261"/> ++ <source>Zoom the selection to fit the window.</source> ++ <translation>Powiększ zaznaczenia na całe okno.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4267"/> ++ <source>Copy URL</source> ++ <translation>Kopiuj URL</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4268"/> ++ <source>Save into the clipboard an URL that highlights the selection.</source> ++ <translation>Zapisz w schowku adres URL który podświetla zaznaczenie.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4270"/> ++ <source>Copy Maparea</source> ++ <translation>Kopiuj obszar adnotacji</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4271"/> ++ <source>Save into the clipboard a maparea annotation expression for program djvused.</source> ++ <translation>Kopiuj do schowka obszar adnotacji w formacie djvused.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4448"/> ++ <source>About DjView</source> ++ <translation>O DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4468"/> ++ <source>DjVu files</source> ++ <translation>Pliki DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4469"/> ++ <source>All files</source> ++ <translation>Wszystkie pliki</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4470"/> ++ <source>Open - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Otwórz - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4487"/> ++ <source>Open Location - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Otwórz adres - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4488"/> ++ <source>Enter the URL of a DjVu document:</source> ++ <translation>Wpisz URL dokumentu DjVu:</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4505"/> ++ <source>Information - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Informacje - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4520"/> ++ <source>Metadata - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Metadane - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="4742"/> ++ <source>&Clear History</source> ++ <translation>&Wyczyść historię</translation> ++ </message> ++</context> ++<context> ++ <name>QDjView::NetOpen</name> ++ <message> ++ <location filename="qdjview.cpp" line="2739"/> ++ <source>Cannot open URL '%1'.</source> ++ <translation>Nie można otworzyć URL '%1'.</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2740"/> ++ <source>Opening DjVu document</source> ++ <translation>Otwieranie dokumentu DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjview.cpp" line="2781"/> ++ <source>Cannot spawn a browser for url '%1'</source> ++ <translation>Nie można uruchomić przeglądarki dla URL '%1'</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewApplication</name> ++ <message> ++ <location filename="djview.cpp" line="320"/> ++ <source>cannot open '%1'.</source> ++ <translation>nie można otworzyć '%1'.</translation> ++ </message> ++ <message> ++ <location filename="djview.cpp" line="377"/> ++ <source>Usage: djview [options] [filename-or-url] ++Common options include: ++-help~~~Prints this message. ++-verbose~~~Prints all warning messages. ++-display <xdpy>~~~Select the X11 display <xdpy>. ++-geometry <xgeom>~~~Select the initial window geometry. ++-font <xlfd>~~~Select the X11 name of the main font. ++-style <qtstyle>~~~Select the QT user interface style. ++-fullscreen, -fs~~~Start djview in full screen mode. ++-page=<page>~~~Jump to page <page>. ++-zoom=<zoom>~~~Set zoom factor. ++-continuous=<yn>~~~Set continuous layout. ++-sidebyside=<yn>~~~Set side-by-side layout. ++</source> ++ <translatorcomment>Are the options really common?</translatorcomment> ++ <translation>Użycie: djview [opcje] [plik-lub-URL] ++Ważniejsze opcje: ++-help~~~Drukuj ten komunikat. ++-verbose~~~Drukuj wszystkie ostrzeżenia. ++-display <xdpy>~~~Wybierz obszar X11 <xdpy>. ++-geometry <xgeom>~~~Wybierz początkową geometrię okna. ++-font <xlfd>~~~Wybierz nazwę X11 głównego fontu. ++-style <qtstyle>~~~Wybierz styl interfejsu QT. ++-fullscreen, -fs~~~Uruchom djview w trybie pełnoekranowym. ++-page=<page>~~~Przejdź do strony <page>. ++-zoom=<zoom>~~~Ustaw wartość skalowania. ++-continuous=<yn>~~~Ustaw wyświetlanie ciągłe. ++-sidebyside=<yn>~~~Ustaw wyświetlanie stron obok siebie. ++</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewAuthDialog</name> ++ <message> ++ <location filename="qdjviewauthdialog.ui" line="48"/> ++ <source>Password:</source> ++ <translation>Hasło:</translation> ++ </message> ++ <message> ++ <location filename="qdjviewauthdialog.ui" line="62"/> ++ <source>User:</source> ++ <translation>Użytkownik:</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="210"/> ++ <source>Authentication required - DjView</source> ++ <translation>Wymagane uwierzytelnienie - DjView</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewDjVuExporter</name> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="342"/> ++ <source>DjVu Bundled Document</source> ++ <translation>Dokument scalony DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="343"/> ++ <location filename="qdjviewexporters.cpp" line="347"/> ++ <source>DjVu Files (*.djvu *.djv)</source> ++ <translation>Pliki DjVu (*.djvu *.djv)</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="346"/> ++ <source>DjVu Indirect Document</source> ++ <translation>Dokument rozłożony DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="394"/> ++ <source>Question - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Pytanie - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="395"/> ++ <source><html> This file belongs to a non empty directory. Saving an indirect document creates many files in this directory. Do you want to continue and risk overwriting files in this directory?</html></source> ++ <translation><html> Ten plik należy do niepustego katalogu.Zapisanie dokumentu rozłożonego stworzy wiele plików w tym katalogu. Czy kontynuować ryzykując zastąpienie plików w tym katalogu?</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="401"/> ++ <source>Con&tinue</source> ++ <translation>&Kontynuuj</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="402"/> ++ <source>&Cancel</source> ++ <translation>&Anuluj</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="429"/> ++ <source>Unknown error.</source> ++ <translation>Nieznany błąd.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="431"/> ++ <source>System error: %1.</source> ++ <translation>Błąd systemowy: %1.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="446"/> ++ <source>Save job creation failed!</source> ++ <translation>Nie powiodło się utworzenie zadania zapisywania!</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewErrorDialog</name> ++ <message> ++ <location filename="qdjviewerrordialog.ui" line="14"/> ++ <location filename="qdjviewdialogs.cpp" line="131"/> ++ <source>DjView Error</source> ++ <translation>Błąd DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjviewerrordialog.ui" line="108"/> ++ <source>&Ok</source> ++ <translation>&OK</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="176"/> ++ <source>Error - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Błąd - DjView</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewExportDialog</name> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="13"/> ++ <source>Dialog</source> ++ <translation>Dialog</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="26"/> ++ <location filename="qdjviewexportdialog.ui" line="38"/> ++ <source>Export</source> ++ <translation>Eksport</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="50"/> ++ <source>&Document</source> ++ <translation>&Dokument</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="60"/> ++ <source>C&urrent page</source> ++ <translation>&Bieżąca strona</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="75"/> ++ <source>&Pages</source> ++ <translation>&Strony</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="85"/> ++ <source>to</source> ++ <translation>do</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="119"/> ++ <source>Destination</source> ++ <translation>Plik wynikowy</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="139"/> ++ <source>Format:</source> ++ <translation>Format:</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="214"/> ++ <source>&Defaults</source> ++ <translation>D&omyślne</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="240"/> ++ <source>&Ok</source> ++ <translation>&OK</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="256"/> ++ <location filename="qdjviewdialogs.cpp" line="1417"/> ++ <source>&Cancel</source> ++ <translation>&Anuluj</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportdialog.ui" line="283"/> ++ <source>Stop</source> ++ <translation>Stop</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1254"/> ++ <source><html><b>Saving.</b><br/> You can save the whole document or a page range under a variety of formats. Selecting certain formats creates additional dialog pages for specifying format options.</html></source> ++ <translation><html><b>Zapisywanie.</b><br/> Można zapisać cały dokument lub zakres stron w jednym z kilku formatów. Wybór niektórych formatów otworzy dodatkowe strony dialogowe z parametrami specyficznymi dla danego formatu.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1407"/> ++ <source>Error - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Błąd - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1408"/> ++ <source>Overwriting the current file is not allowed!</source> ++ <translation>Nie można zastąpić bieżącego pliku!</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1413"/> ++ <source>Question - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Pytanie - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1414"/> ++ <source>A file with this name already exists. ++Do you want to replace it?</source> ++ <translation>Plik o tej nazwie już istnieje ++Czy go zastąpić?</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1416"/> ++ <source>&Replace</source> ++ <translation>&Zastąp</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1454"/> ++ <source>This operation has failed.</source> ++ <translation>Ta operacja nie powiodła się.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1458"/> ++ <source>This operation has been interrupted.</source> ++ <translation>Ta operacja została przerwana.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1487"/> ++ <source>All files</source> ++ <comment>save filter</comment> ++ <translation>Wszystkie pliki</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1494"/> ++ <source>Export - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Eksport - DjView</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewExportPS1</name> ++ <message> ++ <location filename="qdjviewexportps1.ui" line="16"/> ++ <source>Form</source> ++ <translatorcomment>Not sure about the meaning</translatorcomment> ++ <translation>Formularz</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps1.ui" line="36"/> ++ <source>Color</source> ++ <translation>Kolorystyka</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps1.ui" line="48"/> ++ <source>&Color</source> ++ <translation>&Kolor</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps1.ui" line="58"/> ++ <source>&GrayScale</source> ++ <translation>&Skala szarości</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps1.ui" line="68"/> ++ <source>Marks</source> ++ <translation>Znaczniki</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps1.ui" line="80"/> ++ <source>Print image &frame</source> ++ <translation>Drukuj z &ramką</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps1.ui" line="87"/> ++ <source>Print crop &marks</source> ++ <translation>Zaznacz &cięcia</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps1.ui" line="99"/> ++ <source>PostScript</source> ++ <translation>PostScript</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps1.ui" line="111"/> ++ <source>Language Level</source> ++ <translation>Poziom języka</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewExportPS2</name> ++ <message> ++ <location filename="qdjviewexportps2.ui" line="16"/> ++ <source>Form</source> ++ <translation>Formularz</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps2.ui" line="36"/> ++ <source>Scaling</source> ++ <translation>Skalowanie</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps2.ui" line="48"/> ++ <source>Scale to &fit the page</source> ++ <translation>Dopasuj do &strony</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps2.ui" line="66"/> ++ <source>&Zoom</source> ++ <translation>&Skala</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps2.ui" line="76"/> ++ <source> %</source> ++ <translation> %</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps2.ui" line="100"/> ++ <source>Orientation</source> ++ <translation>Orientacja</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps2.ui" line="112"/> ++ <source>Automatic</source> ++ <translation>Automatyczna</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps2.ui" line="122"/> ++ <source>&Portrait</source> ++ <translation>&Portret</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps2.ui" line="129"/> ++ <source>&Landscape</source> ++ <translation>&Krajobraz</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewExportPS3</name> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="16"/> ++ <source>Form</source> ++ <translation>Formularz</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="28"/> ++ <source>Print sheets suitable for folding a booklet.</source> ++ <translation>Drukuj strony do złożenia w broszurę.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="35"/> ++ <source>Advanced</source> ++ <translation>Zaawansowane</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="55"/> ++ <source>Sheets per booklet: </source> ++ <translation>Liczba stron broszury: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="62"/> ++ <source>Unlimited</source> ++ <translation>Nieograniczona</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="65"/> ++ <source>at most </source> ++ <translation>co najwyżej </translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="98"/> ++ <source>Print </source> ++ <translation>Drukuj </translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="112"/> ++ <source>rectos and versos.</source> ++ <translation>recto i verso.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="117"/> ++ <source>rectos only.</source> ++ <translation>tylko recto.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="122"/> ++ <source>versos only.</source> ++ <translation>tylko verso.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="153"/> ++ <source>Shift rectos and versos by </source> ++ <translation>Zwiększ margines przy grzbiecie </translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="160"/> ++ <source> points.</source> ++ <translatorcomment>Translation depends on the number</translatorcomment> ++ <translation> punktów.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="196"/> ++ <source>Center:</source> ++ <translation>Wyśrodkuj:</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="203"/> ++ <source> points</source> ++ <translation> pkt</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="216"/> ++ <source>plus</source> ++ <translation>plus</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="223"/> ++ <source>/100</source> ++ <translation>/100</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportps3.ui" line="239"/> ++ <source>per page.</source> ++ <translation>na stronę.</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewExportPrn</name> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="13"/> ++ <source>Form</source> ++ <translation>Formularz</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="21"/> ++ <source>Color</source> ++ <translation>Kolorystyka</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="30"/> ++ <source>&Color</source> ++ <translation>&Kolor</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="40"/> ++ <source>&GrayScale</source> ++ <translation>&Skala szarości</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="50"/> ++ <source>Marks</source> ++ <translation>Znaczniki</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="59"/> ++ <source>Print image &frame</source> ++ <translation>&Ramka</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="69"/> ++ <source>Print crop &marks</source> ++ <translation>&Cięcia</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="83"/> ++ <source>Scaling</source> ++ <translation>Skalowanie</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="89"/> ++ <source>Scale to &fit the page</source> ++ <translation>Dopasuj do &strony</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="104"/> ++ <source>&Zoom</source> ++ <translation>&Skaluj</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="117"/> ++ <source> %</source> ++ <translation></translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="141"/> ++ <source>Orientation</source> ++ <translation>Orientacja</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="150"/> ++ <source>Automatic</source> ++ <translation>Automatyczna</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="163"/> ++ <source>&Portrait</source> ++ <translation>&Portret</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexportprn.ui" line="173"/> ++ <source>&Landscape</source> ++ <translation>&Krajobraz</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewExportTiff</name> ++ <message> ++ <location filename="qdjviewexporttiff.ui" line="13"/> ++ <source>Form</source> ++ <translation>Formularz</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporttiff.ui" line="25"/> ++ <source>Resolution</source> ++ <translation>Rozdzielczość</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporttiff.ui" line="37"/> ++ <source>Maximum image resolution </source> ++ <translation>Maksymalna rozdzielczość </translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporttiff.ui" line="44"/> ++ <source> dpi</source> ++ <translation> dpi</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporttiff.ui" line="76"/> ++ <source>Compression</source> ++ <translation>Kompresja</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporttiff.ui" line="88"/> ++ <source>Force &bitonal G4 compression.</source> ++ <translation>Wymuś &bitonalną kompresję G4.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporttiff.ui" line="95"/> ++ <source>Allow &lossy JPEG compression.</source> ++ <translation>Zezwól na &stratną kompresję JPEG.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporttiff.ui" line="129"/> ++ <source>JPEG &quality</source> ++ <translation>&Jakość JPEG</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporttiff.ui" line="167"/> ++ <source>Allow &deflate compression.</source> ++ <translation>Zezwól na kompresję &deflate.</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewFind</name> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1616"/> ++ <source>Case sensitive</source> ++ <translation>Kaszta (wielkość) liter ma znaczenie</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1619"/> ++ <source>Words only</source> ++ <translation>Tylko całe słowa</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1622"/> ++ <source>Regular expression</source> ++ <translation>Wyrażenie regularne</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1641"/> ++ <source>Find Previous (Shift+F3) </source> ++ <translation>Znajdź poprzedni (Shift+F3) </translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1646"/> ++ <source>Find Next (F3) </source> ++ <translation>Znajdź następny (F3) </translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1652"/> ++ <source>Reset search options to default values.</source> ++ <translation>Przywróć domyślne wartości opcji wyszukiwania.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1656"/> ++ <source>Options</source> ++ <translation>Opcje</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1703"/> ++ <source><html><b>Finding text.</b><br/> Search hits appear progressively as soon as you type a search string. Typing enter jumps to the next hit. To move to the previous or next hit, you can also use the arrow buttons or the shortcuts <tt>F3</tt> or <tt>Shift-F3</tt>. You can also double click a page name. Use the <tt>Options</tt> menu to search words only or to specify the case sensitivity.</html></source> ++ <translation><html><b>Znajdowanie tekstu.</b><br/> Wyniki wyszukiwania pokazują się sukcesywnie w miarę wprowadzania szukanego napisu. Naciśnięcie Enter przechodzi do następnego wyniku. Można również używać strzałek, aby przejść do poprzedniego lub następnego wyniku, można także używać przycisków strzałek lub klawiszy funkcyjnych <tt>F3</tt> or <tt>Shift-F3</tt>. Można także dwukrotnie kliknąć na nazwę strony na liście wyników. Użyj menu <tt>Opcje</tt> aby szukać tylko całych słów lub uwzględnić kasztę (wielkość) liter.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1713"/> ++ <source>Specify whether search hits must begin on a word boundary.</source> ++ <translation>Określ, czy znalezione wyniki muszą zaczynać się na granicy słów.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1715"/> ++ <source>Specify whether searches are case sensitive.</source> ++ <translation>Określ, czy wyszukiwanie ma uwzględniać kasztę (wielkość) liter.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1717"/> ++ <source>Regular expressions describe complex string matching patterns.</source> ++ <translatorcomment>Loose translation</translatorcomment> ++ <translation>Wyrażenia regularne opisują złożone wzorce porównywania napisów.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1719"/> ++ <source><html><b>Regular Expression Quick Guide</b><ul><li>The dot <tt>.</tt> matches any character.</li><li>Most characters match themselves.</li><li>Prepend a backslash <tt>\</tt> to match special characters <tt>()[]{}|*+.?!^$\</tt>.</li><li><tt>\b</tt> matches a word boundary.</li><li><tt>\w</tt> matches a word character.</li><li><tt>\d</tt> matches a digit character.</li><li><tt>\s</tt> matches a blank character.</li><li><tt>\n</tt> matches a newline character.</li><li><tt>[<i>a</i>-<i>b</i>]</tt> matches characters in range <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt>[^<i>a</i>-<i>b</i>]</tt> matches characters outside range <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt><i>a</i>|<i>b</i></tt> matches either regular expression <tt><i>a</i></tt> or regular expression <tt><i>b</i></tt>.</li><li><tt><i>a</i>{<i>n</i>,<i>m</i>}</tt> matches regular expression <tt><i>a</i></tt> repeated <tt><i>n</i></tt> to <tt><i>m</i></tt> times.</li><li><tt><i>a</i>?</tt>, <tt><i>a</i>*</tt>, and <tt><i>a</i>+</tt> are shorthands for <tt><i>a</i>{0,1}</tt>, <tt><i>a</i>{0,}</tt>, and <tt><i>a</i>{1,}</tt>.</li><li>Use parentheses <tt>()</tt> to group regular expressions before <tt>?+*{</tt>.</li></ul></html></source> ++ <translation><html><b>Uproszczony opis wyrażeń regularnych</b><ul><li>Kropka <tt>.</tt> uzgadnia się z każdym znakiem.</li><li>Większość znaków uzgadnia się ze sobą.</li><li> Aby uzgodnić znaki specjalne <tt>()[]{}|*+.?!^$\</tt>.</li>poprzedź je ukośnikiem wstecznym <tt>\</tt><li><tt>\b</tt> uzgadnia się z granicą słów.</li><li><tt>\w</tt> uzgadnia się ze znakiem alfabetycznym.</li><li><tt>\d</tt> uzgadnia się ze znakiem cyfry.</li><li><tt>\s</tt> uzgadnia się ze spacją.</li><li><tt>\n</tt>uzgadnia się ze znakiem nowej linii.</li><li><tt>[<i>a</i>-<i>b</i>]</tt> uzgadnia się ze znakami z przedziału <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt>[^<i>a</i>-<i>b</i>]</tt> uzgadnia się ze znakami spoza przedziału <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt><i>a</i>|<i>b</i></tt> uzgadnia się z wyrażeniem regularnym <tt><i>a</i></tt> lub wyrażeniem regularnym <tt><i>b</i></tt>.</li><li><tt><i>a</i>{<i>n</i>,<i>m</i>}</tt> uzgadnia się z wyrażeniem regularnym <tt><i>a</i></tt>powtórzonym od <tt><i>n</i></tt> do <tt><i>m</i></tt> razy.</li><li><tt><i>a</i>?</tt>, <tt><i>a</i>*</tt>, and <tt><i>a</i>+</tt> są skrótem dla <tt><i>a</i>{0,1}</tt>, <tt><i>a</i>{0,}</tt>, i <tt><i>a</i>{1,}</tt>.</li><li>Nawiasy okrągłe <tt>()</tt> służą do grupowania wyrażeń przed <tt>?+*{</tt>.</li></ul></html></translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewFind::Model</name> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="979"/> ++ <source>1 hit</source> ++ <translation>1 wynik</translation> ++ </message> ++ <message numerus="yes"> ++ <location filename="qdjviewsidebar.cpp" line="980"/> ++ <source>%n hits</source> ++ <translation> ++ <numerusform>%n wynik</numerusform> ++ <numerusform>%n wyniki</numerusform> ++ <numerusform>%n wyników</numerusform> ++ </translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1048"/> ++ <source>Page %1 (1 hit)</source> ++ <translation>Strona %1 (1 wynik)</translation> ++ </message> ++ <message numerus="yes"> ++ <location filename="qdjviewsidebar.cpp" line="1050"/> ++ <source>Page %1 (%n hits)</source> ++ <translation> ++ <numerusform>Strona %1 (%n wynik)</numerusform> ++ <numerusform>Strona %1 (%n wyniki)</numerusform> ++ <numerusform>Strona %1 (%n wyników)</numerusform> ++ </translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1372"/> ++ <source>Searching page %1 (waiting for data.)</source> ++ <translation>Przeszukiwanie strony %1 (oczekiwanie na dane.)</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1385"/> ++ <source>Searching page %1.</source> ++ <translation>Przeszukiwanie strony %1.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1420"/> ++ <source>No hits!</source> ++ <translation>Brak wyników!</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1425"/> ++ <source><html>Document is not searchable. No page contains information about its textual content.</html></source> ++ <translation><html>Dokument nie nadaje się do przeszukiwania. Żadna strona nie zawiera treści tekstowej.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="1431"/> ++ <source><html>Invalid regular expression.</html></source> ++ <translation><html>Niepoprawne wyrażenie regularne.</html></translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewImgExporter</name> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1866"/> ++ <source>%1 Image</source> ++ <comment>JPG Image</comment> ++ <translation>%1 obraz</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1867"/> ++ <source>%1 Files (*.%2)</source> ++ <comment>JPG Files</comment> ++ <translation>%1 plików (*.%2)</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1933"/> ++ <source>Cannot render page.</source> ++ <translation>Nie można zwizualizować strony.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1943"/> ++ <source>Image format %1 not supported.</source> ++ <translation>Format obrazu %1 nie jest obsługiwany.</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewInfoDialog</name> ++ <message> ++ <location filename="qdjviewinfodialog.ui" line="16"/> ++ <source>Dialog</source> ++ <translation>Dialog</translation> ++ </message> ++ <message> ++ <location filename="qdjviewinfodialog.ui" line="29"/> ++ <source>&Document</source> ++ <translation>&Dokument</translation> ++ </message> ++ <message> ++ <location filename="qdjviewinfodialog.ui" line="88"/> ++ <source>&File</source> ++ <translation>&Plik</translation> ++ </message> ++ <message> ++ <location filename="qdjviewinfodialog.ui" line="108"/> ++ <source>File: </source> ++ <translation>Plik: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewinfodialog.ui" line="154"/> ++ <source>&View Page</source> ++ <translation>&Pokaż stronę</translation> ++ </message> ++ <message> ++ <location filename="qdjviewinfodialog.ui" line="204"/> ++ <source>&Close</source> ++ <translation>&Zamknij</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="300"/> ++ <source>File #</source> ++ <translation>Plik nr</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="300"/> ++ <source>File Name</source> ++ <translation>Nazwa pliku</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="301"/> ++ <source>File Size</source> ++ <translation>Rozmiar pliku</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="301"/> ++ <source>File Type</source> ++ <translation>Typ pliku</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="302"/> ++ <source>Page #</source> ++ <translation>Strona nr</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="302"/> ++ <source>Page Title</source> ++ <translation>Tytuł strony</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="334"/> ++ <source><html><b>Document information</b><br>This panel shows information about the document and its component files. Select a component file to display detailed information in the <tt>File</tt> tab. Double click a component file to show the corresponding page in the main window. </html></source> ++ <translation><html><b>Informacje o dokumencie</b><br>Ten panel zawiera informacje o dokumencie i jego plikach składowych. Wybierz plik składowy, aby wyświetlić szczegółowe informacje w zakładce <tt>Plik</tt> Kliknij dwukrotnie na plik składowy, aby wyświetlić odpowiednią stronę w głównym oknie. </html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="342"/> ++ <source><html><b>File and page information</b><br>This panel shows the structure of the DjVu data corresponding to the component file or the page selected in the <tt>Document</tt> tab. The arrow buttons jump to the previous or next component file.</html></source> ++ <translation><html><b>Informacje o pliku i stronie</b><br>Ten panel pokazuje strukturę danych DjVu odpowiadających plikowi składowemu lub stronie wybranej w zakładce <tt>Dokument</tt> . Klawisze strzałek przenoszą do poprzedniego lub następnego pliku składowego.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="396"/> ++ <source>Waiting for data...</source> ++ <translation>Oczekiwanie na dane...</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="515"/> ++ <source>Page #%1</source> ++ <translation>Strona nr %1</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="518"/> ++ <source>Thumbnails</source> ++ <translation>Miniaturki</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="520"/> ++ <source>Shared annotations</source> ++ <translation>Adnotacje wspólne</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="522"/> ++ <source>Shared data</source> ++ <translation>Dane wspólne</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="523"/> ++ <source>File #%1 - </source> ++ <translation>Plik nr %1 - </translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="536"/> ++ <source>Single DjVu page</source> ++ <translation>Pojedyncza strona DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="540"/> ++ <source>Bundled DjVu document</source> ++ <translation>Scalony dokument DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="542"/> ++ <source>Indirect DjVu document</source> ++ <translation>Rozłożony dokument DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="544"/> ++ <source>Obsolete bundled DjVu document</source> ++ <translation>Przestarzały scalony dokument DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="546"/> ++ <source>Obsolete indexed DjVu document</source> ++ <translation>Przestarzały rozłożony dokument DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="550"/> ++ <source>1 file</source> ++ <translation>1 plik</translation> ++ </message> ++ <message numerus="yes"> ++ <location filename="qdjviewdialogs.cpp" line="550"/> ++ <source>%n files</source> ++ <translation> ++ <numerusform>%n plik</numerusform> ++ <numerusform>%n pliki</numerusform> ++ <numerusform>%n plików</numerusform> ++ </translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="551"/> ++ <source>1 page</source> ++ <translation>1 strona</translation> ++ </message> ++ <message numerus="yes"> ++ <location filename="qdjviewdialogs.cpp" line="551"/> ++ <source>%n pages</source> ++ <translation> ++ <numerusform>%n strona</numerusform> ++ <numerusform>%n strony</numerusform> ++ <numerusform>%n stron</numerusform> ++ </translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="584"/> ++ <location filename="qdjviewdialogs.cpp" line="591"/> ++ <source>n/a</source> ++ <translation>nie stosuje się</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="598"/> ++ <source> Page </source> ++ <translation> Strona </translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="600"/> ++ <source> Thumbnails </source> ++ <translation> Miniaturki </translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="602"/> ++ <source> Shared </source> ++ <translation> Wspólne </translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewMetaDialog</name> ++ <message> ++ <location filename="qdjviewmetadialog.ui" line="16"/> ++ <source>Dialog</source> ++ <translation>Dialog</translation> ++ </message> ++ <message> ++ <location filename="qdjviewmetadialog.ui" line="29"/> ++ <source>&Document Metadata</source> ++ <translation>Metadane &dokumentu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewmetadialog.ui" line="55"/> ++ <source>&Page Metadata</source> ++ <translation>Metadane &strony</translation> ++ </message> ++ <message> ++ <location filename="qdjviewmetadialog.ui" line="75"/> ++ <source>Page:</source> ++ <translation>Strona:</translation> ++ </message> ++ <message> ++ <location filename="qdjviewmetadialog.ui" line="121"/> ++ <source>&View Page</source> ++ <translation>&Pokaż stronę</translation> ++ </message> ++ <message> ++ <location filename="qdjviewmetadialog.ui" line="168"/> ++ <source>&Close</source> ++ <translation>&Zamknij</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="669"/> ++ <source>Ctrl+C</source> ++ <comment>copy</comment> ++ <translation>Ctrl+C</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="672"/> ++ <source> Key </source> ++ <translation> Klawisz </translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="672"/> ++ <source> Value </source> ++ <translation> Wartość </translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="716"/> ++ <source><html><b>Document metadata</b><br>This panel displays metadata pertaining to the document, such as author, title, references, etc. This information can be saved into the document with program <tt>djvused</tt>: use the commands <tt>create-shared-ant</tt> and <tt>set-meta</tt>.</html></source> ++ <translation><html><b>Metadane dokumentu</b><br>Ten panel pokazuje metadane dokumentu, takie jak autor, tytuł, bibliografię itp. Informacje takie mogą być zapisane w dokumencie za pomocą programu <tt>djvused</tt> i komend <tt>create-shared-ant</tt> oraz <tt>set-meta</tt>.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="725"/> ++ <source><html><b>Page metadata</b><br>This panel displays metadata pertaining to a specific page. Page specific metadata override document metadata. This information can be saved into the document with program <tt>djvused</tt>: use command <tt>select</tt> to select the page and command <tt>set-meta</tt> to specify the metadata entries.</html></source> ++ <translation><html><b>Metadane strony</b><br>Ten panel pokazuje metadane dotyczące konkretnej strony. Są one ważniejsze od metadanych dokumentu. Ta informacja może być zapisana w dokumencie za pomocą programu <tt>djvused</tt> i komend: <tt>select</tt> w celu wybrania strony i <tt>set-meta</tt> do wstawienia pól metadanych.</html></translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewOutline</name> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="120"/> ++ <source><html><b>Document outline.</b><br/> This panel display the document outline, or the page names when the outline is not available, Double-click any entry to jump to the selected page.</html></source> ++ <translation><html><b>Zakładki dokumentu.</b><br/> Ten panel pokazuje zakładki dokumentu, lub nazwy stron, jeśli zakładki nie są dostępny. Dwukrotne kliknięcie przenosi do wybranej strony.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="153"/> ++ <source>Outline data is corrupted</source> ++ <translation>Dane zakładek są uszkodzone</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="170"/> ++ <source>Pages</source> ++ <translation>Strony</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="177"/> ++ <location filename="qdjviewsidebar.cpp" line="236"/> ++ <source>Page %1</source> ++ <translation>Strona %1</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="181"/> ++ <location filename="qdjviewsidebar.cpp" line="248"/> ++ <source>Go: page %1.</source> ++ <translation>Przejdź do strony %1.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="244"/> ++ <source>Go: %1</source> ++ <translation>Przejdź: %1</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewPSExporter</name> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="556"/> ++ <source>PostScript</source> ++ <translation>PostScript</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="557"/> ++ <location filename="qdjviewexporters.cpp" line="561"/> ++ <source>PostScript Files (*.ps *.eps)</source> ++ <translation>Pliki w formacie PostScript (*.ps *.eps)</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="560"/> ++ <source>Encapsulated PostScript</source> ++ <translation>Encapsulated PostScript</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="606"/> ++ <source>PostScript</source> ++ <comment>tab caption</comment> ++ <translation>PostScript</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="607"/> ++ <source>Position</source> ++ <comment>tab caption</comment> ++ <translation>Pozycjonowanie</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="608"/> ++ <source>Booklet</source> ++ <comment>tab caption</comment> ++ <translation>Broszura</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="618"/> ++ <source><html><b>PostScript options.</b><br>Option <tt>Color</tt> enables color printing. Document pages can be decorated with frame and crop marks. PostScript language level 1 is only useful with very old printers. Level 2 works with most printers. Level 3 print color document faster on recent printers.</html></source> ++ <translation><html><b>Opcje języka PostScript.</b><br>Opcje <tt>Kolor</tt> włącza drukowanie w kolorze. Strony dokumentu mogą być uzupełnione o ramki i znaczniki cięcia. Język PostScript poziom 1 jest przydatny tylko dla bardzo starych drukarek. Poziom 2 jest właściwy dla większości drukarek. Poziom 3 drukuje kolorowe dokumenty szybciej na nowszych drukarkach.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="626"/> ++ <source><html><b>Position and scaling.</b><br>Option <tt>Scale to fit</tt> accommodates whatever paper size your printer uses. Zoom factor <tt>100%</tt> reproduces the initial document size. Orientation <tt>Automatic</tt> chooses portrait or landscape on a page per page basis.</html></source> ++ <translation><html><b>Pozycjonowanie i skalowanie.</b><br>Opcje <tt>Skaluj, aby dopasować</tt> dostosowuje się do dowolnego rozmiaru papieru. Współczynnik skalowania <tt>100%</tt> zachowuje oryginalny rozmiar dokumentu. Orientacja<tt>Automatyczne</tt> wybiera portret lub krajobraz osobno dla każdej strony.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="633"/> ++ <source><html><b>Producing booklets.</b><br>The booklet mode prints the selected pages as sheets suitable for folding one or several booklets. Several booklets might be produced when a maximum number of sheets per booklet is specified. You can either use a duplex printer or print rectos and versos separately.<p> Shifting rectos and versos is useful with poorly aligned duplex printers. The center margins determine how much space is left between the pages to fold the sheets. This space slowly increases from the inner sheet to the outer sheet.</html></source> ++ <translatorcomment>Loose translation</translatorcomment> ++ <translation><html><b>Tworzenie broszury.</b><br>Tryb broszury drukuje wybrane strony jako arkusze nadające się do złożenia i utworzenia jednej lub więcej broszur. Kilka broszur można tworzyć kiedy jest określona maksymalna liczba arkuszy na broszurę. Można drukować dwustronnie lub osobno strony recto i strony verso.<p> Przesunięcie stron recto i verso jest przydatny dla drukarek dwustronnych, które nie wyrównują dobrze marginesów. Margines centralny decyduje o tym, ile miejsca jest między stronami na zgięcie arkusza. Ten margines zwiększa się powoli od arkuszy wewnętrznych do arkuszy zewnętrznych.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1127"/> ++ <source>Save job creation failed!</source> ++ <translation>Utworzenie zadania zapisania nie powiodło się!</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewPdfExporter</name> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1709"/> ++ <source>PDF Document</source> ++ <translation>Dokument PDF</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1710"/> ++ <source>PDF Files (*.pdf)</source> ++ <translation>Pliki PDF (*.pdf)</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1719"/> ++ <source>PDF Options</source> ++ <comment>tab caption</comment> ++ <translation>Opcje PDF</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1720"/> ++ <source><html><b>PDF options.</b><br>These options control the characteristics of the images embedded in the exported PDF files. The resolution box limits their maximal resolution. Forcing bitonal G4 compression encodes all pages in black and white using the CCITT Group 4 compression. Allowing JPEG compression uses lossy JPEG for all non bitonal or subsampled images. Otherwise, allowing deflate compression produces more compact files. </html></source> ++ <translation><html><b>Opcje PDF.</b><br>Te opcje określają własności obrazów zawartych w eksportowanych plikach PDF. Okienko rozdzielczości ogranicza ich maksymalną rozdzielczość. Wymuszenie bitonalnej kompresji oznacza zakodowanie wszystkich stron jako czarno-białych za pomocą kompresji CCITT Group 4. Dopuszczenie kompresji JPEG oznacza użycie stratnej kompresji JPEG dla wszystkich bitonalnych lub podpróbkowanych obrazów. W przeciwnym razie dopuszczenie kompresji deflate tworzy bardziej zwarte pliki. </html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1764"/> ++ <source>Error while creating pdf file.</source> ++ <translation>Błąd w trakcie tworzenia pliku PDF.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1768"/> ++ <source>Unable to create output file.</source> ++ <translation>Nie można utworzyć pliku wyjściowego.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1770"/> ++ <location filename="qdjviewexporters.cpp" line="1814"/> ++ <source>System error: %1.</source> ++ <translation>Błąd systemowy: %1.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1773"/> ++ <source>Unable to reopen temporary file.</source> ++ <translation>Nie można ponownie otworzyć pliku tymczasowego.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1788"/> ++ <source>PDF export was not compiled.</source> ++ <translatorcomment>What it is supposed to mean?</translatorcomment> ++ <translation>Eksport do PDF nie został skompilowany.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1812"/> ++ <source>Unable to create temporary file.</source> ++ <translation>Nie można utworzyć pliku tymczasowego.</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewPlugin::Document</name> ++ <message> ++ <location filename="qdjviewplugin.cpp" line="389"/> ++ <source>Requesting %1.</source> ++ <translation>Zażądano %1.</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewPrefsDialog</name> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="14"/> ++ <source>Dialog</source> ++ <translation>Dialog</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="27"/> ++ <source>&Screen</source> ++ <translation>&Ekran</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="33"/> ++ <source>Gamma</source> ++ <translation>Współczynnik gamma</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="53"/> ++ <source><html>Screen color correction.<br>Adjust slider until gray shades look similar.</html></source> ++ <translation><html>Korekta koloru ekranu.<br>Ustaw suwak tak, aby odcienie szarości były podobne.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="102"/> ++ <source>Darker</source> ++ <translation>Ciemniej</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="122"/> ++ <source>Lighter</source> ++ <translation>Jaśniej</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="191"/> ++ <location filename="qdjviewprefsdialog.ui" line="387"/> ++ <source>Display</source> ++ <translation>Wyświetlanie</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="199"/> ++ <source>Force screen &resolution</source> ++ <translation>Wymuś rozdzielczość &ekranową</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="234"/> ++ <source> dpi</source> ++ <translation> dpi</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="268"/> ++ <source>Force inverted luminance</source> ++ <translation>Wymuś odwrócenie luminancji</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="279"/> ++ <source>&Interface</source> ++ <translation>&Interfejs</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="293"/> ++ <source>Options for</source> ++ <translatorcomment>Obsolete?</translatorcomment> ++ <translation>Opcje dla</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="321"/> ++ <source>&Remember initial state from last invocation</source> ++ <translatorcomment>Loose translation</translatorcomment> ++ <translation>&Pamiętaj stan po ostatnim uruchomieniu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="330"/> ++ <source>Show</source> ++ <translation>Wyświetlaj</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="336"/> ++ <source>&Menu bar</source> ++ <translation>Pasek &menu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="343"/> ++ <source>&Tool bar</source> ++ <translation>Pasek &narzędzi</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="350"/> ++ <source>Sc&rollbars</source> ++ <translation>&Suwaki przewijania</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="357"/> ++ <source>Stat&us bar</source> ++ <translation>Pasek s&tanu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="364"/> ++ <source>&Side bar</source> ++ <translation>Panel &boczny</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="395"/> ++ <source>&Zoom: </source> ++ <translatorcomment>Skalowanie too long</translatorcomment> ++ <translation>S&kala: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="415"/> ++ <source>Timer: </source> ++ <translatorcomment>All reasonable translation too long</translatorcomment> ++ <translation>Timer: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="428"/> ++ <source> s</source> ++ <translation> s</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="459"/> ++ <source>Display page &frames</source> ++ <translation>&Ramki stron</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="466"/> ++ <source>Display &annotations</source> ++ <translation>&Adnotacje</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="489"/> ++ <source>Layout</source> ++ <translation>Układ</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="495"/> ++ <source>Continuous</source> ++ <translation>Ciągły</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="518"/> ++ <source>Side-by-side</source> ++ <translation>Obok siebie</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="548"/> ++ <source>Cover Page</source> ++ <translation>Strona tytułowa</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="555"/> ++ <source>Right-to-Left</source> ++ <translation>Od prawej</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="598"/> ++ <source>&Keys</source> ++ <translation>&Klawisze</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="604"/> ++ <source>Keys</source> ++ <translation>Klawisze</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="616"/> ++ <source>For displaying hyper&links: </source> ++ <translation>Wyświetlanie &hiperłączy: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="626"/> ++ <source>For &selecting text or images: </source> ++ <translation>&Zaznaczanie tekstu lub obrazów: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="636"/> ++ <source>For displaying the &lens: </source> ++ <translation>Wyświetlanie &lupy: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="670"/> ++ <source>Mouse wheel</source> ++ <translation>Rolka myszy</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="676"/> ++ <source>Mouse wheel scrolls the page</source> ++ <translation>Rolka myszy przewija stronę</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="686"/> ++ <source>Mouse wheel changes the zoom factor</source> ++ <translation>Rolka myszy zmienia wartość skalowania</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="710"/> ++ <source>&Lens</source> ++ <translation>&Lupa</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="722"/> ++ <source>Enable magnifying &lens</source> ++ <translation>Włącz szkło &powiększające</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="732"/> ++ <source>Lens options</source> ++ <translation>Opcje lupy</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="744"/> ++ <source>Lens &size: </source> ++ <translation>&Rozmiar okna lupy: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="754"/> ++ <source>Magnifying &power: </source> ++ <translation>Stopień &powiększenia: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="764"/> ++ <source>x</source> ++ <translation>x</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="780"/> ++ <source> pixels</source> ++ <translation> pikseli</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="816"/> ++ <source>&Network</source> ++ <translation>&Sieć</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="825"/> ++ <source>Proxy settings</source> ++ <translation>Ustawienia serwera pośredniczącego</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="831"/> ++ <source>Use pro&xy to access the network</source> ++ <translation>Stosuj &serwer pośredniczący</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="844"/> ++ <source>&Host: </source> ++ <translation>&Serwer: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="864"/> ++ <source>&Port: </source> ++ <translation>&Port: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="884"/> ++ <source>&User: </source> ++ <translation>&Użytkownik: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="904"/> ++ <source>Pass&word: </source> ++ <translation>&Hasło: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="927"/> ++ <source>Cache</source> ++ <translation>Pamięć podręczna</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="939"/> ++ <source>&Clear</source> ++ <translation>&Wyczyść</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="949"/> ++ <location filename="qdjviewprefsdialog.ui" line="962"/> ++ <source> MB</source> ++ <translation> MB</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="978"/> ++ <source>&Decoded page cache: </source> ++ <translation>Pamięć zdekodowanych &stron: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="988"/> ++ <source>&Pixel cache: </source> ++ <translation>Pamięć &pikseli: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1015"/> ++ <source>&Advanced</source> ++ <translation>&Zaawansowane</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1021"/> ++ <source>Interface</source> ++ <translation>Interfejs</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1029"/> ++ <source>Force language (next time djview runs)</source> ++ <translation>Wymuś język (wymaga ponownego uruchomienia)</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1058"/> ++ <source>Enable page animations</source> ++ <translation>Włącz animację stron</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1068"/> ++ <source>Enable advanced features in menus</source> ++ <translation>Włącz zaawansowane opcje w menu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1075"/> ++ <source>Show hidden text in status bar</source> ++ <translation>Pokazuj na pasku stanu tekst ukryty</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1085"/> ++ <source>Miscellaneous</source> ++ <translation>Różne</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1091"/> ++ <source>Render with openGL when available</source> ++ <translation>Wizualizuj za pomocą openGL jeśli jest dostępne</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1101"/> ++ <source>Override saving and printing restrictions</source> ++ <translation>Ignoruj ograniczenia zapisywania i drukowania</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1110"/> ++ <source>Manual printer color correction</source> ++ <translation>Ręczna korekta kolorów drukowania</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1123"/> ++ <source>gamma=</source> ++ <translation>gamma=</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1188"/> ++ <source>&Defaults</source> ++ <translation>&Wartości domyślne</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1214"/> ++ <source>&Apply</source> ++ <translation>&Zastosuj</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1221"/> ++ <source>&Ok</source> ++ <translation>&OK</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefsdialog.ui" line="1228"/> ++ <source>Cancel</source> ++ <translation>Anuluj</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="780"/> ++ <source>Preferences[*] - DjView</source> ++ <translation>Ustawienia - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="851"/> ++ <source><html><b>Screen gamma correction.</b><br>The best color rendition is achieved by adjusting the gamma correction slider and choosing the position that makes the gray square as uniform as possible.<p><b>Screen resolution.</b><br>This option forces a particular resolution instead of using the unreliable resolution advertised by the operating system. Forcing the resolution to 100 dpi matches the behavior of the djvulibre command line tools.</html></source> ++ <translation><html><b>Korekcja współczynnika gamma.</b><br> Najlepszą wizualizację kolorów osiąga się przez wybór takiej pozycji suwaka, w której szare kwadraty są najbardziej podobne.<p><b>Rozdzielczość ekranu.</b><br>Ta opcja wymusza konkretną rozdzielczość zamiast rozdzielczości proponowanej przez system operacyjny. Wymuszanie rozdzielczości 100 dpi jest zgodne z zachowaniem programów narzędziowych DjVuLibre.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="864"/> ++ <source><html><b>Initial interface setup.</b><br>DjView can run as a standalone viewer, as a full screen viewer, as a full page browser plugin, or as a plugin embedded inside a html page. For each case, check the <tt>Remember</tt> box to automatically save and restore the interface setup. Otherwise, specify an initial configuration.</html></source> ++ <translation><html><b>Początkowe ustawienie interfejsu.</b><br>DjView może pracować jako samodzielna przeglądarka, jako przeglądarka pełnoekranowa, jako pełnoekranowa wtyczka do przeglądarki WWW, i jako wtyczka osadzona na stronie HTML. W każdym przypadku należy zaznaczyć pole wyboru <tt>Pamiętaj</tt> aby automatycznie zapisać i odtworzyć ustawienia interfejsu. W przeciwnym wypadku należy określić konfigurację początkową.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="874"/> ++ <source><html><b>Modifiers keys.</b><br>Define which combination of modifier keys will show the manifying lens, temporarily enable the selection mode, or highlight the hyperlinks.</html></source> ++ <translation><html><b>Klawisze modyfikujące.</b><br>Określ, które kombinacje klawiszy wyświetlają lupę, tymczasowo włączają tryb zaznaczania lub uwydatniają hiperłącza.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="881"/> ++ <source><html><b>Magnifying lens.</b><br>The magnifying lens appears when you depress the modifier keys specified in tab <tt>Keys</tt>. This panel lets you choose the power and the size of the magnifying lens.</html></source> ++ <translation><html><b>Szkło powiekszające.</b><br>Szkło powiększające ukazuje się po naciśnięciu klawisza modyfikującego określonego w zakładce <tt>Klawisze</tt>. Ten panel pozwala wybrać stopień powiększenia i rozmiar lupy.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="889"/> ++ <source><html><b>Advanced.</b><br>You can override the default interface language, disable the page animations, or enable additional menu entries that are useful for authoring DjVu files.You can also disable the printing or saving restrictions dictated by certain web sites. The manual color correction can be useful with old printers.</html></source> ++ <translation><html><b>Zaawansowane.</b><br>Można zmienić domyślny język interfejsu, wyłączyć animację stron, włączyć dodatkowe pozycje menu.Można również wyłączyć ograniczenia drukowania lub zapisywania narzucane przez niektóre witryny internetowe. Ręczna korekta koloru drukowania może być przydatna dla starych drukarek.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="899"/> ++ <source><html><b>Network proxy settings.</b><br>These proxy settings are used when the standalone djview viewer accesses a djvu document through a http url. The djview plugin always uses the proxy settings of the web browser.<p><b>Cache settings.</b><br>The <i>pixel cache</i> stores image data located outside the visible area. This cache makes panning smoother. The <i>decoded page cache</i> contains partially decoded pages. It provides faster response times when navigating a multipage document or when returning to a previously viewed page. Clearing this cache might be useful to reflect a change in the page data without restarting the DjVu viewer.</html></source> ++ <translation><html><b>Ustawienia serwera pośredniczącego.</b><br>Te ustawienia są wykorzystywane, gdy samodzielna przeglądarka pobiera dokument za pomocą protokołu HTTP. Wtyczka DjView zawsze używa ustawień przeglądarki internetowej.<p><b>Ustawienia pamięci podręcznej.</b><br><i>Pamięć pikseli</i> przechowuje informacje o fragmentach obrazu, które nie są aktualnie wyświetlane. Powoduje to bardziej płynne pozycjonowanie. <i>Pamięć zdekodowanych stron</i> zawiera częściowo zdekodowane strony. Zapewnia szybszy czas reakcji podczas nawigacji w wielostronicowym dokumencie oraz przy powrocie do poprzednio wyświetlanej strony. Wyczyszczenie pamięci może być pożyteczne dla uwzględnienia zmienionych dany strony bez ponownego uruchamiania programu.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="954"/> ++ <source>Standalone Viewer</source> ++ <translation>Samodzielna przeglądarka</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="957"/> ++ <source>Standalone Viewer (Full Screen mode)</source> ++ <translation>Samodzielna przeglądarka (tryb pełnoekranowy)</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="960"/> ++ <source>Standalone Viewer (Slideshow mode)</source> ++ <translation>Samodzielna przeglądarka (pokaz slajdów)</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="963"/> ++ <source>Full Page Plugin</source> ++ <translation>Wtyczka całostronicowa</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprefs.cpp" line="966"/> ++ <source>Embedded Plugin</source> ++ <translation>Wtyczka osadzona</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewPrintDialog</name> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="13"/> ++ <source>Dialog</source> ++ <translation>Dialog</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="29"/> ++ <location filename="qdjviewprintdialog.ui" line="41"/> ++ <source>Print</source> ++ <translation>Drukuj</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="53"/> ++ <source>&Document</source> ++ <translation>&Dokument</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="63"/> ++ <source>C&urrent page</source> ++ <translation>&Bieżąca strona</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="78"/> ++ <source>&Pages</source> ++ <translation>&Strony</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="88"/> ++ <source>to</source> ++ <translation>do</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="122"/> ++ <source>Destination</source> ++ <translation>Urządzenie docelowe</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="134"/> ++ <source>Print to file</source> ++ <translation>Drukuj do pliku</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="182"/> ++ <source>Printer name: </source> ++ <translation>Nazwa drukarki: </translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="207"/> ++ <source>Choose</source> ++ <translation>Wybierz</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="238"/> ++ <source>&Defaults</source> ++ <translation>&Wartości domyślne</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="264"/> ++ <source>&Ok</source> ++ <translation>&OK</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="280"/> ++ <location filename="qdjviewdialogs.cpp" line="1852"/> ++ <source>&Cancel</source> ++ <translation>&Anuluj</translation> ++ </message> ++ <message> ++ <location filename="qdjviewprintdialog.ui" line="307"/> ++ <source>Stop</source> ++ <translation>Stop</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1607"/> ++ <source><html><b>Printing.</b><br/> You can print the whole document or a page range. Use the <tt>Choose</tt> button to select a print destination and specify printer options. Additional dialog tabs might appear to specify conversion options.</html></source> ++ <translation><html><b>Drukowanie.</b><br/> Można drukować cały dokument lub pewien przedział stron. Użyj przycisku <tt>Wybierz</tt> aby wybrać urządzenie i określić opcje drukowania. Mogą pojawić się dodatkowe zakładki z opcjami konwersji.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1697"/> ++ <source>(invalid printer)</source> ++ <translation>(drukarka niedostępna)</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1729"/> ++ <source>All files</source> ++ <comment>save filter</comment> ++ <translation>Wszystkie pliki</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1736"/> ++ <source>Print To File - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Drukuj do pliku - Djview</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1848"/> ++ <source>Question - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Pytanie - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1849"/> ++ <source>A file with this name already exists. ++Do you want to replace it?</source> ++ <translation>Plik o tej nazwie już istnieje ++Czy go zastąpić?</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1851"/> ++ <source>&Replace</source> ++ <translation>&Zastąp</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1891"/> ++ <source>This operation has failed.</source> ++ <translation>Ta operacja nie powiodła się.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1895"/> ++ <source>This operation has been interrupted.</source> ++ <translation>Ta operacja została przerwana.</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewPrnExporter</name> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="2011"/> ++ <source>Printer data</source> ++ <translation>Dane drukarki</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="2012"/> ++ <source>PRN Files (*.prn)</source> ++ <translation>Pliki PRN (*.prn)</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="2032"/> ++ <source>Printing Options</source> ++ <comment>tab caption</comment> ++ <translation>Opcje drukowania</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="2034"/> ++ <source><html><b>Printing options.</b><br>Option <tt>Color</tt> enables color printing. Document pages can be decorated with a frame. Option <tt>Scale to fit</tt> accommodates whatever paper size your printer uses. Zoom factor <tt>100%</tt> reproduces the initial document size. Orientation <tt>Automatic</tt> chooses portrait or landscape on a page per page basis.</html></source> ++ <translation><html><b>Opcje drukowania.</b><br>Opcja <tt>Kolor</tt> włącza drukowanie w kolorze. Strony dokumentu mogą być ujęte w ramki. Opcja <tt>Dopasuj do strony</tt> dostosowuje wydruk do dowolnego rozmiaru papieru w drukarce. Współczynnik skalowania równy <tt>100%</tt> zachowuje oryginalny rozmiar dokumentu. Orientacja<tt>Automatycznie/tt> wybiera orientację portret lub krajobraz osobno dla każdej strony.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="2290"/> ++ <source>Cannot render page %1.</source> ++ <translation>Nie można zwizualizować strony %1.</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewSaveDialog</name> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="13"/> ++ <source>Dialog</source> ++ <translation>Dialog</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="25"/> ++ <source>Save</source> ++ <translation>Zapisz</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="37"/> ++ <source>&Document</source> ++ <translation>&Dokument</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="47"/> ++ <source>C&urrent page</source> ++ <translation>&Bieżąca strona</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="62"/> ++ <source>&Pages</source> ++ <translation>&Strony</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="72"/> ++ <source>to</source> ++ <translation>do</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="106"/> ++ <source>Destination</source> ++ <translation>Plik wynikowy</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="134"/> ++ <source>Format:</source> ++ <translation>Format:</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="142"/> ++ <source>Bundled DjVu Document</source> ++ <translation>Scalony dokument DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="147"/> ++ <source>Indirect DjVu Document</source> ++ <translation>Rozłożony dokument DjVu</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="206"/> ++ <source>&Ok</source> ++ <translation>&OK</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="222"/> ++ <location filename="qdjviewdialogs.cpp" line="1070"/> ++ <source>&Cancel</source> ++ <translation>&Anuluj</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsavedialog.ui" line="249"/> ++ <source>Stop</source> ++ <translation>Stop</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="971"/> ++ <source><html><b>Saving.</b><br/> You can save the whole document or a page range. The bundled format creates a single file. The indirect format creates multiple files suitable for web serving.</html></source> ++ <translation><html><b>Zapisywanie.</b><br/> Można zapisać cały dokument lub zakres stron. Format scalony tworzy jeden plik. Format rozłożony tworzy wiele plików wygodnych do udostępniania przez serwery internetowe.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1060"/> ++ <source>Error - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Błąd - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1061"/> ++ <source>Overwriting the current file is not allowed!</source> ++ <translation>Nie można zastąpić bieżącego pliku!</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1066"/> ++ <source>Question - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Pytanie - DjView</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1067"/> ++ <source>A file with this name already exists. ++Do you want to replace it?</source> ++ <translation>Plik o tej nazwie już istnieje ++Czy go zastąpić?</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1069"/> ++ <source>&Replace</source> ++ <translation>&Zastąp</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1107"/> ++ <source>This operation has failed.</source> ++ <translation>Ta operacja nie powiodła się.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1111"/> ++ <source>This operation has been interrupted.</source> ++ <translation>Ta operacja została przerwana.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1138"/> ++ <source>All files</source> ++ <comment>save filter</comment> ++ <translation>Wszystkie pliki</translation> ++ </message> ++ <message> ++ <location filename="qdjviewdialogs.cpp" line="1145"/> ++ <source>Save - DjView</source> ++ <comment>dialog caption</comment> ++ <translation>Zapisz - DjView</translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewThumbnails</name> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="724"/> ++ <source>Tiny</source> ++ <comment>thumbnail menu</comment> ++ <translation>Malutkie</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="729"/> ++ <source>Small</source> ++ <comment>thumbnail menu</comment> ++ <translation>Małe</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="734"/> ++ <source>Medium</source> ++ <comment>thumbnail menu</comment> ++ <translation>Średnie</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="739"/> ++ <source>Large</source> ++ <comment>thumbnail menu</comment> ++ <translation>Duże</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="745"/> ++ <source>Smart</source> ++ <comment>thumbnail menu</comment> ++ <translation>Sprytne</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="752"/> ++ <source>Control Left Mouse Button</source> ++ <translation>Control i lewy klawisz myszy</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="754"/> ++ <source>Right Mouse Button</source> ++ <translation>Prawy klawisz myszy</translation> ++ </message> ++ <message> ++ <location filename="qdjviewsidebar.cpp" line="756"/> ++ <source><html><b>Document thumbnails.</b><br/> This panel display thumbnails for the document pages. Double click a thumbnail to jump to the selected page. %1 to change the thumbnail size or the refresh mode. The smart refresh mode only computes thumbnails when the page data is present (displayed or cached.)</html></source> ++ <translation><html><b>Miniaturki.</b><br/> Ten panel wyświetla miniaturki stron dokumentu. Podwójne kliknięcie na miniaturkę przenosi do odpowiedniej strony. %1 aby zmienić rozmiar miniaturek lub je odświeżyć. Tryb sprytny wyświetla miniaturkę tylko wtedy, gdy strona jest wyświetlana lub znajduje się w pamięci podręcznej.</html></translation> ++ </message> ++</context> ++<context> ++ <name>QDjViewTiffExporter</name> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1349"/> ++ <source>TIFF Document</source> ++ <translation>Dokument TIFF</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1350"/> ++ <source>TIFF Files (*.tiff *.tif)</source> ++ <translation>Pliki TIFF (*.tiff *.tif)</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1369"/> ++ <source>TIFF Options</source> ++ <comment>tab caption</comment> ++ <translation>Opcje TIFF</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1371"/> ++ <source><html><b>TIFF options.</b><br>The resolution box specifies an upper limit for the resolution of the TIFF images. Forcing bitonal G4 compression encodes all pages in black and white using the CCITT Group 4 compression. Allowing JPEG compression uses lossy JPEG for all non bitonal or subsampled images. Otherwise, allowing deflate compression produces more compact (but less portable) files than the default packbits compression.</html></source> ++ <translation><html><b>Opcje TIFF </b><br>Pole wyboru rozdzielczości określa maksymalną rozdzielczość obrazów TIFF. Wymuszenie bitonalnej kompresji oznacza zakodowanie wszystkich stron jako czarno-białych za pomocą kompresji CCITT Group 4. Dopuszczenie kompresji JPEG oznacza użycie stratnej kompresji JPEG dla wszystkich bitonalnych lub podpróbkowanych obrazów. W przeciwnym razie dopuszczenie kompresji deflate tworzy bardziej zwarte pliki niż domyślna kompresja packbits.</html></translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1533"/> ++ <source>Cannot open output file.</source> ++ <translation>Nie można otworzyć pliku wyjściowego.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1645"/> ++ <source>Out of memory.</source> ++ <translation>Zabrakło pamięci.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1647"/> ++ <source>Internal error.</source> ++ <translation>Błąd wewnętrzny.</translation> ++ </message> ++ <message> ++ <location filename="qdjviewexporters.cpp" line="1659"/> ++ <source>TIFF export has not been compiled.</source> ++ <translation>Eksport do TIFF nie został skompilowany.</translation> ++ </message> ++</context> ++<context> ++ <name>QDjVuNetDocument</name> ++ <message> ++ <location filename="qdjvunet.cpp" line="359"/> ++ <source>Requesting '%1'</source> ++ <translation>Zażądano %1</translation> ++ </message> ++</context> ++<context> ++ <name>QDjVuNetDocument::Private</name> ++ <message> ++ <location filename="qdjvunet.cpp" line="127"/> ++ <source>Received http status %1 while retrieving %2.</source> ++ <comment>%1 is an http status code</comment> ++ <translation>Otrzymano kod statusu %1 podczas pobierania %2.</translation> ++ </message> ++ <message> ++ <location filename="qdjvunet.cpp" line="142"/> ++ <source>Received <%1> data while retrieving %2.</source> ++ <comment>%1 is a mime type</comment> ++ <translation>Otrzymano typ danych <%1> w czasie pobierania %2.</translation> ++ </message> ++ <message> ++ <location filename="qdjvunet.cpp" line="185"/> ++ <source>%1 while retrieving '%2'.</source> ++ <translation>%1 w czasie pobierania %2.</translation> ++ </message> ++ <message> ++ <location filename="qdjvunet.cpp" line="225"/> ++ <source>Cannot validate the certificate for server %1.</source> ++ <translation>Nie można potwierdzić certyfikatu serwera %1.</translation> ++ </message> ++ <message> ++ <location filename="qdjvunet.cpp" line="252"/> ++ <source>Authentication required for %1 (%2).</source> ++ <translation>Autoryzacja wymagana dla %1 (%2).</translation> ++ </message> ++ <message> ++ <location filename="qdjvunet.cpp" line="260"/> ++ <source>Authentication required for proxy %1.</source> ++ <translation>Autoryzacja wymagana dla serwera pośredniczącego %1.</translation> ++ </message> ++</context> ++</TS> +--- djview4-4.12.orig/src/qdjviewexporters.cpp ++++ djview4-4.12/src/qdjviewexporters.cpp +@@ -405,9 +405,9 @@ QDjViewDjVuExporter::save(QString fname) + fromPage = qBound(0, fromPage, pagenum-1); + QByteArray pagespec; + if (fromPage == toPage && pagenum > 1) +- pagespec.append(QString("--pages=%1").arg(fromPage+1)); ++ pagespec.append(QString("--pages=%1").arg(fromPage+1).toLocal8Bit()); + else if (fromPage != 0 || toPage != pagenum - 1) +- pagespec.append(QString("--pages=%1-%2").arg(fromPage+1).arg(toPage+1)); ++ pagespec.append(QString("--pages=%1-%2").arg(fromPage+1).arg(toPage+1).toLocal8Bit()); + QByteArray namespec; + if (indirect) + namespec = "--indirect=" + fname.toUtf8(); +--- djview4-4.12.orig/src/qdjviewprefs.cpp ++++ djview4-4.12/src/qdjviewprefs.cpp +@@ -1021,7 +1021,7 @@ QDjViewPrefsDialog::loadLanguageComboBox + { + // supported languages + static const char *languages[] = { +- "cs","de","en","es","fr","it","ja","ru","uk", ++ "cs","de","en","es","fr","it","ja","pl","ru","uk", + "zh_CN","zh_TW",0 } ; + // get application + QComboBox *cb = d->ui.languageComboBox; +--- djview4-4.12.orig/src/qdjvuwidget.cpp ++++ djview4-4.12/src/qdjvuwidget.cpp +@@ -3669,7 +3669,7 @@ MapArea::paintPermanent(QPaintDevice *w, + QRect r = rect.adjusted(bw, bw, -bw, -bw); + QString s = miniexp_to_qstring(comment); + paint.setPen(foregroundColor); +- int flags = Qt::AlignCenter|Qt::AlignVCenter|Qt::TextWordWrap; ++ int flags = Qt::AlignVCenter|Qt::TextWordWrap; + QFont font = paint.font(); + // estimate font size + int size = (int)(z * 0.12); +@@ -3678,11 +3678,11 @@ MapArea::paintPermanent(QPaintDevice *w, + QRect br; + font.setPixelSize(size); + paint.setFont(font); +- paint.drawText(r,flags|Qt::TextDontPrint,s,&br); ++ paint.drawText(r,flags|Qt::AlignHCenter|Qt::TextDontPrint,s,&br); + if (r.contains(br)) + { + // found good font size +- paint.drawText(r,flags,s,0); ++ paint.drawText(r,flags|Qt::AlignLeft,s,0); + break; + } + size -= 1; diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild index 905f220e67..c7dac320c0 100644 --- a/graphics/fontforge/fontforge.SlackBuild +++ b/graphics/fontforge/fontforge.SlackBuild @@ -112,6 +112,8 @@ mv uthash-"$UTHASH" uthash chown -R root:root gnulib uthash chmod -R u+w,go+r-w,a-s gnulib uthash +patch -p1 < $CWD/gettext-0.22.patch + mkdir -p build cd build cmake \ diff --git a/graphics/fontforge/gettext-0.22.patch b/graphics/fontforge/gettext-0.22.patch new file mode 100644 index 0000000000..4ab36b7908 --- /dev/null +++ b/graphics/fontforge/gettext-0.22.patch @@ -0,0 +1,150 @@ +diff -Naur fontforge-20201107.orig/po/fr.po fontforge-20201107/po/fr.po +--- fontforge-20201107.orig/po/fr.po 2020-11-07 21:42:58.000000000 +0100 ++++ fontforge-20201107/po/fr.po 2023-06-20 19:49:55.755110000 +0200 +@@ -273,7 +273,7 @@ + msgid "Bad Reference" + msgstr "Référence incorrecte" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "You are attempting to paste a reference to %1$s into %2$s.\n" + "But %1$s does not exist in this font, nor can I find the original character " +@@ -297,7 +297,7 @@ + msgid "_No" + msgstr "_Non" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "You are attempting to paste a reference to %1$s into %2$s.\n" + "But %1$s does not exist in this font.\n" +@@ -320,7 +320,7 @@ + msgid "Duplicate Anchor" + msgstr "Ancre en double" + +-#, c-format ++#, fuzzy, c-format + msgid "There is already an anchor point named %1$.40s in %2$.40s." + msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs." + +@@ -491,7 +491,7 @@ + msgid "_Use It" + msgstr "_Utilisez la" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've " + "been able to find is %1$.20s-%2$.20s-%4$d.\n" +@@ -1239,7 +1239,7 @@ + msgid "_Revert" + msgstr "_Revenir" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "Font %1$.40s in file %2$.40s has been changed.\n" + "Reverting the file will lose those changes.\n" +@@ -4464,7 +4464,7 @@ + "Il n'y a pas d'entrée ForceBoldThreshold dans la fonte grasse, mais il y a " + "une entrée ForceBold dans la fonte %30s" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The fonts %1$.30s and %2$.30s have a different number of glyphs or different " + "encodings" +@@ -4472,7 +4472,7 @@ + "Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des " + "codages différents" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, " + "one cubic)" +@@ -4525,7 +4525,7 @@ + "Le glyphe %1$.30s de la fonte %2$.30s possède des contours orientés de " + "manière différente que ceux de %3$.30s" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The glyph %1$.30s in font %2$.30s has a different number of references than " + "in %3$.30s" +@@ -4566,7 +4566,7 @@ + "pas à ceux de %4$.30s (nombre différent ou critères de recouvrement " + "différents)" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours " + "than in %3$.30s" +@@ -8022,7 +8022,7 @@ + msgid "Not Found" + msgstr "Non trouvé" + +-#, c-format ++#, fuzzy, c-format + msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s" + msgstr "" + "Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs" +@@ -10453,7 +10453,7 @@ + #. GT: $2 is the glyph's encoding + #. GT: $3 is the pixel size of the bitmap font + #. GT: $4 is the font name +-#, c-format ++#, fuzzy, c-format + msgid "%1$.80s at %2$d size %3$d from %4$.80s" + msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs" + +@@ -11982,7 +11982,7 @@ + #. GT: $2 is the glyph's encoding + #. GT: $3 is the font name + #. GT: $4 is the changed flag ('*' for the changed items) +-#, c-format ++#, fuzzy, c-format + msgid "%1$.80s at %2$d from %3$.90s%4$s" + msgstr "%1$.80s à %2$d de %3$.90hs%4$s" + +@@ -23087,7 +23087,7 @@ + msgid "Use Kerning Class?" + msgstr "Utiliser la classe de crénage ?" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "This kerning pair (%.20s and %.20s) is currently part of a kerning class " + "with a 0 offset for this combination. Would you like to alter this kerning " +diff -Naur fontforge-20201107.orig/po/it.po fontforge-20201107/po/it.po +--- fontforge-20201107.orig/po/it.po 2020-11-07 21:42:58.000000000 +0100 ++++ fontforge-20201107/po/it.po 2023-06-20 19:50:45.026110000 +0200 +@@ -497,7 +497,7 @@ + msgid "_Use It" + msgstr "_Utilizza la" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've " + "been able to find is %1$.20s-%2$.20s-%4$d.\n" +@@ -1190,7 +1190,7 @@ + msgid "_Revert" + msgstr "_Ripristina" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "Font %1$.40s in file %2$.40s has been changed.\n" + "Reverting the file will lose those changes.\n" +@@ -4228,7 +4228,7 @@ + "supported in a font with variations" + msgstr "" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The glyph %1$.30s has a different number of contours in font %2$.30s than in " + "%3$.30s" diff --git a/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.SlackBuild b/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.SlackBuild index 15548724a8..9938485132 100644 --- a/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.SlackBuild +++ b/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.SlackBuild @@ -8,7 +8,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gimp-wideangle-plugin VERSION=${VERSION:-1.0.10} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -66,7 +66,7 @@ fi GIMPPLUGINS=usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins/ mkdir -p $PKG/$GIMPPLUGINS -gcc $SLKCFLAGS \ +gcc $SLKCFLAGS -lm \ $( pkg-config --cflags gimpui-2.0 gimp-2.0 gtk+-2.0 ) \ -o $PKG/$GIMPPLUGINS/$SRCNAM $SRC \ $( pkg-config --libs gimpui-2.0 gimp-2.0 gtk+-2.0 ) diff --git a/graphics/gmic/gmic.SlackBuild b/graphics/gmic/gmic.SlackBuild index ae724de793..77905c5172 100644 --- a/graphics/gmic/gmic.SlackBuild +++ b/graphics/gmic/gmic.SlackBuild @@ -26,9 +26,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gmic -VERSION=${VERSION:-2.9.4} -COMMUNITYVERSION=${COMMUNITYVERSION:-6e9a20ef40e1db99c9b761853ad493ee7439e1b7} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.1.6} +COMMUNITYSRC=GMIC +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,8 +73,8 @@ rm -rf $PRGNAM-community rm -rf $PRGNAM-qt tar xvf $CWD/$PRGNAM\_$VERSION.tar.gz --warning=no-unknown-keyword mv $PRGNAM-$VERSION $PRGNAM -unzip $CWD/$PRGNAM-community-$COMMUNITYVERSION.zip || unzip $CWD/$COMMUNITYVERSION -mv $PRGNAM-community-$COMMUNITYVERSION $PRGNAM-community +tar xvf $CWD/$COMMUNITYSRC-$VERSION.tar.gz +mv $PRGNAM-community-$COMMUNITYSRC-$VERSION $PRGNAM-community cd $PRGNAM chown -R root:root . find -L . \ @@ -92,23 +92,18 @@ sed -i -e "s|LIB = lib|LIB = lib$LIBDIRSUFFIX|g" \ sed -i -e "s|-Ofast|-O2 -fno-fast-math --std=c++11|g" \ gmic-qt/gmic_qt.pro || exit 1 -make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " +make -j1 -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " cd gmic-qt qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=none -make +make -j1 qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=gimp -make +make -j1 qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=krita -make +make -j1 -cd ../zart -qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=off QMAKE_CXXFLAGS+=" -DOPENCV2_HEADERS" -make cd .. -make -C src install LIB=lib$LIBDIRSUFFIX DESTDIR="$PKG" USR="/usr" - -rmdir $PKG/usr/share || true +make -j1 -C src install LIB=lib$LIBDIRSUFFIX DESTDIR="$PKG" USR="/usr" find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/graphics/gmic/gmic.info b/graphics/gmic/gmic.info index 5f7b119ad6..34498e99e9 100644 --- a/graphics/gmic/gmic.info +++ b/graphics/gmic/gmic.info @@ -1,10 +1,10 @@ PRGNAM="gmic" -VERSION="2.9.4" +VERSION="3.1.6" HOMEPAGE="https://gmic.eu" -DOWNLOAD="https://gmic.eu/files/source/gmic_2.9.4.tar.gz \ - https://github.com/dtschump/gmic-community/archive/6e9a20ef40e1db99c9b761853ad493ee7439e1b7.zip" -MD5SUM="e0d396ab6406c9baeb4929c1dd6a0d6a \ - 75f88fa1423f253714e84905a05f37da" +DOWNLOAD="https://gmic.eu/files/source/gmic_3.1.6.tar.gz \ + https://github.com/GreycLab/gmic-community/archive/GMIC-3.1.6/GMIC-3.1.6.tar.gz" +MD5SUM="62101676ee2b83438c3fc57180be92c6 \ + 0a42c6b71ad667638f7199a01feca1d1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/gpicview/README b/graphics/gpicview/README index 535b23c691..e99809f09d 100644 --- a/graphics/gpicview/README +++ b/graphics/gpicview/README @@ -3,3 +3,7 @@ program is not aimed to be powerful or feature-rich. It's aimed to replace the default image viewer of current desktop systems. Fast-startup, low memory usage, and a simple user interface make it a good choice for default viewer. + +If you want to build this for gtk+3, pass to the script the switch + + GTK3=yes diff --git a/graphics/gpicview/gpicview.SlackBuild b/graphics/gpicview/gpicview.SlackBuild index cfbe30d77c..fc7aa78543 100644 --- a/graphics/gpicview/gpicview.SlackBuild +++ b/graphics/gpicview/gpicview.SlackBuild @@ -6,7 +6,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gpicview -VERSION=${VERSION:-0.2.5} +VERSION=${VERSION:-20231013_95eef26} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -19,9 +19,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -45,6 +42,8 @@ else LIBDIRSUFFIX="" fi +WITHGTK3="" ; [ "${GTK3:-no}" = "yes" ] && WITHGTK3="yes" + set -e rm -rf $PKG @@ -60,6 +59,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +./autogen.sh || true + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -68,6 +69,8 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + $WITHGTK3 \ + --disable-silent-rules \ --build=$ARCH-slackware-linux make diff --git a/graphics/gpicview/gpicview.info b/graphics/gpicview/gpicview.info index e9658aff3c..16cd88a436 100644 --- a/graphics/gpicview/gpicview.info +++ b/graphics/gpicview/gpicview.info @@ -1,8 +1,8 @@ PRGNAM="gpicview" -VERSION="0.2.5" +VERSION="20231013_95eef26" HOMEPAGE="http://lxde.sourceforge.net/gpicview/" -DOWNLOAD="http://downloads.sourceforge.net/lxde/gpicview-0.2.5.tar.xz" -MD5SUM="26be9b0c5a234f1afe7d83d02a4a33f4" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/gpicview-20231013_95eef26.tar.xz" +MD5SUM="aa843ddfe08e59d739873d8c76f4c26f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild index 40849f7daf..2c428c4981 100644 --- a/graphics/graphviz/graphviz.SlackBuild +++ b/graphics/graphviz/graphviz.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=graphviz -VERSION=${VERSION:-10.0.1} +VERSION=${VERSION:-11.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -93,6 +93,7 @@ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ + --enable-php=no \ --disable-static \ --build=$ARCH-slackware-linux diff --git a/graphics/graphviz/graphviz.info b/graphics/graphviz/graphviz.info index 2418064f2d..97a5a45696 100644 --- a/graphics/graphviz/graphviz.info +++ b/graphics/graphviz/graphviz.info @@ -1,8 +1,8 @@ PRGNAM="graphviz" -VERSION="10.0.1" +VERSION="11.0.0" HOMEPAGE="https://www.graphviz.org/" -DOWNLOAD="https://gitlab.com/graphviz/graphviz/-/archive/10.0.1/graphviz-10.0.1.tar.bz2" -MD5SUM="5d343d0ba08dc11624d3961af2b4755c" +DOWNLOAD="https://gitlab.com/graphviz/graphviz/-/archive/11.0.0/graphviz-11.0.0.tar.bz2" +MD5SUM="cbc948bb249ff4a26cd3f0ef35938a98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/hugin/boost-1.85.0-patch.gz b/graphics/hugin/boost-1.85.0-patch.gz Binary files differnew file mode 100644 index 0000000000..d03ca9fd5e --- /dev/null +++ b/graphics/hugin/boost-1.85.0-patch.gz diff --git a/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild index 0c5c216bc4..e90b451e18 100644 --- a/graphics/hugin/hugin.SlackBuild +++ b/graphics/hugin/hugin.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for Hugin # # Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA -# Copyright 2011-2023 by titopoquito (titopoquito@gmail.com) +# Copyright 2011-2024 by titopoquito (titopoquito@gmail.com) # Thanks to Romain Dartigues for the help with the update to 2016.2.0 # All rights reserved. # @@ -35,7 +35,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=hugin VERSION=${VERSION:-2023.0.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,6 +79,8 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION +zcat $CWD/boost-1.85.0-patch | patch -p0 + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index 416df46df2..e46844bde4 100644 --- a/graphics/inkscape/inkscape.SlackBuild +++ b/graphics/inkscape/inkscape.SlackBuild @@ -95,6 +95,7 @@ dos2unix -k -q share/extensions/*.py sed -i CMakeScripts/Pod2man.cmake -e "s/SHARE_INSTALL/CMAKE_INSTALL_PREFIX/g" patch -p1 < $CWD/libxml2-2.12.patch +patch -p1 < $CWD/poppler-24.03.patch mkdir -p build cd build diff --git a/graphics/inkscape/poppler-24.03.patch b/graphics/inkscape/poppler-24.03.patch new file mode 100644 index 0000000000..53cf3fd2b6 --- /dev/null +++ b/graphics/inkscape/poppler-24.03.patch @@ -0,0 +1,61 @@ +From 3dd9846ab99260134e11938f0e575be822507037 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 4 Mar 2024 22:59:40 +0100 +Subject: [PATCH] Fix build with >=poppler-24.03.0 + +Fixes build errors caused by: + +"Use an enum for Function getType" +Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/extension/internal/pdfinput/svg-builder.cpp | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp +index 525fbfec0..bcd7b1f61 100644 +--- a/src/extension/internal/pdfinput/svg-builder.cpp ++++ b/src/extension/internal/pdfinput/svg-builder.cpp +@@ -1175,9 +1175,13 @@ static bool svgGetShadingColor(GfxShading *shading, double offset, GfxColor *res + #define INT_EPSILON 8 + bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading, + _POPPLER_CONST Function *func) { +- int type = func->getType(); ++ auto type = func->getType(); + auto space = shading->getColorSpace(); ++#if POPPLER_CHECK_VERSION(24, 3, 0) ++ if ( type == Function::Type::Sampled || type == Function::Type::Exponential ) { // Sampled or exponential function ++#else + if ( type == 0 || type == 2 ) { // Sampled or exponential function ++#endif + GfxColor stop1, stop2; + if (!svgGetShadingColor(shading, 0.0, &stop1) || !svgGetShadingColor(shading, 1.0, &stop2)) { + return false; +@@ -1185,7 +1189,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh + _addStopToGradient(gradient, 0.0, &stop1, space, 1.0); + _addStopToGradient(gradient, 1.0, &stop2, space, 1.0); + } ++#if POPPLER_CHECK_VERSION(24, 3, 0) ++ } else if ( type == Function::Type::Stitching ) { // Stitching ++#else + } else if ( type == 3 ) { // Stitching ++#endif + auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func); + const double *bounds = stitchingFunc->getBounds(); + const double *encode = stitchingFunc->getEncode(); +@@ -1200,7 +1208,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh + for ( int i = 0 ; i < num_funcs ; i++ ) { + svgGetShadingColor(shading, bounds[i + 1], &color); + // Add stops ++#if POPPLER_CHECK_VERSION(24, 3, 0) ++ if (stitchingFunc->getFunc(i)->getType() == Function::Type::Exponential) { // process exponential fxn ++#else + if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn ++#endif + double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE(); + if (expE > 1.0) { + expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1 +-- +2.44.0 + diff --git a/graphics/kColorPicker/README b/graphics/kColorPicker/README deleted file mode 100644 index a0dc172eb6..0000000000 --- a/graphics/kColorPicker/README +++ /dev/null @@ -1,5 +0,0 @@ -kColorPicker (Qt based Color Picker with popup menu) - -QToolButton with color popup menu which lets you select a color. -The popup features a color dialog button which can be used to -add custom colors to the popup menu. diff --git a/graphics/kColorPicker/kColorPicker.SlackBuild b/graphics/kColorPicker/kColorPicker.SlackBuild deleted file mode 100644 index 8736763cdc..0000000000 --- a/graphics/kColorPicker/kColorPicker.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# -# Slackware build script for kColorPicker -# -# Copyright 2022 Alexander Schultz <alexander_schultz@posteo.se> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=kColorPicker -VERSION=${VERSION:-0.1.6} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKCOV_INSTALL_MANDIR=/usr/man \ - -DKCOV_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ - -DBUILD_SHARED_LIBS=ON .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/graphics/kColorPicker/kColorPicker.info b/graphics/kColorPicker/kColorPicker.info deleted file mode 100644 index 2e6859a082..0000000000 --- a/graphics/kColorPicker/kColorPicker.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kColorPicker" -VERSION="0.1.6" -HOMEPAGE="https://github.com/ksnip/kColorPicker" -DOWNLOAD="https://github.com/ksnip/kColorPicker/archive/refs/tags/v0.1.6/kColorPicker-0.1.6.tar.gz" -MD5SUM="2a4e536cf7d947689d9a5e3cdef58837" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Alexander Schultz" -EMAIL="alexander_schultz@posteo.se" diff --git a/graphics/kColorPicker/slack-desc b/graphics/kColorPicker/slack-desc deleted file mode 100644 index c375029bab..0000000000 --- a/graphics/kColorPicker/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -kColorPicker: kColorPicker (Qt based Color Picker with popup menu) -kColorPicker: -kColorPicker: QToolButton with color popup menu which lets you select a color. -kColorPicker: The popup features a color dialog button which can be used -kColorPicker: to add custom colors to the popup menu. -kColorPicker: -kColorPicker: Homepage: https://github.com/ksnip/kColorPicker -kColorPicker: -kColorPicker: -kColorPicker: -kColorPicker: diff --git a/graphics/kImageAnnotator/README b/graphics/kImageAnnotator/README deleted file mode 100644 index 535210789e..0000000000 --- a/graphics/kImageAnnotator/README +++ /dev/null @@ -1,3 +0,0 @@ -kImageAnnotator (Tool for annotating images) - -Tool for annotating images. diff --git a/graphics/kImageAnnotator/kImageAnnotator.SlackBuild b/graphics/kImageAnnotator/kImageAnnotator.SlackBuild deleted file mode 100644 index a6ec4e9a45..0000000000 --- a/graphics/kImageAnnotator/kImageAnnotator.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# -# Slackware build script for kImageAnnotator -# -# Copyright 2022 Alexander Schultz <alexander_schultz@posteo.se> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=kImageAnnotator -VERSION=${VERSION:-0.5.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION - -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKCOV_INSTALL_MANDIR=/usr/man \ - -DKCOV_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ - -DBUILD_SHARED_LIBS=ON .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/graphics/kImageAnnotator/kImageAnnotator.info b/graphics/kImageAnnotator/kImageAnnotator.info deleted file mode 100644 index caba0227ff..0000000000 --- a/graphics/kImageAnnotator/kImageAnnotator.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kImageAnnotator" -VERSION="0.5.3" -HOMEPAGE="https://github.com/ksnip/kImageAnnotator" -DOWNLOAD="https://github.com/ksnip/kImageAnnotator/archive/refs/tags/v0.5.3/kImageAnnotator-0.5.3.tar.gz" -MD5SUM="992390460ab4e10b967bed11f8558250" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="kColorPicker" -MAINTAINER="Alexander Schultz" -EMAIL="alexander_schultz@posteo.se" diff --git a/graphics/kuickshow/kuickshow.SlackBuild b/graphics/kuickshow/kuickshow.SlackBuild index 610ea1f32d..18cd079ce4 100644 --- a/graphics/kuickshow/kuickshow.SlackBuild +++ b/graphics/kuickshow/kuickshow.SlackBuild @@ -78,6 +78,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# workaround for https://bugs.gentoo.org/919504 +sed -i "s|\${libImlib_CFLAGS}||" cmake/modules/FindIMLIB.cmake + mkdir -p build cd build cmake \ diff --git a/graphics/libplacebo/README b/graphics/libplacebo/README deleted file mode 100644 index eff104786c..0000000000 --- a/graphics/libplacebo/README +++ /dev/null @@ -1,3 +0,0 @@ -libplacebo is essentially the core rendering algorithms and ideas of mpv -turned into a library. - diff --git a/graphics/libplacebo/libplacebo.SlackBuild b/graphics/libplacebo/libplacebo.SlackBuild deleted file mode 100644 index ddda6f8e38..0000000000 --- a/graphics/libplacebo/libplacebo.SlackBuild +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -# Slackware build script for libplacebo - -# Copyright 2019-2020 Hunter Sezen California, USA -# Copyright 2023 Christoph Willing Brisbane, Australia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libplacebo -VERSION=${VERSION:-6.338.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-v$VERSION -tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz -cd $PRGNAM-v$VERSION -patch -p0 < $CWD/use_meson-0.59.4.diff -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -if [ "${DEBUG:=0}" != 0 ]; then - NDEBUG=false - RELEASE=debug - SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0/')" -else - NDEBUG=true - RELEASE=plain -fi - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages/ - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -meson \ - --prefix=/usr \ - --libdir=lib${LIBDIRSUFFIX} \ - -Dstrip=$NDEBUG \ - -Db_ndebug=$NDEBUG \ - -Dbuildtype=$RELEASE \ - -Ddemos=false \ - build - -"${NINJA:=ninja}" -C build -DESTDIR=$PKG "$NINJA" -C build install - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/graphics/libplacebo/libplacebo.info b/graphics/libplacebo/libplacebo.info deleted file mode 100644 index 0bbbb982d8..0000000000 --- a/graphics/libplacebo/libplacebo.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libplacebo" -VERSION="6.338.1" -HOMEPAGE="https://code.videolan.org/videolan/libplacebo" -DOWNLOAD="https://code.videolan.org/videolan/libplacebo/-/archive/v6.338.1/libplacebo-v6.338.1.tar.gz" -MD5SUM="36f5d178cc8a5366e35fe1e7400c19c3" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-meson-opt python3-glad" -MAINTAINER="Christoph Willing" -EMAIL="chris.willing@linux.com" diff --git a/graphics/libplacebo/slack-desc b/graphics/libplacebo/slack-desc deleted file mode 100644 index cdb54a9292..0000000000 --- a/graphics/libplacebo/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libplacebo: libplacebo (GPU-accelerated video/image rendering primitives library) -libplacebo: -libplacebo: libplacebo is essentially the core rendering algorithms and ideas of -libplacebo: mpv turned into a library. -libplacebo: -libplacebo: Homepage: https://code.videolan.org/videolan/libplacebo -libplacebo: -libplacebo: -libplacebo: -libplacebo: -libplacebo: diff --git a/graphics/libplacebo/use_meson-0.59.4.diff b/graphics/libplacebo/use_meson-0.59.4.diff deleted file mode 100644 index 3c1c83ebde..0000000000 --- a/graphics/libplacebo/use_meson-0.59.4.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- meson.build.orig 2023-03-24 00:53:00.000000000 +1000 -+++ meson.build 2023-08-23 10:52:45.189000000 +1000 -@@ -6,7 +6,7 @@ - 'c_std=c11', - 'cpp_std=c++11', - ], -- meson_version: '>=0.63', -+ meson_version: '>=0.59.4', - version: '@0@.@1@.@2@'.format( - # Major version - 5, diff --git a/graphics/luminance-hdr/luminance-hdr.SlackBuild b/graphics/luminance-hdr/luminance-hdr.SlackBuild index 027d2b07ea..a9bc215aa3 100644 --- a/graphics/luminance-hdr/luminance-hdr.SlackBuild +++ b/graphics/luminance-hdr/luminance-hdr.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=luminance-hdr -VERSION=${VERSION:-2.6.0} +VERSION=${VERSION:-2.6.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,6 +80,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +# Apply patches from gentoo +for i in $CWD/patches/* ; do patch -p1 < $i ; done + # Workround build failure with gcc-g++-4.9.3 and beyond (mangling bug?) # (fails to link libmvec: "undefined reference to `_ZGVbN4vv_powf'" etc) export CXX=clang++ diff --git a/graphics/luminance-hdr/luminance-hdr.info b/graphics/luminance-hdr/luminance-hdr.info index cc84ef4b63..6151b43135 100644 --- a/graphics/luminance-hdr/luminance-hdr.info +++ b/graphics/luminance-hdr/luminance-hdr.info @@ -1,8 +1,8 @@ PRGNAM="luminance-hdr" -VERSION="2.6.0" +VERSION="2.6.1.1" HOMEPAGE="http://qtpfsgui.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/qtpfsgui/2.6.0/luminance-hdr-2.6.0.tar.bz2" -MD5SUM="9ac2be847d304f0ddc7089b251825c4d" +DOWNLOAD="http://downloads.sf.net/qtpfsgui/luminance-hdr-2.6.1.1.tar.bz2" +MD5SUM="c57baf1d3c5d7952f952496f20f86c8f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.5.1-openmp-automagic.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.5.1-openmp-automagic.patch new file mode 100644 index 0000000000..f0399d271a --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.5.1-openmp-automagic.patch @@ -0,0 +1,32 @@ +diff --git a/build_files/Modules/CompilerSettings.cmake b/build_files/Modules/CompilerSettings.cmake +index f55c130..81e1916 100644 +--- a/build_files/Modules/CompilerSettings.cmake ++++ b/build_files/Modules/CompilerSettings.cmake +@@ -45,16 +45,19 @@ else() + message(WARNING "Your C++ compiler does not support C++11.") + endif() + #OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3 +-IF(MSVC) +- FIND_PACKAGE(OpenMP REQUIRED) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +-ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) +- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) +- IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) +- MESSAGE(STATUS "GCC >= 4.3") ++OPTION(USE_OPENMP "Use openmp threading support." ON) ++IF(USE_OPENMP) ++ IF(MSVC) + FIND_PACKAGE(OpenMP REQUIRED) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) ++ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) ++ IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) ++ MESSAGE(STATUS "GCC >= 4.3") ++ FIND_PACKAGE(OpenMP REQUIRED) ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") ++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ ENDIF() + ENDIF() + ENDIF() diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-cmake.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-cmake.patch new file mode 100644 index 0000000000..5564ebadc9 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-cmake.patch @@ -0,0 +1,22 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:53:19.496802424 +0200 +@@ -5,19 +5,6 @@ + CMAKE_POLICY(SET CMP0053 NEW) + PROJECT("Luminance HDR") + +-string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE) +-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(debug|release|relwithdebinfo|minsizerel)$") +- message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +-else() +- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n" +- "CMAKE_BUILD_TYPE should be one of:\nDebug, Release, RelWithDebInfo, MinSizeRel") +-endif() +- +-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(release|minsizerel)$") +- message(STATUS "Adding definitions: -DQT_NO_DEBUG_OUTPUT") +- add_definitions("-DQT_NO_DEBUG_OUTPUT") +-endif() +- + # assume built-in pthreads on MacOS + IF(APPLE) + enable_language(CXX) diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-docs.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-docs.patch new file mode 100644 index 0000000000..982c7ebfac --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-docs.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:43:41.005292354 +0200 +@@ -413,12 +413,6 @@ + INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon + INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.desktop DESTINATION share/applications) #desktop entry + INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.appdata.xml DESTINATION share/appdata) #appstream +- INSTALL(FILES +- ${CMAKE_SOURCE_DIR}/AUTHORS +- ${CMAKE_SOURCE_DIR}/README.md +- ${CMAKE_SOURCE_DIR}/LICENSE +- ${CMAKE_SOURCE_DIR}/Changelog +- DESTINATION share/luminance-hdr/doc) #info files + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION share/luminance-hdr) # hdrhtml directory + # Microsoft Windows diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-no-git.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-no-git.patch new file mode 100644 index 0000000000..1d95930404 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-no-git.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:41:24.684413834 +0200 +@@ -103,11 +103,7 @@ + set(LIBS ${LIBS} ${QT_QTWEBKIT_LIBRARIES}) + endif() + +-FIND_PACKAGE(Git) +-IF(GIT_FOUND) +- include(GetGitRevisionDescription) +- get_git_head_revision(GIT_REFSPEC GIT_SHA1) +-ENDIF() ++SET(GIT_SHA1 "-- Slackware build --") + + IF(WIN32) + diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-fixheaders.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-fixheaders.patch new file mode 100644 index 0000000000..58974ea998 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-fixheaders.patch @@ -0,0 +1,15 @@ +Source: arch linux + +diff --git a/src/Common/init_fftw.h b/src/Common/init_fftw.h +index af2fc02c..a4aad47f 100644 +--- a/src/Common/init_fftw.h ++++ b/src/Common/init_fftw.h +@@ -22,7 +22,7 @@ + #ifndef INIT_FFTW_H + #define INIT_FFTW_H + +-#include <boost/thread/mutex.hpp> ++#include <mutex> + + class FFTW_MUTEX { + public: diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-openexr3.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-openexr3.patch new file mode 100644 index 0000000000..9ab2832987 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-openexr3.patch @@ -0,0 +1,28 @@ +Source: arch linux + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ff498d0..23f5c387 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,7 +191,7 @@ INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) + FIND_PACKAGE(PNG REQUIRED) + INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) + +-FIND_PACKAGE(OpenEXR REQUIRED) ++FIND_PACKAGE(OpenEXR CONFIG REQUIRED) + INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR") + + FIND_PACKAGE(GSL REQUIRED) +diff --git a/src/Libpfs/CMakeLists.txt b/src/Libpfs/CMakeLists.txt +index 80617998..ce3c746e 100644 +--- a/src/Libpfs/CMakeLists.txt ++++ b/src/Libpfs/CMakeLists.txt +@@ -12,7 +12,7 @@ ADD_SUBDIRECTORY(colorspace) + ADD_SUBDIRECTORY(io) + + ADD_LIBRARY(pfs STATIC ${LIBPFS_H} ${LIBPFS_HXX} ${LIBPFS_CPP}) +-TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets) ++TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets OpenEXR::OpenEXR) + + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfs PARENT_SCOPE) + SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfs PARENT_SCOPE) diff --git a/graphics/qcustomplot/qcustomplot.info b/graphics/qcustomplot/qcustomplot.info index b248ef9d3c..baab57cc97 100644 --- a/graphics/qcustomplot/qcustomplot.info +++ b/graphics/qcustomplot/qcustomplot.info @@ -1,7 +1,7 @@ PRGNAM="qcustomplot" VERSION="2.1.1" HOMEPAGE="https://www.qcustomplot.com/" -DOWNLOAD="https://gitlab.com/DerManu/QCustomPlot/-/archive/v2.1.1/QCustomPlot-v2.1.1.tar.gz \ +DOWNLOAD="https://gitlab.com/ecme2/QCustomPlot/-/archive/v2.1.1/QCustomPlot-v2.1.1.tar.gz \ https://www.qcustomplot.com/release/2.1.1/QCustomPlot-source.tar.gz" MD5SUM="e481fc69a91cd9ad1341397338457caa \ dec87d6ad14745683ebe166b5936bab1" diff --git a/graphics/rawtherapee/rawtherapee-glibc-2.34.patch b/graphics/rawtherapee/rawtherapee-glibc-2.34.patch new file mode 100644 index 0000000000..ea13f6ab9b --- /dev/null +++ b/graphics/rawtherapee/rawtherapee-glibc-2.34.patch @@ -0,0 +1,352 @@ +diff --git a/rtengine/canon_cr3_decoder.cc b/rtengine/canon_cr3_decoder.cc +index 6274154cb..98c743dad 100644 +--- a/rtengine/canon_cr3_decoder.cc ++++ b/rtengine/canon_cr3_decoder.cc +@@ -662,7 +662,7 @@ std::uint32_t _byteswap_ulong(std::uint32_t x) + #endif + + struct LibRaw_abstract_datastream { +- IMFILE* ifp; ++ rtengine::IMFILE* ifp; + + void lock() + { +diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc +index 812f122b3..5da696af2 100644 +--- a/rtengine/dcraw.cc ++++ b/rtengine/dcraw.cc +@@ -2025,7 +2025,7 @@ void CLASS phase_one_load_raw_c() + #endif + { + int len[2], pred[2]; +- IMFILE ifpthr = *ifp; ++ rtengine::IMFILE ifpthr = *ifp; + ifpthr.plistener = nullptr; + + #ifdef _OPENMP +@@ -3380,7 +3380,7 @@ void CLASS sony_arw2_load_raw() + { + uchar *data = new (std::nothrow) uchar[raw_width + 1]; + merror(data, "sony_arw2_load_raw()"); +- IMFILE ifpthr = *ifp; ++ rtengine::IMFILE ifpthr = *ifp; + int pos = ifpthr.pos; + ushort pix[16]; + +@@ -6394,7 +6394,7 @@ int CLASS parse_tiff_ifd (int base) + unsigned sony_curve[] = { 0,0,0,0,0,4095 }; + unsigned *buf, sony_offset=0, sony_length=0, sony_key=0; + struct jhead jh; +-/*RT*/ IMFILE *sfp; ++/*RT*/ rtengine::IMFILE *sfp; + /*RT*/ int pana_raw = 0; + + if (tiff_nifds >= sizeof tiff_ifd / sizeof tiff_ifd[0]) +@@ -6958,7 +6958,7 @@ it under the terms of the one of two licenses as you choose: + fread (buf, sony_length, 1, ifp); + sony_decrypt (buf, sony_length/4, 1, sony_key); + sfp = ifp; +-/*RT*/ ifp = fopen (buf, sony_length); ++/*RT*/ ifp = rtengine::fopen (buf, sony_length); + // if ((ifp = tmpfile())) { + // fwrite (buf, sony_length, 1, ifp); + // fseek (ifp, 0, SEEK_SET); +@@ -7264,7 +7264,7 @@ void CLASS parse_external_jpeg() + { + const char *file, *ext; + char *jname, *jfile, *jext; +-/*RT*/ IMFILE *save=ifp; ++/*RT*/ rtengine::IMFILE *save=ifp; + + ext = strrchr (ifname, '.'); + file = strrchr (ifname, '/'); +@@ -7292,7 +7292,7 @@ void CLASS parse_external_jpeg() + *jext = '0'; + } + if (strcmp (jname, ifname)) { +-/*RT*/ if ((ifp = fopen (jname))) { ++/*RT*/ if ((ifp = rtengine::fopen (jname))) { + // if ((ifp = fopen (jname, "rb"))) { + if (verbose) + fprintf (stderr,_("Reading metadata from %s ...\n"), jname); +diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h +index 89c1fcaff..f25157088 100644 +--- a/rtengine/dcraw.h ++++ b/rtengine/dcraw.h +@@ -73,7 +73,7 @@ public: + + protected: + int exif_base, ciff_base, ciff_len; +- IMFILE *ifp; ++ rtengine::IMFILE *ifp; + FILE *ofp; + short order; + const char *ifname; +@@ -125,7 +125,7 @@ protected: + int cur_buf_size; // buffer size + uchar *cur_buf; // currently read block + int fillbytes; // Counter to add extra byte for block size N*16 +- IMFILE *input; ++ rtengine::IMFILE *input; + struct int_pair grad_even[3][41]; // tables of gradients + struct int_pair grad_odd[3][41]; + ushort *linealloc; +@@ -278,7 +278,7 @@ void parse_redcine(); + class getbithuff_t + { + public: +- getbithuff_t(DCraw *p,IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} ++ getbithuff_t(DCraw *p,rtengine::IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} + unsigned operator()(int nbits, ushort *huff); + + private: +@@ -288,7 +288,7 @@ private: + DCraw *parent; + unsigned bitbuf; + int vbits, reset; +- IMFILE *&ifp; ++ rtengine::IMFILE *&ifp; + unsigned &zero_after_ff; + }; + getbithuff_t getbithuff; +@@ -296,7 +296,7 @@ getbithuff_t getbithuff; + class nikbithuff_t + { + public: +- explicit nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} ++ explicit nikbithuff_t(rtengine::IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} + void operator()() {bitbuf = vbits = 0;}; + unsigned operator()(int nbits, ushort *huff); + unsigned errorCount() { return errors; } +@@ -309,7 +309,7 @@ private: + } + unsigned bitbuf, errors; + int vbits; +- IMFILE *&ifp; ++ rtengine::IMFILE *&ifp; + }; + nikbithuff_t nikbithuff; + +@@ -378,7 +378,7 @@ void parse_qt (int end); + // ph1_bithuff(int nbits, ushort *huff); + class ph1_bithuff_t { + public: +- ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} ++ ph1_bithuff_t(DCraw *p, rtengine::IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} + unsigned operator()(int nbits, ushort *huff); + unsigned operator()(int nbits); + unsigned operator()(); +@@ -412,7 +412,7 @@ private: + } + + short ℴ +- IMFILE* const ifp; ++ rtengine::IMFILE* const ifp; + UINT64 bitbuf; + int vbits; + }; +@@ -430,11 +430,11 @@ void nokia_load_raw(); + + class pana_bits_t{ + public: +- pana_bits_t(IMFILE *i, unsigned &u, unsigned enc): ++ pana_bits_t(rtengine::IMFILE *i, unsigned &u, unsigned enc): + ifp(i), load_flags(u), vbits(0), encoding(enc) {} + unsigned operator()(int nbits, unsigned *bytes=nullptr); + private: +- IMFILE *ifp; ++ rtengine::IMFILE *ifp; + unsigned &load_flags; + uchar buf[0x4000]; + int vbits; +diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc +index 1fb1d2e1b..951df2248 100644 +--- a/rtengine/dfmanager.cc ++++ b/rtengine/dfmanager.cc +@@ -540,7 +540,7 @@ std::vector<badPix> *DFManager::getHotPixels ( const std::string &mak, const std + + int DFManager::scanBadPixelsFile( Glib::ustring filename ) + { +- FILE *file = fopen( filename.c_str(), "r" ); ++ FILE *file = ::fopen( filename.c_str(), "r" ); + + if( !file ) { + return false; +diff --git a/rtengine/myfile.cc b/rtengine/myfile.cc +index 842766dcf..2321d18bb 100644 +--- a/rtengine/myfile.cc ++++ b/rtengine/myfile.cc +@@ -70,7 +70,7 @@ int munmap(void *start, size_t length) + + #ifdef MYFILE_MMAP + +-IMFILE* fopen (const char* fname) ++rtengine::IMFILE* rtengine::fopen (const char* fname) + { + int fd; + +@@ -123,13 +123,13 @@ IMFILE* fopen (const char* fname) + return mf; + } + +-IMFILE* gfopen (const char* fname) ++rtengine::IMFILE* rtengine::gfopen (const char* fname) + { + return fopen(fname); + } + #else + +-IMFILE* fopen (const char* fname) ++rtengine::IMFILE* rtengine::fopen (const char* fname) + { + + FILE* f = g_fopen (fname, "rb"); +@@ -152,7 +152,7 @@ IMFILE* fopen (const char* fname) + return mf; + } + +-IMFILE* gfopen (const char* fname) ++rtengine::IMFILE* rtengine::gfopen (const char* fname) + { + + FILE* f = g_fopen (fname, "rb"); +@@ -176,7 +176,7 @@ IMFILE* gfopen (const char* fname) + } + #endif //MYFILE_MMAP + +-IMFILE* fopen (unsigned* buf, int size) ++rtengine::IMFILE* rtengine::fopen (unsigned* buf, int size) + { + + IMFILE* mf = new IMFILE; +@@ -190,7 +190,7 @@ IMFILE* fopen (unsigned* buf, int size) + return mf; + } + +-void fclose (IMFILE* f) ++void rtengine::fclose (IMFILE* f) + { + #ifdef MYFILE_MMAP + +@@ -207,7 +207,7 @@ void fclose (IMFILE* f) + delete f; + } + +-int fscanf (IMFILE* f, const char* s ...) ++int rtengine::fscanf (IMFILE* f, const char* s ...) + { + // fscanf not easily wrapped since we have no terminating \0 at end + // of file data and vsscanf() won't tell us how many characters that +@@ -253,7 +253,7 @@ int fscanf (IMFILE* f, const char* s ...) + } + + +-char* fgets (char* s, int n, IMFILE* f) ++char* rtengine::fgets (char* s, int n, IMFILE* f) + { + + if (f->pos >= f->size) { +@@ -270,7 +270,7 @@ char* fgets (char* s, int n, IMFILE* f) + return s; + } + +-void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) ++void rtengine::imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) + { + f->plistener = plistener; + f->progress_range = progress_range; +@@ -278,7 +278,7 @@ void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, doub + f->progress_current = 0; + } + +-void imfile_update_progress(IMFILE *f) ++void rtengine::imfile_update_progress(IMFILE *f) + { + if (!f->plistener || f->progress_current < f->progress_next) { + return; +diff --git a/rtengine/myfile.h b/rtengine/myfile.h +index 423edea9a..c655696e6 100644 +--- a/rtengine/myfile.h ++++ b/rtengine/myfile.h +@@ -30,8 +30,6 @@ namespace rtengine + + class ProgressListener; + +-} +- + struct IMFILE { + int fd; + ssize_t pos; +@@ -141,3 +139,5 @@ inline unsigned char* fdata(int offset, IMFILE* f) + + int fscanf (IMFILE* f, const char* s ...); + char* fgets (char* s, int n, IMFILE* f); ++ ++} +diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc +index 9da601e2a..e730842bc 100644 +--- a/rtengine/rtthumbnail.cc ++++ b/rtengine/rtthumbnail.cc +@@ -1922,7 +1922,7 @@ bool Thumbnail::writeImage (const Glib::ustring& fname) + + Glib::ustring fullFName = fname + ".rtti"; + +- FILE* f = g_fopen (fullFName.c_str (), "wb"); ++ FILE* f = ::g_fopen (fullFName.c_str (), "wb"); + + if (!f) { + return false; +@@ -1965,7 +1965,7 @@ bool Thumbnail::readImage (const Glib::ustring& fname) + return false; + } + +- FILE* f = g_fopen(fullFName.c_str (), "rb"); ++ FILE* f = ::g_fopen(fullFName.c_str (), "rb"); + + if (!f) { + return false; +@@ -2191,7 +2191,7 @@ bool Thumbnail::writeData (const Glib::ustring& fname) + return false; + } + +- FILE *f = g_fopen (fname.c_str (), "wt"); ++ FILE *f = ::g_fopen (fname.c_str (), "wt"); + + if (!f) { + if (settings->verbose) { +@@ -2214,7 +2214,7 @@ bool Thumbnail::readEmbProfile (const Glib::ustring& fname) + embProfile = nullptr; + embProfileLength = 0; + +- FILE* f = g_fopen (fname.c_str (), "rb"); ++ FILE* f = ::g_fopen (fname.c_str (), "rb"); + + if (f) { + if (!fseek (f, 0, SEEK_END)) { +@@ -2242,7 +2242,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname) + { + + if (embProfileData) { +- FILE* f = g_fopen (fname.c_str (), "wb"); ++ FILE* f = ::g_fopen (fname.c_str (), "wb"); + + if (f) { + fwrite (embProfileData, 1, embProfileLength, f); +@@ -2257,7 +2257,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname) + bool Thumbnail::readAEHistogram (const Glib::ustring& fname) + { + +- FILE* f = g_fopen(fname.c_str(), "rb"); ++ FILE* f = ::g_fopen(fname.c_str(), "rb"); + + if (!f) { + aeHistogram.reset(); +@@ -2280,7 +2280,7 @@ bool Thumbnail::writeAEHistogram (const Glib::ustring& fname) + { + + if (aeHistogram) { +- FILE* f = g_fopen (fname.c_str (), "wb"); ++ FILE* f = ::g_fopen (fname.c_str (), "wb"); + + if (f) { + fwrite (&aeHistogram[0], 1, (65536 >> aeHistCompression)*sizeof (aeHistogram[0]), f); diff --git a/graphics/rawtherapee/rawtherapee.SlackBuild b/graphics/rawtherapee/rawtherapee.SlackBuild index 80364a7a67..3f05e332c6 100644 --- a/graphics/rawtherapee/rawtherapee.SlackBuild +++ b/graphics/rawtherapee/rawtherapee.SlackBuild @@ -79,6 +79,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks Archlinux! +patch -p1 < $CWD/rawtherapee-glibc-2.34.patch + mkdir -p build cd build cmake \ diff --git a/graphics/ueberzugpp/ueberzugpp.info b/graphics/ueberzugpp/ueberzugpp.info index 49f1b3a994..0ee4d3f378 100644 --- a/graphics/ueberzugpp/ueberzugpp.info +++ b/graphics/ueberzugpp/ueberzugpp.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/jstkdng/ueberzugpp/archive/v2.9.4/ueberzugpp-2.9.4. MD5SUM="7388e482a328d1fdfc655d48576e017b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="CLI11 chafa fmt libsixel nlohmann_json oneTBB range-v3 spdlog vips" +REQUIRES="CLI11 chafa libsixel nlohmann_json oneTBB range-v3 spdlog vips" MAINTAINER="xaizek" EMAIL="xaizek@posteo.net" diff --git a/graphics/veles/README b/graphics/veles/README index 67aa361a89..b1b2d4b179 100644 --- a/graphics/veles/README +++ b/graphics/veles/README @@ -10,3 +10,5 @@ binary data - all at a glance. Warning: This SlackBuild requires network access when it runs, meaning it downloads files from the Internet with root access. YMMV on whether this is a good idea. + +NOTE: Upstream project is now archived diff --git a/graphics/veles/veles.SlackBuild b/graphics/veles/veles.SlackBuild index 058d5f6a29..bcaf3c427a 100644 --- a/graphics/veles/veles.SlackBuild +++ b/graphics/veles/veles.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=veles VERSION=${VERSION:-2018.05.0.TIF} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,6 +79,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +export PATH="/opt/rust16/bin:$PATH" +if [ -z "$LD_LIBRARY_PATH" ]; then + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" +else + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" +fi + mkdir -p build cd build cmake \ diff --git a/graphics/veles/veles.info b/graphics/veles/veles.info index 5fda33da35..cd8cd095b7 100644 --- a/graphics/veles/veles.info +++ b/graphics/veles/veles.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/codilime/veles/archive/2018.05.0.TIF/veles-2018.05. MD5SUM="f10259c5d85700f45e36b629090efed7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="msgpack-c" +REQUIRES="msgpack-c rust16" MAINTAINER="Fernando Lopez Jr." EMAIL="fernando.lopezjr@gmail.com" diff --git a/graphics/wine-nine-standalone/wine-nine-standalone.info b/graphics/wine-nine-standalone/wine-nine-standalone.info index 99c9a530d6..140159575a 100644 --- a/graphics/wine-nine-standalone/wine-nine-standalone.info +++ b/graphics/wine-nine-standalone/wine-nine-standalone.info @@ -3,7 +3,7 @@ VERSION="0.8" HOMEPAGE="https://github.com/iXit/wine-nine-standalone" DOWNLOAD="https://github.com/iXit/wine-nine-standalone/archive/v0.8/wine-nine-standalone-0.8.tar.gz" MD5SUM="84c245c029aa88e21a544dd01607d93e" -DOWNLOAD_x86_64="" +DOWNLOAD_x86_64="UNSUPPORTED" MD5SUM_x86_64="" REQUIRES="wine" MAINTAINER="Hunter Sezen" diff --git a/ham/cm256cc/cm256cc.SlackBuild b/ham/cm256cc/cm256cc.SlackBuild index c20e2a7004..c341be9e75 100644 --- a/ham/cm256cc/cm256cc.SlackBuild +++ b/ham/cm256cc/cm256cc.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cm256cc -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,7 +71,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -unzip $CWD/$PRGNAM-$VERSION.zip +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . diff --git a/ham/cm256cc/cm256cc.info b/ham/cm256cc/cm256cc.info index 2ff6b319ad..a1073a6aaa 100644 --- a/ham/cm256cc/cm256cc.info +++ b/ham/cm256cc/cm256cc.info @@ -1,8 +1,8 @@ PRGNAM="cm256cc" -VERSION="1.1.0" +VERSION="1.1.1" HOMEPAGE="https://github.com/f4exb/cm256cc/" -DOWNLOAD="https://github.com/f4exb/cm256cc/archive/v1.1.0/cm256cc-1.1.0.zip" -MD5SUM="0b9b0a5b8eebbee6eb90a31fe96957df" +DOWNLOAD="https://github.com/f4exb/cm256cc/archive/v1.1.1/cm256cc-1.1.1.tar.gz" +MD5SUM="d727f0f10cc00e91d9c24d83004b351c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/ham/codec2/codec2.SlackBuild b/ham/codec2/codec2.SlackBuild index 5df9d083d1..8002fdcf5e 100644 --- a/ham/codec2/codec2.SlackBuild +++ b/ham/codec2/codec2.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=codec2 -VERSION=${VERSION:-1.0.3} +VERSION=${VERSION:-1.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/ham/codec2/codec2.info b/ham/codec2/codec2.info index 4dc652738d..ea42215f62 100644 --- a/ham/codec2/codec2.info +++ b/ham/codec2/codec2.info @@ -1,10 +1,10 @@ PRGNAM="codec2" -VERSION="1.0.3" +VERSION="1.2.0" HOMEPAGE="http://rowetel.com/codec2.html" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/codec2-1.0.3.tar.gz" -MD5SUM="a20cb37573eb98f8c956212698a49a81" +DOWNLOAD="https://github.com/drowe67/codec2/archive/1.2.0/codec2-1.2.0.tar.gz" +MD5SUM="8186452c6d3cfc89cc6c880a6a7130d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="lpcnetfreedv" MAINTAINER="Gustavo Conrad" EMAIL="gus3963@gmail.com" diff --git a/ham/dab_lib/dab_lib.SlackBuild b/ham/dab_lib/dab_lib.SlackBuild index 3d5fc871b4..02071203fb 100644 --- a/ham/dab_lib/dab_lib.SlackBuild +++ b/ham/dab_lib/dab_lib.SlackBuild @@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dab_lib -VERSION=${VERSION:-20231211.815d83fc} -SRCVERSION=${SRCVERSION:-815d83fcd1b2ffa1289501943c913cc86d6b567b} +VERSION=${VERSION:-20240428.229149eb} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -71,9 +71,9 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf dab-cmdline-$SRCVERSION# -unzip $CWD/dab-cmdline-$SRCVERSION.zip -cd dab-cmdline-$SRCVERSION/library +rm -rf dab-cmdline-${VERSION##*.}* +tar xvf $CWD/dab-cmdline-${VERSION##*.}*.tar.gz +cd dab-cmdline-${VERSION##*.}*/library chown -R root:root . find -L . \ @@ -91,6 +91,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release .. + make $NUMJOBS make install/strip DESTDIR=$PKG cd ../.. @@ -98,10 +99,9 @@ cd ../.. [ -d $PKG/usr/lib -a ! -e $PKG/usr/lib$LIBDIRSUFFIX ] && mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ +cp \ LICENSE README.md AUTHORS \ $PKG/usr/doc/$PRGNAM-$VERSION -chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/README.md cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/ham/dab_lib/dab_lib.info b/ham/dab_lib/dab_lib.info index 5b501d25d7..a1a2c14183 100644 --- a/ham/dab_lib/dab_lib.info +++ b/ham/dab_lib/dab_lib.info @@ -1,8 +1,8 @@ PRGNAM="dab_lib" -VERSION="20231211.815d83fc" +VERSION="20240428.229149eb" HOMEPAGE="https://github.com/JvanKatwijk/dab-cmdline/" -DOWNLOAD="https://github.com/JvanKatwijk/dab-cmdline/archive/815d83fc/dab-cmdline-815d83fcd1b2ffa1289501943c913cc86d6b567b.zip" -MD5SUM="15457cfebfeda63a0619bf6ea170eb8f" +DOWNLOAD="https://github.com/JvanKatwijk/dab-cmdline/archive/229149eb/dab-cmdline-229149eb421eeb8302ff96005c69b3cdab2cc349.tar.gz" +MD5SUM="38f5fb46df66f6bf395b0d1a367e1a77" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="faad2" diff --git a/ham/freedv/freedv.SlackBuild b/ham/freedv/freedv.SlackBuild index fa9c6afa94..798977e29f 100644 --- a/ham/freedv/freedv.SlackBuild +++ b/ham/freedv/freedv.SlackBuild @@ -25,7 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=freedv -VERSION=${VERSION:-1.2.2} +SRCNAM=freedv-gui +VERSION=${VERSION:-1.9.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -69,9 +67,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -96,9 +94,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING README.txt RELEASE_NOTES.txt USER_MANUAL.txt credits.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING *.md *.pdf $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/ham/freedv/freedv.info b/ham/freedv/freedv.info index 73dc5c8ab6..0519fbf8d6 100644 --- a/ham/freedv/freedv.info +++ b/ham/freedv/freedv.info @@ -1,8 +1,8 @@ PRGNAM="freedv" -VERSION="1.2.2" +VERSION="1.9.9.1" HOMEPAGE="https://freedv.org" -DOWNLOAD="https://freedv.com/wp-content/uploads/sites/8/2017/10/freedv-1.2.2.tar.xz" -MD5SUM="b4c6f57ee65dcc6b94e48f9b1105fa5e" +DOWNLOAD="https://github.com/drowe67/freedv-gui/archive/v1.9.9.1/freedv-gui-1.9.9.1.tar.gz" +MD5SUM="bcd2d79a72f1de5a3a33982ab1ccdc62" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="portaudio wxGTK3 codec2 hamlib" diff --git a/ham/gridtracker/gridtracker.SlackBuild b/ham/gridtracker/gridtracker.SlackBuild index f5c7bcb61b..3e1c7ef72c 100644 --- a/ham/gridtracker/gridtracker.SlackBuild +++ b/ham/gridtracker/gridtracker.SlackBuild @@ -2,7 +2,7 @@ # Slackbuild for gridtracker # Brian Cox <hamslackbuild@comcast.net> -# Copyright 2023 +# Copyright 2024 # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gridtracker -VERSION=${VERSION:-1.24.0104} +VERSION=${VERSION:-1.24.0504} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/ham/gridtracker/gridtracker.info b/ham/gridtracker/gridtracker.info index 779a75adb0..54c16e3dcf 100644 --- a/ham/gridtracker/gridtracker.info +++ b/ham/gridtracker/gridtracker.info @@ -1,8 +1,8 @@ PRGNAM="gridtracker" -VERSION="1.24.0104" +VERSION="1.24.0504" HOMEPAGE="https://gridtracker.org" -DOWNLOAD="https://gitlab.com/gridtracker.org/gridtracker/-/archive/v1.24.0104/gridtracker-v1.24.0104.tar.gz" -MD5SUM="f82c6f5e8a166edf3661d9874ca01159" +DOWNLOAD="https://gitlab.com/gridtracker.org/gridtracker/-/archive/v1.24.0504/gridtracker-v1.24.0504.tar.gz" +MD5SUM="bc02cf29fa45163d0ecf3dbf3ca2e4a4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="nwjs" diff --git a/ham/libsigmf/libsigmf.SlackBuild b/ham/libsigmf/libsigmf.SlackBuild index 269312c783..2278ca3bb0 100644 --- a/ham/libsigmf/libsigmf.SlackBuild +++ b/ham/libsigmf/libsigmf.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libsigmf -VERSION=${VERSION:-20231212.b9d14e21} -SRCVERSION=${SRCVERSION:-b9d14e2199bfcd958e16c33612ab35295e527087} +VERSION=${VERSION:-20240428.299dc8f9} +SRCVERSION=${SRCVERSION:-299dc8f9725f1733e5cc1ce8a69fbcf7f18a2f58} VERSION_flatbuffers=${VERSION_flatbuffers:-d8210d5a83faa345046648e520d82b54ea724e35} VERSION_json=${VERSION_json:-9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03} BUILD=${BUILD:-1} diff --git a/ham/libsigmf/libsigmf.info b/ham/libsigmf/libsigmf.info index df9b092712..78a17159dc 100644 --- a/ham/libsigmf/libsigmf.info +++ b/ham/libsigmf/libsigmf.info @@ -1,10 +1,12 @@ PRGNAM="libsigmf" -VERSION="20231212.b9d14e21" +VERSION="20240428.299dc8f9" HOMEPAGE="https://github.com/f4exb/libsigmf/" -DOWNLOAD="https://github.com/f4exb/libsigmf/archive/b9d14e21/libsigmf-b9d14e2199bfcd958e16c33612ab35295e527087.zip \ +DOWNLOAD="https://github.com/f4exb/libsigmf/archive/299dc8f9/libsigmf-299dc8f9725f1733e5cc1ce8a69fbcf7f18a2f58.zip \ https://github.com/google/flatbuffers/archive/d8210d5a/flatbuffers-d8210d5a83faa345046648e520d82b54ea724e35.zip \ https://github.com/nlohmann/json/archive/9cca280a/json-9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03.zip" -MD5SUM="85fcd782696082c48e1654b050d0ba98 9cd198fc0c93c4cd7bf632eb80a39286 05239fe4145889a732c4d90a180ce4bc" +MD5SUM="2da9c5db69ed2c0570e7e5d1f2a6f206 \ + 9cd198fc0c93c4cd7bf632eb80a39286 \ + 05239fe4145889a732c4d90a180ce4bc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/ham/lpcnetfreedv/README b/ham/lpcnetfreedv/README new file mode 100644 index 0000000000..daeafbf0d3 --- /dev/null +++ b/ham/lpcnetfreedv/README @@ -0,0 +1,5 @@ +This plugin provides Experimental Neural Net speech coding for FreeDV + +Warning: This SlackBuild requires network access when it runs, meaning +it downloads files from the Internet with root access. You should +decide for yourself whether or not you think this is a good idea. diff --git a/libraries/zstd-cmake/zstd-cmake.SlackBuild b/ham/lpcnetfreedv/lpcnetfreedv.SlackBuild index 81098203a3..5e6b4a5488 100644 --- a/libraries/zstd-cmake/zstd-cmake.SlackBuild +++ b/ham/lpcnetfreedv/lpcnetfreedv.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for zstd-cmake +# Slackware build script for lpcnetfreedv -# Copyright 2022-2023 Steven Voges <Oregon, USA> +# Copyright 2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +22,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=zstd-cmake -SRCNAM=zstd -VERSION=${VERSION:-1.5.5} +PRGNAM=lpcnetfreedv +SRCNAM=LPCNet +VERSION=${VERSION:-0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,7 +39,6 @@ if [ -z "$ARCH" ]; then *) ARCH=$( uname -m ) ;; esac fi - if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -57,6 +57,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -77,29 +80,27 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -mkdir -p build/cmake/build -cd build/cmake/build +mkdir -p build +cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DZSTD_BUILD_PROGRAMS=OFF \ - -DZSTD_BUILD_STATIC=OFF \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -DUSE_INTERNAL_CODEC2=FALSE \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG -cd ../../.. +cd .. + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la -rm -r $PKG/usr/include -rm -r $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig -rm $PKG/usr/lib$LIBDIRSUFFIX/libzstd.* -sed -i 's/${_IMPORT_PREFIX}\//\//g' \ - $PKG/usr/lib${LIBDIRSUFFIX}/cmake/$SRCNAM/${SRCNAM}Targets-release.cmake +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.md CHANGELOG COPYING LICENSE \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/ham/lpcnetfreedv/lpcnetfreedv.info b/ham/lpcnetfreedv/lpcnetfreedv.info new file mode 100644 index 0000000000..46cc59708c --- /dev/null +++ b/ham/lpcnetfreedv/lpcnetfreedv.info @@ -0,0 +1,10 @@ +PRGNAM="lpcnetfreedv" +VERSION="0.5" +HOMEPAGE="https://freedv.org/" +DOWNLOAD="https://github.com/drowe67/LPCNet/archive/v0.5/LPCNet-0.5.tar.gz" +MD5SUM="5960a002a46e8df245f0294ba3a1c832" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" diff --git a/libraries/lua-readline/slack-desc b/ham/lpcnetfreedv/slack-desc index 566ea2ce2a..d3d6046584 100644 --- a/libraries/lua-readline/slack-desc +++ b/ham/lpcnetfreedv/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -lua-readline: lua-readline (Interface to the readline library) -lua-readline: -lua-readline: This Lua module offers a simple calling interface -lua-readline: to the GNU Readline/History Library. -lua-readline: -lua-readline: Homepage: http://www.pjb.com.au/comp/lua/readline.html -lua-readline: -lua-readline: -lua-readline: -lua-readline: -lua-readline: +lpcnetfreedv: lpcnetfreedv (Experimental Neural Net speech coding for FreeDV) +lpcnetfreedv: +lpcnetfreedv: This plugin provides Experimental Neural Net speech coding for FreeDV +lpcnetfreedv: +lpcnetfreedv: +lpcnetfreedv: +lpcnetfreedv: +lpcnetfreedv: +lpcnetfreedv: +lpcnetfreedv: +lpcnetfreedv: diff --git a/ham/mbelib/mbelib.SlackBuild b/ham/mbelib/mbelib.SlackBuild index 9ae7571738..43890bfeec 100644 --- a/ham/mbelib/mbelib.SlackBuild +++ b/ham/mbelib/mbelib.SlackBuild @@ -25,8 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mbelib -VERSION=${VERSION:-20231211.9a04ed5c} -SRCVERSION=${SRCVERSION:-9a04ed5c78176a9965f3d43f7aa1b1f5330e771f} +VERSION=${VERSION:-20240428.9a04ed5c} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,9 +70,9 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$SRCVERSION -unzip $CWD/$PRGNAM-$SRCVERSION.zip -cd $PRGNAM-$SRCVERSION +rm -rf $PRGNAM-${VERSION##*.}* +tar xvf $CWD/$PRGNAM-${VERSION##*.}*.tar.gz +cd $PRGNAM-${VERSION##*.}* chown -R root:root . find -L . \ diff --git a/ham/mbelib/mbelib.info b/ham/mbelib/mbelib.info index fc1a97d7bf..06887470b0 100644 --- a/ham/mbelib/mbelib.info +++ b/ham/mbelib/mbelib.info @@ -1,8 +1,8 @@ PRGNAM="mbelib" -VERSION="20231211.9a04ed5c" +VERSION="20240428.9a04ed5c" HOMEPAGE="https://github.com/szechyjs/mbelib/" -DOWNLOAD="https://github.com/szechyjs/mbelib/archive/9a04ed5c/mbelib-9a04ed5c78176a9965f3d43f7aa1b1f5330e771f.zip" -MD5SUM="7925d70bbf0d0e6607555f3a90d7b10f" +DOWNLOAD="https://github.com/szechyjs/mbelib/archive/9a04ed5c/mbelib-9a04ed5c78176a9965f3d43f7aa1b1f5330e771f.tar.gz" +MD5SUM="9c998de63e1dea2f04bcd085177008dc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/ham/qlog/qlog.SlackBuild b/ham/qlog/qlog.SlackBuild index 8fc28d502d..ab688da383 100644 --- a/ham/qlog/qlog.SlackBuild +++ b/ham/qlog/qlog.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qlog SRCNAM=QLog -VERSION=${VERSION:-0.34.0} +VERSION=${VERSION:-0.35.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/ham/qlog/qlog.info b/ham/qlog/qlog.info index cf5b1ee24f..2be6e5af2b 100644 --- a/ham/qlog/qlog.info +++ b/ham/qlog/qlog.info @@ -1,10 +1,10 @@ PRGNAM="qlog" -VERSION="0.34.0" +VERSION="0.35.1" HOMEPAGE="https://github.com/foldynl/QLog" -DOWNLOAD="https://github.com/foldynl/QLog/archive/refs/tags/v0.34.0/QLog-0.34.0.tar.gz \ - https://github.com/foldynl/QLog-Flags/archive/refs/tags/v0.34.0/QLog-Flags-0.34.0.tar.gz" -MD5SUM="071583828a6409516a7d6e264d0b6309 \ - c9afee8394a8e0d536ff45b5f56c146b" +DOWNLOAD="https://github.com/foldynl/QLog/archive/refs/tags/v0.35.1/QLog-0.35.1.tar.gz \ + https://github.com/foldynl/QLog-Flags/archive/refs/tags/v0.35.1/QLog-Flags-0.35.1.tar.gz" +MD5SUM="1f8036431e333951320273d352d187a8 \ + fe270015056ec3bf57df3600e3f1583d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="hamlib" diff --git a/ham/satdump/satdump.SlackBuild b/ham/satdump/satdump.SlackBuild index facfab3718..a984608207 100644 --- a/ham/satdump/satdump.SlackBuild +++ b/ham/satdump/satdump.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=satdump -VERSION=${VERSION:-1.1.2} +VERSION=${VERSION:-1.1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/ham/satdump/satdump.info b/ham/satdump/satdump.info index dedbf6c26c..5194b697f5 100644 --- a/ham/satdump/satdump.info +++ b/ham/satdump/satdump.info @@ -1,8 +1,8 @@ PRGNAM="satdump" -VERSION="1.1.2" +VERSION="1.1.4" HOMEPAGE="https://www.satdump.org/" -DOWNLOAD="https://github.com/SatDump/SatDump/archive/1.1.2/SatDump-1.1.2.tar.gz" -MD5SUM="c7bbd6cd82d27b2ffa1c64fae236262f" +DOWNLOAD="https://github.com/SatDump/SatDump/archive/1.1.4/SatDump-1.1.4.tar.gz" +MD5SUM="588b8ff40a1da81d1fb9d618448ede75" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="volk glfw3 nng" diff --git a/ham/sdrangel/README b/ham/sdrangel/README index 1093c95fd2..883a6e912d 100644 --- a/ham/sdrangel/README +++ b/ham/sdrangel/README @@ -30,7 +30,7 @@ is to provide a Software Defined Radio platform that is committed to: Depending to your SDR hardware you may want to install some or all: libairspy, libairspyhf, libbladeRF, libhackrf, liniio, libmirisdr, -libperseus, librtlsdr, uhd ... +SDRplay, libperseus, librtlsdr, uhd ... (not all available at slackbuilds.org) Optional features can be enabled installing: diff --git a/ham/sdrangel/sdrangel.SlackBuild b/ham/sdrangel/sdrangel.SlackBuild index 6736df78bc..1307b9c770 100644 --- a/ham/sdrangel/sdrangel.SlackBuild +++ b/ham/sdrangel/sdrangel.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sdrangel -VERSION=${VERSION:-7.17.3} +VERSION=${VERSION:-7.20.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -85,6 +85,9 @@ find -L . \ # Fix zcat $CWD/localsink.diff.gz | patch -p0 || exit +# Fix (ver 3.14 Added RSP1B Support) +sed 's/case SDRPLAY_RSP1B_ID/case (6)/' -i plugins/samplesource/sdrplayv3/sdrplayv3input.cpp + mkdir -p build cd build cmake \ diff --git a/ham/sdrangel/sdrangel.info b/ham/sdrangel/sdrangel.info index 75d60fb1ed..e638693ff9 100644 --- a/ham/sdrangel/sdrangel.info +++ b/ham/sdrangel/sdrangel.info @@ -1,8 +1,8 @@ PRGNAM="sdrangel" -VERSION="7.17.3" +VERSION="7.20.0" HOMEPAGE="https://github.com/f4exb/sdrangel/wiki/" -DOWNLOAD="https://github.com/f4exb/sdrangel/archive/v7.17.3/sdrangel-v7.17.3.tar.gz" -MD5SUM="845857adc5a4ce96c6a74ed26832453d" +DOWNLOAD="https://github.com/f4exb/sdrangel/archive/v7.20.0/sdrangel-v7.20.0.tar.gz" +MD5SUM="f32e5c197ae11116ddb9c8dede609722" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="faad2 codec2 hamlib" diff --git a/ham/sgp4/sgp4.SlackBuild b/ham/sgp4/sgp4.SlackBuild index a9f9bc2f4d..cd3ac618cb 100644 --- a/ham/sgp4/sgp4.SlackBuild +++ b/ham/sgp4/sgp4.SlackBuild @@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sgp4 -VERSION=${VERSION:-20231211.6a448b48} -SRCVERSION=${SRCVERSION:-6a448b4850e5fbf8c1ca03bb5f6013a9fdc1fd91} +VERSION=${VERSION:-20240428.6a448b48} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -71,9 +71,9 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$SRCVERSION -unzip $CWD/$PRGNAM-$SRCVERSION.zip -cd $PRGNAM-$SRCVERSION +rm -rf $PRGNAM-${VERSION##*.}* +tar xvf $CWD/$PRGNAM-${VERSION##*.}*.tar.gz +cd $PRGNAM-${VERSION##*.}* chown -R root:root . find -L . \ @@ -91,7 +91,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release .. - make + make $NUMJOBS make install/strip DESTDIR=$PKG cd .. diff --git a/ham/sgp4/sgp4.info b/ham/sgp4/sgp4.info index 4f1ce6b7ed..460f8aaf32 100644 --- a/ham/sgp4/sgp4.info +++ b/ham/sgp4/sgp4.info @@ -1,8 +1,8 @@ PRGNAM="sgp4" -VERSION="20231211.6a448b48" +VERSION="20240428.6a448b48" HOMEPAGE="https://github.com/dnwrnr/sgp4/" -DOWNLOAD="https://github.com/dnwrnr/sgp4/archive/6a448b48/sgp4-6a448b4850e5fbf8c1ca03bb5f6013a9fdc1fd91.zip" -MD5SUM="90b246600ec54eaeb35f414accc020d4" +DOWNLOAD="https://github.com/dnwrnr/sgp4/archive/6a448b48/sgp4-6a448b4850e5fbf8c1ca03bb5f6013a9fdc1fd91.tar.gz" +MD5SUM="795cfea39667e3348a5d664ff5415fb6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="serialDV" diff --git a/libraries/CLI11/CLI11.SlackBuild b/libraries/CLI11/CLI11.SlackBuild index dcbca39923..6835bf9685 100644 --- a/libraries/CLI11/CLI11.SlackBuild +++ b/libraries/CLI11/CLI11.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=CLI11 -VERSION=${VERSION:-2.4.1} +VERSION=${VERSION:-2.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/CLI11/CLI11.info b/libraries/CLI11/CLI11.info index 2fe228f05b..55590fd232 100644 --- a/libraries/CLI11/CLI11.info +++ b/libraries/CLI11/CLI11.info @@ -1,8 +1,8 @@ PRGNAM="CLI11" -VERSION="2.4.1" +VERSION="2.4.2" HOMEPAGE="https://cliutils.github.io/CLI11/book/" -DOWNLOAD="https://github.com/CLIUtils/CLI11/archive/v2.4.1/CLI11-2.4.1.tar.gz" -MD5SUM="d88b829bb557951e2b784baa2a0a2655" +DOWNLOAD="https://github.com/CLIUtils/CLI11/archive/v2.4.2/CLI11-2.4.2.tar.gz" +MD5SUM="f9c0acb8c483a524e9dd275955227254" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/LucenePlusPlus/76dc90f2b65d81be018c499714ff11e121ba5585.patch b/libraries/LucenePlusPlus/76dc90f2b65d81be018c499714ff11e121ba5585.patch new file mode 100644 index 0000000000..05babf97a0 --- /dev/null +++ b/libraries/LucenePlusPlus/76dc90f2b65d81be018c499714ff11e121ba5585.patch @@ -0,0 +1,64 @@ +From c18ead2b0c4aa62af01450cb12353a0baa51411f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch> +Date: Wed, 27 Mar 2024 12:00:18 +0100 +Subject: [PATCH] Fix build with boost 1.85.0 + +boost::filesystem::wpath has been deprecated (and typedef-ed to +boost::filesystem::path) for a long time; it is removed from boost +starting with 1.85.0-beta1. + +Use boost::filesystem::path instead. + +boost/filesystem/convenience.hpp has been removed (and was being +included without being used anyway - its only use was indirectly +pulling in boost/filesystem/directory.hpp, which is actually used). + +Include boost/filesystem/directory.hpp directly instead. +--- + src/core/store/MMapDirectory.cpp | 2 +- + src/core/util/FileUtils.cpp | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/core/store/MMapDirectory.cpp b/src/core/store/MMapDirectory.cpp +index beac7828..46156e3a 100644 +--- a/src/core/store/MMapDirectory.cpp ++++ b/src/core/store/MMapDirectory.cpp +@@ -36,7 +36,7 @@ MMapIndexInput::MMapIndexInput(const String& path) { + bufferPosition = 0; + if (!path.empty()) { + try { +- file.open(boost::filesystem::wpath(path), _length); ++ file.open(boost::filesystem::path(path), _length); + } catch (...) { + boost::throw_exception(FileNotFoundException(path)); + } +diff --git a/src/core/util/FileUtils.cpp b/src/core/util/FileUtils.cpp +index 51508b57..d92efbb8 100644 +--- a/src/core/util/FileUtils.cpp ++++ b/src/core/util/FileUtils.cpp +@@ -5,9 +5,9 @@ + ///////////////////////////////////////////////////////////////////////////// + + #include "LuceneInc.h" +-#include <boost/filesystem/convenience.hpp> + #include <boost/filesystem/operations.hpp> + #include <boost/filesystem/path.hpp> ++#include <boost/filesystem/directory.hpp> + #include "LuceneThread.h" + #include "StringUtils.h" + #include "FileUtils.h" +@@ -128,12 +128,12 @@ String joinPath(const String& path, const String& file) { + } + + String extractPath(const String& path) { +- boost::filesystem::wpath parentPath(path.c_str()); ++ boost::filesystem::path parentPath(path.c_str()); + return parentPath.parent_path().wstring().c_str(); + } + + String extractFile(const String& path) { +- boost::filesystem::wpath fileName(path.c_str()); ++ boost::filesystem::path fileName(path.c_str()); + return fileName.filename().wstring().c_str(); + } + diff --git a/libraries/LucenePlusPlus/LucenePlusPlus.SlackBuild b/libraries/LucenePlusPlus/LucenePlusPlus.SlackBuild index aca1525316..338cd26ea9 100644 --- a/libraries/LucenePlusPlus/LucenePlusPlus.SlackBuild +++ b/libraries/LucenePlusPlus/LucenePlusPlus.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=LucenePlusPlus -VERSION=${VERSION:-3.0.8} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.0.9} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,8 +76,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/soname.patch - +patch -p1 < $CWD/a460863810b3a6a473780686e5d3fd70bf4378ba.patch +patch -p1 < $CWD/76dc90f2b65d81be018c499714ff11e121ba5585.patch mkdir -p build cd build cmake \ diff --git a/libraries/LucenePlusPlus/LucenePlusPlus.info b/libraries/LucenePlusPlus/LucenePlusPlus.info index 46b54dbfd1..b9da9031e4 100644 --- a/libraries/LucenePlusPlus/LucenePlusPlus.info +++ b/libraries/LucenePlusPlus/LucenePlusPlus.info @@ -1,8 +1,8 @@ PRGNAM="LucenePlusPlus" -VERSION="3.0.8" +VERSION="3.0.9" HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus" -DOWNLOAD="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_3.0.8/LucenePlusPlus-rel_3.0.8.tar.gz" -MD5SUM="cb9b2e7cb37b7dd68c1e24a65c6eda9d" +DOWNLOAD="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_3.0.9/LucenePlusPlus-rel_3.0.9.tar.gz" +MD5SUM="33da6751de47523e22e7a1beebd78c29" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/LucenePlusPlus/a460863810b3a6a473780686e5d3fd70bf4378ba.patch b/libraries/LucenePlusPlus/a460863810b3a6a473780686e5d3fd70bf4378ba.patch new file mode 100644 index 0000000000..1c9d5681e4 --- /dev/null +++ b/libraries/LucenePlusPlus/a460863810b3a6a473780686e5d3fd70bf4378ba.patch @@ -0,0 +1,22 @@ +From f40f59c6e169b4e16b7a6439ecb26a629c6540d1 Mon Sep 17 00:00:00 2001 +From: Sergey Fedorov <vital.had@gmail.com> +Date: Thu, 14 Mar 2024 20:37:34 +0800 +Subject: [PATCH] Fix install path for liblucene++.pc + +--- + src/config/core/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/config/core/CMakeLists.txt b/src/config/core/CMakeLists.txt +index e5691f54..69cfefcc 100644 +--- a/src/config/core/CMakeLists.txt ++++ b/src/config/core/CMakeLists.txt +@@ -9,7 +9,7 @@ if(NOT WIN32) + install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc" +- DESTINATION "${LIB_DESTINATION}/pkgconfig") ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + + diff --git a/libraries/LucenePlusPlus/soname.patch b/libraries/LucenePlusPlus/soname.patch deleted file mode 100644 index d8ddf04955..0000000000 --- a/libraries/LucenePlusPlus/soname.patch +++ /dev/null @@ -1,219 +0,0 @@ -commit 1cd2509ed74ae47965006d16de3c09db029b4efe -Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Date: Mon Jan 4 23:45:13 2021 +0100 - - Fix various cmake issues: - "CMAKE_INSTALL_FULL_LIBDIR" not being correctly evaluated and used - pkgconfig directory wrongly set to include instead of lib - cmake directory wrongly set to include instead of lib - core_libname contrib_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR PACKAGE_CMAKE_INSTALL_LIBDIR variables not being substituted to cmake.in files - cmake helpers not being correctly set - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 41de688..71dbbd5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -21,7 +21,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) - endif() - - set(LIB_DESTINATION -- "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE STRING "Define lib output directory name") -+ "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Define lib output directory name") - - - #################################### -diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt -index e5e6624..fe8e8b8 100644 ---- a/src/config/CMakeLists.txt -+++ b/src/config/CMakeLists.txt -@@ -1,16 +1,16 @@ - #################################### - # Set config vars - #################################### --set(core_libname, "lucene++") --set(contrib_libname, "lucene++-contrib") -+set(core_libname "lucene++") -+set(contrib_libname "lucene++-contrib") - - set( -- PACKAGE_CMAKE_INSTALL_INCLUDEDIR, -- "${lucene++_INCLUDE_DIR}/lucene++/") -+ PACKAGE_CMAKE_INSTALL_INCLUDEDIR -+ "${CMAKE_INSTALL_INCLUDEDIR}/lucene++/") - - set( -- PACKAGE_CMAKE_INSTALL_LIBDIR, -- "${LIB_INSTALL_DIR}/cmake") -+ PACKAGE_CMAKE_INSTALL_LIBDIR -+ "${LIB_DESTINATION}") - - - #################################### -diff --git a/src/config/contrib/CMakeLists.txt b/src/config/contrib/CMakeLists.txt -index c0dd86f..b4a4391 100644 ---- a/src/config/contrib/CMakeLists.txt -+++ b/src/config/contrib/CMakeLists.txt -@@ -9,7 +9,7 @@ if(NOT WIN32) - install( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc" -- DESTINATION "include/pkgconfig") -+ DESTINATION "${LIB_DESTINATION}/pkgconfig") - endif() - - -@@ -19,7 +19,8 @@ endif() - configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/liblucene++-contribConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake" -- INSTALL_DESTINATION "${LIB_DESTINATION}/cmake") -+ INSTALL_DESTINATION "${LIB_DESTINATION}/cmake/liblucene++-contrib" -+ PATH_VARS contrib_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR PACKAGE_CMAKE_INSTALL_LIBDIR) - - write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake" -@@ -30,4 +31,4 @@ install( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contribConfigVersion.cmake" -- DESTINATION "include/cmake") -+ DESTINATION "${LIB_DESTINATION}/cmake/liblucene++-contrib") -diff --git a/src/config/contrib/liblucene++-contribConfig.cmake.in b/src/config/contrib/liblucene++-contribConfig.cmake.in -index f92f683..85fdfd2 100644 ---- a/src/config/contrib/liblucene++-contribConfig.cmake.in -+++ b/src/config/contrib/liblucene++-contribConfig.cmake.in -@@ -20,6 +20,6 @@ if (NOT DEFINED set_and_check) - endif() - - --set_and_check(liblucene++-contrib_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@contrib_libname@") --set_and_check(liblucene++-contrib_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") --set(liblucene++-contrib_LIBRARIES "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@contrib_libname@") -+set_and_check(liblucene++-contrib_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") -+set_and_check(liblucene++-contrib_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_LIBDIR@") -+set(liblucene++-contrib_LIBRARIES "@contrib_libname@") -diff --git a/src/config/core/CMakeLists.txt b/src/config/core/CMakeLists.txt -index a3eb17a..65376f5 100644 ---- a/src/config/core/CMakeLists.txt -+++ b/src/config/core/CMakeLists.txt -@@ -9,7 +9,7 @@ if(NOT WIN32) - install( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc" -- DESTINATION "include/pkgconfig") -+ DESTINATION "${LIB_DESTINATION}/pkgconfig") - endif() - - -@@ -19,7 +19,8 @@ endif() - configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/liblucene++Config.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake" -- INSTALL_DESTINATION "${LIB_DESTINATION}/cmake") -+ INSTALL_DESTINATION "${LIB_DESTINATION}/cmake/liblucene++" -+ PATH_VARS core_libname PACKAGE_CMAKE_INSTALL_INCLUDEDIR PACKAGE_CMAKE_INSTALL_LIBDIR) - - write_basic_package_version_file( - ${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake -@@ -30,4 +31,4 @@ install( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++Config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/liblucene++ConfigVersion.cmake" -- DESTINATION "include/cmake") -+ DESTINATION "${LIB_DESTINATION}/cmake/liblucene++") -diff --git a/src/config/core/liblucene++Config.cmake.in b/src/config/core/liblucene++Config.cmake.in -index 89b48a3..574f812 100644 ---- a/src/config/core/liblucene++Config.cmake.in -+++ b/src/config/core/liblucene++Config.cmake.in -@@ -20,8 +20,8 @@ if (NOT DEFINED set_and_check) - endif() - - --set_and_check(liblucene++_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@core_libname@") --set_and_check(liblucene++_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") --set(liblucene++_LIBRARIES "@PACKAGE_CMAKE_INSTALL_LIBDIR@/@core_libname@") -+set_and_check(liblucene++_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") -+set_and_check(liblucene++_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/@PACKAGE_CMAKE_INSTALL_LIBDIR@") -+set(liblucene++_LIBRARIES "@core_libname@") - - - -commit 127492f1ab85fd74ab9f9dff0be5b0a63bf7c271 -Merge: df65bf5 fd9eaf1 -Author: Alan Wright <85800+alanw@users.noreply.github.com> -Date: Tue Dec 29 17:46:39 2020 +0000 - - Merge pull request #160 from Kakueeen/master - - fix a bug of ChineseTokenizer - - -commit fd9eaf10c49239d700af848062acc1d5efd54aa8 -Author: liuzhangjian <liuzhangjian@uniontech.com> -Date: Fri Dec 4 15:41:31 2020 +0800 - - Title:fix a bug of ChineseTokenizer - - Description:When I use ChineseAnalyzer for Chinese word segmentation, I find that English and numbers are treated as one word and I think they should be separated. - - RootCause:Null - - Solution: - -diff --git a/src/contrib/analyzers/common/analysis/cn/ChineseFilter.cpp b/src/contrib/analyzers/common/analysis/cn/ChineseFilter.cpp -index d2a19f3..8313445 100644 ---- a/src/contrib/analyzers/common/analysis/cn/ChineseFilter.cpp -+++ b/src/contrib/analyzers/common/analysis/cn/ChineseFilter.cpp -@@ -38,7 +38,7 @@ bool ChineseFilter::incrementToken() { - if (text.length() > 1) { - return true; - } -- } else if (UnicodeUtil::isOther(text[0])) { -+ } else if (UnicodeUtil::isOther(text[0]) || UnicodeUtil::isDigit(text[0])) { - // One Chinese character as one Chinese word. - // Chinese word extraction to be added later here. - return true; -diff --git a/src/contrib/analyzers/common/analysis/cn/ChineseTokenizer.cpp b/src/contrib/analyzers/common/analysis/cn/ChineseTokenizer.cpp -index 38bf987..3b4de74 100644 ---- a/src/contrib/analyzers/common/analysis/cn/ChineseTokenizer.cpp -+++ b/src/contrib/analyzers/common/analysis/cn/ChineseTokenizer.cpp -@@ -65,6 +65,7 @@ bool ChineseTokenizer::incrementToken() { - - length = 0; - start = offset; -+ bool last_is_en = false, last_is_num = false; - - while (true) { - wchar_t c; -@@ -82,11 +83,30 @@ bool ChineseTokenizer::incrementToken() { - c = ioBuffer[bufferIndex++]; - } - -- if (UnicodeUtil::isDigit(c) || UnicodeUtil::isLower(c) || UnicodeUtil::isUpper(c)) { -+ if (UnicodeUtil::isLower(c) || UnicodeUtil::isUpper(c)) { -+ if (last_is_num) { -+ --bufferIndex; -+ --offset; -+ return flush(); -+ } -+ -+ push(c); -+ if (length == MAX_WORD_LEN) { -+ return flush(); -+ } -+ last_is_en = true; -+ } else if (UnicodeUtil::isDigit(c)) { -+ if (last_is_en) { -+ --bufferIndex; -+ --offset; -+ return flush(); -+ } -+ - push(c); - if (length == MAX_WORD_LEN) { - return flush(); - } -+ last_is_num = true; - } else if (UnicodeUtil::isOther(c)) { - if (length > 0) { - --bufferIndex; diff --git a/libraries/MyGUI/MyGUI.SlackBuild b/libraries/MyGUI/MyGUI.SlackBuild index 6737d63981..f5ce2d4c72 100644 --- a/libraries/MyGUI/MyGUI.SlackBuild +++ b/libraries/MyGUI/MyGUI.SlackBuild @@ -84,6 +84,7 @@ find -L . \ sed -i '71 i set(MYGUI_GCC_VISIBILITY_FLAGS "")' CMakeLists.txt sed -i 's/\${OIS_LIBRARIES}/${OIS_LIBRARIES} boost_system/g' Common/CMakeLists.txt +sed -i s/\#include\ \<string\>/\#include\ \<string\>\\n\#include\ \<cstdint\>/ ./MyGUIEngine/include/MyGUI_Types.h mkdir -p build cd build diff --git a/libraries/ORBit2/ORBit2.SlackBuild b/libraries/ORBit2/ORBit2.SlackBuild index 6aac3d721e..d47be71520 100644 --- a/libraries/ORBit2/ORBit2.SlackBuild +++ b/libraries/ORBit2/ORBit2.SlackBuild @@ -79,6 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/ORBit2/patches/ORBit2-configure-c99.patch b/libraries/ORBit2/patches/ORBit2-configure-c99.patch new file mode 100644 index 0000000000..8e267b5658 --- /dev/null +++ b/libraries/ORBit2/patches/ORBit2-configure-c99.patch @@ -0,0 +1,147 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index 3b67d9b5cae2d766..408b9845f8f1f328 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -23,7 +23,7 @@ AC_DEFUN([AC_CHECK_ALIGNOF], + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; $1 s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +diff --git a/configure b/configure +index 1fed47a1d26c3f36..63c32a20c6574672 100755 +--- a/configure ++++ b/configure +@@ -12346,7 +12346,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdio.h> +- main () ++ int main (void) + { + return 0; + } +@@ -12387,7 +12387,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_octet s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12434,7 +12434,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_boolean s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12481,7 +12481,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_char s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12528,7 +12528,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_wchar s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12575,7 +12575,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_short s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12622,7 +12622,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_long s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12669,7 +12669,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_long_long s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12716,7 +12716,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_float s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12763,7 +12763,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_double s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12810,7 +12810,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_long_double s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12857,7 +12857,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_struct s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12904,7 +12904,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_pointer s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +diff --git a/configure.in b/configure.in +index 04d4b2a397d53196..4a25f4e6ec84bdac 100644 +--- a/configure.in ++++ b/configure.in +@@ -220,7 +220,7 @@ dnl + dofus_save_libs="$LIBS" + LIBS="$ORBIT_LIBS $LIBS" + AC_TRY_RUN([ #include <stdio.h> +- main () ++ int main (void) + { + return 0; + } ],, diff --git a/libraries/ORBit2/patches/pointer-type.patch b/libraries/ORBit2/patches/pointer-type.patch new file mode 100644 index 0000000000..f1e95644e4 --- /dev/null +++ b/libraries/ORBit2/patches/pointer-type.patch @@ -0,0 +1,11 @@ +--- ./src/orb/GIOP/giop-recv-buffer.c~ 2010-02-09 06:05:35.000000000 -0600 ++++ ./src/orb/GIOP/giop-recv-buffer.c 2024-01-30 09:31:58.383855651 -0600 +@@ -559,7 +559,7 @@ + ent->src_thread = giop_thread_self (); + ent->async_cb = NULL; + +- ent->cnx = giop_connection_ref (cnx); ++ ent->cnx = (GIOPConnection *)giop_connection_ref (cnx); + ent->msg_type = msg_type; + ent->request_id = request_id; + ent->buffer = NULL; diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild index bcf21cc5d8..096a1e6bd7 100644 --- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild +++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild @@ -67,6 +67,9 @@ find -L . \ # whose current versions at SBo cause build failure patch -p0 < $CWD/no-asio-occ.diff +# https://github.com/openscenegraph/OpenSceneGraph/issues/1111 +sed -i '/FFmpeg/d' CMakeLists.txt + mkdir -p build cd build cmake .. \ diff --git a/libraries/PrettyTable/PrettyTable.SlackBuild b/libraries/PrettyTable/PrettyTable.SlackBuild index 61059f2846..cc1a65ccab 100644 --- a/libraries/PrettyTable/PrettyTable.SlackBuild +++ b/libraries/PrettyTable/PrettyTable.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for PrettyTable -# Copyright 2014-2020 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=PrettyTable SRCNAM=prettytable -VERSION=${VERSION:-0.7.2} +VERSION=${VERSION:-3.10.0} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,18 +80,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG - -# Python 3 support. -if $(python3 -c 'import sys' 2>/dev/null); then - python3 setup.py install --root=$PKG -fi +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG COPYING PKG-INFO README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md PKG-INFO README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/PrettyTable/PrettyTable.info b/libraries/PrettyTable/PrettyTable.info index dd98ba3064..ede13c49e1 100644 --- a/libraries/PrettyTable/PrettyTable.info +++ b/libraries/PrettyTable/PrettyTable.info @@ -1,10 +1,10 @@ PRGNAM="PrettyTable" -VERSION="0.7.2" +VERSION="3.10.0" HOMEPAGE="https://pypi.org/project/PrettyTable/" -DOWNLOAD="https://pypi.python.org/packages/e0/a1/36203205f77ccf98f3c6cf17cf068c972e6458d7e58509ca66da949ca347/prettytable-0.7.2.tar.gz" -MD5SUM="a6b80afeef286ce66733d54a0296b13b" +DOWNLOAD="https://files.pythonhosted.org/packages/19/d3/7cb826e085a254888d8afb4ae3f8d43859b13149ac8450b221120d4964c9/prettytable-3.10.0.tar.gz" +MD5SUM="f3b3f5738658bbf8d1fb8c7859ea95e6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3-hatch_vcs" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/libraries/SDL_Pango/SDL_Pango.SlackBuild b/libraries/SDL_Pango/SDL_Pango.SlackBuild index de28ac1e0c..64c1019e61 100644 --- a/libraries/SDL_Pango/SDL_Pango.SlackBuild +++ b/libraries/SDL_Pango/SDL_Pango.SlackBuild @@ -85,7 +85,7 @@ autoreconf -i libtoolize --copy --force automake -a -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/SimGear/SimGear.SlackBuild b/libraries/SimGear/SimGear.SlackBuild index 3b611b701f..485d532e1e 100644 --- a/libraries/SimGear/SimGear.SlackBuild +++ b/libraries/SimGear/SimGear.SlackBuild @@ -81,6 +81,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/compositor-pass-missing-array-include.patch + mkdir -p build cd build cmake \ diff --git a/libraries/SimGear/compositor-pass-missing-array-include.patch b/libraries/SimGear/compositor-pass-missing-array-include.patch new file mode 100644 index 0000000000..5572f5f9e4 --- /dev/null +++ b/libraries/SimGear/compositor-pass-missing-array-include.patch @@ -0,0 +1,11 @@ +diff -ur simgear-2020.3.17.orig/simgear/scene/viewer/Compositor.hxx simgear-2020.3.17/simgear/scene/viewer/Compositor.hxx +--- simgear-2020.3.17.orig/simgear/scene/viewer/Compositor.hxx 2022-11-20 19:01:30.000000000 +0100 ++++ simgear-2020.3.17/simgear/scene/viewer/Compositor.hxx 2023-03-10 18:40:59.219808993 +0100 +@@ -17,6 +17,7 @@ + #ifndef SG_COMPOSITOR_HXX + #define SG_COMPOSITOR_HXX + ++#include <array> + #include <unordered_map> + #include <vector> + diff --git a/libraries/alure/alure.SlackBuild b/libraries/alure/alure.SlackBuild index 5f4e5f824f..e3823d7ca6 100644 --- a/libraries/alure/alure.SlackBuild +++ b/libraries/alure/alure.SlackBuild @@ -98,6 +98,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DBUILD_STATIC=OFF \ -DCMAKE_BUILD_TYPE=Release .. + find -name build.make | xargs sed -e 's|\;| |g' -i make make install/strip DESTDIR=$PKG cd .. diff --git a/libraries/aubio/README b/libraries/aubio/README index 0bab21e1c8..d1c71a9330 100644 --- a/libraries/aubio/README +++ b/libraries/aubio/README @@ -7,7 +7,7 @@ results too. jack and ffmpeg are optional dependencies. -The python bindings are built if numpy is available and the python3 -ones are built if numpy3 is available: if both versions of python -are present in the system, the aubio and aubiocut python scripts -will use python3. +The python2 bindings are built if python2-numpy is available and +the python3 ones are built if python3-numpy is available: if both +versions of numpy are present in the system, the aubio and aubiocut +python scripts will use python3. diff --git a/libraries/aubio/aubio.SlackBuild b/libraries/aubio/aubio.SlackBuild index 48e8c876be..35a2f9bc82 100644 --- a/libraries/aubio/aubio.SlackBuild +++ b/libraries/aubio/aubio.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for aubio # Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2018-2019 Matteo Bernardini, Pisa, Italy +# Copyright 2018-2024 Matteo Bernardini, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -31,8 +31,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=aubio -VERSION=${VERSION:-0.4.9} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20240102_152d681} +WAFVER=${WAFVER:-2.0.26} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,7 +74,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION-2 -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -82,6 +83,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + +install -m 0755 $CWD/waf-$WAFVER waf + # Fix detecting ffmpeg sed -i "s|'HAVE_' + i in ctx.env.define_key|'HAVE_' + i in ctx.env|" \ wscript || exit 1 @@ -116,6 +119,8 @@ cd .. cp -a $PRGNAM-$VERSION $PRGNAM-$VERSION-2 cd - +export CFLAGS="$SLKCFLAGS -fpermissive" + if $(python2 -c 'import numpy' 2>/dev/null); then python2 setup.py install --root=$PKG fi diff --git a/libraries/aubio/aubio.info b/libraries/aubio/aubio.info index c5d084ea72..aa912abca8 100644 --- a/libraries/aubio/aubio.info +++ b/libraries/aubio/aubio.info @@ -1,8 +1,10 @@ PRGNAM="aubio" -VERSION="0.4.9" +VERSION="20240102_152d681" HOMEPAGE="https://aubio.org/" -DOWNLOAD="https://aubio.org/pub/aubio-0.4.9.tar.bz2" -MD5SUM="50c9c63b15a2692378af5d602892f16a" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/aubio-20240102_152d681.tar.xz \ + https://ponce.cc/slackware/sources/repo/waf-2.0.26" +MD5SUM="6ada0f768d8b78308f842d8e8862c325 \ + 730623b05efa37980aa15ff34a02e990" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/bamf/add_compile_warning_flags.patch b/libraries/bamf/add_compile_warning_flags.patch deleted file mode 100644 index 203ccc75d3..0000000000 --- a/libraries/bamf/add_compile_warning_flags.patch +++ /dev/null @@ -1,71 +0,0 @@ -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=940164 - -diff -Naur bamf-0.5.4.orig/configure.ac bamf-0.5.4/configure.ac ---- bamf-0.5.4.orig/configure.ac 2018-11-07 23:39:11.355315678 +0100 -+++ bamf-0.5.4/configure.ac 2019-11-18 12:57:04.534000000 +0100 -@@ -18,14 +18,15 @@ - GNOME_COMPILE_WARNINGS(maximum) - - AM_MAINTAINER_MODE --AM_DISABLE_STATIC --AM_PROG_LIBTOOL - AC_ISC_POSIX - AC_SUBST(ACLOCAL_AMFLAFS, "$ACLOCAL_FLAGS -I m4") - - PKG_PROG_PKG_CONFIG - if test "x$PKG_CONFIG" = "x"; then AC_MSG_ERROR([You need to install pkg-config]); fi - -+LT_INIT([disable-static]) -+LT_LIB_M -+ - # Checks for programs. - AC_PROG_CC - AM_PROG_CC_C_O -@@ -154,8 +155,39 @@ - # - AM_PATH_GTK_3_0 - -+# Compile warnings -+AC_ARG_ENABLE(compile-warnings, -+ AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], -+ [Trun on compiler warnings]),, -+ [enable_compile_warnings=maximum]) -+ -+warning_flags= -+ -+case "$enable_compile_warnings" in -+no) -+warning_flags= -+;; -+minimum) -+warning_flags="-Wall" -+;; -+yes) -+warning_flags="-wall -Wno-error=deprecated-declarations" -+;; -+maximum|error) -+warning_flags="-Wall -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration" -+if test "$enable_compile_warnings" = "error" ; then -+ warning_flags="$warning_flags -Werror" -+fi -+;; -+*) -+AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) -+;; -+esac -+AC_MSG_CHECKING(what warning flags to pass to the C compiler) -+AC_MSG_RESULT($warning_flags) -+ - dnl CFLAGS --CFLAGS="$CFLAGS -Wall -Werror -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm" -+CFLAGS="$CFLAGS $warning_flags $LIBM" - - AC_SUBST(BAMFDAEMON_CFLAGS) - AC_SUBST(BAMFDAEMON_LIBS) -@@ -190,5 +222,6 @@ - Headless tests: ${enable_headless_tests} - Coverage Reporting: ${use_gcov} - Export actions menus: ${enable_export_actions_menu} -+ Compiler Flags: ${CFLAGS} - - EOF diff --git a/libraries/bamf/bamf-no-gtester2xunit.patch b/libraries/bamf/bamf-no-gtester2xunit.patch new file mode 100644 index 0000000000..5c1e0fcd74 --- /dev/null +++ b/libraries/bamf/bamf-no-gtester2xunit.patch @@ -0,0 +1,22 @@ +diff -Naur bamf-0.5.6.orig/configure.ac bamf-0.5.6/configure.ac +--- bamf-0.5.6.orig/configure.ac 2022-02-17 19:16:55.346057503 +0100 ++++ bamf-0.5.6/configure.ac 2023-02-04 19:24:42.506720000 +0100 +@@ -106,18 +106,6 @@ + GTK_DOC_CHECK(1.0) + + ########################### +-# gtester2xunit checks # +-########################### +- +-AC_PATH_PROG([PYTHON],[python3]) +-AC_MSG_CHECKING(for gtester2xunit dependencies) +-if !($PYTHON -c "from lxml import etree" 2> /dev/null); then +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([You need to install python3-lxml]); +-fi +-AC_MSG_RESULT([yes]) +- +-########################### + # Headless tests + ########################### + AC_ARG_ENABLE([headless-tests], diff --git a/libraries/bamf/bamf.SlackBuild b/libraries/bamf/bamf.SlackBuild index a381620ac1..38d46e792a 100644 --- a/libraries/bamf/bamf.SlackBuild +++ b/libraries/bamf/bamf.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bamf -VERSION=${VERSION:-0.5.4} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.5.6} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,7 +80,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/add_compile_warning_flags.patch +patch -p1 < $CWD/bamf-no-gtester2xunit.patch autoreconf -vif CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/bamf/bamf.info b/libraries/bamf/bamf.info index 1effbc4410..b57453a2fe 100644 --- a/libraries/bamf/bamf.info +++ b/libraries/bamf/bamf.info @@ -1,8 +1,8 @@ PRGNAM="bamf" -VERSION="0.5.4" +VERSION="0.5.6" HOMEPAGE="https://launchpad.net/bamf" -DOWNLOAD="https://launchpad.net/bamf/0.5/0.5.4/+download/bamf-0.5.4.tar.gz" -MD5SUM="e5078ec8f6c8a9d77242010dcd3b3217" +DOWNLOAD="https://launchpad.net/bamf/0.5/0.5.6/+download/bamf-0.5.6.tar.gz" +MD5SUM="49ed19dd5db0b4109f4dc2e4fe2ed13d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gnome-common" diff --git a/libraries/botocore/botocore.SlackBuild b/libraries/botocore/botocore.SlackBuild index 1f79141716..4f44f09d30 100644 --- a/libraries/botocore/botocore.SlackBuild +++ b/libraries/botocore/botocore.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=botocore -VERSION=${VERSION:-1.34.14} +VERSION=${VERSION:-1.34.99} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/botocore/botocore.info b/libraries/botocore/botocore.info index 076ad6bfa3..65b8582cd5 100644 --- a/libraries/botocore/botocore.info +++ b/libraries/botocore/botocore.info @@ -1,8 +1,8 @@ PRGNAM="botocore" -VERSION="1.34.14" +VERSION="1.34.99" HOMEPAGE="https://github.com/boto/botocore" -DOWNLOAD="https://github.com/boto/botocore/archive/1.34.14/botocore-1.34.14.tar.gz" -MD5SUM="cc8017ec4a3798eca8a5c22bdb1df69c" +DOWNLOAD="https://github.com/boto/botocore/archive/1.34.99/botocore-1.34.99.tar.gz" +MD5SUM="d065f95459c16331822bb50cee9920ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-dateutil jmespath" diff --git a/libraries/chromaprint/chromaprint.SlackBuild b/libraries/chromaprint/chromaprint.SlackBuild index 3b01f015bc..7ec8bf6a04 100644 --- a/libraries/chromaprint/chromaprint.SlackBuild +++ b/libraries/chromaprint/chromaprint.SlackBuild @@ -83,6 +83,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/ffmpeg5.patch + mkdir -p build cd build cmake \ diff --git a/libraries/chromaprint/ffmpeg5.patch b/libraries/chromaprint/ffmpeg5.patch new file mode 100644 index 0000000000..d90767fd14 --- /dev/null +++ b/libraries/chromaprint/ffmpeg5.patch @@ -0,0 +1,76 @@ +From 6d938d70b1d52634f8b0d88cb29da87f8d5b35a2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch> +Date: Mon, 17 Jan 2022 04:41:33 +0100 +Subject: [PATCH] Port to ffmpeg 5.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Replace removed functionality like accessing the codec context +from an AVStream and avcodec_decode_audio4() + +Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch> +--- + src/audio/ffmpeg_audio_reader.h | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) + +diff --git a/src/audio/ffmpeg_audio_reader.h b/src/audio/ffmpeg_audio_reader.h +index 5550164..a3b8de7 100644 +--- a/src/audio/ffmpeg_audio_reader.h ++++ b/src/audio/ffmpeg_audio_reader.h +@@ -74,7 +74,7 @@ class FFmpegAudioReader { + uint8_t *m_convert_buffer[1] = { nullptr }; + int m_convert_buffer_nb_samples = 0; + +- AVInputFormat *m_input_fmt = nullptr; ++ const AVInputFormat *m_input_fmt = nullptr; + AVDictionary *m_input_opts = nullptr; + + AVFormatContext *m_format_ctx = nullptr; +@@ -153,7 +153,7 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + return false; + } + +- AVCodec *codec; ++ const AVCodec *codec; + ret = av_find_best_stream(m_format_ctx, AVMEDIA_TYPE_AUDIO, -1, -1, &codec, 0); + if (ret < 0) { + SetError("Could not find any audio stream in the file", ret); +@@ -161,7 +161,13 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + } + m_stream_index = ret; + ++#if LIBAVCODEC_VERSION_MAJOR >= 59 ++ const AVCodec *streamcodec = avcodec_find_decoder(m_format_ctx->streams[m_stream_index]->codecpar->codec_id); ++ m_codec_ctx = avcodec_alloc_context3(streamcodec); ++ avcodec_parameters_to_context(m_codec_ctx, m_format_ctx->streams[m_stream_index]->codecpar); ++#else + m_codec_ctx = m_format_ctx->streams[m_stream_index]->codec; ++#endif + m_codec_ctx->request_sample_fmt = AV_SAMPLE_FMT_S16; + + ret = avcodec_open2(m_codec_ctx, codec, nullptr); +@@ -278,7 +284,23 @@ inline bool FFmpegAudioReader::Read(const int16_t **data, size_t *size) { + } + } + ++#if LIBAVCODEC_VERSION_MAJOR < 59 + ret = avcodec_decode_audio4(m_codec_ctx, m_frame, &m_got_frame, &m_packet); ++#else ++ m_got_frame = 0; ++ ret = avcodec_send_packet(m_codec_ctx, &m_packet); ++ if(ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) ++ ret = 0; ++ if(ret >= 0) { ++ ret = avcodec_receive_frame(m_codec_ctx, m_frame); ++ if (ret == 0) { ++ m_got_frame = 1; ++ ret = m_packet.size; ++ } ++ } ++ if(ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) ++ ret = 0; ++#endif + if (ret < 0) { + if (m_decode_error) { + SetError("Error decoding audio frame", m_decode_error); diff --git a/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild b/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild index 06780bfb97..620857d696 100644 --- a/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild +++ b/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild @@ -79,6 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/gcc13.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/compiz-plugins-experimental/gcc13.patch b/libraries/compiz-plugins-experimental/gcc13.patch new file mode 100644 index 0000000000..8edce5b67e --- /dev/null +++ b/libraries/compiz-plugins-experimental/gcc13.patch @@ -0,0 +1,169 @@ +https://bbs.archlinux.org/viewtopic.php?id=290483 + +diff --git a/src/anaglyph/anaglyph.c b/src/anaglyph/anaglyph.c +index 5ee0b32..94dec30 100644 +--- a/src/anaglyph/anaglyph.c ++++ b/src/anaglyph/anaglyph.c +@@ -21,6 +21,7 @@ + #include <compiz-core.h> + #include "anaglyph_options.h" + ++#include <stdlib.h> + + #define GET_ANAGLYPH_CORE(c) \ + ((AnaglyphCore *) (c)->base.privates[corePrivateIndex].ptr) +diff --git a/src/atlantis/atlantis-internal.h b/src/atlantis/atlantis-internal.h +index 4b3e903..4ce80cd 100644 +--- a/src/atlantis/atlantis-internal.h ++++ b/src/atlantis/atlantis-internal.h +@@ -104,6 +104,7 @@ + + #include <math.h> + #include <float.h> ++#include <stdlib.h> + + /* some constants */ + #define PI M_PI +diff --git a/src/elements/elements.c b/src/elements/elements.c +index 9c3d61f..f24ebc0 100644 +--- a/src/elements/elements.c ++++ b/src/elements/elements.c +@@ -50,6 +50,9 @@ + + #include <compiz-core.h> + #include "elements_options.h" ++ ++#include <stdlib.h> ++ + #define GET_DISPLAY(d) \ + ((eDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/fakeargb/fakeargb.c b/src/fakeargb/fakeargb.c +index 1c8c241..c76c1b7 100644 +--- a/src/fakeargb/fakeargb.c ++++ b/src/fakeargb/fakeargb.c +@@ -22,6 +22,8 @@ + #include <compiz-core.h> + #include "fakeargb_options.h" + ++#include <stdlib.h> ++ + static int displayPrivateIndex; + + typedef struct _FakeDisplay +diff --git a/src/fireflies/fireflies.c b/src/fireflies/fireflies.c +index 6d271c2..6f7b1a9 100644 +--- a/src/fireflies/fireflies.c ++++ b/src/fireflies/fireflies.c +@@ -32,6 +32,8 @@ + #include <compiz-core.h> + #include "fireflies_options.h" + ++#include <stdlib.h> ++ + #define GET_SNOW_DISPLAY(d) \ + ((SnowDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/freewins/freewins.c b/src/freewins/freewins.c +index bd55f56..fffc337 100644 +--- a/src/freewins/freewins.c ++++ b/src/freewins/freewins.c +@@ -50,6 +50,8 @@ + + #include "freewins.h" + ++#include <stdlib.h> ++ + static CompMetadata freewinsMetadata; + + /* Information on window resize */ +diff --git a/src/freewins/input.c b/src/freewins/input.c +index 96a9009..7c35d1e 100644 +--- a/src/freewins/input.c ++++ b/src/freewins/input.c +@@ -50,6 +50,8 @@ + #include "freewins.h" + #include <cairo/cairo-xlib.h> + ++#include <stdlib.h> ++ + /* ------ Input Prevention -------------------------------------------*/ + + /* Shape the IPW +diff --git a/src/smartput/smartput.c b/src/smartput/smartput.c +index a43f4c1..05bcbf1 100644 +--- a/src/smartput/smartput.c ++++ b/src/smartput/smartput.c +@@ -50,6 +50,8 @@ + #include <compiz-core.h> + #include "smartput_options.h" + ++#include <stdlib.h> ++ + typedef struct _SmartputUndoInfo { + Window window; + +diff --git a/src/snow/snow.c b/src/snow/snow.c +index 80e94aa..fb6566a 100644 +--- a/src/snow/snow.c ++++ b/src/snow/snow.c +@@ -32,6 +32,8 @@ + #include <compiz-core.h> + #include "snow_options.h" + ++#include <stdlib.h> ++ + #define GET_SNOW_DISPLAY(d) \ + ((SnowDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/snowglobe/snowglobe-internal.h b/src/snowglobe/snowglobe-internal.h +index 9ca51ff..f6d89af 100644 +--- a/src/snowglobe/snowglobe-internal.h ++++ b/src/snowglobe/snowglobe-internal.h +@@ -8,6 +8,7 @@ + + #include <math.h> + #include <float.h> ++#include <stdlib.h> + + /* some constants */ + #define PI M_PI +diff --git a/src/stars/star.c b/src/stars/star.c +index 96a26c1..59aa7d9 100644 +--- a/src/stars/star.c ++++ b/src/stars/star.c +@@ -43,6 +43,8 @@ + #include <compiz-core.h> + #include "star_options.h" + ++#include <stdlib.h> ++ + #define GET_SNOW_DISPLAY(d) \ + ((SnowDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/tile/tile.c b/src/tile/tile.c +index d58cac5..98c0ad0 100644 +--- a/src/tile/tile.c ++++ b/src/tile/tile.c +@@ -30,6 +30,8 @@ + #include <compiz-core.h> + #include "tile_options.h" + ++#include <stdlib.h> ++ + static int displayPrivateIndex = 0; + + typedef enum { +diff --git a/src/wizard/wizard.c b/src/wizard/wizard.c +index d60ff94..d90f9cc 100644 +--- a/src/wizard/wizard.c ++++ b/src/wizard/wizard.c +@@ -30,6 +30,8 @@ + #include "wizard_options.h" + #include "wizard_tex.h" + ++#include <stdlib.h> ++ + #define GET_WIZARD_DISPLAY(d) \ + ((WizardDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + diff --git a/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild b/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild index baf64788ca..bd933df6ae 100644 --- a/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild +++ b/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild @@ -79,6 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/gcc13.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/compiz-plugins-extra/gcc13.patch b/libraries/compiz-plugins-extra/gcc13.patch new file mode 100644 index 0000000000..5500445b4b --- /dev/null +++ b/libraries/compiz-plugins-extra/gcc13.patch @@ -0,0 +1,203 @@ +https://bbs.archlinux.org/viewtopic.php?id=290483 + +diff --git a/src/addhelper/addhelper.c b/src/addhelper/addhelper.c +index 3bc8a6b..78242e9 100644 +--- a/src/addhelper/addhelper.c ++++ b/src/addhelper/addhelper.c +@@ -24,6 +24,9 @@ + */ + + #include <compiz-core.h> ++ ++#include <stdlib.h> ++ + #include "addhelper_options.h" + + #define GET_ADD_DISPLAY(d) \ +diff --git a/src/bench/bench.c b/src/bench/bench.c +index 9cdef8c..4610021 100644 +--- a/src/bench/bench.c ++++ b/src/bench/bench.c +@@ -22,6 +22,8 @@ + + #include <compiz-core.h> + ++#include <stdlib.h> ++ + #include "bench_tex.h" + #include "bench_options.h" + +diff --git a/src/firepaint/firepaint.c b/src/firepaint/firepaint.c +index b147b03..cb8a508 100644 +--- a/src/firepaint/firepaint.c ++++ b/src/firepaint/firepaint.c +@@ -21,6 +21,8 @@ + + #include <compiz-core.h> + ++#include <stdlib.h> ++ + #include "firepaint_options.h" + #include "firepaint_tex.h" + +diff --git a/src/grid/grid.c b/src/grid/grid.c +index a8d5152..cb827e6 100644 +--- a/src/grid/grid.c ++++ b/src/grid/grid.c +@@ -23,7 +23,10 @@ + */ + + #include <compiz-core.h> ++ ++#include <stdlib.h> + #include <string.h> ++ + #include "grid_options.h" + + #define GRID_DEBUG 0 +diff --git a/src/highlightcontent/highlightcontent.c b/src/highlightcontent/highlightcontent.c +index 33bf932..5d66978 100644 +--- a/src/highlightcontent/highlightcontent.c ++++ b/src/highlightcontent/highlightcontent.c +@@ -21,6 +21,7 @@ + */ + + #include <math.h> ++#include <stdlib.h> + #include <string.h> + + #include <compiz-core.h> +diff --git a/src/loginout/loginout.c b/src/loginout/loginout.c +index e2889d2..466f7df 100644 +--- a/src/loginout/loginout.c ++++ b/src/loginout/loginout.c +@@ -21,6 +21,8 @@ + + #include <compiz-core.h> + ++#include <stdlib.h> ++ + #include "loginout_options.h" + + static int displayPrivateIndex = 0; +diff --git a/src/mblur/mblur.c b/src/mblur/mblur.c +index 103cd32..4e15c6d 100644 +--- a/src/mblur/mblur.c ++++ b/src/mblur/mblur.c +@@ -20,6 +20,7 @@ + */ + + #include <math.h> ++#include <stdlib.h> + + #include <compiz-core.h> + +diff --git a/src/reflex/reflex.c b/src/reflex/reflex.c +index 8c6ebc3..648c9c9 100644 +--- a/src/reflex/reflex.c ++++ b/src/reflex/reflex.c +@@ -20,6 +20,8 @@ + */ + #include <compiz-core.h> + ++#include <stdlib.h> ++ + #include "reflex_options.h" + + +diff --git a/src/scalefilter/scalefilter.c b/src/scalefilter/scalefilter.c +index 55e2a96..c10c5d1 100644 +--- a/src/scalefilter/scalefilter.c ++++ b/src/scalefilter/scalefilter.c +@@ -25,6 +25,7 @@ + + #define _GNU_SOURCE + #include <math.h> ++#include <stdlib.h> + #include <string.h> + #include <wchar.h> + #include <locale.h> +diff --git a/src/shelf/shelf.c b/src/shelf/shelf.c +index cd17839..e4fd09c 100644 +--- a/src/shelf/shelf.c ++++ b/src/shelf/shelf.c +@@ -33,6 +33,7 @@ + #include <X11/extensions/shape.h> + #include <X11/cursorfont.h> + #include <math.h> ++#include <stdlib.h> + #include <string.h> + #include "shelf_options.h" + +diff --git a/src/showmouse/showmouse.c b/src/showmouse/showmouse.c +index fe972a2..32c3cb9 100644 +--- a/src/showmouse/showmouse.c ++++ b/src/showmouse/showmouse.c +@@ -25,6 +25,7 @@ + */ + + #include <math.h> ++#include <stdlib.h> + #include <string.h> + + #include <compiz-core.h> +diff --git a/src/splash/splash.c b/src/splash/splash.c +index c72b9b0..986a3ec 100644 +--- a/src/splash/splash.c ++++ b/src/splash/splash.c +@@ -20,6 +20,7 @@ + */ + + #include <math.h> ++#include <stdlib.h> + + #include <compiz-core.h> + #include <X11/Xatom.h> +diff --git a/src/trailfocus/trailfocus.c b/src/trailfocus/trailfocus.c +index ecfa84d..05c50f4 100644 +--- a/src/trailfocus/trailfocus.c ++++ b/src/trailfocus/trailfocus.c +@@ -25,6 +25,7 @@ + * + */ + ++#include <stdlib.h> + #include <string.h> + #include <compiz-core.h> + #include "trailfocus_options.h" +diff --git a/src/vidcap/vidcap.c b/src/vidcap/vidcap.c +index 10157b2..a08126d 100644 +--- a/src/vidcap/vidcap.c ++++ b/src/vidcap/vidcap.c +@@ -27,6 +27,7 @@ + + #define _GNU_SOURCE /* For asprintf */ + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <sys/types.h> + #include <sys/stat.h> +diff --git a/src/wallpaper/wallpaper.c b/src/wallpaper/wallpaper.c +index fd23b69..2c47fa7 100644 +--- a/src/wallpaper/wallpaper.c ++++ b/src/wallpaper/wallpaper.c +@@ -23,6 +23,7 @@ + */ + + #include <stdarg.h> ++#include <stdlib.h> + #include <string.h> + #include <math.h> + #include <dirent.h> +diff --git a/src/widget/widget.c b/src/widget/widget.c +index ce7d4f0..6d146fa 100644 +--- a/src/widget/widget.c ++++ b/src/widget/widget.c +@@ -26,6 +26,7 @@ + * + */ + ++#include <stdlib.h> + #include <string.h> + #include <compiz-core.h> + #include <X11/Xatom.h> diff --git a/libraries/dav1d/README b/libraries/dav1d/README deleted file mode 100644 index cf7b07d41c..0000000000 --- a/libraries/dav1d/README +++ /dev/null @@ -1,7 +0,0 @@ -dav1d is an AV1 decoder being developed by the VideoLAN, -with the aim of creating a fast and correct decoder to -overcome the present lack of hardware AV1 decoders. - -This SlackBuild builds the binary decoder dav1d as well -as libraries suitable for use by other applications such -as FFmpeg and VLC. diff --git a/libraries/dav1d/dav1d.SlackBuild b/libraries/dav1d/dav1d.SlackBuild deleted file mode 100644 index 70cced3037..0000000000 --- a/libraries/dav1d/dav1d.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash -# ---------------------------------------------------------------------- -# Slackware build script for dav1d -# -# Copyright (c) 2019-2024 Andrew Strong, Blue Mountains, Australia. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ---------------------------------------------------------------------- - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=dav1d -VERSION=${VERSION:-1.4.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson setup .. \ - --buildtype=release \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --prefix=/usr - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING NEWS *.md doc/PATENTS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/dav1d/dav1d.info b/libraries/dav1d/dav1d.info deleted file mode 100644 index 53196f5a6e..0000000000 --- a/libraries/dav1d/dav1d.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="dav1d" -VERSION="1.4.0" -HOMEPAGE="https://code.videolan.org/videolan/dav1d" -DOWNLOAD="https://code.videolan.org/videolan/dav1d/-/archive/1.4.0/dav1d-1.4.0.tar.gz" -MD5SUM="827aff30accb3de733df9482e19935d4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andrew Strong" -EMAIL="andrew.david.strong@gmail.com" diff --git a/libraries/ell/README b/libraries/ell/README new file mode 100644 index 0000000000..4772d79eb6 --- /dev/null +++ b/libraries/ell/README @@ -0,0 +1,2 @@ +Embedded Linux Library provides core, low-level functionality for +system daemons. diff --git a/python/clint/clint.SlackBuild b/libraries/ell/ell.SlackBuild index cad239c847..c73d685198 100644 --- a/python/clint/clint.SlackBuild +++ b/libraries/ell/ell.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for clint +# Slackware build script for ell -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2024 Thibaut Notteboom, Paris, FRANCE # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=clint -VERSION=${VERSION:-0.5.1} +PRGNAM=ell +VERSION=${VERSION:-0.65} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -59,6 +56,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -79,14 +79,27 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --build=$ARCH-slackware-linux -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +make +make install-strip DESTDIR=$PKG -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la -cp -a *.rst AUTHORS LICENSE NOTICE PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog README TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/ell/ell.info b/libraries/ell/ell.info new file mode 100644 index 0000000000..92c3d61ac5 --- /dev/null +++ b/libraries/ell/ell.info @@ -0,0 +1,10 @@ +PRGNAM="ell" +VERSION="0.65" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git" +DOWNLOAD="https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.65.tar.gz" +MD5SUM="b1480a0d8cf5826e02c60802b602e173" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Thibaut Notteboom" +EMAIL="thibaut.notteboom@gmail.com" diff --git a/libraries/fmt/slack-desc b/libraries/ell/slack-desc index 01b96bb24d..63036d7301 100644 --- a/libraries/fmt/slack-desc +++ b/libraries/ell/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fmt: fmt (A modern formatting library) -fmt: -fmt: {fmt} is an open-source formatting library for C++. It can be used as -fmt: a safe and fast alternative to (s)printf and iostreams. -fmt: -fmt: Homepage: https://fmt.dev/ -fmt: -fmt: -fmt: -fmt: -fmt: +ell: ell (Embedded Linux library) +ell: +ell: Embedded Linux Library provides core, low-level functionality for +ell: system daemons. +ell: +ell: +ell: +ell: +ell: +ell: +ell: diff --git a/libraries/fmt/README b/libraries/fmt/README deleted file mode 100644 index aac25b6316..0000000000 --- a/libraries/fmt/README +++ /dev/null @@ -1,2 +0,0 @@ -{fmt} is an open-source formatting library for C++. It can be used as a -safe and fast alternative to (s)printf and iostreams. diff --git a/libraries/fmt/fmt.info b/libraries/fmt/fmt.info deleted file mode 100644 index 6942c4a773..0000000000 --- a/libraries/fmt/fmt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fmt" -VERSION="10.2.1" -HOMEPAGE="https://fmt.dev" -DOWNLOAD="https://github.com/fmtlib/fmt/archive/10.2.1/fmt-10.2.1.tar.gz" -MD5SUM="dc09168c94f90ea890257995f2c497a5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/folly/0001-Fix-CMakeLists.txt-to-honor-CMAKE_INSTALL_LIBDIR.patch b/libraries/folly/0001-Fix-CMakeLists.txt-to-honor-CMAKE_INSTALL_LIBDIR.patch deleted file mode 100644 index 87c0fa6a25..0000000000 --- a/libraries/folly/0001-Fix-CMakeLists.txt-to-honor-CMAKE_INSTALL_LIBDIR.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 85422b744ae2294d60fdae9074ad8eae53323e66 Mon Sep 17 00:00:00 2001 -From: Ebben Aries <exa@dscp.org> -Date: Thu, 16 Jun 2022 08:18:06 -0700 -Subject: [PATCH] Fix CMakeLists.txt to honor CMAKE_INSTALL_LIBDIR - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 21d24ba6e..8f83f22c4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,11 +52,11 @@ project(${PACKAGE_NAME} CXX C ASM) - - set(INCLUDE_INSTALL_DIR include CACHE STRING - "The subdirectory where header files should be installed") --set(LIB_INSTALL_DIR lib CACHE STRING -+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING - "The subdirectory where libraries should be installed") - set(BIN_INSTALL_DIR bin CACHE STRING - "The subdirectory where binaries should be installed") --set(CMAKE_INSTALL_DIR lib/cmake/folly CACHE STRING -+set(CMAKE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/folly CACHE STRING - "The subdirectory where CMake package config files should be installed") - - option(BUILD_SHARED_LIBS --- -2.36.1 - diff --git a/libraries/folly/README b/libraries/folly/README deleted file mode 100644 index 9dea6f4127..0000000000 --- a/libraries/folly/README +++ /dev/null @@ -1,6 +0,0 @@ -Folly (acronymed loosely after Facebook Open Source Library) is a -library of C++14 components designed with practicality and efficiency in -mind. Folly contains a variety of core library components used -extensively at Facebook. In particular, it's often a dependency of -Facebook's other open source C++ efforts and place where those projects -can share code. diff --git a/libraries/folly/folly.SlackBuild b/libraries/folly/folly.SlackBuild deleted file mode 100644 index 8b4e80784d..0000000000 --- a/libraries/folly/folly.SlackBuild +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/bash - -# Slackware build script for folly - -# Copyright 2022 Ebben Aries <slackbuilds@dscp.org> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=folly -VERSION=${VERSION:-20220722_437b29d} -GITHASH=${GITHASH:-437b29dd062a40c741b2147827025a2f413b76c7} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$GITHASH -mkdir $PRGNAM-$GITHASH -tar xvf $CWD/$PRGNAM-$GITHASH.tar.gz -cd $PRGNAM-$GITHASH -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Fix for CMAKE_INSTALL_LIBDIR -# https://github.com/facebook/folly/pull/1796 -patch -p1 < $CWD/0001-Fix-CMakeLists.txt-to-honor-CMAKE_INSTALL_LIBDIR.patch - -mkdir -p _build -cd _build - cmake \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ - -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ - -DCMAKE_INSTALL_MANDIR=/usr/man \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=ON \ - .. - - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share/ $PKG/usr/doc/$PRGNAM-$VERSION/NEWS -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/folly/folly.info b/libraries/folly/folly.info deleted file mode 100644 index d117806b6c..0000000000 --- a/libraries/folly/folly.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="folly" -VERSION="20220722_437b29d" -HOMEPAGE="https://github.com/facebook/folly" -DOWNLOAD="https://github.com/facebook/folly/archive/437b29d/folly-437b29dd062a40c741b2147827025a2f413b76c7.tar.gz" -MD5SUM="c4ac1fa2f76c8c8291c5abb3643b3741" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="double-conversion glog gflags fmt" -MAINTAINER="Ebben Aries" -EMAIL="slackbuilds@dscp.org" diff --git a/libraries/folly/slack-desc b/libraries/folly/slack-desc deleted file mode 100644 index 51dcacc036..0000000000 --- a/libraries/folly/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -folly: folly (Facebook Open-source Library) -folly: -folly: Folly is a library of C++14 components designed with practicality and -folly: efficiency in mind. It complements (as opposed to competing against) -folly: offerings such as Boost and of course std. -folly: -folly: -folly: -folly: -folly: Homepage: https://github.com/facebook/folly -folly: diff --git a/libraries/gdl/gdl.SlackBuild b/libraries/gdl/gdl.SlackBuild index f59ee628ae..707ad87ecd 100644 --- a/libraries/gdl/gdl.SlackBuild +++ b/libraries/gdl/gdl.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gdl -VERSION=${VERSION:-3.34.0} -BUILD=${BUILD:-3} +VERSION=${VERSION:-3.40.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -83,7 +80,7 @@ find -L . \ # Don't create the __pycache__ directory. export PYTHONDONTWRITEBYTECODE=1 -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/gdl/gdl.info b/libraries/gdl/gdl.info index cadf2359c3..2b7af28d80 100644 --- a/libraries/gdl/gdl.info +++ b/libraries/gdl/gdl.info @@ -1,8 +1,8 @@ PRGNAM="gdl" -VERSION="3.34.0" +VERSION="3.40.0" HOMEPAGE="https://www.gnome.org/" -DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/gdl/3.34/gdl-3.34.0.tar.xz" -MD5SUM="d624f2ca85555402828d5c4a98912b82" +DOWNLOAD="https://download.gnome.org/sources/gdl/3.40/gdl-3.40.0.tar.xz" +MD5SUM="21df1254b49b74a498feb99be57364d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/goffice/goffice.SlackBuild b/libraries/goffice/goffice.SlackBuild index 39282e2f9d..e30e2ed5f1 100644 --- a/libraries/goffice/goffice.SlackBuild +++ b/libraries/goffice/goffice.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for goffice # Copyright (c) 2007 alkos333 <me@alkos333.net> +# Copyright (c) 2023-24 Jim Diamond, Dartmouth, Nova Scotia, Canada # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -31,8 +32,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=goffice -VERSION=${VERSION:-0.10.56} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.10.57} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -57,17 +58,14 @@ if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=$ARCH -mtune=i686" LIBDIRSUFFIX="" CONFIG_ARGS="--without-long-double" - NEED_PATCHES=T elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" CONFIG_ARGS= - NEED_PATCHES=F else SLKCFLAGS="-O2" LIBDIRSUFFIX="" CONFIG_ARGS= - NEED_PATCHES=F fi set -e @@ -79,16 +77,6 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION -if [ "$NEED_PATCHES" = T ] -then - for i in $CWD/patches/* - do - patch -p0 < $i - done - cp $CWD/import-ryu tools/ - chmod 755 tools/import-ryu -fi - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/libraries/goffice/goffice.info b/libraries/goffice/goffice.info index 209e7365ab..7e4d226c69 100644 --- a/libraries/goffice/goffice.info +++ b/libraries/goffice/goffice.info @@ -1,8 +1,8 @@ PRGNAM="goffice" -VERSION="0.10.56" +VERSION="0.10.57" HOMEPAGE="https://download.gnome.org/sources/goffice/" -DOWNLOAD="https://download.gnome.org/sources/goffice/0.10/goffice-0.10.56.tar.xz" -MD5SUM="50555440e0e4ccef4651193e5e0b5f62" +DOWNLOAD="https://download.gnome.org/sources/goffice/0.10/goffice-0.10.57.tar.xz" +MD5SUM="4c55f99d8fafe1f91276cb7538521fdb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/goffice/import-ryu b/libraries/goffice/import-ryu deleted file mode 100644 index e99f022e0b..0000000000 --- a/libraries/goffice/import-ryu +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/perl -w -# ----------------------------------------------------------------------------- - -my $ryu = $ARGV[0]; - -my @files = (# "ryu.h", - "common.h", - "digit_table.h", - "d2s_intrinsics.h", - "d2s_small_table.h", - 'd2s.c', - 'WITH_LONG_DOUBLE', - 'ryu_generic_128.h', - 'generic_128.h', - 'generic_128.c'); - -print "#define RYU_OPTIMIZE_SIZE 1\n\n"; -print "#define bool int\n\n"; -print "#include \"go-ryu.h\"\n"; -print "#include <inttypes.h>\n"; -print "\n"; - -my $with_long_double = 0; - -foreach my $f (@files) { - if ($f eq 'WITH_LONG_DOUBLE') { - $with_long_double = 1; - next; - } - - my $fn = "$ryu/ryu/$f"; - - my $in_conditional = 0; - - print STDERR "Importing $f...\n"; - open my $fh, "<", $fn or die "$0: cannot read $fn:$!\n"; - - print "#ifdef GOFFICE_WITH_LONG_DOUBLE\n" if $with_long_double; - - print "// File $f imported from ryu\n"; - while (<$fh>) { - next if /^\s*#\s*include\s*"ryu.*"/; - - s/\b((float|double|long_double)_to_fd128|generic_binary_to_decimal|generic_to_chars|(d|f)2(s|exp|fixed)(|_buffered_n|_buffered))\b/go_ryu_$1/g; - - if (/\b(go_ryu_d2s_buffered|go_ryu_d2s|go_ryu_f2s_buffered_n|go_ryu_f2s_buffered|go_ryu_f2s|go_ryu_d2fixed_buffered_n|go_ryu_d2fixed_buffered|go_ryu_d2fixed|go_ryu_d2exp_buffered_n|go_ryu_d2exp_buffered|go_ryu_d2exp)\s*\([a-z]+\s.*\)(;|\s*\{)$/) { - print "#if 0\n"; - $_ = "static $_"; - $in_conditional = 1; - } - - if (/\b(go_ryu_long_double_to_fd128|go_ryu_generic_to_chars)\s*\([a-z]+\s.*\)(;|\s*\{)$/) { - $_ = "static $_"; - } - - if (/struct floating_decimal_128 go_ryu_generic_binary_to_decimal\(/) { - $_ = "static $_"; - } - - - if ($f =~ /128/) { - s/\b(pow5bits|pow5Factor|multipleOfPowerOf[25]|log10Pow[25]|copy_special_str|POW5_TABLE_SIZE)\b/$1l/g; - - if (/go_ryu_float_to_fd128\(float/) { - print "#if 0\n"; - $_ = "static $_"; - $in_conditional = 1; - } - - if (/go_ryu_double_to_fd128\(double/) { - print "#if 0\n"; - $_ = "static $_"; - $in_conditional = 1; - } - } - - if ($in_conditional && (/^[a-z].*\);$/ || /^}/)) { - $_ = "$_#endif\n"; - $in_conditional = 0; - } - - print; - } - print "// End of file $f imported from ryu\n"; - print "#endif // GOFFICE_WITH_LONG_DOUBLE\n" if $with_long_double; - print "\n"; - - die "Trouble" if $in_conditional; -} - -print "\n"; -print "#ifdef GOFFICE_WITH_LONG_DOUBLE\n"; -print "int go_ryu_ld2s_buffered_n (long double d, char *dst) {\n"; -print " struct floating_decimal_128 fd128 = go_ryu_long_double_to_fd128(d);\n"; -print " return go_ryu_generic_to_chars(fd128, dst);\n"; -print "}\n"; -print "#endif\n"; diff --git a/libraries/goffice/patches/NEWS.patch b/libraries/goffice/patches/NEWS.patch deleted file mode 100644 index 773bb5a77b..0000000000 --- a/libraries/goffice/patches/NEWS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- NEWS 2023-12-27 18:37:51.129423722 -0400 -+++ NEWS.patched 2023-12-27 18:36:14.000000000 -0400 -@@ -1,3 +1,8 @@ -+goffice 0.10.57: -+ -+ * Excise long double parts of ryu unless --with-long-double. -+ -+-------------------------------------------------------------------------- - goffice 0.10.56: - - B.S.: diff --git a/libraries/goffice/patches/configure.ac.patch b/libraries/goffice/patches/configure.ac.patch deleted file mode 100644 index 1b82b29215..0000000000 --- a/libraries/goffice/patches/configure.ac.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.ac 2023-05-19 22:19:44.000000000 -0300 -+++ configure.ac.fixed 2023-12-27 16:38:43.520064640 -0400 -@@ -560,14 +560,23 @@ - GOFFICE_CHECK_FUNC(acosh) - GOFFICE_CHECK_FUNC(atanh) - -+AC_TYPE_LONG_DOUBLE -+dnl go-ryu needs __uint128_t for long double support. -+AC_CHECK_TYPES([__uint128_t], [], [], [[#include <inttypes.h> -+#include <stdint.h>]]) -+if test $ac_cv_type_long_double.$ac_cv_type___uint128_t = yes.yes; then -+ with_long_double_default=yes -+else -+ with_long_double_default=no -+fi -+ - float_msg=no - AC_ARG_WITH(long-double, - [ --without-long-double disable support for long double], -- , [ with_long_double=yes]) -+ , [ with_long_double=$with_long_double_default]) - - if test "x$with_long_double" = "xyes"; then -- AC_TYPE_LONG_DOUBLE -- if test $ac_cv_type_long_double = yes; then -+ if test $with_long_double_default = yes; then - have_mandatory_funcs=yes - need_sunmath=0 - ss_ccprog=`echo $CC | sed -e 's/ .*//'` diff --git a/libraries/goffice/patches/go-dtoa.c.patch b/libraries/goffice/patches/go-dtoa.c.patch deleted file mode 100644 index 525d2893b8..0000000000 --- a/libraries/goffice/patches/go-dtoa.c.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- goffice/math/go-dtoa.c 2023-05-21 13:08:07.000000000 -0300 -+++ goffice/math/go-dtoa.c.patched 2023-12-27 19:28:35.623167312 -0400 -@@ -464,9 +464,14 @@ - GString const *dec = go_locale_get_decimal(); - - g_string_set_size (dst, 53 + oldlen + dec->len); -- if (is_long) -+ if (is_long) { -+#ifdef GOFFICE_WITH_LONG_DOUBLE - n = go_ryu_ld2s_buffered_n (d, dst->str + oldlen); -- else -+#else -+ g_critical ("Compiled with long-double, then asked to use it"); -+ return; -+#endif -+ } else - n = go_ryu_d2s_buffered_n ((double)d, dst->str + oldlen); - g_string_set_size (dst, oldlen + n); - dpos = strchr (dst->str + oldlen, '.'); diff --git a/libraries/goffice/patches/go-ryu.c.patch b/libraries/goffice/patches/go-ryu.c.patch deleted file mode 100644 index 6d0513c752..0000000000 --- a/libraries/goffice/patches/go-ryu.c.patch +++ /dev/null @@ -1,204 +0,0 @@ ---- goffice/math/go-ryu.c 2023-05-20 20:02:02.000000000 -0300 -+++ goffice/math/go-ryu.c.patched 2023-12-27 19:28:35.623167312 -0400 -@@ -3,55 +3,8 @@ - #define bool int - - #include "go-ryu.h" --// File ryu.h imported from ryu --// Copyright 2018 Ulf Adams --// --// The contents of this file may be used under the terms of the Apache License, --// Version 2.0. --// --// (See accompanying file LICENSE-Apache or copy at --// http://www.apache.org/licenses/LICENSE-2.0) --// --// Alternatively, the contents of this file may be used under the terms of --// the Boost Software License, Version 1.0. --// (See accompanying file LICENSE-Boost or copy at --// https://www.boost.org/LICENSE_1_0.txt) --// --// Unless required by applicable law or agreed to in writing, this software --// is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --// KIND, either express or implied. --#ifndef RYU_H --#define RYU_H -- --#ifdef __cplusplus --extern "C" { --#endif -- - #include <inttypes.h> - --int go_ryu_d2s_buffered_n(double f, char* result); --void go_ryu_d2s_buffered(double f, char* result); --char* go_ryu_d2s(double f); -- --int go_ryu_f2s_buffered_n(float f, char* result); --void go_ryu_f2s_buffered(float f, char* result); --char* go_ryu_f2s(float f); -- --int go_ryu_d2fixed_buffered_n(double d, uint32_t precision, char* result); --void go_ryu_d2fixed_buffered(double d, uint32_t precision, char* result); --char* go_ryu_d2fixed(double d, uint32_t precision); -- --int go_ryu_d2exp_buffered_n(double d, uint32_t precision, char* result); --void go_ryu_d2exp_buffered(double d, uint32_t precision, char* result); --char* go_ryu_d2exp(double d, uint32_t precision); -- --#ifdef __cplusplus --} --#endif -- --#endif // RYU_H --// End of file ryu.h imported from ryu -- - // File common.h imported from ryu - // Copyright 2018 Ulf Adams - // -@@ -1242,20 +1195,25 @@ - return to_chars(v, ieeeSign, result); - } - --void go_ryu_d2s_buffered(double f, char* result) { -+#if 0 -+static void go_ryu_d2s_buffered(double f, char* result) { - const int index = go_ryu_d2s_buffered_n(f, result); - - // Terminate the string. - result[index] = '\0'; - } -+#endif - --char* go_ryu_d2s(double f) { -+#if 0 -+static char* go_ryu_d2s(double f) { - char* const result = (char*) malloc(25); - go_ryu_d2s_buffered(f, result); - return result; - } -+#endif - // End of file d2s.c imported from ryu - -+#ifdef GOFFICE_WITH_LONG_DOUBLE - // File ryu_generic_128.h imported from ryu - // Copyright 2018 Ulf Adams - // -@@ -1303,16 +1261,20 @@ - bool sign; - }; - --struct floating_decimal_128 go_ryu_float_to_fd128(float f); --struct floating_decimal_128 go_ryu_double_to_fd128(double d); -+#if 0 -+static struct floating_decimal_128 go_ryu_float_to_fd128(float f); -+#endif -+#if 0 -+static struct floating_decimal_128 go_ryu_double_to_fd128(double d); -+#endif - - // According to wikipedia (https://en.wikipedia.org/wiki/Long_double), this likely only works on - // x86 with specific compilers (clang?). May need an ifdef. --struct floating_decimal_128 go_ryu_long_double_to_fd128(long double d); -+static struct floating_decimal_128 go_ryu_long_double_to_fd128(long double d); - - // Converts the given binary floating point number to the shortest decimal floating point number - // that still accurately represents it. --struct floating_decimal_128 go_ryu_generic_binary_to_decimal( -+static struct floating_decimal_128 go_ryu_generic_binary_to_decimal( - const __uint128_t bits, const uint32_t mantissaBits, const uint32_t exponentBits, const bool explicitLeadingBit); - - // Converts the given decimal floating point number to a string, writing to result, and returning -@@ -1322,7 +1284,7 @@ - // Maximal char buffer requirement: - // sign + mantissa digits + decimal dot + 'E' + exponent sign + exponent digits - // = 1 + 39 + 1 + 1 + 1 + 10 = 53 --int go_ryu_generic_to_chars(const struct floating_decimal_128 v, char* const result); -+static int go_ryu_generic_to_chars(const struct floating_decimal_128 v, char* const result); - - #ifdef __cplusplus - } -@@ -1330,7 +1292,9 @@ - - #endif // RYU_GENERIC_128_H - // End of file ryu_generic_128.h imported from ryu -+#endif // GOFFICE_WITH_LONG_DOUBLE - -+#ifdef GOFFICE_WITH_LONG_DOUBLE - // File generic_128.h imported from ryu - // Copyright 2018 Ulf Adams - // -@@ -1852,7 +1816,9 @@ - - #endif // RYU_GENERIC128_H - // End of file generic_128.h imported from ryu -+#endif // GOFFICE_WITH_LONG_DOUBLE - -+#ifdef GOFFICE_WITH_LONG_DOUBLE - // File generic_128.c imported from ryu - // Copyright 2018 Ulf Adams - // -@@ -1903,25 +1869,29 @@ - #define FLOAT_MANTISSA_BITS 23 - #define FLOAT_EXPONENT_BITS 8 - --struct floating_decimal_128 go_ryu_float_to_fd128(float f) { -+#if 0 -+static struct floating_decimal_128 go_ryu_float_to_fd128(float f) { - uint32_t bits = 0; - memcpy(&bits, &f, sizeof(float)); - return go_ryu_generic_binary_to_decimal(bits, FLOAT_MANTISSA_BITS, FLOAT_EXPONENT_BITS, false); - } -+#endif - - #define DOUBLE_MANTISSA_BITS 52 - #define DOUBLE_EXPONENT_BITS 11 - --struct floating_decimal_128 go_ryu_double_to_fd128(double d) { -+#if 0 -+static struct floating_decimal_128 go_ryu_double_to_fd128(double d) { - uint64_t bits = 0; - memcpy(&bits, &d, sizeof(double)); - return go_ryu_generic_binary_to_decimal(bits, DOUBLE_MANTISSA_BITS, DOUBLE_EXPONENT_BITS, false); - } -+#endif - - #define LONG_DOUBLE_MANTISSA_BITS 64 - #define LONG_DOUBLE_EXPONENT_BITS 15 - --struct floating_decimal_128 go_ryu_long_double_to_fd128(long double d) { -+static struct floating_decimal_128 go_ryu_long_double_to_fd128(long double d) { - uint128_t bits = 0; - memcpy(&bits, &d, sizeof(long double)); - #ifdef RYU_DEBUG -@@ -1934,7 +1904,7 @@ - return go_ryu_generic_binary_to_decimal(bits, LONG_DOUBLE_MANTISSA_BITS, LONG_DOUBLE_EXPONENT_BITS, true); - } - --struct floating_decimal_128 go_ryu_generic_binary_to_decimal( -+static struct floating_decimal_128 go_ryu_generic_binary_to_decimal( - const uint128_t bits, const uint32_t mantissaBits, const uint32_t exponentBits, const bool explicitLeadingBit) { - #ifdef RYU_DEBUG - printf("IN="); -@@ -2147,7 +2117,7 @@ - return fd.sign + 8; - } - --int go_ryu_generic_to_chars(const struct floating_decimal_128 v, char* const result) { -+static int go_ryu_generic_to_chars(const struct floating_decimal_128 v, char* const result) { - if (v.exponent == FD128_EXCEPTIONAL_EXPONENT) { - return copy_special_strl(result, v); - } -@@ -2200,9 +2170,12 @@ - return index; - } - // End of file generic_128.c imported from ryu -+#endif // GOFFICE_WITH_LONG_DOUBLE - - -+#ifdef GOFFICE_WITH_LONG_DOUBLE - int go_ryu_ld2s_buffered_n (long double d, char *dst) { - struct floating_decimal_128 fd128 = go_ryu_long_double_to_fd128(d); - return go_ryu_generic_to_chars(fd128, dst); - } -+#endif diff --git a/libraries/goffice/patches/go-ryu.h.patch b/libraries/goffice/patches/go-ryu.h.patch deleted file mode 100644 index 623da14e36..0000000000 --- a/libraries/goffice/patches/go-ryu.h.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- goffice/math/go-ryu.h 2023-05-20 19:48:32.000000000 -0300 -+++ goffice/math/go-ryu.h.patched 2023-12-27 19:28:35.623167312 -0400 -@@ -9,7 +9,9 @@ - /* ------------------------------------------------------------------------- */ - - int go_ryu_d2s_buffered_n (double d, char *dst); -+#ifdef GOFFICE_WITH_LONG_DOUBLE - int go_ryu_ld2s_buffered_n (long double d, char *dst); -+#endif - - /* ------------------------------------------------------------------------- */ - diff --git a/libraries/googlebenchmark/googlebenchmark.SlackBuild b/libraries/googlebenchmark/googlebenchmark.SlackBuild index fdfa6c16b8..c80d6f04bf 100644 --- a/libraries/googlebenchmark/googlebenchmark.SlackBuild +++ b/libraries/googlebenchmark/googlebenchmark.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=googlebenchmark -VERSION=${VERSION:-1.8.0} +VERSION=${VERSION:-1.8.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -93,6 +93,7 @@ cd build -DBENCHMARK_ENABLE_GTEST_TESTS=OFF \ -DBENCHMARK_ENABLE_LTO=ON \ -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF \ + -DBUILD_SHARED_LIBS=ON \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/libraries/googlebenchmark/googlebenchmark.info b/libraries/googlebenchmark/googlebenchmark.info index 5802cdb767..3c66565db8 100644 --- a/libraries/googlebenchmark/googlebenchmark.info +++ b/libraries/googlebenchmark/googlebenchmark.info @@ -1,8 +1,8 @@ PRGNAM="googlebenchmark" -VERSION="1.8.0" +VERSION="1.8.3" HOMEPAGE="https://github.com/google/benchmark/" -DOWNLOAD="https://github.com/google/benchmark/archive/v1.8.0/benchmark-1.8.0.tar.gz" -MD5SUM="8ddf8571d3f6198d37852bcbd964f817" +DOWNLOAD="https://github.com/google/benchmark/archive/v1.8.3/benchmark-1.8.3.tar.gz" +MD5SUM="7b93dd03670665684f1b2e9b70ad17fe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtest gflags" diff --git a/libraries/grpc/grpc.SlackBuild b/libraries/grpc/grpc.SlackBuild index a8b5061c8e..981e72a85d 100644 --- a/libraries/grpc/grpc.SlackBuild +++ b/libraries/grpc/grpc.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=grpc -VERSION=${VERSION:-1.62.1} +VERSION=${VERSION:-1.63.0} OPENCENSUS_VERSION=${OPENCENSUS_VERSION:-0.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -103,14 +103,11 @@ cmake -Bbuild \ -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DgRPC_BUILD_TESTS=OFF \ -DgRPC_BUILD_CODEGEN=ON \ - -DgRPC_BUILD_CSHARP_EXT=ON \ - -DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF \ -DgRPC_ZLIB_PROVIDER='package' \ -DgRPC_CARES_PROVIDER='package' \ -DgRPC_RE2_PROVIDER='package' \ -DgRPC_SSL_PROVIDER='package' \ -DgRPC_PROTOBUF_PROVIDER='package' \ - -DgRPC_PROTOBUF_PACKAGE_TYPE='MODULE' \ -DgRPC_BENCHMARK_PROVIDER:STRING='package' \ -DgRPC_ABSL_PROVIDER:STRING='package' \ -DgRPC_USE_PROTO_LITE=OFF \ diff --git a/libraries/grpc/grpc.info b/libraries/grpc/grpc.info index a987421e33..a5342238d1 100644 --- a/libraries/grpc/grpc.info +++ b/libraries/grpc/grpc.info @@ -1,9 +1,9 @@ PRGNAM="grpc" -VERSION="1.62.1" +VERSION="1.63.0" HOMEPAGE="https://grpc.io/" -DOWNLOAD="https://github.com/grpc/grpc/archive/v1.62.1/grpc-1.62.1.tar.gz \ +DOWNLOAD="https://github.com/grpc/grpc/archive/v1.63.0/grpc-1.63.0.tar.gz \ https://github.com/census-instrumentation/opencensus-proto/archive/v0.3.0/opencensus-proto-0.3.0.tar.gz" -MD5SUM="e1d5a5152303a7edb48bdf5f60a22c04 \ +MD5SUM="a7a4cd8ce187c4a49d9498b3fcd148b2 \ 0b208800a68548cbf2d4bff763c050a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/libraries/gtk-session-lock/README b/libraries/gtk-session-lock/README new file mode 100644 index 0000000000..b4c374bded --- /dev/null +++ b/libraries/gtk-session-lock/README @@ -0,0 +1,5 @@ +gtk-session-lock (Wayland GTK3 session-lock protocol) + +This is a library to use GTK 3 to build screen lockers using the +secure ext-session-lock-v1 protocol. This Library is compatible with +C, C++ and any language that supports GObject introspection files. diff --git a/python/chump/chump.SlackBuild b/libraries/gtk-session-lock/gtk-session-lock.SlackBuild index 3edc737715..055cbc3ca1 100644 --- a/python/chump/chump.SlackBuild +++ b/libraries/gtk-session-lock/gtk-session-lock.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for chump +# Slackware build script for gtk-session-lock -# Copyright 2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2024 Jay Lanagan (j@lngn.net), Detroit, MI, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=chump -VERSION=${VERSION:-1.5.2} +PRGNAM=gtk-session-lock +VERSION=${VERSION:-0.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -59,6 +56,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -70,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -79,18 +79,29 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG - -# Python 3 support. -if $(python3 -c 'import sys' 2>/dev/null); then - python3 setup.py install --root=$PKG -fi +mkdir -p meson-build +cd meson-build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson setup .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc + +"${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst HISTORY.rst LICENSE PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md LICENSE_* compatibility.md README.md release_process.md \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/gtk-session-lock/gtk-session-lock.info b/libraries/gtk-session-lock/gtk-session-lock.info new file mode 100644 index 0000000000..bf058b8350 --- /dev/null +++ b/libraries/gtk-session-lock/gtk-session-lock.info @@ -0,0 +1,10 @@ +PRGNAM="gtk-session-lock" +VERSION="0.2.0" +HOMEPAGE="http://github.com/Cu3PO42/gtk-session-lock/" +DOWNLOAD="https://github.com/Cu3PO42/gtk-session-lock/archive/v0.2.0/gtk-session-lock-0.2.0.tar.gz" +MD5SUM="6c9efb18c461ce91ac05d2e5a7b861e3" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Jay Lanagan" +EMAIL="j@lngn.net" diff --git a/libraries/gtk-session-lock/slack-desc b/libraries/gtk-session-lock/slack-desc new file mode 100644 index 0000000000..6e60b55455 --- /dev/null +++ b/libraries/gtk-session-lock/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +gtk-session-lock: gtk-session-lock (Wayland GTK3 session-lock protocol) +gtk-session-lock: +gtk-session-lock: This is a library to use GTK 3 to build screen lockers using the +gtk-session-lock: secure ext-session-lock-v1 protocol. This Library is compatible with +gtk-session-lock: C, C++ and any language that supports GObject introspection files. +gtk-session-lock: +gtk-session-lock: Homepage: https://github.com/Cu3PO42/gtk-session-lock +gtk-session-lock: +gtk-session-lock: +gtk-session-lock: +gtk-session-lock: diff --git a/libraries/gtkspell3/README b/libraries/gtkspell3/README deleted file mode 100644 index 74961fdb71..0000000000 --- a/libraries/gtkspell3/README +++ /dev/null @@ -1,7 +0,0 @@ -GtkSpell provides word-processor-style highlighting and replacement -of misspelled words in a GtkTextView widget. - -Right-clicking a misspelled word pops up a menu of suggested -replacements. - -This package can co-exist with Slackware's gtkspell package diff --git a/libraries/gtkspell3/gtkspell3.info b/libraries/gtkspell3/gtkspell3.info deleted file mode 100644 index 842d35954a..0000000000 --- a/libraries/gtkspell3/gtkspell3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gtkspell3" -VERSION="3.0.10" -HOMEPAGE="http://gtkspell.sourceforge.net/" -DOWNLOAD="https://sourceforge.net/projects/gtkspell/files/3.0.10/gtkspell3-3.0.10.tar.xz" -MD5SUM="34ece0c8cd0f68e6e125624ec0953cba" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/libraries/gtkspell3/slack-desc b/libraries/gtkspell3/slack-desc deleted file mode 100644 index e6fd83f10c..0000000000 --- a/libraries/gtkspell3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gtkspell3: gtkspell3 (GTK3 spell checker interface library) -gtkspell3: -gtkspell3: GtkSpell provides word-processor-style highlighting and replacement -gtkspell3: of misspelled words in a GtkTextView widget. -gtkspell3: Right-clicking a misspelled word pops up a menu of suggested -gtkspell3: replacements. -gtkspell3: -gtkspell3: -gtkspell3: -gtkspell3: Homepage: http://gtkspell.sourceforge.net/ -gtkspell3: diff --git a/libraries/html5lib/README b/libraries/html5lib/README deleted file mode 100644 index 7e57438059..0000000000 --- a/libraries/html5lib/README +++ /dev/null @@ -1,5 +0,0 @@ -html5lib is a pure-python library for parsing HTML. It is designed to -conform to the WHATWG HTML specification, as is implemented by all -major web browsers. - -Optional dependencies: genshi and lxml diff --git a/libraries/html5lib/html5lib.info b/libraries/html5lib/html5lib.info deleted file mode 100644 index 2640ea6836..0000000000 --- a/libraries/html5lib/html5lib.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="html5lib" -VERSION="1.1" -HOMEPAGE="https://github.com/html5lib/html5lib-python" -DOWNLOAD="https://files.pythonhosted.org/packages/ac/b6/b55c3f49042f1df3dcd422b7f224f939892ee94f22abcf503a9b7339eaf2/html5lib-1.1.tar.gz" -MD5SUM="6748742e2ec4cb99287a6bc82bcfe2b0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-webencodings" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/html5lib/slack-desc b/libraries/html5lib/slack-desc deleted file mode 100644 index e4a55d3a1d..0000000000 --- a/libraries/html5lib/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -html5lib: html5lib (HTML parser based on the HTML5 specification) -html5lib: -html5lib: Standards-compliant library for parsing and serializing HTML documents -html5lib: and fragments in Python -html5lib: -html5lib: Homepage: https://github.com/html5lib/html5lib-python -html5lib: -html5lib: -html5lib: -html5lib: -html5lib: diff --git a/libraries/htslib/htslib.SlackBuild b/libraries/htslib/htslib.SlackBuild index b27ea38502..d88f89c846 100644 --- a/libraries/htslib/htslib.SlackBuild +++ b/libraries/htslib/htslib.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=htslib -VERSION=${VERSION:-1.19.1} +VERSION=${VERSION:-1.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/htslib/htslib.info b/libraries/htslib/htslib.info index dd142db7c4..fb49fe4935 100644 --- a/libraries/htslib/htslib.info +++ b/libraries/htslib/htslib.info @@ -1,8 +1,8 @@ PRGNAM="htslib" -VERSION="1.19.1" +VERSION="1.20" HOMEPAGE="http://www.htslib.org" -DOWNLOAD="https://github.com/samtools/htslib/releases/download/1.19.1/htslib-1.19.1.tar.bz2" -MD5SUM="f9b2f75e1e9ec6cc5c1e204d56fbee9e" +DOWNLOAD="https://github.com/samtools/htslib/releases/download/1.20/htslib-1.20.tar.bz2" +MD5SUM="127cbea4e9a8c084fb09c3fd24bd825d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/iniparser/README b/libraries/iniparser/README deleted file mode 100644 index f9cd696418..0000000000 --- a/libraries/iniparser/README +++ /dev/null @@ -1,6 +0,0 @@ -Iniparser is a free stand-alone INI file parsing library. -It is written in portable ANSI C and should compile anywhere. - -WARNING: -This package will overwrite Samba's libiniparser.so -If you remove this package, don't forget to reinstall samba diff --git a/libraries/iniparser/iniparser.SlackBuild b/libraries/iniparser/iniparser.SlackBuild deleted file mode 100644 index 83ffb96692..0000000000 --- a/libraries/iniparser/iniparser.SlackBuild +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -# Slackware build script for Iniparser - -# Copyright 2017, Steven King <kingrst@gmail.com> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20220418 bkw: Modified by SlackBuilds.org, BUILD=2: -# - actually use SLKCFLAGS. -# - remove the static library. -# - fix the shared library so it actually works. -# - install the shared lib stripped. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=iniparser -VERSION=${VERSION:-4.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar vxf $CWD/${PRGNAM}-${VERSION}.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -# 20220418 bkw: previous version of this script tried to fix the -rpath -# info in the shared library, but was broken. this works: -sed -i "s,/usr/lib,/usr/lib$LIBDIRSUFFIX," Makefile - -# 20220418 bkw: SLKCFLAGS weren't being used. -CFLAGS="$SLKCFLAGS" \ -CXFLAGS="$SLKCFLAGS" \ -make V=1 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} -mkdir -p $PKG/usr/include - -cp -ar AUTHORS LICENSE README.md html $PKG/usr/doc/$PRGNAM-$VERSION - -install -s -m0755 libiniparser.so.0 $PKG/usr/lib${LIBDIRSUFFIX} - -# 20220418 bkw: create the symlink gcc uses to link with this. -# previously, anything (such as cava) which linked with -# -liniparser was actually using the static library. -ln -s lib${PRGNAM}.so.0 $PKG/usr/lib$LIBDIRSUFFIX/lib${PRGNAM}.so - -cp -a ./src/dictionary.h ./src/iniparser.h $PKG/usr/include - -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/iniparser/iniparser.info b/libraries/iniparser/iniparser.info deleted file mode 100644 index de282c9c58..0000000000 --- a/libraries/iniparser/iniparser.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="iniparser" -VERSION="4.0" -HOMEPAGE="https://github.com/ndevilla/iniparser" -DOWNLOAD="https://github.com/ndevilla/iniparser/archive/v4.0/iniparser-4.0.tar.gz" -MD5SUM="94c7278f8d22de1a31320219b27634b0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Steven King" -EMAIL="kingrst@gmail.com" diff --git a/libraries/iniparser/slack-desc b/libraries/iniparser/slack-desc deleted file mode 100644 index c410aaa786..0000000000 --- a/libraries/iniparser/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -iniparser: iniparser (A free stand-alone INI file parsing library) -iniparser: -iniparser: It is written in portable ANSI C and should compile anywhere. -iniparser: Iniparser is distributed under an MIT license. -iniparser: -iniparser: Homepage: http://ndevilla.free.fr/iniparser -iniparser: -iniparser: -iniparser: -iniparser: -iniparser: diff --git a/libraries/keybinder/keybinder.SlackBuild b/libraries/keybinder/keybinder.SlackBuild index a0c586771d..4f4c77de0e 100644 --- a/libraries/keybinder/keybinder.SlackBuild +++ b/libraries/keybinder/keybinder.SlackBuild @@ -91,6 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --disable-python \ + --disable-lua \ --build=$ARCH-slackware-linux make diff --git a/libraries/libass/README b/libraries/libass/README deleted file mode 100644 index 5aef4001d0..0000000000 --- a/libraries/libass/README +++ /dev/null @@ -1,5 +0,0 @@ -libass is a portable subtitle renderer for the ASS/SSA (Advanced -Substation Alpha/Substation Alpha) subtitle format. It is mostly -compatible with VSFilter. - -enca is an optional dependency. diff --git a/libraries/libass/libass.info b/libraries/libass/libass.info deleted file mode 100644 index 34d42d17e8..0000000000 --- a/libraries/libass/libass.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libass" -VERSION="0.17.1" -HOMEPAGE="https://github.com/libass/libass" -DOWNLOAD="https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz" -MD5SUM="73f00a898161be424e05d4bee1962dbb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libass/slack-desc b/libraries/libass/slack-desc deleted file mode 100644 index d64a3d90f2..0000000000 --- a/libraries/libass/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libass: libass (Subtitle renderer for the ASS/SSA) -libass: -libass: libass is a portable subtitle renderer for the ASS/SSA (Advanced -libass: Substation Alpha/Substation Alpha) subtitle format. It is mostly -libass: compatible with VSFilter. -libass: -libass: Homepage: http://code.google.com/p/libass/ -libass: -libass: -libass: -libass: diff --git a/libraries/libbass/libbass.info b/libraries/libbass/libbass.info index 6079096f0c..63193d59d0 100644 --- a/libraries/libbass/libbass.info +++ b/libraries/libbass/libbass.info @@ -2,7 +2,7 @@ PRGNAM="libbass" VERSION="2.4.17" HOMEPAGE="https://www.un4seen.com" DOWNLOAD="http://www.un4seen.com/files/bass24-linux.zip" -MD5SUM="a9ea0bca8e1da1d3759cc0d0dc7e6bbe" +MD5SUM="91b04cdc2f29c79ff9f6108b8aa33486" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libbassmidi/libbassmidi.info b/libraries/libbassmidi/libbassmidi.info index 3e186a9f19..cde021b54d 100644 --- a/libraries/libbassmidi/libbassmidi.info +++ b/libraries/libbassmidi/libbassmidi.info @@ -1,7 +1,7 @@ PRGNAM="libbassmidi" VERSION="2.4.14.1" HOMEPAGE="https://www.un4seen.com" -DOWNLOAD="http://www.un4seen.com/files/bassmidi24-linux.zip" +DOWNLOAD="https://slackware.uk/sbosrcarch/by-md5/4/9/4985968621722888acbb639de9cffd06/bassmidi24-linux.zip" MD5SUM="4985968621722888acbb639de9cffd06" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/libraries/libbpg/README b/libraries/libbpg/README index d5aa204430..31f6a26015 100644 --- a/libraries/libbpg/README +++ b/libraries/libbpg/README @@ -5,12 +5,12 @@ browsers with small javascript decoder.It is based on the subset of HEVC Open Video Compression Standard. An HTML demonstration is available -in /usr/doc/libbpg-0e2aadb_20180428/html/index.html +in /usr/doc/libbpg-0.9.8/html/index.html you can access it by using the Falkon web browser or using chrome with --allow-file-access-from-files option The BPG file format is specified in -/usr/doc/libbpg-0e2aadb_20180428/doc/bpg_spec.txt. +/usr/doc/libbpg-0.9.8/doc/bpg_spec.txt. This is an optional dependency for VLC media player. It is supported only on 64-bit platforms only. diff --git a/libraries/libbpg/libbpg.SlackBuild b/libraries/libbpg/libbpg.SlackBuild index 7278baacc7..9b33550520 100644 --- a/libraries/libbpg/libbpg.SlackBuild +++ b/libraries/libbpg/libbpg.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libbpg -# Copyright 2022 Vijay Marcel +# Copyright 2022-2024 Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libbpg -VERSION=${VERSION:-0e2aadb_20180428} +VERSION=${VERSION:-0.9.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -COMMIT=${COMMIT:-0e2aadbe40fd8b962440caa51a52c558ccdbc791} + if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -39,9 +39,6 @@ case "$( uname -m )" in esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -52,13 +49,13 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -72,8 +69,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz -cd $PRGNAM-$COMMIT +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -87,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \ sed -i 's/$(CMAKE_OPTS)/$(CMAKE_OPTS) -DENABLE_LIBNUMA=OFF/' "Makefile" sed -i 's/^CFLAGS+=-I.$/CFLAGS+=-I. -fPIC/' "Makefile" -make USE_JCTVC=y USE_JCTVC_HIGH_BIT_DEPTH=y USE_X265=y USE_BPGVIEW=y prefix=/usr +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make USE_JCTVC=y USE_JCTVC_HIGH_BIT_DEPTH=y USE_X265=y USE_BPGVIEW=y prefix=/usr install -Dm755 bpgdec "$PKG/usr/bin/bpgdec" install -Dm755 bpgenc "$PKG/usr/bin/bpgenc" diff --git a/libraries/libbpg/libbpg.info b/libraries/libbpg/libbpg.info index 5846e2e9d9..d9c8f9dd74 100644 --- a/libraries/libbpg/libbpg.info +++ b/libraries/libbpg/libbpg.info @@ -1,10 +1,10 @@ PRGNAM="libbpg" -VERSION="0e2aadb_20180428" -HOMEPAGE="http://bellard.org/bpg/" +VERSION="0.9.8" +HOMEPAGE="https://bellard.org/bpg/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/mirrorer/libbpg/archive/0e2aadb/libbpg-0e2aadbe40fd8b962440caa51a52c558ccdbc791.tar.gz" -MD5SUM_x86_64="e1c94ee36488fb989a3b1a2f79821f4b" +DOWNLOAD_x86_64="https://bellard.org/bpg/libbpg-0.9.8.tar.gz" +MD5SUM_x86_64="1c8258bc6de26bbae7c688944a2023ac" REQUIRES="" MAINTAINER="Vijay Marcel" EMAIL="vijaymarcel@outlook.com" diff --git a/libraries/libcpuid/libcpuid.SlackBuild b/libraries/libcpuid/libcpuid.SlackBuild index 46c85264ab..f5aed0b7fe 100644 --- a/libraries/libcpuid/libcpuid.SlackBuild +++ b/libraries/libcpuid/libcpuid.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libcpuid -VERSION=${VERSION:-0.6.4} +VERSION=${VERSION:-0.6.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libcpuid/libcpuid.info b/libraries/libcpuid/libcpuid.info index 55a61967b6..0ce6795494 100644 --- a/libraries/libcpuid/libcpuid.info +++ b/libraries/libcpuid/libcpuid.info @@ -1,8 +1,8 @@ PRGNAM="libcpuid" -VERSION="0.6.4" +VERSION="0.6.5" HOMEPAGE="http://libcpuid.sourceforge.net" -DOWNLOAD="https://github.com/anrieff/libcpuid/archive/v0.6.4/libcpuid-0.6.4.tar.gz" -MD5SUM="dad029ee90ed683ee07bf83a2b32304d" +DOWNLOAD="https://github.com/anrieff/libcpuid/archive/v0.6.5/libcpuid-0.6.5.tar.gz" +MD5SUM="034584d695e8df67d544c571c98c9467" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libcuefile/libcuefile.SlackBuild b/libraries/libcuefile/libcuefile.SlackBuild index eded3fa9d8..43aa6f7a45 100644 --- a/libraries/libcuefile/libcuefile.SlackBuild +++ b/libraries/libcuefile/libcuefile.SlackBuild @@ -65,7 +65,7 @@ echo 'INSTALL(FILES ${libcuefile_SOURCE_DIR}/include/cuetools/cuefile.h ${libcue cmake \ -G "Unix Makefiles" \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -fpermissive" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/libraries/libdispatch/libdispatch.SlackBuild b/libraries/libdispatch/libdispatch.SlackBuild index a856400a2b..a23f419f99 100644 --- a/libraries/libdispatch/libdispatch.SlackBuild +++ b/libraries/libdispatch/libdispatch.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libdispatch -VERSION=${VERSION:-5.3} +VERSION=${VERSION:-5.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libdispatch/libdispatch.info b/libraries/libdispatch/libdispatch.info index 093ad12ad4..ef5494940b 100644 --- a/libraries/libdispatch/libdispatch.info +++ b/libraries/libdispatch/libdispatch.info @@ -1,8 +1,8 @@ PRGNAM="libdispatch" -VERSION="5.3" +VERSION="5.5" HOMEPAGE="https://apple.github.io/swift-corelibs-libdispatch/" -DOWNLOAD="https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3-RELEASE/swift-corelibs-libdispatch-swift-5.3-RELEASE.tar.gz" -MD5SUM="6ab94f19f3b29fe1970fd8471109f184" +DOWNLOAD="https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.5-RELEASE/swift-corelibs-libdispatch-swift-5.5-RELEASE.tar.gz" +MD5SUM="865c9d5225e29cbeebb903faa5e29a2c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libdisplay-info/libdisplay-info.SlackBuild b/libraries/libdisplay-info/libdisplay-info.SlackBuild index e348754dbb..ca0192e2bc 100644 --- a/libraries/libdisplay-info/libdisplay-info.SlackBuild +++ b/libraries/libdisplay-info/libdisplay-info.SlackBuild @@ -66,7 +66,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . diff --git a/libraries/libev/README b/libraries/libev/README deleted file mode 100644 index f7826e9dd5..0000000000 --- a/libraries/libev/README +++ /dev/null @@ -1,12 +0,0 @@ -libev (a high-performance event loop/model) - -Libev is modelled (very loosely) after libevent and the Event perl -module, but is faster, scales better and is more correct, and also -more featureful. And also smaller. Yay. - -Note: libev and libevent both have a usr/include/event.h -header file. This could have lead to compile problems if both -packages were installed at the same time, so it has been moved to -usr/include/libev/event.h. Add CPPFLAGS="-I/usr/include/libev" to -the SlackBuild if the software you're building over this needs the -libevent compatibility layer (lighttpd2 and i3 don't). diff --git a/libraries/libev/libev.SlackBuild b/libraries/libev/libev.SlackBuild deleted file mode 100644 index 0baf104e88..0000000000 --- a/libraries/libev/libev.SlackBuild +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -# Slackware build script for libev - -# Written by Šime Ramov <s@ramov.com> -# Maintained (2012-2020) by Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy - -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libev -VERSION=${VERSION:-4.33} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Force CFLAGS -sed -i "s|-g -O3|$SLKCFLAGS|" configure || exit 1 - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --enable-static=no \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -# avoid conflicting with libevent, we move an header in a subfolder -# and we will explicitly add CPPFLAGS="-I/usr/include/libev" when -# building software depending on this, if needed: lighttpd2 and i3, -# for example, don't need this header. -mkdir -p $PKG/usr/include/libev -mv $PKG/usr/include/event.h $PKG/usr/include/libev/ - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README LICENSE Changes $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libev/libev.info b/libraries/libev/libev.info deleted file mode 100644 index a603f1c17c..0000000000 --- a/libraries/libev/libev.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libev" -VERSION="4.33" -HOMEPAGE="http://software.schmorp.de/pkg/libev.html" -DOWNLOAD="http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz" -MD5SUM="a3433f23583167081bf4acdd5b01b34f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libev/slack-desc b/libraries/libev/slack-desc deleted file mode 100644 index 67d4ce48e7..0000000000 --- a/libraries/libev/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libev: libev (a high-performance event loop/model) -libev: -libev: Libev is modelled (very loosely) after libevent and the Event perl -libev: module, but is faster, scales better and is more correct, and also -libev: more featureful. And also smaller. Yay. -libev: -libev: Website: <http://software.schmorp.de/pkg/libev.html> -libev: -libev: -libev: -libev: diff --git a/libraries/libfabric/changelog b/libraries/libfabric/changelog index 0e7e63095c..936fd485a4 100644 --- a/libraries/libfabric/changelog +++ b/libraries/libfabric/changelog @@ -18,3 +18,7 @@ on x86_64 platform only. 19/02/2024: Updated to version 1.20.1 + +23/04/2024: + +Updated to version 1.21.0 diff --git a/libraries/libfabric/libfabric.SlackBuild b/libraries/libfabric/libfabric.SlackBuild index 196598c58a..6043fa3371 100644 --- a/libraries/libfabric/libfabric.SlackBuild +++ b/libraries/libfabric/libfabric.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libfabric -VERSION=${VERSION:-1.20.1} +VERSION=${VERSION:-1.21.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,6 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-shared \ --with-valgrind \ + --disable-static \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux diff --git a/libraries/libfabric/libfabric.info b/libraries/libfabric/libfabric.info index 8462d1dc4e..e8b5d73c79 100644 --- a/libraries/libfabric/libfabric.info +++ b/libraries/libfabric/libfabric.info @@ -1,10 +1,10 @@ PRGNAM="libfabric" -VERSION="1.20.1" +VERSION="1.21.0" HOMEPAGE="https://libfabric.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/ofiwg/libfabric/archive/v1.20.1/libfabric-1.20.1.tar.gz" -MD5SUM_x86_64="1d94cdfea3bcbac8cd9fc49496c48af4" +DOWNLOAD_x86_64="https://github.com/ofiwg/libfabric/archive/v1.21.0/libfabric-1.21.0.tar.gz" +MD5SUM_x86_64="43e7a7e473a9afc7b5af88fe56f06d17" REQUIRES="numactl rdma-core valgrind" MAINTAINER="Vijay Marcel" EMAIL="vijaymarcel@outlook.com" diff --git a/libraries/libfaketime/libfaketime.SlackBuild b/libraries/libfaketime/libfaketime.SlackBuild index 70ce838f4a..1b335e33aa 100644 --- a/libraries/libfaketime/libfaketime.SlackBuild +++ b/libraries/libfaketime/libfaketime.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libfaketime -# Copyright 2016-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com> +# Copyright 2016-2024 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libfaketime -VERSION=${VERSION:-0.9.9} +VERSION=${VERSION:-0.9.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libfaketime/libfaketime.info b/libraries/libfaketime/libfaketime.info index 6b7bed9c56..f1b7ff542f 100644 --- a/libraries/libfaketime/libfaketime.info +++ b/libraries/libfaketime/libfaketime.info @@ -1,8 +1,8 @@ PRGNAM="libfaketime" -VERSION="0.9.9" +VERSION="0.9.10" HOMEPAGE="https://github.com/wolfcw/libfaketime" -DOWNLOAD="https://github.com/wolfcw/libfaketime/archive/v0.9.9/libfaketime-0.9.9.tar.gz" -MD5SUM="1f784c9c0ec7807b9d1107d1730dbb41" +DOWNLOAD="https://github.com/wolfcw/libfaketime/archive/v0.9.10/libfaketime-0.9.10.tar.gz" +MD5SUM="bbeaa43f514fc8e637e5efdac53e2671" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libfm-extra/libfm-extra.SlackBuild b/libraries/libfm-extra/libfm-extra.SlackBuild index 482e5e6806..b480d20381 100644 --- a/libraries/libfm-extra/libfm-extra.SlackBuild +++ b/libraries/libfm-extra/libfm-extra.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libfm-extra -# Copyright 2014-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2014-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libfm-extra SRCNAM=libfm -VERSION=${VERSION:-1.3.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20230916_5346a53} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -80,6 +77,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +./autogen.sh || true + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libfm-extra/libfm-extra.info b/libraries/libfm-extra/libfm-extra.info index 1ca4ae995d..e0fb17706b 100644 --- a/libraries/libfm-extra/libfm-extra.info +++ b/libraries/libfm-extra/libfm-extra.info @@ -1,8 +1,8 @@ PRGNAM="libfm-extra" -VERSION="1.3.2" +VERSION="20230916_5346a53" HOMEPAGE="https://wiki.lxde.org/en/Libfm" -DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.2.tar.xz" -MD5SUM="c87a0ff41ae77825079b2f785ec0741e" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/libfm-20230916_5346a53.tar.xz" +MD5SUM="9c32dde43dda170979358eea298ba10e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libfm/README b/libraries/libfm/README index 4b3684e8a7..d8dc092950 100644 --- a/libraries/libfm/README +++ b/libraries/libfm/README @@ -3,9 +3,9 @@ giving a convenient higher-level API. You can choose which version of gtk the library will build against: - GTK=2 link with gtk+2 (default) - GTK=3 link with gtk+3 - GTK=0 don't link against gtk at all + GTK3=yes link with gtk+3 (default) + GTK3=no link with gtk+2 + GTK3=- don't link against gtk at all Pass the script the parameter you prefer, like - GTK=3 ./libfm.SlackBuild + GTK3=no ./libfm.SlackBuild diff --git a/libraries/libfm/gcc14.patch b/libraries/libfm/gcc14.patch new file mode 100644 index 0000000000..c04fd53cc0 --- /dev/null +++ b/libraries/libfm/gcc14.patch @@ -0,0 +1,55 @@ +From ec6a21263d150aea918826941a80f335b45470a8 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Fri, 1 Mar 2024 14:19:46 +0900 +Subject: [PATCH] FIX: support gcc14 -Werror=incompatible-pointer-types + +gcc14 now defaults to -Werror=incompatible-pointer-types . +To support this, cast GTK related objects for assignment +properly. + +Fixes #100 . +--- + src/gtk/exo/exo-icon-view.c | 2 +- + src/gtk/fm-dnd-dest.c | 2 +- + src/gtk/fm-standard-view.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/gtk/exo/exo-icon-view.c b/src/gtk/exo/exo-icon-view.c +index 3ce98099..79e1c7ab 100644 +--- a/src/gtk/exo/exo-icon-view.c ++++ b/src/gtk/exo/exo-icon-view.c +@@ -2819,7 +2819,7 @@ exo_icon_view_key_press_event (GtkWidget *widget, + /* allocate a new event to forward */ + new_event = gdk_event_copy ((GdkEvent *) event); + g_object_unref (G_OBJECT (new_event->key.window)); +- new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry))); ++ new_event->key.window = GDK_WINDOW(g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)))); + + /* send the event to the search entry. If the "preedit-changed" signal is + * emitted during this event, priv->search_imcontext_changed will be set. +diff --git a/src/gtk/fm-dnd-dest.c b/src/gtk/fm-dnd-dest.c +index 95d310d3..ce752758 100644 +--- a/src/gtk/fm-dnd-dest.c ++++ b/src/gtk/fm-dnd-dest.c +@@ -458,7 +458,7 @@ static GdkDragAction _ask_action_on_drop(GtkWidget *widget, + gtk_action_set_sensitive(act, FALSE); + } + } +- ri.menu = g_object_ref(gtk_ui_manager_get_widget(ui, "/popup")); ++ ri.menu = GTK_MENU(g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"))); + g_signal_connect(ri.menu, "selection-done", G_CALLBACK(gtk_widget_destroy), NULL); + unmap_handler = g_signal_connect(ri.menu, "unmap", + G_CALLBACK(run_unmap_handler), &ri); +diff --git a/src/gtk/fm-standard-view.c b/src/gtk/fm-standard-view.c +index e0ff5a06..df920254 100644 +--- a/src/gtk/fm-standard-view.c ++++ b/src/gtk/fm-standard-view.c +@@ -637,7 +637,7 @@ static inline void create_icon_view(FmStandardView* fv, GList* sels) + "text", FM_FOLDER_MODEL_COL_NAME ); + if(fv->renderer_text) + g_object_unref(fv->renderer_text); +- fv->renderer_text = g_object_ref_sink(render); ++ fv->renderer_text = FM_CELL_RENDERER_TEXT(g_object_ref_sink(render)); + exo_icon_view_set_search_column((ExoIconView*)fv->view, FM_FOLDER_MODEL_COL_NAME); + g_signal_connect(fv->view, "item-activated", G_CALLBACK(on_icon_view_item_activated), fv); + g_signal_connect(fv->view, "selection-changed", G_CALLBACK(on_sel_changed), fv); diff --git a/libraries/libfm/libfm.SlackBuild b/libraries/libfm/libfm.SlackBuild index 0be4336787..1cd6e3da53 100644 --- a/libraries/libfm/libfm.SlackBuild +++ b/libraries/libfm/libfm.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libfm # Copyright 2010 Chris Abela <chris.abela@maltats.com> -# Copyright 2013-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libfm -VERSION=${VERSION:-1.3.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20230916_5346a53} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -65,13 +62,10 @@ else LIBDIRSUFFIX="" fi -# Enable custom actions if we have vala available -if [ -h /usr/bin/vapigen ]; then actions=""; else actions="--disable-actions"; fi - -case "$GTK" in - 3) gtk="--with-gtk=3 --enable-gtk-doc" ;; - 0) gtk="--without-gtk" ;; - *) gtk="--with-gtk=2 --enable-gtk-doc" ;; +case "${GTK3:-yes}" in + "no") gtk="--with-gtk=2 --enable-gtk-doc" ;; + "-") gtk="--without-gtk" ;; + *) gtk="--with-gtk=3 --enable-gtk-doc" ;; esac set -e @@ -89,6 +83,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/gcc14.patch + NOCONFIGURE=1 sh autogen.sh || true CFLAGS="$SLKCFLAGS" \ @@ -102,7 +98,6 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-static=no \ --enable-udisks \ $gtk \ - $actions \ --build=$ARCH-slackware-linux make @@ -117,8 +112,10 @@ make install-strip DESTDIR=$PKG cd $PKG/usr/lib$LIBDIRSUFFIX rm -f libfm-extra.so* pkgconfig/libfm-extra.pc libfm-extra.la ) -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +if [ -d $PKG/usr/man ]; then + find $PKG/usr/man -type f -exec gzip -9 {} \; + for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +fi # add handlers for terminal and archiver from LXDE components to the default config sed -i -e 's|\[ui\]|terminal=lxterminal -e %s\narchiver=file-roller %s\n\n[ui]|' \ diff --git a/libraries/libfm/libfm.info b/libraries/libfm/libfm.info index 33d95cb239..54af9b127a 100644 --- a/libraries/libfm/libfm.info +++ b/libraries/libfm/libfm.info @@ -1,8 +1,8 @@ PRGNAM="libfm" -VERSION="1.3.2" +VERSION="20230916_5346a53" HOMEPAGE="https://wiki.lxde.org/en/Libfm" -DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.2.tar.xz" -MD5SUM="c87a0ff41ae77825079b2f785ec0741e" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/libfm-20230916_5346a53.tar.xz" +MD5SUM="9c32dde43dda170979358eea298ba10e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lxmenu-data menu-cache" diff --git a/libraries/libgedit-amtk/libgedit-amtk.info b/libraries/libgedit-amtk/libgedit-amtk.info index 99a97cb69a..265aca261e 100644 --- a/libraries/libgedit-amtk/libgedit-amtk.info +++ b/libraries/libgedit-amtk/libgedit-amtk.info @@ -6,5 +6,5 @@ MD5SUM="1b2ad96c189dd1749b6526c6026e0618" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Juan M. Lasca" -EMAIL="juanmlasca@gmail.com" +MAINTAINER="Bob Funk" +EMAIL="bobfunk11@gmail.com" diff --git a/libraries/libgedit-gtksourceview/libgedit-gtksourceview.info b/libraries/libgedit-gtksourceview/libgedit-gtksourceview.info index b6d1f2684c..a853fff6fb 100644 --- a/libraries/libgedit-gtksourceview/libgedit-gtksourceview.info +++ b/libraries/libgedit-gtksourceview/libgedit-gtksourceview.info @@ -6,5 +6,5 @@ MD5SUM="2f20bcc19e72a370021d4144019af770" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Juan M. Lasca" -EMAIL="juanmlasca@gmail.com" +MAINTAINER="Bob Funk" +EMAIL="bobfunk11@gmail.com" diff --git a/libraries/libglpng/libglpng.SlackBuild b/libraries/libglpng/libglpng.SlackBuild index 80bd940a77..1a458d45d2 100644 --- a/libraries/libglpng/libglpng.SlackBuild +++ b/libraries/libglpng/libglpng.SlackBuild @@ -82,7 +82,7 @@ find -L . \ patch -p1 < $CWD/libglpng-1.45-extra_cflags.patch patch -p1 < $CWD/libglpng-1.45-libpng15.patch -make EXTRA_CFLAGS="$SLKCFLAGS" +make EXTRA_CFLAGS="$SLKCFLAGS -fpermissive" make install DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG/usr # The Makefile doesn't make this easy :/ diff --git a/libraries/libgusb/libgusb.SlackBuild b/libraries/libgusb/libgusb.SlackBuild index 5154f86a00..519a936acf 100644 --- a/libraries/libgusb/libgusb.SlackBuild +++ b/libraries/libgusb/libgusb.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libgusb -# Copyright 2016-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2016-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libgusb -VERSION=${VERSION:-0.4.8} +VERSION=${VERSION:-0.4.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libgusb/libgusb.info b/libraries/libgusb/libgusb.info index 8404cdd1c9..23dba9393a 100644 --- a/libraries/libgusb/libgusb.info +++ b/libraries/libgusb/libgusb.info @@ -1,8 +1,8 @@ PRGNAM="libgusb" -VERSION="0.4.8" +VERSION="0.4.9" HOMEPAGE="https://github.com/hughsie/libgusb" -DOWNLOAD="https://github.com/hughsie/libgusb/releases/download/0.4.8/libgusb-0.4.8.tar.xz" -MD5SUM="edc0715ded0b886c063189deef94c754" +DOWNLOAD="https://github.com/hughsie/libgusb/releases/download/0.4.9/libgusb-0.4.9.tar.xz" +MD5SUM="354a3227334991ea4e924843c144bd82" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libhandy/README b/libraries/libhandy/README deleted file mode 100644 index b2c80e4661..0000000000 --- a/libraries/libhandy/README +++ /dev/null @@ -1,4 +0,0 @@ -libhandy (additional UI components for gtk+3) - -The aim of the Handy library is to help with developing UI for mobile -devices using GTK/GNOME. diff --git a/libraries/libhandy/libhandy.SlackBuild b/libraries/libhandy/libhandy.SlackBuild deleted file mode 100644 index e2139e6658..0000000000 --- a/libraries/libhandy/libhandy.SlackBuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Slackware build script for libhandy - -# Written by B. Watson (urchlay@slackware.uk) - -# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libhandy -VERSION=${VERSION:-1.5.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -Dgtk_doc=true \ - -Dstrip=true - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING NEWS *.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libhandy/libhandy.info b/libraries/libhandy/libhandy.info deleted file mode 100644 index 600448b7b2..0000000000 --- a/libraries/libhandy/libhandy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libhandy" -VERSION="1.5.0" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/" -DOWNLOAD="https://download.gnome.org/sources/libhandy/1.5/libhandy-1.5.0.tar.xz" -MD5SUM="fbc76c75a03494adacf2b90bf536bf0f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/libraries/libheif/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch b/libraries/libheif/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch new file mode 100644 index 0000000000..e3f337419f --- /dev/null +++ b/libraries/libheif/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch @@ -0,0 +1,22 @@ +From a911b26a902c5f89fee2dc20ac4dfaafcb8144ec Mon Sep 17 00:00:00 2001 +From: Andrey Semashev <Lastique@users.noreply.github.com> +Date: Fri, 15 Mar 2024 17:46:48 +0300 +Subject: [PATCH] Fix compilation with libsvtav1 2.0.0. + +--- + libheif/plugins/encoder_svt.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libheif/plugins/encoder_svt.cc b/libheif/plugins/encoder_svt.cc +index 4597d7b8fc..1ff3bce2d5 100644 +--- a/libheif/plugins/encoder_svt.cc ++++ b/libheif/plugins/encoder_svt.cc +@@ -646,7 +646,7 @@ struct heif_error svt_encode_image(void* encoder_raw, const struct heif_image* i + + if (nclx) { + svt_config.color_description_present_flag = true; +-#if SVT_AV1_VERSION_MAJOR == 1 ++#if SVT_AV1_VERSION_MAJOR >= 1 + svt_config.color_primaries = static_cast<EbColorPrimaries>(nclx->color_primaries); + svt_config.transfer_characteristics = static_cast<EbTransferCharacteristics>(nclx->transfer_characteristics); + svt_config.matrix_coefficients = static_cast<EbMatrixCoefficients>(nclx->matrix_coefficients); diff --git a/libraries/libheif/libheif.SlackBuild b/libraries/libheif/libheif.SlackBuild index 48456dfbac..b961a74b1e 100644 --- a/libraries/libheif/libheif.SlackBuild +++ b/libraries/libheif/libheif.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libheif VERSION=${VERSION:-1.17.6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,6 +76,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch + mkdir -p build cd build cmake \ diff --git a/libraries/libindi/README b/libraries/libindi/README deleted file mode 100644 index c04391240f..0000000000 --- a/libraries/libindi/README +++ /dev/null @@ -1,16 +0,0 @@ -INDI is a distributed control protocol designed to operate -astronomical instrumentation. INDI is small, flexible, easy to parse, -and scalable. It supports common DCS functions such as remote -control, data acquisition, monitoring, and a lot more. - -This script builds the library that KDE KStars and similar programs -can use for image capture in astrophotography, telescope control, etc. - -rtl-sdr is optional to enable Realtek RTL2832 DVB dongle as a SDR -receiver (available on SBo). There may be additional optional -dependencies. - -Supported hardware devices: http://indilib.org/devices/ -You will need libindi-drivers (also on SBo) to fully utilize some -third party hardware. Refer to indi-{libraries,drivers} on SBo for -optional hardware requirements and dependencies. diff --git a/libraries/libindi/doinst.sh b/libraries/libindi/doinst.sh deleted file mode 100644 index 47e1cb12cb..0000000000 --- a/libraries/libindi/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /sbin/udevadm ]; then - /sbin/udevadm control --reload-rules >/dev/null 2>&1 && /sbin/udevadm trigger >/dev/null 2>&1 -fi diff --git a/libraries/libindi/libindi.SlackBuild b/libraries/libindi/libindi.SlackBuild deleted file mode 100644 index dd927245cb..0000000000 --- a/libraries/libindi/libindi.SlackBuild +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -# Slackware build script for libindi - -# Copyright 2018, 2022 Edward W. Koenig, Vancouver, WA, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libindi -VERSION=${VERSION:-2.0.6} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -SRCNAM=indi - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -export LDFLAGS="-lbz2" -mkdir -p build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DINCLUDE_INSTALL_DIR=/usr/include \ - -DUDEVRULES_INSTALL_DIR=/lib/udev/rules.d \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING.* INSTALL LICENSE README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libindi/libindi.info b/libraries/libindi/libindi.info deleted file mode 100644 index 3ae80bc03a..0000000000 --- a/libraries/libindi/libindi.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libindi" -VERSION="2.0.6" -HOMEPAGE="https://www.indilib.org/" -DOWNLOAD="https://github.com/indilib/indi/archive/v2.0.6/indi-2.0.6.tar.gz" -MD5SUM="7ecc7c944743089ad9da35b0602de589" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libnova libev" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@linuxgalaxy.org" diff --git a/libraries/libindi/slack-desc b/libraries/libindi/slack-desc deleted file mode 100644 index c8394dc76e..0000000000 --- a/libraries/libindi/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libindi: libindi (Instrument Neutral Distributed Interface) -libindi: -libindi: INDI is a distributed control protocol designed to operate -libindi: astronomical instrumentation. INDI is small, flexible, easy to parse, -libindi: and scalable. It supports common DCS functions such as remote control, -libindi: data acquisition, monitoring, and a lot more. -libindi: -libindi: https://www.indilib.org/ -libindi: -libindi: -libindi: diff --git a/libraries/libiptcdata/libiptcdata.SlackBuild b/libraries/libiptcdata/libiptcdata.SlackBuild index 25f622f8e5..349f8d4966 100644 --- a/libraries/libiptcdata/libiptcdata.SlackBuild +++ b/libraries/libiptcdata/libiptcdata.SlackBuild @@ -32,8 +32,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libiptcdata -VERSION=${VERSION:-1.0.4} -BUILD=${BUILD:-4} +VERSION=${VERSION:-1.0.5} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libiptcdata/libiptcdata.info b/libraries/libiptcdata/libiptcdata.info index 1059a4dc96..c8fb736c21 100644 --- a/libraries/libiptcdata/libiptcdata.info +++ b/libraries/libiptcdata/libiptcdata.info @@ -1,8 +1,8 @@ PRGNAM="libiptcdata" -VERSION="1.0.4" +VERSION="1.0.5" HOMEPAGE="http://libiptcdata.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/libiptcdata/libiptcdata-1.0.4.tar.gz" -MD5SUM="af886556ecb129b694f2d365d03d95a8" +DOWNLOAD="https://github.com/ianw/libiptcdata/releases/download/release_1_0_5/libiptcdata-1.0.5.tar.gz" +MD5SUM="c04bc1375c280d41c0106255d1df711a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libliftoff/libliftoff.SlackBuild b/libraries/libliftoff/libliftoff.SlackBuild index a27bf71e70..a4d25ff895 100644 --- a/libraries/libliftoff/libliftoff.SlackBuild +++ b/libraries/libliftoff/libliftoff.SlackBuild @@ -67,9 +67,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-v$VERSION-$COMMIT -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz -cd $PRGNAM-v$VERSION-$COMMIT +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/libraries/libliftoff/libliftoff.info b/libraries/libliftoff/libliftoff.info index 4f240361bd..126a9a6352 100644 --- a/libraries/libliftoff/libliftoff.info +++ b/libraries/libliftoff/libliftoff.info @@ -1,7 +1,7 @@ PRGNAM="libliftoff" VERSION="0.4.1" HOMEPAGE="https://gitlab.freedesktop.org/emersion/libliftoff" -DOWNLOAD="https://gitlab.freedesktop.org/emersion/libliftoff/-/archive/v0.4.1/libliftoff-0.4.1.tar.gz" +DOWNLOAD="https://gitlab.freedesktop.org/emersion/libliftoff/-/releases/v0.4.1/downloads/libliftoff-0.4.1.tar.gz" MD5SUM="5c5ef466a63cf7e00822341e424d7412" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/libraries/libnova/README b/libraries/libnova/README deleted file mode 100644 index de58ecb423..0000000000 --- a/libraries/libnova/README +++ /dev/null @@ -1,7 +0,0 @@ -libnova is a general purpose, double precision, celestial mechanics, -astrometry, and astrodynamics library. It is the calculation engine -used by the Nova project. - -The intended audience of libnova are C / C++ programmers, astronomers -and anyone else interested in calculating positions of astronomical -objects or celestial mechanics. diff --git a/libraries/libnova/libnova.SlackBuild b/libraries/libnova/libnova.SlackBuild deleted file mode 100644 index 0dcecdbb40..0000000000 --- a/libraries/libnova/libnova.SlackBuild +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/bash - -# Slackware build script for libnova - -# Copyright 2013 Chris Abela -# Copyright 2014 Ryan P.C. McQuen <ryanpcmcquen at member dot fsf dot org> -# Copyright 2017 Philip Lacroix <slackph at posteo dot de> -# -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libnova -VERSION=${VERSION:-0.15.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -autoreconf -vif - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make -C doc doc -make install DESTDIR=$PKG -rm -rf examples/.{deps,libs} - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -cp -a doc/man $PKG/usr/man -rm -f $PKG/usr/man/man3/_tmp*.3 -rm -f $PKG/usr/man/man3/version.3 # This conflicts with the Slackware perl package -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README doc/html examples \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libnova/libnova.info b/libraries/libnova/libnova.info deleted file mode 100644 index 5268ed8a90..0000000000 --- a/libraries/libnova/libnova.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libnova" -VERSION="0.15.0" -HOMEPAGE="http://libnova.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/libnova/libnova-0.15.0.tar.gz" -MD5SUM="756fdb55745cb78511f83a62c25f3be4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Philip Lacroix" -EMAIL="slackph at posteo dot de" diff --git a/libraries/libnova/slack-desc b/libraries/libnova/slack-desc deleted file mode 100644 index ea5d1c0b89..0000000000 --- a/libraries/libnova/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libnova: libnova (celestial mechanics, astrometry and astrodynamics library) -libnova: -libnova: libnova is a general purpose, double precision, celestial mechanics, -libnova: astrometry, and astrodynamics library. It is the calculation engine -libnova: used by the Nova project. -libnova: -libnova: The intended audience of libnova are C / C++ programmers, astronomers -libnova: and anyone else interested in calculating positions of astronomical -libnova: objects or celestial mechanics. -libnova: -libnova: Homepage: http://libnova.sourceforge.net/ diff --git a/libraries/libosinfo/libosinfo.SlackBuild b/libraries/libosinfo/libosinfo.SlackBuild index 6617cc6a61..554d88da22 100644 --- a/libraries/libosinfo/libosinfo.SlackBuild +++ b/libraries/libosinfo/libosinfo.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libosinfo -# Copyright 2014-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2014-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libosinfo -VERSION=${VERSION:-1.10.0} +VERSION=${VERSION:-1.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libosinfo/libosinfo.info b/libraries/libosinfo/libosinfo.info index 95389ddec1..7cc6274254 100644 --- a/libraries/libosinfo/libosinfo.info +++ b/libraries/libosinfo/libosinfo.info @@ -1,8 +1,8 @@ PRGNAM="libosinfo" -VERSION="1.10.0" +VERSION="1.11.0" HOMEPAGE="http://libosinfo.org" -DOWNLOAD="https://releases.pagure.org/libosinfo/libosinfo-1.10.0.tar.xz" -MD5SUM="9c2059648bf6f5610ba838a1fb1a84ad" +DOWNLOAD="https://releases.pagure.org/libosinfo/libosinfo-1.11.0.tar.xz" +MD5SUM="e7e586c0dd61aa73deff7fbe86473d64" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="osinfo-db" diff --git a/libraries/libpst/libpst.SlackBuild b/libraries/libpst/libpst.SlackBuild index f02b91fcd1..65c4e55007 100644 --- a/libraries/libpst/libpst.SlackBuild +++ b/libraries/libpst/libpst.SlackBuild @@ -99,58 +99,26 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -buildit() { - autoreconf -if - - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --enable-dii \ - --disable-static \ - --enable-libpst-shared \ - --enable-python \ - --build=$ARCH-slackware-linux - - make - # ./configure options --docdir and --htmldir have no effect, - # it is necessary to override "htmldir" and "htmldeveldir" - make install-strip DESTDIR=$PKG \ - htmldir=/usr/doc/$PRGNAM-$VERSION \ - htmldeveldir=/usr/doc/$PRGNAM-$VERSION/devel -} - -# 20211019 bkw: python3 builds work now. Include support for both -# python versions, 2 and 3. Unfortunately this means building the -# entire project twice (keeping only the python2 stuff from the -# first build). autotools doesn't make it easy or even necessarily -# possible to build only part of a project :( - -# Python 2 build. If python2 ever really does go away, this code will -# silently omit python2 support from the package. -if type -p python2 &>/dev/null; then - PY2VER="$( python2 --version 2>&1 | cut -d' ' -f2 | cut -d. -f1,2 )" - - # ./configure --help claims that I can set PYTHON_VERSION in the environment - # and it'll use that, but it doesn't work. So I have to use this abomination: - sed -i.bak 's,\<python3\..\>,python'$PY2VER',g' m4/ax_python.m4 - - buildit - - mv $PKG/usr/lib$LIBDIRSUFFIX/python$PY2VER $PKG/.keep.python2 - rm -rf $PKG/* - - # put everything back the way it was. - make distclean - mv m4/ax_python.m4.bak m4/ax_python.m4 -fi - -# Python 3 build -buildit -[ -e $PKG/.keep.python2 ] && \ - mv $PKG/.keep.python2 $PKG/usr/lib$LIBDIRSUFFIX/python$PY2VER +autoreconf -if + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --enable-dii \ + --disable-static \ + --enable-libpst-shared \ + --enable-python \ + --build=$ARCH-slackware-linux + +make +# ./configure options --docdir and --htmldir have no effect, +# it is necessary to override "htmldir" and "htmldeveldir" +make install-strip DESTDIR=$PKG \ + htmldir=/usr/doc/$PRGNAM-$VERSION \ + htmldeveldir=/usr/doc/$PRGNAM-$VERSION/devel gzip -9 $PKG/usr/man/man?/*.? diff --git a/libraries/libqtpas/changelog b/libraries/libqtpas/changelog index 156ad52fa6..24df36ea70 100644 --- a/libraries/libqtpas/changelog +++ b/libraries/libqtpas/changelog @@ -24,3 +24,7 @@ Bumped the build no. Upgraded to version 2.9 corresponding to the lazarus version 2.2.6-0 in SBo. + +26/04/2024: + +Update to use lazarus version 3.2-0 diff --git a/libraries/libqtpas/libqtpas.SlackBuild b/libraries/libqtpas/libqtpas.SlackBuild index ee0160a08a..b42fadb75f 100644 --- a/libraries/libqtpas/libqtpas.SlackBuild +++ b/libraries/libqtpas/libqtpas.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} SRCNAM=${SRCNAM:-lazarus} -SRCVER=${SRCVER:-3.0} +SRCVER=${SRCVER:-3.2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -61,7 +61,7 @@ elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="$PREPROCESS -march=i686 -mtune=i686 -O2 -fPIC $HARDENING" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="$PREPROCESS -march=x86-64 -mtune=native -O2 -fPIC $HARDENING" + SLKCFLAGS="$PREPROCESS -march=x86-64 -mtune=generic -O2 -fPIC $HARDENING" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/libraries/libqtpas/libqtpas.info b/libraries/libqtpas/libqtpas.info index 6e36b91df9..ec0dc8139a 100644 --- a/libraries/libqtpas/libqtpas.info +++ b/libraries/libqtpas/libqtpas.info @@ -1,8 +1,8 @@ PRGNAM="libqtpas" VERSION="2.15" HOMEPAGE="http://www.lazarus.freepascal.org/" -DOWNLOAD="http://downloads.sourceforge.net/lazarus/lazarus-3.0-0.tar.gz" -MD5SUM="d4130b835451e3a61df3a9d9603e8063" +DOWNLOAD="http://downloads.sourceforge.net/lazarus/lazarus-3.2-0.tar.gz" +MD5SUM="75b871d4d19d08570d2f282b0d8fed0e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg2.patch b/libraries/libquicktime/libquicktime-1.2.4-ffmpeg2.patch deleted file mode 100644 index 7add44220a..0000000000 --- a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg2.patch +++ /dev/null @@ -1,98 +0,0 @@ -Extracted from upstream CVS. -https://bugs.gentoo.org/show_bug.cgi?id=476498 - -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -45,6 +45,11 @@ - #define ENCODE_AUDIO 1 - #endif - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+/* from libavcodec/avcodec.h dated Dec 23 2012 */ -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#endif -+ - /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ - - /* MPEG Audio header parsing code */ -Index: libquicktime-1.2.4/plugins/ffmpeg/params.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c -+++ libquicktime-1.2.4/plugins/ffmpeg/params.c -@@ -101,6 +101,17 @@ typedef struct - } \ - } - -+#define PARAM_DICT_INT(name, dict_name) \ -+ { \ -+ if(!strcasecmp(name, key)) \ -+ { \ -+ char buf[128]; \ -+ snprintf(buf, sizeof(buf), "%d", *(int*)value); \ -+ av_dict_set(options, dict_name, buf, 0); \ -+ found = 1; \ -+ } \ -+ } -+ - #define PARAM_DICT_FLAG(name, dict_name) \ - { \ - if(!strcasecmp(name, key)) \ -@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_max_b_frames",max_b_frames); - PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); - PARAM_INT("ff_b_frame_strategy",b_frame_strategy); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold"); -+ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold"); -+#else - PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); - PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); -+#endif -+ - PARAM_INT("ff_strict_std_compliance",strict_std_compliance); - PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); - PARAM_INT("ff_rc_min_rate",rc_min_rate); -@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_QP2LAMBDA("ff_lmax", lmax); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_inter_threshold","inter_threshold"); -+ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping"); -+#else - PARAM_INT("ff_inter_threshold",inter_threshold); - PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); -+#endif -+ - PARAM_INT("ff_thread_count",thread_count); - PARAM_INT("ff_me_threshold",me_threshold); - PARAM_INT("ff_mb_threshold",mb_threshold); -@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); - PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); - // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd"); -+ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); -+ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); -+#else - PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); - PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); -+ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); -+#endif - - #if LIBAVCODEC_VERSION_MAJOR >= 54 - PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); -@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); - PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); - PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); -- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); - PARAM_ENUM("ff_coder_type",coder_type,coder_type); - - } diff --git a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch b/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch deleted file mode 100644 index eb196ea16a..0000000000 --- a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch +++ /dev/null @@ -1,342 +0,0 @@ -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t - - #if DECODE_AUDIO3 || DECODE_AUDIO4 - codec->pkt.data = codec->chunk_buffer; -- codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE; - - #if DECODE_AUDIO4 - frame_bytes = avcodec_decode_audio4(codec->avctx, &f, -@@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t - (codec->sample_buffer_end - codec->sample_buffer_start)], - &bytes_decoded, - codec->chunk_buffer, -- packet_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ packet_size + AV_INPUT_BUFFER_PADDING_SIZE); - if(frame_bytes < 0) - { - lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error"); -@@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi - return 0; - } - -- if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE) -+ if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE) - { -- codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE; - codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc); - } - memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0, -- mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); -+ mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); - num_samples = mph.samples_per_frame; - codec->bytes_in_chunk_buffer = mph.frame_bytes; - } -@@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi - { - - -- /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size -+ /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size - because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */ - - /* Some really broken mp3 files have the header bytes split across 2 chunks */ -@@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi - - #if DECODE_AUDIO3 || DECODE_AUDIO4 - codec->pkt.data = &codec->chunk_buffer[bytes_used]; -- codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE; - - #if DECODE_AUDIO4 - -@@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi - (codec->sample_buffer_end - codec->sample_buffer_start)], - &bytes_decoded, - &codec->chunk_buffer[bytes_used], -- codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); -+ codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); - #endif - if(frame_bytes < 0) - { -@@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi - } - } - -- /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ -+ /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ - - if(codec->bytes_in_chunk_buffer < 0) - codec->bytes_in_chunk_buffer = 0; -Index: libquicktime-1.2.4/plugins/ffmpeg/params.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c -+++ libquicktime-1.2.4/plugins/ffmpeg/params.c -@@ -124,16 +124,6 @@ typedef struct - } - - --enum_t me_method[] = -- { -- { "Zero", ME_ZERO }, -- { "Phods", ME_PHODS }, -- { "Log", ME_LOG }, -- { "X1", ME_X1 }, -- { "Epzs", ME_EPZS }, -- { "Full", ME_FULL } -- }; -- - enum_t prediction_method[] = - { - { "Left", FF_PRED_LEFT }, -@@ -163,15 +153,6 @@ enum_t mb_decision[] = - { "Rate distoration", FF_MB_DECISION_RD } - }; - --enum_t coder_type[] = -- { -- { "VLC", FF_CODER_TYPE_VLC }, -- { "Arithmetic", FF_CODER_TYPE_AC }, -- { "Raw", FF_CODER_TYPE_RAW }, -- { "RLE", FF_CODER_TYPE_RLE }, -- { "Deflate", FF_CODER_TYPE_DEFLATE }, -- }; -- - #define PARAM_ENUM(name, var, arr) \ - if(!strcasecmp(key, name)) \ - { \ -@@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000); - PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000); - PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000); -- PARAM_ENUM("ff_me_method",me_method,me_method); -+ PARAM_DICT_INT("ff_me_method","motion-est"); - PARAM_INT("ff_gop_size",gop_size); - PARAM_FLOAT("ff_qcompress",qcompress); - PARAM_FLOAT("ff_qblur",qblur); -@@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_rc_min_rate",rc_min_rate); - PARAM_INT("ff_rc_max_rate",rc_max_rate); - PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000); -- PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity); - PARAM_FLOAT("ff_i_quant_factor",i_quant_factor); - PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset); -- PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx); -+ PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx"); - PARAM_FLOAT("ff_lumi_masking",lumi_masking); - PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking); - PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking); -@@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_me_range",me_range); - PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision); - PARAM_INT("ff_scenechange_threshold",scenechange_threshold); -- PARAM_QP2LAMBDA("ff_lmin", lmin); -- PARAM_QP2LAMBDA("ff_lmax", lmax); -+ PARAM_DICT_INT("ff_lmin", "lmin"); -+ PARAM_DICT_INT("ff_lmax", "lmax"); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); - -@@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - #endif - - PARAM_INT("ff_thread_count",thread_count); -- PARAM_INT("ff_me_threshold",me_threshold); -- PARAM_INT("ff_mb_threshold",mb_threshold); - PARAM_INT("ff_nsse_weight",nsse_weight); -- PARAM_FLOAT("ff_border_masking",border_masking); -+ PARAM_DICT_INT("ff_border_masking","border_mask"); - PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin); - PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax); - PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation); - PARAM_INT("ff_bidir_refine",bidir_refine); - PARAM_INT("ff_brd_scale",brd_scale); -- PARAM_INT("ff_scenechange_factor",scenechange_factor); -- PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE); -- PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV); -- PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL); -- PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC); -- PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0); -+ PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE); -+ PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV); -+ PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL); -+ PARAM_DICT_FLAG("ff_flag_gmc","gmc"); -+ PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags"); - // PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused -- PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY); -- PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE); -- PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP); -+ PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY); -+ PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq"); - // PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT); - #else - PARAM_INT("ff_trellis",trellis); - #endif -- PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); -- PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); -+ PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT); -+ PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED); - // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused - - #if LIBAVCODEC_VERSION_MAJOR >= 55 -@@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); - PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); - #else -- PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); -- PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); -- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); -+ PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD); -+ PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD); -+ PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP); - #endif - - #if LIBAVCODEC_VERSION_MAJOR >= 54 -@@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_DICT_FLAG("ff_flag_obmc","obmc"); - PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices"); - #else -- PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV); -- PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC); -- PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT); -+ PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV); -+ PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC); -+ PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT); - #endif - -- PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); -- PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); -- PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); -- PARAM_ENUM("ff_coder_type",coder_type,coder_type); -+ PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER); -+ PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP); -+ PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST); -+ PARAM_DICT_INT("ff_coder_type","coder"); - - } -Index: libquicktime-1.2.4/plugins/ffmpeg/params.h -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h -+++ libquicktime-1.2.4/plugins/ffmpeg/params.h -@@ -149,7 +149,7 @@ the reference. Unused for constant quant - .type = LQT_PARAMETER_INT, \ - .val_default = { .val_int = 0 }, \ - .val_min = { .val_int = 0 }, \ -- .val_max = { .val_int = FF_MAX_B_FRAMES }, \ -+ .val_max = { .val_int = 16 }, \ - .help_string = TRS("Maximum number of B-frames between non B-frames") \ - } - -Index: libquicktime-1.2.4/plugins/ffmpeg/video.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick - if(extradata) - { - codec->extradata = -- calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); - memcpy(codec->extradata, extradata, extradata_size); - codec->avctx->extradata_size = extradata_size; - codec->avctx->extradata = codec->extradata; -@@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t - codec->avctx->qmin = 1; - codec->avctx->qmax = 3; - codec->avctx->rtp_payload_size = 1; // ?? -- codec->avctx->rc_buffer_aggressivity = 0.25; -- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY; -+ av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0); -+ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY; - - #if (LIBAVCODEC_VERSION_MAJOR < 54) - codec->avctx->flags2 |= CODEC_FLAG2_INTRA_VLC|CODEC_FLAG2_NON_LINEAR_QUANT; -@@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick - // codec->avctx->time_base.den = 1; - // codec->avctx->time_base.num = lqt_video_time_scale(file, track); - -- if(codec->avctx->flags & CODEC_FLAG_QSCALE) -+ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) - codec->avctx->global_quality = codec->qscale; - - codec->avctx->width = width; -@@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - codec->write_global_header = 1; - } - -@@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick - { - lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding"); - codec->avctx->flags |= -- (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN); -+ (AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME|AV_CODEC_FLAG_ALT_SCAN); - } - #endif - } -@@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - codec->write_global_header = 1; - } - } -@@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) - { -- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT; -+ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT; - } - } - else if(codec->is_imx) -@@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick - if(codec->pass == 1) - { - codec->stats_file = fopen(codec->stats_filename, "w"); -- codec->avctx->flags |= CODEC_FLAG_PASS1; -+ codec->avctx->flags |= AV_CODEC_FLAG_PASS1; - } - else if(codec->pass == codec->total_passes) - { -@@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick - fclose(codec->stats_file); - codec->stats_file = (FILE*)0; - -- codec->avctx->flags |= CODEC_FLAG_PASS2; -+ codec->avctx->flags |= AV_CODEC_FLAG_PASS2; - } - } - /* Open codec */ -@@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick - } - - codec->frame->pts = vtrack->timestamp; -- if(codec->avctx->flags & CODEC_FLAG_QSCALE) -+ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) - codec->frame->quality = codec->qscale; - #ifdef DO_INTERLACE - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) -@@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick - else if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - int advanced = 0; -- if(codec->avctx->max_b_frames || -- (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC))) -+ if(codec->avctx->max_b_frames) - advanced = 1; - - setup_header_mpeg4(file, track, codec->avctx->extradata, diff --git a/libraries/libquicktime/libquicktime-ffmpeg3.patch b/libraries/libquicktime/libquicktime-ffmpeg3.patch deleted file mode 100644 index f5784e8229..0000000000 --- a/libraries/libquicktime/libquicktime-ffmpeg3.patch +++ /dev/null @@ -1,935 +0,0 @@ -Index: libquicktime-1.2.4/plugins/ffmpeg/video.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -37,10 +37,10 @@ - #endif - - --#ifdef PIX_FMT_YUV422P10 --#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10 -+#ifdef AV_PIX_FMT_YUV422P10 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10 - #else --#define PIX_FMT_YUV422P10_OR_DUMMY -1234 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234 - #endif - - #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0) -@@ -90,9 +90,9 @@ typedef struct - int imx_bitrate; - int imx_strip_vbi; - -- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while -- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */ -- enum PixelFormat reinterpret_pix_fmt; -+ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while -+ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */ -+ enum AVPixelFormat reinterpret_pix_fmt; - - int is_imx; - int y_offset; -@@ -137,42 +137,42 @@ typedef struct - - static const struct - { -- enum PixelFormat ffmpeg_id; -+ enum AVPixelFormat ffmpeg_id; - int lqt_id; - int exact; - } - colormodels[] = - { -- { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) -+ { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_YUV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUV422, BC_YUV422, 1 }, - #else -- { PIX_FMT_YUYV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUYV422, BC_YUV422, 1 }, - #endif -- { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -- { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) --#ifdef PIX_FMT_YUV422P10 -- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 --#endif -- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) -+ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -+ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -+ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -+ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -+ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+#ifdef AV_PIX_FMT_YUV422P10 -+ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 -+#endif -+ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -+ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #else -- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #endif -- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -- { PIX_FMT_GRAY8, BC_RGB888, 0 }, -- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) -+ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -+ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 }, -+ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -+ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -+ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -+ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) - }; - - static const struct -@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV - if (!codec->pix_fmts) - return 0; - -- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i) -+ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i) - { -- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY) -+ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY) - return 1; - } - - return 0; - } - --static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) -+static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) - { - int i; - -@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f - if(colormodels[i].lqt_id == id) - return colormodels[i].ffmpeg_id; - } -- return PIX_FMT_NB; -+ return AV_PIX_FMT_NB; - } - --static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact) -+static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact) - { - int i; - -@@ -402,24 +402,24 @@ static void lqt_ffmpeg_setup_decoding_co - /* First we try codec-specific colormodel matching. */ - if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which -- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ -- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY) -+ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which -+ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ -+ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY) - { -- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY); -+ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY); - *exact = 1; - if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) - { - vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P; -- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P; -+ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except - // there is no such colormodel in FFMpeg. Fortunately, it's not a problem - // in this case, as reinterpret_pix_fmt is only used when *exact == 0. - } - else - { - vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P; -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P; - } - return; - } -@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co - - if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 -- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 -+ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 -+ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 - (in fact, the latter doesn't even exist) */ -- codec->avctx->pix_fmt = PIX_FMT_YUV422P; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P; - if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10) - { - if (lqt_tenbit_dnxhd_supported(codec->encoder)) -- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY; - } - } - } -@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co - /* From avcodec.h: */ - - /* -- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA -+ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA - * color is put together as: - * (A << 24) | (R << 16) | (G << 8) | B - * This is stored as BGRA on little endian CPU architectures and ARGB on -@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t - */ - - static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec, -- AVFrame * in_frame, enum PixelFormat in_format, -+ AVFrame * in_frame, enum AVPixelFormat in_format, - unsigned char ** out_frame, int out_format, - int width, int height, int row_span, int row_span_uv) - { -@@ -547,9 +547,9 @@ static void convert_image_decode(quickti - * RGBA format like in ffmpeg?? - */ - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) - #else -- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) - #endif - { - convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset); -@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick - if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0) - return -1; - #endif -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - vtrack->stream_cmodel = LQT_COLORMODEL_NONE; - codec->initialized = 1; - } -@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick - #ifdef HAVE_LIBSWSCALE - - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #else -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #endif - { -@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick - - if(!codec->initialized) - { -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - - /* time_base is 1/framerate for constant framerate */ - -@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick - if(vtrack->stream_cmodel == BC_RGBA8888) - { - /* Libquicktime doesn't natively support a color model equivalent -- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel. -+ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel. - So, we use BC_RGBA8888 and do ad hoc conversion below. */ -- codec->avctx->pix_fmt = PIX_FMT_ARGB; -+ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB; - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick - } - // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc); - -- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - if(!codec->tmp_rows) - { -@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick - vtrack->stream_cmodel, - 0, 0, 0, codec->y_offset); - } -- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span, - codec->tmp_rows[0], codec->tmp_row_span, -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -1266,7 +1266,7 @@ static int lqt_ffmpeg_encode_audio(quick - pkt.data = codec->chunk_buffer; - pkt.size = codec->chunk_buffer_alloc; - -- avcodec_get_frame_defaults(&f); -+ av_frame_unref(&f); - f.nb_samples = codec->avctx->frame_size; - - avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt, ---- libquicktime-1.2.4/plugins/ffmpeg/lqt_ffmpeg.c.orig 2016-02-17 08:11:50.683023612 +0000 -+++ libquicktime-1.2.4/plugins/ffmpeg/lqt_ffmpeg.c 2016-02-17 08:12:20.362898974 +0000 -@@ -370,7 +370,7 @@ - struct CODECIDMAP codecidmap_v[] = - { - { -- .id = CODEC_ID_MPEG1VIDEO, -+ .id = AV_CODEC_ID_MPEG1VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -381,7 +381,7 @@ - .wav_ids = { LQT_WAV_ID_NONE } - }, - { -- .id = CODEC_ID_MPEG4, -+ .id = AV_CODEC_ID_MPEG4, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -399,7 +399,7 @@ - .compression_id = LQT_COMPRESSION_MPEG4_ASP, - }, - { -- .id = CODEC_ID_MSMPEG4V1, -+ .id = AV_CODEC_ID_MSMPEG4V1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -410,7 +410,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V2, -+ .id = AV_CODEC_ID_MSMPEG4V2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -421,7 +421,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -437,7 +437,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -452,7 +452,7 @@ - }, - #if 0 - { -- .id = CODEC_ID_WMV1, -+ .id = AV_CODEC_ID_WMV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -465,7 +465,7 @@ - }, - #endif - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -477,7 +477,7 @@ - .compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP, - }, - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -492,7 +492,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_H264, -+ .id = AV_CODEC_ID_H264, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -503,7 +503,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_H263P, -+ .id = AV_CODEC_ID_H263P, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -517,7 +517,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_H263I, -+ .id = AV_CODEC_ID_H263I, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -528,7 +528,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ1, -+ .id = AV_CODEC_ID_SVQ1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -539,7 +539,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ3, -+ .id = AV_CODEC_ID_SVQ3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -550,7 +550,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MJPEG, -+ .id = AV_CODEC_ID_MJPEG, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -564,7 +564,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_MJPEGB, -+ .id = AV_CODEC_ID_MJPEGB, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -578,7 +578,7 @@ - }, - #if LIBAVCODEC_BUILD >= 3346688 - { -- .id = CODEC_ID_TARGA, -+ .id = AV_CODEC_ID_TARGA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -590,7 +590,7 @@ - #endif - #if LIBAVCODEC_BUILD >= 3347456 - { -- .id = CODEC_ID_TIFF, -+ .id = AV_CODEC_ID_TIFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -601,7 +601,7 @@ - }, - #endif - { -- .id = CODEC_ID_8BPS, -+ .id = AV_CODEC_ID_8BPS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -611,7 +611,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_INDEO3, -+ .id = AV_CODEC_ID_INDEO3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -622,7 +622,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_RPZA, -+ .id = AV_CODEC_ID_RPZA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -632,7 +632,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SMC, -+ .id = AV_CODEC_ID_SMC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -642,7 +642,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CINEPAK, -+ .id = AV_CODEC_ID_CINEPAK, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -653,7 +653,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CYUV, -+ .id = AV_CODEC_ID_CYUV, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -664,7 +664,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_QTRLE, -+ .id = AV_CODEC_ID_QTRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -677,7 +677,7 @@ - .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE }, - }, - { -- .id = CODEC_ID_MSRLE, -+ .id = AV_CODEC_ID_MSRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -687,7 +687,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -703,7 +703,7 @@ - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -719,7 +719,7 @@ - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -735,7 +735,7 @@ - }, - /* DVCPRO HD (decoding only for now) */ - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -756,7 +756,7 @@ - // .do_encode = 1 - }, - { -- .id = CODEC_ID_FFVHUFF, -+ .id = AV_CODEC_ID_FFVHUFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -769,7 +769,7 @@ - .do_encode = 1 - }, - { -- .id = CODEC_ID_FFV1, -+ .id = AV_CODEC_ID_FFV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -785,7 +785,7 @@ - }, - #if LIBAVCODEC_BUILD >= 3352576 - { -- .id = CODEC_ID_DNXHD, -+ .id = AV_CODEC_ID_DNXHD, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -801,7 +801,7 @@ - }, - #endif - { -- .id = CODEC_ID_MPEG2VIDEO, -+ .id = AV_CODEC_ID_MPEG2VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -823,7 +823,7 @@ - struct CODECIDMAP codecidmap_a[] = - { - { -- .id = CODEC_ID_MP3, -+ .id = AV_CODEC_ID_MP3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -835,7 +835,7 @@ - .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MP2, -+ .id = AV_CODEC_ID_MP2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -850,7 +850,7 @@ - .compression_id = LQT_COMPRESSION_MP2, - }, - { -- .id = CODEC_ID_AC3, -+ .id = AV_CODEC_ID_AC3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -865,7 +865,7 @@ - .compression_id = LQT_COMPRESSION_AC3, - }, - { -- .id = CODEC_ID_QDM2, -+ .id = AV_CODEC_ID_QDM2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -880,7 +880,7 @@ - #if 1 - /* Doesn't work as long as audio chunks are not split into VBR "Samples" */ - { -- .id = CODEC_ID_ALAC, -+ .id = AV_CODEC_ID_ALAC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -893,7 +893,7 @@ - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_MS, -+ .id = AV_CODEC_ID_ADPCM_MS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -906,7 +906,7 @@ - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_IMA_WAV, -+ .id = AV_CODEC_ID_ADPCM_IMA_WAV, - .index = -1, - .encoder = NULL, - .decoder = NULL, ---- libquicktime-1.2.4/plugins/ffmpeg/video.c.orig 2016-02-17 08:14:18.585735622 +0000 -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c 2016-02-17 08:14:35.332331900 +0000 -@@ -400,7 +400,7 @@ - codec->reinterpret_pix_fmt = codec->avctx->pix_fmt; - - /* First we try codec-specific colormodel matching. */ -- if(codec->decoder->id == CODEC_ID_DNXHD) -+ if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { - /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which - we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ -@@ -438,7 +438,7 @@ - quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv; - codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel); - -- if (codec->encoder->id == CODEC_ID_DNXHD) -+ if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { - /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 - and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 -@@ -728,13 +728,13 @@ - - /* Set extradata: It's done differently for each codec */ - -- if(codec->decoder->id == CODEC_ID_SVQ3) -+ if(codec->decoder->id == AV_CODEC_ID_SVQ3) - { - extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4; - extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4; - - } -- else if(codec->decoder->id == CODEC_ID_H264) -+ else if(codec->decoder->id == AV_CODEC_ID_H264) - { - user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len); - -@@ -753,7 +753,7 @@ - } - - } -- else if(codec->decoder->id == CODEC_ID_MPEG4) -+ else if(codec->decoder->id == AV_CODEC_ID_MPEG4) - { - if(trak->mdia.minf.stbl.stsd.table[0].has_esds) - { -@@ -947,15 +947,15 @@ - } - #endif - } -- if(codec->decoder->id == CODEC_ID_DVVIDEO) -+ if(codec->decoder->id == AV_CODEC_ID_DVVIDEO) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST; - vtrack->ci.id = LQT_COMPRESSION_DV; - } -- else if((codec->decoder->id == CODEC_ID_MPEG4) || -- (codec->decoder->id == CODEC_ID_H264)) -+ else if((codec->decoder->id == AV_CODEC_ID_MPEG4) || -+ (codec->decoder->id == AV_CODEC_ID_H264)) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; -@@ -1299,13 +1299,13 @@ - { - if(vtrack->stream_cmodel == BC_YUV420P) - { -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; - /* enable interlaced encoding */ - vtrack->interlace_mode = LQT_INTERLACE_NONE; - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - } -@@ -1340,7 +1340,7 @@ - codec->avctx->sample_aspect_ratio.num = pixel_width; - codec->avctx->sample_aspect_ratio.den = pixel_height; - /* Use global headers for mp4v */ -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1364,12 +1364,12 @@ - } - #endif - } -- else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) && -+ else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) && - !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4)) - { - strncpy(trak->strl->strh.fccHandler, "div3", 4); - } -- else if((codec->encoder->id == CODEC_ID_H263) && -+ else if((codec->encoder->id == AV_CODEC_ID_H263) && - (file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP))) - { - uint8_t d263_data[] = -@@ -1383,7 +1383,7 @@ - strncpy(trak->mdia.minf.stbl.stsd.table[0].format, - "s263", 4); - } -- else if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1391,7 +1391,7 @@ - codec->write_global_header = 1; - } - } -- else if(codec->encoder->id == CODEC_ID_QTRLE) -+ else if(codec->encoder->id == AV_CODEC_ID_QTRLE) - { - if(vtrack->stream_cmodel == BC_RGBA8888) - { -@@ -1402,11 +1402,11 @@ - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - set_dv_fourcc(width, height, vtrack->stream_cmodel, trak); - } -- else if(codec->encoder->id == CODEC_ID_DNXHD) -+ else if(codec->encoder->id == AV_CODEC_ID_DNXHD) - { - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) - { -@@ -1558,12 +1558,12 @@ - - #endif - -- if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD) -+ if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD) - setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded); - - if(bytes_encoded) - { -- if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0)) -+ if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0)) - { - /* Some codecs don't bother generating presentation timestamps. - FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */ -@@ -1590,13 +1590,13 @@ - - if(codec->write_global_header && !codec->global_header_written) - { -- if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms, - "glbl", - codec->avctx->extradata, codec->avctx->extradata_size ); - } -- else if(codec->encoder->id == CODEC_ID_MPEG4) -+ else if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - int advanced = 0; - if(codec->avctx->max_b_frames || -@@ -1903,18 +1903,18 @@ - codec_base->encode_video = lqt_ffmpeg_encode_video; - codec_base->set_pass = set_pass_ffmpeg; - -- if(encoder->id == CODEC_ID_MPEG4) -+ if(encoder->id == AV_CODEC_ID_MPEG4) - { - codec_base->writes_compressed = writes_compressed_mpeg4; - codec_base->init_compressed = init_compressed_mpeg4; - codec_base->write_packet = write_packet_mpeg4; - } -- else if(encoder->id == CODEC_ID_MPEG2VIDEO) -+ else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO) - { - codec_base->writes_compressed = writes_compressed_imx; - codec_base->init_compressed = init_compressed_imx; - } -- else if(encoder->id == CODEC_ID_DVVIDEO) -+ else if(encoder->id == AV_CODEC_ID_DVVIDEO) - { - codec_base->init_compressed = init_compressed_dv; - } -@@ -1922,7 +1922,7 @@ - } - if(decoder) - { -- if(decoder->id == CODEC_ID_H264) -+ if(decoder->id == AV_CODEC_ID_H264) - codec_base->read_packet = read_packet_h264; - codec_base->decode_video = lqt_ffmpeg_decode_video; - } ---- libquicktime-1.2.4/plugins/ffmpeg/audio.c.orig 2016-02-17 08:17:57.421481934 +0000 -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c 2016-02-17 08:18:05.254782305 +0000 -@@ -626,7 +626,7 @@ - { - /* If the codec is mp3, make sure to decode the very last frame */ - -- if((codec->avctx->codec_id == CODEC_ID_MP3) && -+ if((codec->avctx->codec_id == AV_CODEC_ID_MP3) && - (codec->bytes_in_chunk_buffer >= 4)) - { - if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0)) -@@ -695,7 +695,7 @@ - - /* Some really broken mp3 files have the header bytes split across 2 chunks */ - -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - if(codec->bytes_in_chunk_buffer < 4) - { -@@ -806,7 +806,7 @@ - - if(bytes_decoded < 0) - { -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - /* For mp3, bytes_decoded < 0 means, that the frame should be muted */ - memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end - -@@ -866,8 +866,8 @@ - quicktime_audio_map_t *track_map = &file->atracks[track]; - quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv; - -- if((codec->decoder->id == CODEC_ID_MP2) || -- (codec->decoder->id == CODEC_ID_MP3)) -+ if((codec->decoder->id == AV_CODEC_ID_MP2) || -+ (codec->decoder->id == AV_CODEC_ID_MP3)) - { - mpa_header h; - uint32_t header; -@@ -909,7 +909,7 @@ - else - track_map->ci.bitrate = h.bitrate; - } -- else if(codec->decoder->id == CODEC_ID_AC3) -+ else if(codec->decoder->id == AV_CODEC_ID_AC3) - { - a52_header h; - uint8_t * ptr; -@@ -986,7 +986,7 @@ - #endif - /* Some codecs need extra stuff */ - -- if(codec->decoder->id == CODEC_ID_ALAC) -+ if(codec->decoder->id == AV_CODEC_ID_ALAC) - { - header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len); - if(header) -@@ -995,7 +995,7 @@ - codec->avctx->extradata_size = header_len; - } - } -- if(codec->decoder->id == CODEC_ID_QDM2) -+ if(codec->decoder->id == AV_CODEC_ID_QDM2) - { - header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len); - if(header) -@@ -1495,9 +1495,9 @@ - codec_base->decode_audio = lqt_ffmpeg_decode_audio; - codec_base->set_parameter = set_parameter; - -- if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2)) -+ if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2)) - codec_base->read_packet = read_packet_mpa; -- else if(decoder->id == CODEC_ID_AC3) -+ else if(decoder->id == AV_CODEC_ID_AC3) - { - codec_base->write_packet = write_packet_ac3; - codec_base->read_packet = read_packet_ac3; diff --git a/libraries/libquicktime/libquicktime.SlackBuild b/libraries/libquicktime/libquicktime.SlackBuild index 522d29632b..c4924d7f0a 100644 --- a/libraries/libquicktime/libquicktime.SlackBuild +++ b/libraries/libquicktime/libquicktime.SlackBuild @@ -80,17 +80,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -# Fix compatibility with ffmpeg 4.x -patch -p1 -i $CWD/libquicktime-1.2.4-ffmpeg2.patch -patch -p1 -i $CWD/libquicktime-ffmpeg3.patch -patch -p1 -i $CWD/libquicktime-1.2.4-ffmpeg4.patch +# Upstream seems to have dropped ffmpeg support # Fix compiling against newer faad2 patch -p1 -i $CWD/libquicktime-1.2.4-faad2.patch autoreconf -vif -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -101,6 +98,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-gpl \ --with-libdv \ + --without-ffmpeg \ --build=$ARCH-slackware-linux make diff --git a/libraries/librepfunc/librepfunc.SlackBuild b/libraries/librepfunc/librepfunc.SlackBuild index 0f89fe34bc..2f4ec2353f 100644 --- a/libraries/librepfunc/librepfunc.SlackBuild +++ b/libraries/librepfunc/librepfunc.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=librepfunc -VERSION=${VERSION:-1.8.1} +VERSION=${VERSION:-1.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/librepfunc/librepfunc.info b/libraries/librepfunc/librepfunc.info index 3c47205f09..af3a723875 100644 --- a/libraries/librepfunc/librepfunc.info +++ b/libraries/librepfunc/librepfunc.info @@ -1,8 +1,8 @@ PRGNAM="librepfunc" -VERSION="1.8.1" +VERSION="1.10.0" HOMEPAGE="https://github.com/wirbel-at-vdr-portal/librepfunc" -DOWNLOAD="https://github.com/wirbel-at-vdr-portal/librepfunc/archive/1.8.1/librepfunc-1.8.1.tar.gz" -MD5SUM="8087573812dd396efb55cd0702b3faa8" +DOWNLOAD="https://github.com/wirbel-at-vdr-portal/librepfunc/archive/1.10.0/librepfunc-1.10.0.tar.gz" +MD5SUM="b1f52cb230907416628af27539e11923" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libslirp/changelog b/libraries/libslirp/changelog index cb657bde2d..75f35d507e 100644 --- a/libraries/libslirp/changelog +++ b/libraries/libslirp/changelog @@ -13,3 +13,7 @@ Issues in the script were fixed. updated to version 4.7.0 Valgrind is an optional dependency for libslirp + +16/05/2024: + +updated to version 4.8.0 diff --git a/libraries/libslirp/libslirp.SlackBuild b/libraries/libslirp/libslirp.SlackBuild index 06b3fab202..36089f4bb3 100644 --- a/libraries/libslirp/libslirp.SlackBuild +++ b/libraries/libslirp/libslirp.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libslirp -# Copyright 2022-2023 Vijay Marcel +# Copyright 2022-2024 Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libslirp -VERSION=${VERSION:-4.7.0} +VERSION=${VERSION:-4.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -92,10 +92,10 @@ cd .. rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG.md COPYRIGHT README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md COPYRIGHT README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/libslirp/libslirp.info b/libraries/libslirp/libslirp.info index 6fbf9b27af..1dbe155bed 100644 --- a/libraries/libslirp/libslirp.info +++ b/libraries/libslirp/libslirp.info @@ -1,8 +1,8 @@ PRGNAM="libslirp" -VERSION="4.7.0" +VERSION="4.8.0" HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp" -DOWNLOAD="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v4.7.0/libslirp-v4.7.0.tar.gz" -MD5SUM="8eb16991ab6145ca45e8393e9959a832" +DOWNLOAD="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v4.8.0/libslirp-v4.8.0.tar.gz" +MD5SUM="442988e931075fc45ed84c5ffc391073" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libsoup3/README b/libraries/libsoup3/README deleted file mode 100644 index dbdd7128d3..0000000000 --- a/libraries/libsoup3/README +++ /dev/null @@ -1,6 +0,0 @@ -Soup is an HTTP client/server library implementation in C. It uses -GObjects and the glib main loop to integrate well with GTK+ -applications, and has a synchronous API suitable for use in threaded -applications. - -NOTE: This package can co-exist with libsoup package in Slackware. diff --git a/libraries/libsoup3/libsoup3.SlackBuild b/libraries/libsoup3/libsoup3.SlackBuild deleted file mode 100644 index a08d69918b..0000000000 --- a/libraries/libsoup3/libsoup3.SlackBuild +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -# Slackware build script for libsoup3 - -# Copyright 2022-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20220422 bkw: Modified by SlackBuilds.org: fix PRINT_PACKAGE_NAME. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libsoup3 -SRCNAM=libsoup -VERSION=${VERSION:-3.4.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - -Dtests=FALSE \ - -Dsysprof="disabled" \ - -Dstrip=true \ - -Ddocs="disabled" \ - --sysconfdir=/etc - ninja - DESTDIR=$PKG ninja install -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING NEWS README docs examples $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libsoup3/libsoup3.info b/libraries/libsoup3/libsoup3.info deleted file mode 100644 index 4971a8a2de..0000000000 --- a/libraries/libsoup3/libsoup3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libsoup3" -VERSION="3.4.4" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libsoup" -DOWNLOAD="https://gitlab.gnome.org/GNOME/libsoup/-/archive/3.4.4/libsoup-3.4.4.tar.bz2" -MD5SUM="6f6296f6d9c908de043266efff51b77c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/libraries/libsoup3/slack-desc b/libraries/libsoup3/slack-desc deleted file mode 100644 index 2567a528e2..0000000000 --- a/libraries/libsoup3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libsoup3: libsoup3 (an HTTP client/server library) -libsoup3: -libsoup3: Soup is an HTTP client/server library implementation in C. It uses -libsoup3: GObjects and the glib main loop to integrate well with GTK+ -libsoup3: applications, and has a synchronous API suitable for use in threaded -libsoup3: applications. -libsoup3: -libsoup3: -libsoup3: -libsoup3: -libsoup3: diff --git a/libraries/libtecla/libtecla.SlackBuild b/libraries/libtecla/libtecla.SlackBuild index c8d986e2f1..52476b6339 100644 --- a/libraries/libtecla/libtecla.SlackBuild +++ b/libraries/libtecla/libtecla.SlackBuild @@ -93,8 +93,8 @@ CXXFLAGS="$SLKCFLAGS" \ # Remove static sed -i "s|static shared|shared|" Makefile -make -make install prefix="$PKG/usr" LIBDIR="$PKG/usr/lib${LIBDIRSUFFIX}" MANDIR="$PKG/usr/man" +make -j1 +make -j1 install prefix="$PKG/usr" LIBDIR="$PKG/usr/lib${LIBDIRSUFFIX}" MANDIR="$PKG/usr/man" find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/libraries/libtorch-cxx11-abi-shared-with-deps/README b/libraries/libtorch-cxx11-abi-shared-with-deps/README deleted file mode 100644 index 513950f231..0000000000 --- a/libraries/libtorch-cxx11-abi-shared-with-deps/README +++ /dev/null @@ -1,4 +0,0 @@ -Tensors and Dynamic neural networks in Python with strong GPU -acceleration. - -These are precompiled libraries diff --git a/libraries/libtorch-cxx11-abi-shared-with-deps/libtorch-cxx11-abi-shared-with-deps.info b/libraries/libtorch-cxx11-abi-shared-with-deps/libtorch-cxx11-abi-shared-with-deps.info deleted file mode 100644 index 1bd175634b..0000000000 --- a/libraries/libtorch-cxx11-abi-shared-with-deps/libtorch-cxx11-abi-shared-with-deps.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libtorch-cxx11-abi-shared-with-deps" -VERSION="2.1.1" -HOMEPAGE="https://pytorch.org/" -DOWNLOAD="https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.1.1%2Bcpu.zip" -MD5SUM="9209a7dba2ab08bea5a2b59b5ae36088" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds@schoepfer.info" diff --git a/libraries/libtorch-cxx11-abi-shared-with-deps/slack-desc b/libraries/libtorch-cxx11-abi-shared-with-deps/slack-desc deleted file mode 100644 index f7792a3a2e..0000000000 --- a/libraries/libtorch-cxx11-abi-shared-with-deps/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libtorch-cxx11-abi-shared-with-deps: libtorch-cxx11-abi-shared-with-deps (Tensors and neural networks) -libtorch-cxx11-abi-shared-with-deps: -libtorch-cxx11-abi-shared-with-deps: Tensors and Dynamic neural networks in Python with strong GPU -libtorch-cxx11-abi-shared-with-deps: acceleration. -libtorch-cxx11-abi-shared-with-deps: -libtorch-cxx11-abi-shared-with-deps: These are precompiled libraries. -libtorch-cxx11-abi-shared-with-deps: -libtorch-cxx11-abi-shared-with-deps: -libtorch-cxx11-abi-shared-with-deps: -libtorch-cxx11-abi-shared-with-deps: https://pytorch.org/ -libtorch-cxx11-abi-shared-with-deps: diff --git a/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild b/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild index 88aecdbe4e..74022eb530 100644 --- a/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild +++ b/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libtorrent-rasterbar VERSION=${VERSION:-1.2.19} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -89,7 +89,6 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR:PATH=lib${LIBDIRSUFFIX} \ -Dpython-bindings=ON \ - -Dpython-egg-info=ON \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/libraries/libunibreak/README b/libraries/libunibreak/README deleted file mode 100644 index 597ba98bcb..0000000000 --- a/libraries/libunibreak/README +++ /dev/null @@ -1,9 +0,0 @@ -libunibreak (a line breaking library) - -Libunibreak is an implementation of the line breaking and word -breaking algorithms as described in Unicode Standard Annex 14 and -Unicode Standard Annex 29. - -It is designed to be used in a generic text renderer. FBReader is one -real-world example, and the Enlightenment Foundation Libraries are -another. diff --git a/libraries/libunibreak/libunibreak.SlackBuild b/libraries/libunibreak/libunibreak.SlackBuild deleted file mode 100644 index 9251cefd1e..0000000000 --- a/libraries/libunibreak/libunibreak.SlackBuild +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -# Slackware build script for libunibreak -# Maintained as of version 3.0 by slackmart <email removed> -# Now maintained by B. Watson <urchlay@slackware.uk> -# Original version had no license; now licensed under the WTFPL. See -# http://www.wtfpl.net/txt/copying/ for details. - -# 20240315 bkw: update for v6.1 -# 20230111 bkw: update for v5.1 -# 20211003 bkw: -# - take over maintenance -# - update for v4.3 -# - add HTML docs to package - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libunibreak -VERSION=${VERSION:-6.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ ---prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-static=no \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS* LICEN* NEWS README* doc/html $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libunibreak/libunibreak.info b/libraries/libunibreak/libunibreak.info deleted file mode 100644 index cfdbef9981..0000000000 --- a/libraries/libunibreak/libunibreak.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libunibreak" -VERSION="6.1" -HOMEPAGE="https://github.com/adah1972/libunibreak/" -DOWNLOAD="https://github.com/adah1972/libunibreak/releases/download/libunibreak_6_1/libunibreak-6.1.tar.gz" -MD5SUM="8df410d010e03de1a339a400a920335e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/libraries/libunibreak/slack-desc b/libraries/libunibreak/slack-desc deleted file mode 100644 index dfb36c5f36..0000000000 --- a/libraries/libunibreak/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libunibreak: libunibreak (a line breaking library) -libunibreak: -libunibreak: Libunibreak is an implementation of the line breaking and word -libunibreak: breaking algorithms as described in Unicode Standard Annex 14 and -libunibreak: Unicode Standard Annex 29. -libunibreak: -libunibreak: It is designed to be used in a generic text renderer. FBReader is -libunibreak: one real-world example, and the Enlightenment Foundation Libraries -libunibreak: are another. -libunibreak: -libunibreak: diff --git a/libraries/libunicap/libunicap.SlackBuild b/libraries/libunicap/libunicap.SlackBuild index cd365f1adf..d9b730847a 100644 --- a/libraries/libunicap/libunicap.SlackBuild +++ b/libraries/libunicap/libunicap.SlackBuild @@ -68,6 +68,8 @@ patch -p1 < $CWD/gcc10.patch sed -i "s|linux\/videodev\.|libv4l1-videodev.|" \ cpi/v4l/v4l.c cpi/v4l2cpi/uvcvideo.h +sed -i "s|charset=|charset=UTF-8|" po/de.po + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libvirt-glib/libvirt-glib-4.0.0-cast-align.patch b/libraries/libvirt-glib/libvirt-glib-4.0.0-cast-align.patch deleted file mode 100644 index 666babaca6..0000000000 --- a/libraries/libvirt-glib/libvirt-glib-4.0.0-cast-align.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup libvirt-glib-4.0.0.orig/meson.build libvirt-glib-4.0.0.new/meson.build ---- libvirt-glib-4.0.0.orig/meson.build 2021-02-15 12:23:04.609036200 +0000 -+++ libvirt-glib-4.0.0.new/meson.build 2021-02-15 14:50:24.838971022 +0000 -@@ -175,8 +175,6 @@ cc_flags += [ - '-Wbuiltin-declaration-mismatch', - '-Wbuiltin-macro-redefined', - '-Wcannot-profile', -- '-Wcast-align', -- '-Wcast-align=strict', - '-Wcast-function-type', - '-Wchar-subscripts', - '-Wclobbered', diff --git a/libraries/libvirt-glib/libvirt-glib.SlackBuild b/libraries/libvirt-glib/libvirt-glib.SlackBuild index 96ebde059d..0c46671882 100644 --- a/libraries/libvirt-glib/libvirt-glib.SlackBuild +++ b/libraries/libvirt-glib/libvirt-glib.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libvirt-glib -# Copyright 2012-2021 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2012-2024 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvirt-glib -VERSION=${VERSION:-4.0.0} +VERSION=${VERSION:-5.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,8 +76,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/libvirt-glib-4.0.0-cast-align.patch - mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libvirt-glib/libvirt-glib.info b/libraries/libvirt-glib/libvirt-glib.info index 560c9a11d0..5528f83e51 100644 --- a/libraries/libvirt-glib/libvirt-glib.info +++ b/libraries/libvirt-glib/libvirt-glib.info @@ -1,8 +1,8 @@ PRGNAM="libvirt-glib" -VERSION="4.0.0" +VERSION="5.0.0" HOMEPAGE="http://libvirt.org/" -DOWNLOAD="https://libvirt.org/sources/glib/libvirt-glib-4.0.0.tar.xz" -MD5SUM="0d0932949cde8a8933f6fb6aaf66dfe0" +DOWNLOAD="https://download.libvirt.org/glib/libvirt-glib-5.0.0.tar.xz" +MD5SUM="2e36b42b91bb98fac22321b5afc5a835" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libvirt" diff --git a/libraries/libvirt-python/libvirt-python.SlackBuild b/libraries/libvirt-python/libvirt-python.SlackBuild index 047fa9cfc2..49e4294821 100644 --- a/libraries/libvirt-python/libvirt-python.SlackBuild +++ b/libraries/libvirt-python/libvirt-python.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libvirt-python -# Copyright 2013-2023 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2013-2024 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvirt-python -VERSION=${VERSION:-9.1.0} +VERSION=${VERSION:-10.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/libraries/libvirt-python/libvirt-python.info b/libraries/libvirt-python/libvirt-python.info index 9904928d47..61a4a1f756 100644 --- a/libraries/libvirt-python/libvirt-python.info +++ b/libraries/libvirt-python/libvirt-python.info @@ -1,8 +1,8 @@ PRGNAM="libvirt-python" -VERSION="9.1.0" +VERSION="10.3.0" HOMEPAGE="https://libvirt.org" -DOWNLOAD="https://libvirt.org/sources/python/libvirt-python-9.1.0.tar.gz" -MD5SUM="24a0043ff93979fa2b9ca8925893a6e4" +DOWNLOAD="https://download.libvirt.org/python/libvirt-python-10.3.0.tar.gz" +MD5SUM="042301eba766bd90a48cf25cd5fb756c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libvirt" diff --git a/libraries/libvirt/README b/libraries/libvirt/README index dcf8472fc2..adddc0abc1 100644 --- a/libraries/libvirt/README +++ b/libraries/libvirt/README @@ -46,13 +46,11 @@ There is also a 'guests_reboot' for rebooting all running guests. Have a look at the commented part of rc.libvirt for some gotchas. -netcat-openbsd is an optional dependency (needed if you -want to connect from a remote host using virt-manager). -Other optional dependencies include avahi, xen, audit, glusterfs, -numactl, open-iscsi and libiscsi. +Optional dependencies include avahi, xen, audit, glusterfs, numactl, +open-iscsi and libiscsi. As of the 4.5.0 version, you may have to remove any previously -installed versions of libvirt before this will build. +installed version of libvirt before this will build. Note also that sometimes, in consequence of a major-version upgrade, you might discover that the libvirt configuration is in an inconsistent diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild index 1da38ef831..40b90550ab 100644 --- a/libraries/libvirt/libvirt.SlackBuild +++ b/libraries/libvirt/libvirt.SlackBuild @@ -10,7 +10,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvirt -VERSION=${VERSION:-9.1.0} +VERSION=${VERSION:-10.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -61,6 +61,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION +rm -fR tests/vircaps2xmldata # either this or find outputs "filesystem loop detected" chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info index 8a7276895c..44a3cbe629 100644 --- a/libraries/libvirt/libvirt.info +++ b/libraries/libvirt/libvirt.info @@ -1,8 +1,8 @@ PRGNAM="libvirt" -VERSION="9.1.0" +VERSION="10.3.0" HOMEPAGE="http://libvirt.org" -DOWNLOAD="https://libvirt.org/sources/libvirt-9.1.0.tar.xz" -MD5SUM="fbfab9819030ec363f0b1e88ca5b83de" +DOWNLOAD="https://libvirt.org/sources/libvirt-10.3.0.tar.xz" +MD5SUM="046625ca97f32aaf06737fa1ede6d018" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yajl" diff --git a/libraries/libvterm/libvterm.SlackBuild b/libraries/libvterm/libvterm.SlackBuild index 34aa147774..0619642475 100644 --- a/libraries/libvterm/libvterm.SlackBuild +++ b/libraries/libvterm/libvterm.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvterm VERSION=${VERSION:-0.3.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -86,6 +86,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/libvterm/libvterm.info b/libraries/libvterm/libvterm.info index c0c9acf72b..af056e9aaf 100644 --- a/libraries/libvterm/libvterm.info +++ b/libraries/libvterm/libvterm.info @@ -1,8 +1,8 @@ PRGNAM="libvterm" VERSION="0.3.3" HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/" -DOWNLOAD="http://www.leonerd.org.uk/code/libvterm/libvterm-0.3.3.tar.gz" -MD5SUM="7d86578b4966ce6c622fb3662d3d3ee8" +DOWNLOAD="https://github.com/neovim/libvterm/archive/v0.3.3/libvterm-0.3.3.tar.gz" +MD5SUM="d2631d2599a0bd6795082ad567aa7d68" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libxmlb/libxmlb.SlackBuild b/libraries/libxmlb/libxmlb.SlackBuild index 026fdc3ffb..b7cf8065f1 100644 --- a/libraries/libxmlb/libxmlb.SlackBuild +++ b/libraries/libxmlb/libxmlb.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libxmlb -VERSION=${VERSION:-0.3.15} +VERSION=${VERSION:-0.3.19} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,6 +77,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Use newer meson +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages/ + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ meson \ diff --git a/libraries/libxmlb/libxmlb.info b/libraries/libxmlb/libxmlb.info index 908366a050..3f6c7c61d8 100644 --- a/libraries/libxmlb/libxmlb.info +++ b/libraries/libxmlb/libxmlb.info @@ -1,10 +1,10 @@ PRGNAM="libxmlb" -VERSION="0.3.15" +VERSION="0.3.19" HOMEPAGE="https://github.com/hughsie/libxmlb" -DOWNLOAD="https://github.com/hughsie/libxmlb/archive/0.3.15/libxmlb-0.3.15.tar.gz" -MD5SUM="8cec7081a7bb4db1eb38d8709d890035" +DOWNLOAD="https://github.com/hughsie/libxmlb/archive/0.3.19/libxmlb-0.3.19.tar.gz" +MD5SUM="4a66b1865538868efd902db6a9f27234" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3-meson-opt" MAINTAINER="Andrew Clemons" EMAIL="andrew.clemons@gmail.com" diff --git a/libraries/lua-readline/README b/libraries/lua-readline/README deleted file mode 100644 index 6effa3b8f8..0000000000 --- a/libraries/lua-readline/README +++ /dev/null @@ -1,5 +0,0 @@ -This Lua module offers a simple calling interface -to the GNU Readline/History Library. - -Optional Dependency: lua52, lua53. -Default support for all versions of Lua installed before build. diff --git a/libraries/lua-readline/lua-readline.SlackBuild b/libraries/lua-readline/lua-readline.SlackBuild deleted file mode 100644 index f2ec41e0ab..0000000000 --- a/libraries/lua-readline/lua-readline.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash - -# Slackware build script for lua-readline -# Copyright 2021 abooksigun <abooksigun09@gmail.com> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=lua-readline -SRCNAM=readline -VERSION=${VERSION:-2.9} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -LUAVERS="5.1 5.2 5.3 5.4" - -for luaver in $LUAVERS -do - if [ $luaver != 5.1 ]; then version=$luaver dir=lua$version; fi - if $(lua$version -v &> /dev/null) - then - gcc $SLKCFLAGS -I /usr/include/$dir -c C-readline.c -o C-readline.o - gcc $SLKCFLAGS -shared -o C-readline.so.$luaver C-readline.o - - install -D -m 0755 C-readline.so.$luaver $PKG/usr/lib$LIBDIRSUFFIX/lua/$luaver/C-readline.so - install -D -m 0644 readline.lua $PKG/usr/share/lua/$luaver/readline.lua - fi -done - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp doc/readline.html $PKG/usr/doc/$PRGNAM-$VERSION - -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/lua-readline/lua-readline.info b/libraries/lua-readline/lua-readline.info deleted file mode 100644 index 6c8455a684..0000000000 --- a/libraries/lua-readline/lua-readline.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="lua-readline" -VERSION="2.9" -HOMEPAGE="http://www.pjb.com.au/comp/lua/readline.html" -DOWNLOAD="http://www.pjb.com.au/comp/lua/readline-2.9.tar.gz" -MD5SUM="9423302e81cad9a2b9f0fbfd0b39b5a8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="lua-posix" -MAINTAINER="abooksigun" -EMAIL="abooksigun09@gmail.com" diff --git a/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild b/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild index dced673631..9f8403e6ec 100644 --- a/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild +++ b/libraries/lxqt-build-tools/lxqt-build-tools.SlackBuild @@ -4,7 +4,7 @@ # # Copyright 2016-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. # Copyright 2018-2022 Matteo Bernardini, Pisa, Italy. -# Copyright 2022-2023 Isaac Yu <isaacyu@protonmail.com> +# Copyright 2022-2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/libraries/lxqt-build-tools/lxqt-build-tools.info b/libraries/lxqt-build-tools/lxqt-build-tools.info index c832f7d827..69a95e8278 100644 --- a/libraries/lxqt-build-tools/lxqt-build-tools.info +++ b/libraries/lxqt-build-tools/lxqt-build-tools.info @@ -1,6 +1,6 @@ PRGNAM="lxqt-build-tools" VERSION="0.13.0" -HOMEPAGE="https://github.com/lxde/lxqt-build-tools" +HOMEPAGE="https://github.com/lxqt/lxqt-build-tools" DOWNLOAD="https://github.com/lxqt/lxqt-build-tools/releases/download/0.13.0/lxqt-build-tools-0.13.0.tar.xz" MD5SUM="f434042d33af5b47d61afdd6f0677276" DOWNLOAD_x86_64="" diff --git a/libraries/lxqt-qtplugin/lxqt-qtplugin.SlackBuild b/libraries/lxqt-qtplugin/lxqt-qtplugin.SlackBuild index b291015091..8bdfdb7ec8 100644 --- a/libraries/lxqt-qtplugin/lxqt-qtplugin.SlackBuild +++ b/libraries/lxqt-qtplugin/lxqt-qtplugin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for lxqt-qtplugin -# Copyright 2022-2023 Isaac Yu <isaacyu@protonmail.com> +# Copyright 2022-2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxqt-qtplugin -VERSION=${VERSION:-1.3.0} +VERSION=${VERSION:-1.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/lxqt-qtplugin/lxqt-qtplugin.info b/libraries/lxqt-qtplugin/lxqt-qtplugin.info index 1d3e7fee8f..88d27a54cb 100644 --- a/libraries/lxqt-qtplugin/lxqt-qtplugin.info +++ b/libraries/lxqt-qtplugin/lxqt-qtplugin.info @@ -1,8 +1,8 @@ PRGNAM="lxqt-qtplugin" -VERSION="1.3.0" +VERSION="1.4.1" HOMEPAGE="https://github.com/lxqt/lxqt-qtplugin" -DOWNLOAD="https://github.com/lxqt/lxqt-qtplugin/releases/download/1.3.0/lxqt-qtplugin-1.3.0.tar.xz" -MD5SUM="569bbb880942c3eeb1b08b8d4115365b" +DOWNLOAD="https://github.com/lxqt/lxqt-qtplugin/releases/download/1.4.1/lxqt-qtplugin-1.4.1.tar.xz" +MD5SUM="b2644cd53c16341013b3987077b6fec6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libfm-qt libqtxdg" diff --git a/libraries/mimalloc/mimalloc.SlackBuild b/libraries/mimalloc/mimalloc.SlackBuild index 7cde1378c7..8f87d83a0f 100644 --- a/libraries/mimalloc/mimalloc.SlackBuild +++ b/libraries/mimalloc/mimalloc.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mimalloc -VERSION=${VERSION:-2.1.2} +VERSION=${VERSION:-2.1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/mimalloc/mimalloc.info b/libraries/mimalloc/mimalloc.info index 55cded1893..79cf6a1b71 100644 --- a/libraries/mimalloc/mimalloc.info +++ b/libraries/mimalloc/mimalloc.info @@ -1,8 +1,8 @@ PRGNAM="mimalloc" -VERSION="2.1.2" +VERSION="2.1.4" HOMEPAGE="https://github.com/microsoft/mimalloc" -DOWNLOAD="https://github.com/microsoft/mimalloc/archive/v2.1.2/mimalloc-2.1.2.tar.gz" -MD5SUM="5179c8f5cf1237d2300e2d8559a7bc55" +DOWNLOAD="https://github.com/microsoft/mimalloc/archive/v2.1.4/mimalloc-2.1.4.tar.gz" +MD5SUM="50f2e6e2bf0e92876bedf95cf5444d43" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/nlohmann_json/nlohmann_json.SlackBuild b/libraries/nlohmann_json/nlohmann_json.SlackBuild index dfcb6419d6..69eb38c5ed 100644 --- a/libraries/nlohmann_json/nlohmann_json.SlackBuild +++ b/libraries/nlohmann_json/nlohmann_json.SlackBuild @@ -76,6 +76,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + mkdir -p build cd build cmake \ diff --git a/libraries/nlohmann_json/patches/1_6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee.patch b/libraries/nlohmann_json/patches/1_6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee.patch new file mode 100644 index 0000000000..6f133312ee --- /dev/null +++ b/libraries/nlohmann_json/patches/1_6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee.patch @@ -0,0 +1,55 @@ +From 6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Wed, 8 Mar 2023 11:31:56 +0000 +Subject: [PATCH] custom allocators: define missing 'rebind' type (#3895) + +--- + tests/src/unit-allocator.cpp | 9 +++++++++ + tests/src/unit-regression2.cpp | 9 +++++++++ + 2 files changed, 18 insertions(+) + +diff --git a/tests/src/unit-allocator.cpp b/tests/src/unit-allocator.cpp +index 76e3b03f10..f2e63552a4 100644 +--- a/tests/src/unit-allocator.cpp ++++ b/tests/src/unit-allocator.cpp +@@ -20,11 +20,20 @@ struct bad_allocator : std::allocator<T> + { + using std::allocator<T>::allocator; + ++ bad_allocator() = default; ++ template<class U> bad_allocator(const bad_allocator<U>& /*unused*/) { } ++ + template<class... Args> + void construct(T* /*unused*/, Args&& ... /*unused*/) + { + throw std::bad_alloc(); + } ++ ++ template <class U> ++ struct rebind ++ { ++ using other = bad_allocator<U>; ++ }; + }; + } // namespace + +diff --git a/tests/src/unit-regression2.cpp b/tests/src/unit-regression2.cpp +index 2bb9b32e51..dbafb436ba 100644 +--- a/tests/src/unit-regression2.cpp ++++ b/tests/src/unit-regression2.cpp +@@ -189,6 +189,15 @@ class my_allocator : public std::allocator<T> + { + public: + using std::allocator<T>::allocator; ++ ++ my_allocator() = default; ++ template<class U> my_allocator(const my_allocator<U>& /*unused*/) { } ++ ++ template <class U> ++ struct rebind ++ { ++ using other = my_allocator<U>; ++ }; + }; + + ///////////////////////////////////////////////////////////////////// diff --git a/libraries/nlohmann_json/patches/2_660d0b58565073975d6f5d94365d6cbf150a4cf8.patch b/libraries/nlohmann_json/patches/2_660d0b58565073975d6f5d94365d6cbf150a4cf8.patch new file mode 100644 index 0000000000..d14345f40e --- /dev/null +++ b/libraries/nlohmann_json/patches/2_660d0b58565073975d6f5d94365d6cbf150a4cf8.patch @@ -0,0 +1,24 @@ +From 660d0b58565073975d6f5d94365d6cbf150a4cf8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> +Date: Sun, 5 Mar 2023 14:11:22 +0100 +Subject: [PATCH] tests/unit-iterators2: use std::ranges::equals for range + comparisons (#3950) + +Closes https://github.com/nlohmann/json/issues/3927 +--- + tests/src/unit-iterators2.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/src/unit-iterators2.cpp b/tests/src/unit-iterators2.cpp +index 27926084c7..72a5d9dc5c 100644 +--- a/tests/src/unit-iterators2.cpp ++++ b/tests/src/unit-iterators2.cpp +@@ -943,7 +943,7 @@ TEST_CASE("iterators 2") + json j_expected{5, 4, 3, 2, 1}; + + auto reversed = j | std::views::reverse; +- CHECK(reversed == j_expected); ++ CHECK(std::ranges::equal(reversed, j_expected)); + } + + SECTION("transform") diff --git a/libraries/nng/nng.SlackBuild b/libraries/nng/nng.SlackBuild index b85000e4b5..79e9122276 100644 --- a/libraries/nng/nng.SlackBuild +++ b/libraries/nng/nng.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nng -VERSION=${VERSION:-1.6.0} +VERSION=${VERSION:-1.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/nng/nng.info b/libraries/nng/nng.info index c29dc48122..98339ffc94 100644 --- a/libraries/nng/nng.info +++ b/libraries/nng/nng.info @@ -1,8 +1,8 @@ PRGNAM="nng" -VERSION="1.6.0" +VERSION="1.8.0" HOMEPAGE="https://nng.nanomsg.org/" -DOWNLOAD="https://github.com/nanomsg/nng/archive/v1.6.0/nng-v1.6.0.tar.gz" -MD5SUM="1af544f3cc51c0d240e3dcd329333264" +DOWNLOAD="https://github.com/nanomsg/nng/archive/v1.8.0/nng-v1.8.0.tar.gz" +MD5SUM="6a8857856b9b15f0187ebcc5f7301b5a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/nv-codec-headers/README b/libraries/nv-codec-headers/README deleted file mode 100644 index 3509867132..0000000000 --- a/libraries/nv-codec-headers/README +++ /dev/null @@ -1,18 +0,0 @@ -The FFmpeg version of Nvidia Codec SDK headers which are required -to interface with Nvidia's codec APIs. The purpose of these -headers is to allow hardware (GPU) encoding with suitable NVidia -cards. This version corresponds to Video Codec SDK version 11.1.5 -and requires NVidia drivers version 470.57.02 or newer. - -There are 3 stages in the history of NVidia GPU encoding with FFmpeg: - - 1. Pre August 27th 2016 it was necessary to track down your own - headers to build nvenc. - 2. Post August 27th 2016 the required headers were incorporated - as part of the FFmpeg source. - 3. Post February 26th 2018 the NVidia headers were removed from - the FFmpeg source and a separate git repository was created - to hold continuing work with these headers. - -This nv-codec-headers script is for point 3 where the headers will -need to be installed before compiling a recent FFmpeg. diff --git a/libraries/nv-codec-headers/nv-codec-headers.info b/libraries/nv-codec-headers/nv-codec-headers.info deleted file mode 100644 index 47f4502ae1..0000000000 --- a/libraries/nv-codec-headers/nv-codec-headers.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nv-codec-headers" -VERSION="11.1.5.2" -HOMEPAGE="https://github.com/FFmpeg/nv-codec-headers" -DOWNLOAD="https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.1.5.2/nv-codec-headers-11.1.5.2.tar.gz" -MD5SUM="94fd5479bf934595530d9bfae93c1c55" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andrew Strong" -EMAIL="andrew.david.strong@gmail.com" diff --git a/libraries/nv-codec-headers/slack-desc b/libraries/nv-codec-headers/slack-desc deleted file mode 100644 index 8187a52c58..0000000000 --- a/libraries/nv-codec-headers/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -nv-codec-headers: nv-codec-headers (FFmpeg version of Nvidia Codec SDK headers) -nv-codec-headers: -nv-codec-headers: FFmpeg version of headers required to interface with Nvidia's -nv-codec-headers: codec APIs. Corresponds to Video Codec SDK version 11.1.5. -nv-codec-headers: -nv-codec-headers: -nv-codec-headers: -nv-codec-headers: https://github.com/FFmpeg/nv-codec-headers -nv-codec-headers: -nv-codec-headers: -nv-codec-headers: diff --git a/libraries/nx-libs/nx-libs.SlackBuild b/libraries/nx-libs/nx-libs.SlackBuild index fbc40c8eb6..9a97d06a8a 100644 --- a/libraries/nx-libs/nx-libs.SlackBuild +++ b/libraries/nx-libs/nx-libs.SlackBuild @@ -34,12 +34,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nx-libs -VERSION=${VERSION:-3.5.99.26} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.5.99.27} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -SRCVERSION=$(echo $VERSION | tr _ - ) +SRCVERSION=$(echo $VERSION | tr - _ ) if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -81,7 +81,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$SRCVERSION -tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz +tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.?z cd $PRGNAM-$SRCVERSION chown -R root:root . find -L . \ @@ -90,14 +90,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix for the newer binutils (no more l flag for ar) -sed -i -e "s|ArCmdBase\ clq|ArCmdBase cq|" \ - -e "s|ArCmdBase\ rul|ArCmdBase ru|" \ - -e "s|ArCmdBase\ xl|ArCmdBase x|" \ - nx-X11/config/cf/Imake.tmpl - # Fix man install dir -sed -i "s|share/man|man|g" Makefile +sed -i "s|share/man|man|g" Makefile || exit 1 make -j1 CONFIGURE="./configure --libdir=/usr/lib${LIBDIRSUFFIX} --prefix=/usr --mandir=/usr/man" PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} IMAKE_DEFINES="-DUseTIRPC=YES" diff --git a/libraries/nx-libs/nx-libs.info b/libraries/nx-libs/nx-libs.info index 61974a26a5..71d383bb48 100644 --- a/libraries/nx-libs/nx-libs.info +++ b/libraries/nx-libs/nx-libs.info @@ -1,8 +1,8 @@ PRGNAM="nx-libs" -VERSION="3.5.99.26" +VERSION="3.5.99.27" HOMEPAGE="http://www.x2go.org" -DOWNLOAD="https://github.com/ArcticaProject/nx-libs/archive/3.5.99.26/nx-libs-3.5.99.26.tar.gz" -MD5SUM="ce874313e69f1a0f8c09c7363b006f66" +DOWNLOAD="https://github.com/ArcticaProject/nx-libs/archive/3.5.99.27/nx-libs-3.5.99.27.tar.gz" +MD5SUM="f4b73c5e904a14388916d153effb6f69" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/opencl-amd/opencl-amd.info b/libraries/opencl-amd/opencl-amd.info index 15f6c25ea6..8ff03f005d 100644 --- a/libraries/opencl-amd/opencl-amd.info +++ b/libraries/opencl-amd/opencl-amd.info @@ -1,8 +1,8 @@ PRGNAM="opencl-amd" VERSION="22.20.3" HOMEPAGE="https://docs.amd.com/bundle/ROCm-Release-Notes-v5.2/page/About_This_Document.html" -DOWNLOAD="https://repo.radeon.com/amdgpu/22.20.3/ubuntu/pool/main/libd/libdrm-amdgpu/libdrm-amdgpu-amdgpu1_2.4.110.50203-1462318~22.04_amd64.deb" -MD5SUM="cd291312140d06b001381991c3e6ce24" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" DOWNLOAD_x86_64="https://repo.radeon.com/amdgpu/22.20.3/ubuntu/pool/main/libd/libdrm-amdgpu/libdrm-amdgpu-amdgpu1_2.4.110.50203-1462318~22.04_amd64.deb \ https://repo.radeon.com/rocm/apt/5.2.3/pool/main/r/rocm-core/rocm-core_5.2.3.50203-109_amd64.deb \ https://repo.radeon.com/rocm/apt/5.2.3/pool/main/c/comgr/comgr_2.4.0.50203-109_amd64.deb \ diff --git a/libraries/openvdb/openvdb.info b/libraries/openvdb/openvdb.info index f27cbec8cb..88e5891ac6 100644 --- a/libraries/openvdb/openvdb.info +++ b/libraries/openvdb/openvdb.info @@ -1,10 +1,10 @@ PRGNAM="openvdb" VERSION="10.0.1" HOMEPAGE="https://github.com/AcademySoftwareFoundation/openvdb/" -DOWNLOAD="https://github.com/AcademySoftwareFoundation/openvdb/archive/v10.0.1/openvdb-10.0.1.tar.gz" -MD5SUM="0239ff0c912a3eac76bd6a4ae1b03522" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/AcademySoftwareFoundation/openvdb/archive/v10.0.1/openvdb-10.0.1.tar.gz" +MD5SUM_x86_64="0239ff0c912a3eac76bd6a4ae1b03522" REQUIRES="c-blosc tbb glfw3" MAINTAINER="Lockywolf" EMAIL="for_sbo.openvdb_2023-07-12@lockywolf.net" diff --git a/libraries/openvino/README b/libraries/openvino/README new file mode 100644 index 0000000000..5370ef436e --- /dev/null +++ b/libraries/openvino/README @@ -0,0 +1,9 @@ +OpenVINO is an open-source toolkit for optimizing and deploying AI +inference. + +Supported hardware: +https://docs.openvino.ai/2024/about-openvino/system-requirements.html + +The dependency oneTBB needs to be compiled with its optional +dependency hwloc, otherwise libtbbbind-2.5 is missing and openvino +will fail to build. diff --git a/libraries/openvino/openvino.SlackBuild b/libraries/openvino/openvino.SlackBuild new file mode 100644 index 0000000000..e05fe6fbfa --- /dev/null +++ b/libraries/openvino/openvino.SlackBuild @@ -0,0 +1,181 @@ +#!/bin/bash + +# Slackware build script for openvino + +# Copyright 2024 Johannes Schoepfer, Germany +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=openvino +VERSION=${VERSION:-2024.1.0} +VERSION_FLATBUFFERS=24.3.25 +VERSION_ONNX=1.16.0 +VERSION_ITTAPI=3.24.4 +COMMIT_ONEDNN=26633ae49edd4353a29b7170d9fcef6b2d79f4b3 +COMMIT_MLAS=d1bc25ec4660cddd87804fcf03b2411b5dfb2e94 +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z +cd $PRGNAM-$VERSION + +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} + -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + + +# Flatbuffers from SBo provide broken cmake files(static-lib removed but static-lib-cmake-files not removed) +( +cd thirdparty/flatbuffers/ +rmdir flatbuffers +tar vxf $CWD/flatbuffers-$VERSION_FLATBUFFERS.tar.gz +ln -s flatbuffers-$VERSION_FLATBUFFERS flatbuffers +) +## onnx frontend +( +cd thirdparty/onnx/ +rmdir onnx +tar vxf $CWD/onnx-$VERSION_ONNX.tar.gz +ln -s onnx-$VERSION_ONNX onnx +) +# ittapi +( +cd thirdparty/ittapi/ +rmdir ittapi +tar vxf $CWD/ittapi-$VERSION_ITTAPI.tar.gz +ln -s ittapi-$VERSION_ITTAPI ittapi +) +# mlas for cpu inference device +( +cd src/plugins/intel_cpu/thirdparty +rmdir mlas +tar vxf $CWD/mlas-$COMMIT_MLAS.tar.gz +ln -s mlas-$COMMIT_MLAS mlas +) +# oneDNN for cpu inference device +# oneDNN supports 64 bit platforms only +if [ "$LIBDIRSUFFIX" == 64 ]; then + CPU=ON + GPU=ON + ( + cd src/plugins/intel_cpu/thirdparty + rmdir onednn + tar vxf $CWD/oneDNN-$COMMIT_ONEDNN.tar.gz + ln -s oneDNN-$COMMIT_ONEDNN onednn + ) + # oneDNN for gpu inference device, original project + ( + cd src/plugins/intel_gpu/thirdparty + rmdir onednn_gpu + tar vxf $CWD/oneDNN-$COMMIT_ONEDNN.tar.gz + ln -s oneDNN-$COMMIT_ONEDNN onednn + ) +else + CPU=OFF + GPU=OFF +fi + +mkdir -p build +cd build + unshare -n cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_INSTALL_PREFIX=/usr/share/openvino \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DONNX_ML=ON \ + -DENABLE_SYSTEM_SNAPPY=ON \ + -DENABLE_SYSTEM_TBB=ON \ + -DENABLE_SYSTEM_PROTOBUF=ON \ + -DENABLE_SYSTEM_PUGIXML=ON \ + -DProtobuf_LIBRARY=/usr/lib$LIBDIRSUFFIX/libprotobuf.so \ + -DENABLE_PROFILING_ITT=ON \ + -DENABLE_TBBBIND_2_5=OFF \ + -DENABLE_JS=OFF \ + -DENABLE_SAMPLES=OFF \ + -DENABLE_INTEL_CPU=$CPU \ + -DENABLE_INTEL_GPU=$GPU \ + -DENABLE_INTEL_NPU=OFF \ + -DENABLE_ONEDNN_FOR_GPU=OFF \ + -Wno-dev \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. + +# We don't build samples, so we remove samples stub files +rm -rf $PKG/usr/share/openvino/samples + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/openvino/openvino.info b/libraries/openvino/openvino.info new file mode 100644 index 0000000000..01a9c32ad4 --- /dev/null +++ b/libraries/openvino/openvino.info @@ -0,0 +1,20 @@ +PRGNAM="openvino" +VERSION="2024.1.0" +HOMEPAGE="https://github.com/openvinotoolkit/openvino/" +DOWNLOAD="https://github.com/openvinotoolkit/openvino/archive/2024.1.0/openvino-2024.1.0.tar.gz \ + https://github.com/openvinotoolkit/mlas/archive/d1bc25e/mlas-d1bc25ec4660cddd87804fcf03b2411b5dfb2e94.tar.gz \ + https://github.com/openvinotoolkit/onednn/archive/26633ae/oneDNN-26633ae49edd4353a29b7170d9fcef6b2d79f4b3.tar.gz \ + https://github.com/google/flatbuffers/archive/v24.3.25/flatbuffers-24.3.25.tar.gz \ + https://github.com/onnx/onnx/archive/v1.16.0/onnx-1.16.0.tar.gz \ + https://github.com/intel/ittapi/archive/v3.24.4/ittapi-3.24.4.tar.gz" +MD5SUM="459481c0b3f7fe3fcc2be799fe413308 \ + 0e87473410db355fd9251a2e1337dc32 \ + 2cbdb4f80608959b3c013bab745bb807 \ + f28f12fc16c72f4e7c22066a35405c3a \ + 5ef5a7bd4f9dad914bddc3b4335a67cd \ + aec402d3441bb8ecb9c8e75bab6cc102" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="protobuf3 oneTBB xbyak pugixml snappy pybind11 OpenCL-CLHPP" +MAINTAINER="Johannes Schoepfer" +EMAIL="slackbuilds@schoepfer.info" diff --git a/python/PyGithub/slack-desc b/libraries/openvino/slack-desc index 2efeb97996..d5180cdf26 100644 --- a/python/PyGithub/slack-desc +++ b/libraries/openvino/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -PyGithub: PyGithub (Library to use Github API v3) -PyGithub: -PyGithub: PyGithub is a Python library to access the full Github API v3. -PyGithub: -PyGithub: Homepage: https://pygithub.readthedocs.io/en/latest/ -PyGithub: -PyGithub: -PyGithub: -PyGithub: -PyGithub: -PyGithub: +openvino: openvino (toolkit for optimizing and deploying AI inference) +openvino: +openvino: OpenVINO is an open-source toolkit for optimizing and deploying AI +openvino: inference. +openvino: +openvino: Supported hardware: +openvino: https://docs.openvino.ai/2024/about-openvino/system-requirements.html +openvino: +openvino: +openvino: https://github.com/openvinotoolkit/openvino/ +openvino: diff --git a/libraries/pcl/pcl.SlackBuild b/libraries/pcl/pcl.SlackBuild index c99211b384..fad32479ee 100644 --- a/libraries/pcl/pcl.SlackBuild +++ b/libraries/pcl/pcl.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2017 Nikolay Nikolov <nikobnikolov[at]gmail[dot]com> # All rights reserved. -# Copyright 2019 Chriastoph Willing Brisbane, Australia +# Copyright 2019-2024 Christoph Willing Sydney, Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pcl -VERSION=${VERSION:-1.12.1} +VERSION=${VERSION:-1.14.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/pcl/pcl.info b/libraries/pcl/pcl.info index 02a97014de..5a6657f92c 100644 --- a/libraries/pcl/pcl.info +++ b/libraries/pcl/pcl.info @@ -1,8 +1,8 @@ PRGNAM="pcl" -VERSION="1.12.1" +VERSION="1.14.0" HOMEPAGE="http://www.pointclouds.org/" -DOWNLOAD="https://github.com/PointCloudLibrary/pcl/archive/pcl-1.12.1/pcl-pcl-1.12.1.tar.gz" -MD5SUM="eb1be79330872f9674c9850bb35023bf" +DOWNLOAD="https://github.com/PointCloudLibrary/pcl/archive/pcl-1.14.0/pcl-pcl-1.14.0.tar.gz" +MD5SUM="b0a73380e878837916a782c8ee807ab6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="flann VTK" diff --git a/libraries/podofo/XRefStrParObj-deprecated.patch b/libraries/podofo/XRefStrParObj-deprecated.patch deleted file mode 100644 index d2a74b68b5..0000000000 --- a/libraries/podofo/XRefStrParObj-deprecated.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -Naur podofo-0.9.6.orig/src/base/PdfXRefStreamParserObject.h podofo-0.9.6/src/base/PdfXRefStreamParserObject.h ---- podofo-0.9.6.orig/src/base/PdfXRefStreamParserObject.h 2014-06-06 22:13:22.000000000 +0000 -+++ podofo-0.9.6/src/base/PdfXRefStreamParserObject.h 2020-05-03 02:26:01.119538387 +0000 -@@ -47,8 +47,11 @@ - * an XRef stream object. - * - * It is mainly here to make PdfParser more modular. -+ * This is only marked PODOFO_API for the benefit of the tests, -+ * the class is for internal use only. It is deprecated, so -+ * don't ever rely on it (i.e. externally or in PoDoFo tools). - */ --class PdfXRefStreamParserObject : public PdfParserObject { -+class PODOFO_DEPRECATED PODOFO_API PdfXRefStreamParserObject : public PdfParserObject { - public: - - /** Parse the object data from the given file handle starting at -diff -Naur podofo-0.9.6.orig/src/base/podofoapi.h podofo-0.9.6/src/base/podofoapi.h ---- podofo-0.9.6.orig/src/base/podofoapi.h 2017-10-27 06:38:19.000000000 +0000 -+++ podofo-0.9.6/src/base/podofoapi.h 2020-05-03 02:27:03.874537513 +0000 -@@ -173,9 +173,22 @@ - - /* Set up some other compiler-specific but not platform-specific macros */ - --#if defined(__GNUC__) -- /* gcc will issue a warning if a function or variable so annotated is used */ -- #define PODOFO_DEPRECATED __attribute__((deprecated)) -+#ifdef __GNU__ -+ #define PODOFO_HAS_GCC_ATTRIBUTE_DEPRECATED 1 -+#elif defined(__has_attribute) -+ #if __has_attribute(__deprecated__) -+ #define PODOFO_HAS_GCC_ATTRIBUTE_DEPRECATED 1 -+ #endif -+#endif -+ -+#ifdef PODOFO_HAS_GCC_ATTRIBUTE_DEPRECATED -+ /* gcc (or compat. clang) will issue a warning if a function or variable so annotated is used */ -+ #define PODOFO_DEPRECATED __attribute__((__deprecated__)) -+#else -+ #define PODOFO_DEPRECATED -+#endif -+ -+#ifdef __GNU__ - /* gcc can do some additional optimisations on functions annotated as pure. - * See the documentation on __attribute__((pure)) in the gcc docs. */ - #define PODOFO_PURE_FUNCTION __attribute__((pure)) -@@ -185,9 +198,12 @@ - * (see CODINGSTYLE.txt) .*/ - #define PODOFO_NOTHROW __attribute__((nothrow)) - #else -- #define PODOFO_DEPRECATED -- #define PODOFO_PURE_FUNCTION -- #define PODOFO_NOTHROW __declspec(nothrow) -+ #define PODOFO_PURE_FUNCTION -+ #ifdef _MSC_VER -+ #define PODOFO_NOTHROW __declspec(nothrow) -+ #else -+ #define PODOFO_NOTHROW -+ #endif - #endif - - // Peter Petrov 27 April 2008 diff --git a/libraries/podofo/gcc12.patch b/libraries/podofo/gcc12.patch new file mode 100644 index 0000000000..1bd71721e3 --- /dev/null +++ b/libraries/podofo/gcc12.patch @@ -0,0 +1,39 @@ +From d0e9f5d503b0cb79516ec9bff989f3d7d625b678 Mon Sep 17 00:00:00 2001 +From: Pino Toscano <toscano.pino@tiscali.it> +Date: Sun, 14 Aug 2022 08:27:13 +0200 +Subject: [PATCH] Fix declaration of operator<< for PoDoFo::PdfString + +Since PdfString is in the PoDoFo namespace, the operator<< for it must +be in the same namespace as well, otherwise it is not found. In +particular, operator<<(std::ostream&) is needed by cppunit as a way to +get the string representation of an arbitrary type, when using +CPPUNIT_ASSERT_EQUAL() on instances of it. + +This used to work with GCC until 11 because of a buggy behaviour. +GCC 12 fixed it [1], causing this test to fail to build with it. + +[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51577 +--- + test/unit/StringTest.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/test/unit/StringTest.cpp b/test/unit/StringTest.cpp +index a7841f78..b52b7880 100644 +--- a/test/unit/StringTest.cpp ++++ b/test/unit/StringTest.cpp +@@ -29,11 +29,15 @@ using namespace PoDoFo; + // Registers the fixture into the 'registry' + CPPUNIT_TEST_SUITE_REGISTRATION( StringTest ); + ++namespace PoDoFo { ++ + inline std::ostream& operator<<(std::ostream& o, const PdfString& s) + { + return o << s.GetStringUtf8(); + } + ++} ++ + void StringTest::setUp() + { + } diff --git a/libraries/podofo/podofo.SlackBuild b/libraries/podofo/podofo.SlackBuild index 8484a157da..d425cbd091 100644 --- a/libraries/podofo/podofo.SlackBuild +++ b/libraries/podofo/podofo.SlackBuild @@ -29,8 +29,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=podofo -VERSION=${VERSION:-0.9.6} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.9.8} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,12 +80,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -sed -i "s/BINARY_DIR}\/objects\"/BINARY_DIR}\/objects\" || true/" test/TokenizerTest/CMakeLists.txt +# Thanks to chrisretusn on LQ! +patch -p1 < $CWD/gcc12.patch + +sed -i "s/BINARY_DIR}\/objects\"/BINARY_DIR}\/objects\" || true/" test/TokenizerTest/CMakeLists.txt || exit 1 # Fix mandir directory. -sed -i 's|share/man|man|' CMakeLists.txt -# Ref: https://sourceforge.net/p/podofo/tickets/28/ -patch -p1 < $CWD/XRefStrParObj-deprecated.patch +sed -i 's|share/man|man|' CMakeLists.txt || exit 1 mkdir build cd build @@ -96,7 +97,6 @@ cd build -DPODOFO_BUILD_STATIC:BOOL=FALSE \ -DPODOFO_BUILD_SHARED:BOOL=TRUE \ -DPODOFO_USE_VISIBILITY:BOOL=1 \ - -DCMAKE_CXX_STANDARD:STRING=11 \ -DWANT_BOOST:BOOL=1 \ -DLIB_SUFFIX:STRING="$LIBDIRSUFFIX" \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/libraries/podofo/podofo.info b/libraries/podofo/podofo.info index 5a97ef24ef..5d3f34b904 100644 --- a/libraries/podofo/podofo.info +++ b/libraries/podofo/podofo.info @@ -1,8 +1,8 @@ PRGNAM="podofo" -VERSION="0.9.6" +VERSION="0.9.8" HOMEPAGE="http://podofo.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/podofo/podofo-0.9.6.tar.gz" -MD5SUM="46336fc4c4ce4be814bb5fbb4d918334" +DOWNLOAD="http://downloads.sourceforge.net/podofo/podofo-0.9.8.tar.gz" +MD5SUM="f6d3d5f917c7150c44fc6a15848442dd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/python-xlrd/python-xlrd.SlackBuild b/libraries/python-xlrd/python-xlrd.SlackBuild index 8fac848819..2a6a1bfa39 100644 --- a/libraries/python-xlrd/python-xlrd.SlackBuild +++ b/libraries/python-xlrd/python-xlrd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xlrd -# Copyright 2014-2017 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python-xlrd SCRNAM=$(echo $PRGNAM | cut -c8-11) -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-2.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,7 +80,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG +python2 setup.py install --root=$PKG +python3 setup.py install --root=$PKG if $(python3 -c 'import sys' 2>/dev/null); then python3 setup.py install --root=$PKG @@ -90,7 +91,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a PKG-INFO README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/python-xlrd/python-xlrd.info b/libraries/python-xlrd/python-xlrd.info index b080ab21e9..fb284b4ff7 100644 --- a/libraries/python-xlrd/python-xlrd.info +++ b/libraries/python-xlrd/python-xlrd.info @@ -1,10 +1,10 @@ PRGNAM="python-xlrd" -VERSION="1.1.0" +VERSION="2.0.1" HOMEPAGE="http://www.python-excel.org/" -DOWNLOAD="https://pypi.python.org/packages/86/cf/bb010f16cefa8f26ac9329ca033134bcabc7a27f5c3d8de961bacc0f80b3/xlrd-1.1.0.tar.gz" -MD5SUM="b85c9916ac755cad489a9005f5a0d390" +DOWNLOAD="https://files.pythonhosted.org/packages/a6/b3/19a2540d21dea5f908304375bd43f5ed7a4c28a370dc9122c565423e6b44/xlrd-2.0.1.tar.gz" +MD5SUM="ae3f951c857a490d432f0a7d722352bf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild index ae25564038..dd2896ec54 100644 --- a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild +++ b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild @@ -85,14 +85,13 @@ export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5 export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" -python3 configure.py \ - --verbose \ - -q /usr/bin/qmake-qt5 \ - --sip=/usr/bin/sip3 \ - --sip-incdir=$(pkg-config --cflags-only-I python3 | sed 's/^-I//') - +sip-build \ + --no-make \ + --api-dir /usr/share/qt5/qsci/api/python +cd build make -make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG +make INSTALL_ROOT="$PKG" install +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/libraries/python3-plumbum/python3-plumbum.SlackBuild b/libraries/python3-plumbum/python3-plumbum.SlackBuild index c0b05b63d8..e2e122d53b 100644 --- a/libraries/python3-plumbum/python3-plumbum.SlackBuild +++ b/libraries/python3-plumbum/python3-plumbum.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-plumbum -# Copyright 2022-2023 fourtysixandtwo <fourtysixandtwo@sliderr.net> +# Copyright 2022-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-plumbum SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.8.2} +VERSION=${VERSION:-1.8.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,23 +50,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG diff --git a/libraries/python3-plumbum/python3-plumbum.info b/libraries/python3-plumbum/python3-plumbum.info index 71c973a35d..dffb0c0c36 100644 --- a/libraries/python3-plumbum/python3-plumbum.info +++ b/libraries/python3-plumbum/python3-plumbum.info @@ -1,8 +1,8 @@ PRGNAM="python3-plumbum" -VERSION="1.8.2" +VERSION="1.8.3" HOMEPAGE="http://plumbum.readthedocs.org" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/plumbum/plumbum-1.8.2.tar.gz" -MD5SUM="9484ac142c2a637e5d397040a22a6907" +DOWNLOAD="https://files.pythonhosted.org/packages/source/p/plumbum/plumbum-1.8.3.tar.gz" +MD5SUM="02ac5ff47e1a20105b24e9f9b6be3b8e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-hatch_vcs" diff --git a/libraries/pytorch/README b/libraries/pytorch/README new file mode 100644 index 0000000000..a27962167a --- /dev/null +++ b/libraries/pytorch/README @@ -0,0 +1,3 @@ +Deep neural networks built on a tape-based autograd system. + +This package is a library build, supporting CPU(not GPU). diff --git a/libraries/zxing-cpp/zxing-cpp.SlackBuild b/libraries/pytorch/pytorch.SlackBuild index d5acf0cfcd..76967ea5c5 100644 --- a/libraries/zxing-cpp/zxing-cpp.SlackBuild +++ b/libraries/pytorch/pytorch.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for zxing-cpp +# Slackware build script for pytorch -# Copyright 2023 Bloyburt +# Copyright 2024 Johannes Schoepfer, Germany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,12 +24,11 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=zxing-cpp -VERSION=${VERSION:-2.2.1} -BUILD=${BUILD:-2} +PRGNAM=pytorch +VERSION=${VERSION:-2.3.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -STBVER=${STBVER:-03f50e343d796e492e6579a11143a085429d7f5d} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -39,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -53,19 +49,18 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then +elif [ "$ARCH" = "aarch64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then +elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e @@ -73,41 +68,63 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION - -# Use a local version of the stb image library -patch zxing.cmake $CWD/zxing.cmake.patch -cp -a $CWD/stb-$STBVER.tar.gz . -tar xvf stb-$STBVER.tar.gz -mv stb-$STBVER stb-src - +rm -rf v$PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz +cd $PRGNAM-v$VERSION chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +chmod -R u+w,go-w,a+rX-st $PKG + +# Fix cmake libdir location +sed -i c10/CMakeLists.txt \ + -e "s;DESTINATION lib;DESTINATION lib$LIBDIRSUFFIX;g" mkdir -p build cd build - cmake \ + unshare -n cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DLIBSHM_INSTALL_LIB_SUBDIR="lib$LIBDIRSUFFIX" \ + -DTORCH_INSTALL_LIB_DIR="lib$LIBDIRSUFFIX" \ + -DPYTHON_EXECUTABLE=$(which python3) \ + -DBUILD_TEST=OFF \ + -DBUILD_CAFFE2=OFF \ + -DBUILD_CAFFE2_OPS=OFF \ + -DBUILD_PYTHON=OFF \ + -DBUILD_CUSTOM_PROTOBUF=OFF \ + -DUSE_CUDA=OFF \ + -DUSE_CUDNN=OFF \ + -DUSE_FBGEMM=OFF \ + -DUSE_FFMPEG=ON \ + -DUSE_KINETO=OFF \ + -DUSE_MKLDNN=OFF \ + -DUSE_MPI=OFF \ + -DUSE_NCCL=OFF \ + -DUSE_NNPACK=OFF \ + -DUSE_OPENMP=OFF \ + -DUSE_OPENCL=ON \ + -DUSE_OPENCV=ON \ + -DUSE_PTHREADPOOL=OFF \ + -DUSE_PYTORCH_QNNPACK=OFF \ + -DUSE_QNNPACK=OFF \ + -DUSE_SYSTEM_TBB=ON \ + -DUSE_XNNPACK=OFF \ + -Wno-dev \ + -DUSE_DISTRIBUTED=OFF \ -DCMAKE_BUILD_TYPE=Release .. make - make install/strip DESTDIR=$PKG + make install/strip DESTDIR=tmpxxx + + mkdir -p $PKG/usr + mv tmpxxx/usr/include $PKG/usr + mkdir -p $PKG/usr/share + mv tmpxxx/usr/share/cmake $PKG/usr/share + mkdir -p $PKG/usr/lib$LIBDIRSUFFIX + mv tmpxxx/usr/lib$LIBDIRSUFFIX/*.so $PKG/usr/lib$LIBDIRSUFFIX cd .. -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE NOTICE README.md RELEASE.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/pytorch/pytorch.info b/libraries/pytorch/pytorch.info new file mode 100644 index 0000000000..f8cd244420 --- /dev/null +++ b/libraries/pytorch/pytorch.info @@ -0,0 +1,10 @@ +PRGNAM="pytorch" +VERSION="2.3.0" +HOMEPAGE="https://pytorch.org/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/pytorch/pytorch/releases/download/v2.3.0/pytorch-v2.3.0.tar.gz" +MD5SUM_x86_64="786047d07da744410eb41493a1cd0687" +REQUIRES="oneTBB protobuf3 OpenBLAS typing-extensions" +MAINTAINER="Johannes Schoepfer" +EMAIL="slackbuilds@schoepfer.info" diff --git a/python/path.py/slack-desc b/libraries/pytorch/slack-desc index c85172b889..72ee22b524 100644 --- a/python/path.py/slack-desc +++ b/libraries/pytorch/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -path.py: path.py (A module wrapper for os.path) -path.py: -path.py: path.py implements a path objects as first-class entities, -path.py: allowing common operations on files to be invoked on those -path.py: path objects directly. -path.py: -path.py: Homepage: https://github.com/jaraco/path.py -path.py: -path.py: -path.py: -path.py: +pytorch: pytorch (Tensors and Dynamic neural networks in Python) +pytorch: +pytorch: Deep neural networks built on a tape-based autograd system. +pytorch: +pytorch: This package is a library build, supporting CPU(not GPU). +pytorch: +pytorch: +pytorch: +pytorch: +pytorch: https://pytorch.org +pytorch: diff --git a/libraries/qt5gtk2/README b/libraries/qt5gtk2/README new file mode 100644 index 0000000000..469995df24 --- /dev/null +++ b/libraries/qt5gtk2/README @@ -0,0 +1,4 @@ +GTK+2.0 integration plugin for Qt5. + +qt5gtk2 contains a newer gtk2 integration theme than that from +qt5-styleplugins. diff --git a/python/pyPdf/pyPdf.SlackBuild b/libraries/qt5gtk2/qt5gtk2.SlackBuild index c8e815cc5c..1fa574f679 100644 --- a/python/pyPdf/pyPdf.SlackBuild +++ b/libraries/qt5gtk2/qt5gtk2.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for pyPdf +# Slackware build script for qt5gtk2 -# Copyright (c) 2017 Alan Alberghini <414N@slacky.it> +# Copyright 2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,26 +21,15 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# ----------------------------------------------------------------------------- -# -# Build history: -# -# 1 - Initial release. cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=pyPdf -VERSION=${VERSION:-1.13} +PRGNAM=qt5gtk2 +VERSION=${VERSION:-1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -DOCS="README CHANGELOG" - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -54,6 +43,10 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -74,22 +67,29 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +QMAKE_CFLAGS_RELEASE="$SLKCFLAGS" \ +QMAKE_CXXFLAGS_RELEASE="$SLKCFLAGS" \ +PREFIX=/usr \ +LIBDIR=/usr/lib${LIBDIRSUFFIX} \ +qmake-qt5 -python setup.py install --root=$PKG +make +make install INSTALL_ROOT=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/qt5gtk2/qt5gtk2.info b/libraries/qt5gtk2/qt5gtk2.info new file mode 100644 index 0000000000..7b6ff6acb2 --- /dev/null +++ b/libraries/qt5gtk2/qt5gtk2.info @@ -0,0 +1,10 @@ +PRGNAM="qt5gtk2" +VERSION="1.0" +HOMEPAGE="https://github.com/trialuser02/qt5gtk2" +DOWNLOAD="https://github.com/trialuser02/qt5gtk2/releases/download/1.0/qt5gtk2-1.0.tar.bz2" +MD5SUM="c1955cf5386da6f329368f2d548b906b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu@protonmail.com" diff --git a/libraries/dav1d/slack-desc b/libraries/qt5gtk2/slack-desc index b9ef7d3079..579c25129a 100644 --- a/libraries/dav1d/slack-desc +++ b/libraries/qt5gtk2/slack-desc @@ -5,15 +5,15 @@ # You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. - |-----handy-ruler------------------------------------------------------| -dav1d: dav1d (AV1 decoder) -dav1d: -dav1d: dav1d is an AV1 decoder focused on speed and correctness. -dav1d: -dav1d: Homepage: https://code.videolan.org/videolan/dav1d -dav1d: -dav1d: -dav1d: -dav1d: -dav1d: -dav1d: + |-----handy-ruler------------------------------------------------------| +qt5gtk2: qt5gtk2 (GTK+2.0 integration plugin for Qt5) +qt5gtk2: +qt5gtk2: GTK+2.0 integration plugin for Qt5. +qt5gtk2: +qt5gtk2: +qt5gtk2: +qt5gtk2: +qt5gtk2: +qt5gtk2: +qt5gtk2: +qt5gtk2: diff --git a/libraries/qt6/README b/libraries/qt6/README deleted file mode 100644 index b73df851a7..0000000000 --- a/libraries/qt6/README +++ /dev/null @@ -1,39 +0,0 @@ -Qt is a cross-platform application development framework for desktop, -embedded and mobile. Supported Platforms include Linux, OS X, -Windows, VxWorks, QNX, Android, iOS, BlackBerry, Sailfish OS and -others. - -Qt is not a programming language on its own. It is a framework written -in C++. A preprocessor, the MOC (Meta-Object Compiler), is used to -extend the C++ language with features like signals and slots. Before -the compilation step, the MOC parses the source files written in -Qt-extended C++ and generates standard compliant C++ sources from -them. Thus the framework itself and applications/libraries using it -can be compiled by any standard compliant C++ compiler like Clang, -GCC, ICC, MinGW and MSVC. - -Qt6 has a compiler cache option when building. By default, this -behavior is disabled. To enable it, pass CCACHE=ON to the build script. -Unless you are building qt6 multiple times, you should leave this -option OFF. - -Examples are disabled by default. To build them, pass EXAMPLES=ON -to the build script. - -When building Qt's webengine, proprietary codecs are disabled by -default. To enable them, pass PROPRIETARY_CODECS=ON to the build -script. This will make the resulting package non-redistributable. - -Qt6 requires 16GB of RAM to build, and a minimum of 40GB of available -disk storage. Disk storage requirements may increase when built -against optional dependencies. - -Qt6 will autodetect and build against multiple external programs and -libraries. To see a list of optional dependencies, please consult -README.SLACKWARE - -Qt6 can take substantial time to build and ninja automatically uses -all of your cpus power to speed up this process: if for some reason -this ends up trashing the machine on which you are building it you -can export the environment variable CMAKE_BUILD_PARALLEL_LEVEL to -set an appropriate number of parallel jobs. diff --git a/libraries/qt6/README.SLACKWARE b/libraries/qt6/README.SLACKWARE deleted file mode 100644 index 0c4a8679c3..0000000000 --- a/libraries/qt6/README.SLACKWARE +++ /dev/null @@ -1,35 +0,0 @@ -Slackware 15.0's version of clang fails to compile qt6, due to the -following error: - -Linking CXX executable qtbase/lib64/bin/lupdate -/usr/bin/ld: CMakeFiles/lupdate.dir/cpp_clang.cpp.o: undefined - reference to symbol '_ZTIN5clang7tooling21FrontendActionFactoryE' -/usr/bin/ld: /usr/lib64/libclangTooling.so.13: error adding symbols: - DSO missing from command line -clang-13: error: linker command failed with exit code 1 - -To remedy this, Qt provides a prebuilt clang package that we bootstrap -against. - -Qt6 will compile with multiple optional dependencies, such as: - - assimp - (*)db2 - (*)cerence - (*)directfb - (*)gn - (*)interbase - libb2 - (*)litehtml - (*)lttn-ust - mold - postgresql - (*)sensorfw - (*)s-log2 - snappy - (*)tslib - xmlstarlet - - ...and possibly others. - -(*) = not available from SBo at the time of writing. diff --git a/libraries/qt6/desktop/assistant-qt6.desktop b/libraries/qt6/desktop/assistant-qt6.desktop deleted file mode 100644 index 32a48bd1cd..0000000000 --- a/libraries/qt6/desktop/assistant-qt6.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Qt6 Assistant -Comment=Shows Qt6 documentation and examples -Exec=/usr/lib@LIBDIR@/qt6/bin/assistant -Icon=assistant-qt6 -Terminal=false -Type=Application -Categories=Qt;Development;Documentation; diff --git a/libraries/qt6/desktop/designer-qt6.desktop b/libraries/qt6/desktop/designer-qt6.desktop deleted file mode 100644 index 3287bad25f..0000000000 --- a/libraries/qt6/desktop/designer-qt6.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt6 Designer -GenericName=Interface Designer -Comment=Design GUIs for Qt6 applications -Exec=/usr/lib@LIBDIR@/qt6/bin/designer -Icon=designer-qt6 -MimeType=application/x-designer; -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/libraries/qt6/desktop/linguist-qt6.desktop b/libraries/qt6/desktop/linguist-qt6.desktop deleted file mode 100644 index 837a24cf77..0000000000 --- a/libraries/qt6/desktop/linguist-qt6.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt6 Linguist -Comment=Add translations to Qt6 applications -Exec=/usr/lib@LIBDIR@/qt6/bin/linguist -Icon=linguist-qt6 -MimeType=text/vnd.trolltech.linguist;application/x-linguist; -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/libraries/qt6/desktop/qdbusviewer-qt6.desktop b/libraries/qt6/desktop/qdbusviewer-qt6.desktop deleted file mode 100644 index 7ec65d117b..0000000000 --- a/libraries/qt6/desktop/qdbusviewer-qt6.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt6 QDbusViewer -GenericName=Qt6 D-Bus Debugger -Comment=Debug D-Bus applications -Exec=/usr/lib@LIBDIR@/qt6/bin/qdbusviewer -Icon=qdbusviewer-qt6 -Terminal=false -Type=Application -Categories=Qt;Development;Debugger; diff --git a/libraries/qt6/doinst.sh b/libraries/qt6/doinst.sh deleted file mode 100644 index 65c7e2eeb9..0000000000 --- a/libraries/qt6/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/libraries/qt6/newer_protobuf_1.patch b/libraries/qt6/newer_protobuf_1.patch deleted file mode 100644 index a5f24bf302..0000000000 --- a/libraries/qt6/newer_protobuf_1.patch +++ /dev/null @@ -1,58 +0,0 @@ -Backported to 6.5.2 from 1a610ab9c7edde2e27ff707c9e534172e288e8ed in v6.7.0-beta1~260 - -https://codereview.qt-project.org/gitweb?p=qt%2Fqtgrpc.git;a=commit;h=1a610ab9c7edde2e27ff707c9e534172e288e8ed - -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp 2024-03-12 08:14:21.885741000 +0100 -@@ -8,7 +8,6 @@ - #include <google/protobuf/io/printer.h> - #include <google/protobuf/io/zero_copy_stream.h> - #include <google/protobuf/stubs/common.h> --#include <google/protobuf/stubs/logging.h> - - #include <string> - #include <unordered_set> -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2024-03-12 08:16:45.956741000 +0100 -@@ -12,11 +12,10 @@ - - #include <set> - #include <google/protobuf/compiler/code_generator.h> --#include <google/protobuf/stubs/logging.h> --#include <google/protobuf/stubs/common.h> -+#include <google/protobuf/descriptor.h> - #include <google/protobuf/io/printer.h> - #include <google/protobuf/io/zero_copy_stream.h> --#include <google/protobuf/descriptor.h> -+#include <google/protobuf/stubs/common.h> - - using namespace ::QtGrpc; - using namespace ::qtprotoccommon; -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2024-03-12 08:17:09.574741000 +0100 -@@ -17,7 +17,6 @@ - #include <array> - #include <numeric> - #include <set> --#include <google/protobuf/stubs/logging.h> - #include <google/protobuf/stubs/common.h> - #include <google/protobuf/io/printer.h> - #include <google/protobuf/io/zero_copy_stream.h> -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp 2024-03-12 08:18:20.905741000 +0100 -@@ -5,10 +5,9 @@ - #include "generatorbase.h" - - #include <google/protobuf/descriptor.h> --#include <google/protobuf/stubs/logging.h> --#include <google/protobuf/stubs/common.h> - #include <google/protobuf/io/printer.h> - #include <google/protobuf/io/zero_copy_stream.h> -+#include <google/protobuf/stubs/common.h> - - #include "utils.h" - #include "commontemplates.h" diff --git a/libraries/qt6/newer_protobuf_2.patch b/libraries/qt6/newer_protobuf_2.patch deleted file mode 100644 index cfd5277570..0000000000 --- a/libraries/qt6/newer_protobuf_2.patch +++ /dev/null @@ -1,42 +0,0 @@ -Backported to 6.5.2 from 2297f2da520b7eebe10dd6b5304e5a4c3c18a57c in v6.7.0-beta1~220 - -https://codereview.qt-project.org/gitweb?p=qt/qtgrpc.git;a=commit;h=2297f2da520b7eebe10dd6b5304e5a4c3c18a57c - -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2024-03-12 08:40:27.884741000 +0100 -@@ -32,13 +32,9 @@ - bool QGrpcGenerator::Generate(const FileDescriptor *file, - [[maybe_unused]] const std::string ¶meter, - GeneratorContext *generatorContext, -- std::string *error) const -+ [[maybe_unused]] std::string *error) const - { - assert(file != nullptr && generatorContext != nullptr); -- if (file->syntax() != FileDescriptor::SYNTAX_PROTO3) { -- *error = "Invalid proto used. qtgrpcgen only supports 'proto3' syntax"; -- return false; -- } - - return GenerateClientServices(file, generatorContext); - } -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2024-03-12 08:42:48.976741000 +0100 -@@ -37,15 +37,10 @@ - bool QProtobufGenerator::Generate(const FileDescriptor *file, - [[maybe_unused]] const std::string ¶meter, - GeneratorContext *generatorContext, -- std::string *error) const -+ [[maybe_unused]] std::string *error) const - { - assert(file != nullptr && generatorContext != nullptr); - -- if (file->syntax() != FileDescriptor::SYNTAX_PROTO3) { -- *error = "Invalid proto used. qtprotobufgen only supports 'proto3' syntax"; -- return false; -- } -- - return GenerateMessages(file, generatorContext); - } - diff --git a/libraries/qt6/profile.d/qt6.csh b/libraries/qt6/profile.d/qt6.csh deleted file mode 100644 index 7764724e0d..0000000000 --- a/libraries/qt6/profile.d/qt6.csh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/csh -# Environment path variables for the Qt package: -if ( ! $?QT6DIR ) then - # It's best to use the generic directory to avoid - # compiling in a version-containing path: - if ( -d /usr/lib@LIBDIRSUFFIX@/qt6 ) then - setenv QT6DIR /usr/lib@LIBDIRSUFFIX@/qt6 - else - # Find the newest Qt directory and set $QT6DIR to that: - foreach qtd ( /usr/lib@LIBDIRSUFFIX@/qt6-* ) - if ( -d $qtd ) then - setenv QT6DIR $qtd - endif - end - endif -endif -set path = ( $path $QT6DIR/bin ) diff --git a/libraries/qt6/profile.d/qt6.sh b/libraries/qt6/profile.d/qt6.sh deleted file mode 100644 index 70ccbc2faf..0000000000 --- a/libraries/qt6/profile.d/qt6.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Environment variables for the Qt package. -# -# It's best to use the generic directory to avoid -# compiling in a version-containing path: -if [ -d /usr/lib@LIBDIRSUFFIX@/qt6 ]; then - QT6DIR=/usr/lib@LIBDIRSUFFIX@/qt6 -else - # Find the newest Qt directory and set $QT6DIR to that: - for qtd in /usr/lib@LIBDIRSUFFIX@/qt6-* ; do - if [ -d $qtd ]; then - QT6DIR=$qtd - fi - done -fi -PATH="$PATH:$QT6DIR/bin" -export QT6DIR diff --git a/libraries/qt6/qt6.SlackBuild b/libraries/qt6/qt6.SlackBuild deleted file mode 100644 index 92997fc905..0000000000 --- a/libraries/qt6/qt6.SlackBuild +++ /dev/null @@ -1,197 +0,0 @@ -#!/bin/bash - -# Slackware build script for qt6 - -# Copyright 2022-2023 Steven Voges <Oregon, USA> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=qt6 -SRCNAM=qt-everywhere-src -VERSION=${VERSION:-6.5.2} -BSCLANG=libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64 -CCACHE=${CCACHE:-OFF} -EXAMPLES=${EXAMPLES:-OFF} -LINKED_OPENSSL=${LINKED_OPENSSL:-ON} -PROPRIETARY_CODECS=${PROPRIETARY_CODECS:-OFF} -SYSTEM_FFMPEG=${SYSTEM_FFMPEG:-ON} -SYSTEM_HARFBUZZ=${SYSTEM_HARFBUZZ:-OFF} #Link against qt6's harfbuzz because Slackware 15.0's package is too old -SYSTEM_SQLITE=${SYSTEM_SQLITE:-ON} -SYSTEM_XCB_INPUT=${SYSTEM_XCB_INPUT:-ON} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.xz -cd $SRCNAM-$VERSION -bsdtar xvf $CWD/$BSCLANG.7z -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -patch -p1 < $CWD/newer_protobuf_1.patch -patch -p1 < $CWD/newer_protobuf_2.patch - -#Fix compile on -current/gcc13+ -sed -i '54i #include <cstdint>' qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp - -export CC=clang -export CXX=clang++ -export CFLAGS="$SLKCFLAGS" - -mkdir -p build -cd build - cmake \ - -G Ninja \ - -Wno-dev \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DClang_DIR=$TMP/$SRCNAM-$VERSION/libclang/lib/cmake/clang \ - -DFEATURE_openssl_linked=$LINKED_OPENSSL \ - -DFEATURE_system_harfbuzz=$SYSTEM_HARFBUZZ \ - -DFEATURE_system_sqlite=$SYSTEM_SQLITE \ - -DFEATURE_system_xcb_xinput=$SYSTEM_XCB_INPUT \ - -DFEATURE_webengine_proprietary_codecs=$PROPRIETARY_CODECS \ - -DFEATURE_webengine_system_ffmpeg=$SYSTEM_FFMPEG \ - -DFEATURE_webengine_system_re2=OFF \ - -DINSTALL_ARCHDATADIR=./lib${LIBDIRSUFFIX} \ - -DINSTALL_BINDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/bin \ - -DINSTALL_DESCRIPTIONSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/modules \ - -DINSTALL_DOCDIR=./doc/$PRGNAM-$VERSION \ - -DINSTALL_EXAMPLESDIR=./doc/$PRGNAM-$VERSION/examples \ - -DINSTALL_INCLUDEDIR=./include/$PRGNAM \ - -DINSTALL_LIBDIR=./lib${LIBDIRSUFFIX} \ - -DINSTALL_LIBEXECDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/libexec \ - -DINSTALL_MKSPECSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/mkspecs \ - -DINSTALL_PLUGINSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/plugins \ - -DINSTALL_QMLDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/qml \ - -DINSTALL_TRANSLATIONSDIR=./share/$PRGNAM/translations \ - -DINSTALL_TESTSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/tests \ - -DQT_BUILD_EXAMPLES=$EXAMPLES \ - -DQT_USE_CCACHE=$CCACHE \ - -DCMAKE_BUILD_TYPE=Release .. - cmake --build . - DESTDIR=$PKG cmake --install . --strip -cd .. - -rm -R $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/QtBuildInternals -rmdir $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/ios -rmdir $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/macos - -if [ -d "$PKG/usr/phrasebooks" ]; then - mv $PKG/usr/phrasebooks $PKG/usr/share/$PRGNAM/ -fi -if [ -d "$PKG/usr/resources" ]; then - mv $PKG/usr/resources $PKG/usr/share/$PRGNAM/ -fi - -if [ "$EXAMPLES" = "ON" ]; then - find -L $PKG/usr/doc/$PRGNAM-$VERSION/examples \ - -type d -exec chmod 755 {} \; - find -L $PKG/usr/doc/$PRGNAM-$VERSION/examples \ - -type f -exec chmod 644 {} \; -fi - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -for i in $CWD/desktop/*.desktop; do - install -D -m 0644 $i $PKG/usr/share/applications/$(basename $i) -done -sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/* - -# Install symlinks to the Qt6 binaries in the $PATH (avoid the ones already ending in "6" or "cmake"): -mkdir -p $PKG/usr/bin -for FILE in $PKG/usr/lib${LIBDIRSUFFIX}/qt6/bin/* ; do - if ! [[ $FILE =~ (6$|cmake$) ]]; then - ln -s ../lib${LIBDIRSUFFIX}/qt6/bin/$(basename $FILE) $PKG/usr/bin/$(basename $FILE)-qt6 - fi -done - -install -D -m 0644 qttools/src/assistant/assistant/images/assistant-128.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/assistant-qt6.png -install -D -m 0644 qttools/src/designer/src/designer/images/designer.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/designer-qt6.png -install -D -m 0644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt6.png -install -D -m 0644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/linguist-qt6.png - -mkdir -p $PKG/etc/profile.d -sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.sh \ - > $PKG/etc/profile.d/$PRGNAM.sh -sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.csh \ - > $PKG/etc/profile.d/$PRGNAM.csh -chmod 0755 $PKG/etc/profile.d/* - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - .QT-ENTERPRISE-LICENSE-AGREEMENT LICENSE.* README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/qt6/qt6.info b/libraries/qt6/qt6.info deleted file mode 100644 index 5996f1a317..0000000000 --- a/libraries/qt6/qt6.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="qt6" -VERSION="6.5.2" -HOMEPAGE="https://qt.io" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://download.qt.io/official_releases/qt/6.5/6.5.2/single/qt-everywhere-src-6.5.2.tar.xz \ - https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" -MD5SUM_x86_64="87f56fd8aedd2e429047c40397e9be48 \ - 1eb94ba35df4aa217cf485086215182a" -REQUIRES="double-conversion html5lib md4c nodejs" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/qt6/slack-desc b/libraries/qt6/slack-desc deleted file mode 100644 index 32c3c86424..0000000000 --- a/libraries/qt6/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -qt6: qt6 (Application Development Framework) -qt6: -qt6: Qt is a cross-platform application development framework for desktop, -qt6: embedded and mobile. Supported Platforms include Linux, OS X, -qt6: Windows, VxWorks, QNX, Android, iOS, BlackBerry, Sailfish OS and -qt6: others. -qt6: -qt6: Homepage: https://qt.io -qt6: -qt6: -qt6: diff --git a/libraries/qt6gtk2/README b/libraries/qt6gtk2/README new file mode 100644 index 0000000000..306b8ac20b --- /dev/null +++ b/libraries/qt6gtk2/README @@ -0,0 +1,4 @@ +GTK+2.0 integration plugin for Qt6. + +qt5gtk2 (designed to be compatible with qt6gtk2) contains GTK+2.0 +integration for Qt5. diff --git a/python/args/args.SlackBuild b/libraries/qt6gtk2/qt6gtk2.SlackBuild index 2cc1262dec..5594b11b1c 100644 --- a/python/args/args.SlackBuild +++ b/libraries/qt6gtk2/qt6gtk2.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for args +# Slackware build script for qt5gtk2 -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=args -VERSION=${VERSION:-0.1.0} +PRGNAM=qt6gtk2 +VERSION=${VERSION:-0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -70,21 +67,29 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG +QMAKE_CFLAGS_RELEASE="$SLKCFLAGS" \ +QMAKE_CXXFLAGS_RELEASE="$SLKCFLAGS" \ +PREFIX=/usr \ +LIBDIR=/usr/lib${LIBDIRSUFFIX} \ +qmake-qt6 + +make +make install INSTALL_ROOT=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp AUTHORS ChangeLog COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/qt6gtk2/qt6gtk2.info b/libraries/qt6gtk2/qt6gtk2.info new file mode 100644 index 0000000000..7a8bb612ef --- /dev/null +++ b/libraries/qt6gtk2/qt6gtk2.info @@ -0,0 +1,10 @@ +PRGNAM="qt6gtk2" +VERSION="0.2" +HOMEPAGE="https://github.com/trialuser02/qt6gtk2" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/trialuser02/qt6gtk2/releases/download/0.2/qt6gtk2-0.2.tar.xz" +MD5SUM_x86_64="67c6430bf425bbf1ba3a07b349265a5d" +REQUIRES="qt6" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu@protonmail.com" diff --git a/development/nodejs/slack-desc b/libraries/qt6gtk2/slack-desc index bb10691042..acd120202a 100644 --- a/development/nodejs/slack-desc +++ b/libraries/qt6gtk2/slack-desc @@ -5,15 +5,15 @@ # You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. - |-----handy-ruler------------------------------------------------------| -nodejs: nodejs (JavaScript runtime) -nodejs: -nodejs: Node.js is a JavaScript runtime built on Chrome's V8 JavaScript -nodejs: engine. -nodejs: -nodejs: https://nodejs.org/ -nodejs: -nodejs: -nodejs: -nodejs: -nodejs: + |-----handy-ruler------------------------------------------------------| +qt6gtk2: qt6gtk2 (GTK+2.0 integration plugin for Qt6) +qt6gtk2: +qt6gtk2: GTK+2.0 integration plugin for Qt6. +qt6gtk2: +qt6gtk2: +qt6gtk2: +qt6gtk2: +qt6gtk2: +qt6gtk2: +qt6gtk2: +qt6gtk2: diff --git a/libraries/quesoglc/quesoglc.SlackBuild b/libraries/quesoglc/quesoglc.SlackBuild index 959f25c2c3..595f180d43 100644 --- a/libraries/quesoglc/quesoglc.SlackBuild +++ b/libraries/quesoglc/quesoglc.SlackBuild @@ -78,7 +78,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/rapidjson/fix-build-on-gcc7.diff b/libraries/rapidjson/fix-build-on-gcc7.diff deleted file mode 100644 index d55a477678..0000000000 --- a/libraries/rapidjson/fix-build-on-gcc7.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur rapidjson-1.1.0.orig/include/rapidjson/internal/regex.h rapidjson-1.1.0/include/rapidjson/internal/regex.h ---- rapidjson-1.1.0.orig/include/rapidjson/internal/regex.h 2016-08-25 02:59:05.000000000 -0500 -+++ rapidjson-1.1.0/include/rapidjson/internal/regex.h 2017-12-27 01:10:17.765316098 -0600 -@@ -29,6 +29,9 @@ - #ifdef __GNUC__ - RAPIDJSON_DIAG_PUSH - RAPIDJSON_DIAG_OFF(effc++) -+#if __GNUC__ >= 7 -+RAPIDJSON_DIAG_OFF(implicit-fallthrough) -+#endif - #endif - - #ifdef _MSC_VER diff --git a/libraries/rapidjson/gcc14.patch b/libraries/rapidjson/gcc14.patch new file mode 100644 index 0000000000..0799d22aa0 --- /dev/null +++ b/libraries/rapidjson/gcc14.patch @@ -0,0 +1,22 @@ +From 3b2441b87f99ab65f37b141a7b548ebadb607b96 Mon Sep 17 00:00:00 2001 +From: Janusz Chorko <janusz.chorko@apdu.pl> +Date: Fri, 26 Aug 2016 21:17:38 +0200 +Subject: [PATCH] Removed non-compiling assignment operator. Fixed #718 + +--- + include/rapidjson/document.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h +index e3e20dfbd..b0f1f70be 100644 +--- a/include/rapidjson/document.h ++++ b/include/rapidjson/document.h +@@ -316,8 +316,6 @@ struct GenericStringRef { + + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } +- + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } + diff --git a/libraries/rapidjson/rapidjson.SlackBuild b/libraries/rapidjson/rapidjson.SlackBuild index e1454d89c6..96dfa719b8 100644 --- a/libraries/rapidjson/rapidjson.SlackBuild +++ b/libraries/rapidjson/rapidjson.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for RapidJson # Copyright 2017 Andre Barboza, Belo Horizonte - Brazil +# Copyright 2024 Jeremy Hansen <jebrhansen+SBo@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +30,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=rapidjson VERSION=${VERSION:-1.1.0} -BUILD=${BUILD:-3} +GTESTVER=${GTESTVER:-ba96d0b1161f540656efdaed035b3c062b60e006} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,6 +74,9 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +rmdir thirdparty/gtest/ +tar xvf $CWD/googletest-$GTESTVER.tar.gz +mv googletest-$GTESTVER thirdparty/gtest chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -79,26 +84,29 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -# Patch for -current but should be harmless on -stable -patch -p1 < $CWD/fix-build-on-gcc7.diff -find -name CMakeLists.txt | xargs sed -e 's|-Werror||' -i +# Fix for gcc7+ +find -name CMakeLists.txt -exec sed -i 's/ -Werror//g' {} + +# Fix for gcc14+ +patch -p1 < $CWD/gcc14.patch mkdir -p build cd build cmake \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ + -DDOC_INSTALL_DIR=/usr/doc/$PRGNAM-$VERSION \ + -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=ON \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG cd .. -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/doc/RapidJSON/* $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG.md license.txt readme.md readme.zh-cn.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + CHANGELOG.md license.txt readme.md readme.zh-cn.md \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -rmdir --parents $PKG/usr/share/doc/RapidJSON 2>/dev/null || true mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/libraries/rapidjson/rapidjson.info b/libraries/rapidjson/rapidjson.info index 4eff481a5f..281fa98e7a 100644 --- a/libraries/rapidjson/rapidjson.info +++ b/libraries/rapidjson/rapidjson.info @@ -1,10 +1,12 @@ PRGNAM="rapidjson" VERSION="1.1.0" -HOMEPAGE="https://github.com/miloyip/rapidjson/" -DOWNLOAD="https://github.com/miloyip/rapidjson/archive/v1.1.0/rapidjson-1.1.0.tar.gz" -MD5SUM="badd12c511e081fec6c89c43a7027bce" +HOMEPAGE="https://github.com/Tencent/rapidjson/" +DOWNLOAD="https://github.com/Tencent/rapidjson/archive/v1.1.0/rapidjson-1.1.0.tar.gz \ + https://github.com/google/googletest/archive/ba96d0b/googletest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz" +MD5SUM="badd12c511e081fec6c89c43a7027bce \ + b629364cd39a2dd886d449d9559da0f1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Andre Barboza" -EMAIL="bmg.andre@gmail.com" +MAINTAINER="Jeremy Hansen" +EMAIL="jebrhansen+SBo@@gmail.com" diff --git a/libraries/rapidjson/slack-desc b/libraries/rapidjson/slack-desc index 937f0eb30e..cb48eb4d26 100644 --- a/libraries/rapidjson/slack-desc +++ b/libraries/rapidjson/slack-desc @@ -15,5 +15,5 @@ rapidjson: rapidjson: rapidjson: rapidjson: -rapidjson: https://github.com/miloyip/rapidjson +rapidjson: https://github.com/Tencent/rapidjson rapidjson: diff --git a/libraries/scafacos/scafacos.SlackBuild b/libraries/scafacos/scafacos.SlackBuild index 6016fce3b9..1bd68bf063 100644 --- a/libraries/scafacos/scafacos.SlackBuild +++ b/libraries/scafacos/scafacos.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=scafacos VERSION=${VERSION:-1.0.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -91,7 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --enable-shared -make -j 10 +make make doc make install DESTDIR=$PKG diff --git a/libraries/simde/simde.SlackBuild b/libraries/simde/simde.SlackBuild index ffedd6acbd..05aab2484f 100644 --- a/libraries/simde/simde.SlackBuild +++ b/libraries/simde/simde.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=simde -VERSION=${VERSION:-0.8.0} +VERSION=${VERSION:-0.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/simde/simde.info b/libraries/simde/simde.info index c639595c47..6ea75a2a2a 100644 --- a/libraries/simde/simde.info +++ b/libraries/simde/simde.info @@ -1,8 +1,8 @@ PRGNAM="simde" -VERSION="0.8.0" +VERSION="0.8.2" HOMEPAGE="https://simd-everywhere.github.io/blog/" -DOWNLOAD="https://github.com/simd-everywhere/simde/releases/download/v0.8.0/simde-amalgamated-0.8.0.tar.xz" -MD5SUM="1163abbb1c0c4627a1dfd95f8eedcc1d" +DOWNLOAD="https://github.com/simd-everywhere/simde/releases/download/v0.8.2/simde-amalgamated-0.8.2.tar.xz" +MD5SUM="57239a45e0cc7ceccb20b3b69cae6db5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/spdlog/spdlog.SlackBuild b/libraries/spdlog/spdlog.SlackBuild index 2895b47708..b94c82e6cb 100644 --- a/libraries/spdlog/spdlog.SlackBuild +++ b/libraries/spdlog/spdlog.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=spdlog -VERSION=${VERSION:-1.12.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.14.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/spdlog/spdlog.info b/libraries/spdlog/spdlog.info index 2da0e77b10..e4584a4019 100644 --- a/libraries/spdlog/spdlog.info +++ b/libraries/spdlog/spdlog.info @@ -1,10 +1,10 @@ PRGNAM="spdlog" -VERSION="1.12.0" +VERSION="1.14.1" HOMEPAGE="https://github.com/gabime/spdlog" -DOWNLOAD="https://github.com/gabime/spdlog/archive/v1.12.0/spdlog-1.12.0.tar.gz" -MD5SUM="6b4446526264c1d1276105482adc18d1" +DOWNLOAD="https://github.com/gabime/spdlog/archive/v1.14.1/spdlog-1.14.1.tar.gz" +MD5SUM="f2c3f15c20e67b261836ff7bfda302cf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="Catch2" +REQUIRES="Catch2 fmt" MAINTAINER="Steven Voges" EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/tclws/tclws.info b/libraries/tclws/tclws.info index c3f5e6da90..4d7a8cb331 100644 --- a/libraries/tclws/tclws.info +++ b/libraries/tclws/tclws.info @@ -2,7 +2,7 @@ PRGNAM="tclws" VERSION="3.4.0" HOMEPAGE="https://core.tcl-lang.org/tclws" DOWNLOAD="https://core.tcl-lang.org/tclws/tarball/tclws-3.4.0.tar.gz" -MD5SUM="36815313028e90332048d9e16bd0726f" +MD5SUM="886df07686b75354b6cd70c55316ea82" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="tcllib tcl-tls tDOM" diff --git a/libraries/td_lib/td_lib.SlackBuild b/libraries/td_lib/td_lib.SlackBuild index bf0f96fd88..1f9fef6ff9 100644 --- a/libraries/td_lib/td_lib.SlackBuild +++ b/libraries/td_lib/td_lib.SlackBuild @@ -12,11 +12,17 @@ # path of least resistance is to break this library out into its own # build, even though nothing else besides ded uses it. +# 20240423 bkw, BUILD=2: add missing .pc file to package. I thought +# ded was compiling OK without it, but it was actually pulling in +# td_lib from $TMP, not the installed package... which meant building +# td_lib followed by ded seemed to work, but building td_lib, then "rm +# -rf /tmp/SBo", *then* building ded would fail. Grr. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=td_lib VERSION=${VERSION:-20230122} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -84,6 +90,11 @@ CXXFLAGS="$SLKCFLAGS" \ make -j1 make -j1 install DESTDIR=$PKG +# 20240423 bkw: make install doesn't install this, ded needs it. +PC=$PKG/usr/lib$LIBDIRSUFFIX/pkgconfig +mkdir -p $PC +cp -a support/$PRGNAM.pc $PC + PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKGDOC cp -a CHANGES COPYING README $PKGDOC diff --git a/libraries/tepl/tepl.SlackBuild b/libraries/tepl/tepl.SlackBuild index 6a6195bfca..8790d5a26d 100644 --- a/libraries/tepl/tepl.SlackBuild +++ b/libraries/tepl/tepl.SlackBuild @@ -81,15 +81,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# circunvent meson version mismtach (fs.copyfile not available) -# avoid gtk_doc, which uses fs.copyfile -# replace unnecesary version bump of gio-2.0 -sed -i "s/meson_version: '>= 0.64'/meson_version: '>= 0.59'/; - s/'gio-2.0', version: '>= 2.74'/'gio-2.0', version: '>= 2.70'/" meson.build - - cd build - CFLAGS="$SLKCFLAGS -DG_CONNECT_DEFAULT=0" \ + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ meson .. \ --buildtype=release \ diff --git a/libraries/tepl/tepl.info b/libraries/tepl/tepl.info index 1b279bf63a..4be0680124 100644 --- a/libraries/tepl/tepl.info +++ b/libraries/tepl/tepl.info @@ -6,5 +6,5 @@ MD5SUM="5d29b2c9032a1ba2d33ef9c9c9c7de79" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libgedit-gtksourceview libgedit-amtk" -MAINTAINER="Juan M. Lasca" -EMAIL="juanmlasca@gmail.com" +MAINTAINER="Bob Funk" +EMAIL="bobfunk11@gmail.com" diff --git a/libraries/tree-sitter/tree-sitter.SlackBuild b/libraries/tree-sitter/tree-sitter.SlackBuild index 6d85abd7cc..238f0aa65c 100644 --- a/libraries/tree-sitter/tree-sitter.SlackBuild +++ b/libraries/tree-sitter/tree-sitter.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tree-sitter -VERSION=${VERSION:-0.22.5} +VERSION=${VERSION:-0.22.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/tree-sitter/tree-sitter.info b/libraries/tree-sitter/tree-sitter.info index dd061a9cce..939b2148af 100644 --- a/libraries/tree-sitter/tree-sitter.info +++ b/libraries/tree-sitter/tree-sitter.info @@ -1,8 +1,8 @@ PRGNAM="tree-sitter" -VERSION="0.22.5" +VERSION="0.22.6" HOMEPAGE="https://github.com/tree-sitter/tree-sitter" -DOWNLOAD="https://github.com/tree-sitter/tree-sitter/archive/v0.22.5/tree-sitter-0.22.5.tar.gz" -MD5SUM="0dd82a02eb9fd99d0374fc95e4ca493d" +DOWNLOAD="https://github.com/tree-sitter/tree-sitter/archive/v0.22.6/tree-sitter-0.22.6.tar.gz" +MD5SUM="1c8767fcc22be1b66583677d6ab07cb1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/uriparser/uriparser.SlackBuild b/libraries/uriparser/uriparser.SlackBuild index 4011fb00d1..fb7aad977d 100644 --- a/libraries/uriparser/uriparser.SlackBuild +++ b/libraries/uriparser/uriparser.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for uriparser -# Copyright 2015-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2015-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=uriparser -VERSION=${VERSION:-0.9.7} +VERSION=${VERSION:-0.9.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -81,15 +78,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Test building is disabled ATM because we haven't an up2date gtest +# Tests building is disabled ATM because we haven't an up2date gtest mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DMAN_INSTALL_DIR=/usr/man \ -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DURIPARSER_BUILD_TESTS=OFF \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/libraries/uriparser/uriparser.info b/libraries/uriparser/uriparser.info index 92a6f24b8a..620633abd4 100644 --- a/libraries/uriparser/uriparser.info +++ b/libraries/uriparser/uriparser.info @@ -1,8 +1,8 @@ PRGNAM="uriparser" -VERSION="0.9.7" +VERSION="0.9.8" HOMEPAGE="https://uriparser.github.io" -DOWNLOAD="https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.7/uriparser-0.9.7.tar.xz" -MD5SUM="5c64361cb0a7432b98309c94918a0b86" +DOWNLOAD="https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.8/uriparser-0.9.8.tar.xz" +MD5SUM="2ee6738028a2a7d57a1fd2fb5fac2441" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="graphviz" diff --git a/libraries/virglrenderer/virglrenderer.SlackBuild b/libraries/virglrenderer/virglrenderer.SlackBuild index 490a3d4888..af28a5ea95 100644 --- a/libraries/virglrenderer/virglrenderer.SlackBuild +++ b/libraries/virglrenderer/virglrenderer.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virglrenderer -# Copyright 2016-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2016-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=virglrenderer -VERSION=${VERSION:-0.10.4} +VERSION=${VERSION:-1.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/virglrenderer/virglrenderer.info b/libraries/virglrenderer/virglrenderer.info index d264746fe5..c5a2d4a842 100644 --- a/libraries/virglrenderer/virglrenderer.info +++ b/libraries/virglrenderer/virglrenderer.info @@ -1,8 +1,8 @@ PRGNAM="virglrenderer" -VERSION="0.10.4" +VERSION="1.0.1" HOMEPAGE="https://virgil3d.github.io" -DOWNLOAD="https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/0.10.4/virglrenderer-0.10.4.tar.bz2" -MD5SUM="470f34cbd9c7e9422555bf3841f00b7e" +DOWNLOAD="https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/1.0.1/virglrenderer-1.0.1.tar.bz2" +MD5SUM="c3d2785352a8e612858017d61377b74d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/wcslib/README b/libraries/wcslib/README deleted file mode 100644 index 8ea64be5d9..0000000000 --- a/libraries/wcslib/README +++ /dev/null @@ -1,11 +0,0 @@ -WCSLIB is a set of C library routines that implements the World -Coordinate System (WCS) standard in FITS (Flexible Image Transport -System). It comes with support for FORTRAN via a set of wrapper -functions. It also includes a general curvilinear axis drawing -routine, PGSBOX, for PGPLOT. Another included utility program is -HPXcvt, which is used to convert 1D HEALPix pixelization data stored -in a variety of forms in FITS into a 2D primary image array with HPX -or XPH coordinate representation. - -Usage with gcc compiler: use "-lwcs" command line argument for linking -at compile time. diff --git a/libraries/wcslib/slack-desc b/libraries/wcslib/slack-desc deleted file mode 100644 index 2051c37450..0000000000 --- a/libraries/wcslib/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -wcslib: wcslib (World Coordinate System for FITS) -wcslib: -wcslib: WCSLIB is a C library, supplied with a full set of Fortran wrappers, -wcslib: that implements the World Coordinate System (WCS) standard in FITS -wcslib: (Flexible Image Transport System). It also includes a PGPLOT-based -wcslib: routine, PGSBOX, for drawing general curvilinear coordinate -wcslib: graticules and a number of utility programs. -wcslib: -wcslib: -wcslib: Homepage: http://www.atnf.csiro.au/people/mcalabre/WCS/ -wcslib: diff --git a/libraries/wcslib/wcslib.SlackBuild b/libraries/wcslib/wcslib.SlackBuild deleted file mode 100644 index da958e2213..0000000000 --- a/libraries/wcslib/wcslib.SlackBuild +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/bash - -# Slackware build script for WCSLib - -# Copyright 2018 Nitish Ragoomundun, Mauritius -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20220419 bkw: Modified by SlackBuilds.org, BUILD=3: -# - fix dir permissions in package (e.g. usr/man was 0775). -# - get rid of static lib. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=wcslib -VERSION=${VERSION:-7.7} -BUILD=${BUILD:-3} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION -chown -R root:root . -find . -type f -exec chmod 0644 {} \+ -find . -type d -exec chmod 0755 {} \+ - -# Paths for PGPLOT in case it is not set properly -#PGPLOT_DIR="/usr/lib${LIBDIRSUFFIX}/pgplot" -#LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib${LIBDIRSUFFIX}/pgplot" - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -sh ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-cfitsio \ - --with-cfitsiolib=/usr/lib${LIBDIRSUFFIX} \ - --with-cfitsioinc=/usr/include \ - --with-x \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG -gzip -9 $PKG/usr/man/man*/* - -# 20220419 bkw: --disable-static accepted and ignored, so: -rm -f $PKG/usr/lib*/*.a - -# Give root write permission on regular files as many of them get 444 -# permissions by default. -# 20220419 bkw: also, a lot of the directories are 775. -find $PKG -type f -exec chmod u+w {} \+ -find $PKG -type d -exec chmod 0755 {} \+ - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/wcslib/wcslib.info b/libraries/wcslib/wcslib.info deleted file mode 100644 index 9c830a0366..0000000000 --- a/libraries/wcslib/wcslib.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wcslib" -VERSION="7.7" -HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/" -DOWNLOAD="ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-7.7.tar.bz2" -MD5SUM="958a8e10cf01b7fb7c9340952fc79cd0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Nitish Ragoomundun" -EMAIL="lrugratz@gmail.com" diff --git a/libraries/webkit2gtk/webkit2gtk.SlackBuild b/libraries/webkit2gtk/webkit2gtk.SlackBuild index fe4f736d00..db0780ca37 100644 --- a/libraries/webkit2gtk/webkit2gtk.SlackBuild +++ b/libraries/webkit2gtk/webkit2gtk.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=webkit2gtk SRCNAM=webkitgtk -VERSION=${VERSION:-2.44.1} +VERSION=${VERSION:-2.44.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/webkit2gtk/webkit2gtk.info b/libraries/webkit2gtk/webkit2gtk.info index 3cf7294c8a..e13aa39445 100644 --- a/libraries/webkit2gtk/webkit2gtk.info +++ b/libraries/webkit2gtk/webkit2gtk.info @@ -1,8 +1,8 @@ PRGNAM="webkit2gtk" -VERSION="2.44.1" +VERSION="2.44.2" HOMEPAGE="https://www.webkitgtk.org/" -DOWNLOAD="https://www.webkitgtk.org/releases/webkitgtk-2.44.1.tar.xz" -MD5SUM="b3a4504892162b30a774d3afde4707f7" +DOWNLOAD="https://www.webkitgtk.org/releases/webkitgtk-2.44.2.tar.xz" +MD5SUM="b61ff37133cabc9ef5d870b296e9694d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="bubblewrap geoclue2 wpebackend-fdo xdg-dbus-proxy unifdef" diff --git a/libraries/webkit2gtk4.1/webkit2gtk4.1.SlackBuild b/libraries/webkit2gtk4.1/webkit2gtk4.1.SlackBuild index 59f324de96..093b929826 100644 --- a/libraries/webkit2gtk4.1/webkit2gtk4.1.SlackBuild +++ b/libraries/webkit2gtk4.1/webkit2gtk4.1.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=webkit2gtk4.1 SRCNAM=webkitgtk -VERSION=${VERSION:-2.44.1} +VERSION=${VERSION:-2.44.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/webkit2gtk4.1/webkit2gtk4.1.info b/libraries/webkit2gtk4.1/webkit2gtk4.1.info index 53e02a7130..e4ed81f235 100644 --- a/libraries/webkit2gtk4.1/webkit2gtk4.1.info +++ b/libraries/webkit2gtk4.1/webkit2gtk4.1.info @@ -1,8 +1,8 @@ PRGNAM="webkit2gtk4.1" -VERSION="2.44.1" +VERSION="2.44.2" HOMEPAGE="https://www.webkitgtk.org/" -DOWNLOAD="https://www.webkitgtk.org/releases/webkitgtk-2.44.1.tar.xz" -MD5SUM="b3a4504892162b30a774d3afde4707f7" +DOWNLOAD="https://www.webkitgtk.org/releases/webkitgtk-2.44.2.tar.xz" +MD5SUM="b61ff37133cabc9ef5d870b296e9694d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="bubblewrap geoclue2 wpebackend-fdo xdg-dbus-proxy libsoup3 unifdef" diff --git a/libraries/wxWidgets/wxWidgets.SlackBuild b/libraries/wxWidgets/wxWidgets.SlackBuild index d0bd31f480..10ce6f60bb 100644 --- a/libraries/wxWidgets/wxWidgets.SlackBuild +++ b/libraries/wxWidgets/wxWidgets.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wxWidgets -VERSION=${VERSION:-3.2.4} +VERSION=${VERSION:-3.2.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/wxWidgets/wxWidgets.info b/libraries/wxWidgets/wxWidgets.info index 041fd0b6ea..e3cb00eed4 100644 --- a/libraries/wxWidgets/wxWidgets.info +++ b/libraries/wxWidgets/wxWidgets.info @@ -1,8 +1,8 @@ PRGNAM="wxWidgets" -VERSION="3.2.4" +VERSION="3.2.4.1" HOMEPAGE="http://www.wxwidgets.org" -DOWNLOAD="https://github.com/wxWidgets/wxWidgets/archive/v3.2.4/wxWidgets-3.2.4.tar.gz" -MD5SUM="42f94852aad2be0a534424679a42db50" +DOWNLOAD="https://github.com/wxWidgets/wxWidgets/archive/v3.2.4.1/wxWidgets-3.2.4.1.tar.gz" +MD5SUM="41db655cf3555bfe41908fec685c267f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/yascreen/yascreen.SlackBuild b/libraries/yascreen/yascreen.SlackBuild index e00d1cd642..ea1ca081f9 100644 --- a/libraries/yascreen/yascreen.SlackBuild +++ b/libraries/yascreen/yascreen.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for yascreen -# Copyright 2022-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2022-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=yascreen -VERSION=${VERSION:-1.97} +VERSION=${VERSION:-1.99} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/yascreen/yascreen.info b/libraries/yascreen/yascreen.info index e0006d05b4..c9ad43afc7 100644 --- a/libraries/yascreen/yascreen.info +++ b/libraries/yascreen/yascreen.info @@ -1,8 +1,8 @@ PRGNAM="yascreen" -VERSION="1.97" +VERSION="1.99" HOMEPAGE="https://github.com/bbonev/yascreen" -DOWNLOAD="https://github.com/bbonev/yascreen/releases/download/v1.97/yascreen-1.97.tar.xz" -MD5SUM="6e0d650760d3376d83cedbff4133f214" +DOWNLOAD="https://github.com/bbonev/yascreen/releases/download/v1.99/yascreen-1.99.tar.xz" +MD5SUM="016255de7841ff711e1f778cff7b3c23" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/zstd-cmake/README b/libraries/zstd-cmake/README deleted file mode 100644 index 3ddefa5f00..0000000000 --- a/libraries/zstd-cmake/README +++ /dev/null @@ -1,2 +0,0 @@ -This is only the cmake files meant to compliment the zstd package -already in Slackware. diff --git a/libraries/zstd-cmake/slack-desc b/libraries/zstd-cmake/slack-desc deleted file mode 100644 index 9adf2daff3..0000000000 --- a/libraries/zstd-cmake/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -zstd-cmake: zstd-cmake (cmake files for zstd) -zstd-cmake: -zstd-cmake: Provide the cmake files necessary for cmake to find zstd. -zstd-cmake: -zstd-cmake: Homepage: http://www.zstd.net -zstd-cmake: -zstd-cmake: -zstd-cmake: -zstd-cmake: -zstd-cmake: -zstd-cmake: diff --git a/libraries/zstd-cmake/zstd-cmake.info b/libraries/zstd-cmake/zstd-cmake.info deleted file mode 100644 index 51061140f6..0000000000 --- a/libraries/zstd-cmake/zstd-cmake.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="zstd-cmake" -VERSION="1.5.5" -HOMEPAGE="http://www.zstd.net" -DOWNLOAD="https://github.com/facebook/zstd/archive/v1.5.5/zstd-1.5.5.tar.gz" -MD5SUM="4ff0ee1965ab161bc55be7c9dcd1f7f9" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/zxing-cpp/README b/libraries/zxing-cpp/README deleted file mode 100644 index 7e7c2ad1d0..0000000000 --- a/libraries/zxing-cpp/README +++ /dev/null @@ -1,20 +0,0 @@ -ZXing-C++ ("zebra crossing") is an open-source, multi-format -linear/matrix barcode image processing library implemented in C++. - -It was originally ported from the Java ZXing Library but has been -developed further and now includes many improvements in terms of -runtime and detection performance. It can both read and write -barcodes in a number of formats. - -Features: - * Written in pure C++17 (/C++20), no third-party dependencies - (for the library itself) - * Thread safe - * Wrappers/Bindings for: - - Android - - C - - iOS - - Python - - WebAssembly - - WinRT - - Flutter (external project) diff --git a/libraries/zxing-cpp/slack-desc b/libraries/zxing-cpp/slack-desc deleted file mode 100644 index 2211be0a13..0000000000 --- a/libraries/zxing-cpp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -zxing-cpp: zxing-cpp (barcode image processing library) -zxing-cpp: -zxing-cpp: ZXing-C++ ("zebra crossing") is an open-source, multi-format -zxing-cpp: linear/matrix barcode image processing library implemented in C++. -zxing-cpp: It can both read and write barcodes in a number of formats. -zxing-cpp: -zxing-cpp: Homepage: https://github.com/zxing-cpp/zxing-cpp -zxing-cpp: -zxing-cpp: -zxing-cpp: -zxing-cpp: diff --git a/libraries/zxing-cpp/zxing-cpp.info b/libraries/zxing-cpp/zxing-cpp.info deleted file mode 100644 index 17e51a38e2..0000000000 --- a/libraries/zxing-cpp/zxing-cpp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="zxing-cpp" -VERSION="2.2.1" -HOMEPAGE="https://github.com/zxing-cpp/zxing-cpp" -DOWNLOAD="https://github.com/zxing-cpp/zxing-cpp/archive/v2.2.1/zxing-cpp-2.2.1.tar.gz https://github.com/nothings/stb/archive/03f50e3/stb-03f50e343d796e492e6579a11143a085429d7f5d.tar.gz" -MD5SUM="8d2b1592668c57f77c6351c8bb5fe739 6c2059b2728abb6da1d93ec52eaddd9c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Bloyburt" -EMAIL="alexpen@startmail.com" diff --git a/libraries/zxing-cpp/zxing.cmake.patch b/libraries/zxing-cpp/zxing.cmake.patch deleted file mode 100644 index c7fc316223..0000000000 --- a/libraries/zxing-cpp/zxing.cmake.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- zxing.cmake.orig 2023-11-10 19:38:55.601450169 +0000 -+++ zxing.cmake 2023-11-10 19:39:15.889449494 +0000 -@@ -12,11 +12,8 @@ - - if (NOT STB_FOUND) - include(FetchContent) -- FetchContent_Declare (stb -- GIT_REPOSITORY https://github.com/nothings/stb.git) -- FetchContent_MakeAvailable (stb) - add_library(stb::stb INTERFACE IMPORTED) -- target_include_directories(stb::stb INTERFACE ${stb_SOURCE_DIR}) -+ target_include_directories(stb::stb INTERFACE ../stb-src) - else() - add_library(stb::stb ALIAS PkgConfig::STB) - endif() diff --git a/misc/bitwarden-desktop/bitwarden-desktop.SlackBuild b/misc/bitwarden-desktop/bitwarden-desktop.SlackBuild index ec9dc75610..9e535962fc 100644 --- a/misc/bitwarden-desktop/bitwarden-desktop.SlackBuild +++ b/misc/bitwarden-desktop/bitwarden-desktop.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bitwarden-desktop SRCNAM=bitwarden -VERSION=${VERSION:-2024.3.2} +VERSION=${VERSION:-2024.4.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/misc/bitwarden-desktop/bitwarden-desktop.info b/misc/bitwarden-desktop/bitwarden-desktop.info index 967b85825c..21723fc9ca 100644 --- a/misc/bitwarden-desktop/bitwarden-desktop.info +++ b/misc/bitwarden-desktop/bitwarden-desktop.info @@ -1,10 +1,10 @@ PRGNAM="bitwarden-desktop" -VERSION="2024.3.2" +VERSION="2024.4.3" HOMEPAGE="https://bitwarden.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/bitwarden/clients/releases/download/desktop-v2024.3.2/Bitwarden-2024.3.2-amd64.deb" -MD5SUM_x86_64="8d7d6ab9e973c6890267ea72c3e61e61" +DOWNLOAD_x86_64="https://github.com/bitwarden/clients/releases/download/desktop-v2024.4.3/Bitwarden-2024.4.3-amd64.deb" +MD5SUM_x86_64="0ebef4a2d4e90631125848a179a05dca" REQUIRES="" MAINTAINER="marav" EMAIL="marav8@free.fr" diff --git a/misc/fcitx5-chinese-addons/README b/misc/fcitx5-chinese-addons/README deleted file mode 100644 index 30a7236fd9..0000000000 --- a/misc/fcitx5-chinese-addons/README +++ /dev/null @@ -1,4 +0,0 @@ -fcitx5-chinese-addons provides pinyin and table input method support -for fcitx5. Released under LGPL-2.1+. - -im/pinyin/emoji.txt is derived from Unicode CLDR with modification. diff --git a/misc/fcitx5-chinese-addons/doinst.sh b/misc/fcitx5-chinese-addons/doinst.sh deleted file mode 100644 index ca71fd3c40..0000000000 --- a/misc/fcitx5-chinese-addons/doinst.sh +++ /dev/null @@ -1,12 +0,0 @@ -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/glib-2.0/schemas ]; then - if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 - fi -fi - diff --git a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild b/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild deleted file mode 100644 index 2d1e5c5a1f..0000000000 --- a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash - -# Copyright 2022-2023 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-chinese-addons -VERSION=${VERSION:-5.1.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-${VERSION}_dict.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.info b/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.info deleted file mode 100644 index 35482d7a7e..0000000000 --- a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-chinese-addons" -VERSION="5.1.4" -HOMEPAGE="https://github.com/fcitx/fcitx5-chinese-addons" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.4_dict.tar.xz" -MD5SUM="cc8dcac68aebfcf836160fe3fd0108e6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx5-qt libime" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-chinese-addons/slack-desc b/misc/fcitx5-chinese-addons/slack-desc deleted file mode 100644 index 01fc72e5f1..0000000000 --- a/misc/fcitx5-chinese-addons/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5-chinese-addons: fcitx5-chinese-addons (Chinese related addon for fcitx5) -fcitx5-chinese-addons: -fcitx5-chinese-addons: This provides pinyin and table input method support for fcitx5. -fcitx5-chinese-addons: Released under LGPL-2.1+. -fcitx5-chinese-addons: -fcitx5-chinese-addons: -fcitx5-chinese-addons: -fcitx5-chinese-addons: -fcitx5-chinese-addons: -fcitx5-chinese-addons: Homepage: https://github.com/fcitx/fcitx5-chinese-addons -fcitx5-chinese-addons: diff --git a/misc/fcitx5-configtool/README b/misc/fcitx5-configtool/README deleted file mode 100644 index 929c275144..0000000000 --- a/misc/fcitx5-configtool/README +++ /dev/null @@ -1,6 +0,0 @@ -Fcitx5-configtool provides the configuration GUI for Fcitx5. - -Do note that although this package could be installed along with the -bundled kcm-fcitx, they are considered conflicting packages in some -other distros (like Arch), so depending on your situation, you may -uninstall and blacklist kcm-fcitx before installing this package. diff --git a/misc/fcitx5-configtool/doinst.sh b/misc/fcitx5-configtool/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/misc/fcitx5-configtool/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/misc/fcitx5-configtool/fcitx5-configtool.SlackBuild b/misc/fcitx5-configtool/fcitx5-configtool.SlackBuild deleted file mode 100644 index 50b647d7ba..0000000000 --- a/misc/fcitx5-configtool/fcitx5-configtool.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash - -# Copyright 2022-2023 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-configtool -VERSION=${VERSION:-5.1.4} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - -# patch desktop file to conform with standards -if [ -f $PKG/usr/share/applications/kcm_fcitx5.desktop ]; then - sed -i 's/True/true/g' $PKG/usr/share/applications/kcm_fcitx5.desktop -fi - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/fcitx5-configtool/fcitx5-configtool.info b/misc/fcitx5-configtool/fcitx5-configtool.info deleted file mode 100644 index 1afb7bbbe8..0000000000 --- a/misc/fcitx5-configtool/fcitx5-configtool.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-configtool" -VERSION="5.1.4" -HOMEPAGE="https://github.com/fcitx/fcitx5-configtool" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-5.1.4.tar.xz" -MD5SUM="25e7b02ee957e15d10ce632483f3e0e9" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx5-qt" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-configtool/slack-desc b/misc/fcitx5-configtool/slack-desc deleted file mode 100644 index 663a547c50..0000000000 --- a/misc/fcitx5-configtool/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5-configtool: fcitx5-configtool (Configuration Tool for Fcitx5) -fcitx5-configtool: -fcitx5-configtool: Configuration Tool for Fcitx5. -fcitx5-configtool: -fcitx5-configtool: Homepage: https://fcitx-im.org/wiki/Fcitx_5 -fcitx5-configtool: -fcitx5-configtool: -fcitx5-configtool: -fcitx5-configtool: -fcitx5-configtool: -fcitx5-configtool: diff --git a/misc/fcitx5-gtk/README b/misc/fcitx5-gtk/README deleted file mode 100644 index aa8eaf0727..0000000000 --- a/misc/fcitx5-gtk/README +++ /dev/null @@ -1,15 +0,0 @@ -fcitx5-gtk provides the GTK IM modules and libraries for fcitx5. - -If you enable GObject Introspection (via the ENABLE_GIR CMake -variable), make install will install some files to the system's GIR -directories regardless of what CMAKE_INSTALL_PREFIX is set to. - -If you have installed it to a custom prefix, you'll need to update the -GTK input method module cache. This is done by invoking -gtk-query-immodules-3.0 (or gtk-query-immodules-3.0 for GTK 2) and -setting GTK_PATH to point at fcitx5-gtk's GTK library install path -beforehand. For example: - - GTK_PATH=/your/install/path/lib/gtk-3.0 gtk-query-immodules-3.0 \ - --update-cache - diff --git a/misc/fcitx5-gtk/fcitx5-gtk.SlackBuild b/misc/fcitx5-gtk/fcitx5-gtk.SlackBuild deleted file mode 100644 index dcdf5d7681..0000000000 --- a/misc/fcitx5-gtk/fcitx5-gtk.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -# Copyright 2022 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-gtk -VERSION=${VERSION:-5.1.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* README* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/fcitx5-gtk/fcitx5-gtk.info b/misc/fcitx5-gtk/fcitx5-gtk.info deleted file mode 100644 index ae6a61cb21..0000000000 --- a/misc/fcitx5-gtk/fcitx5-gtk.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-gtk" -VERSION="5.1.2" -HOMEPAGE="https://github.com/fcitx/fcitx5-gtk" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-5.1.2.tar.xz" -MD5SUM="8e7e17fd0569b1f7492812f455fbf7b8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx5" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-gtk/slack-desc b/misc/fcitx5-gtk/slack-desc deleted file mode 100644 index 5cd05489ea..0000000000 --- a/misc/fcitx5-gtk/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5-gtk: fcitx5-gtk (Gtk IM modules and DBus client library for fcitx5) -fcitx5-gtk: -fcitx5-gtk: Gtk IM module for fcitx5 and glib based dbus client library. -fcitx5-gtk: -fcitx5-gtk: Homepage: https://fcitx-im.org/wiki/Fcitx_5 -fcitx5-gtk: -fcitx5-gtk: -fcitx5-gtk: -fcitx5-gtk: -fcitx5-gtk: -fcitx5-gtk: diff --git a/misc/fcitx5-mozc/0013-mozc-includes.patch b/misc/fcitx5-mozc/0013-mozc-includes.patch new file mode 100644 index 0000000000..b437f24e8b --- /dev/null +++ b/misc/fcitx5-mozc/0013-mozc-includes.patch @@ -0,0 +1,20 @@ +--- third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc 2023-09-05 17:36:23.973250174 +0900 ++++ third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc 2023-09-05 17:37:06.585477262 +0900 +@@ -5,6 +5,7 @@ + #include <algorithm> + #include <cassert> + #include <cmath> ++#include <cstdint> + #include <limits> + #include <string> + +--- third_party/abseil-cpp/absl/strings/internal/str_format/extension.h 2023-09-05 17:45:04.104106229 +0900 ++++ third_party/abseil-cpp/absl/strings/internal/str_format/extension.h 2023-09-05 17:45:24.484098612 +0900 +@@ -20,6 +20,7 @@ + + #include <cstddef> + #include <cstring> ++#include <cstdint> + #include <ostream> + + #include "absl/base/config.h" diff --git a/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild b/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild index 2d679c9fce..eb7836e054 100644 --- a/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild +++ b/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild @@ -165,6 +165,9 @@ cd src/ # Build with gcc instead of clang echo "... Apply 0012-mozc-build-gcc.patch" patch -p1 < $CWD/0012-mozc-build-gcc.patch +# gcc-13 compatibility +echo "... Apply 0013-mozc-includes.patch" +patch -p0 < $CWD/0013-mozc-includes.patch # Fix compatibility with google-glog 0.3.3 (symbol conflict) CFLAGS="${CFLAGS} -fvisibility=hidden" diff --git a/misc/fcitx5-qt/README b/misc/fcitx5-qt/README deleted file mode 100644 index 2f83854aea..0000000000 --- a/misc/fcitx5-qt/README +++ /dev/null @@ -1,25 +0,0 @@ -fcitx5-qt is the Qt im-module for fcitx5 and it needs to be installed -in order to use fcitx5 with Qt-based applications. It currently -supports Qt4, Qt5 and Qt6. - -You'll need several Qt modules if you're going to enable Qt5/Qt6 -support, namely QtCore, QtDbus, QtWidgets and QtX11Extras. Qt5 is -bundled in Slackware, however if you want Qt6 support you're on your -own; but any app that requires Qt6 on SBo at this point should have -already pulled all the dependencies in. - -Relevant CMake options are ENABLE_QT4, ENABLE_QT5 and ENABLE_QT6. -ENABLE_QT4 is turned off by default, ENABLE_QT5 and ENABLE_QT6 are -turned on by default. However to avoid pulling in excess dependencies, -Qt6 support is turned off in the SlackBuild. If you need Qt4 or Qt6 -support, you might want to turn the flags on/off depending on the Qt -version you are using. To enable Qt4, you need to modify - - -DENABLE_QT4=Off \ - -from "Off" to "On". Similarly, to turn on Qt6 support, turn - - -DENABLE_QT6=Off \ - -DENABLE_QT6_WAYLAND_WORKAROUND=Off .. - -from "Off" to "On". diff --git a/misc/fcitx5-qt/doinst.sh b/misc/fcitx5-qt/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/misc/fcitx5-qt/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/misc/fcitx5-qt/fcitx5-qt.SlackBuild b/misc/fcitx5-qt/fcitx5-qt.SlackBuild deleted file mode 100644 index d60735c8c4..0000000000 --- a/misc/fcitx5-qt/fcitx5-qt.SlackBuild +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -# Copyright 2022-2023 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-qt -VERSION=${VERSION:-5.1.5} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DENABLE_QT4=Off \ - -DENABLE_QT6=Off \ - -DENABLE_QT6_WAYLAND_WORKAROUND=Off .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* README* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/fcitx5-qt/fcitx5-qt.info b/misc/fcitx5-qt/fcitx5-qt.info deleted file mode 100644 index 750d7f18ab..0000000000 --- a/misc/fcitx5-qt/fcitx5-qt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-qt" -VERSION="5.1.5" -HOMEPAGE="https://github.com/fcitx/fcitx5-qt" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-5.1.5.tar.xz" -MD5SUM="91d1b828b5263843117c3d8a2c0fb1d0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fcitx5" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-table-extra/README b/misc/fcitx5-table-extra/README deleted file mode 100644 index a65ebaddbf..0000000000 --- a/misc/fcitx5-table-extra/README +++ /dev/null @@ -1,13 +0,0 @@ -fcitx5-table-extra provides extra table for Fcitx5, including Boshiamy, -Zhengma, Cangjie, and Quick. - -Zhengma's patent is expired at 2009. -Boshiamy's patent is expired at 2003.11.11. -Cangjie's author drop Cangjie's patent in 1982. - -The code of this package are released under GPLv3 or later. - -All the data file is now in public domain. - -For expired patent references, see the original README on the website: -https://github.com/fcitx/fcitx5-table-extra diff --git a/misc/fcitx5-table-extra/doinst.sh b/misc/fcitx5-table-extra/doinst.sh deleted file mode 100644 index ca71fd3c40..0000000000 --- a/misc/fcitx5-table-extra/doinst.sh +++ /dev/null @@ -1,12 +0,0 @@ -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/glib-2.0/schemas ]; then - if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 - fi -fi - diff --git a/misc/fcitx5-table-extra/fcitx5-table-extra.SlackBuild b/misc/fcitx5-table-extra/fcitx5-table-extra.SlackBuild deleted file mode 100644 index c2b8eb2f25..0000000000 --- a/misc/fcitx5-table-extra/fcitx5-table-extra.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash - -# Copyright 2022 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-table-extra -VERSION=${VERSION:-5.1.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-${VERSION}.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/fcitx5-table-extra/fcitx5-table-extra.info b/misc/fcitx5-table-extra/fcitx5-table-extra.info deleted file mode 100644 index 71d6cd7f26..0000000000 --- a/misc/fcitx5-table-extra/fcitx5-table-extra.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-table-extra" -VERSION="5.1.4" -HOMEPAGE="https://github.com/fcitx/fcitx5-table-extra" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-5.1.4.tar.xz" -MD5SUM="de95e17779128e331bc14f7b32eebd9d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libime fcitx5" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-table-extra/slack-desc b/misc/fcitx5-table-extra/slack-desc deleted file mode 100644 index 5c5f732685..0000000000 --- a/misc/fcitx5-table-extra/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5-table-extra: fcitx5-table-extra (Extra table input methods for fcitx5) -fcitx5-table-extra: -fcitx5-table-extra: fcitx5-table-extra provides extra table for Fcitx5, including -fcitx5-table-extra: Boshiamy, Zhengma, Cangjie, and Quick. -fcitx5-table-extra: -fcitx5-table-extra: -fcitx5-table-extra: -fcitx5-table-extra: -fcitx5-table-extra: -fcitx5-table-extra: Homepage: https://github.com/fcitx/fcitx5-table-extra -fcitx5-table-extra: diff --git a/misc/fcitx5-table-other/README b/misc/fcitx5-table-other/README deleted file mode 100644 index 85f68343b7..0000000000 --- a/misc/fcitx5-table-other/README +++ /dev/null @@ -1,7 +0,0 @@ -fcitx-table-other provides some other tables for Fcitx, fork from -ibus-table-others, scim-tables. - -Most of the table in this package is non-Chinese table. They are listed -under /tables by language. - -The package is released under GPLv3+. diff --git a/misc/fcitx5-table-other/doinst.sh b/misc/fcitx5-table-other/doinst.sh deleted file mode 100644 index ca71fd3c40..0000000000 --- a/misc/fcitx5-table-other/doinst.sh +++ /dev/null @@ -1,12 +0,0 @@ -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/glib-2.0/schemas ]; then - if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 - fi -fi - diff --git a/misc/fcitx5-table-other/fcitx5-table-other.SlackBuild b/misc/fcitx5-table-other/fcitx5-table-other.SlackBuild deleted file mode 100644 index bded45b468..0000000000 --- a/misc/fcitx5-table-other/fcitx5-table-other.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash - -# Copyright 2022 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5-table-other -VERSION=${VERSION:-5.1.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -ARCH=noarch - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-${VERSION}.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/fcitx5-table-other/fcitx5-table-other.info b/misc/fcitx5-table-other/fcitx5-table-other.info deleted file mode 100644 index 0e87257e56..0000000000 --- a/misc/fcitx5-table-other/fcitx5-table-other.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5-table-other" -VERSION="5.1.1" -HOMEPAGE="https://github.com/fcitx/fcitx5-table-other" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-5.1.1.tar.xz" -MD5SUM="75d0b6f0bad6e781b1d358aaa7c593e3" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libime fcitx5" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5-table-other/slack-desc b/misc/fcitx5-table-other/slack-desc deleted file mode 100644 index 600f1a9a4a..0000000000 --- a/misc/fcitx5-table-other/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5-table-other: fcitx5-table-other (Some other tables for fcitx5) -fcitx5-table-other: -fcitx5-table-other: fcitx-table-other provides some other tables for Fcitx, fork from -fcitx5-table-other: ibus-table-others, scim-tables. -fcitx5-table-other: -fcitx5-table-other: Most of the table in this package is non-Chinese table. They are -fcitx5-table-other: listed under /tables by language. -fcitx5-table-other: -fcitx5-table-other: -fcitx5-table-other: Homepage: https://github.com/fcitx/fcitx5-table-other -fcitx5-table-other: diff --git a/misc/fcitx5/README b/misc/fcitx5/README deleted file mode 100644 index bd043ee147..0000000000 --- a/misc/fcitx5/README +++ /dev/null @@ -1,37 +0,0 @@ -Fcitx is an input method framework with extension support. Currently it -supports Linux and Unix systems like freebsd. Fcitx supports typing -with many languages all over the world with a large number of engines. - -Fcitx has a slim core while provides powerful features with addons. It -is easy to customize fcitx to satisfy your own needs. - -Fcitx5 is the next generation of fcitx. - -Some cmake options to keep in mind before building are: - -- ENABLE_WAYLAND: Wayland support. Defaults to On and should be fine - for desktop environments such as KDE and GNOME. Users running - X11-based window managers will need to turn it off. - -- ENABLE_ENCHANT: Enchant support. Defaults to On. Used for word - prediction (hinting). Depends on libenchant, which is provided by - most distributions. - -The user is encouraged to check the contents of CMakeLists.txt for an -exhaustive list of options. - -For example, an i3 user who wishes to install it to /opt would run -(likely with sudo privileges): - - cmake -DENABLE_WAYLAND=Off \ - -DCMAKE_INSTALL_PREFIX=/your/install/path . - make - sudo make install - -To make fcitx5 the default input method, please add these lines to your -/etc/environment (or .profile): - - GTK_IM_MODULE=fcitx - QT_IM_MODULE=fcitx - XMODIFIERS=@im=fcitx - diff --git a/misc/fcitx5/fcitx5-autostart b/misc/fcitx5/fcitx5-autostart deleted file mode 100644 index 22d8c056d3..0000000000 --- a/misc/fcitx5/fcitx5-autostart +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -START="no" - -if [ "$XIM" = "fcitx" ]; then - START="yes" -fi - -if [ "$XIM_PROGRAM" = "fcitx" ]; then - START="yes" -fi - -if [ "$GTK_IM_MODULE" = "fcitx" ]; then - START="yes" -fi - -if [ "$QT_IM_MODULE" = "fcitx" ]; then - START="yes" -fi - -if [ "$START" = "no" ]; then - exit 0 -fi - -# sleep for a little while to avoid duplicate startup -sleep 2 - -# Test whether fcitx is running correctly with dbus... -fcitx5-remote > /dev/null 2>&1 - -if [ $? = "1" ]; then - echo "Fcitx seems is not running" - fcitx5 -else - echo "Fcitx is running correctly." -fi diff --git a/misc/fcitx5/fcitx5.SlackBuild b/misc/fcitx5/fcitx5.SlackBuild deleted file mode 100644 index 662f996168..0000000000 --- a/misc/fcitx5/fcitx5.SlackBuild +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -# Copyright 2022-2023 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fcitx5 -VERSION=${VERSION:-5.1.8} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-${VERSION}_dict.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - - -# Use our own autostart script to autostart fcitx5 -install -m 755 $CWD/fcitx5-autostart $PKG/usr/bin/ -sed -i "s|Exec=/usr/bin/fcitx5|Exec=/usr/bin/fcitx5-autostart|" \ - $PKG/etc/xdg/autostart/org.fcitx.Fcitx5.desktop - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* README* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/fcitx5/fcitx5.info b/misc/fcitx5/fcitx5.info deleted file mode 100644 index e185c82b2b..0000000000 --- a/misc/fcitx5/fcitx5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fcitx5" -VERSION="5.1.8" -HOMEPAGE="https://fcitx-im.org/wiki/Fcitx_5" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-5.1.8_dict.tar.xz" -MD5SUM="f3cabadf80a3bdd252d37079bbdcecdf" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="fmt xcb-imdkit" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/fcitx5/slack-desc b/misc/fcitx5/slack-desc deleted file mode 100644 index eaccae7994..0000000000 --- a/misc/fcitx5/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fcitx5: fcitx5 (Input Method Framework) -fcitx5: -fcitx5: Fcitx is an input method framework with extension support. Currently -fcitx5: it supports Linux and Unix systems like freebsd. It has three built- -fcitx5: in Input Method Engine, Pinyin, QuWei and Table-based input methods. -fcitx5: Fcitx tries to provide a native feeling under all desktop as well as -fcitx5: a light weight core. You can easily customize it to fit your -fcitx5: requirements. -fcitx5: -fcitx5: Homepage: https://fcitx-im.org/wiki/Fcitx_5 -fcitx5: diff --git a/misc/open-simh/open-simh.SlackBuild b/misc/open-simh/open-simh.SlackBuild index 19564929d1..50a7eacc62 100644 --- a/misc/open-simh/open-simh.SlackBuild +++ b/misc/open-simh/open-simh.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Open-SimH -# Copyright 2023 Antonio Leal, Porto Salvo, Oeiras, Portugal +# Copyright 2023-2024 Antonio Leal, Porto Salvo, Oeiras, Portugal # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=open-simh SRCNAM=simh -VERSION=${VERSION:-a588496} -COMMIT=${COMMIT:-a58849613bfaffa7b600269db018edcdb2978bf9} +VERSION=${VERSION:-20240315_ffe537a} +COMMIT=${COMMIT:-ffe537a621d36bcf2e4d63b8b9ac3163929b57a9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/misc/open-simh/open-simh.info b/misc/open-simh/open-simh.info index 785de24d71..08a3fcc417 100644 --- a/misc/open-simh/open-simh.info +++ b/misc/open-simh/open-simh.info @@ -1,8 +1,8 @@ PRGNAM="open-simh" -VERSION="a588496" +VERSION="20240315_ffe537a" HOMEPAGE="https://opensimh.org" -DOWNLOAD="https://github.com/open-simh/simh/archive/a588496/simh-a58849613bfaffa7b600269db018edcdb2978bf9.tar.gz" -MD5SUM="d4b1cf5daca76eb8e16f3264117ced07" +DOWNLOAD="https://github.com/open-simh/simh/archive/ffe537a/simh-ffe537a621d36bcf2e4d63b8b9ac3163929b57a9.tar.gz" +MD5SUM="720089dcb28e7d28dca0b9a8b5c92e59" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/misc/par2cmdline-tbb/par2cmdline-tbb.info b/misc/par2cmdline-tbb/par2cmdline-tbb.info index abf6afd8b3..d197ad0868 100644 --- a/misc/par2cmdline-tbb/par2cmdline-tbb.info +++ b/misc/par2cmdline-tbb/par2cmdline-tbb.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/jcfp/par2tbb-chuchusoft-sources/releases/download/0 MD5SUM="8159d5747647d9790ae39e3aedbd2f3c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="tbb" +REQUIRES="oneTBB" MAINTAINER="powtrix" EMAIL="powtrix@gmail.com" diff --git a/misc/sigrok-firmware-fx2lafw/patches/00-fx2lafw__silence_integer_overflow_compile_warnings.patch b/misc/sigrok-firmware-fx2lafw/patches/00-fx2lafw__silence_integer_overflow_compile_warnings.patch new file mode 100644 index 0000000000..57143d0f91 --- /dev/null +++ b/misc/sigrok-firmware-fx2lafw/patches/00-fx2lafw__silence_integer_overflow_compile_warnings.patch @@ -0,0 +1,26 @@ +From: Gerhard Sittig <redacted> +Date: Mon, 22 Feb 2021 19:17:02 +0000 (+0100) +Subject: fx2lafw: silence integer overflow compile warnings +X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-firmware-fx2lafw.git;a=commitdiff_plain;h=61f1c8fc33ce959f167f6bcb5ba3b0959d60b038 + +fx2lafw: silence integer overflow compile warnings + +Explicitly mark literals for control bitfield values as unsigned, to +avoid compiler warnings when the MSB gets set in assignments to a byte. +This kind of follows up to commit f6ef2ff72979 after commit b283ba837a11 +re-introduced the warning. +--- + +diff --git a/gpif-acquisition.c b/gpif-acquisition.c +index 96476ccc..c6ba52a0 100644 +--- a/gpif-acquisition.c ++++ b/gpif-acquisition.c +@@ -161,7 +161,7 @@ static void gpif_make_data_dp_state(volatile BYTE *pSTATE) + * BRANCH + * Branch to IDLE if condition is true, back to S0 otherwise. + */ +- pSTATE[0] = (1 << 7) | (7 << 3) | (0 << 0); ++ pSTATE[0] = (1u << 7) | (7u << 3) | (0u << 0); + + /* + * OPCODE diff --git a/misc/sigrok-firmware-fx2lafw/patches/01-fx2lib__Update___interrupt_syntax_for_sdcc_4.2.3.patch b/misc/sigrok-firmware-fx2lafw/patches/01-fx2lib__Update___interrupt_syntax_for_sdcc_4.2.3.patch new file mode 100644 index 0000000000..72387ac5d7 --- /dev/null +++ b/misc/sigrok-firmware-fx2lafw/patches/01-fx2lib__Update___interrupt_syntax_for_sdcc_4.2.3.patch @@ -0,0 +1,575 @@ +From: Matthew Cengia <redacted> +Date: Tue, 15 Aug 2023 00:38:34 +0000 (+1000) +Subject: fx2lib: Update __interrupt syntax for sdcc>=4.2.3 +X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-firmware-fx2lafw.git;a=commitdiff_plain;h=5aab87d358a4585a10ad89277bb88ad139077abd + +fx2lib: Update __interrupt syntax for sdcc>=4.2.3 + +The SDCC user manual https://sdcc.sourceforge.net/doc/sdccman.pdf +section 1.5 "Compatibility with previous versions" on page 11 states: + +> In 4.2.3, support for non-parenthesized arguments to __using and +> __interrupt was dropped. + +Adjust the imported fx2lib source files to unbreak compilation with +more recent SDCC versions. +--- + +diff --git a/fx2lib/include/autovector.h b/fx2lib/include/autovector.h +index 495a3126..38f80fcd 100644 +--- a/fx2lib/include/autovector.h ++++ b/fx2lib/include/autovector.h +@@ -172,49 +172,49 @@ typedef enum { + // you must include the predef of these in the file with your main + // so lets just define them here + +-void sudav_isr() __interrupt SUDAV_ISR; +-void sof_isr() __interrupt SOF_ISR; +-void sutok_isr() __interrupt SUTOK_ISR; +-void suspend_isr() __interrupt SUSPEND_ISR; +-void usbreset_isr() __interrupt USBRESET_ISR; +-void hispeed_isr() __interrupt HISPEED_ISR; +-void ep0ack_isr() __interrupt EP0ACK_ISR; +-void ep0in_isr() __interrupt EP0IN_ISR; +-void ep0out_isr() __interrupt EP0OUT_ISR; +-void ep1in_isr() __interrupt EP1IN_ISR; +-void ep1out_isr() __interrupt EP1OUT_ISR; +-void ep2_isr() __interrupt EP2_ISR; +-void ep4_isr() __interrupt EP4_ISR; +-void ep6_isr() __interrupt EP6_ISR; +-void ep8_isr() __interrupt EP8_ISR; +-void ibn_isr() __interrupt IBN_ISR; +-void ep0ping_isr() __interrupt EP0PING_ISR; +-void ep1ping_isr() __interrupt EP1PING_ISR; +-void ep2ping_isr() __interrupt EP2PING_ISR; +-void ep4ping_isr() __interrupt EP4PING_ISR; +-void ep6ping_isr() __interrupt EP6PING_ISR; +-void ep8ping_isr() __interrupt EP8PING_ISR; +-void errlimit_isr() __interrupt ERRLIMIT_ISR; +-void ep2isoerr_isr() __interrupt EP2ISOERR_ISR; +-void ep4isoerr_isr() __interrupt EP4ISOERR_ISR; +-void ep6isoerr_isr() __interrupt EP6ISOERR_ISR; +-void ep8isoerr_isr() __interrupt EP8ISOERR_ISR; +-void spare_isr() __interrupt RESERVED_ISR; // not used ++void sudav_isr() __interrupt(SUDAV_ISR); ++void sof_isr() __interrupt(SOF_ISR); ++void sutok_isr() __interrupt(SUTOK_ISR); ++void suspend_isr() __interrupt(SUSPEND_ISR); ++void usbreset_isr() __interrupt(USBRESET_ISR); ++void hispeed_isr() __interrupt(HISPEED_ISR); ++void ep0ack_isr() __interrupt(EP0ACK_ISR); ++void ep0in_isr() __interrupt(EP0IN_ISR); ++void ep0out_isr() __interrupt(EP0OUT_ISR); ++void ep1in_isr() __interrupt(EP1IN_ISR); ++void ep1out_isr() __interrupt(EP1OUT_ISR); ++void ep2_isr() __interrupt(EP2_ISR); ++void ep4_isr() __interrupt(EP4_ISR); ++void ep6_isr() __interrupt(EP6_ISR); ++void ep8_isr() __interrupt(EP8_ISR); ++void ibn_isr() __interrupt(IBN_ISR); ++void ep0ping_isr() __interrupt(EP0PING_ISR); ++void ep1ping_isr() __interrupt(EP1PING_ISR); ++void ep2ping_isr() __interrupt(EP2PING_ISR); ++void ep4ping_isr() __interrupt(EP4PING_ISR); ++void ep6ping_isr() __interrupt(EP6PING_ISR); ++void ep8ping_isr() __interrupt(EP8PING_ISR); ++void errlimit_isr() __interrupt(ERRLIMIT_ISR); ++void ep2isoerr_isr() __interrupt(EP2ISOERR_ISR); ++void ep4isoerr_isr() __interrupt(EP4ISOERR_ISR); ++void ep6isoerr_isr() __interrupt(EP6ISOERR_ISR); ++void ep8isoerr_isr() __interrupt(EP8ISOERR_ISR); ++void spare_isr() __interrupt(RESERVED_ISR); // not used + // gpif ints +-void ep2pf_isr() __interrupt EP2PF_ISR; +-void ep4pf_isr() __interrupt EP4PF_ISR; +-void ep6pf_isr() __interrupt EP6PF_ISR; +-void ep8pf_isr() __interrupt EP8PF_ISR; +-void ep2ef_isr() __interrupt EP2EF_ISR; +-void ep4ef_isr() __interrupt EP4EF_ISR; +-void ep6ef_isr() __interrupt EP6EF_ISR; +-void ep8ef_isr() __interrupt EP8EF_ISR; +-void ep2ff_isr() __interrupt EP2FF_ISR; +-void ep4ff_isr() __interrupt EP4FF_ISR; +-void ep6ff_isr() __interrupt EP6FF_ISR; +-void ep8ff_isr() __interrupt EP8FF_ISR; +-void gpifdone_isr() __interrupt GPIFDONE_ISR; +-void gpifwf_isr() __interrupt GPIFWF_ISR; ++void ep2pf_isr() __interrupt(EP2PF_ISR); ++void ep4pf_isr() __interrupt(EP4PF_ISR); ++void ep6pf_isr() __interrupt(EP6PF_ISR); ++void ep8pf_isr() __interrupt(EP8PF_ISR); ++void ep2ef_isr() __interrupt(EP2EF_ISR); ++void ep4ef_isr() __interrupt(EP4EF_ISR); ++void ep6ef_isr() __interrupt(EP6EF_ISR); ++void ep8ef_isr() __interrupt(EP8EF_ISR); ++void ep2ff_isr() __interrupt(EP2FF_ISR); ++void ep4ff_isr() __interrupt(EP4FF_ISR); ++void ep6ff_isr() __interrupt(EP6FF_ISR); ++void ep8ff_isr() __interrupt(EP8FF_ISR); ++void gpifdone_isr() __interrupt(GPIFDONE_ISR); ++void gpifwf_isr() __interrupt(GPIFWF_ISR); + + #endif + +diff --git a/fx2lib/lib/interrupts/ep0ack_isr.c b/fx2lib/lib/interrupts/ep0ack_isr.c +index dec4e56a..d216717d 100644 +--- a/fx2lib/lib/interrupts/ep0ack_isr.c ++++ b/fx2lib/lib/interrupts/ep0ack_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep0ack_isr() __interrupt EP0ACK_ISR {} ++void ep0ack_isr() __interrupt(EP0ACK_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep0in_isr.c b/fx2lib/lib/interrupts/ep0in_isr.c +index 2fa99a42..f3d8990e 100644 +--- a/fx2lib/lib/interrupts/ep0in_isr.c ++++ b/fx2lib/lib/interrupts/ep0in_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep0in_isr() __interrupt EP0IN_ISR {} ++void ep0in_isr() __interrupt(EP0IN_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep0out_isr.c b/fx2lib/lib/interrupts/ep0out_isr.c +index 043ae70d..a5acedb7 100644 +--- a/fx2lib/lib/interrupts/ep0out_isr.c ++++ b/fx2lib/lib/interrupts/ep0out_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep0out_isr() __interrupt EP0OUT_ISR {} ++void ep0out_isr() __interrupt(EP0OUT_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep0ping_isr.c b/fx2lib/lib/interrupts/ep0ping_isr.c +index 3062d177..7b1ee929 100644 +--- a/fx2lib/lib/interrupts/ep0ping_isr.c ++++ b/fx2lib/lib/interrupts/ep0ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep0ping_isr() __interrupt EP0PING_ISR {} ++void ep0ping_isr() __interrupt(EP0PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep1in_isr.c b/fx2lib/lib/interrupts/ep1in_isr.c +index d4ecf06f..b666fcb3 100644 +--- a/fx2lib/lib/interrupts/ep1in_isr.c ++++ b/fx2lib/lib/interrupts/ep1in_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep1in_isr() __interrupt EP1IN_ISR {} ++void ep1in_isr() __interrupt(EP1IN_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep1out_isr.c b/fx2lib/lib/interrupts/ep1out_isr.c +index 998b7aa8..6c87dc20 100644 +--- a/fx2lib/lib/interrupts/ep1out_isr.c ++++ b/fx2lib/lib/interrupts/ep1out_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep1out_isr() __interrupt EP1OUT_ISR {} ++void ep1out_isr() __interrupt(EP1OUT_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep1ping_isr.c b/fx2lib/lib/interrupts/ep1ping_isr.c +index ff8990e0..c32d437c 100644 +--- a/fx2lib/lib/interrupts/ep1ping_isr.c ++++ b/fx2lib/lib/interrupts/ep1ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep1ping_isr() __interrupt EP1PING_ISR {} ++void ep1ping_isr() __interrupt(EP1PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep2_isr.c b/fx2lib/lib/interrupts/ep2_isr.c +index 43a31b7d..4de637a3 100644 +--- a/fx2lib/lib/interrupts/ep2_isr.c ++++ b/fx2lib/lib/interrupts/ep2_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2_isr() __interrupt EP2_ISR {} ++void ep2_isr() __interrupt(EP2_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep2ef_isr.c b/fx2lib/lib/interrupts/ep2ef_isr.c +index e26c5e8a..46f3f87a 100644 +--- a/fx2lib/lib/interrupts/ep2ef_isr.c ++++ b/fx2lib/lib/interrupts/ep2ef_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2ef_isr() __interrupt EP2EF_ISR{} ++void ep2ef_isr() __interrupt(EP2EF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep2ff_isr.c b/fx2lib/lib/interrupts/ep2ff_isr.c +index 22bb95d7..400e4803 100644 +--- a/fx2lib/lib/interrupts/ep2ff_isr.c ++++ b/fx2lib/lib/interrupts/ep2ff_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2ff_isr() __interrupt EP2FF_ISR{} ++void ep2ff_isr() __interrupt(EP2FF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep2isoerr_isr.c b/fx2lib/lib/interrupts/ep2isoerr_isr.c +index b9dc9b50..d0ca4a89 100644 +--- a/fx2lib/lib/interrupts/ep2isoerr_isr.c ++++ b/fx2lib/lib/interrupts/ep2isoerr_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2isoerr_isr() __interrupt EP2ISOERR_ISR {} ++void ep2isoerr_isr() __interrupt(EP2ISOERR_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep2pf_isr.c b/fx2lib/lib/interrupts/ep2pf_isr.c +index 7cad068e..9bd8e9aa 100644 +--- a/fx2lib/lib/interrupts/ep2pf_isr.c ++++ b/fx2lib/lib/interrupts/ep2pf_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2pf_isr() __interrupt EP2PF_ISR{} ++void ep2pf_isr() __interrupt(EP2PF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep2ping_isr.c b/fx2lib/lib/interrupts/ep2ping_isr.c +index 78affed5..dad1e953 100644 +--- a/fx2lib/lib/interrupts/ep2ping_isr.c ++++ b/fx2lib/lib/interrupts/ep2ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2ping_isr() __interrupt EP2PING_ISR {} ++void ep2ping_isr() __interrupt(EP2PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep4_isr.c b/fx2lib/lib/interrupts/ep4_isr.c +index 0315c853..5affac9a 100644 +--- a/fx2lib/lib/interrupts/ep4_isr.c ++++ b/fx2lib/lib/interrupts/ep4_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4_isr() __interrupt EP4_ISR {} ++void ep4_isr() __interrupt(EP4_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep4ef_isr.c b/fx2lib/lib/interrupts/ep4ef_isr.c +index a203e7ba..4a0cff1a 100644 +--- a/fx2lib/lib/interrupts/ep4ef_isr.c ++++ b/fx2lib/lib/interrupts/ep4ef_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4ef_isr() __interrupt EP4EF_ISR{} ++void ep4ef_isr() __interrupt(EP4EF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep4ff_isr.c b/fx2lib/lib/interrupts/ep4ff_isr.c +index e0cd201b..3278da2d 100644 +--- a/fx2lib/lib/interrupts/ep4ff_isr.c ++++ b/fx2lib/lib/interrupts/ep4ff_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4ff_isr() __interrupt EP4FF_ISR{} ++void ep4ff_isr() __interrupt(EP4FF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep4isoerr_isr.c b/fx2lib/lib/interrupts/ep4isoerr_isr.c +index 579fb8bf..dcd7ff90 100644 +--- a/fx2lib/lib/interrupts/ep4isoerr_isr.c ++++ b/fx2lib/lib/interrupts/ep4isoerr_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4isoerr_isr() __interrupt EP4ISOERR_ISR {} ++void ep4isoerr_isr() __interrupt(EP4ISOERR_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep4pf_isr.c b/fx2lib/lib/interrupts/ep4pf_isr.c +index ec5ce725..7bbe9f02 100644 +--- a/fx2lib/lib/interrupts/ep4pf_isr.c ++++ b/fx2lib/lib/interrupts/ep4pf_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4pf_isr() __interrupt EP4PF_ISR{} ++void ep4pf_isr() __interrupt(EP4PF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep4ping_isr.c b/fx2lib/lib/interrupts/ep4ping_isr.c +index 18bac000..8d226856 100644 +--- a/fx2lib/lib/interrupts/ep4ping_isr.c ++++ b/fx2lib/lib/interrupts/ep4ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4ping_isr() __interrupt EP4PING_ISR {} ++void ep4ping_isr() __interrupt(EP4PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep6_isr.c b/fx2lib/lib/interrupts/ep6_isr.c +index 552e60de..630f9b26 100644 +--- a/fx2lib/lib/interrupts/ep6_isr.c ++++ b/fx2lib/lib/interrupts/ep6_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6_isr() __interrupt EP6_ISR {} ++void ep6_isr() __interrupt(EP6_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep6ef_isr.c b/fx2lib/lib/interrupts/ep6ef_isr.c +index 39e8e0c5..e9ba6d54 100644 +--- a/fx2lib/lib/interrupts/ep6ef_isr.c ++++ b/fx2lib/lib/interrupts/ep6ef_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6ef_isr() __interrupt EP6EF_ISR{} ++void ep6ef_isr() __interrupt(EP6EF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep6ff_isr.c b/fx2lib/lib/interrupts/ep6ff_isr.c +index 54137316..011fe871 100644 +--- a/fx2lib/lib/interrupts/ep6ff_isr.c ++++ b/fx2lib/lib/interrupts/ep6ff_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6ff_isr() __interrupt EP6FF_ISR{} ++void ep6ff_isr() __interrupt(EP6FF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep6isoerr_isr.c b/fx2lib/lib/interrupts/ep6isoerr_isr.c +index 407414c7..8c005777 100644 +--- a/fx2lib/lib/interrupts/ep6isoerr_isr.c ++++ b/fx2lib/lib/interrupts/ep6isoerr_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6isoerr_isr() __interrupt EP6ISOERR_ISR {} ++void ep6isoerr_isr() __interrupt(EP6ISOERR_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep6pf_isr.c b/fx2lib/lib/interrupts/ep6pf_isr.c +index 808f7513..52f6d738 100644 +--- a/fx2lib/lib/interrupts/ep6pf_isr.c ++++ b/fx2lib/lib/interrupts/ep6pf_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6pf_isr() __interrupt EP6PF_ISR{} ++void ep6pf_isr() __interrupt(EP6PF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep6ping_isr.c b/fx2lib/lib/interrupts/ep6ping_isr.c +index 53f8ba52..5430f209 100644 +--- a/fx2lib/lib/interrupts/ep6ping_isr.c ++++ b/fx2lib/lib/interrupts/ep6ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6ping_isr() __interrupt EP6PING_ISR {} ++void ep6ping_isr() __interrupt(EP6PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep8_isr.c b/fx2lib/lib/interrupts/ep8_isr.c +index 4f1dd51d..d415a3ec 100644 +--- a/fx2lib/lib/interrupts/ep8_isr.c ++++ b/fx2lib/lib/interrupts/ep8_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8_isr() __interrupt EP8_ISR {} ++void ep8_isr() __interrupt(EP8_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep8ef_isr.c b/fx2lib/lib/interrupts/ep8ef_isr.c +index c018f3ac..d04d2376 100644 +--- a/fx2lib/lib/interrupts/ep8ef_isr.c ++++ b/fx2lib/lib/interrupts/ep8ef_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8ef_isr() __interrupt EP8EF_ISR{} ++void ep8ef_isr() __interrupt(EP8EF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep8ff_isr.c b/fx2lib/lib/interrupts/ep8ff_isr.c +index a6169de3..d1e5fcd7 100644 +--- a/fx2lib/lib/interrupts/ep8ff_isr.c ++++ b/fx2lib/lib/interrupts/ep8ff_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8ff_isr() __interrupt EP8FF_ISR{} ++void ep8ff_isr() __interrupt(EP8FF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep8isoerr_isr.c b/fx2lib/lib/interrupts/ep8isoerr_isr.c +index a95bae9a..a7e8e0f9 100644 +--- a/fx2lib/lib/interrupts/ep8isoerr_isr.c ++++ b/fx2lib/lib/interrupts/ep8isoerr_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8isoerr_isr() __interrupt EP8ISOERR_ISR {} ++void ep8isoerr_isr() __interrupt(EP8ISOERR_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep8pf_isr.c b/fx2lib/lib/interrupts/ep8pf_isr.c +index b0e687c6..53dcdf27 100644 +--- a/fx2lib/lib/interrupts/ep8pf_isr.c ++++ b/fx2lib/lib/interrupts/ep8pf_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8pf_isr() __interrupt EP8PF_ISR{} ++void ep8pf_isr() __interrupt(EP8PF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep8ping_isr.c b/fx2lib/lib/interrupts/ep8ping_isr.c +index e9c25d9e..5cf05dc7 100644 +--- a/fx2lib/lib/interrupts/ep8ping_isr.c ++++ b/fx2lib/lib/interrupts/ep8ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8ping_isr() __interrupt EP8PING_ISR {} ++void ep8ping_isr() __interrupt(EP8PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/errlimit_isr.c b/fx2lib/lib/interrupts/errlimit_isr.c +index fe103c22..cf4e1f61 100644 +--- a/fx2lib/lib/interrupts/errlimit_isr.c ++++ b/fx2lib/lib/interrupts/errlimit_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void errlimit_isr() __interrupt ERRLIMIT_ISR {} ++void errlimit_isr() __interrupt(ERRLIMIT_ISR) {} + +diff --git a/fx2lib/lib/interrupts/gpifdone_isr.c b/fx2lib/lib/interrupts/gpifdone_isr.c +index 6bb15c77..ee5ce1f6 100644 +--- a/fx2lib/lib/interrupts/gpifdone_isr.c ++++ b/fx2lib/lib/interrupts/gpifdone_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void gpifdone_isr() __interrupt GPIFDONE_ISR{} ++void gpifdone_isr() __interrupt(GPIFDONE_ISR){} + +diff --git a/fx2lib/lib/interrupts/gpifwf_isr.c b/fx2lib/lib/interrupts/gpifwf_isr.c +index 49eba448..e9941541 100644 +--- a/fx2lib/lib/interrupts/gpifwf_isr.c ++++ b/fx2lib/lib/interrupts/gpifwf_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void gpifwf_isr() __interrupt GPIFWF_ISR{} ++void gpifwf_isr() __interrupt(GPIFWF_ISR){} + +diff --git a/fx2lib/lib/interrupts/hispeed_isr.c b/fx2lib/lib/interrupts/hispeed_isr.c +index 7b05916f..9daabc12 100644 +--- a/fx2lib/lib/interrupts/hispeed_isr.c ++++ b/fx2lib/lib/interrupts/hispeed_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void hispeed_isr() __interrupt HISPEED_ISR {} ++void hispeed_isr() __interrupt(HISPEED_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ibn_isr.c b/fx2lib/lib/interrupts/ibn_isr.c +index 0f38871a..aa0a7523 100644 +--- a/fx2lib/lib/interrupts/ibn_isr.c ++++ b/fx2lib/lib/interrupts/ibn_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ibn_isr() __interrupt IBN_ISR {} ++void ibn_isr() __interrupt(IBN_ISR) {} + +diff --git a/fx2lib/lib/interrupts/sof_isr.c b/fx2lib/lib/interrupts/sof_isr.c +index 49bf5081..64a409c4 100644 +--- a/fx2lib/lib/interrupts/sof_isr.c ++++ b/fx2lib/lib/interrupts/sof_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void sof_isr() __interrupt SOF_ISR {} ++void sof_isr() __interrupt(SOF_ISR) {} + +diff --git a/fx2lib/lib/interrupts/spare_isr.c b/fx2lib/lib/interrupts/spare_isr.c +index 965b2818..3b81fd20 100644 +--- a/fx2lib/lib/interrupts/spare_isr.c ++++ b/fx2lib/lib/interrupts/spare_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void spare_isr() __interrupt RESERVED_ISR {} ++void spare_isr() __interrupt(RESERVED_ISR) {} + +diff --git a/fx2lib/lib/interrupts/sudav_isr.c b/fx2lib/lib/interrupts/sudav_isr.c +index 7660e115..4d36b59a 100644 +--- a/fx2lib/lib/interrupts/sudav_isr.c ++++ b/fx2lib/lib/interrupts/sudav_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void sudav_isr() __interrupt SUDAV_ISR {} ++void sudav_isr() __interrupt(SUDAV_ISR) {} + +diff --git a/fx2lib/lib/interrupts/suspend_isr.c b/fx2lib/lib/interrupts/suspend_isr.c +index 4b2f1aa2..cf08b28a 100644 +--- a/fx2lib/lib/interrupts/suspend_isr.c ++++ b/fx2lib/lib/interrupts/suspend_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void suspend_isr() __interrupt SUSPEND_ISR {} ++void suspend_isr() __interrupt(SUSPEND_ISR) {} + +diff --git a/fx2lib/lib/interrupts/sutok_isr.c b/fx2lib/lib/interrupts/sutok_isr.c +index 05330799..8c7368d2 100644 +--- a/fx2lib/lib/interrupts/sutok_isr.c ++++ b/fx2lib/lib/interrupts/sutok_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void sutok_isr() __interrupt SUTOK_ISR {} ++void sutok_isr() __interrupt(SUTOK_ISR) {} + +diff --git a/fx2lib/lib/interrupts/usbreset_isr.c b/fx2lib/lib/interrupts/usbreset_isr.c +index 7f2ed72d..8888eede 100644 +--- a/fx2lib/lib/interrupts/usbreset_isr.c ++++ b/fx2lib/lib/interrupts/usbreset_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void usbreset_isr() __interrupt USBRESET_ISR {} ++void usbreset_isr() __interrupt(USBRESET_ISR) {} + diff --git a/misc/sigrok-firmware-fx2lafw/patches/02-fx2lafw__Update___interrupt_syntax_for_sdcc_4.2.3.patch b/misc/sigrok-firmware-fx2lafw/patches/02-fx2lafw__Update___interrupt_syntax_for_sdcc_4.2.3.patch new file mode 100644 index 0000000000..402ec85b64 --- /dev/null +++ b/misc/sigrok-firmware-fx2lafw/patches/02-fx2lafw__Update___interrupt_syntax_for_sdcc_4.2.3.patch @@ -0,0 +1,108 @@ +From: Matthew Cengia <redacted> +Date: Tue, 15 Aug 2023 00:39:32 +0000 (+1000) +Subject: fx2lafw: Update __interrupt syntax for sdcc>=4.2.3 +X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-firmware-fx2lafw.git;a=commitdiff_plain;h=3e08500d22f87f69941b65cf8b8c1b85f9b41173 + +fx2lafw: Update __interrupt syntax for sdcc>=4.2.3 + +The SDCC user manual https://sdcc.sourceforge.net/doc/sdccman.pdf +section 1.5 "Compatibility with previous versions" on page 11 states: + +> In 4.2.3, support for non-parenthesized arguments to __using and +> __interrupt was dropped. + +Adjust the sigrok fx2lafw application source to unbreak compilation with +more recent SDCC versions. +--- + +diff --git a/fx2lafw.c b/fx2lafw.c +index 1035713d..42129219 100644 +--- a/fx2lafw.c ++++ b/fx2lafw.c +@@ -191,14 +191,14 @@ BOOL handle_set_configuration(BYTE cfg) + return (cfg == 1) ? TRUE : FALSE; + } + +-void sudav_isr(void) __interrupt SUDAV_ISR ++void sudav_isr(void) __interrupt(SUDAV_ISR) + { + got_sud = TRUE; + CLEAR_SUDAV(); + } + + /* IN BULK NAK - the host started requesting data. */ +-void ibn_isr(void) __interrupt IBN_ISR ++void ibn_isr(void) __interrupt(IBN_ISR) + { + /* + * If the IBN interrupt is not disabled, clearing +@@ -229,19 +229,19 @@ void ibn_isr(void) __interrupt IBN_ISR + SYNCDELAY(); + } + +-void usbreset_isr(void) __interrupt USBRESET_ISR ++void usbreset_isr(void) __interrupt(USBRESET_ISR) + { + handle_hispeed(FALSE); + CLEAR_USBRESET(); + } + +-void hispeed_isr(void) __interrupt HISPEED_ISR ++void hispeed_isr(void) __interrupt(HISPEED_ISR) + { + handle_hispeed(TRUE); + CLEAR_HISPEED(); + } + +-void timer2_isr(void) __interrupt TF2_ISR ++void timer2_isr(void) __interrupt(TF2_ISR) + { + /* Blink LED during acquisition, keep it on otherwise. */ + if (gpif_acquiring == RUNNING) { +diff --git a/include/scope.inc b/include/scope.inc +index 96422f1b..c6990853 100644 +--- a/include/scope.inc ++++ b/include/scope.inc +@@ -43,36 +43,36 @@ static volatile __bit dosuspend = FALSE; + extern __code BYTE highspd_dscr; + extern __code BYTE fullspd_dscr; + +-void resume_isr(void) __interrupt RESUME_ISR ++void resume_isr(void) __interrupt(RESUME_ISR) + { + CLEAR_RESUME(); + } + +-void sudav_isr(void) __interrupt SUDAV_ISR ++void sudav_isr(void) __interrupt(SUDAV_ISR) + { + dosud = TRUE; + CLEAR_SUDAV(); + } + +-void usbreset_isr(void) __interrupt USBRESET_ISR ++void usbreset_isr(void) __interrupt(USBRESET_ISR) + { + handle_hispeed(FALSE); + CLEAR_USBRESET(); + } + +-void hispeed_isr(void) __interrupt HISPEED_ISR ++void hispeed_isr(void) __interrupt(HISPEED_ISR) + { + handle_hispeed(TRUE); + CLEAR_HISPEED(); + } + +-void suspend_isr(void) __interrupt SUSPEND_ISR ++void suspend_isr(void) __interrupt(SUSPEND_ISR) + { + dosuspend = TRUE; + CLEAR_SUSPEND(); + } + +-void timer2_isr(void) __interrupt TF2_ISR ++void timer2_isr(void) __interrupt(TF2_ISR) + { + /* Toggle the probe calibration pin, only accurate up to ca. 8MHz. */ + TOGGLE_CALIBRATION_PIN(); diff --git a/misc/sigrok-firmware-fx2lafw/patches/03-fx2lafw__Update___at_syntax_for_sdcc_4.2.3.patch b/misc/sigrok-firmware-fx2lafw/patches/03-fx2lafw__Update___at_syntax_for_sdcc_4.2.3.patch new file mode 100644 index 0000000000..a591d310b9 --- /dev/null +++ b/misc/sigrok-firmware-fx2lafw/patches/03-fx2lafw__Update___at_syntax_for_sdcc_4.2.3.patch @@ -0,0 +1,300 @@ +From: Matthew Cengia <redacted> +Date: Tue, 15 Aug 2023 00:35:45 +0000 (+1000) +Subject: fx2lafw: Update __at syntax for sdcc>=4.2.3 +X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-firmware-fx2lafw.git;a=commitdiff_plain;h=96b0b476522c3f93a47ff8f479ec08105ba6a2a5 + +fx2lafw: Update __at syntax for sdcc>=4.2.3 + +The SDCC user manual https://sdcc.sourceforge.net/doc/sdccman.pdf +section 1.5 "Compatibility with previous versions" on page 12 states: + +> In 4.2.3, support for non-parenthesized arguments to __at that are +> not constants was dropped. + +Adjust the sigrok fx2lafw application source to unbreak compilation with +more recent SDCC versions. +--- + +diff --git a/fx2lib/include/fx2regs.h b/fx2lib/include/fx2regs.h +index 0645fe36..6ae3339d 100644 +--- a/fx2lib/include/fx2regs.h ++++ b/fx2lib/include/fx2regs.h +@@ -266,14 +266,14 @@ __xdata __at 0xE50D volatile BYTE GPCR2; ///< Chip Features + + __sfr __at 0x80 IOA; + /* IOA */ +- __sbit __at 0x80 + 0 PA0; +- __sbit __at 0x80 + 1 PA1; +- __sbit __at 0x80 + 2 PA2; +- __sbit __at 0x80 + 3 PA3; +- __sbit __at 0x80 + 4 PA4; +- __sbit __at 0x80 + 5 PA5; +- __sbit __at 0x80 + 6 PA6; +- __sbit __at 0x80 + 7 PA7; ++ __sbit __at (0x80+0) PA0; ++ __sbit __at (0x80+1) PA1; ++ __sbit __at (0x80+2) PA2; ++ __sbit __at (0x80+3) PA3; ++ __sbit __at (0x80+4) PA4; ++ __sbit __at (0x80+5) PA5; ++ __sbit __at (0x80+6) PA6; ++ __sbit __at (0x80+7) PA7; + __sfr __at 0x81 SP; + __sfr __at 0x82 DPL; + __sfr __at 0x83 DPH; +@@ -283,14 +283,14 @@ __sfr __at 0x86 DPS; + __sfr __at 0x87 PCON; + __sfr __at 0x88 TCON; + /* TCON */ +- __sbit __at 0x88+0 IT0; +- __sbit __at 0x88+1 IE0; +- __sbit __at 0x88+2 IT1; +- __sbit __at 0x88+3 IE1; +- __sbit __at 0x88+4 TR0; +- __sbit __at 0x88+5 TF0; +- __sbit __at 0x88+6 TR1; +- __sbit __at 0x88+7 TF1; ++ __sbit __at (0x88+0) IT0; ++ __sbit __at (0x88+1) IE0; ++ __sbit __at (0x88+2) IT1; ++ __sbit __at (0x88+3) IE1; ++ __sbit __at (0x88+4) TR0; ++ __sbit __at (0x88+5) TF0; ++ __sbit __at (0x88+6) TR1; ++ __sbit __at (0x88+7) TF1; + __sfr __at 0x89 TMOD; + __sfr __at 0x8A TL0; + __sfr __at 0x8B TL1; +@@ -299,28 +299,28 @@ __sfr __at 0x8D TH1; + __sfr __at 0x8E CKCON; + __sfr __at 0x90 IOB; + /* IOB */ +- __sbit __at 0x90 + 0 PB0; +- __sbit __at 0x90 + 1 PB1; +- __sbit __at 0x90 + 2 PB2; +- __sbit __at 0x90 + 3 PB3; +- __sbit __at 0x90 + 4 PB4; +- __sbit __at 0x90 + 5 PB5; +- __sbit __at 0x90 + 6 PB6; +- __sbit __at 0x90 + 7 PB7; ++ __sbit __at (0x90+0) PB0; ++ __sbit __at (0x90+1) PB1; ++ __sbit __at (0x90+2) PB2; ++ __sbit __at (0x90+3) PB3; ++ __sbit __at (0x90+4) PB4; ++ __sbit __at (0x90+5) PB5; ++ __sbit __at (0x90+6) PB6; ++ __sbit __at (0x90+7) PB7; + __sfr __at 0x91 EXIF; + + //__sfr __at 0x92 MPAGE; + __sfr __at 0x92 _XPAGE; // same as MPAGE for pdata __sfr access w/ sdcc + __sfr __at 0x98 SCON0; + /* SCON0 */ +- __sbit __at 0x98+0 RI; +- __sbit __at 0x98+1 TI; +- __sbit __at 0x98+2 RB8; +- __sbit __at 0x98+3 TB8; +- __sbit __at 0x98+4 REN; +- __sbit __at 0x98+5 SM2; +- __sbit __at 0x98+6 SM1; +- __sbit __at 0x98+7 SM0; ++ __sbit __at (0x98+0) RI; ++ __sbit __at (0x98+1) TI; ++ __sbit __at (0x98+2) RB8; ++ __sbit __at (0x98+3) TB8; ++ __sbit __at (0x98+4) REN; ++ __sbit __at (0x98+5) SM2; ++ __sbit __at (0x98+6) SM1; ++ __sbit __at (0x98+7) SM0; + __sfr __at 0x99 SBUF0; + + __sfr __at 0x9A AUTOPTRH1; +@@ -330,27 +330,27 @@ __sfr __at 0x9E AUTOPTRL2; + + __sfr __at 0xA0 IOC; + /* IOC */ +- __sbit __at 0xA0 + 0 PC0; +- __sbit __at 0xA0 + 1 PC1; +- __sbit __at 0xA0 + 2 PC2; +- __sbit __at 0xA0 + 3 PC3; +- __sbit __at 0xA0 + 4 PC4; +- __sbit __at 0xA0 + 5 PC5; +- __sbit __at 0xA0 + 6 PC6; +- __sbit __at 0xA0 + 7 PC7; ++ __sbit __at (0xA0+0) PC0; ++ __sbit __at (0xA0+1) PC1; ++ __sbit __at (0xA0+2) PC2; ++ __sbit __at (0xA0+3) PC3; ++ __sbit __at (0xA0+4) PC4; ++ __sbit __at (0xA0+5) PC5; ++ __sbit __at (0xA0+6) PC6; ++ __sbit __at (0xA0+7) PC7; + __sfr __at 0xA1 INT2CLR; + __sfr __at 0xA2 INT4CLR; + + __sfr __at 0xA8 IE; + /* IE */ +- __sbit __at 0xA8+0 EX0; +- __sbit __at 0xA8+1 ET0; +- __sbit __at 0xA8+2 EX1; +- __sbit __at 0xA8+3 ET1; +- __sbit __at 0xA8+4 ES0; +- __sbit __at 0xA8+5 ET2; +- __sbit __at 0xA8+6 ES1; +- __sbit __at 0xA8+7 EA; ++ __sbit __at (0xA8+0) EX0; ++ __sbit __at (0xA8+1) ET0; ++ __sbit __at (0xA8+2) EX1; ++ __sbit __at (0xA8+3) ET1; ++ __sbit __at (0xA8+4) ES0; ++ __sbit __at (0xA8+5) ET2; ++ __sbit __at (0xA8+6) ES1; ++ __sbit __at (0xA8+7) EA; + + __sfr __at 0xAA EP2468STAT; + __sfr __at 0xAB EP24FIFOFLGS; +@@ -358,14 +358,14 @@ __sfr __at 0xAC EP68FIFOFLGS; + __sfr __at 0xAF AUTOPTRSETUP; + __sfr __at 0xB0 IOD; + /* IOD */ +- __sbit __at 0xB0 + 0 PD0; +- __sbit __at 0xB0 + 1 PD1; +- __sbit __at 0xB0 + 2 PD2; +- __sbit __at 0xB0 + 3 PD3; +- __sbit __at 0xB0 + 4 PD4; +- __sbit __at 0xB0 + 5 PD5; +- __sbit __at 0xB0 + 6 PD6; +- __sbit __at 0xB0 + 7 PD7; ++ __sbit __at (0xB0+0) PD0; ++ __sbit __at (0xB0+1) PD1; ++ __sbit __at (0xB0+2) PD2; ++ __sbit __at (0xB0+3) PD3; ++ __sbit __at (0xB0+4) PD4; ++ __sbit __at (0xB0+5) PD5; ++ __sbit __at (0xB0+6) PD6; ++ __sbit __at (0xB0+7) PD7; + __sfr __at 0xB1 IOE; + __sfr __at 0xB2 OEA; + __sfr __at 0xB3 OEB; +@@ -375,13 +375,13 @@ __sfr __at 0xB6 OEE; + + __sfr __at 0xB8 IP; + /* IP */ +- __sbit __at 0xB8+0 PX0; +- __sbit __at 0xB8+1 PT0; +- __sbit __at 0xB8+2 PX1; +- __sbit __at 0xB8+3 PT1; +- __sbit __at 0xB8+4 PS0; +- __sbit __at 0xB8+5 PT2; +- __sbit __at 0xB8+6 PS1; ++ __sbit __at (0xB8+0) PX0; ++ __sbit __at (0xB8+1) PT0; ++ __sbit __at (0xB8+2) PX1; ++ __sbit __at (0xB8+3) PT1; ++ __sbit __at (0xB8+4) PS0; ++ __sbit __at (0xB8+5) PT2; ++ __sbit __at (0xB8+6) PS1; + + __sfr __at 0xBA EP01STAT; + __sfr __at 0xBB GPIFTRIG; +@@ -392,61 +392,61 @@ __sfr __at 0xBF GPIFSGLDATLNOX; + + __sfr __at 0xC0 SCON1; + /* SCON1 */ +- __sbit __at 0xC0+0 RI1; +- __sbit __at 0xC0+1 TI1; +- __sbit __at 0xC0+2 RB81; +- __sbit __at 0xC0+3 TB81; +- __sbit __at 0xC0+4 REN1; +- __sbit __at 0xC0+5 SM21; +- __sbit __at 0xC0+6 SM11; +- __sbit __at 0xC0+7 SM01; ++ __sbit __at (0xC0+0) RI1; ++ __sbit __at (0xC0+1) TI1; ++ __sbit __at (0xC0+2) RB81; ++ __sbit __at (0xC0+3) TB81; ++ __sbit __at (0xC0+4) REN1; ++ __sbit __at (0xC0+5) SM21; ++ __sbit __at (0xC0+6) SM11; ++ __sbit __at (0xC0+7) SM01; + __sfr __at 0xC1 SBUF1; + __sfr __at 0xC8 T2CON; + /* T2CON */ +- __sbit __at 0xC8+0 CP_RL2; +- __sbit __at 0xC8+1 C_T2; +- __sbit __at 0xC8+2 TR2; +- __sbit __at 0xC8+3 EXEN2; +- __sbit __at 0xC8+4 TCLK; +- __sbit __at 0xC8+5 RCLK; +- __sbit __at 0xC8+6 EXF2; +- __sbit __at 0xC8+7 TF2; ++ __sbit __at (0xC8+0) CP_RL2; ++ __sbit __at (0xC8+1) C_T2; ++ __sbit __at (0xC8+2) TR2; ++ __sbit __at (0xC8+3) EXEN2; ++ __sbit __at (0xC8+4) TCLK; ++ __sbit __at (0xC8+5) RCLK; ++ __sbit __at (0xC8+6) EXF2; ++ __sbit __at (0xC8+7) TF2; + __sfr __at 0xCA RCAP2L; + __sfr __at 0xCB RCAP2H; + __sfr __at 0xCC TL2; + __sfr __at 0xCD TH2; + __sfr __at 0xD0 PSW; + /* PSW */ +- __sbit __at 0xD0+0 P; +- __sbit __at 0xD0+1 FL; +- __sbit __at 0xD0+2 OV; +- __sbit __at 0xD0+3 RS0; +- __sbit __at 0xD0+4 RS1; +- __sbit __at 0xD0+5 F0; +- __sbit __at 0xD0+6 AC; +- __sbit __at 0xD0+7 CY; ++ __sbit __at (0xD0+0) P; ++ __sbit __at (0xD0+1) FL; ++ __sbit __at (0xD0+2) OV; ++ __sbit __at (0xD0+3) RS0; ++ __sbit __at (0xD0+4) RS1; ++ __sbit __at (0xD0+5) F0; ++ __sbit __at (0xD0+6) AC; ++ __sbit __at (0xD0+7) CY; + __sfr __at 0xD8 EICON; // Was WDCON in DS80C320; Bit Values differ from Reg320 + /* EICON */ +- __sbit __at 0xD8+3 INT6; +- __sbit __at 0xD8+4 RESI; +- __sbit __at 0xD8+5 ERESI; +- __sbit __at 0xD8+7 SMOD1; ++ __sbit __at (0xD8+3) INT6; ++ __sbit __at (0xD8+4) RESI; ++ __sbit __at (0xD8+5) ERESI; ++ __sbit __at (0xD8+7) SMOD1; + __sfr __at 0xE0 ACC; + __sfr __at 0xE8 EIE; // EIE Bit Values differ from Reg320 + /* EIE */ +- __sbit __at 0xE8+0 EUSB; +- __sbit __at 0xE8+1 EI2C; +- __sbit __at 0xE8+2 EIEX4; +- __sbit __at 0xE8+3 EIEX5; +- __sbit __at 0xE8+4 EIEX6; ++ __sbit __at (0xE8+0) EUSB; ++ __sbit __at (0xE8+1) EI2C; ++ __sbit __at (0xE8+2) EIEX4; ++ __sbit __at (0xE8+3) EIEX5; ++ __sbit __at (0xE8+4) EIEX6; + __sfr __at 0xF0 B; + __sfr __at 0xF8 EIP; // EIP Bit Values differ from Reg320 + /* EIP */ +- __sbit __at 0xF8+0 PUSB; +- __sbit __at 0xF8+1 PI2C; +- __sbit __at 0xF8+2 EIPX4; +- __sbit __at 0xF8+3 EIPX5; +- __sbit __at 0xF8+4 EIPX6; ++ __sbit __at (0xF8+0) PUSB; ++ __sbit __at (0xF8+1) PI2C; ++ __sbit __at (0xF8+2) EIPX4; ++ __sbit __at (0xF8+3) EIPX5; ++ __sbit __at (0xF8+4) EIPX6; + + + /* CPU Control & Status Register (CPUCS) */ diff --git a/misc/sigrok-firmware-fx2lafw/patches/04-fx2lib_fix_SDCC_warning_283.patch b/misc/sigrok-firmware-fx2lafw/patches/04-fx2lib_fix_SDCC_warning_283.patch new file mode 100644 index 0000000000..7b6968a095 --- /dev/null +++ b/misc/sigrok-firmware-fx2lafw/patches/04-fx2lib_fix_SDCC_warning_283.patch @@ -0,0 +1,686 @@ +From: Steve Markgraf <redacted> +Date: Wed, 17 Jan 2024 19:18:34 +0000 (+0100) +Subject: fx2lib: fix SDCC warning 283 +X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-firmware-fx2lafw.git;a=commitdiff_plain;h=bb3c6dfdb3f95bf529ed95dcc5fb3610e4473673 + +fx2lib: fix SDCC warning 283 + +This fixes the following warnings that appear with +SDCC >= 4.3.0: + +"warning 283: function declarator with no prototype" +--- + +diff --git a/fx2lib/include/autovector.h b/fx2lib/include/autovector.h +index 38f80fcd..ecbeb411 100644 +--- a/fx2lib/include/autovector.h ++++ b/fx2lib/include/autovector.h +@@ -172,49 +172,49 @@ typedef enum { + // you must include the predef of these in the file with your main + // so lets just define them here + +-void sudav_isr() __interrupt(SUDAV_ISR); +-void sof_isr() __interrupt(SOF_ISR); +-void sutok_isr() __interrupt(SUTOK_ISR); +-void suspend_isr() __interrupt(SUSPEND_ISR); +-void usbreset_isr() __interrupt(USBRESET_ISR); +-void hispeed_isr() __interrupt(HISPEED_ISR); +-void ep0ack_isr() __interrupt(EP0ACK_ISR); +-void ep0in_isr() __interrupt(EP0IN_ISR); +-void ep0out_isr() __interrupt(EP0OUT_ISR); +-void ep1in_isr() __interrupt(EP1IN_ISR); +-void ep1out_isr() __interrupt(EP1OUT_ISR); +-void ep2_isr() __interrupt(EP2_ISR); +-void ep4_isr() __interrupt(EP4_ISR); +-void ep6_isr() __interrupt(EP6_ISR); +-void ep8_isr() __interrupt(EP8_ISR); +-void ibn_isr() __interrupt(IBN_ISR); +-void ep0ping_isr() __interrupt(EP0PING_ISR); +-void ep1ping_isr() __interrupt(EP1PING_ISR); +-void ep2ping_isr() __interrupt(EP2PING_ISR); +-void ep4ping_isr() __interrupt(EP4PING_ISR); +-void ep6ping_isr() __interrupt(EP6PING_ISR); +-void ep8ping_isr() __interrupt(EP8PING_ISR); +-void errlimit_isr() __interrupt(ERRLIMIT_ISR); +-void ep2isoerr_isr() __interrupt(EP2ISOERR_ISR); +-void ep4isoerr_isr() __interrupt(EP4ISOERR_ISR); +-void ep6isoerr_isr() __interrupt(EP6ISOERR_ISR); +-void ep8isoerr_isr() __interrupt(EP8ISOERR_ISR); +-void spare_isr() __interrupt(RESERVED_ISR); // not used ++void sudav_isr(void) __interrupt(SUDAV_ISR); ++void sof_isr(void) __interrupt(SOF_ISR); ++void sutok_isr(void) __interrupt(SUTOK_ISR); ++void suspend_isr(void) __interrupt(SUSPEND_ISR); ++void usbreset_isr(void) __interrupt(USBRESET_ISR); ++void hispeed_isr(void) __interrupt(HISPEED_ISR); ++void ep0ack_isr(void) __interrupt(EP0ACK_ISR); ++void ep0in_isr(void) __interrupt(EP0IN_ISR); ++void ep0out_isr(void) __interrupt(EP0OUT_ISR); ++void ep1in_isr(void) __interrupt(EP1IN_ISR); ++void ep1out_isr(void) __interrupt(EP1OUT_ISR); ++void ep2_isr(void) __interrupt(EP2_ISR); ++void ep4_isr(void) __interrupt(EP4_ISR); ++void ep6_isr(void) __interrupt(EP6_ISR); ++void ep8_isr(void) __interrupt(EP8_ISR); ++void ibn_isr(void) __interrupt(IBN_ISR); ++void ep0ping_isr(void) __interrupt(EP0PING_ISR); ++void ep1ping_isr(void) __interrupt(EP1PING_ISR); ++void ep2ping_isr(void) __interrupt(EP2PING_ISR); ++void ep4ping_isr(void) __interrupt(EP4PING_ISR); ++void ep6ping_isr(void) __interrupt(EP6PING_ISR); ++void ep8ping_isr(void) __interrupt(EP8PING_ISR); ++void errlimit_isr(void) __interrupt(ERRLIMIT_ISR); ++void ep2isoerr_isr(void) __interrupt(EP2ISOERR_ISR); ++void ep4isoerr_isr(void) __interrupt(EP4ISOERR_ISR); ++void ep6isoerr_isr(void) __interrupt(EP6ISOERR_ISR); ++void ep8isoerr_isr(void) __interrupt(EP8ISOERR_ISR); ++void spare_isr(void) __interrupt(RESERVED_ISR); // not used + // gpif ints +-void ep2pf_isr() __interrupt(EP2PF_ISR); +-void ep4pf_isr() __interrupt(EP4PF_ISR); +-void ep6pf_isr() __interrupt(EP6PF_ISR); +-void ep8pf_isr() __interrupt(EP8PF_ISR); +-void ep2ef_isr() __interrupt(EP2EF_ISR); +-void ep4ef_isr() __interrupt(EP4EF_ISR); +-void ep6ef_isr() __interrupt(EP6EF_ISR); +-void ep8ef_isr() __interrupt(EP8EF_ISR); +-void ep2ff_isr() __interrupt(EP2FF_ISR); +-void ep4ff_isr() __interrupt(EP4FF_ISR); +-void ep6ff_isr() __interrupt(EP6FF_ISR); +-void ep8ff_isr() __interrupt(EP8FF_ISR); +-void gpifdone_isr() __interrupt(GPIFDONE_ISR); +-void gpifwf_isr() __interrupt(GPIFWF_ISR); ++void ep2pf_isr(void) __interrupt(EP2PF_ISR); ++void ep4pf_isr(void) __interrupt(EP4PF_ISR); ++void ep6pf_isr(void) __interrupt(EP6PF_ISR); ++void ep8pf_isr(void) __interrupt(EP8PF_ISR); ++void ep2ef_isr(void) __interrupt(EP2EF_ISR); ++void ep4ef_isr(void) __interrupt(EP4EF_ISR); ++void ep6ef_isr(void) __interrupt(EP6EF_ISR); ++void ep8ef_isr(void) __interrupt(EP8EF_ISR); ++void ep2ff_isr(void) __interrupt(EP2FF_ISR); ++void ep4ff_isr(void) __interrupt(EP4FF_ISR); ++void ep6ff_isr(void) __interrupt(EP6FF_ISR); ++void ep8ff_isr(void) __interrupt(EP8FF_ISR); ++void gpifdone_isr(void) __interrupt(GPIFDONE_ISR); ++void gpifwf_isr(void) __interrupt(GPIFWF_ISR); + + #endif + +diff --git a/fx2lib/include/serial.h b/fx2lib/include/serial.h +index 7c5935eb..c83959c4 100644 +--- a/fx2lib/include/serial.h ++++ b/fx2lib/include/serial.h +@@ -51,4 +51,4 @@ void sio0_init( WORD baud_rate ) __critical ; // baud_rate max should be 57600 s + Just use one or the other. (This makes terminal echo easy) + **/ + void putchar(char c); +-char getchar(); ++char getchar(void); +diff --git a/fx2lib/include/setupdat.h b/fx2lib/include/setupdat.h +index 5dba882a..fc9e40c6 100644 +--- a/fx2lib/include/setupdat.h ++++ b/fx2lib/include/setupdat.h +@@ -148,7 +148,7 @@ __xdata BYTE* ep_addr(BYTE ep); + You can also use the usbjt and enable the sudav isr + and call the function from withing the sudav isr routine + */ +-void handle_setupdata(); ++void handle_setupdata(void); + + + /** +diff --git a/fx2lib/lib/interrupts/ep0ack_isr.c b/fx2lib/lib/interrupts/ep0ack_isr.c +index d216717d..547e0bfc 100644 +--- a/fx2lib/lib/interrupts/ep0ack_isr.c ++++ b/fx2lib/lib/interrupts/ep0ack_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep0ack_isr() __interrupt(EP0ACK_ISR) {} ++void ep0ack_isr(void) __interrupt(EP0ACK_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep0in_isr.c b/fx2lib/lib/interrupts/ep0in_isr.c +index f3d8990e..c55d0fbc 100644 +--- a/fx2lib/lib/interrupts/ep0in_isr.c ++++ b/fx2lib/lib/interrupts/ep0in_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep0in_isr() __interrupt(EP0IN_ISR) {} ++void ep0in_isr(void) __interrupt(EP0IN_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep0out_isr.c b/fx2lib/lib/interrupts/ep0out_isr.c +index a5acedb7..a93cd77c 100644 +--- a/fx2lib/lib/interrupts/ep0out_isr.c ++++ b/fx2lib/lib/interrupts/ep0out_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep0out_isr() __interrupt(EP0OUT_ISR) {} ++void ep0out_isr(void) __interrupt(EP0OUT_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep0ping_isr.c b/fx2lib/lib/interrupts/ep0ping_isr.c +index 7b1ee929..218b7528 100644 +--- a/fx2lib/lib/interrupts/ep0ping_isr.c ++++ b/fx2lib/lib/interrupts/ep0ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep0ping_isr() __interrupt(EP0PING_ISR) {} ++void ep0ping_isr(void) __interrupt(EP0PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep1in_isr.c b/fx2lib/lib/interrupts/ep1in_isr.c +index b666fcb3..4197bd54 100644 +--- a/fx2lib/lib/interrupts/ep1in_isr.c ++++ b/fx2lib/lib/interrupts/ep1in_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep1in_isr() __interrupt(EP1IN_ISR) {} ++void ep1in_isr(void) __interrupt(EP1IN_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep1out_isr.c b/fx2lib/lib/interrupts/ep1out_isr.c +index 6c87dc20..8e19ca01 100644 +--- a/fx2lib/lib/interrupts/ep1out_isr.c ++++ b/fx2lib/lib/interrupts/ep1out_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep1out_isr() __interrupt(EP1OUT_ISR) {} ++void ep1out_isr(void) __interrupt(EP1OUT_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep1ping_isr.c b/fx2lib/lib/interrupts/ep1ping_isr.c +index c32d437c..62849214 100644 +--- a/fx2lib/lib/interrupts/ep1ping_isr.c ++++ b/fx2lib/lib/interrupts/ep1ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep1ping_isr() __interrupt(EP1PING_ISR) {} ++void ep1ping_isr(void) __interrupt(EP1PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep2_isr.c b/fx2lib/lib/interrupts/ep2_isr.c +index 4de637a3..4596b3ce 100644 +--- a/fx2lib/lib/interrupts/ep2_isr.c ++++ b/fx2lib/lib/interrupts/ep2_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2_isr() __interrupt(EP2_ISR) {} ++void ep2_isr(void) __interrupt(EP2_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep2ef_isr.c b/fx2lib/lib/interrupts/ep2ef_isr.c +index 46f3f87a..a88f1571 100644 +--- a/fx2lib/lib/interrupts/ep2ef_isr.c ++++ b/fx2lib/lib/interrupts/ep2ef_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2ef_isr() __interrupt(EP2EF_ISR){} ++void ep2ef_isr(void) __interrupt(EP2EF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep2ff_isr.c b/fx2lib/lib/interrupts/ep2ff_isr.c +index 400e4803..1c073fbd 100644 +--- a/fx2lib/lib/interrupts/ep2ff_isr.c ++++ b/fx2lib/lib/interrupts/ep2ff_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2ff_isr() __interrupt(EP2FF_ISR){} ++void ep2ff_isr(void) __interrupt(EP2FF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep2isoerr_isr.c b/fx2lib/lib/interrupts/ep2isoerr_isr.c +index d0ca4a89..7b121a51 100644 +--- a/fx2lib/lib/interrupts/ep2isoerr_isr.c ++++ b/fx2lib/lib/interrupts/ep2isoerr_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2isoerr_isr() __interrupt(EP2ISOERR_ISR) {} ++void ep2isoerr_isr(void) __interrupt(EP2ISOERR_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep2pf_isr.c b/fx2lib/lib/interrupts/ep2pf_isr.c +index 9bd8e9aa..4aa71d33 100644 +--- a/fx2lib/lib/interrupts/ep2pf_isr.c ++++ b/fx2lib/lib/interrupts/ep2pf_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2pf_isr() __interrupt(EP2PF_ISR){} ++void ep2pf_isr(void) __interrupt(EP2PF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep2ping_isr.c b/fx2lib/lib/interrupts/ep2ping_isr.c +index dad1e953..336616cd 100644 +--- a/fx2lib/lib/interrupts/ep2ping_isr.c ++++ b/fx2lib/lib/interrupts/ep2ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep2ping_isr() __interrupt(EP2PING_ISR) {} ++void ep2ping_isr(void) __interrupt(EP2PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep4_isr.c b/fx2lib/lib/interrupts/ep4_isr.c +index 5affac9a..19beb727 100644 +--- a/fx2lib/lib/interrupts/ep4_isr.c ++++ b/fx2lib/lib/interrupts/ep4_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4_isr() __interrupt(EP4_ISR) {} ++void ep4_isr(void) __interrupt(EP4_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep4ef_isr.c b/fx2lib/lib/interrupts/ep4ef_isr.c +index 4a0cff1a..77c5576b 100644 +--- a/fx2lib/lib/interrupts/ep4ef_isr.c ++++ b/fx2lib/lib/interrupts/ep4ef_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4ef_isr() __interrupt(EP4EF_ISR){} ++void ep4ef_isr(void) __interrupt(EP4EF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep4ff_isr.c b/fx2lib/lib/interrupts/ep4ff_isr.c +index 3278da2d..cbe0b686 100644 +--- a/fx2lib/lib/interrupts/ep4ff_isr.c ++++ b/fx2lib/lib/interrupts/ep4ff_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4ff_isr() __interrupt(EP4FF_ISR){} ++void ep4ff_isr(void) __interrupt(EP4FF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep4isoerr_isr.c b/fx2lib/lib/interrupts/ep4isoerr_isr.c +index dcd7ff90..d198f3b8 100644 +--- a/fx2lib/lib/interrupts/ep4isoerr_isr.c ++++ b/fx2lib/lib/interrupts/ep4isoerr_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4isoerr_isr() __interrupt(EP4ISOERR_ISR) {} ++void ep4isoerr_isr(void) __interrupt(EP4ISOERR_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep4pf_isr.c b/fx2lib/lib/interrupts/ep4pf_isr.c +index 7bbe9f02..14ec7e5b 100644 +--- a/fx2lib/lib/interrupts/ep4pf_isr.c ++++ b/fx2lib/lib/interrupts/ep4pf_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4pf_isr() __interrupt(EP4PF_ISR){} ++void ep4pf_isr(void) __interrupt(EP4PF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep4ping_isr.c b/fx2lib/lib/interrupts/ep4ping_isr.c +index 8d226856..47de3721 100644 +--- a/fx2lib/lib/interrupts/ep4ping_isr.c ++++ b/fx2lib/lib/interrupts/ep4ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep4ping_isr() __interrupt(EP4PING_ISR) {} ++void ep4ping_isr(void) __interrupt(EP4PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep6_isr.c b/fx2lib/lib/interrupts/ep6_isr.c +index 630f9b26..61801f2f 100644 +--- a/fx2lib/lib/interrupts/ep6_isr.c ++++ b/fx2lib/lib/interrupts/ep6_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6_isr() __interrupt(EP6_ISR) {} ++void ep6_isr(void) __interrupt(EP6_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep6ef_isr.c b/fx2lib/lib/interrupts/ep6ef_isr.c +index e9ba6d54..28b2db39 100644 +--- a/fx2lib/lib/interrupts/ep6ef_isr.c ++++ b/fx2lib/lib/interrupts/ep6ef_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6ef_isr() __interrupt(EP6EF_ISR){} ++void ep6ef_isr(void) __interrupt(EP6EF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep6ff_isr.c b/fx2lib/lib/interrupts/ep6ff_isr.c +index 011fe871..051b6e29 100644 +--- a/fx2lib/lib/interrupts/ep6ff_isr.c ++++ b/fx2lib/lib/interrupts/ep6ff_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6ff_isr() __interrupt(EP6FF_ISR){} ++void ep6ff_isr(void) __interrupt(EP6FF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep6isoerr_isr.c b/fx2lib/lib/interrupts/ep6isoerr_isr.c +index 8c005777..efae2cfd 100644 +--- a/fx2lib/lib/interrupts/ep6isoerr_isr.c ++++ b/fx2lib/lib/interrupts/ep6isoerr_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6isoerr_isr() __interrupt(EP6ISOERR_ISR) {} ++void ep6isoerr_isr(void) __interrupt(EP6ISOERR_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep6pf_isr.c b/fx2lib/lib/interrupts/ep6pf_isr.c +index 52f6d738..dee40231 100644 +--- a/fx2lib/lib/interrupts/ep6pf_isr.c ++++ b/fx2lib/lib/interrupts/ep6pf_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6pf_isr() __interrupt(EP6PF_ISR){} ++void ep6pf_isr(void) __interrupt(EP6PF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep6ping_isr.c b/fx2lib/lib/interrupts/ep6ping_isr.c +index 5430f209..9ed855f7 100644 +--- a/fx2lib/lib/interrupts/ep6ping_isr.c ++++ b/fx2lib/lib/interrupts/ep6ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep6ping_isr() __interrupt(EP6PING_ISR) {} ++void ep6ping_isr(void) __interrupt(EP6PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep8_isr.c b/fx2lib/lib/interrupts/ep8_isr.c +index d415a3ec..8ebce9b8 100644 +--- a/fx2lib/lib/interrupts/ep8_isr.c ++++ b/fx2lib/lib/interrupts/ep8_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8_isr() __interrupt(EP8_ISR) {} ++void ep8_isr(void) __interrupt(EP8_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep8ef_isr.c b/fx2lib/lib/interrupts/ep8ef_isr.c +index d04d2376..508f49b9 100644 +--- a/fx2lib/lib/interrupts/ep8ef_isr.c ++++ b/fx2lib/lib/interrupts/ep8ef_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8ef_isr() __interrupt(EP8EF_ISR){} ++void ep8ef_isr(void) __interrupt(EP8EF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep8ff_isr.c b/fx2lib/lib/interrupts/ep8ff_isr.c +index d1e5fcd7..88811d7d 100644 +--- a/fx2lib/lib/interrupts/ep8ff_isr.c ++++ b/fx2lib/lib/interrupts/ep8ff_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8ff_isr() __interrupt(EP8FF_ISR){} ++void ep8ff_isr(void) __interrupt(EP8FF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep8isoerr_isr.c b/fx2lib/lib/interrupts/ep8isoerr_isr.c +index a7e8e0f9..fa5f54c5 100644 +--- a/fx2lib/lib/interrupts/ep8isoerr_isr.c ++++ b/fx2lib/lib/interrupts/ep8isoerr_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8isoerr_isr() __interrupt(EP8ISOERR_ISR) {} ++void ep8isoerr_isr(void) __interrupt(EP8ISOERR_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ep8pf_isr.c b/fx2lib/lib/interrupts/ep8pf_isr.c +index 53dcdf27..245fd343 100644 +--- a/fx2lib/lib/interrupts/ep8pf_isr.c ++++ b/fx2lib/lib/interrupts/ep8pf_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8pf_isr() __interrupt(EP8PF_ISR){} ++void ep8pf_isr(void) __interrupt(EP8PF_ISR){} + +diff --git a/fx2lib/lib/interrupts/ep8ping_isr.c b/fx2lib/lib/interrupts/ep8ping_isr.c +index 5cf05dc7..56965e6a 100644 +--- a/fx2lib/lib/interrupts/ep8ping_isr.c ++++ b/fx2lib/lib/interrupts/ep8ping_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ep8ping_isr() __interrupt(EP8PING_ISR) {} ++void ep8ping_isr(void) __interrupt(EP8PING_ISR) {} + +diff --git a/fx2lib/lib/interrupts/errlimit_isr.c b/fx2lib/lib/interrupts/errlimit_isr.c +index cf4e1f61..921b1def 100644 +--- a/fx2lib/lib/interrupts/errlimit_isr.c ++++ b/fx2lib/lib/interrupts/errlimit_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void errlimit_isr() __interrupt(ERRLIMIT_ISR) {} ++void errlimit_isr(void) __interrupt(ERRLIMIT_ISR) {} + +diff --git a/fx2lib/lib/interrupts/gpifdone_isr.c b/fx2lib/lib/interrupts/gpifdone_isr.c +index ee5ce1f6..03f0bb5f 100644 +--- a/fx2lib/lib/interrupts/gpifdone_isr.c ++++ b/fx2lib/lib/interrupts/gpifdone_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void gpifdone_isr() __interrupt(GPIFDONE_ISR){} ++void gpifdone_isr(void) __interrupt(GPIFDONE_ISR){} + +diff --git a/fx2lib/lib/interrupts/gpifwf_isr.c b/fx2lib/lib/interrupts/gpifwf_isr.c +index e9941541..b220a9fe 100644 +--- a/fx2lib/lib/interrupts/gpifwf_isr.c ++++ b/fx2lib/lib/interrupts/gpifwf_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void gpifwf_isr() __interrupt(GPIFWF_ISR){} ++void gpifwf_isr(void) __interrupt(GPIFWF_ISR){} + +diff --git a/fx2lib/lib/interrupts/hispeed_isr.c b/fx2lib/lib/interrupts/hispeed_isr.c +index 9daabc12..dcbd0e4b 100644 +--- a/fx2lib/lib/interrupts/hispeed_isr.c ++++ b/fx2lib/lib/interrupts/hispeed_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void hispeed_isr() __interrupt(HISPEED_ISR) {} ++void hispeed_isr(void) __interrupt(HISPEED_ISR) {} + +diff --git a/fx2lib/lib/interrupts/ibn_isr.c b/fx2lib/lib/interrupts/ibn_isr.c +index aa0a7523..97fb05e8 100644 +--- a/fx2lib/lib/interrupts/ibn_isr.c ++++ b/fx2lib/lib/interrupts/ibn_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void ibn_isr() __interrupt(IBN_ISR) {} ++void ibn_isr(void) __interrupt(IBN_ISR) {} + +diff --git a/fx2lib/lib/interrupts/sof_isr.c b/fx2lib/lib/interrupts/sof_isr.c +index 64a409c4..8b0b8654 100644 +--- a/fx2lib/lib/interrupts/sof_isr.c ++++ b/fx2lib/lib/interrupts/sof_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void sof_isr() __interrupt(SOF_ISR) {} ++void sof_isr(void) __interrupt(SOF_ISR) {} + +diff --git a/fx2lib/lib/interrupts/spare_isr.c b/fx2lib/lib/interrupts/spare_isr.c +index 3b81fd20..effb7d02 100644 +--- a/fx2lib/lib/interrupts/spare_isr.c ++++ b/fx2lib/lib/interrupts/spare_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void spare_isr() __interrupt(RESERVED_ISR) {} ++void spare_isr(void) __interrupt(RESERVED_ISR) {} + +diff --git a/fx2lib/lib/interrupts/sudav_isr.c b/fx2lib/lib/interrupts/sudav_isr.c +index 4d36b59a..d5ed73bf 100644 +--- a/fx2lib/lib/interrupts/sudav_isr.c ++++ b/fx2lib/lib/interrupts/sudav_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void sudav_isr() __interrupt(SUDAV_ISR) {} ++void sudav_isr(void) __interrupt(SUDAV_ISR) {} + +diff --git a/fx2lib/lib/interrupts/suspend_isr.c b/fx2lib/lib/interrupts/suspend_isr.c +index cf08b28a..1f471179 100644 +--- a/fx2lib/lib/interrupts/suspend_isr.c ++++ b/fx2lib/lib/interrupts/suspend_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void suspend_isr() __interrupt(SUSPEND_ISR) {} ++void suspend_isr(void) __interrupt(SUSPEND_ISR) {} + +diff --git a/fx2lib/lib/interrupts/sutok_isr.c b/fx2lib/lib/interrupts/sutok_isr.c +index 8c7368d2..9c424c67 100644 +--- a/fx2lib/lib/interrupts/sutok_isr.c ++++ b/fx2lib/lib/interrupts/sutok_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void sutok_isr() __interrupt(SUTOK_ISR) {} ++void sutok_isr(void) __interrupt(SUTOK_ISR) {} + +diff --git a/fx2lib/lib/interrupts/usbreset_isr.c b/fx2lib/lib/interrupts/usbreset_isr.c +index 8888eede..5a91e080 100644 +--- a/fx2lib/lib/interrupts/usbreset_isr.c ++++ b/fx2lib/lib/interrupts/usbreset_isr.c +@@ -17,5 +17,5 @@ + + #include <autovector.h> + +-void usbreset_isr() __interrupt(USBRESET_ISR) {} ++void usbreset_isr(void) __interrupt(USBRESET_ISR) {} + +diff --git a/fx2lib/lib/serial.c b/fx2lib/lib/serial.c +index 3114d580..60eb0187 100644 +--- a/fx2lib/lib/serial.c ++++ b/fx2lib/lib/serial.c +@@ -68,7 +68,7 @@ void sio0_init( WORD baud_rate ) __critical { // baud_rate max should be 57600 s + + } + +-char getchar() { ++char getchar(void) { + char c; + while (!RI) + ; +diff --git a/fx2lib/lib/setupdat.c b/fx2lib/lib/setupdat.c +index 878f7b94..a1eb41d1 100644 +--- a/fx2lib/lib/setupdat.c ++++ b/fx2lib/lib/setupdat.c +@@ -34,7 +34,7 @@ extern BOOL handle_vendorcommand(BYTE cmd); + extern BOOL handle_set_configuration(BYTE cfg); + extern BOOL handle_get_interface(BYTE ifc, BYTE* alt_ifc); + extern BOOL handle_set_interface(BYTE ifc,BYTE alt_ifc); +-extern BYTE handle_get_configuration(); ++extern BYTE handle_get_configuration(void); + extern BOOL handle_set_configuration(BYTE cfg); + extern void handle_reset_ep(BYTE ep); + +@@ -44,16 +44,16 @@ extern void handle_reset_ep(BYTE ep); + + + // GET_STATUS, +-BOOL handle_get_status(); ++BOOL handle_get_status(void); + // CLEAR_FEATURE, +-BOOL handle_clear_feature(); ++BOOL handle_clear_feature(void); + // 0x02 is reserved + // SET_FEATURE=0x03, +-BOOL handle_set_feature(); ++BOOL handle_set_feature(void); + // 0x04 is reserved + // SET_ADDRESS=0x05, // this is handled by EZ-USB core unless RENUM=0 + // GET_DESCRIPTOR, +-void handle_get_descriptor(); ++void handle_get_descriptor(void); + // SET_DESCRIPTOR, + // GET_CONFIGURATION, // handled by callback + // SET_CONFIGURATION, // handled by callback +@@ -68,7 +68,7 @@ void handle_get_descriptor(); + handshake + */ + +-void handle_setupdata() { ++void handle_setupdata(void) { + //printf ( "Handle setupdat: %02x\n", SETUPDAT[1] ); + + switch ( SETUPDAT[1] ) { +@@ -156,7 +156,7 @@ __xdata BYTE* ep_addr(BYTE ep) { // bit 8 of ep_num is the direction + volatile BOOL self_powered=FALSE; + volatile BOOL remote_wakeup_allowed=FALSE; + +-BOOL handle_get_status() { ++BOOL handle_get_status(void) { + + switch ( SETUPDAT[0] ) { + +@@ -201,7 +201,7 @@ BOOL handle_get_status() { + #define GF_DEVICE 0 + #define GF_ENDPOINT 2 + +-BOOL handle_clear_feature() { ++BOOL handle_clear_feature(void) { + //printf ( "Clear Feature\n" ); + switch ( SETUPDAT[0] ) { + case GF_DEVICE: +@@ -227,7 +227,7 @@ BOOL handle_clear_feature() { + return TRUE; + } + +-BOOL handle_set_feature() { ++BOOL handle_set_feature(void) { + printf ( "Set Feature %02x\n", SETUPDAT[0] ); + switch ( SETUPDAT[0] ) { + case GF_DEVICE: +@@ -299,7 +299,7 @@ void handle_hispeed(BOOL highspeed) { + * String + * Other-Speed + **/ +-void handle_get_descriptor() { ++void handle_get_descriptor(void) { + //printf ( "Get Descriptor\n" ); + + switch ( SETUPDAT[3] ) { diff --git a/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.SlackBuild b/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.SlackBuild index 72169f9aa7..04547b8cec 100644 --- a/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.SlackBuild +++ b/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for sigrok fx2lafw firmware -# Copyright 2019 Andrzej Telszewski, Szczecin +# Copyright 2024 Andrzej Telszewski, Koszalin # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -32,9 +32,6 @@ PKGTYPE=${PKGTYPE:-tgz} ARCH=noarch -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -44,27 +41,31 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e +set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP + rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION + chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +chmod -R a-st,u+rwX,go-w+rX . + +patch -p1 < $CWD/patches/00-fx2lafw__silence_integer_overflow_compile_warnings.patch +patch -p1 < $CWD/patches/01-fx2lib__Update___interrupt_syntax_for_sdcc_4.2.3.patch +patch -p1 < $CWD/patches/02-fx2lafw__Update___interrupt_syntax_for_sdcc_4.2.3.patch +patch -p1 < $CWD/patches/03-fx2lafw__Update___at_syntax_for_sdcc_4.2.3.patch +patch -p1 < $CWD/patches/04-fx2lib_fix_SDCC_warning_283.patch ./configure --prefix=/usr make make install DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING{,.LESSER} INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS ChangeLog COPYING{,.LESSER} NEWS README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.info b/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.info index 45cf878407..ee2f6c3ab2 100644 --- a/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.info +++ b/misc/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="sdcc" MAINTAINER="Andrzej Telszewski" -EMAIL="atelszewski@gmail.com" +EMAIL="andrzej@telszewski.com" diff --git a/misc/xcb-imdkit/README b/misc/xcb-imdkit/README deleted file mode 100644 index a9aaa69367..0000000000 --- a/misc/xcb-imdkit/README +++ /dev/null @@ -1,8 +0,0 @@ -xcb-imdkit is an implementation of the xim protocol in xcb. Compared -with the implementation of IMDkit with Xlib, and xim inside Xlib, it -has a smaller memory footprint, better performance, and is safer on -malformed clients. And not to say it's all asynchronous and it works -with xcb. - -To build this project, you need: libxcb, xcb-util, xcb-util-keysym, -which are all included in a full Slackware installation. diff --git a/misc/xcb-imdkit/slack-desc b/misc/xcb-imdkit/slack-desc deleted file mode 100644 index 73fec52ff7..0000000000 --- a/misc/xcb-imdkit/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -xcb-imdkit: xcb-imdkit (implementation of the xim protocol in xcb) -xcb-imdkit: -xcb-imdkit: xcb-imdkit is an implementation of the xim protocol in xcb. Compared -xcb-imdkit: with the implementation of IMDkit with Xlib, and xim inside Xlib, it -xcb-imdkit: has a smaller memory footprint, better performance, and is safer on -xcb-imdkit: malformed clients. And not to say it's all asynchronous and it works -xcb-imdkit: with xcb. -xcb-imdkit: -xcb-imdkit: Homepage: https://github.com/fcitx/xcb-imdkit -xcb-imdkit: -xcb-imdkit: diff --git a/misc/xcb-imdkit/xcb-imdkit.SlackBuild b/misc/xcb-imdkit/xcb-imdkit.SlackBuild deleted file mode 100644 index c5365ebbef..0000000000 --- a/misc/xcb-imdkit/xcb-imdkit.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -# Copyright 2022 Wen-Wei Kao (ltlnx), Taichung, Taiwan -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=xcb-imdkit -VERSION=${VERSION:-1.0.7} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSES/* README* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/xcb-imdkit/xcb-imdkit.info b/misc/xcb-imdkit/xcb-imdkit.info deleted file mode 100644 index a7e9a757cb..0000000000 --- a/misc/xcb-imdkit/xcb-imdkit.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="xcb-imdkit" -VERSION="1.0.7" -HOMEPAGE="https://github.com/fcitx/xcb-imdkit" -DOWNLOAD="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-1.0.7.tar.xz" -MD5SUM="e6b16dffa6fafd0e6980a122c9821167" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="ltlnx" -EMAIL="ltlnx@disroot.org" diff --git a/misc/yubioath-desktop/yubioath-desktop.SlackBuild b/misc/yubioath-desktop/yubioath-desktop.SlackBuild index 2b0fd0e736..0bb70150f8 100644 --- a/misc/yubioath-desktop/yubioath-desktop.SlackBuild +++ b/misc/yubioath-desktop/yubioath-desktop.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=yubioath-desktop -VERSION=${VERSION:-5.0.4} +VERSION=${VERSION:-5.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/misc/yubioath-desktop/yubioath-desktop.info b/misc/yubioath-desktop/yubioath-desktop.info index 6426460d0d..c435869b24 100644 --- a/misc/yubioath-desktop/yubioath-desktop.info +++ b/misc/yubioath-desktop/yubioath-desktop.info @@ -1,10 +1,10 @@ PRGNAM="yubioath-desktop" -VERSION="5.0.4" +VERSION="5.1.0" HOMEPAGE="https://www.yubico.com/products/services-software/download/yubico-authenticator/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-5.0.4-linux.AppImage" -MD5SUM_x86_64="4490045c8910b8f34678a1a3b4541eaa" +DOWNLOAD_x86_64="https://developers.yubico.com/yubioath-flutter/Releases/yubioath-desktop-5.1.0-linux.AppImage" +MD5SUM_x86_64="ba9a3d61e6f400f94530baf0f255fee4" REQUIRES="" MAINTAINER="Spycrowsoft" EMAIL="spycrowsoft [ at ] gmail [ dot ] com" diff --git a/multimedia/MuseScore/MuseScore.SlackBuild b/multimedia/MuseScore/MuseScore.SlackBuild index 7ab0fb1ebc..ad73860f95 100644 --- a/multimedia/MuseScore/MuseScore.SlackBuild +++ b/multimedia/MuseScore/MuseScore.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=MuseScore -VERSION=${VERSION:-4.2.1} +VERSION=${VERSION:-4.3.0} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -88,7 +88,8 @@ cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_MODULE_LINKER_FLAGS_RELEASE="-pthread" \ -DQMAKE=/usr/lib"${LIBDIRSUFFIX}"/qt5/bin/qmake \ - -DQT_QMAKE_EXECUTABLE=/usr/lib"${LIBDIRSUFFIX}"/qt5/bin/qmake + -DQT_QMAKE_EXECUTABLE=/usr/lib"${LIBDIRSUFFIX}"/qt5/bin/qmake \ + -DMUSESCORE_BUILD_MODE=release make install \ DESTDIR=$PKG \ diff --git a/multimedia/MuseScore/MuseScore.info b/multimedia/MuseScore/MuseScore.info index 1afc8b2503..2a529cf8b8 100644 --- a/multimedia/MuseScore/MuseScore.info +++ b/multimedia/MuseScore/MuseScore.info @@ -1,8 +1,8 @@ PRGNAM="MuseScore" -VERSION="4.2.1" +VERSION="4.3.0" HOMEPAGE="https://github.com/musescore/MuseScore" -DOWNLOAD="https://github.com/musescore/MuseScore/archive/v4.2.1/MuseScore-4.2.1.tar.gz" -MD5SUM="be651dd658905545bfd3601c23d8831b" +DOWNLOAD="https://github.com/musescore/MuseScore/archive/v4.3.0/MuseScore-4.3.0.tar.gz" +MD5SUM="2a068415e88839673a2455232a94be6d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/MuseScore/README b/multimedia/MuseScore/README index c8249719ba..e539fd95d0 100644 --- a/multimedia/MuseScore/README +++ b/multimedia/MuseScore/README @@ -1,5 +1,9 @@ MuseScore is a free cross platform WYSIWYG music notation -program, licenced under GNU GPL. Features: +program, licenced under GNU GPL. +MuseScore has been rebranded to "MuseScore Studio" to avoid +confusion with the site musescore.com that holds the music scores. + +MuseScore features: - WYSIWYG design, notes are entered on a "virtual notepaper" - TrueType font(s) for printing & display allows for high quality @@ -13,4 +17,4 @@ program, licenced under GNU GPL. Features: - Integrated sequencer and software synthesizer to play the score - Print or create pdf files -This package partially installs to /opt/MuseScore +In Slackware this package partially installs to /opt/MuseScore diff --git a/multimedia/MuseScore/slack-desc b/multimedia/MuseScore/slack-desc index 26d3afcfd3..653468c529 100644 --- a/multimedia/MuseScore/slack-desc +++ b/multimedia/MuseScore/slack-desc @@ -8,8 +8,8 @@ |-----handy-ruler------------------------------------------------------| MuseScore: MuseScore (WYSIWYG Music Score Typesetter) MuseScore: -MuseScore: MuseScore is a free cross platform WYSIWYG music notation program, -MuseScore: licensed under GNU GPL. +MuseScore: MuseScore aka "MuseScore Studio" is a free cross platform WYSIWYG +MuseScore: music notation program licensed under GNU GPL. MuseScore: MuseScore: Homepage: http://www.musescore.org/ MuseScore: diff --git a/multimedia/aom/README b/multimedia/aom/README deleted file mode 100644 index dbddf20cbb..0000000000 --- a/multimedia/aom/README +++ /dev/null @@ -1,7 +0,0 @@ -AOMedia Video 1 (AV1) is an Open Source video codec designed for -video transmission over the Internet. AV1 is planned to surpass -VP9 and also to eventually be a competitor with HEVC/H.265. - -This script builds the encoder aomenc, the decoder aomdec as well -as shared libraries which can be utilised by suitable versions of -both FFmpeg and vlc. diff --git a/multimedia/aom/aom.SlackBuild b/multimedia/aom/aom.SlackBuild deleted file mode 100644 index 1045d3e0a3..0000000000 --- a/multimedia/aom/aom.SlackBuild +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash -# ---------------------------------------------------------------------- -# Slackware build script for aom -# -# Copyright (c) 2018-2023 Andrew Strong, Blue Mountains, Australia. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ---------------------------------------------------------------------- - - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=aom -# The 'official' archive for the aom 3.6.0 release has the git commit in -# the filename, so adjustments are required for a sane Slackware build: -VERSION=${VERSION:-3.6.0} -GITCOMMIT=${GITCOMMIT:-3c65175b1972da4a1992c1dae2365b48d13f9a8d} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -mkdir -p $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$GITCOMMIT.tar.gz -C $TMP/$PRGNAM-$VERSION -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -cd build - - # I don't build either the HTML or the Latex docs as IMHO at this stage - # of aom development they are still not terribly useful for non-developers. - # To enable these docs change '-DENABLE_DOCS=0' below to '1' to build - # the docs and then uncomment the 'extra docs' section below to install them... - - cmake \ - -G "Unix Makefiles" \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DCMAKE_INSTALL_INCLUDEDIR=include \ - -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_NASM=1 \ - -DENABLE_DOCS=0 \ - -DBUILD_SHARED_LIBS=1 \ - -DENABLE_TESTS=0 \ - ../ - make -j1 - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CHANGELOG LICENSE PATENTS README.md Sample.cfg $PKG/usr/doc/$PRGNAM-$VERSION - -# These are the 'extra docs', more details above... -# mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{html,latex} -# cp -a build/docs/html/* $PKG/usr/doc/$PRGNAM-$VERSION/html -# cp -a build/docs/latex/* $PKG/usr/doc/$PRGNAM-$VERSION/latex - -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/aom/aom.info b/multimedia/aom/aom.info deleted file mode 100644 index 815f782382..0000000000 --- a/multimedia/aom/aom.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="aom" -VERSION="3.6.0" -HOMEPAGE="https://aomedia.googlesource.com/aom" -DOWNLOAD="http://www.andrews-corner.org/downloads/aom-3c65175b1972da4a1992c1dae2365b48d13f9a8d.tar.gz" -MD5SUM="4c73a44a710688e8c496b3740ecee84b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andrew Strong" -EMAIL="andrew.david.strong@gmail.com" diff --git a/multimedia/aom/slack-desc b/multimedia/aom/slack-desc deleted file mode 100644 index 981c25fff9..0000000000 --- a/multimedia/aom/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -aom: aom (Open Source Video Codec) -aom: -aom: AOMedia Video 1 (AV1) is designed to be the successor to VP9 and -aom: also to eventually be a direct competitor for HEVC/H.265. -aom: This Slackbuild builds the 'reference' encoder aomenc as well as -aom: the 'reference' decoder aomdec. -aom: -aom: Homepage: https://aomedia.googlesource.com/aom -aom: -aom: -aom: diff --git a/multimedia/avidemux/0004-support-nv-codec-headers-12.2.patch b/multimedia/avidemux/0004-support-nv-codec-headers-12.2.patch new file mode 100644 index 0000000000..1f9afebba1 --- /dev/null +++ b/multimedia/avidemux/0004-support-nv-codec-headers-12.2.patch @@ -0,0 +1,292 @@ +diff -Naur ffmpeg-6.0.1.orig/libavcodec/nvenc.c ffmpeg-6.0.1/libavcodec/nvenc.c +--- ffmpeg-6.0.1.orig/libavcodec/nvenc.c 2024-04-20 14:36:35.902732000 +0200 ++++ ffmpeg-6.0.1/libavcodec/nvenc.c 2024-04-20 14:40:15.660732000 +0200 +@@ -233,8 +233,20 @@ + + static void nvenc_print_driver_requirement(AVCodecContext *avctx, int level) + { +-#if NVENCAPI_CHECK_VERSION(12, 1) ++#if NVENCAPI_CHECK_VERSION(12, 3) + const char *minver = "(unknown)"; ++#elif NVENCAPI_CHECK_VERSION(12, 2) ++# if defined(_WIN32) || defined(__CYGWIN__) ++ const char *minver = "551.76"; ++# else ++ const char *minver = "550.54.14"; ++# endif ++#elif NVENCAPI_CHECK_VERSION(12, 1) ++# if defined(_WIN32) || defined(__CYGWIN__) ++ const char *minver = "531.61"; ++# else ++ const char *minver = "530.41.03"; ++# endif + #elif NVENCAPI_CHECK_VERSION(12, 0) + # if defined(_WIN32) || defined(__CYGWIN__) + const char *minver = "522.25"; +@@ -585,6 +597,33 @@ + return AVERROR(ENOSYS); + } + ++#ifdef NVENC_HAVE_TEMPORAL_FILTER ++ ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_TEMPORAL_FILTER); ++ if(ctx->tf_level > 0 && ret <= 0) { ++ av_log(avctx, AV_LOG_WARNING, "Temporal filtering not supported by the device\n"); ++ return AVERROR(ENOSYS); ++ } ++#endif ++ ++#ifdef NVENC_HAVE_LOOKAHEAD_LEVEL ++ ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_LOOKAHEAD_LEVEL); ++ if(ctx->rc_lookahead > 0 && ctx->lookahead_level > 0 && ++ ctx->lookahead_level != NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT && ++ ctx->lookahead_level > ret) ++ { ++ av_log(avctx, AV_LOG_WARNING, "Lookahead level not supported. Maximum level: %d\n", ret); ++ return AVERROR(ENOSYS); ++ } ++#endif ++ ++#ifdef NVENC_HAVE_UNIDIR_B ++ ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_UNIDIRECTIONAL_B); ++ if(ctx->unidir_b && ret <= 0) { ++ av_log(avctx, AV_LOG_WARNING, "Unidirectional B-Frames not supported by the device\n"); ++ return AVERROR(ENOSYS); ++ } ++#endif ++ + ctx->support_dyn_bitrate = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE); + + return 0; +@@ -978,7 +1017,7 @@ + return 0; + } + +-static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx) ++static av_cold int nvenc_setup_rate_control(AVCodecContext *avctx) + { + NvencContext *ctx = avctx->priv_data; + +@@ -1107,6 +1146,24 @@ + if (ctx->encode_config.rcParams.lookaheadDepth < ctx->rc_lookahead) + av_log(avctx, AV_LOG_WARNING, "Clipping lookahead depth to %d (from %d) due to lack of surfaces/delay", + ctx->encode_config.rcParams.lookaheadDepth, ctx->rc_lookahead); ++ ++#ifdef NVENC_HAVE_LOOKAHEAD_LEVEL ++ if (ctx->lookahead_level >= 0) { ++ switch (ctx->lookahead_level) { ++ case NV_ENC_LOOKAHEAD_LEVEL_0: ++ case NV_ENC_LOOKAHEAD_LEVEL_1: ++ case NV_ENC_LOOKAHEAD_LEVEL_2: ++ case NV_ENC_LOOKAHEAD_LEVEL_3: ++ case NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT: ++ break; ++ default: ++ av_log(avctx, AV_LOG_ERROR, "Invalid lookahead level.\n"); ++ return AVERROR(EINVAL); ++ } ++ ++ ctx->encode_config.rcParams.lookaheadLevel = ctx->lookahead_level; ++ } ++#endif + } + } + +@@ -1134,6 +1191,8 @@ + ctx->encode_config.rcParams.vbvBufferSize = avctx->rc_buffer_size = 0; + ctx->encode_config.rcParams.maxBitRate = avctx->rc_max_rate; + } ++ ++ return 0; + } + + static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) +@@ -1244,6 +1303,11 @@ + + h264->level = ctx->level; + ++#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API ++ h264->inputBitDepth = h264->outputBitDepth = ++ IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; ++#endif ++ + if (ctx->coder >= 0) + h264->entropyCodingMode = ctx->coder; + +@@ -1357,7 +1421,12 @@ + + hevc->chromaFormatIDC = IS_YUV444(ctx->data_pix_fmt) ? 3 : 1; + ++#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API ++ hevc->inputBitDepth = hevc->outputBitDepth = ++ IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; ++#else + hevc->pixelBitDepthMinus8 = IS_10BIT(ctx->data_pix_fmt) ? 2 : 0; ++#endif + + hevc->level = ctx->level; + +@@ -1373,6 +1442,25 @@ + hevc->numRefL1 = avctx->refs; + #endif + ++#ifdef NVENC_HAVE_TEMPORAL_FILTER ++ if (ctx->tf_level >= 0) { ++ hevc->tfLevel = ctx->tf_level; ++ ++ switch (ctx->tf_level) ++ { ++ case NV_ENC_TEMPORAL_FILTER_LEVEL_0: ++ case NV_ENC_TEMPORAL_FILTER_LEVEL_4: ++ break; ++ default: ++ av_log(avctx, AV_LOG_ERROR, "Invalid temporal filtering level.\n"); ++ return AVERROR(EINVAL); ++ } ++ ++ if (ctx->encode_config.frameIntervalP < 5) ++ av_log(avctx, AV_LOG_WARNING, "Temporal filtering needs at least 4 B-Frames (-bf 4).\n"); ++ } ++#endif ++ + return 0; + } + +@@ -1443,8 +1531,13 @@ + + av1->chromaFormatIDC = IS_YUV444(ctx->data_pix_fmt) ? 3 : 1; + ++#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API ++ av1->inputBitDepth = IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; ++ av1->outputBitDepth = (IS_10BIT(ctx->data_pix_fmt) || ctx->highbitdepth) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; ++#else + av1->inputPixelBitDepthMinus8 = IS_10BIT(ctx->data_pix_fmt) ? 2 : 0; + av1->pixelBitDepthMinus8 = (IS_10BIT(ctx->data_pix_fmt) || ctx->highbitdepth) ? 2 : 0; ++#endif + + if (ctx->b_ref_mode >= 0) + av1->useBFramesAsRef = ctx->b_ref_mode; +@@ -1567,6 +1660,10 @@ + ctx->init_encode_params.frameRateDen = avctx->time_base.num * avctx->ticks_per_frame; + } + ++#ifdef NVENC_HAVE_UNIDIR_B ++ ctx->init_encode_params.enableUniDirectionalB = ctx->unidir_b; ++#endif ++ + ctx->init_encode_params.enableEncodeAsync = 0; + ctx->init_encode_params.enablePTD = 1; + +@@ -1617,7 +1714,9 @@ + + nvenc_recalc_surfaces(avctx); + +- nvenc_setup_rate_control(avctx); ++ res = nvenc_setup_rate_control(avctx); ++ if (res < 0) ++ return res; + + if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { + ctx->encode_config.frameFieldMode = NV_ENC_PARAMS_FRAME_FIELD_MODE_FIELD; +@@ -1673,16 +1772,16 @@ + { + switch (pix_fmt) { + case AV_PIX_FMT_YUV420P: +- // MEANX return NV_ENC_BUFFER_FORMAT_YV12_PL; ++ return NV_ENC_BUFFER_FORMAT_YV12; + case AV_PIX_FMT_NV12: +- return NV_ENC_BUFFER_FORMAT_NV12_PL; ++ return NV_ENC_BUFFER_FORMAT_NV12; + case AV_PIX_FMT_P010: + case AV_PIX_FMT_P016: + return NV_ENC_BUFFER_FORMAT_YUV420_10BIT; + #if 0 /* MEANX */ + case AV_PIX_FMT_GBRP: + case AV_PIX_FMT_YUV444P: +- return NV_ENC_BUFFER_FORMAT_YUV444_PL; ++ return NV_ENC_BUFFER_FORMAT_YUV444; + case AV_PIX_FMT_GBRP16: + case AV_PIX_FMT_YUV444P16: + return NV_ENC_BUFFER_FORMAT_YUV444_10BIT; +@@ -2309,12 +2408,6 @@ + frame_data->duration = frame->duration; + frame_data->frame_opaque = frame->opaque; + +-#if FF_API_REORDERED_OPAQUE +-FF_DISABLE_DEPRECATION_WARNINGS +- frame_data->reordered_opaque = frame->reordered_opaque; +-FF_ENABLE_DEPRECATION_WARNINGS +-#endif +- + ctx->frame_data_array_pos = (ctx->frame_data_array_pos + 1) % ctx->frame_data_array_nb; + pic_params->inputDuration = idx; + +@@ -2331,12 +2424,6 @@ + + pkt->duration = frame_data->duration; + +-#if FF_API_REORDERED_OPAQUE +-FF_DISABLE_DEPRECATION_WARNINGS +- avctx->reordered_opaque = frame_data->reordered_opaque; +-FF_ENABLE_DEPRECATION_WARNINGS +-#endif +- + if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { + pkt->opaque = frame_data->frame_opaque; + pkt->opaque_ref = frame_data->frame_opaque_ref; +@@ -2724,6 +2811,7 @@ + pic_params.encodePicFlags = 0; + } + ++ pic_params.frameIdx = ctx->frame_idx_counter++; + pic_params.inputTimeStamp = frame->pts; + + if (ctx->extra_sei) { +diff -Naur ffmpeg-6.0.1.orig/libavcodec/nvenc.h ffmpeg-6.0.1/libavcodec/nvenc.h +--- ffmpeg-6.0.1.orig/libavcodec/nvenc.h 2023-11-10 01:30:25.000000000 +0100 ++++ ffmpeg-6.0.1/libavcodec/nvenc.h 2024-04-20 14:42:22.556732000 +0200 +@@ -83,6 +83,15 @@ + #define NVENC_NO_DEPRECATED_RC + #endif + ++// SDK 12.2 compile time feature checks ++#if NVENCAPI_CHECK_VERSION(12, 2) ++#define NVENC_HAVE_NEW_BIT_DEPTH_API ++#define NVENC_HAVE_TEMPORAL_FILTER ++#define NVENC_HAVE_LOOKAHEAD_LEVEL ++#define NVENC_HAVE_UHQ_TUNING ++#define NVENC_HAVE_UNIDIR_B ++#endif ++ + typedef struct NvencSurface + { + NV_ENC_INPUT_PTR input_surface; +@@ -100,10 +109,6 @@ + { + int64_t duration; + +-#if FF_API_REORDERED_OPAQUE +- int64_t reordered_opaque; +-#endif +- + void *frame_opaque; + AVBufferRef *frame_opaque_ref; + } NvencFrameData; +@@ -215,6 +220,8 @@ + + void *nvencoder; + ++ uint32_t frame_idx_counter; ++ + int preset; + int profile; + int level; +@@ -262,6 +269,9 @@ + int udu_sei; + int timing_info; + int highbitdepth; ++ int tf_level; ++ int lookahead_level; ++ int unidir_b; + } NvencContext; + + int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild index 37202fb9d3..15cce7f22f 100644 --- a/multimedia/avidemux/avidemux.SlackBuild +++ b/multimedia/avidemux/avidemux.SlackBuild @@ -5,7 +5,7 @@ # Derived from a SlackBuild by Eric Hameleers. # Copyright 2009, 2010, 2011, 2013 Eric Hameleers, Eindhoven, NL # Copyright 2015 John Vogel Corning, NY USA -# Copyright 2017-2022 Matteo Bernardini, Pisa, IT +# Copyright 2017-2024 Matteo Bernardini, Pisa, IT # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=avidemux -VERSION=${VERSION:-2.8.1} +VERSION=${VERSION:-20240417_ac7587b} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -75,7 +75,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf ${PRGNAM}_${VERSION} -tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz +tar xvf $CWD/${PRGNAM}_${VERSION}.tar.?z cd ${PRGNAM}_${VERSION} chown -R root:root . find -L . \ @@ -90,6 +90,9 @@ find -L . \ sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash || exit 1 sed -i 's|0.19|1.0|' avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt || exit 1 +mkdir -p avidemux_core/ffmpeg_package/patches/upstream +cp $CWD/0004-support-nv-codec-headers-12.2.patch avidemux_core/ffmpeg_package/patches/upstream + bash bootStrap.bash --with-core --with-cli --with-plugins make -C buildCli DESTDIR="$PKG" install diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info index 948c45dcc6..d6a3da1e89 100644 --- a/multimedia/avidemux/avidemux.info +++ b/multimedia/avidemux/avidemux.info @@ -1,8 +1,8 @@ PRGNAM="avidemux" -VERSION="2.8.1" +VERSION="20240417_ac7587b" HOMEPAGE="http://avidemux.org" -DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.8.1.tar.gz" -MD5SUM="fee41934cba460ec0fde2a453d5a6307" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/avidemux_20240417_ac7587b.tar.xz" +MD5SUM="21dfb34ecacb4fca7d50cd2c54b3a181" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="faac faad2 libdca x264 xvidcore" diff --git a/multimedia/ccextractor/ccextractor.SlackBuild b/multimedia/ccextractor/ccextractor.SlackBuild index 8e072caee8..7ac1170764 100644 --- a/multimedia/ccextractor/ccextractor.SlackBuild +++ b/multimedia/ccextractor/ccextractor.SlackBuild @@ -98,8 +98,8 @@ cd build -DMAN_INSTALL_DIR=/usr/man \ -DWITHOUT_RUST=ON \ -DWITH_OCR=ON \ - -DWITH_HARDSUBX=ON \ - -DWITH_FFMPEG=ON \ + -DWITH_HARDSUBX=OFF \ + -DWITH_FFMPEG=OFF \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG diff --git a/multimedia/cinelerra/cinelerra.SlackBuild b/multimedia/cinelerra/cinelerra.SlackBuild index 1d88525bc0..424392f9a9 100644 --- a/multimedia/cinelerra/cinelerra.SlackBuild +++ b/multimedia/cinelerra/cinelerra.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cinelerra -VERSION=${VERSION:-20210331_eabda9c} +VERSION=${VERSION:-20231006_bfc2f6c} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -88,6 +88,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i "s|ffplay|ffplay --disable-htmlpages|" thirdparty/Makefile + ./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/multimedia/cinelerra/cinelerra.info b/multimedia/cinelerra/cinelerra.info index 296f02857f..74df7b48e8 100644 --- a/multimedia/cinelerra/cinelerra.info +++ b/multimedia/cinelerra/cinelerra.info @@ -1,8 +1,8 @@ PRGNAM="cinelerra" -VERSION="20210331_eabda9c" +VERSION="20231006_bfc2f6c" HOMEPAGE="https://cinelerra-gg.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/cinelerra-gg-20210331_eabda9c.tar.xz" -MD5SUM="fd7a1f289192a8f1f77d0a494f8f204b" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/cinelerra-gg-20231006_bfc2f6c.tar.xz" +MD5SUM="1d496163396c4f5dc427cbbd7748fb90" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="faac faad2 libavc1394 libdv libiec61883 mjpegtools x264" diff --git a/multimedia/droidcam/droidcam.SlackBuild b/multimedia/droidcam/droidcam.SlackBuild index d2d8ffdfc5..1297ce75f7 100644 --- a/multimedia/droidcam/droidcam.SlackBuild +++ b/multimedia/droidcam/droidcam.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=droidcam -VERSION=${VERSION:-1.8.2} +VERSION=${VERSION:-2.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -106,7 +103,7 @@ sed -i "5,6s/local\///" $PKG/usr/share/applications/Droidcam.desktop sed -i "7s/.*/Icon=\/usr\/share\/icons\/droidcam.png/" $PKG/usr/share/applications/Droidcam.desktop #Documentation -cp -a $CWD/README* $PKG/usr/doc/$PRGNAM-$VERSION/ +cp $CWD/README* $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/droidcam/droidcam.info b/multimedia/droidcam/droidcam.info index 3849af8446..c249de346e 100644 --- a/multimedia/droidcam/droidcam.info +++ b/multimedia/droidcam/droidcam.info @@ -1,8 +1,8 @@ PRGNAM="droidcam" -VERSION="1.8.2" +VERSION="2.1.3" HOMEPAGE="https://www.dev47apps.com/" -DOWNLOAD="https://files.dev47apps.net/linux/droidcam_1.8.2.zip" -MD5SUM="af019ca66198c501e2ffa813d1c81471" +DOWNLOAD="https://files.dev47apps.net/linux/droidcam_2.1.3.zip" +MD5SUM="9e4034e81ba9be6c9a37d6f38c4d4f62" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="android-tools dkms" diff --git a/multimedia/gpac/README b/multimedia/gpac/README index 1e7c8f82a2..a2020a9bcb 100644 --- a/multimedia/gpac/README +++ b/multimedia/gpac/README @@ -1,6 +1,3 @@ GPAC is mainly used to package multimedia content for local or streaming playback. GPAC includes MP4Box utility which lets packaging of various audio and video codecs into mp4 container. - -Optional dependencies include the following: wxPython, js, faad2, -ffmpeg, xvidcore, jack, xulrunner and xmlrpc-c. diff --git a/multimedia/gpac/ffmpeg-6.patch b/multimedia/gpac/ffmpeg-6.patch new file mode 100644 index 0000000000..0e7c18299d --- /dev/null +++ b/multimedia/gpac/ffmpeg-6.patch @@ -0,0 +1,51 @@ +From ba14e34dd7a3c4cef5a56962898e9f863dd4b4f3 Mon Sep 17 00:00:00 2001 +From: jeanlf <jeanlf@gpac.io> +Date: Mon, 13 Mar 2023 09:43:52 +0100 +Subject: [PATCH] fixed compil with ffmpeg 6 - cf #2406 + +--- + src/filters/ff_mx.c | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/src/filters/ff_mx.c b/src/filters/ff_mx.c +index 34e5f59e7c..5cf1d98941 100644 +--- a/src/filters/ff_mx.c ++++ b/src/filters/ff_mx.c +@@ -503,7 +503,11 @@ static GF_Err ffmx_close_seg(GF_Filter *filter, GF_FFMuxCtx *ctx, Bool send_evt_ + evt.seg_size.is_init = 0; + } + evt.seg_size.media_range_start = ctx->offset_at_seg_start; ++#if LIBAVFORMAT_VERSION_MAJOR < 60 + evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->written-1) : 0; ++#else ++ evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->bytes_written-1) : 0; ++#endif + ctx->offset_at_seg_start = evt.seg_size.media_range_end; + + gf_filter_pid_send_event(pid, &evt); +@@ -1013,13 +1017,21 @@ static GF_Err ffmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_r + ff_codec_id = ffmpeg_codecid_from_gpac(codec_id, &ff_codec_tag); + } + ++ ++ res = 1; ++#if LIBAVFORMAT_VERSION_MAJOR < 60 + if (ctx->muxer->oformat && ctx->muxer->oformat->query_codec) { + res = ctx->muxer->oformat->query_codec(ff_codec_id, 1); +- if (!res) { +- GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Codec %s not supported in container %s\n", gf_codecid_name(codec_id), ctx->muxer->oformat->name)); +- return GF_NOT_SUPPORTED; +- } + } ++#else ++ res = avformat_query_codec(ctx->muxer->oformat, ff_codec_id, FF_COMPLIANCE_NORMAL); ++#endif ++ ++ if (!res) { ++ GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Codec %s not supported in container %s\n", gf_codecid_name(codec_id), ctx->muxer->oformat->name)); ++ return GF_NOT_SUPPORTED; ++ } ++ + const AVCodec *c = avcodec_find_decoder(ff_codec_id); + if (!c) return GF_NOT_SUPPORTED; + diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild index 3d47f2be9d..e981e25b6a 100644 --- a/multimedia/gpac/gpac.SlackBuild +++ b/multimedia/gpac/gpac.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="gpac" -VERSION=${VERSION:-1.0.1} +VERSION=${VERSION:-2.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -69,57 +69,33 @@ else LIBDIRSUFFIX="" fi -### wxwidgets support -if [ "${WX_SUPPORT:-no}" = "no" ]; then - wx_option="--disable-wx" -else - wx_option="--enable-wx" -fi - -if [ "${AMR:-no}" = "no" ]; then - amr_option="--disable-amr" -else - amr_option="--enable-amr" -fi - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -fR $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -chown -R root.root . +chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# configure doesn't have --libdir option. -sed -i "s/^libdir=\".*\"$/libdir=\"lib$LIBDIRSUFFIX\"/" configure +patch -p1 < $CWD/ffmpeg-6.patch ./configure \ --prefix=/usr \ + --libdir=lib$LIBDIRSUFFIX \ --mandir=/usr/man \ --disable-opt \ --enable-pic \ - --enable-pulseaudio \ --cpu=${ARCH} \ - --extra-cflags="$SLKCFLAGS" \ - $wx_option \ - $amr_option - -make -j1 -make install DESTDIR=$PKG -make install-lib DESTDIR=$PKG - -### remove $PKG/usr/share/gpac directory -### only contains gpac.mp4 file which -### doesn't seem to play with mplayer -#rm -fr $PKG/usr/share + --extra-cflags="$SLKCFLAGS" -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +make +make install DESTDIR=$PKG STRIP=true +make install-lib DESTDIR=$PKG STRIP=true find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done diff --git a/multimedia/gpac/gpac.info b/multimedia/gpac/gpac.info index 9b1adc7085..537f6fd8da 100644 --- a/multimedia/gpac/gpac.info +++ b/multimedia/gpac/gpac.info @@ -1,8 +1,8 @@ PRGNAM="gpac" -VERSION="1.0.1" +VERSION="2.2.1" HOMEPAGE="http://gpac.wp.mines-telecom.fr" -DOWNLOAD="https://github.com/gpac/gpac/archive/v1.0.1/gpac-1.0.1.tar.gz" -MD5SUM="52f6711e43a8d271ebec0c2ea2afab4a" +DOWNLOAD="https://github.com/gpac/gpac/archive/v2.2.1/gpac-2.2.1.tar.gz" +MD5SUM="a1a4a6c7f1525431b211b5ba47253ed0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild index 5fdcb0305a..3bfe805da8 100644 --- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild +++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gst-plugins-bad-nonfree -# Copyright 2013-2021 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2013-2024 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gst-plugins-bad-nonfree -VERSION=${VERSION:-1.18.5} +VERSION=${VERSION:-1.24.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -206,7 +206,20 @@ cd build -Dvulkan=disabled \ -Dwayland=disabled \ -Dwebrtc=disabled \ - -Dwebp=disabled + -Dwebp=disabled \ + -Daes=disabled \ + -Danalyticsoverlay=disabled \ + -Dassrender=disabled \ + -Dcodec2json=disabled \ + -Dcodecalpha=disabled \ + -Dcodectimestamper=disabled \ + -Dinsertbin=disabled \ + -Dmse=disabled \ + -Dqroverlay=disabled \ + -Dqsv=disabled \ + -Dunixfd=disabled \ + -Duvcgadget=disabled \ + -Dzxing=disabled "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install cd .. diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info index 43340d39f2..bfc39e9e8d 100644 --- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info +++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info @@ -1,8 +1,8 @@ PRGNAM="gst-plugins-bad-nonfree" -VERSION="1.18.5" +VERSION="1.24.0" HOMEPAGE="https://gstreamer.freedesktop.org/" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz" -MD5SUM="4ab1c19c3cf1ba79c20c65f6be78e7fd" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.24.0.tar.xz" +MD5SUM="22982dd1f7baffa6435551cbe156b888" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild index d5d9e11406..0a2a72d73c 100644 --- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild +++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gst-plugins-ugly -# Copyright 2013-2021 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2013-2024 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gst-plugins-ugly -VERSION=${VERSION:-1.18.5} +VERSION=${VERSION:-1.24.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -90,8 +90,7 @@ cd build --localstatedir=/var \ --mandir=/usr/man \ --prefix=/usr \ - --sysconfdir=/etc \ - -Dexamples=disabled + --sysconfdir=/etc "${NINJA:=ninja}" DESTDIR=$PKG $NINJA install cd .. diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info index 5a55a8aa0f..50e4d7359e 100644 --- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info +++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info @@ -1,8 +1,8 @@ PRGNAM="gst-plugins-ugly" -VERSION="1.18.5" +VERSION="1.24.2" HOMEPAGE="https://gstreamer.freedesktop.org/" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz" -MD5SUM="049f90b7a3a72e241ad47564b5cd7a7a" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.24.2.tar.xz" +MD5SUM="405e4820eabd142d3cede21360742b7f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/inputstream.adaptive/inputstream.adaptive.SlackBuild b/multimedia/inputstream.adaptive/inputstream.adaptive.SlackBuild index 9309853146..47ce5311a2 100644 --- a/multimedia/inputstream.adaptive/inputstream.adaptive.SlackBuild +++ b/multimedia/inputstream.adaptive/inputstream.adaptive.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=inputstream.adaptive CODNAM=Omega -VERSION=${VERSION:-21.4.4} +VERSION=${VERSION:-21.4.7} BENTO4VER=${BENTO4VER:-1.6.0-641} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/multimedia/inputstream.adaptive/inputstream.adaptive.info b/multimedia/inputstream.adaptive/inputstream.adaptive.info index 534cfa6cc5..219567c3e9 100644 --- a/multimedia/inputstream.adaptive/inputstream.adaptive.info +++ b/multimedia/inputstream.adaptive/inputstream.adaptive.info @@ -1,9 +1,9 @@ PRGNAM="inputstream.adaptive" -VERSION="21.4.4" +VERSION="21.4.7" HOMEPAGE="https://github.com/xbmc/inputstream.adaptive/" -DOWNLOAD="https://github.com/xbmc/inputstream.adaptive/archive/21.4.4-Omega/inputstream.adaptive-21.4.4-Omega.tar.gz \ +DOWNLOAD="https://github.com/xbmc/inputstream.adaptive/archive/21.4.7-Omega/inputstream.adaptive-21.4.7-Omega.tar.gz \ https://github.com/xbmc/Bento4/archive/refs/tags/1.6.0-641-Omega/Bento4-1.6.0-641-Omega.tar.gz" -MD5SUM="ac05307397df43eb6cc77c8379275056 \ +MD5SUM="084e0e4454abce7cd65fe0152b19c201 \ 77b1246f0d738ee4f2006c27eb48d3c8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild index 0d62385bcf..901a074701 100644 --- a/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild +++ b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=intel-gmmlib -VERSION=${VERSION:-21.3.1} +VERSION=${VERSION:-22.3.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/intel-gmmlib/intel-gmmlib.info b/multimedia/intel-gmmlib/intel-gmmlib.info index 56c6e5218b..0c605461d6 100644 --- a/multimedia/intel-gmmlib/intel-gmmlib.info +++ b/multimedia/intel-gmmlib/intel-gmmlib.info @@ -1,8 +1,8 @@ PRGNAM="intel-gmmlib" -VERSION="21.3.1" +VERSION="22.3.9" HOMEPAGE="https://github.com/intel/gmmlib/" -DOWNLOAD="https://github.com/intel/gmmlib/archive/intel-gmmlib-21.3.1/gmmlib-intel-gmmlib-21.3.1.tar.gz" -MD5SUM="e6755c5d0f44e336f298cee9c7c3fdae" +DOWNLOAD="https://github.com/intel/gmmlib/archive/intel-gmmlib-22.3.9/gmmlib-intel-gmmlib-22.3.9.tar.gz" +MD5SUM="b9891f96c736f07a4431a7e97843cdc2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/intel-media-driver/intel-media-driver.SlackBuild b/multimedia/intel-media-driver/intel-media-driver.SlackBuild index dfb1b3b30b..a17fb38d63 100644 --- a/multimedia/intel-media-driver/intel-media-driver.SlackBuild +++ b/multimedia/intel-media-driver/intel-media-driver.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=intel-media-driver -VERSION=${VERSION:-21.3.5} +VERSION=${VERSION:-23.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -95,7 +95,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CODEOWNERS LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/intel-media-driver/intel-media-driver.info b/multimedia/intel-media-driver/intel-media-driver.info index 1967da2f92..d6d9a57752 100644 --- a/multimedia/intel-media-driver/intel-media-driver.info +++ b/multimedia/intel-media-driver/intel-media-driver.info @@ -1,10 +1,10 @@ PRGNAM="intel-media-driver" -VERSION="21.3.5" +VERSION="23.3.0" HOMEPAGE="https://github.com/intel/media-driver/" -DOWNLOAD="https://github.com/intel/media-driver/archive/intel-media-21.3.5/media-driver-intel-media-21.3.5.tar.gz" -MD5SUM="3ace8aec373b3990acb1e3270e4a9e0b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/intel/media-driver/archive/intel-media-23.3.0/media-driver-intel-media-23.3.0.tar.gz" +MD5SUM_x86_64="3b5eda7543298f7fecbce14af5fa1385" REQUIRES="intel-gmmlib" MAINTAINER="Mario Preksavec" EMAIL="mario at slackware dot hr" diff --git a/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild index 2c3f1e67bf..6adf652d14 100644 --- a/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild +++ b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=intel-media-sdk -VERSION=${VERSION:-21.3.5} +VERSION=${VERSION:-23.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -78,6 +78,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix for gcc >= 13.x +sed -i '/mfxloader/i #include <cstdint>' api/mfx_dispatch/linux/mfxparser.cpp + mkdir -p build cd build cmake \ diff --git a/multimedia/intel-media-sdk/intel-media-sdk.info b/multimedia/intel-media-sdk/intel-media-sdk.info index 8ac23ebd28..8c2d7f82ad 100644 --- a/multimedia/intel-media-sdk/intel-media-sdk.info +++ b/multimedia/intel-media-sdk/intel-media-sdk.info @@ -1,8 +1,8 @@ PRGNAM="intel-media-sdk" -VERSION="21.3.5" +VERSION="23.2.2" HOMEPAGE="https://github.com/Intel-Media-SDK/MediaSDK/" -DOWNLOAD="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-21.3.5/MediaSDK-intel-mediasdk-21.3.5.tar.gz" -MD5SUM="7a71beb6def13ab71348785a8880dd0a" +DOWNLOAD="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-23.2.2/MediaSDK-intel-mediasdk-23.2.2.tar.gz" +MD5SUM="7f348210213fd4a67466b3a20e4b93d7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/kodi/kodi-21.0-gcc14.patch b/multimedia/kodi/kodi-21.0-gcc14.patch new file mode 100644 index 0000000000..09ffa2f7ae --- /dev/null +++ b/multimedia/kodi/kodi-21.0-gcc14.patch @@ -0,0 +1,11 @@ +diff -Naur xbmc-21.0-Omega.orig/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp xbmc-21.0-Omega/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp +--- xbmc-21.0-Omega.orig/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp 2024-04-06 04:29:22.000000000 +0200 ++++ xbmc-21.0-Omega/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp 2024-05-16 19:52:18.646667000 +0200 +@@ -17,6 +17,7 @@ + + #include "platform/posix/filesystem/SMBWSDiscovery.h" + ++#include <algorithm> + #include <array> + #include <chrono> + #include <mutex> diff --git a/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild index 138bd4d8c6..46ed64a7d9 100644 --- a/multimedia/kodi/kodi.SlackBuild +++ b/multimedia/kodi/kodi.SlackBuild @@ -29,18 +29,15 @@ PRGNAM=kodi SRCNAM=xbmc CODNAM=Omega VERSION=${VERSION:-21.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} # Versions used below crossguidVER=${crossguiVER:-ca1bf4b810e2d188d04cb6286f957008ee1b7681} -fmtVER=${fmtVER:-9.1.0} libdvdcssVER=${libdvdcssVER:-1.4.3-Next-Nexus-Alpha2-2} libdvdnavVER=${libdvdnavVER:-6.1.1-Next-Nexus-Alpha2-2} libdvdreadVER=${libdvdreadVER:-6.1.3-Next-Nexus-Alpha2-2} -rapidjsonVER=${rapidjsonVER:-1.1.0} -spdlogVER=${spdlogVER:-1.10.0} groovyVER=${groovyVER:-4.0.16} comLangVER=${comLangVER:-3.14.0} comTextVER=${comTextVER:-1.11.0} @@ -88,6 +85,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/kodi-21.0-gcc14.patch + # Autodetection of "optional" dependencies sucks. It does not work and # compilation will fail on each of these if not explicitly disabled. # Figured I'd implement my own autodetection instead of requiring @@ -133,22 +132,18 @@ cp -a $CWD/apache-groovy-binary-$groovyVER.zip \ # Reasons for internal programs # (so I can remember in the future why we're using them) -# Internal crossguid & rapidjson is recommended by upstream +# Internal crossguid is recommended by upstream +# Internal libdvd{css,nav,read} are required by kodi due to patches # Internal ffmpeg since 15.0's is too old -# Internal fmt & spdlog to prevent issues if spdlog was built without -# optional fmt dependency cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -DNDEBUG" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DNDEBUG" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DAPP_RENDER_SYSTEM=gl \ -DCORE_PLATFORM_NAME="$PLATFORM" \ -DENABLE_INTERNAL_CROSSGUID=ON \ - -DENABLE_INTERNAL_RapidJSON=ON \ - -DENABLE_INTERNAL_FMT=ON \ - -DENABLE_INTERNAL_SPDLOG=ON \ -DENABLE_INTERNAL_FFMPEG=$FFMPEG \ -DENABLE_AIRTUNES=$AIRPLAY \ -DENABLE_AVAHI=$AVAHI \ @@ -160,12 +155,9 @@ cp -a $CWD/apache-groovy-binary-$groovyVER.zip \ -DENABLE_NFS=$NFS \ -DENABLE_UDFREAD=$UDFREAD \ -DCROSSGUID_URL=$CWD/crossguid-$crossguidVER.tar.gz \ - -DFMT_URL=$CWD/fmt-$fmtVER.tar.gz \ -Dlibdvdcss_URL=$CWD/libdvdcss-$libdvdcssVER.tar.gz \ -Dlibdvdnav_URL=$CWD/libdvdnav-$libdvdnavVER.tar.gz \ -Dlibdvdread_URL=$CWD/libdvdread-$libdvdreadVER.tar.gz \ - -DRAPIDJSON_URL=$CWD/rapidjson-$rapidjsonVER.tar.gz \ - -DSPDLOG_URL=$CWD/spdlog-$spdlogVER.tar.gz \ $FFMPEGURL \ -DCMAKE_BUILD_TYPE=Release ../$SRCNAM-$VERSION-$CODNAM make diff --git a/multimedia/kodi/kodi.info b/multimedia/kodi/kodi.info index 8ea284404e..3c712c4197 100644 --- a/multimedia/kodi/kodi.info +++ b/multimedia/kodi/kodi.info @@ -6,9 +6,6 @@ DOWNLOAD="https://github.com/xbmc/xbmc/archive/21.0-Omega/xbmc-21.0-Omega.tar.gz https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.3-Next-Nexus-Alpha2-2/libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz \ https://github.com/xbmc/libdvdnav/archive/refs/tags/6.1.1-Next-Nexus-Alpha2-2/libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz \ https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2/libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz \ - https://github.com/fmtlib/fmt/archive/refs/tags/9.1.0/fmt-9.1.0.tar.gz \ - https://github.com/gabime/spdlog/archive/refs/tags/v1.10.0/spdlog-1.10.0.tar.gz \ - https://github.com/miloyip/rapidjson/archive/v1.1.0/rapidjson-1.1.0.tar.gz \ http://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip \ http://mirrors.kodi.tv/build-deps/sources/commons-lang3-3.14.0-bin.tar.gz \ http://mirrors.kodi.tv/build-deps/sources/commons-text-1.11.0-bin.tar.gz \ @@ -18,15 +15,12 @@ MD5SUM="74501a89f0ea23d2908a9b983ab3d6f8 \ 42dc3770ae928103e8033a18b007e79d \ 2349cde54d950af21fa4936371ad3349 \ 0d24c950abfef9dc02e231dda56912ac \ - 21fac48cae8f3b4a5783ae06b443973a \ - effea813cd81cfb5588806c5754e14f1 \ - badd12c511e081fec6c89c43a7027bce \ bd9eb761a11372dd659da8c2cf1ae692 \ 88c83b3fa007ae35d4f82a2466cad423 \ ae1f7607159b192e12f9c8eaaaf3d927 \ ab9c27629c2a43689c63ff55fd7cbf67" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="zulu-openjdk11 libass flatbuffers tinyxml gtest fmt fstrcmp spdlog tinyxml2 libdisplay-info" +REQUIRES="zulu-openjdk11 libass flatbuffers tinyxml gtest fstrcmp spdlog tinyxml2 libdisplay-info rapidjson" MAINTAINER="Jeremy Hansen" EMAIL="jebrhansen+SBo@gmail.com" diff --git a/multimedia/kvazaar/changelog b/multimedia/kvazaar/changelog index 0ef8f242e1..0816e3f5a5 100644 --- a/multimedia/kvazaar/changelog +++ b/multimedia/kvazaar/changelog @@ -12,3 +12,7 @@ updated to version 2.2.0 08/02/2024: updated to version 2.3.0 + +23/04/2024: + +updated to version 2.3.1 diff --git a/multimedia/kvazaar/kvazaar.SlackBuild b/multimedia/kvazaar/kvazaar.SlackBuild index 88edf72ac6..c6e432de90 100644 --- a/multimedia/kvazaar/kvazaar.SlackBuild +++ b/multimedia/kvazaar/kvazaar.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kvazaar -VERSION=${VERSION:-2.3.0} +VERSION=${VERSION:-2.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -89,6 +89,8 @@ autoreconf -fiv --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-shared=yes \ + --disable-static \ + --with-gnu-ld \ --build=$ARCH-slackware-linux make diff --git a/multimedia/kvazaar/kvazaar.info b/multimedia/kvazaar/kvazaar.info index 8a48c1c2e0..1f2a908be9 100644 --- a/multimedia/kvazaar/kvazaar.info +++ b/multimedia/kvazaar/kvazaar.info @@ -1,8 +1,8 @@ PRGNAM="kvazaar" -VERSION="2.3.0" +VERSION="2.3.1" HOMEPAGE="https://github.com/ultravideo/kvazaar" -DOWNLOAD="https://github.com/ultravideo/kvazaar/archive/v2.3.0/kvazaar-2.3.0.tar.gz" -MD5SUM="1fd2c07adb3da4d7f71b73b3d206f71f" +DOWNLOAD="https://github.com/ultravideo/kvazaar/archive/v2.3.1/kvazaar-2.3.1.tar.gz" +MD5SUM="4ee30f43efea54bee14757f108c1da55" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/obs-studio/0011-Fix-FTBFS-on-32bit-archs.patch b/multimedia/obs-studio/0011-Fix-FTBFS-on-32bit-archs.patch new file mode 100644 index 0000000000..051aee2c67 --- /dev/null +++ b/multimedia/obs-studio/0011-Fix-FTBFS-on-32bit-archs.patch @@ -0,0 +1,43 @@ +From: =?utf-8?q?=22IOhannes_m_zm=C3=B6lnig_=28Debian/GNU=29=22?= + <umlaeute@debian.org> +Date: Tue, 27 Jun 2023 14:06:19 +0200 +Subject: Fix FTBFS on 32bit archs + +--- + libobs-opengl/gl-egl-common.c | 4 +++- + libobs/obs.c | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- obs-studio.orig/libobs-opengl/gl-egl-common.c ++++ obs-studio/libobs-opengl/gl-egl-common.c +@@ -368,16 +368,18 @@ + uint64_t **modifiers, + size_t *n_modifiers) + { ++ EGLuint64KHR n_modifiers_egl = *n_modifiers; + if (!glad_eglQueryDmaBufModifiersEXT) { + blog(LOG_ERROR, "Unable to load eglQueryDmaBufModifiersEXT"); + return false; + } + if (!query_dmabuf_modifiers(egl_display, drm_format, modifiers, +- n_modifiers)) { ++ &n_modifiers_egl)) { + *n_modifiers = 0; + *modifiers = NULL; + return false; + } ++ *n_modifiers = n_modifiers_egl; + return true; + } + +--- obs-studio.orig/libobs/obs.c ++++ obs-studio/libobs/obs.c +@@ -885,7 +885,7 @@ + obs->video.mixes.array[i] = NULL; + } + if (num_views > 0) +- blog(LOG_WARNING, "Number of remaining views: %ld", num_views); ++ blog(LOG_WARNING, "Number of remaining views: %ld", (long int)num_views); + pthread_mutex_unlock(&obs->video.mixes_mutex); + + pthread_mutex_destroy(&obs->video.mixes_mutex); diff --git a/multimedia/obs-studio/obs-studio.SlackBuild b/multimedia/obs-studio/obs-studio.SlackBuild index bcbab1aea3..e098e0cc7b 100644 --- a/multimedia/obs-studio/obs-studio.SlackBuild +++ b/multimedia/obs-studio/obs-studio.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for Open Broadcaster Software # # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com> -# Copyright 2016-2023 Christoph Willing, Brisbane Australia +# Copyright 2016-2024 Christoph Willing, Sydney Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -77,6 +77,7 @@ tar xvf $CWD/$CEF_ROOT.tar.bz2 cd $CEF_ROOT strip -v Release/*.so if [ "$ARCH" = "i686" -o "$ARCH" = "i586" ]; then + echo "Making 32bit libcef_dll_wrapper ..." cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -88,6 +89,10 @@ cd $CEF_ROOT cd $PRGNAM-$COMMIT sed -i -e '/OBS_VERSION_CANONICAL/ s=^=#=' CMakeLists.txt +if [ "$ARCH" = "i686" -o "$ARCH" = "i586" ]; then + echo "Patching 32bit fix" + patch -p1 < $CWD/0011-Fix-FTBFS-on-32bit-archs.patch +fi chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -95,6 +100,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done +sed -i '/include "browser-app.hpp"/i #include <algorithm>' plugins/obs-browser/browser-app.cpp +sed -e 's|-Werror-implicit-function-declaration||g' -i cmake/Modules/CompilerConfig.cmake +sed -e '/-Werror/d' -i cmake/Modules/CompilerConfig.cmake mkdir -p build cd build diff --git a/multimedia/obs-studio/patches/1_7ed9b1f.patch b/multimedia/obs-studio/patches/1_7ed9b1f.patch new file mode 100644 index 0000000000..438004ea39 --- /dev/null +++ b/multimedia/obs-studio/patches/1_7ed9b1f.patch @@ -0,0 +1,43 @@ +From 7ed9b1f3a6b5e73a39daf906c8e8c19e93fce4b4 Mon Sep 17 00:00:00 2001 +From: Stephen Seo <seo.disparate@gmail.com> +Date: Wed, 29 Nov 2023 22:06:09 +0900 +Subject: [PATCH] deps/media-playback: Use new (nb_)coded_side_data FFmpeg 6.1 + API + +Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to +allow builds for using older versions of FFmpeg. + +The change in deps/media-playback/media-playback/decode.c is due to +FFmpeg moving "side_data" into AVCodecParameters which is mentioned in +commit [1] in FFmpeg's repository. + +In summary of the "side_data" change, AVStream.side_data is deprecated +and replaced with AVStream.codecpar->coded_side_data, and +AVStream.nb_side_data is replaced with +AVStream.codecpar->nb_coded_side_data. + +[1]: avcodec/codec_par: add side data to AVCodecParameters +https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe +--- + deps/media-playback/media-playback/decode.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/deps/media-playback/media-playback/decode.c b/deps/media-playback/media-playback/decode.c +index 55b91c140ace4..40853f171bde7 100644 +--- a/deps/media-playback/media-playback/decode.c ++++ b/deps/media-playback/media-playback/decode.c +@@ -114,8 +114,14 @@ static uint16_t get_max_luminance(const AVStream *stream) + { + uint32_t max_luminance = 0; + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + for (int i = 0; i < stream->nb_side_data; i++) { + const AVPacketSideData *const sd = &stream->side_data[i]; ++#else ++ for (int i = 0; i < stream->codecpar->nb_coded_side_data; i++) { ++ const AVPacketSideData *const sd = ++ &stream->codecpar->coded_side_data[i]; ++#endif + switch (sd->type) { + case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: { + const AVMasteringDisplayMetadata *mastering = diff --git a/multimedia/obs-studio/patches/2_92fc9f6.patch b/multimedia/obs-studio/patches/2_92fc9f6.patch new file mode 100644 index 0000000000..db0221d0a9 --- /dev/null +++ b/multimedia/obs-studio/patches/2_92fc9f6.patch @@ -0,0 +1,43 @@ +From 92fc9f69ccff2cb12bb8ef877e9238f5d46588a8 Mon Sep 17 00:00:00 2001 +From: Stephen Seo <seo.disparate@gmail.com> +Date: Wed, 29 Nov 2023 22:08:42 +0900 +Subject: [PATCH] deps/media-playback: In check for key-frame, use new FFmpeg + 6.1 API + +Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to +allow builds for using older versions of FFmpeg. + +AVFrame.key_frame was replaced with a flag in AVFrame.flags. The commit +adding the flag is [1] in FFmpeg's repository, and the deprecation is in +commit [2]. + +In summary of the "key_frame" change, AVFrame.key_frame is deprecated, +and AVFrame.flags indicates with a bit flag if it is a key frame (with +the enum/defined AV_FRAME_FLAG_KEY). + +[1]: avutil/frame: add a keyframe flag to AVFrame +https://github.com/FFmpeg/FFmpeg/commit/cc11191fda0471017b03c1434d6d8cb79f6914e5 + +[2]: avutil/frame: deprecate key_frame +https://github.com/FFmpeg/FFmpeg/commit/3e06f6f04020bef32fa42bc9d7f96e76a46453aa +--- + deps/media-playback/media-playback/media.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/deps/media-playback/media-playback/media.c b/deps/media-playback/media-playback/media.c +index 566eb9e35c9ef..07b040dd8235c 100644 +--- a/deps/media-playback/media-playback/media.c ++++ b/deps/media-playback/media-playback/media.c +@@ -504,7 +504,12 @@ void mp_media_next_video(mp_media_t *m, bool preload) + } + + if (!m->is_local_file && !d->got_first_keyframe) { ++ ++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(58, 29, 100) + if (!f->key_frame) ++#else ++ if (!(f->flags & AV_FRAME_FLAG_KEY)) ++#endif + return; + + d->got_first_keyframe = true; diff --git a/multimedia/obs-studio/patches/3_ed1e079.patch b/multimedia/obs-studio/patches/3_ed1e079.patch new file mode 100644 index 0000000000..d1e435ca9d --- /dev/null +++ b/multimedia/obs-studio/patches/3_ed1e079.patch @@ -0,0 +1,39 @@ +From ed1e0795acde8349ab18b631c545f56e5a3acb9d Mon Sep 17 00:00:00 2001 +From: Stephen Seo <seo.disparate@gmail.com> +Date: Wed, 29 Nov 2023 20:07:10 +0900 +Subject: [PATCH] libobs: Fence off unnecessary code due to FFmpeg v6.1 changes + +Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to +allow builds for using older versions of FFmpeg. + +This commit prevents obs from using the "fenced" code if using FFmpeg +6.1, since in FFmpeg commit [1] the "side_data" is added to +`AVCodecParameters`, and therefore the existing/following +`avcodec_parameters_copy(...)` will account for the metadata. + +[1]: avcodec/codec_par: add side data to AVCodecParameters +https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe +--- + libobs/media-io/media-remux.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libobs/media-io/media-remux.c b/libobs/media-io/media-remux.c +index 7d5eead200012..827d4e59b18ed 100644 +--- a/libobs/media-io/media-remux.c ++++ b/libobs/media-io/media-remux.c +@@ -91,6 +91,7 @@ static inline bool init_output(media_remux_job_t job, const char *out_filename) + return false; + } + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + #if FF_API_BUFFER_SIZE_T + int content_size; + #else +@@ -125,6 +126,7 @@ static inline bool init_output(media_remux_job_t job, const char *out_filename) + mastering_size); + } + } ++#endif + + ret = avcodec_parameters_copy(out_stream->codecpar, + in_stream->codecpar); diff --git a/multimedia/obs-studio/patches/4_6d0381f.patch b/multimedia/obs-studio/patches/4_6d0381f.patch new file mode 100644 index 0000000000..a386f53a3b --- /dev/null +++ b/multimedia/obs-studio/patches/4_6d0381f.patch @@ -0,0 +1,157 @@ +From 6d0381f98ce0a5624901b0042d624ea972a10c2b Mon Sep 17 00:00:00 2001 +From: Stephen Seo <seo.disparate@gmail.com> +Date: Wed, 29 Nov 2023 20:09:08 +0900 +Subject: [PATCH] obs-ffmpeg: Use new side-data FFmpeg 6.1 API + +Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to +allow builds for using older versions of FFmpeg. + +This commit replaces usage of `av_stream_add_side_data(...)` with +`av_packet_side_data_add(...)`, as the former was deprecated in favor of +the latter. + +The FFmpeg commit that deprecated `av_stream_add_side_data(...)` is [1]. + +The FFmpeg commit that introduced `av_packet_side_data_add(...)` is [2]. + +Note that the deprecation commit is after the new API function. The +commit in between [3] appears to be changes that migrates to the usage +of the new API function. + +[1]: avformat/avformat: use the side data from AVStream.codecpar +https://github.com/FFmpeg/FFmpeg/commit/5432d2aacad5fa7420fe2d9369ed061d521e92d6 + +[2]: avcodec/packet: add generic side data helpers +https://github.com/FFmpeg/FFmpeg/commit/74279227dd28d01b447edb8e617a545982171c2c + +[3]: avcodec/codec_par: add side data to AVCodecParameters +https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe +--- + plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c | 16 ++++++++++++++++ + plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c | 16 ++++++++++++++++ + plugins/obs-ffmpeg/obs-ffmpeg-output.c | 16 ++++++++++++++++ + 3 files changed, 48 insertions(+) + +diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +index 740b60e5bf46e..8fb84aa7c4e0b 100644 +--- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c ++++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +@@ -498,9 +498,17 @@ static void create_video_stream(struct ffmpeg_mux *ffm) + av_content_light_metadata_alloc(&content_size); + content->MaxCLL = max_luminance; + content->MaxFALL = max_luminance; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(ffm->video_stream, + AV_PKT_DATA_CONTENT_LIGHT_LEVEL, + (uint8_t *)content, content_size); ++#else ++ av_packet_side_data_add( ++ &ffm->video_stream->codecpar->coded_side_data, ++ &ffm->video_stream->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content, ++ content_size, 0); ++#endif + + AVMasteringDisplayMetadata *const mastering = + av_mastering_display_metadata_alloc(); +@@ -516,10 +524,18 @@ static void create_video_stream(struct ffmpeg_mux *ffm) + mastering->max_luminance = av_make_q(max_luminance, 1); + mastering->has_primaries = 1; + mastering->has_luminance = 1; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(ffm->video_stream, + AV_PKT_DATA_MASTERING_DISPLAY_METADATA, + (uint8_t *)mastering, + sizeof(*mastering)); ++#else ++ av_packet_side_data_add( ++ &ffm->video_stream->codecpar->coded_side_data, ++ &ffm->video_stream->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_MASTERING_DISPLAY_METADATA, ++ (uint8_t *)mastering, sizeof(*mastering), 0); ++#endif + } + + if (ffm->output->oformat->flags & AVFMT_GLOBALHEADER) +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c +index f33ee77365274..a56dd91bcc38e 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c +@@ -168,9 +168,17 @@ static bool create_video_stream(struct ffmpeg_output *stream, + av_content_light_metadata_alloc(&content_size); + content->MaxCLL = hdr_nominal_peak_level; + content->MaxFALL = hdr_nominal_peak_level; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(data->video, + AV_PKT_DATA_CONTENT_LIGHT_LEVEL, + (uint8_t *)content, content_size); ++#else ++ av_packet_side_data_add( ++ &data->video->codecpar->coded_side_data, ++ &data->video->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content, ++ content_size, 0); ++#endif + + AVMasteringDisplayMetadata *const mastering = + av_mastering_display_metadata_alloc(); +@@ -186,10 +194,18 @@ static bool create_video_stream(struct ffmpeg_output *stream, + mastering->max_luminance = av_make_q(hdr_nominal_peak_level, 1); + mastering->has_primaries = 1; + mastering->has_luminance = 1; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(data->video, + AV_PKT_DATA_MASTERING_DISPLAY_METADATA, + (uint8_t *)mastering, + sizeof(*mastering)); ++#else ++ av_packet_side_data_add( ++ &data->video->codecpar->coded_side_data, ++ &data->video->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_MASTERING_DISPLAY_METADATA, ++ (uint8_t *)mastering, sizeof(*mastering), 0); ++#endif + } + context = avcodec_alloc_context3(NULL); + context->codec_type = codec->type; +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.c b/plugins/obs-ffmpeg/obs-ffmpeg-output.c +index ec02b59cda9d8..c7786153392e5 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-output.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-output.c +@@ -213,9 +213,17 @@ static bool create_video_stream(struct ffmpeg_data *data) + av_content_light_metadata_alloc(&content_size); + content->MaxCLL = hdr_nominal_peak_level; + content->MaxFALL = hdr_nominal_peak_level; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(data->video, + AV_PKT_DATA_CONTENT_LIGHT_LEVEL, + (uint8_t *)content, content_size); ++#else ++ av_packet_side_data_add( ++ &data->video->codecpar->coded_side_data, ++ &data->video->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content, ++ content_size, 0); ++#endif + + AVMasteringDisplayMetadata *const mastering = + av_mastering_display_metadata_alloc(); +@@ -231,10 +239,18 @@ static bool create_video_stream(struct ffmpeg_data *data) + mastering->max_luminance = av_make_q(hdr_nominal_peak_level, 1); + mastering->has_primaries = 1; + mastering->has_luminance = 1; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102) + av_stream_add_side_data(data->video, + AV_PKT_DATA_MASTERING_DISPLAY_METADATA, + (uint8_t *)mastering, + sizeof(*mastering)); ++#else ++ av_packet_side_data_add( ++ &data->video->codecpar->coded_side_data, ++ &data->video->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_MASTERING_DISPLAY_METADATA, ++ (uint8_t *)mastering, sizeof(*mastering), 0); ++#endif + } + + closest_format = data->config.format; diff --git a/multimedia/sfnt2woff/sfnt2woff.SlackBuild b/multimedia/sfnt2woff/sfnt2woff.SlackBuild index a20ab3a34d..b357def98c 100644 --- a/multimedia/sfnt2woff/sfnt2woff.SlackBuild +++ b/multimedia/sfnt2woff/sfnt2woff.SlackBuild @@ -26,6 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sfnt2woff +SRCNAM=woff-tools VERSION=${VERSION:-2009.10.03} SRCVER=20091003 BUILD=${BUILD:-1} @@ -40,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -67,9 +65,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$SRCVER -tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz -cd $PRGNAM-$SRCVER +rm -rf $SRCNAM-$SRCVER +tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz +cd $SRCNAM-$SRCVER chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -80,13 +78,13 @@ find -L . \ # Ain't really much to the build process CC="cc $SLCKFLAGS" make -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - # There's no "make install", but we can do that ourselves. mkdir -p $PKG/usr/bin cp -a sfnt2woff woff2sfnt $PKG/usr/bin +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/multimedia/sfnt2woff/sfnt2woff.info b/multimedia/sfnt2woff/sfnt2woff.info index f687f5ca67..1c9e706aeb 100644 --- a/multimedia/sfnt2woff/sfnt2woff.info +++ b/multimedia/sfnt2woff/sfnt2woff.info @@ -1,8 +1,8 @@ PRGNAM="sfnt2woff" VERSION="2009.10.03" -HOMEPAGE="https://github.com/wget/sfnt2woff" -DOWNLOAD="https://github.com/wget/sfnt2woff/archive/20091003/sfnt2woff-20091003.tar.gz" -MD5SUM="38f57b8a1925314ca918280c7536701e" +HOMEPAGE="https://github.com/wget/woff-tools" +DOWNLOAD="https://github.com/wget/woff-tools/archive/20091003/woff-tools-20091003.tar.gz" +MD5SUM="eca28571c45eb412099bb57a0b83ce5e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/shine/fix-bugs.patch b/multimedia/shine/fix-bugs.patch deleted file mode 100644 index 8e97a12bce..0000000000 --- a/multimedia/shine/fix-bugs.patch +++ /dev/null @@ -1,12394 +0,0 @@ -diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml -new file mode 100644 -index 0000000..500a5f6 ---- /dev/null -+++ b/.github/workflows/ci.yml -@@ -0,0 +1,73 @@ -+name: Build and install -+ -+on: -+ push: -+ branches: [ "main" ] -+ pull_request: -+ -+concurrency: -+ group: ${{ github.workflow }}-${{ github.ref }} -+ cancel-in-progress: true -+ -+jobs: -+ build: -+ runs-on: ${{ matrix.os }} -+ strategy: -+ fail-fast: false -+ matrix: -+ os: [macos-latest, ubuntu-latest] -+ steps: -+ - uses: actions/checkout@v3 -+ - name: Install required packages on macos -+ if: matrix.os == 'macos-latest' -+ run: brew install autoconf automake pkg-config -+ - name: Install required packages on ubuntu -+ if: matrix.os == 'ubuntu-latest' -+ run: sudo apt-get -y install automake autoconf pkg-config -+ - name: bootstrap -+ run: ./bootstrap -+ - name: configure -+ run: ./configure -+ - name: make -+ run: make -+ - name: make install on macos -+ if: matrix.os == 'macos-latest' -+ run: make install -+ - name: make install on ubuntu -+ if: matrix.os == 'ubuntu-latest' -+ run: sudo make install -+ - name: Test pkg-config setup -+ run: pkg-config --libs shine -+ -+ android_build: -+ runs-on: ubuntu-latest -+ steps: -+ - uses: actions/checkout@v3 -+ - uses: nttld/setup-ndk@v1 -+ with: -+ ndk-version: r25b -+ local-cache: true -+ - name: Install autoconf/automake -+ run: sudo apt-get -y install automake autoconf -+ - name: bootstrap -+ run: ./bootstrap -+ - name: configure -+ run: ./configure -+ - name: make android -+ run: make android -+ -+ js_build: -+ runs-on: ubuntu-latest -+ steps: -+ - uses: actions/checkout@v3 -+ - uses: mymindstorm/setup-emsdk@v11 -+ - name: JS build -+ run: | -+ cd js -+ make -+ - uses: actions/setup-node@v3 -+ - name: Run node test -+ run: | -+ cd js/test/node -+ npm install -+ npm run test -diff --git a/.gitignore b/.gitignore -index aa76abe..ffdd74d 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -2,9 +2,9 @@ - obj - libs - compile --android/lib --android/include --android/bin -+android/ -+js/src/post-node.js -+!android/*.mk - shine - shine.pc - m4 -@@ -82,6 +82,6 @@ src/lib/reservoir.o - src/lib/tables.lo - src/lib/tables.o - shine-*.tar.gz --*.bc -+*.o - *.mp3 - node_modules -diff --git a/ChangeLog b/ChangeLog -index 122dae5..0713282 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,8 @@ -+x.y.z () -+===== -+* Be more specific when enabling MIPS assembly routines. -+* Fix wave header reading on big endian machines (#34) -+ - 3.1.1 (2017-07-28) - ===== - * Remove invalid MPEG 2.5 bitrates. -diff --git a/Makefile.am b/Makefile.am -index bebf32d..538256c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -26,14 +26,14 @@ pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = shine.pc - - android: -- [ -d android/bin ] || mkdir android/bin - [ -d android/include ] || mkdir android/include -- [ -d android/lib ] || mkdir android/lib -- NDK_PROJECT_PATH=$(shell pwd) ndk-build APP_BUILD_SCRIPT=$(shell pwd)/android/Library.mk -- cp libs/armeabi/libshine.so android/lib -+ [ -d android/lib ] || mkdir android/lib -+ [ -d android/bin ] || mkdir android/bin - cp src/lib/layer3.h android/include -+ NDK_PROJECT_PATH=$(shell pwd) ndk-build APP_BUILD_SCRIPT=$(shell pwd)/android/Library.mk -+ mv libs/* android/lib - NDK_PROJECT_PATH=$(shell pwd) ndk-build APP_BUILD_SCRIPT=$(shell pwd)/android/Binary.mk -- cp libs/armeabi/shineenc android/bin -+ mv libs/* android/bin - - clean-local: - -rm -rf obj libs android/lib android/bin android/include -diff --git a/README.md b/README.md -index 1d30cbd..e9b781a 100644 ---- a/README.md -+++ b/README.md -@@ -2,15 +2,15 @@ Shine: fast fixed-point mp3 encoding - ==================================== - - [shine](https://github.com/savonet/shine) is a blazing fast mp3 encoding library implemented in --fixed-point arithmetic. The library can thus be used to performe super fast mp3 encoding on architectures --without a FPU, such as `armel`, etc.. It is also, however, also super fast on architectures with a FPU! -+fixed-point arithmetic. The library can thus be used to perform super fast mp3 encoding on architectures -+without a FPU, such as `armel`, etc.. It is also super fast on architectures with a FPU! - - How to use? - ----------- - - The encoding API should be quite straight forward: - --``` -+```c - #include <shine/layer3.h> - - (...) -@@ -42,46 +42,47 @@ shine_close(s); - How fast is it? - --------------- - --On a [Raspberry Pi](http://www.raspberrypi.org/) (`ARM`, `FPU`): -+On a macbook pro (`arm64`/M1 pro, `FPU`, December 30, 2022): - --Lame, `3m06s`, `1.8x` realtime: --``` --pi@raspberrypi ~ $ lame bla.wav bla.mp3 --LAME 3.99.5 32bits (http://lame.sf.net) -+Lame, `88.7x` realtime: -+```bash -+LAME 3.100 64bits (http://lame.sf.net) - Using polyphase lowpass filter, transition band: 16538 Hz - 17071 Hz --Encoding bla.wav to bla.mp3 -+Encoding /tmp/decoded.wav to /tmp/lame.mp3 - Encoding as 44.1 kHz j-stereo MPEG-1 Layer III (11x) 128 kbps qval=3 - Frame | CPU time/estim | REAL time/estim | play/CPU | ETA -- 12987/12987 (100%)| 3:06/ 3:06| 3:06/ 3:06| 1.8216x| 0:00 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -+ 12203/12203 (100%)| 0:03/ 0:03| 0:04/ 0:04| 88.773x| 0:00 -+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - kbps LR MS % long switch short % -- 128.0 0.1 99.9 89.1 6.1 4.9 -+ 128.0 32.6 67.4 96.4 1.9 1.7 - Writing LAME Tag...done --ReplayGain: -10.5dB -+ReplayGain: -9.3dB -+lame -b 128 /tmp/decoded.wav /tmp/lame.mp3 3.55s user 0.05s system 99% cpu 3.609 total - ``` - --Shine, `1m35s`, `3.6x` realtime: -+Shine, `318.0x` realtime: - ``` --pi@raspberrypi ~ $ shineenc bla.wav bla.mp3 - shineenc (Liquidsoap version) --WAVE PCM Data, stereo 44100Hz 16bit, duration: 00:05:39 -+WAVE PCM Data, stereo 44100Hz 16bit, duration: 00:05:18 - MPEG-I layer III, stereo Psychoacoustic Model: Shine - Bitrate: 128 kbps De-emphasis: none Original --Encoding "bla.wav" to "bla.mp3" --Finished in 00:01:35 (3.6x realtime) -+Encoding "/tmp/bla.wav" to "/tmp/shine.mp3" -+Finished in 00:00:01 (318.0x realtime) - ``` - --Now, on a mac airbook (`x86_64`, `FPU`): -+### ⚠ The following are outdated tests ⚠ - --Lame, `15s`, `22x` realtime: --``` --toots@zulu tmp % lame bla.wav bla.mp3 --LAME 3.99.5 64bits (http://lame.sf.net) -+On a [Raspberry Pi](http://www.raspberrypi.org/) (`ARM`, `FPU`): -+ -+Lame, `1.8x` realtime: -+```bash -+pi@raspberrypi ~ $ lame bla.wav bla.mp3 -+LAME 3.99.5 32bits (http://lame.sf.net) - Using polyphase lowpass filter, transition band: 16538 Hz - 17071 Hz - Encoding bla.wav to bla.mp3 - Encoding as 44.1 kHz j-stereo MPEG-1 Layer III (11x) 128 kbps qval=3 - Frame | CPU time/estim | REAL time/estim | play/CPU | ETA -- 12987/12987 (100%)| 0:15/ 0:15| 0:17/ 0:17| 22.087x| 0:00 -+ 12987/12987 (100%)| 3:06/ 3:06| 3:06/ 3:06| 1.8216x| 0:00 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - kbps LR MS % long switch short % - 128.0 0.1 99.9 89.1 6.1 4.9 -@@ -89,20 +90,21 @@ Writing LAME Tag...done - ReplayGain: -10.5dB - ``` - --Shine, `9s`, `37.7x` realtime: --``` -+Shine, `3.6x` realtime: -+```bash -+pi@raspberrypi ~ $ shineenc bla.wav bla.mp3 - shineenc (Liquidsoap version) - WAVE PCM Data, stereo 44100Hz 16bit, duration: 00:05:39 - MPEG-I layer III, stereo Psychoacoustic Model: Shine - Bitrate: 128 kbps De-emphasis: none Original --Encoding "/tmp/bla.wav" to "/tmp/bla.mp3" --Finished in 00:00:09 (37.7x realtime) -+Encoding "bla.wav" to "bla.mp3" -+Finished in 00:01:35 (3.6x realtime) - ``` - - On a Google Nexus 5 (`ARM`, `FPU`): - - Shine, `14s`, `24.2x` realtime: --``` -+```bash - u0_a65@hammerhead:/mnt/sdcard $ shineenc bla.wav bla.mp3 - shineenc (Liquidsoap version) - WAVE PCM Data, stereo 44100Hz 16bit, duration: 00:05:39 -@@ -128,7 +130,7 @@ A bit of history - This code was dug out from the dusty crates of those times before internet - and github. It apparently was created by Gabriel Bouvigne sometime around - the end of the 20th century. The encoder was converted circa 2001 by Pete --Everett to fixed-point arithmetic for the RISC OS. Latest we know, Patrick -+Everett to fixed-point arithmetic for the RISC OS. Last we know, Patrick - Roberts had worked on the code to make it multi-platform and more library - oriented. That was around 2006. - -diff --git a/configure.ac b/configure.ac -index 87a5f68..6d6cb23 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,6 +1,7 @@ --AC_INIT([shine],[3.1.0],[savonet-users@lists.sourceforge.net]) -+AC_INIT([shine],[3.1.1],[toots@rastageeks.org]) - AM_INIT_AUTOMAKE([subdir-objects]) - LT_INIT - AC_CONFIG_MACRO_DIR([m4]) - AC_C_BIGENDIAN([CFLAGS="$CFLAGS -DSHINE_BIG_ENDIAN"]) -+AC_CHECK_HEADER([byteswap.h],[CFLAGS="$CFLAGS -DSHINE_HAVE_BSWAP_H"]) - AC_OUTPUT([Makefile shine.pc]) -diff --git a/js/.npmignore b/js/.npmignore -new file mode 100644 -index 0000000..f1b84a5 ---- /dev/null -+++ b/js/.npmignore -@@ -0,0 +1,4 @@ -+test/ -+src/ -+Makefile -+.* -diff --git a/js/.prettierignore b/js/.prettierignore -new file mode 100644 -index 0000000..1b64941 ---- /dev/null -+++ b/js/.prettierignore -@@ -0,0 +1,5 @@ -+.next/ -+dist/ -+stubs/ -+public/audio -+__ENV.js -diff --git a/js/.prettierrc b/js/.prettierrc -new file mode 100644 -index 0000000..a995c49 ---- /dev/null -+++ b/js/.prettierrc -@@ -0,0 +1,12 @@ -+{ -+ "singleQuote": false, -+ "quoteProps": "as-needed", -+ "arrowParens": "avoid", -+ "tabWidth": 2, -+ "trailingComma": "es5", -+ "semi": true, -+ "jsxSingleQuote": true, -+ "bracketSameLine": false, -+ "printWidth": 120, -+ "parser": "typescript" -+} -diff --git a/js/Makefile b/js/Makefile -index 465ffde..3781b6e 100644 ---- a/js/Makefile -+++ b/js/Makefile -@@ -1,24 +1,37 @@ - # Emscriptem compilation - - EMCC:=emcc --EXPORTED_FUNCTIONS:='["_shine_check_config", "_shine_js_init",\ -+EXPORTED_FUNCTIONS:='["_malloc", "_free", "_shine_check_config", "_shine_js_init",\ -+ "_shine_js_int16_len", "_shine_js_ptr_len", \ - "_shine_samples_per_pass", "_shine_encode_buffer",\ -- "_shine_flush", "_shine_close"]' -+ "_shine_flush", "_shine_close"]' - CFLAGS:=-O3 --LINKFLAGS:=-s EXPORTED_FUNCTIONS=$(EXPORTED_FUNCTIONS) --memory-init-file 0 $(CFLAGS) -+LINKFLAGS:=-s EXPORTED_FUNCTIONS=$(EXPORTED_FUNCTIONS) -s SINGLE_FILE=1 -s EXPORTED_RUNTIME_METHODS=setValue,getValue --memory-init-file 0 $(CFLAGS) -+WEB_LINKFLAGS:=$(LINKFLAGS) -s ENVIRONMENT='web' -s EXPORT_NAME='createModule' -s USE_ES6_IMPORT_META=0 - - C_FILES:=$(wildcard ../src/lib/*.c) src/wrapper.c - HEADER_FILES:=$(wildcard ../src/lib/*.h) - SOURCES:=$(C_FILES) $(HEADER_FILES) --OBJECTS:=$(C_FILES:%.c=%.bc) -+OBJECTS:=$(C_FILES:%.c=%.o) - --all: dist/libshine.js -+all: dist/libshine_node.js dist/libshine_browser.js - --dist/libshine.js: $(SOURCES) $(OBJECTS) src/pre.js src/post.js -- $(EMCC) $(LINKFLAGS) --pre-js src/pre.js --post-js src/post.js $(OBJECTS) -o $@ -+src/post-node.js: src/libshine_class.js src/libshine_node_wrapper.js -+ rm -f src/post-node.js -+ cat src/libshine_class.js src/libshine_node_wrapper.js > src/post-node.js - --%.bc: %.c -+dist/libshine_node.js: $(SOURCES) $(OBJECTS) src/post-node.js -+ $(EMCC) $(LINKFLAGS) --post-js src/post-node.js $(OBJECTS) -o dist/libshine_node.js -+ -+dist/libshine_browser_stubs.js: $(SOURCES) $(OBJECTS) -+ $(EMCC) $(WEB_LINKFLAGS) $(OBJECTS) -o dist/libshine_browser_stubs.mjs -+ mv dist/libshine_browser_stubs.mjs dist/libshine_browser_stubs.js -+ -+dist/libshine_browser.js: src/libshine_class.js src/libshine_browser_wrapper.js dist/libshine_browser_stubs.js -+ cat src/libshine_class.js src/libshine_browser_wrapper.js > dist/libshine_browser.js -+ -+%.o: %.c - $(EMCC) $(CFLAGS) -I../src/lib -c $< -o $@ - - clean: -- rm -f *.bc ../src/lib/*.bc -+ rm -rf *.o ../src/lib/*.o dist/libshine*js -diff --git a/js/README.md b/js/README.md -index 49ca3f6..d521d4b 100644 ---- a/js/README.md -+++ b/js/README.md -@@ -1,112 +1,156 @@ - Shine encoder library for Javascript - ==================================== - --This directory contains a build of shine for Javascript using --[kripken/emscripten](https://github.com/kripken/emscripten) and --located in `dist/libshine.js` -+This package contains a build of the [shine](https://github.com/toots/shine) fixed-point -+mp3 encoder compiled for Javascript and wasm using [emscripten-core/emscripten](https://github.com/emscripten-core/emscripten). -+ -+Install -+------- -+ -+Using `npm`: -+ -+```shell -+npm install @toots/shine.js -+``` -+ -+Using `yarn`: -+ -+```shell -+yarn add @toots/shine.js -+``` -+ -+Using `pnpm`: -+ -+```shell -+pnpm install @toots/shine.js -+``` -+ -+In a HTML page: -+ -+When using `webpack`, the package should point to the correct -+`libshine_browser.js` file automatically. -+ -+When using directly as a script, you can load the `libshine_node.js` -+file as: -+ -+```html -+<script src="libshine_node.js"></script> -+``` -+ -+See: [test/browser](https://github.com/toots/shine/tree/main/js/test/browser) for an example. - - How to use? - ----------- - - The encoding API should be quite straight forward: - --``` --shine = new Shine({ -- samplerate: 44100, -- bitrate: 128, -- channels: 2, -- mode: Shine.STEREO --}); -+```js -+import { Shine, StereoModel } from "@toots/shine.js"; -+ -+const exec = async () => { -+ await Shine.initialized; -+ -+ shine = new Shine({ -+ samplerate: 44100, -+ bitrate: 128, -+ channels: 2, -+ stereoModel: StereoModel.STEREO -+ }); - --// All the magic happens here --while (..) { -- // data here is an array of channels. -- // Channels must have the same number of samples -- // and both be either Int16Array or Float32Array. -- encoded = shine.encode(data); -+ // All the magic happens here -+ while (..) { -+ // data here is an array of channels. -+ // Channels must have the same number of samples -+ // and both be either Int16Array or Float32Array. -+ encoded = shine.encode(data); -+ ... -+ } -+ -+ // Close and get remaining data. -+ flushed = shine.close(); -+ - ... - } - --// Close and get remaining data. --flushed = shine.close(); --... -+exec(); - ``` - - How fast is it? - --------------- - --You can run the test suite located in `test/`. As of now (26/07/2014), only firefox --and seems to show performances decent enough for real-time encoding while Google Chrome --can encode between 1X and 2X. -+You can run the test suite located in `test/`. Encoding rate above `1X` means that -+the browser should be suitable for real-time encoding. -+ -+Results, as of December 30, 2022: - --Chrome: -+Chrome (`108.0.5359.124`): - ``` - Executing encoding test - Got WAV file. - Encoding.. - Done encoding. - File duration: 5.57 seconds --Encoding time: 5.18 seconds --Encoding rate: 1.08X -+Encoding time: 0.08 seconds -+Encoding rate: 67.96X - - Executing rounds test - Encoding 50 buffers of 4096 samples - Done encoding - Total duration: 4.64 --Encoding time: 2.73 --Encoding rate: 1.70X -+Encoding time: 0.03 -+Encoding rate: 160.00X - ``` - --Firefox: -+Firefox (`108.0.1`): - ``` - Executing encoding test - Got WAV file. - Encoding.. - Done encoding. - File duration: 5.57 seconds --Encoding time: 1.48 seconds --Encoding rate: 3.76X -+Encoding time: 0.06 seconds -+Encoding rate: 99.52X - - Executing rounds test - Encoding 50 buffers of 4096 samples - Done encoding - Total duration: 4.64 --Encoding time: 0.98 --Encoding rate: 4.72X -+Encoding time: 0.03 -+Encoding rate: 178.46X - ``` - --Safari: -+Safari (`16.2`): - ``` - Executing encoding test - Got WAV file. - Encoding.. - Done encoding. - File duration: 5.57 seconds --Encoding time: 11.77 seconds --Encoding rate: 0.47X -+Encoding time: 0.12 seconds -+Encoding rate: 46.44X - - Executing rounds test - Encoding 50 buffers of 4096 samples - Done encoding - Total duration: 4.64 --Encoding time: 6.93 --Encoding rate: 0.67X -+Encoding time: 0.02 -+Encoding rate: 210.91X - ``` - --NodeJS, v0.10.24: -+NodeJS (`v19.3.0`): - ``` - Executing encoding test - Got WAV file. - Encoding.. - Done encoding. - File duration: 5.57 seconds --Encoding time: 22.57 seconds --Encoding rate: 0.25X -+Encoding time: 0.06 seconds -+Encoding rate: 94.45X - - Executing rounds test - Encoding 50 buffers of 4096 samples - Done encoding - Total duration: 4.64 --Encoding time: 11.46 --Encoding rate: 0.40X -+Encoding time: 0.03 -+Encoding rate: 178.46X - ``` -diff --git a/js/dist/libshine.js b/js/dist/libshine.js -deleted file mode 100644 -index c44f119..0000000 ---- a/js/dist/libshine.js -+++ /dev/null -@@ -1,16 +0,0 @@ --var Shine=(function(){var context={};return(function(){var Module;if(!Module)Module=(typeof Module!=="undefined"?Module:null)||{};var moduleOverrides={};for(var key in Module){if(Module.hasOwnProperty(key)){moduleOverrides[key]=Module[key]}}var ENVIRONMENT_IS_WEB=false;var ENVIRONMENT_IS_WORKER=false;var ENVIRONMENT_IS_NODE=false;var ENVIRONMENT_IS_SHELL=false;if(Module["ENVIRONMENT"]){if(Module["ENVIRONMENT"]==="WEB"){ENVIRONMENT_IS_WEB=true}else if(Module["ENVIRONMENT"]==="WORKER"){ENVIRONMENT_IS_WORKER=true}else if(Module["ENVIRONMENT"]==="NODE"){ENVIRONMENT_IS_NODE=true}else if(Module["ENVIRONMENT"]==="SHELL"){ENVIRONMENT_IS_SHELL=true}else{throw new Error("The provided Module['ENVIRONMENT'] value is not valid. It must be one of: WEB|WORKER|NODE|SHELL.")}}else{ENVIRONMENT_IS_WEB=typeof window==="object";ENVIRONMENT_IS_WORKER=typeof importScripts==="function";ENVIRONMENT_IS_NODE=typeof process==="object"&&typeof require==="function"&&!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_WORKER;ENVIRONMENT_IS_SHELL=!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_NODE&&!ENVIRONMENT_IS_WORKER}if(ENVIRONMENT_IS_NODE){if(!Module["print"])Module["print"]=console.log;if(!Module["printErr"])Module["printErr"]=console.warn;var nodeFS;var nodePath;Module["read"]=function shell_read(filename,binary){if(!nodeFS)nodeFS=require("fs");if(!nodePath)nodePath=require("path");filename=nodePath["normalize"](filename);var ret=nodeFS["readFileSync"](filename);return binary?ret:ret.toString()};Module["readBinary"]=function readBinary(filename){var ret=Module["read"](filename,true);if(!ret.buffer){ret=new Uint8Array(ret)}assert(ret.buffer);return ret};Module["load"]=function load(f){globalEval(read(f))};if(!Module["thisProgram"]){if(process["argv"].length>1){Module["thisProgram"]=process["argv"][1].replace(/\\/g,"/")}else{Module["thisProgram"]="unknown-program"}}Module["arguments"]=process["argv"].slice(2);if(typeof module!=="undefined"){module["exports"]=Module}process["on"]("uncaughtException",(function(ex){if(!(ex instanceof ExitStatus)){throw ex}}));Module["inspect"]=(function(){return"[Emscripten Module object]"})}else if(ENVIRONMENT_IS_SHELL){if(!Module["print"])Module["print"]=print;if(typeof printErr!="undefined")Module["printErr"]=printErr;if(typeof read!="undefined"){Module["read"]=read}else{Module["read"]=function shell_read(){throw"no read() available"}}Module["readBinary"]=function readBinary(f){if(typeof readbuffer==="function"){return new Uint8Array(readbuffer(f))}var data=read(f,"binary");assert(typeof data==="object");return data};if(typeof scriptArgs!="undefined"){Module["arguments"]=scriptArgs}else if(typeof arguments!="undefined"){Module["arguments"]=arguments}if(typeof quit==="function"){Module["quit"]=(function(status,toThrow){quit(status)})}}else if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){Module["read"]=function shell_read(url){var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.send(null);return xhr.responseText};if(ENVIRONMENT_IS_WORKER){Module["readBinary"]=function readBinary(url){var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.responseType="arraybuffer";xhr.send(null);return new Uint8Array(xhr.response)}}Module["readAsync"]=function readAsync(url,onload,onerror){var xhr=new XMLHttpRequest;xhr.open("GET",url,true);xhr.responseType="arraybuffer";xhr.onload=function xhr_onload(){if(xhr.status==200||xhr.status==0&&xhr.response){onload(xhr.response)}else{onerror()}};xhr.onerror=onerror;xhr.send(null)};if(typeof arguments!="undefined"){Module["arguments"]=arguments}if(typeof console!=="undefined"){if(!Module["print"])Module["print"]=function shell_print(x){console.log(x)};if(!Module["printErr"])Module["printErr"]=function shell_printErr(x){console.warn(x)}}else{var TRY_USE_DUMP=false;if(!Module["print"])Module["print"]=TRY_USE_DUMP&&typeof dump!=="undefined"?(function(x){dump(x)}):(function(x){})}if(ENVIRONMENT_IS_WORKER){Module["load"]=importScripts}if(typeof Module["setWindowTitle"]==="undefined"){Module["setWindowTitle"]=(function(title){document.title=title})}}else{throw"Unknown runtime environment. Where are we?"}function globalEval(x){eval.call(null,x)}if(!Module["load"]&&Module["read"]){Module["load"]=function load(f){globalEval(Module["read"](f))}}if(!Module["print"]){Module["print"]=(function(){})}if(!Module["printErr"]){Module["printErr"]=Module["print"]}if(!Module["arguments"]){Module["arguments"]=[]}if(!Module["thisProgram"]){Module["thisProgram"]="./this.program"}if(!Module["quit"]){Module["quit"]=(function(status,toThrow){throw toThrow})}Module.print=Module["print"];Module.printErr=Module["printErr"];Module["preRun"]=[];Module["postRun"]=[];for(var key in moduleOverrides){if(moduleOverrides.hasOwnProperty(key)){Module[key]=moduleOverrides[key]}}moduleOverrides=undefined;var Runtime={setTempRet0:(function(value){tempRet0=value;return value}),getTempRet0:(function(){return tempRet0}),stackSave:(function(){return STACKTOP}),stackRestore:(function(stackTop){STACKTOP=stackTop}),getNativeTypeSize:(function(type){switch(type){case"i1":case"i8":return 1;case"i16":return 2;case"i32":return 4;case"i64":return 8;case"float":return 4;case"double":return 8;default:{if(type[type.length-1]==="*"){return Runtime.QUANTUM_SIZE}else if(type[0]==="i"){var bits=parseInt(type.substr(1));assert(bits%8===0);return bits/8}else{return 0}}}}),getNativeFieldSize:(function(type){return Math.max(Runtime.getNativeTypeSize(type),Runtime.QUANTUM_SIZE)}),STACK_ALIGN:16,prepVararg:(function(ptr,type){if(type==="double"||type==="i64"){if(ptr&7){assert((ptr&7)===4);ptr+=4}}else{assert((ptr&3)===0)}return ptr}),getAlignSize:(function(type,size,vararg){if(!vararg&&(type=="i64"||type=="double"))return 8;if(!type)return Math.min(size,8);return Math.min(size||(type?Runtime.getNativeFieldSize(type):0),Runtime.QUANTUM_SIZE)}),dynCall:(function(sig,ptr,args){if(args&&args.length){return Module["dynCall_"+sig].apply(null,[ptr].concat(args))}else{return Module["dynCall_"+sig].call(null,ptr)}}),functionPointers:[],addFunction:(function(func){for(var i=0;i<Runtime.functionPointers.length;i++){if(!Runtime.functionPointers[i]){Runtime.functionPointers[i]=func;return 2*(1+i)}}throw"Finished up all reserved function pointers. Use a higher value for RESERVED_FUNCTION_POINTERS."}),removeFunction:(function(index){Runtime.functionPointers[(index-2)/2]=null}),warnOnce:(function(text){if(!Runtime.warnOnce.shown)Runtime.warnOnce.shown={};if(!Runtime.warnOnce.shown[text]){Runtime.warnOnce.shown[text]=1;Module.printErr(text)}}),funcWrappers:{},getFuncWrapper:(function(func,sig){assert(sig);if(!Runtime.funcWrappers[sig]){Runtime.funcWrappers[sig]={}}var sigCache=Runtime.funcWrappers[sig];if(!sigCache[func]){if(sig.length===1){sigCache[func]=function dynCall_wrapper(){return Runtime.dynCall(sig,func)}}else if(sig.length===2){sigCache[func]=function dynCall_wrapper(arg){return Runtime.dynCall(sig,func,[arg])}}else{sigCache[func]=function dynCall_wrapper(){return Runtime.dynCall(sig,func,Array.prototype.slice.call(arguments))}}}return sigCache[func]}),getCompilerSetting:(function(name){throw"You must build with -s RETAIN_COMPILER_SETTINGS=1 for Runtime.getCompilerSetting or emscripten_get_compiler_setting to work"}),stackAlloc:(function(size){var ret=STACKTOP;STACKTOP=STACKTOP+size|0;STACKTOP=STACKTOP+15&-16;return ret}),staticAlloc:(function(size){var ret=STATICTOP;STATICTOP=STATICTOP+size|0;STATICTOP=STATICTOP+15&-16;return ret}),dynamicAlloc:(function(size){var ret=HEAP32[DYNAMICTOP_PTR>>2];var end=(ret+size+15|0)&-16;HEAP32[DYNAMICTOP_PTR>>2]=end;if(end>=TOTAL_MEMORY){var success=enlargeMemory();if(!success){HEAP32[DYNAMICTOP_PTR>>2]=ret;return 0}}return ret}),alignMemory:(function(size,quantum){var ret=size=Math.ceil(size/(quantum?quantum:16))*(quantum?quantum:16);return ret}),makeBigInt:(function(low,high,unsigned){var ret=unsigned?+(low>>>0)+ +(high>>>0)*+4294967296:+(low>>>0)+ +(high|0)*+4294967296;return ret}),GLOBAL_BASE:8,QUANTUM_SIZE:4,__dummy__:0};Module["Runtime"]=Runtime;var ABORT=0;var EXITSTATUS=0;function assert(condition,text){if(!condition){abort("Assertion failed: "+text)}}function getCFunc(ident){var func=Module["_"+ident];if(!func){try{func=eval("_"+ident)}catch(e){}}assert(func,"Cannot call unknown function "+ident+" (perhaps LLVM optimizations or closure removed it?)");return func}var cwrap,ccall;((function(){var JSfuncs={"stackSave":(function(){Runtime.stackSave()}),"stackRestore":(function(){Runtime.stackRestore()}),"arrayToC":(function(arr){var ret=Runtime.stackAlloc(arr.length);writeArrayToMemory(arr,ret);return ret}),"stringToC":(function(str){var ret=0;if(str!==null&&str!==undefined&&str!==0){var len=(str.length<<2)+1;ret=Runtime.stackAlloc(len);stringToUTF8(str,ret,len)}return ret})};var toC={"string":JSfuncs["stringToC"],"array":JSfuncs["arrayToC"]};ccall=function ccallFunc(ident,returnType,argTypes,args,opts){var func=getCFunc(ident);var cArgs=[];var stack=0;if(args){for(var i=0;i<args.length;i++){var converter=toC[argTypes[i]];if(converter){if(stack===0)stack=Runtime.stackSave();cArgs[i]=converter(args[i])}else{cArgs[i]=args[i]}}}var ret=func.apply(null,cArgs);if(returnType==="string")ret=Pointer_stringify(ret);if(stack!==0){if(opts&&opts.async){EmterpreterAsync.asyncFinalizers.push((function(){Runtime.stackRestore(stack)}));return}Runtime.stackRestore(stack)}return ret};var sourceRegex=/^function\s*[a-zA-Z$_0-9]*\s*\(([^)]*)\)\s*{\s*([^*]*?)[\s;]*(?:return\s*(.*?)[;\s]*)?}$/;function parseJSFunc(jsfunc){var parsed=jsfunc.toString().match(sourceRegex).slice(1);return{arguments:parsed[0],body:parsed[1],returnValue:parsed[2]}}var JSsource=null;function ensureJSsource(){if(!JSsource){JSsource={};for(var fun in JSfuncs){if(JSfuncs.hasOwnProperty(fun)){JSsource[fun]=parseJSFunc(JSfuncs[fun])}}}}cwrap=function cwrap(ident,returnType,argTypes){argTypes=argTypes||[];var cfunc=getCFunc(ident);var numericArgs=argTypes.every((function(type){return type==="number"}));var numericRet=returnType!=="string";if(numericRet&&numericArgs){return cfunc}var argNames=argTypes.map((function(x,i){return"$"+i}));var funcstr="(function("+argNames.join(",")+") {";var nargs=argTypes.length;if(!numericArgs){ensureJSsource();funcstr+="var stack = "+JSsource["stackSave"].body+";";for(var i=0;i<nargs;i++){var arg=argNames[i],type=argTypes[i];if(type==="number")continue;var convertCode=JSsource[type+"ToC"];funcstr+="var "+convertCode.arguments+" = "+arg+";";funcstr+=convertCode.body+";";funcstr+=arg+"=("+convertCode.returnValue+");"}}var cfuncname=parseJSFunc((function(){return cfunc})).returnValue;funcstr+="var ret = "+cfuncname+"("+argNames.join(",")+");";if(!numericRet){var strgfy=parseJSFunc((function(){return Pointer_stringify})).returnValue;funcstr+="ret = "+strgfy+"(ret);"}if(!numericArgs){ensureJSsource();funcstr+=JSsource["stackRestore"].body.replace("()","(stack)")+";"}funcstr+="return ret})";return eval(funcstr)}}))();Module["ccall"]=ccall;Module["cwrap"]=cwrap;function setValue(ptr,value,type,noSafe){type=type||"i8";if(type.charAt(type.length-1)==="*")type="i32";switch(type){case"i1":HEAP8[ptr>>0]=value;break;case"i8":HEAP8[ptr>>0]=value;break;case"i16":HEAP16[ptr>>1]=value;break;case"i32":HEAP32[ptr>>2]=value;break;case"i64":tempI64=[value>>>0,(tempDouble=value,+Math_abs(tempDouble)>=+1?tempDouble>+0?(Math_min(+Math_floor(tempDouble/+4294967296),+4294967295)|0)>>>0:~~+Math_ceil((tempDouble- +(~~tempDouble>>>0))/+4294967296)>>>0:0)],HEAP32[ptr>>2]=tempI64[0],HEAP32[ptr+4>>2]=tempI64[1];break;case"float":HEAPF32[ptr>>2]=value;break;case"double":HEAPF64[ptr>>3]=value;break;default:abort("invalid type for setValue: "+type)}}Module["setValue"]=setValue;function getValue(ptr,type,noSafe){type=type||"i8";if(type.charAt(type.length-1)==="*")type="i32";switch(type){case"i1":return HEAP8[ptr>>0];case"i8":return HEAP8[ptr>>0];case"i16":return HEAP16[ptr>>1];case"i32":return HEAP32[ptr>>2];case"i64":return HEAP32[ptr>>2];case"float":return HEAPF32[ptr>>2];case"double":return HEAPF64[ptr>>3];default:abort("invalid type for setValue: "+type)}return null}Module["getValue"]=getValue;var ALLOC_NORMAL=0;var ALLOC_STACK=1;var ALLOC_STATIC=2;var ALLOC_DYNAMIC=3;var ALLOC_NONE=4;Module["ALLOC_NORMAL"]=ALLOC_NORMAL;Module["ALLOC_STACK"]=ALLOC_STACK;Module["ALLOC_STATIC"]=ALLOC_STATIC;Module["ALLOC_DYNAMIC"]=ALLOC_DYNAMIC;Module["ALLOC_NONE"]=ALLOC_NONE;function allocate(slab,types,allocator,ptr){var zeroinit,size;if(typeof slab==="number"){zeroinit=true;size=slab}else{zeroinit=false;size=slab.length}var singleType=typeof types==="string"?types:null;var ret;if(allocator==ALLOC_NONE){ret=ptr}else{ret=[typeof _malloc==="function"?_malloc:Runtime.staticAlloc,Runtime.stackAlloc,Runtime.staticAlloc,Runtime.dynamicAlloc][allocator===undefined?ALLOC_STATIC:allocator](Math.max(size,singleType?1:types.length))}if(zeroinit){var ptr=ret,stop;assert((ret&3)==0);stop=ret+(size&~3);for(;ptr<stop;ptr+=4){HEAP32[ptr>>2]=0}stop=ret+size;while(ptr<stop){HEAP8[ptr++>>0]=0}return ret}if(singleType==="i8"){if(slab.subarray||slab.slice){HEAPU8.set(slab,ret)}else{HEAPU8.set(new Uint8Array(slab),ret)}return ret}var i=0,type,typeSize,previousType;while(i<size){var curr=slab[i];if(typeof curr==="function"){curr=Runtime.getFunctionIndex(curr)}type=singleType||types[i];if(type===0){i++;continue}if(type=="i64")type="i32";setValue(ret+i,curr,type);if(previousType!==type){typeSize=Runtime.getNativeTypeSize(type);previousType=type}i+=typeSize}return ret}Module["allocate"]=allocate;function getMemory(size){if(!staticSealed)return Runtime.staticAlloc(size);if(!runtimeInitialized)return Runtime.dynamicAlloc(size);return _malloc(size)}Module["getMemory"]=getMemory;function Pointer_stringify(ptr,length){if(length===0||!ptr)return"";var hasUtf=0;var t;var i=0;while(1){t=HEAPU8[ptr+i>>0];hasUtf|=t;if(t==0&&!length)break;i++;if(length&&i==length)break}if(!length)length=i;var ret="";if(hasUtf<128){var MAX_CHUNK=1024;var curr;while(length>0){curr=String.fromCharCode.apply(String,HEAPU8.subarray(ptr,ptr+Math.min(length,MAX_CHUNK)));ret=ret?ret+curr:curr;ptr+=MAX_CHUNK;length-=MAX_CHUNK}return ret}return Module["UTF8ToString"](ptr)}Module["Pointer_stringify"]=Pointer_stringify;function AsciiToString(ptr){var str="";while(1){var ch=HEAP8[ptr++>>0];if(!ch)return str;str+=String.fromCharCode(ch)}}Module["AsciiToString"]=AsciiToString;function stringToAscii(str,outPtr){return writeAsciiToMemory(str,outPtr,false)}Module["stringToAscii"]=stringToAscii;var UTF8Decoder=typeof TextDecoder!=="undefined"?new TextDecoder("utf8"):undefined;function UTF8ArrayToString(u8Array,idx){var endPtr=idx;while(u8Array[endPtr])++endPtr;if(endPtr-idx>16&&u8Array.subarray&&UTF8Decoder){return UTF8Decoder.decode(u8Array.subarray(idx,endPtr))}else{var u0,u1,u2,u3,u4,u5;var str="";while(1){u0=u8Array[idx++];if(!u0)return str;if(!(u0&128)){str+=String.fromCharCode(u0);continue}u1=u8Array[idx++]&63;if((u0&224)==192){str+=String.fromCharCode((u0&31)<<6|u1);continue}u2=u8Array[idx++]&63;if((u0&240)==224){u0=(u0&15)<<12|u1<<6|u2}else{u3=u8Array[idx++]&63;if((u0&248)==240){u0=(u0&7)<<18|u1<<12|u2<<6|u3}else{u4=u8Array[idx++]&63;if((u0&252)==248){u0=(u0&3)<<24|u1<<18|u2<<12|u3<<6|u4}else{u5=u8Array[idx++]&63;u0=(u0&1)<<30|u1<<24|u2<<18|u3<<12|u4<<6|u5}}}if(u0<65536){str+=String.fromCharCode(u0)}else{var ch=u0-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}}}}Module["UTF8ArrayToString"]=UTF8ArrayToString;function UTF8ToString(ptr){return UTF8ArrayToString(HEAPU8,ptr)}Module["UTF8ToString"]=UTF8ToString;function stringToUTF8Array(str,outU8Array,outIdx,maxBytesToWrite){if(!(maxBytesToWrite>0))return 0;var startIdx=outIdx;var endIdx=outIdx+maxBytesToWrite-1;for(var i=0;i<str.length;++i){var u=str.charCodeAt(i);if(u>=55296&&u<=57343)u=65536+((u&1023)<<10)|str.charCodeAt(++i)&1023;if(u<=127){if(outIdx>=endIdx)break;outU8Array[outIdx++]=u}else if(u<=2047){if(outIdx+1>=endIdx)break;outU8Array[outIdx++]=192|u>>6;outU8Array[outIdx++]=128|u&63}else if(u<=65535){if(outIdx+2>=endIdx)break;outU8Array[outIdx++]=224|u>>12;outU8Array[outIdx++]=128|u>>6&63;outU8Array[outIdx++]=128|u&63}else if(u<=2097151){if(outIdx+3>=endIdx)break;outU8Array[outIdx++]=240|u>>18;outU8Array[outIdx++]=128|u>>12&63;outU8Array[outIdx++]=128|u>>6&63;outU8Array[outIdx++]=128|u&63}else if(u<=67108863){if(outIdx+4>=endIdx)break;outU8Array[outIdx++]=248|u>>24;outU8Array[outIdx++]=128|u>>18&63;outU8Array[outIdx++]=128|u>>12&63;outU8Array[outIdx++]=128|u>>6&63;outU8Array[outIdx++]=128|u&63}else{if(outIdx+5>=endIdx)break;outU8Array[outIdx++]=252|u>>30;outU8Array[outIdx++]=128|u>>24&63;outU8Array[outIdx++]=128|u>>18&63;outU8Array[outIdx++]=128|u>>12&63;outU8Array[outIdx++]=128|u>>6&63;outU8Array[outIdx++]=128|u&63}}outU8Array[outIdx]=0;return outIdx-startIdx}Module["stringToUTF8Array"]=stringToUTF8Array;function stringToUTF8(str,outPtr,maxBytesToWrite){return stringToUTF8Array(str,HEAPU8,outPtr,maxBytesToWrite)}Module["stringToUTF8"]=stringToUTF8;function lengthBytesUTF8(str){var len=0;for(var i=0;i<str.length;++i){var u=str.charCodeAt(i);if(u>=55296&&u<=57343)u=65536+((u&1023)<<10)|str.charCodeAt(++i)&1023;if(u<=127){++len}else if(u<=2047){len+=2}else if(u<=65535){len+=3}else if(u<=2097151){len+=4}else if(u<=67108863){len+=5}else{len+=6}}return len}Module["lengthBytesUTF8"]=lengthBytesUTF8;var UTF16Decoder=typeof TextDecoder!=="undefined"?new TextDecoder("utf-16le"):undefined;function demangle(func){var __cxa_demangle_func=Module["___cxa_demangle"]||Module["__cxa_demangle"];if(__cxa_demangle_func){try{var s=func.substr(1);var len=lengthBytesUTF8(s)+1;var buf=_malloc(len);stringToUTF8(s,buf,len);var status=_malloc(4);var ret=__cxa_demangle_func(buf,0,0,status);if(getValue(status,"i32")===0&&ret){return Pointer_stringify(ret)}}catch(e){}finally{if(buf)_free(buf);if(status)_free(status);if(ret)_free(ret)}return func}Runtime.warnOnce("warning: build with -s DEMANGLE_SUPPORT=1 to link in libcxxabi demangling");return func}function demangleAll(text){var regex=/__Z[\w\d_]+/g;return text.replace(regex,(function(x){var y=demangle(x);return x===y?x:x+" ["+y+"]"}))}function jsStackTrace(){var err=new Error;if(!err.stack){try{throw new Error(0)}catch(e){err=e}if(!err.stack){return"(no stack trace available)"}}return err.stack.toString()}function stackTrace(){var js=jsStackTrace();if(Module["extraStackTrace"])js+="\n"+Module["extraStackTrace"]();return demangleAll(js)}Module["stackTrace"]=stackTrace;var HEAP,buffer,HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;function updateGlobalBufferViews(){Module["HEAP8"]=HEAP8=new Int8Array(buffer);Module["HEAP16"]=HEAP16=new Int16Array(buffer);Module["HEAP32"]=HEAP32=new Int32Array(buffer);Module["HEAPU8"]=HEAPU8=new Uint8Array(buffer);Module["HEAPU16"]=HEAPU16=new Uint16Array(buffer);Module["HEAPU32"]=HEAPU32=new Uint32Array(buffer);Module["HEAPF32"]=HEAPF32=new Float32Array(buffer);Module["HEAPF64"]=HEAPF64=new Float64Array(buffer)}var STATIC_BASE,STATICTOP,staticSealed;var STACK_BASE,STACKTOP,STACK_MAX;var DYNAMIC_BASE,DYNAMICTOP_PTR;STATIC_BASE=STATICTOP=STACK_BASE=STACKTOP=STACK_MAX=DYNAMIC_BASE=DYNAMICTOP_PTR=0;staticSealed=false;function abortOnCannotGrowMemory(){abort("Cannot enlarge memory arrays. Either (1) compile with -s TOTAL_MEMORY=X with X higher than the current value "+TOTAL_MEMORY+", (2) compile with -s ALLOW_MEMORY_GROWTH=1 which allows increasing the size at runtime but prevents some optimizations, (3) set Module.TOTAL_MEMORY to a higher value before the program runs, or (4) if you want malloc to return NULL (0) instead of this abort, compile with -s ABORTING_MALLOC=0 ")}function enlargeMemory(){abortOnCannotGrowMemory()}var TOTAL_STACK=Module["TOTAL_STACK"]||5242880;var TOTAL_MEMORY=Module["TOTAL_MEMORY"]||16777216;if(TOTAL_MEMORY<TOTAL_STACK)Module.printErr("TOTAL_MEMORY should be larger than TOTAL_STACK, was "+TOTAL_MEMORY+"! (TOTAL_STACK="+TOTAL_STACK+")");if(Module["buffer"]){buffer=Module["buffer"]}else{{buffer=new ArrayBuffer(TOTAL_MEMORY)}}updateGlobalBufferViews();function getTotalMemory(){return TOTAL_MEMORY}HEAP32[0]=1668509029;HEAP16[1]=25459;if(HEAPU8[2]!==115||HEAPU8[3]!==99)throw"Runtime error: expected the system to be little-endian!";Module["HEAP"]=HEAP;Module["buffer"]=buffer;Module["HEAP8"]=HEAP8;Module["HEAP16"]=HEAP16;Module["HEAP32"]=HEAP32;Module["HEAPU8"]=HEAPU8;Module["HEAPU16"]=HEAPU16;Module["HEAPU32"]=HEAPU32;Module["HEAPF32"]=HEAPF32;Module["HEAPF64"]=HEAPF64;function callRuntimeCallbacks(callbacks){while(callbacks.length>0){var callback=callbacks.shift();if(typeof callback=="function"){callback();continue}var func=callback.func;if(typeof func==="number"){if(callback.arg===undefined){Module["dynCall_v"](func)}else{Module["dynCall_vi"](func,callback.arg)}}else{func(callback.arg===undefined?null:callback.arg)}}}var __ATPRERUN__=[];var __ATINIT__=[];var __ATMAIN__=[];var __ATEXIT__=[];var __ATPOSTRUN__=[];var runtimeInitialized=false;var runtimeExited=false;function preRun(){if(Module["preRun"]){if(typeof Module["preRun"]=="function")Module["preRun"]=[Module["preRun"]];while(Module["preRun"].length){addOnPreRun(Module["preRun"].shift())}}callRuntimeCallbacks(__ATPRERUN__)}function ensureInitRuntime(){if(runtimeInitialized)return;runtimeInitialized=true;callRuntimeCallbacks(__ATINIT__)}function preMain(){callRuntimeCallbacks(__ATMAIN__)}function exitRuntime(){callRuntimeCallbacks(__ATEXIT__);runtimeExited=true}function postRun(){if(Module["postRun"]){if(typeof Module["postRun"]=="function")Module["postRun"]=[Module["postRun"]];while(Module["postRun"].length){addOnPostRun(Module["postRun"].shift())}}callRuntimeCallbacks(__ATPOSTRUN__)}function addOnPreRun(cb){__ATPRERUN__.unshift(cb)}Module["addOnPreRun"]=addOnPreRun;function addOnInit(cb){__ATINIT__.unshift(cb)}Module["addOnInit"]=addOnInit;function addOnPreMain(cb){__ATMAIN__.unshift(cb)}Module["addOnPreMain"]=addOnPreMain;function addOnExit(cb){__ATEXIT__.unshift(cb)}Module["addOnExit"]=addOnExit;function addOnPostRun(cb){__ATPOSTRUN__.unshift(cb)}Module["addOnPostRun"]=addOnPostRun;function intArrayFromString(stringy,dontAddNull,length){var len=length>0?length:lengthBytesUTF8(stringy)+1;var u8array=new Array(len);var numBytesWritten=stringToUTF8Array(stringy,u8array,0,u8array.length);if(dontAddNull)u8array.length=numBytesWritten;return u8array}Module["intArrayFromString"]=intArrayFromString;function intArrayToString(array){var ret=[];for(var i=0;i<array.length;i++){var chr=array[i];if(chr>255){chr&=255}ret.push(String.fromCharCode(chr))}return ret.join("")}Module["intArrayToString"]=intArrayToString;function writeStringToMemory(string,buffer,dontAddNull){Runtime.warnOnce("writeStringToMemory is deprecated and should not be called! Use stringToUTF8() instead!");var lastChar,end;if(dontAddNull){end=buffer+lengthBytesUTF8(string);lastChar=HEAP8[end]}stringToUTF8(string,buffer,Infinity);if(dontAddNull)HEAP8[end]=lastChar}Module["writeStringToMemory"]=writeStringToMemory;function writeArrayToMemory(array,buffer){HEAP8.set(array,buffer)}Module["writeArrayToMemory"]=writeArrayToMemory;function writeAsciiToMemory(str,buffer,dontAddNull){for(var i=0;i<str.length;++i){HEAP8[buffer++>>0]=str.charCodeAt(i)}if(!dontAddNull)HEAP8[buffer>>0]=0}Module["writeAsciiToMemory"]=writeAsciiToMemory;if(!Math["imul"]||Math["imul"](4294967295,5)!==-5)Math["imul"]=function imul(a,b){var ah=a>>>16;var al=a&65535;var bh=b>>>16;var bl=b&65535;return al*bl+(ah*bl+al*bh<<16)|0};Math.imul=Math["imul"];if(!Math["clz32"])Math["clz32"]=(function(x){x=x>>>0;for(var i=0;i<32;i++){if(x&1<<31-i)return i}return 32});Math.clz32=Math["clz32"];if(!Math["trunc"])Math["trunc"]=(function(x){return x<0?Math.ceil(x):Math.floor(x)});Math.trunc=Math["trunc"];var Math_abs=Math.abs;var Math_cos=Math.cos;var Math_sin=Math.sin;var Math_tan=Math.tan;var Math_acos=Math.acos;var Math_asin=Math.asin;var Math_atan=Math.atan;var Math_atan2=Math.atan2;var Math_exp=Math.exp;var Math_log=Math.log;var Math_sqrt=Math.sqrt;var Math_ceil=Math.ceil;var Math_floor=Math.floor;var Math_pow=Math.pow;var Math_imul=Math.imul;var Math_fround=Math.fround;var Math_round=Math.round;var Math_min=Math.min;var Math_clz32=Math.clz32;var Math_trunc=Math.trunc;var runDependencies=0;var runDependencyWatcher=null;var dependenciesFulfilled=null;function addRunDependency(id){runDependencies++;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}}Module["addRunDependency"]=addRunDependency;function removeRunDependency(id){runDependencies--;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}if(runDependencies==0){if(runDependencyWatcher!==null){clearInterval(runDependencyWatcher);runDependencyWatcher=null}if(dependenciesFulfilled){var callback=dependenciesFulfilled;dependenciesFulfilled=null;callback()}}}Module["removeRunDependency"]=removeRunDependency;Module["preloadedImages"]={};Module["preloadedAudios"]={};var ASM_CONSTS=[];STATIC_BASE=Runtime.GLOBAL_BASE;STATICTOP=STATIC_BASE+10560;__ATINIT__.push();allocate([0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,104,18,0,0,108,29,0,0,3,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,112,18,0,0,112,29,0,0,3,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,130,18,0,0,121,29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,148,18,0,0,130,29,0,0,4,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,180,18,0,0,146,29,0,0,6,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,212,18,0,0,162,29,0,0,6,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,28,19,0,0,198,29,0,0,6,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,100,19,0,0,234,29,0,0,8,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,172,19,0,0,14,30,0,0,8,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,44,20,0,0,78,30,0,0,8,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,172,20,0,0,142,30,0,0,16,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,44,21,0,0,206,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,44,23,0,0,206,31,0,0,16,0,0,0,16,0,0,0,1,0,0,0,1,0,0,0,44,25,0,0,206,32,0,0,16,0,0,0,16,0,0,0,2,0,0,0,3,0,0,0,44,25,0,0,206,32,0,0,16,0,0,0,16,0,0,0,3,0,0,0,7,0,0,0,44,25,0,0,206,32,0,0,16,0,0,0,16,0,0,0,4,0,0,0,15,0,0,0,44,25,0,0,206,32,0,0,16,0,0,0,16,0,0,0,6,0,0,0,63,0,0,0,44,25,0,0,206,32,0,0,16,0,0,0,16,0,0,0,8,0,0,0,255,0,0,0,44,25,0,0,206,32,0,0,16,0,0,0,16,0,0,0,10,0,0,0,255,3,0,0,44,25,0,0,206,32,0,0,16,0,0,0,16,0,0,0,13,0,0,0,255,31,0,0,44,25,0,0,206,32,0,0,16,0,0,0,16,0,0,0,4,0,0,0,15,0,0,0,44,27,0,0,206,33,0,0,16,0,0,0,16,0,0,0,5,0,0,0,31,0,0,0,44,27,0,0,206,33,0,0,16,0,0,0,16,0,0,0,6,0,0,0,63,0,0,0,44,27,0,0,206,33,0,0,16,0,0,0,16,0,0,0,7,0,0,0,127,0,0,0,44,27,0,0,206,33,0,0,16,0,0,0,16,0,0,0,8,0,0,0,255,0,0,0,44,27,0,0,206,33,0,0,16,0,0,0,16,0,0,0,9,0,0,0,255,1,0,0,44,27,0,0,206,33,0,0,16,0,0,0,16,0,0,0,11,0,0,0,255,7,0,0,44,27,0,0,206,33,0,0,16,0,0,0,16,0,0,0,13,0,0,0,255,31,0,0,44,27,0,0,206,33,0,0,1,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,44,29,0,0,206,34,0,0,1,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,76,29,0,0,222,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,2,0,0,0,2,0,0,0,2,0,0,0,2,0,0,0,3,0,0,0,2,0,0,0,3,0,0,0,3,0,0,0,4,0,0,0,3,0,0,0,4,0,0,0,3,0,0,0,4,0,0,0,4,0,0,0,5,0,0,0,4,0,0,0,5,0,0,0,4,0,0,0,6,0,0,0,5,0,0,0,6,0,0,0,5,0,0,0,6,0,0,0,5,0,0,0,7,0,0,0,6,0,0,0,7,0,0,0,6,0,0,0,7,0,0,0,0,0,0,0,6,0,0,0,11,0,0,0,16,0,0,0,21,0,0,0,1,0,0,0,255,255,255,255,1,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,2,0,0,0,2,0,0,0,2,0,0,0,3,0,0,0,3,0,0,0,3,0,0,0,4,0,0,0,4,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,2,0,0,0,3,0,0,0,68,172,0,0,128,187,0,0,0,125,0,0,34,86,0,0,192,93,0,0,128,62,0,0,17,43,0,0,224,46,0,0,64,31,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,8,0,0,0,255,255,255,255,8,0,0,0,32,0,0,0,16,0,0,0,255,255,255,255,16,0,0,0,40,0,0,0,24,0,0,0,255,255,255,255,24,0,0,0,48,0,0,0,32,0,0,0,255,255,255,255,32,0,0,0,56,0,0,0,40,0,0,0,255,255,255,255,40,0,0,0,64,0,0,0,48,0,0,0,255,255,255,255,48,0,0,0,80,0,0,0,56,0,0,0,255,255,255,255,56,0,0,0,96,0,0,0,64,0,0,0,255,255,255,255,64,0,0,0,112,0,0,0,255,255,255,255,255,255,255,255,80,0,0,0,128,0,0,0,255,255,255,255,255,255,255,255,96,0,0,0,160,0,0,0,255,255,255,255,255,255,255,255,112,0,0,0,192,0,0,0,255,255,255,255,255,255,255,255,128,0,0,0,224,0,0,0,255,255,255,255,255,255,255,255,144,0,0,0,0,1,0,0,255,255,255,255,255,255,255,255,160,0,0,0,64,1,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,4,0,0,0,8,0,0,0,12,0,0,0,16,0,0,0,20,0,0,0,24,0,0,0,30,0,0,0,36,0,0,0,44,0,0,0,52,0,0,0,62,0,0,0,74,0,0,0,90,0,0,0,110,0,0,0,134,0,0,0,162,0,0,0,196,0,0,0,238,0,0,0,32,1,0,0,86,1,0,0,162,1,0,0,64,2,0,0,0,0,0,0,4,0,0,0,8,0,0,0,12,0,0,0,16,0,0,0,20,0,0,0,24,0,0,0,30,0,0,0,36,0,0,0,42,0,0,0,50,0,0,0,60,0,0,0,72,0,0,0,88,0,0,0,106,0,0,0,128,0,0,0,156,0,0,0,190,0,0,0,230,0,0,0,20,1,0,0,74,1,0,0,128,1,0,0,64,2,0,0,0,0,0,0,4,0,0,0,8,0,0,0,12,0,0,0,16,0,0,0,20,0,0,0,24,0,0,0,30,0,0,0,36,0,0,0,44,0,0,0,54,0,0,0,66,0,0,0,82,0,0,0,102,0,0,0,126,0,0,0,156,0,0,0,194,0,0,0,240,0,0,0,40,1,0,0,108,1,0,0,192,1,0,0,38,2,0,0,64,2,0,0,0,0,0,0,6,0,0,0,12,0,0,0,18,0,0,0,24,0,0,0,30,0,0,0,36,0,0,0,44,0,0,0,54,0,0,0,66,0,0,0,80,0,0,0,96,0,0,0,116,0,0,0,140,0,0,0,168,0,0,0,200,0,0,0,238,0,0,0,28,1,0,0,80,1,0,0,140,1,0,0,208,1,0,0,10,2,0,0,64,2,0,0,0,0,0,0,6,0,0,0,12,0,0,0,18,0,0,0,24,0,0,0,30,0,0,0,36,0,0,0,44,0,0,0,54,0,0,0,66,0,0,0,80,0,0,0,96,0,0,0,114,0,0,0,136,0,0,0,162,0,0,0,194,0,0,0,232,0,0,0,22,1,0,0,74,1,0,0,138,1,0,0,208,1,0,0,28,2,0,0,64,2,0,0,0,0,0,0,6,0,0,0,12,0,0,0,18,0,0,0,24,0,0,0,30,0,0,0,36,0,0,0,44,0,0,0,45,0,0,0,66,0,0,0,80,0,0,0,96,0,0,0,116,0,0,0,140,0,0,0,168,0,0,0,200,0,0,0,238,0,0,0,248,0,0,0,80,1,0,0,140,1,0,0,208,1,0,0,10,2,0,0,64,2,0,0,0,0,0,0,6,0,0,0,12,0,0,0,18,0,0,0,24,0,0,0,30,0,0,0,36,0,0,0,44,0,0,0,54,0,0,0,66,0,0,0,80,0,0,0,96,0,0,0,116,0,0,0,140,0,0,0,168,0,0,0,200,0,0,0,238,0,0,0,28,1,0,0,80,1,0,0,140,1,0,0,208,1,0,0,10,2,0,0,64,2,0,0,0,0,0,0,6,0,0,0,12,0,0,0,18,0,0,0,24,0,0,0,30,0,0,0,36,0,0,0,44,0,0,0,54,0,0,0,66,0,0,0,80,0,0,0,96,0,0,0,116,0,0,0,140,0,0,0,168,0,0,0,200,0,0,0,238,0,0,0,28,1,0,0,80,1,0,0,140,1,0,0,208,1,0,0,10,2,0,0,64,2,0,0,0,0,0,0,12,0,0,0,24,0,0,0,36,0,0,0,48,0,0,0,60,0,0,0,72,0,0,0,88,0,0,0,108,0,0,0,132,0,0,0,160,0,0,0,192,0,0,0,232,0,0,0,24,1,0,0,80,1,0,0,144,1,0,0,220,1,0,0,54,2,0,0,56,2,0,0,58,2,0,0,60,2,0,0,62,2,0,0,64,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,157,247,255,255,157,247,255,255,157,247,255,255,157,247,255,255,157,247,255,255,157,247,255,255,58,239,255,255,58,239,255,255,58,239,255,255,58,239,255,255,214,230,255,255,214,230,255,255,214,230,255,255,115,222,255,255,115,222,255,255,15,214,255,255,15,214,255,255,172,205,255,255,72,197,255,255,229,188,255,255,229,188,255,255,129,180,255,255,30,172,255,255,186,163,255,255,87,155,255,255,144,138,255,255,44,130,255,255,101,113,255,255,2,105,255,255,59,88,255,255,215,79,255,255,16,63,255,255,73,46,255,255,31,21,255,255,88,4,255,255,145,243,254,255,103,218,254,255,60,193,254,255,18,168,254,255,75,151,254,255,32,126,254,255,146,92,254,255,104,67,254,255,61,42,254,255,175,8,254,255,133,239,253,255,91,214,253,255,205,180,253,255,162,155,253,255,20,122,253,255,134,88,253,255,92,63,253,255,49,38,253,255,163,4,253,255,221,243,252,255,178,218,252,255,136,193,252,255,163,87,3,0,106,104,3,0,49,121,3,0,148,129,3,0,248,137,3,0,91,146,3,0,91,146,3,0,248,137,3,0,148,129,3,0,205,112,3,0,6,96,3,0,120,62,3,0,234,28,3,0,249,242,2,0,164,192,2,0,79,142,2,0,51,75,2,0,180,255,1,0,209,171,1,0,139,79,1,0,126,226,0,0,112,117,0,0,157,247,255,255,101,113,255,255,202,226,254,255,104,67,254,255,162,155,253,255,121,235,252,255,236,50,252,255,153,105,251,255,226,151,250,255,199,189,249,255,230,210,248,255,4,232,247,255,92,236,246,255,80,232,245,255,68,228,244,255,212,215,243,255,1,195,242,255,203,165,241,255,49,128,240,255,250,98,239,255,96,61,238,255,198,23,237,255,45,242,235,255,147,204,234,255,92,175,233,255,137,154,232,255,182,133,231,255,71,121,230,255,59,117,229,255,246,129,228,255,120,159,227,255,93,197,226,255,109,4,226,255,68,84,225,255,69,189,224,255,113,63,224,255,199,218,223,255,171,151,223,255,186,109,223,255,86,101,223,255,129,126,223,255,157,193,223,255,86,209,31,0,187,66,31,0,203,129,30,0,233,150,29,0,179,121,28,0,39,42,27,0,171,176,25,0,118,252,23,0,235,21,22,0,13,253,19,0,117,169,17,0,236,43,15,0,72,107,12,0,235,111,9,0,156,74,6,0,50,226,2,0,215,79,255,255,195,130,251,255,247,122,247,255,57,73,243,255,38,229,238,255,190,78,234,255,101,142,229,255,27,164,224,255,66,152,219,255,120,98,214,255,132,19,209,255,2,163,203,255,85,25,198,255,69,135,192,255,10,220,186,255,207,48,181,255,49,125,175,255,147,201,169,255,188,38,164,255,72,140,158,255,255,10,153,255,224,162,147,255,179,100,142,255,19,72,137,255,44,102,132,255,254,190,127,255,135,82,123,255,144,49,119,255,124,100,115,255,174,243,111,255,39,223,108,255,16,64,106,255,163,5,104,255,11,73,102,255,170,18,101,255,129,98,100,255,86,73,100,255,42,199,100,255,97,228,101,255,93,169,103,255,130,30,106,255,52,76,109,255,115,50,113,255,5,226,117,255,135,82,123,255,93,140,129,255,78,160,136,255,245,133,144,255,73,186,102,0,9,24,93,0,17,164,82,0,56,69,71,0,226,3,59,0,13,224,45,0,86,209,31,0,133,232,16,0,210,20,1,0,6,103,240,255,187,214,222,255,85,108,204,255,213,39,185,255,1,26,165,255,118,58,144,255,151,145,122,255,200,39,100,255,109,5,77,255,232,50,53,255,58,176,28,255,142,150,3,255,227,229,233,254,156,166,207,254,130,233,180,254,90,191,153,254,37,40,126,254,169,52,98,254,18,254,69,254,251,123,41,254,243,207,12,254,92,2,240,253,255,35,211,253,63,61,182,253,226,94,153,253,19,162,124,253,209,6,96,253,172,174,67,253,163,153,39,253,67,233,11,253,141,157,240,252,171,207,213,252,1,136,187,252,86,215,161,252,212,214,136,252,223,142,112,252,218,7,89,252,239,90,66,252,130,144,44,252,247,176,23,252,120,213,3,252,105,6,241,251,44,76,223,251,38,175,206,251,29,64,191,251,117,7,177,251,145,13,164,251,214,90,152,251,165,247,141,251,0,228,132,251,174,48,125,251,173,221,118,251,255,234,113,251,7,97,110,251,197,63,108,251,200,120,148,4,59,192,147,4,249,158,145,4,1,21,142,4,83,34,137,4,82,207,130,4,0,28,123,4,91,8,114,4,42,165,103,4,111,242,91,4,139,248,78,4,227,191,64,4,218,80,49,4,212,179,32,4,151,249,14,4,136,42,252,3,9,79,232,3,126,111,211,3,17,165,189,3,38,248,166,3,33,113,143,3,44,41,119,3,170,40,94,3,255,119,68,3,85,48,42,3,115,98,15,3,189,22,244,2,93,102,216,2,84,81,188,2,47,249,159,2,237,93,131,2,30,161,102,2,193,194,73,2,1,220,44,2,164,253,15,2,13,48,243,1,5,132,214,1,238,1,186,1,87,203,157,1,219,215,129,1,166,64,102,1,126,22,75,1,100,89,48,1,29,26,22,1,114,105,252,0,198,79,227,0,24,205,202,0,147,250,178,0,56,216,155,0,105,110,133,0,138,197,111,0,255,229,90,0,43,216,70,0,171,147,51,0,69,41,33,0,250,152,15,0,46,235,254,255,123,23,239,255,170,46,224,255,243,31,210,255,30,252,196,255,200,186,184,255,239,91,173,255,247,231,162,255,73,186,102,0,11,122,111,0,178,95,119,0,163,115,126,0,121,173,132,0,251,29,138,0,141,205,142,0,204,179,146,0,126,225,149,0,163,86,152,0,159,27,154,0,214,56,155,0,170,182,155,0,127,157,155,0,86,237,154,0,245,182,153,0,93,250,151,0,240,191,149,0,217,32,147,0,82,12,144,0,132,155,140,0,112,206,136,0,121,173,132,0,2,65,128,0,212,153,123,0,237,183,118,0,77,155,113,0,32,93,108,0,1,245,102,0,184,115,97,0,68,217,91,0,109,54,86,0,207,130,80,0,49,207,74,0,246,35,69,0,187,120,63,0,171,230,57,0,254,92,52,0,124,236,46,0,136,157,41,0,190,103,36,0,229,91,31,0,155,113,26,0,66,177,21,0,218,26,17,0,199,182,12,0,9,133,8,0,61,125,4,0,41,176,0,0,206,29,253,255,100,181,249,255,21,144,246,255,184,148,243,255,20,212,240,255,139,86,238,255,243,2,236,255,21,234,233,255,138,3,232,255,85,79,230,255,217,213,228,255,77,134,227,255,23,105,226,255,53,126,225,255,69,189,224,255,86,209,31,0,99,62,32,0,127,129,32,0,170,154,32,0,70,146,32,0,85,104,32,0,57,37,32,0,143,192,31,0,187,66,31,0,188,171,30,0,147,251,29,0,163,58,29,0,136,96,28,0,10,126,27,0,197,138,26,0,185,134,25,0,74,122,24,0,119,101,23,0,164,80,22,0,109,51,21,0,211,13,20,0,58,232,18,0,160,194,17,0,6,157,16,0,207,127,15,0,53,90,14,0,255,60,13,0,44,40,12,0,188,27,11,0,176,23,10,0,164,19,9,0,252,23,8,0,26,45,7,0,57,66,6,0,30,104,5,0,103,150,4,0,20,205,3,0,135,20,3,0,94,100,2,0,152,188,1,0,54,29,1,0,155,142,0,0,99,8,0,0,144,138,255,255,130,29,255,255,117,176,254,255,47,84,254,255,76,0,254,255,205,180,253,255,177,113,253,255,92,63,253,255,7,13,253,255,22,227,252,255,136,193,252,255,250,159,252,255,51,143,252,255,108,126,252,255,8,118,252,255,165,109,252,255,165,109,252,255,8,118,252,255,108,126,252,255,207,134,252,255,150,151,252,255,163,87,3,0,120,62,3,0,78,37,3,0,35,12,3,0,93,251,2,0,207,217,2,0,164,192,2,0,122,167,2,0,236,133,2,0,94,100,2,0,51,75,2,0,165,41,2,0,123,16,2,0,81,247,1,0,195,213,1,0,152,188,1,0,110,163,1,0,224,129,1,0,181,104,1,0,238,87,1,0,196,62,1,0,153,37,1,0,111,12,1,0,168,251,0,0,225,234,0,0,183,209,0,0,240,192,0,0,41,176,0,0,197,167,0,0,254,150,0,0,155,142,0,0,212,125,0,0,112,117,0,0,169,100,0,0,70,92,0,0,226,83,0,0,127,75,0,0,27,67,0,0,27,67,0,0,184,58,0,0,84,50,0,0,241,41,0,0,241,41,0,0,141,33,0,0,141,33,0,0,42,25,0,0,42,25,0,0,42,25,0,0,198,16,0,0,198,16,0,0,198,16,0,0,198,16,0,0,99,8,0,0,99,8,0,0,99,8,0,0,99,8,0,0,99,8,0,0,99,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,52,37,0,0,0,4,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,232,17,0,0,1,0,1,0,1,0,0,0,1,0,2,0,1,0,3,0,1,0,1,0,3,0,2,0,0,0,3,0,2,0,1,0,1,0,1,0,1,0,3,0,2,0,0,0,1,0,2,0,6,0,5,0,3,0,1,0,4,0,4,0,7,0,5,0,7,0,1,0,6,0,1,0,1,0,0,0,7,0,3,0,5,0,1,0,6,0,2,0,3,0,2,0,5,0,4,0,4,0,1,0,3,0,3,0,2,0,0,0,1,0,2,0,10,0,19,0,16,0,10,0,3,0,3,0,7,0,10,0,5,0,3,0,11,0,4,0,13,0,17,0,8,0,4,0,12,0,11,0,18,0,15,0,11,0,2,0,7,0,6,0,9,0,14,0,3,0,1,0,6,0,4,0,5,0,3,0,2,0,0,0,3,0,4,0,6,0,18,0,12,0,5,0,5,0,1,0,2,0,16,0,9,0,3,0,7,0,3,0,5,0,14,0,7,0,3,0,19,0,17,0,15,0,13,0,10,0,4,0,13,0,5,0,8,0,11,0,5,0,1,0,12,0,4,0,4,0,1,0,1,0,0,0,7,0,5,0,9,0,14,0,15,0,7,0,6,0,4,0,5,0,5,0,6,0,7,0,7,0,6,0,8,0,8,0,8,0,5,0,15,0,6,0,9,0,10,0,5,0,1,0,11,0,7,0,9,0,6,0,4,0,1,0,14,0,4,0,6,0,2,0,6,0,0,0,1,0,2,0,10,0,23,0,35,0,30,0,12,0,17,0,3,0,3,0,8,0,12,0,18,0,21,0,12,0,7,0,11,0,9,0,15,0,21,0,32,0,40,0,19,0,6,0,14,0,13,0,22,0,34,0,46,0,23,0,18,0,7,0,20,0,19,0,33,0,47,0,27,0,22,0,9,0,3,0,31,0,22,0,41,0,26,0,21,0,20,0,5,0,3,0,14,0,13,0,10,0,11,0,16,0,6,0,5,0,1,0,9,0,8,0,7,0,8,0,4,0,4,0,2,0,0,0,3,0,4,0,10,0,24,0,34,0,33,0,21,0,15,0,5,0,3,0,4,0,10,0,32,0,17,0,11,0,10,0,11,0,7,0,13,0,18,0,30,0,31,0,20,0,5,0,25,0,11,0,19,0,59,0,27,0,18,0,12,0,5,0,35,0,33,0,31,0,58,0,30,0,16,0,7,0,5,0,28,0,26,0,32,0,19,0,17,0,15,0,8,0,14,0,14,0,12,0,9,0,13,0,14,0,9,0,4,0,1,0,11,0,4,0,6,0,6,0,6,0,3,0,2,0,0,0,9,0,6,0,16,0,33,0,41,0,39,0,38,0,26,0,7,0,5,0,6,0,9,0,23,0,16,0,26,0,11,0,17,0,7,0,11,0,14,0,21,0,30,0,10,0,7,0,17,0,10,0,15,0,12,0,18,0,28,0,14,0,5,0,32,0,13,0,22,0,19,0,18,0,16,0,9,0,5,0,40,0,17,0,31,0,29,0,17,0,13,0,4,0,2,0,27,0,12,0,11,0,15,0,10,0,7,0,4,0,1,0,27,0,12,0,8,0,12,0,6,0,3,0,1,0,0,0,1,0,5,0,14,0,21,0,34,0,51,0,46,0,71,0,42,0,52,0,68,0,52,0,67,0,44,0,43,0,19,0,3,0,4,0,12,0,19,0,31,0,26,0,44,0,33,0,31,0,24,0,32,0,24,0,31,0,35,0,22,0,14,0,15,0,13,0,23,0,36,0,59,0,49,0,77,0,65,0,29,0,40,0,30,0,40,0,27,0,33,0,42,0,16,0,22,0,20,0,37,0,61,0,56,0,79,0,73,0,64,0,43,0,76,0,56,0,37,0,26,0,31,0,25,0,14,0,35,0,16,0,60,0,57,0,97,0,75,0,114,0,91,0,54,0,73,0,55,0,41,0,48,0,53,0,23,0,24,0,58,0,27,0,50,0,96,0,76,0,70,0,93,0,84,0,77,0,58,0,79,0,29,0,74,0,49,0,41,0,17,0,47,0,45,0,78,0,74,0,115,0,94,0,90,0,79,0,69,0,83,0,71,0,50,0,59,0,38,0,36,0,15,0,72,0,34,0,56,0,95,0,92,0,85,0,91,0,90,0,86,0,73,0,77,0,65,0,51,0,44,0,43,0,42,0,43,0,20,0,30,0,44,0,55,0,78,0,72,0,87,0,78,0,61,0,46,0,54,0,37,0,30,0,20,0,16,0,53,0,25,0,41,0,37,0,44,0,59,0,54,0,81,0,66,0,76,0,57,0,54,0,37,0,18,0,39,0,11,0,35,0,33,0,31,0,57,0,42,0,82,0,72,0,80,0,47,0,58,0,55,0,21,0,22,0,26,0,38,0,22,0,53,0,25,0,23,0,38,0,70,0,60,0,51,0,36,0,55,0,26,0,34,0,23,0,27,0,14,0,9,0,7,0,34,0,32,0,28,0,39,0,49,0,75,0,30,0,52,0,48,0,40,0,52,0,28,0,18,0,17,0,9,0,5,0,45,0,21,0,34,0,64,0,56,0,50,0,49,0,45,0,31,0,19,0,12,0,15,0,10,0,7,0,6,0,3,0,48,0,23,0,20,0,39,0,36,0,35,0,53,0,21,0,16,0,23,0,13,0,10,0,6,0,1,0,4,0,2,0,16,0,15,0,17,0,27,0,25,0,20,0,29,0,11,0,17,0,12,0,16,0,8,0,1,0,1,0,0,0,1,0,7,0,12,0,18,0,53,0,47,0,76,0,124,0,108,0,89,0,123,0,108,0,119,0,107,0,81,0,122,0,63,0,13,0,5,0,16,0,27,0,46,0,36,0,61,0,51,0,42,0,70,0,52,0,83,0,65,0,41,0,59,0,36,0,19,0,17,0,15,0,24,0,41,0,34,0,59,0,48,0,40,0,64,0,50,0,78,0,62,0,80,0,56,0,33,0,29,0,28,0,25,0,43,0,39,0,63,0,55,0,93,0,76,0,59,0,93,0,72,0,54,0,75,0,50,0,29,0,52,0,22,0,42,0,40,0,67,0,57,0,95,0,79,0,72,0,57,0,89,0,69,0,49,0,66,0,46,0,27,0,77,0,37,0,35,0,66,0,58,0,52,0,91,0,74,0,62,0,48,0,79,0,63,0,90,0,62,0,40,0,38,0,125,0,32,0,60,0,56,0,50,0,92,0,78,0,65,0,55,0,87,0,71,0,51,0,73,0,51,0,70,0,30,0,109,0,53,0,49,0,94,0,88,0,75,0,66,0,122,0,91,0,73,0,56,0,42,0,64,0,44,0,21,0,25,0,90,0,43,0,41,0,77,0,73,0,63,0,56,0,92,0,77,0,66,0,47,0,67,0,48,0,53,0,36,0,20,0,71,0,34,0,67,0,60,0,58,0,49,0,88,0,76,0,67,0,106,0,71,0,54,0,38,0,39,0,23,0,15,0,109,0,53,0,51,0,47,0,90,0,82,0,58,0,57,0,48,0,72,0,57,0,41,0,23,0,27,0,62,0,9,0,86,0,42,0,40,0,37,0,70,0,64,0,52,0,43,0,70,0,55,0,42,0,25,0,29,0,18,0,11,0,11,0,118,0,68,0,30,0,55,0,50,0,46,0,74,0,65,0,49,0,39,0,24,0,16,0,22,0,13,0,14,0,7,0,91,0,44,0,39,0,38,0,34,0,63,0,52,0,45,0,31,0,52,0,28,0,19,0,14,0,8,0,9,0,3,0,123,0,60,0,58,0,53,0,47,0,43,0,32,0,22,0,37,0,24,0,17,0,12,0,15,0,10,0,2,0,1,0,71,0,37,0,34,0,30,0,28,0,20,0,17,0,26,0,21,0,16,0,10,0,6,0,8,0,6,0,2,0,0,0,1,0,5,0,14,0,44,0,74,0,63,0,110,0,93,0,172,0,149,0,138,0,242,0,225,0,195,0,120,1,17,0,3,0,4,0,12,0,20,0,35,0,62,0,53,0,47,0,83,0,75,0,68,0,119,0,201,0,107,0,207,0,9,0,15,0,13,0,23,0,38,0,67,0,58,0,103,0,90,0,161,0,72,0,127,0,117,0,110,0,209,0,206,0,16,0,45,0,21,0,39,0,69,0,64,0,114,0,99,0,87,0,158,0,140,0,252,0,212,0,199,0,131,1,109,1,26,0,75,0,36,0,68,0,65,0,115,0,101,0,179,0,164,0,155,0,8,1,246,0,226,0,139,1,126,1,106,1,9,0,66,0,30,0,59,0,56,0,102,0,185,0,173,0,9,1,142,0,253,0,232,0,144,1,132,1,122,1,189,1,16,0,111,0,54,0,52,0,100,0,184,0,178,0,160,0,133,0,1,1,244,0,228,0,217,0,129,1,110,1,203,2,10,0,98,0,48,0,91,0,88,0,165,0,157,0,148,0,5,1,248,0,151,1,141,1,116,1,124,1,121,3,116,3,8,0,85,0,84,0,81,0,159,0,156,0,143,0,4,1,249,0,171,1,145,1,136,1,127,1,215,2,201,2,196,2,7,0,154,0,76,0,73,0,141,0,131,0,0,1,245,0,170,1,150,1,138,1,128,1,223,2,103,1,198,2,96,1,11,0,139,0,129,0,67,0,125,0,247,0,233,0,229,0,219,0,137,1,231,2,225,2,208,2,117,3,114,3,183,1,4,0,243,0,120,0,118,0,115,0,227,0,223,0,140,1,234,2,230,2,224,2,209,2,200,2,194,2,223,0,180,1,6,0,202,0,224,0,222,0,218,0,216,0,133,1,130,1,125,1,108,1,120,3,187,1,195,2,184,1,181,1,192,6,4,0,235,2,211,0,210,0,208,0,114,1,123,1,222,2,211,2,202,2,199,6,115,3,109,3,108,3,131,13,97,3,2,0,121,1,113,1,102,0,187,0,214,2,210,2,102,1,199,2,197,2,98,3,198,6,103,3,130,13,102,3,178,1,0,0,12,0,10,0,7,0,11,0,10,0,17,0,11,0,9,0,13,0,12,0,10,0,7,0,5,0,3,0,1,0,3,0,15,0,13,0,46,0,80,0,146,0,6,1,248,0,178,1,170,1,157,2,141,2,137,2,109,2,5,2,8,4,88,0,14,0,12,0,21,0,38,0,71,0,130,0,122,0,216,0,209,0,198,0,71,1,89,1,63,1,41,1,23,1,42,0,47,0,22,0,41,0,74,0,68,0,128,0,120,0,221,0,207,0,194,0,182,0,84,1,59,1,39,1,29,2,18,0,81,0,39,0,75,0,70,0,134,0,125,0,116,0,220,0,204,0,190,0,178,0,69,1,55,1,37,1,15,1,16,0,147,0,72,0,69,0,135,0,127,0,118,0,112,0,210,0,200,0,188,0,96,1,67,1,50,1,29,1,28,2,14,0,7,1,66,0,129,0,126,0,119,0,114,0,214,0,202,0,192,0,180,0,85,1,61,1,45,1,25,1,6,1,12,0,249,0,123,0,121,0,117,0,113,0,215,0,206,0,195,0,185,0,91,1,74,1,52,1,35,1,16,1,8,2,10,0,179,1,115,0,111,0,109,0,211,0,203,0,196,0,187,0,97,1,76,1,57,1,42,1,27,1,19,2,125,1,17,0,171,1,212,0,208,0,205,0,201,0,193,0,186,0,177,0,169,0,64,1,47,1,30,1,12,1,2,2,121,1,16,0,79,1,199,0,197,0,191,0,189,0,181,0,174,0,77,1,65,1,49,1,33,1,19,1,9,2,123,1,115,1,11,0,156,2,184,0,183,0,179,0,175,0,88,1,75,1,58,1,48,1,34,1,21,1,18,2,127,1,117,1,110,1,10,0,140,2,90,1,171,0,168,0,164,0,62,1,53,1,43,1,31,1,20,1,7,1,1,2,119,1,112,1,106,1,6,0,136,2,66,1,60,1,56,1,51,1,46,1,36,1,28,1,13,1,5,1,0,2,120,1,114,1,108,1,103,1,4,0,108,2,44,1,40,1,38,1,32,1,26,1,17,1,10,1,3,2,124,1,118,1,113,1,109,1,105,1,101,1,2,0,9,4,24,1,22,1,18,1,11,1,8,1,3,1,126,1,122,1,116,1,111,1,107,1,104,1,102,1,100,1,0,0,43,0,20,0,19,0,17,0,15,0,13,0,11,0,9,0,7,0,6,0,4,0,7,0,5,0,3,0,1,0,3,0,1,0,5,0,4,0,5,0,6,0,5,0,4,0,4,0,7,0,3,0,6,0,0,0,7,0,2,0,3,0,1,0,15,0,14,0,13,0,12,0,11,0,10,0,9,0,8,0,7,0,6,0,5,0,4,0,3,0,2,0,1,0,0,0,1,3,2,3,1,3,6,3,3,5,5,5,6,2,2,6,3,2,5,5,5,6,1,3,6,7,3,3,6,7,6,6,7,8,7,6,7,8,3,3,5,7,3,2,4,5,4,4,5,6,6,5,6,7,1,3,6,8,8,9,3,4,6,7,7,8,6,5,7,8,8,9,7,7,8,9,9,9,7,7,8,9,9,10,8,8,9,10,10,10,2,3,6,8,8,9,3,2,4,8,8,8,6,4,6,8,8,9,8,8,8,9,9,10,8,7,8,9,10,10,9,8,9,9,11,11,3,3,5,6,8,9,3,3,4,5,6,8,4,4,5,6,7,8,6,5,6,7,7,8,7,6,7,7,8,9,8,7,8,8,9,9,1,3,6,8,9,9,9,10,3,4,6,7,8,9,8,8,6,6,7,8,9,10,9,9,7,7,8,9,10,10,9,10,8,8,9,10,10,10,10,10,9,9,10,10,11,11,10,11,8,8,9,10,10,10,11,11,9,8,9,10,10,11,11,11,2,3,5,7,8,9,8,9,3,3,4,6,8,8,7,8,5,5,6,7,8,9,8,8,7,6,7,9,8,10,8,9,8,8,8,9,9,10,9,10,8,8,9,10,10,11,10,11,8,7,7,8,9,10,10,10,8,7,8,9,10,10,10,10,4,3,5,7,8,9,9,9,3,3,4,5,7,7,8,8,5,4,5,6,7,8,7,8,6,5,6,6,7,8,8,8,7,6,7,7,8,8,8,9,8,7,8,8,8,9,8,9,8,7,7,8,8,9,9,10,9,8,8,9,9,9,9,10,1,4,6,7,8,9,9,10,9,10,11,11,12,12,13,13,3,4,6,7,8,8,9,9,9,9,10,10,11,12,12,12,6,6,7,8,9,9,10,10,9,10,10,11,11,12,13,13,7,7,8,9,9,10,10,10,10,11,11,11,11,12,13,13,8,7,9,9,10,10,11,11,10,11,11,12,12,13,13,14,9,8,9,10,10,10,11,11,11,11,12,11,13,13,14,14,9,9,10,10,11,11,11,11,11,12,12,12,13,13,14,14,10,9,10,11,11,11,12,12,12,12,13,13,13,14,16,16,9,8,9,10,10,11,11,12,12,12,12,13,13,14,15,15,10,9,10,10,11,11,11,13,12,13,13,14,14,14,16,15,10,10,10,11,11,12,12,13,12,13,14,13,14,15,16,17,11,10,10,11,12,12,12,12,13,13,13,14,15,15,15,16,11,11,11,12,12,13,12,13,14,14,15,15,15,16,16,16,12,11,12,13,13,13,14,14,14,14,14,15,16,15,16,16,13,12,12,13,13,13,15,14,14,17,15,15,15,17,16,16,12,12,13,14,14,14,15,14,15,15,16,16,19,18,19,16,3,4,5,7,7,8,9,9,9,10,10,11,11,11,12,13,4,3,5,6,7,7,8,8,8,9,9,10,10,10,11,11,5,5,5,6,7,7,8,8,8,9,9,10,10,11,11,11,6,6,6,7,7,8,8,9,9,9,10,10,10,11,11,11,7,6,7,7,8,8,9,9,9,9,10,10,10,11,11,11,8,7,7,8,8,8,9,9,9,9,10,10,11,11,11,12,9,7,8,8,8,9,9,9,9,10,10,10,11,11,12,12,9,8,8,9,9,9,9,10,10,10,10,10,11,11,11,12,9,8,8,9,9,9,9,10,10,10,10,11,11,12,12,12,9,8,9,9,9,9,10,10,10,11,11,11,11,12,12,12,10,9,9,9,10,10,10,10,10,11,11,11,11,12,13,12,10,9,9,9,10,10,10,10,11,11,11,11,12,12,12,13,11,10,9,10,10,10,11,11,11,11,11,11,12,12,13,13,11,10,10,10,10,11,11,11,11,12,12,12,12,12,13,13,12,11,11,11,11,11,11,11,12,12,12,12,13,13,12,13,12,11,11,11,11,11,11,12,12,12,12,12,13,13,13,13,1,4,6,8,9,9,10,10,11,11,11,12,12,12,13,9,3,4,6,7,8,9,9,9,10,10,10,11,12,11,12,8,6,6,7,8,9,9,10,10,11,10,11,11,11,12,12,9,8,7,8,9,9,10,10,10,11,11,12,12,12,13,13,10,9,8,9,9,10,10,11,11,11,12,12,12,13,13,13,9,9,8,9,9,10,11,11,12,11,12,12,13,13,13,14,10,10,9,9,10,11,11,11,11,12,12,12,12,13,13,14,10,10,9,10,10,11,11,11,12,12,13,13,13,13,15,15,10,10,10,10,11,11,11,12,12,13,13,13,13,14,14,14,10,11,10,10,11,11,12,12,13,13,13,13,14,13,14,13,11,11,11,10,11,12,12,12,12,13,14,14,14,15,15,14,10,12,11,11,11,12,12,13,14,14,14,14,14,14,13,14,11,12,12,12,12,12,13,13,13,13,15,14,14,14,14,16,11,14,12,12,12,13,13,14,14,14,16,15,15,15,17,15,11,13,13,11,12,14,14,13,14,14,15,16,15,17,15,14,11,9,8,8,9,9,10,10,10,11,11,11,11,11,11,11,8,4,4,6,7,8,9,9,10,10,11,11,11,11,11,12,9,4,4,5,6,7,8,8,9,9,9,10,10,10,10,10,8,6,5,6,7,7,8,8,9,9,9,9,10,10,10,11,7,7,6,7,7,8,8,8,9,9,9,9,10,10,10,10,7,8,7,7,8,8,8,8,9,9,9,10,10,10,10,11,7,9,7,8,8,8,8,9,9,9,9,10,10,10,10,10,7,9,8,8,8,8,9,9,9,9,10,10,10,10,10,11,7,10,8,8,8,9,9,9,9,10,10,10,10,10,11,11,8,10,9,9,9,9,9,9,9,9,10,10,10,10,11,11,8,10,9,9,9,9,9,9,10,10,10,10,10,11,11,11,8,11,9,9,9,9,10,10,10,10,10,10,11,11,11,11,8,11,10,9,9,9,10,10,10,10,10,10,11,11,11,11,8,11,10,10,10,10,10,10,10,10,10,11,11,11,11,11,8,11,10,10,10,10,10,10,10,11,11,11,11,11,11,11,8,12,10,10,10,10,10,10,11,11,11,11,11,11,11,11,8,8,7,7,7,7,7,7,7,7,7,7,8,8,8,8,4,1,4,4,5,4,6,5,6,4,5,5,6,5,6,6,6,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4],"i8",ALLOC_NONE,Runtime.GLOBAL_BASE);var tempDoublePtr=STATICTOP;STATICTOP+=16;Module["_i64Add"]=_i64Add;function _llvm_exp2_f32(x){return Math.pow(2,x)}function _llvm_exp2_f64(){return _llvm_exp2_f32.apply(null,arguments)}Module["_memset"]=_memset;Module["_bitshift64Lshr"]=_bitshift64Lshr;function _abort(){Module["abort"]()}function ___lock(){}function ___unlock(){}var SYSCALLS={varargs:0,get:(function(varargs){SYSCALLS.varargs+=4;var ret=HEAP32[SYSCALLS.varargs-4>>2];return ret}),getStr:(function(){var ret=Pointer_stringify(SYSCALLS.get());return ret}),get64:(function(){var low=SYSCALLS.get(),high=SYSCALLS.get();if(low>=0)assert(high===0);else assert(high===-1);return low}),getZero:(function(){assert(SYSCALLS.get()===0)})};function ___syscall6(which,varargs){SYSCALLS.varargs=varargs;try{var stream=SYSCALLS.getStreamFromFD();FS.close(stream);return 0}catch(e){if(typeof FS==="undefined"||!(e instanceof FS.ErrnoError))abort(e);return-e.errno}}Module["___muldsi3"]=___muldsi3;Module["___muldi3"]=___muldi3;function ___setErrNo(value){if(Module["___errno_location"])HEAP32[Module["___errno_location"]()>>2]=value;return value}Module["_sbrk"]=_sbrk;function _emscripten_memcpy_big(dest,src,num){HEAPU8.set(HEAPU8.subarray(src,src+num),dest);return dest}Module["_memcpy"]=_memcpy;Module["_llvm_bswap_i32"]=_llvm_bswap_i32;function ___syscall140(which,varargs){SYSCALLS.varargs=varargs;try{var stream=SYSCALLS.getStreamFromFD(),offset_high=SYSCALLS.get(),offset_low=SYSCALLS.get(),result=SYSCALLS.get(),whence=SYSCALLS.get();var offset=offset_low;FS.llseek(stream,offset,whence);HEAP32[result>>2]=stream.position;if(stream.getdents&&offset===0&&whence===0)stream.getdents=null;return 0}catch(e){if(typeof FS==="undefined"||!(e instanceof FS.ErrnoError))abort(e);return-e.errno}}function ___syscall146(which,varargs){SYSCALLS.varargs=varargs;try{var stream=SYSCALLS.get(),iov=SYSCALLS.get(),iovcnt=SYSCALLS.get();var ret=0;if(!___syscall146.buffer){___syscall146.buffers=[null,[],[]];___syscall146.printChar=(function(stream,curr){var buffer=___syscall146.buffers[stream];assert(buffer);if(curr===0||curr===10){(stream===1?Module["print"]:Module["printErr"])(UTF8ArrayToString(buffer,0));buffer.length=0}else{buffer.push(curr)}})}for(var i=0;i<iovcnt;i++){var ptr=HEAP32[iov+i*8>>2];var len=HEAP32[iov+(i*8+4)>>2];for(var j=0;j<len;j++){___syscall146.printChar(stream,HEAPU8[ptr+j])}ret+=len}return ret}catch(e){if(typeof FS==="undefined"||!(e instanceof FS.ErrnoError))abort(e);return-e.errno}}function ___syscall54(which,varargs){SYSCALLS.varargs=varargs;try{return 0}catch(e){if(typeof FS==="undefined"||!(e instanceof FS.ErrnoError))abort(e);return-e.errno}}__ATEXIT__.push((function(){var fflush=Module["_fflush"];if(fflush)fflush(0);var printChar=___syscall146.printChar;if(!printChar)return;var buffers=___syscall146.buffers;if(buffers[1].length)printChar(1,10);if(buffers[2].length)printChar(2,10)}));DYNAMICTOP_PTR=allocate(1,"i32",ALLOC_STATIC);STACK_BASE=STACKTOP=Runtime.alignMemory(STATICTOP);STACK_MAX=STACK_BASE+TOTAL_STACK;DYNAMIC_BASE=Runtime.alignMemory(STACK_MAX);HEAP32[DYNAMICTOP_PTR>>2]=DYNAMIC_BASE;staticSealed=true;function invoke_ii(index,a1){try{return Module["dynCall_ii"](index,a1)}catch(e){if(typeof e!=="number"&&e!=="longjmp")throw e;Module["setThrew"](1,0)}}function invoke_iiii(index,a1,a2,a3){try{return Module["dynCall_iiii"](index,a1,a2,a3)}catch(e){if(typeof e!=="number"&&e!=="longjmp")throw e;Module["setThrew"](1,0)}}Module.asmGlobalArg={"Math":Math,"Int8Array":Int8Array,"Int16Array":Int16Array,"Int32Array":Int32Array,"Uint8Array":Uint8Array,"Uint16Array":Uint16Array,"Uint32Array":Uint32Array,"Float32Array":Float32Array,"Float64Array":Float64Array,"NaN":NaN,"Infinity":Infinity};Module.asmLibraryArg={"abort":abort,"assert":assert,"enlargeMemory":enlargeMemory,"getTotalMemory":getTotalMemory,"abortOnCannotGrowMemory":abortOnCannotGrowMemory,"invoke_ii":invoke_ii,"invoke_iiii":invoke_iiii,"_llvm_exp2_f64":_llvm_exp2_f64,"___lock":___lock,"_llvm_exp2_f32":_llvm_exp2_f32,"_abort":_abort,"___setErrNo":___setErrNo,"___syscall6":___syscall6,"___syscall140":___syscall140,"_emscripten_memcpy_big":_emscripten_memcpy_big,"___syscall54":___syscall54,"___unlock":___unlock,"___syscall146":___syscall146,"DYNAMICTOP_PTR":DYNAMICTOP_PTR,"tempDoublePtr":tempDoublePtr,"ABORT":ABORT,"STACKTOP":STACKTOP,"STACK_MAX":STACK_MAX};// EMSCRIPTEN_START_ASM --var asm=(function(global,env,buffer) { --"use asm";var a=new global.Int8Array(buffer);var b=new global.Int16Array(buffer);var c=new global.Int32Array(buffer);var d=new global.Uint8Array(buffer);var e=new global.Uint16Array(buffer);var f=new global.Uint32Array(buffer);var g=new global.Float32Array(buffer);var h=new global.Float64Array(buffer);var i=env.DYNAMICTOP_PTR|0;var j=env.tempDoublePtr|0;var k=env.ABORT|0;var l=env.STACKTOP|0;var m=env.STACK_MAX|0;var n=0;var o=0;var p=0;var q=0;var r=global.NaN,s=global.Infinity;var t=0,u=0,v=0,w=0,x=0.0;var y=0;var z=global.Math.floor;var A=global.Math.abs;var B=global.Math.sqrt;var C=global.Math.pow;var D=global.Math.cos;var E=global.Math.sin;var F=global.Math.tan;var G=global.Math.acos;var H=global.Math.asin;var I=global.Math.atan;var J=global.Math.atan2;var K=global.Math.exp;var L=global.Math.log;var M=global.Math.ceil;var N=global.Math.imul;var O=global.Math.min;var P=global.Math.max;var Q=global.Math.clz32;var R=env.abort;var S=env.assert;var T=env.enlargeMemory;var U=env.getTotalMemory;var V=env.abortOnCannotGrowMemory;var W=env.invoke_ii;var X=env.invoke_iiii;var Y=env._llvm_exp2_f64;var Z=env.___lock;var _=env._llvm_exp2_f32;var $=env._abort;var aa=env.___setErrNo;var ba=env.___syscall6;var ca=env.___syscall140;var da=env._emscripten_memcpy_big;var ea=env.___syscall54;var fa=env.___unlock;var ga=env.___syscall146;var ha=0.0; --// EMSCRIPTEN_START_FUNCS --function ka(a){a=a|0;var b=0;b=l;l=l+a|0;l=l+15&-16;return b|0}function la(){return l|0}function ma(a){a=a|0;l=a}function na(a,b){a=a|0;b=b|0;l=a;m=b}function oa(a,b){a=a|0;b=b|0;if(!n){n=a;o=b}}function pa(a){a=a|0;y=a}function qa(){return y|0}function ra(a,b){a=a|0;b=b|0;c[a>>2]=gb(b)|0;c[a+4>>2]=b;c[a+8>>2]=0;c[a+12>>2]=0;c[a+16>>2]=32;return}function sa(a){a=a|0;a=c[a>>2]|0;if(!a)return;hb(a);return}function ta(a,b,d){a=a|0;b=b|0;d=d|0;var e=0,f=0,g=0,h=0,i=0,j=0,k=0;k=a+16|0;i=c[k>>2]|0;if(i>>>0>d>>>0){d=i-d|0;c[k>>2]=d;k=a+12|0;c[k>>2]=c[k>>2]|b<<d;return}j=a+8|0;e=c[j>>2]|0;g=a+4|0;h=c[g>>2]|0;f=c[a>>2]|0;if((e+4|0)>>>0<h>>>0)g=i;else{f=jb(f,((h|0)/2|0)+h|0)|0;c[a>>2]=f;e=c[g>>2]|0;c[g>>2]=((e|0)/2|0)+e;g=c[k>>2]|0;e=c[j>>2]|0}i=d-g|0;d=a+12|0;c[f+e>>2]=ub(b>>>i|c[d>>2]|0)|0;c[j>>2]=(c[j>>2]|0)+4;j=32-i|0;c[k>>2]=j;c[d>>2]=(i|0)==0?0:b<<j;return}function ua(a){a=a|0;return (c[a+8>>2]<<3)+32-(c[a+16>>2]|0)|0}function va(a){a=a|0;var b=0,f=0,g=0,h=0,i=0,j=0,k=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,F=0;C=l;l=l+416|0;B=C;if((c[a>>2]|0)>0){j=a+16|0;g=0;b=c[j>>2]|0;do{if((b|0)>0){f=0;do{b=0;do{if((c[a+25264+(g*4608|0)+(f*2304|0)+(b<<2)>>2]|0)<0?(h=a+2224+(g*4608|0)+(f*2304|0)+(b<<2)|0,i=c[h>>2]|0,(i|0)>0):0)c[h>>2]=0-i;b=b+1|0}while((b|0)!=576);f=f+1|0;b=c[j>>2]|0}while((f|0)<(b|0))}g=g+1|0}while((g|0)<(c[a>>2]|0))}j=a+116|0;tb(B|0,j|0,408)|0;z=a+96|0;ta(z,2047,11);i=a+8|0;ta(z,c[i>>2]|0,2);ta(z,c[a+12>>2]|0,2);ta(z,(c[a+76>>2]|0)==0&1,1);ta(z,c[a+68>>2]|0,4);A=a+72|0;ta(z,(c[A>>2]|0)%3|0,2);ta(z,c[a+32>>2]|0,1);ta(z,c[a+80>>2]|0,1);ta(z,c[a+20>>2]|0,2);ta(z,c[a+84>>2]|0,2);ta(z,c[a+88>>2]|0,1);ta(z,c[a+92>>2]|0,1);ta(z,c[a+28>>2]|0,2);do if((c[i>>2]|0)==3){ta(z,0,9);b=c[B>>2]|0;if((c[a>>2]|0)==2){ta(z,b,3);break}else{ta(z,b,5);break}}else{ta(z,0,8);b=c[B>>2]|0;if((c[a>>2]|0)==2){ta(z,b,2);break}else{ta(z,b,1);break}}while(0);if((c[i>>2]|0)==3?(c[a>>2]|0)>0:0){b=0;do{ta(z,c[B+8+(b<<4)>>2]|0,1);ta(z,c[B+8+(b<<4)+4>>2]|0,1);ta(z,c[B+8+(b<<4)+8>>2]|0,1);ta(z,c[B+8+(b<<4)+12>>2]|0,1);b=b+1|0}while((b|0)<(c[a>>2]|0))}y=a+16|0;b=c[y>>2]|0;if((b|0)>0){h=0;g=c[a>>2]|0;do{if((g|0)>0){f=0;do{ta(z,c[B+40+(h*184|0)+(f*92|0)>>2]|0,12);ta(z,c[B+40+(h*184|0)+(f*92|0)+4>>2]|0,9);ta(z,c[B+40+(h*184|0)+(f*92|0)+12>>2]|0,8);b=c[B+40+(h*184|0)+(f*92|0)+16>>2]|0;if((c[i>>2]|0)==3)ta(z,b,4);else ta(z,b,9);ta(z,0,1);ta(z,c[B+40+(h*184|0)+(f*92|0)+20>>2]|0,5);ta(z,c[B+40+(h*184|0)+(f*92|0)+24>>2]|0,5);ta(z,c[B+40+(h*184|0)+(f*92|0)+28>>2]|0,5);ta(z,c[B+40+(h*184|0)+(f*92|0)+32>>2]|0,4);ta(z,c[B+40+(h*184|0)+(f*92|0)+36>>2]|0,3);if((c[i>>2]|0)==3)ta(z,c[B+40+(h*184|0)+(f*92|0)+40>>2]|0,1);ta(z,c[B+40+(h*184|0)+(f*92|0)+44>>2]|0,1);ta(z,c[B+40+(h*184|0)+(f*92|0)+48>>2]|0,1);f=f+1|0;g=c[a>>2]|0}while((f|0)<(g|0));b=c[y>>2]|0}h=h+1|0}while((h|0)<(b|0))}tb(B|0,j|0,408)|0;if((b|0)<=0){l=C;return}x=0;f=c[a>>2]|0;do{if((f|0)>0){w=(x|0)==0;v=0;do{f=c[B+40+(x*184|0)+(v*92|0)+16>>2]|0;b=c[1044+(f<<2)>>2]|0;f=c[1108+(f<<2)>>2]|0;if(!w?(c[B+8+(v<<4)>>2]|0)!=0:0)t=39;else{ta(z,c[a+1208+(x*176|0)+(v*88|0)>>2]|0,b);ta(z,c[a+1208+(x*176|0)+(v*88|0)+4>>2]|0,b);ta(z,c[a+1208+(x*176|0)+(v*88|0)+8>>2]|0,b);ta(z,c[a+1208+(x*176|0)+(v*88|0)+12>>2]|0,b);ta(z,c[a+1208+(x*176|0)+(v*88|0)+16>>2]|0,b);ta(z,c[a+1208+(x*176|0)+(v*88|0)+20>>2]|0,b);if(w)t=40;else t=39}if((t|0)==39)if(!(c[B+8+(v<<4)+4>>2]|0))t=40;else t=41;if((t|0)==40){ta(z,c[a+1208+(x*176|0)+(v*88|0)+24>>2]|0,b);ta(z,c[a+1208+(x*176|0)+(v*88|0)+28>>2]|0,b);ta(z,c[a+1208+(x*176|0)+(v*88|0)+32>>2]|0,b);ta(z,c[a+1208+(x*176|0)+(v*88|0)+36>>2]|0,b);ta(z,c[a+1208+(x*176|0)+(v*88|0)+40>>2]|0,b);if(w)t=42;else t=41}if((t|0)==41)if(!(c[B+8+(v<<4)+8>>2]|0))t=42;else t=43;if((t|0)==42){ta(z,c[a+1208+(x*176|0)+(v*88|0)+44>>2]|0,f);ta(z,c[a+1208+(x*176|0)+(v*88|0)+48>>2]|0,f);ta(z,c[a+1208+(x*176|0)+(v*88|0)+52>>2]|0,f);ta(z,c[a+1208+(x*176|0)+(v*88|0)+56>>2]|0,f);ta(z,c[a+1208+(x*176|0)+(v*88|0)+60>>2]|0,f);if(w)t=44;else t=43}if((t|0)==43?(t=0,(c[B+8+(v<<4)+12>>2]|0)==0):0)t=44;if((t|0)==44){t=0;ta(z,c[a+1208+(x*176|0)+(v*88|0)+64>>2]|0,f);ta(z,c[a+1208+(x*176|0)+(v*88|0)+68>>2]|0,f);ta(z,c[a+1208+(x*176|0)+(v*88|0)+72>>2]|0,f);ta(z,c[a+1208+(x*176|0)+(v*88|0)+76>>2]|0,f);ta(z,c[a+1208+(x*176|0)+(v*88|0)+80>>2]|0,f)}q=c[A>>2]|0;u=ua(z)|0;b=c[B+40+(x*184|0)+(v*92|0)+4>>2]<<1;s=c[B+40+(x*184|0)+(v*92|0)+32>>2]|0;r=c[1464+(q*92|0)+(s+1<<2)>>2]|0;s=c[1464+(q*92|0)+(s+2+(c[B+40+(x*184|0)+(v*92|0)+36>>2]|0)<<2)>>2]|0;if((b|0)>0){q=0;do{g=c[B+40+(x*184|0)+(v*92|0)+20+(((q|0)>=(r|0)&1)+((q|0)>=(s|0)&1)<<2)>>2]|0;do if(g|0){h=c[a+2224+(v*4608|0)+(x*2304|0)+(q<<2)>>2]|0;k=c[a+2224+(v*4608|0)+(x*2304|0)+((q|1)<<2)>>2]|0;i=(h|0)>0;h=i?h:0-h|0;i=(i^1)&1;o=(k|0)>0;k=o?k:0-k|0;o=(o^1)&1;f=c[8+(g*24|0)+4>>2]|0;if((g|0)<=15){p=(N(f,h)|0)+k|0;j=e[(c[8+(g*24|0)+16>>2]|0)+(p<<1)>>1]|0;n=(h|0)==0;j=n?j:j<<1|i;m=(k|0)==0;ta(z,m?j:j<<1|o,((m^1)&1)+((n^1)&1)+(d[(c[8+(g*24|0)+20>>2]|0)+p>>0]|0)|0);break}m=c[8+(g*24|0)+8>>2]|0;E=(h|0)>14;F=E?15:h;D=(k|0)>14;j=D?15:k;n=(N(F,f)|0)+j|0;p=e[(c[8+(g*24|0)+16>>2]|0)+(n<<1)>>1]|0;n=d[(c[8+(g*24|0)+20>>2]|0)+n>>0]|0;f=E?h+-15|0:0;g=(F|0)==0;f=g?f:f<<1|i;g=(E?m:0)+((g^1)&1)|0;if(!D){if(j)t=51}else{g=g+m|0;f=f<<m|k+2147483633;t=51}if((t|0)==51){t=0;g=g+1|0;f=f<<1|o}ta(z,p,n);ta(z,f,g)}while(0);q=q+2|0}while((q|0)<(b|0))}f=(c[B+40+(x*184|0)+(v*92|0)+48>>2]|0)+32|0;h=(c[B+40+(x*184|0)+(v*92|0)+8>>2]<<2)+b|0;if((b|0)<(h|0)){g=c[8+(f*24|0)+16>>2]|0;f=c[8+(f*24|0)+20>>2]|0;do{E=c[a+2224+(v*4608|0)+(x*2304|0)+(b<<2)>>2]|0;D=c[a+2224+(v*4608|0)+(x*2304|0)+((b|1)<<2)>>2]|0;t=c[a+2224+(v*4608|0)+(x*2304|0)+(b+2<<2)>>2]|0;F=c[a+2224+(v*4608|0)+(x*2304|0)+(b+3<<2)>>2]|0;p=(E|0)>0;E=p?E:0-E|0;q=(D|0)>0;D=q?D:0-D|0;r=(t|0)>0;t=r?t:0-t|0;s=(F|0)>0;F=s?F:0-F|0;o=(D<<1)+E+(t<<2)+(F<<3)|0;ta(z,e[g+(o<<1)>>1]|0,d[f+o>>0]|0);E=(E|0)==0;p=((p|E)^1)&1;D=(D|0)==0;q=D?p:p<<1|(q^1)&1;t=(t|0)==0;r=t?q:q<<1|(r^1)&1;F=(F|0)==0;ta(z,F?r:r<<1|(s^1)&1,((t^1)&1)+(D?(E^1)&1:E?1:2)+((F^1)&1)|0);b=b+4|0}while((b|0)<(h|0))}b=ua(z)|0;b=(c[B+40+(x*184|0)+(v*92|0)>>2]|0)-(c[B+40+(x*184|0)+(v*92|0)+52>>2]|0)+(u-b)|0;if(b|0){f=(b|0)%32|0;if((b+31|0)>>>0>=63){b=(b|0)/32|0;do{b=b+-1|0;ta(z,-1,32)}while((b|0)!=0)}if(f|0)ta(z,(1<<f)+-1|0,f)}v=v+1|0;f=c[a>>2]|0}while((v|0)<(f|0));b=c[y>>2]|0}x=x+1|0}while((x|0)<(b|0));l=C;return}function wa(a,b,e,f,g,i){a=a|0;b=b|0;e=e|0;f=f|0;g=g|0;i=i|0;var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,z=0,A=0,C=0,D=0,E=0,F=0,G=0,H=0,I=0,J=0,K=0.0,L=0,M=0,O=0,P=0;J=e+72|0;if((b|0)<0)c[J>>2]=(c[J>>2]|0)+-1;v=i+39100|0;w=i+34488|0;x=e+8|0;z=e+4|0;A=e+48|0;C=e+32|0;D=e+36|0;E=e+20|0;F=e+24|0;G=e+28|0;H=e+60|0;I=e+64|0;r=e+68|0;s=i+72|0;t=c[199]|0;u=c[205]|0;do{while(1){f=c[J>>2]|0;c[J>>2]=f+1;f=f+128|0;l=c[i+40480+(f<<2)>>2]|0;q=c[v>>2]|0;m=((l|0)<0)<<31>>31;q=rb(q|0,((q|0)<0)<<31>>31|0,l|0,m|0)|0;nb(q|0,y|0,-2147483648,0)|0;if((y|0)>165140)continue;k=i+39456+(f<<3)|0;j=c[w>>2]|0;g=0;e=0;do{f=c[j+(e<<2)>>2]|0;f=(f|0)>-1?f:0-f|0;f=rb(f|0,((f|0)<0)<<31>>31|0,l|0,m|0)|0;nb(f|0,y|0,-2147483648,0)|0;f=y;if((f|0)<1e4)f=c[i+40992+(f<<2)>>2]|0;else{K=+h[k>>3]*+(c[i+36796+(e<<2)>>2]|0)*4.656612875e-10;f=~~+B(+(+B(+K)*K))}c[a+(e<<2)>>2]=f;g=(g|0)<(f|0)?f:g;e=e+1|0}while((e|0)!=576);if((g|0)<=8192){g=576;break}}while(1){if((g|0)<=1){n=13;break}if(c[a+(g+-1<<2)>>2]|0){n=16;break}f=g+-2|0;if(!(c[a+(f<<2)>>2]|0))g=f;else{n=16;break}}do if((n|0)==13){c[x>>2]=0;n=23}else if((n|0)==16){c[x>>2]=0;if((g|0)>3){j=0;while(1){if((c[a+(g+-1<<2)>>2]|0)>=2){n=24;break}if((c[a+(g+-2<<2)>>2]|0)>=2){n=24;break}if((c[a+(g+-3<<2)>>2]|0)>=2){n=24;break}f=g+-4|0;e=j+1|0;if((c[a+(f<<2)>>2]|0)>=2){n=24;break}c[x>>2]=e;if((f|0)>3){g=f;j=e}else{n=18;break}}if((n|0)==18){n=0;q=f>>1;c[z>>2]=q;g=f;f=q}else if((n|0)==24){n=0;f=g>>>1;c[z>>2]=f;if(!j){k=0;j=0;break}else e=j}j=0;l=g;m=0;k=0;while(1){o=c[a+(l<<2)>>2]|0;L=c[a+((l|1)<<2)>>2]|0;M=c[a+(l+2<<2)>>2]|0;p=c[a+(l+3<<2)>>2]|0;q=(L<<1)+o+(M<<2)+(p<<3)|0;o=(o|0)!=0;p=((M|0)!=0&1)+((L|0)==0?o&1:o?2:1)+((p|0)!=0&1)|0;j=(d[t+q>>0]|0)+j+p|0;k=p+k+(d[u+q>>0]|0)|0;m=m+1|0;if((m|0)==(e|0))break;else l=l+4|0}}else n=23}while(0);if((n|0)==23){f=g>>1;c[z>>2]=f;k=0;j=0}M=(j|0)<(k|0);q=M?j:k;c[A>>2]=(M^1)&1;if(!f){c[C>>2]=0;c[D>>2]=0;j=c[H>>2]|0}else{j=c[s>>2]|0;e=0;while(1)if((c[1464+(j*92|0)+(e<<2)>>2]|0)<(g|0))e=e+1|0;else break;f=c[824+(e<<3)>>2]|0;while(1){k=1464+(j*92|0)+(f+1<<2)|0;l=c[k>>2]|0;if((f|0)!=0&(l|0)>(g|0))f=f+-1|0;else break}c[C>>2]=f;c[H>>2]=l;f=c[824+(e<<3)+4>>2]|0;while(1){e=c[k+(f+1<<2)>>2]|0;if((f|0)!=0&(e|0)>(g|0))f=f+-1|0;else break}c[D>>2]=f;c[I>>2]=e;c[r>>2]=g;j=l}c[E>>2]=0;c[F>>2]=0;c[G>>2]=0;if(!j)k=0;else{k=xa(a,0,j)|0;c[E>>2]=k}e=c[I>>2]|0;n=e>>>0>j>>>0;if(n){o=xa(a,j,e)|0;c[F>>2]=o}else o=0;if(g>>>0>e>>>0){p=xa(a,e,g)|0;c[G>>2]=p}else p=0;do if(k){m=c[8+(k*24|0)+4>>2]|0;l=c[8+(k*24|0)+8>>2]|0;f=(j|0)!=0;if(k>>>0>15){if(!f){f=0;break}k=c[8+(k*24|0)+20>>2]|0;f=0;g=0;do{L=c[a+(g<<2)>>2]|0;M=c[a+((g|1)<<2)>>2]|0;P=(L|0)>14;L=P?15:L;O=(M|0)>14;M=O?15:M;f=(P?l:0)+f+(O?l:0)+(d[k+((N(L,m)|0)+M)>>0]|0)+((L|0)!=0&1)+((M|0)!=0&1)|0;g=g+2|0}while(g>>>0<j>>>0)}else{if(!f){f=0;break}k=c[8+(k*24|0)+20>>2]|0;g=0;f=0;do{O=c[a+(g<<2)>>2]|0;P=c[a+((g|1)<<2)>>2]|0;f=((O|0)!=0&1)+f+((P|0)!=0&1)+(d[k+((N(O,m)|0)+P)>>0]|0)|0;g=g+2|0}while(g>>>0<j>>>0)}}else f=0;while(0);if(o){m=c[8+(o*24|0)+4>>2]|0;l=c[8+(o*24|0)+8>>2]|0;if(o>>>0>15)if(n){k=c[8+(o*24|0)+20>>2]|0;g=0;do{O=c[a+(j<<2)>>2]|0;P=c[a+(j+1<<2)>>2]|0;L=(O|0)>14;O=L?15:O;M=(P|0)>14;P=M?15:P;g=(L?l:0)+g+(M?l:0)+(d[k+((N(O,m)|0)+P)>>0]|0)+((O|0)!=0&1)+((P|0)!=0&1)|0;j=j+2|0}while(j>>>0<e>>>0)}else g=0;else if(n){k=c[8+(o*24|0)+20>>2]|0;g=0;do{O=c[a+(j<<2)>>2]|0;P=c[a+(j+1<<2)>>2]|0;g=((O|0)!=0&1)+g+((P|0)!=0&1)+(d[k+((N(O,m)|0)+P)>>0]|0)|0;j=j+2|0}while(j>>>0<e>>>0)}else g=0;f=g+f|0}if(p){l=c[r>>2]|0;m=c[8+(p*24|0)+4>>2]|0;k=c[8+(p*24|0)+8>>2]|0;g=e>>>0<l>>>0;if(p>>>0>15)if(g){j=c[8+(p*24|0)+20>>2]|0;g=0;do{O=c[a+(e<<2)>>2]|0;P=c[a+(e+1<<2)>>2]|0;L=(O|0)>14;O=L?15:O;M=(P|0)>14;P=M?15:P;g=(L?k:0)+g+(M?k:0)+(d[j+((N(O,m)|0)+P)>>0]|0)+((O|0)!=0&1)+((P|0)!=0&1)|0;e=e+2|0}while(e>>>0<l>>>0)}else g=0;else if(g){j=c[8+(p*24|0)+20>>2]|0;g=0;do{O=c[a+(e<<2)>>2]|0;P=c[a+(e+1<<2)>>2]|0;g=((O|0)!=0&1)+g+((P|0)!=0&1)+(d[j+((N(O,m)|0)+P)>>0]|0)|0;e=e+2|0}while(e>>>0<l>>>0)}else g=0;f=g+f|0}f=f+q|0}while((f|0)>(b|0));return f|0}function xa(a,b,e){a=a|0;b=b|0;e=e|0;var f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;if(b>>>0<e>>>0){f=b;g=0}else{e=0;return e|0}do{m=c[a+(f<<2)>>2]|0;g=(g|0)<(m|0)?m:g;f=f+1|0}while((f|0)!=(e|0));if(!g){e=0;return e|0}if((g|0)>=15){f=g+-15|0;if((c[95]|0)>>>0<f>>>0)if((c[101]|0)>>>0<f>>>0)if((c[107]|0)>>>0<f>>>0)if((c[113]|0)>>>0<f>>>0)if((c[119]|0)>>>0<f>>>0)if((c[125]|0)>>>0<f>>>0)if((c[131]|0)>>>0<f>>>0)if((c[137]|0)>>>0<f>>>0)m=(c[143]|0)>>>0<f>>>0?0:23;else m=22;else m=21;else m=20;else m=19;else m=18;else m=17;else m=16;else m=15;if((c[149]|0)>>>0<f>>>0)if((c[155]|0)>>>0<f>>>0)if((c[161]|0)>>>0<f>>>0)if((c[167]|0)>>>0<f>>>0)if((c[173]|0)>>>0<f>>>0)if((c[179]|0)>>>0<f>>>0)if((c[185]|0)>>>0<f>>>0)l=(c[191]|0)>>>0<f>>>0?0:31;else l=30;else l=29;else l=28;else l=27;else l=26;else l=25;else l=24;if(m){i=c[8+(m*24|0)+4>>2]|0;h=c[8+(m*24|0)+8>>2]|0;j=c[8+(m*24|0)+20>>2]|0;if(m>>>0>15){f=0;g=b;do{n=c[a+(g<<2)>>2]|0;k=c[a+(g+1<<2)>>2]|0;p=(n|0)>14;n=p?15:n;o=(k|0)>14;k=o?15:k;f=(p?h:0)+f+(o?h:0)+(d[j+((N(n,i)|0)+k)>>0]|0)+((n|0)!=0&1)+((k|0)!=0&1)|0;g=g+2|0}while(g>>>0<e>>>0);k=f}else{g=b;f=0;do{o=c[a+(g<<2)>>2]|0;p=c[a+(g+1<<2)>>2]|0;f=((o|0)!=0&1)+f+((p|0)!=0&1)+(d[j+((N(o,i)|0)+p)>>0]|0)|0;g=g+2|0}while(g>>>0<e>>>0);k=f}}else k=0;if(!l){p=0;p=(p|0)<(k|0);p=p?l:m;return p|0}i=c[8+(l*24|0)+4>>2]|0;h=c[8+(l*24|0)+8>>2]|0;j=c[8+(l*24|0)+20>>2]|0;if(l>>>0>15){f=0;g=b;do{o=c[a+(g<<2)>>2]|0;p=c[a+(g+1<<2)>>2]|0;b=(o|0)>14;o=b?15:o;n=(p|0)>14;p=n?15:p;f=(b?h:0)+f+(n?h:0)+(d[j+((N(o,i)|0)+p)>>0]|0)+((o|0)!=0&1)+((p|0)!=0&1)|0;g=g+2|0}while(g>>>0<e>>>0);p=(f|0)<(k|0);p=p?l:m;return p|0}else{g=b;f=0;do{o=c[a+(g<<2)>>2]|0;p=c[a+(g+1<<2)>>2]|0;f=((o|0)!=0&1)+f+((p|0)!=0&1)+(d[j+((N(o,i)|0)+p)>>0]|0)|0;g=g+2|0}while(g>>>0<e>>>0);p=(f|0)<(k|0);p=p?l:m;return p|0}}else k=14;while(1){l=k+-1|0;if(!k){f=0;h=44;break}if((c[8+(l*24|0)>>2]|0)>>>0>g>>>0)break;else k=l}if((h|0)==44)return f|0;if(!l){p=0;return p|0}i=c[8+(l*24|0)+4>>2]|0;h=c[8+(l*24|0)+8>>2]|0;j=c[8+(l*24|0)+20>>2]|0;if(l>>>0>15){f=0;g=b;do{o=c[a+(g<<2)>>2]|0;p=c[a+(g+1<<2)>>2]|0;m=(o|0)>14;o=m?15:o;n=(p|0)>14;p=n?15:p;f=(m?h:0)+f+(n?h:0)+(d[j+((N(o,i)|0)+p)>>0]|0)+((o|0)!=0&1)+((p|0)!=0&1)|0;g=g+2|0}while(g>>>0<e>>>0);j=f}else{g=b;f=0;do{o=c[a+(g<<2)>>2]|0;p=c[a+(g+1<<2)>>2]|0;f=((o|0)!=0&1)+f+((p|0)!=0&1)+(d[j+((N(o,i)|0)+p)>>0]|0)|0;g=g+2|0}while(g>>>0<e>>>0);j=f}switch(k|0){case 3:{h=c[21]|0;i=c[25]|0;f=b;g=0;do{o=c[a+(f<<2)>>2]|0;p=c[a+(f+1<<2)>>2]|0;g=((o|0)!=0&1)+g+((p|0)!=0&1)+(d[i+((N(o,h)|0)+p)>>0]|0)|0;f=f+2|0}while(f>>>0<e>>>0);p=(g|0)>(j|0)?l:3;return p|0}case 6:{h=c[39]|0;i=c[43]|0;f=b;g=0;do{o=c[a+(f<<2)>>2]|0;p=c[a+(f+1<<2)>>2]|0;g=((o|0)!=0&1)+g+((p|0)!=0&1)+(d[i+((N(o,h)|0)+p)>>0]|0)|0;f=f+2|0}while(f>>>0<e>>>0);p=(g|0)>(j|0)?l:6;return p|0}case 8:{g=c[51]|0;h=c[55]|0;f=b;i=0;do{o=c[a+(f<<2)>>2]|0;p=c[a+(f+1<<2)>>2]|0;i=((o|0)!=0&1)+i+((p|0)!=0&1)+(d[h+((N(o,g)|0)+p)>>0]|0)|0;f=f+2|0}while(f>>>0<e>>>0);h=(i|0)>(j|0);k=h?l:8;h=h?j:i;i=c[57]|0;j=c[61]|0;f=b;g=0;do{o=c[a+(f<<2)>>2]|0;p=c[a+(f+1<<2)>>2]|0;g=((o|0)!=0&1)+g+((p|0)!=0&1)+(d[j+((N(o,i)|0)+p)>>0]|0)|0;f=f+2|0}while(f>>>0<e>>>0);return ((g|0)>(h|0)?k:9)|0}case 11:{g=c[69]|0;h=c[73]|0;f=b;i=0;do{o=c[a+(f<<2)>>2]|0;p=c[a+(f+1<<2)>>2]|0;i=((o|0)!=0&1)+i+((p|0)!=0&1)+(d[h+((N(o,g)|0)+p)>>0]|0)|0;f=f+2|0}while(f>>>0<e>>>0);h=(i|0)>(j|0);k=h?l:11;h=h?j:i;i=c[75]|0;j=c[79]|0;f=b;g=0;do{o=c[a+(f<<2)>>2]|0;p=c[a+(f+1<<2)>>2]|0;g=((o|0)!=0&1)+g+((p|0)!=0&1)+(d[j+((N(o,i)|0)+p)>>0]|0)|0;f=f+2|0}while(f>>>0<e>>>0);p=(g|0)>(h|0)?k:12;return p|0}case 14:{h=c[93]|0;i=c[97]|0;f=b;g=0;do{o=c[a+(f<<2)>>2]|0;p=c[a+(f+1<<2)>>2]|0;g=((o|0)!=0&1)+g+((p|0)!=0&1)+(d[i+((N(o,h)|0)+p)>>0]|0)|0;f=f+2|0}while(f>>>0<e>>>0);p=(g|0)>(j|0)?l:15;return p|0}default:{p=l;return p|0}}return 0}function ya(a,b,e,f,g,i){a=a|0;b=b|0;e=e|0;f=f|0;g=g|0;i=i|0;var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,z=0,A=0,C=0,D=0,E=0,F=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,O=0,P=0,Q=0.0,R=0,S=0,T=0,U=0;K=i+39100|0;L=i+34488|0;M=i+156+(f*184|0)+(g*92|0)+8|0;O=i+156+(f*184|0)+(g*92|0)+4|0;u=i+156+(f*184|0)+(g*92|0)+48|0;v=i+156+(f*184|0)+(g*92|0)+32|0;w=i+156+(f*184|0)+(g*92|0)+36|0;x=i+156+(f*184|0)+(g*92|0)+20|0;z=i+156+(f*184|0)+(g*92|0)+24|0;A=i+156+(f*184|0)+(g*92|0)+28|0;C=i+156+(f*184|0)+(g*92|0)+60|0;D=i+156+(f*184|0)+(g*92|0)+64|0;E=i+156+(f*184|0)+(g*92|0)+68|0;F=i+72|0;G=c[199]|0;H=c[205]|0;t=120;P=-120;do{I=(t|0)/2|0;J=I+P|0;b=J+127|0;n=c[i+40480+(b<<2)>>2]|0;s=c[K>>2]|0;o=((n|0)<0)<<31>>31;s=rb(s|0,((s|0)<0)<<31>>31|0,n|0,o|0)|0;nb(s|0,y|0,-2147483648,0)|0;if((y|0)<=165140){m=i+39456+(b<<3)|0;l=c[L>>2]|0;j=0;k=0;do{b=c[l+(k<<2)>>2]|0;b=(b|0)>-1?b:0-b|0;b=rb(b|0,((b|0)<0)<<31>>31|0,n|0,o|0)|0;nb(b|0,y|0,-2147483648,0)|0;b=y;if((b|0)<1e4)b=c[i+40992+(b<<2)>>2]|0;else{Q=+h[m>>3]*+(c[i+36796+(k<<2)>>2]|0)*4.656612875e-10;b=~~+B(+(+B(+Q)*Q))}c[e+(k<<2)>>2]=b;j=(j|0)<(b|0)?b:j;k=k+1|0}while((k|0)!=576);if((j|0)<=8192){j=576;while(1){if((j|0)<=1){n=10;break}if(c[e+(j+-1<<2)>>2]|0){n=13;break}b=j+-2|0;if(!(c[e+(b<<2)>>2]|0))j=b;else{n=13;break}}do if((n|0)==10){c[M>>2]=0;n=20}else if((n|0)==13){c[M>>2]=0;if((j|0)>3){l=0;while(1){if((c[e+(j+-1<<2)>>2]|0)>=2){n=21;break}if((c[e+(j+-2<<2)>>2]|0)>=2){n=21;break}if((c[e+(j+-3<<2)>>2]|0)>=2){n=21;break}b=j+-4|0;k=l+1|0;if((c[e+(b<<2)>>2]|0)>=2){n=21;break}c[M>>2]=k;if((b|0)>3){j=b;l=k}else{n=15;break}}if((n|0)==15){s=b>>1;c[O>>2]=s;j=b;b=s}else if((n|0)==21){b=j>>>1;c[O>>2]=b;if(!l){c[u>>2]=1;b=0;n=27;break}else k=l}l=0;n=j;o=0;m=0;while(1){q=c[e+(n<<2)>>2]|0;p=c[e+((n|1)<<2)>>2]|0;R=c[e+(n+2<<2)>>2]|0;r=c[e+(n+3<<2)>>2]|0;s=(p<<1)+q+(R<<2)+(r<<3)|0;q=(q|0)!=0;r=((R|0)!=0&1)+((p|0)==0?q&1:q?2:1)+((r|0)!=0&1)|0;l=(d[G+s>>0]|0)+l+r|0;m=r+m+(d[H+s>>0]|0)|0;o=o+1|0;if((o|0)==(k|0)){k=b;n=25;break}else n=n+4|0}}else n=20}while(0);if((n|0)==20){k=j>>1;c[O>>2]=k;m=0;l=0;n=25}if((n|0)==25){n=0;R=(l|0)<(m|0);b=R?l:m;c[u>>2]=(R^1)&1;if(!k){c[v>>2]=0;c[w>>2]=0;s=b;l=c[C>>2]|0}else n=27}if((n|0)==27){m=c[F>>2]|0;l=0;while(1)if((c[1464+(m*92|0)+(l<<2)>>2]|0)<(j|0))l=l+1|0;else break;k=c[824+(l<<3)>>2]|0;while(1){n=1464+(m*92|0)+(k+1<<2)|0;o=c[n>>2]|0;if((k|0)!=0&(o|0)>(j|0))k=k+-1|0;else break}c[v>>2]=k;c[C>>2]=o;k=c[824+(l<<3)+4>>2]|0;while(1){l=c[n+(k+1<<2)>>2]|0;if((k|0)!=0&(l|0)>(j|0))k=k+-1|0;else break}c[w>>2]=k;c[D>>2]=l;c[E>>2]=j;s=b;l=o}c[x>>2]=0;c[z>>2]=0;c[A>>2]=0;if(!l)m=0;else{m=xa(e,0,l)|0;c[x>>2]=m}k=c[D>>2]|0;p=k>>>0>l>>>0;if(p){q=xa(e,l,k)|0;c[z>>2]=q}else q=0;if(j>>>0>k>>>0){r=xa(e,k,j)|0;c[A>>2]=r}else r=0;do if(m){o=c[8+(m*24|0)+4>>2]|0;n=c[8+(m*24|0)+8>>2]|0;b=(l|0)!=0;if(m>>>0>15){if(!b){b=0;break}m=c[8+(m*24|0)+20>>2]|0;b=0;j=0;do{S=c[e+(j<<2)>>2]|0;R=c[e+((j|1)<<2)>>2]|0;U=(S|0)>14;S=U?15:S;T=(R|0)>14;R=T?15:R;b=(U?n:0)+b+(T?n:0)+(d[m+((N(S,o)|0)+R)>>0]|0)+((S|0)!=0&1)+((R|0)!=0&1)|0;j=j+2|0}while(j>>>0<l>>>0)}else{if(!b){b=0;break}m=c[8+(m*24|0)+20>>2]|0;j=0;b=0;do{T=c[e+(j<<2)>>2]|0;U=c[e+((j|1)<<2)>>2]|0;b=((T|0)!=0&1)+b+((U|0)!=0&1)+(d[m+((N(T,o)|0)+U)>>0]|0)|0;j=j+2|0}while(j>>>0<l>>>0)}}else b=0;while(0);if(q){o=c[8+(q*24|0)+4>>2]|0;n=c[8+(q*24|0)+8>>2]|0;if(q>>>0>15)if(p){m=c[8+(q*24|0)+20>>2]|0;j=0;do{T=c[e+(l<<2)>>2]|0;U=c[e+(l+1<<2)>>2]|0;R=(T|0)>14;T=R?15:T;S=(U|0)>14;U=S?15:U;j=(R?n:0)+j+(S?n:0)+(d[m+((N(T,o)|0)+U)>>0]|0)+((T|0)!=0&1)+((U|0)!=0&1)|0;l=l+2|0}while(l>>>0<k>>>0)}else j=0;else if(p){m=c[8+(q*24|0)+20>>2]|0;j=0;do{T=c[e+(l<<2)>>2]|0;U=c[e+(l+1<<2)>>2]|0;j=((T|0)!=0&1)+j+((U|0)!=0&1)+(d[m+((N(T,o)|0)+U)>>0]|0)|0;l=l+2|0}while(l>>>0<k>>>0)}else j=0;b=j+b|0}if(r){n=c[E>>2]|0;o=c[8+(r*24|0)+4>>2]|0;m=c[8+(r*24|0)+8>>2]|0;j=k>>>0<n>>>0;if(r>>>0>15)if(j){l=c[8+(r*24|0)+20>>2]|0;j=0;do{T=c[e+(k<<2)>>2]|0;U=c[e+(k+1<<2)>>2]|0;R=(T|0)>14;T=R?15:T;S=(U|0)>14;U=S?15:U;j=(R?m:0)+j+(S?m:0)+(d[l+((N(T,o)|0)+U)>>0]|0)+((T|0)!=0&1)+((U|0)!=0&1)|0;k=k+2|0}while(k>>>0<n>>>0)}else j=0;else if(j){l=c[8+(r*24|0)+20>>2]|0;j=0;do{T=c[e+(k<<2)>>2]|0;U=c[e+(k+1<<2)>>2]|0;j=((T|0)!=0&1)+j+((U|0)!=0&1)+(d[l+((N(T,o)|0)+U)>>0]|0)|0;k=k+2|0}while(k>>>0<n>>>0)}else j=0;b=j+b|0}b=b+s|0}else b=1e5}else b=1e5;U=(b|0)<(a|0);P=U?P:J;t=U?I:t-I|0}while((t|0)>1);l=i+156+(f*184|0)+(g*92|0)|0;c[i+156+(f*184|0)+(g*92|0)+72>>2]=P;b=c[i+156+(f*184|0)+(g*92|0)+16>>2]|0;k=c[1044+(b<<2)>>2]|0;b=c[1108+(b<<2)>>2]|0;if(f){j=b*5|0;b=((c[i+124+(g<<4)+4>>2]|0)==0?k*5|0:0)+((c[i+124+(g<<4)>>2]|0)==0?k*6|0:0)+((c[i+124+(g<<4)+8>>2]|0)==0?j:0)|0;if(c[i+124+(g<<4)+12>>2]|0){U=b;T=i+156+(f*184|0)+(g*92|0)+52|0;c[T>>2]=U;U=a-U|0;U=wa(e,U,l,0,0,i)|0;T=c[T>>2]|0;U=T+U|0;c[l>>2]=U;return U|0}}else{j=b*5|0;b=j+(k*11|0)|0}U=b+j|0;T=i+156+(f*184|0)+(g*92|0)+52|0;c[T>>2]=U;U=a-U|0;U=wa(e,U,l,0,0,i)|0;T=c[T>>2]|0;U=T+U|0;c[l>>2]=U;return U|0}function za(a){a=a|0;var b=0,d=0,e=0,f=0,g=0.0,i=0,j=0,k=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,z=0,A=0,B=0,C=0,D=0,E=0,F=0,G=0;F=l;l=l+672|0;t=F;b=c[a>>2]|0;if(!b){Pa(a);l=F;return}z=a+16|0;A=a+34488|0;B=a+39100|0;C=a+8|0;D=a+72|0;E=a+39452|0;u=a+39448|0;v=a+39104|0;w=a+39108|0;x=b*23|0;d=c[z>>2]|0;s=0;while(1){r=x+(N(s,-23)|0)|0;b=b+-1|0;if((d|0)>0){q=a+((b<<4)+124)|0;p=0;while(1){o=a+140+(r+(p*46|0)<<2)|0;c[A>>2]=a+25264+(b*4608|0)+(p*2304|0);d=576;e=0;a:while(1){c[B>>2]=e;while(1){f=d+-1|0;if(!d)break a;n=c[(c[A>>2]|0)+(f<<2)>>2]|0;e=((n|0)<0)<<31>>31;e=rb(n|0,e|0,n|0,e|0)|0;e=nb(e|0,y|0,1073741824,0)|0;e=pb(e|0,y|0,31)|0;c[a+34492+(f<<2)>>2]=e;e=c[(c[A>>2]|0)+(f<<2)>>2]|0;e=(e|0)>-1?e:0-e|0;c[a+36796+(f<<2)>>2]=e;if((e|0)>(c[B>>2]|0)){d=f;continue a}else d=f}}m=a+2224+(b*4608|0)+(p*2304|0)|0;n=a+156+(p*184|0)+(b*92|0)|0;c[a+156+(p*184|0)+(b*92|0)+56>>2]=21;ob(t+(p*336|0)+(b*168|0)|0,0,168)|0;b:do if((c[C>>2]|0)==3){k=c[D>>2]|0;c[a+39448+(p<<2)>>2]=c[B>>2];d=0;e=575;while(1){d=(c[a+34492+(e<<2)>>2]>>10)+d|0;if(!e)break;else e=e+-1|0}if(!d)d=0;else d=~~(+L(+(+(d|0)*4.768371584e-07))/.69314718);c[a+39104+(p<<2)>>2]=d;i=20;j=c[1464+(k*92|0)+84>>2]|0;while(1){f=j;j=c[1464+(k*92|0)+(i<<2)>>2]|0;if((j|0)<(f|0)){d=0;e=j;do{d=(c[a+34492+(e<<2)>>2]>>10)+d|0;e=e+1|0}while((e|0)!=(f|0));if(d)d=~~(+L(+(+(d|0)*4.768371584e-07))/.69314718);else d=0}else d=0;c[a+39112+(p*84|0)+(i<<2)>>2]=d;g=+h[t+(p*336|0)+(b*168|0)+(i<<3)>>3];if(g!=0.0)d=~~(+L(+g)/.69314718);else d=0;c[a+39280+(p*84|0)+(i<<2)>>2]=d;if(!i)break;else i=i+-1|0}if((p|0)==1){j=(c[u>>2]|0)!=0;e=c[E>>2]|0?3:2;i=(c[v>>2]|0)-(c[w>>2]|0)|0;i=(((i|0)>-1?i:0-i|0)|0)<10;d=0;f=20;while(1){k=(c[a+39112+(f<<2)>>2]|0)-(c[a+39196+(f<<2)>>2]|0)|0;d=((k|0)>-1?k:0-k|0)+d|0;if(!f)break;else f=f+-1|0}if(((j&1)+e+(i&1)+((d|0)<100&1)|0)==6){d=0;e=0}else{c[q>>2]=0;c[q+4>>2]=0;c[q+8>>2]=0;c[q+12>>2]=0;break}do{while(1){k=a+124+(b<<4)+(d<<2)|0;c[k>>2]=0;d=d+1|0;j=e;e=c[1008+(d<<2)>>2]|0;if((j|0)<(e|0)){f=0;i=0;do{G=(c[a+39112+(j<<2)>>2]|0)-(c[a+39196+(j<<2)>>2]|0)|0;f=((G|0)>-1?G:0-G|0)+f|0;G=(c[a+39280+(j<<2)>>2]|0)-(c[a+39364+(j<<2)>>2]|0)|0;i=((G|0)>-1?G:0-G|0)+i|0;j=j+1|0}while((j|0)!=(e|0))}else{i=0;f=0}if((f|0)<10&(i|0)<10)break;c[k>>2]=0;if((d|0)>=4)break b}c[k>>2]=1}while((d|0)<4)}}while(0);d=Na(a+2192+(b<<4)+(p<<3)|0,a)|0;e=a+1208+(p*176|0)+(b*88|0)|0;f=e+88|0;do{c[e>>2]=0;e=e+4|0}while((e|0)<(f|0));ob(a+1560+(p*312|0)+(b*156|0)|0,0,156)|0;c[o>>2]=0;c[o+4>>2]=0;c[o+8>>2]=0;c[o+12>>2]=0;c[n>>2]=0;c[a+156+(p*184|0)+(b*92|0)+4>>2]=0;c[a+156+(p*184|0)+(b*92|0)+8>>2]=0;e=a+156+(p*184|0)+(b*92|0)+16|0;f=e+40|0;do{c[e>>2]=0;e=e+4|0}while((e|0)<(f|0));if(c[B>>2]|0)c[n>>2]=ya(d,0,m,p,b,a)|0;Oa(n,a);c[a+156+(p*184|0)+(b*92|0)+12>>2]=(c[a+156+(p*184|0)+(b*92|0)+72>>2]|0)+210;p=p+1|0;d=c[z>>2]|0;if((p|0)>=(d|0))break}}if(!b)break;else s=s+1|0}Pa(a);l=F;return}function Aa(a){a=a|0;var b=0,d=0,e=0.0;b=128;d=127;while(1){e=+Y(+(+(128-b|0)*.25));h[a+39456+(d<<3)>>3]=e;e=e*2.0;c[a+40480+(d<<2)>>2]=e>2147483647.0?2147483647:~~(e+.5);if(!d){b=9999;break}else{b=d;d=d+-1|0}}while(1){e=+(b|0);c[a+40992+(b<<2)>>2]=~~(+B(+(e*+B(+e)))+-.0946+.5);if(!b)break;else b=b+-1|0}return}function Ba(a){a=a|0;var b=0,d=0.0,e=0;b=17;while(1){d=+(b<<1|1|0);e=35;while(1){c[a+80992+(b*144|0)+(e<<2)>>2]=~~(+E(+((+(e|0)+.5)*.087266462599717))*+D(+(d*(+((e<<1)+19|0)*.043633231299858195)))*2147483647.0);if(!e)break;else e=e+-1|0}if(!b)break;else b=b+-1|0}return}function Ca(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0;s=l;l=l+144|0;p=s;d=c[a>>2]|0;if(!d){l=s;return}q=a+16|0;r=p+140|0;do{d=d+-1|0;e=c[q>>2]|0;if((e|0)>0){o=a+2184+(d<<2)|0;n=0;do{m=a+25264+(d*4608|0)+(n*2304|0)|0;k=n;n=n+1|0;e=0;do{Ea(o,a+11440+(d*6912|0)+(n*2304|0)+(e<<7)|0,d,a,b);j=e|1;Ea(o,a+11440+(d*6912|0)+(n*2304|0)+(j<<7)|0,d,a,b);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+4|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+12|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+20|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+28|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+36|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+44|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+52|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+60|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+68|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+76|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+84|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+92|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+100|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+108|0;c[i>>2]=0-(c[i>>2]|0);i=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+116|0;c[i>>2]=0-(c[i>>2]|0);j=a+11440+(d*6912|0)+(n*2304|0)+(j<<7)+124|0;c[j>>2]=0-(c[j>>2]|0);e=e+2|0}while((e|0)<18);j=0;while(1){e=18;f=17;while(1){c[p+(f<<2)>>2]=c[a+11440+(d*6912|0)+(k*2304|0)+(f<<7)+(j<<2)>>2];c[p+(e+17<<2)>>2]=c[a+11440+(d*6912|0)+(n*2304|0)+(f<<7)+(j<<2)>>2];if(!f)break;else{e=f;f=f+-1|0}}g=c[r>>2]|0;h=((g|0)<0)<<31>>31;i=17;while(1){e=c[a+80992+(i*144|0)+140>>2]|0;rb(e|0,((e|0)<0)<<31>>31|0,g|0,h|0)|0;e=35;f=y;do{v=e+-1|0;t=c[p+(v<<2)>>2]|0;v=c[a+80992+(i*144|0)+(v<<2)>>2]|0;rb(v|0,((v|0)<0)<<31>>31|0,t|0,((t|0)<0)<<31>>31|0)|0;t=y+f|0;v=e+-2|0;u=c[p+(v<<2)>>2]|0;v=c[a+80992+(i*144|0)+(v<<2)>>2]|0;rb(v|0,((v|0)<0)<<31>>31|0,u|0,((u|0)<0)<<31>>31|0)|0;t=t+y|0;u=e+-3|0;v=c[p+(u<<2)>>2]|0;u=c[a+80992+(i*144|0)+(u<<2)>>2]|0;rb(u|0,((u|0)<0)<<31>>31|0,v|0,((v|0)<0)<<31>>31|0)|0;t=t+y|0;v=e+-4|0;u=c[p+(v<<2)>>2]|0;v=c[a+80992+(i*144|0)+(v<<2)>>2]|0;rb(v|0,((v|0)<0)<<31>>31|0,u|0,((u|0)<0)<<31>>31|0)|0;t=t+y|0;u=e+-5|0;v=c[p+(u<<2)>>2]|0;u=c[a+80992+(i*144|0)+(u<<2)>>2]|0;rb(u|0,((u|0)<0)<<31>>31|0,v|0,((v|0)<0)<<31>>31|0)|0;t=t+y|0;v=e+-6|0;u=c[p+(v<<2)>>2]|0;v=c[a+80992+(i*144|0)+(v<<2)>>2]|0;rb(v|0,((v|0)<0)<<31>>31|0,u|0,((u|0)<0)<<31>>31|0)|0;t=t+y|0;e=e+-7|0;u=c[p+(e<<2)>>2]|0;v=c[a+80992+(i*144|0)+(e<<2)>>2]|0;rb(v|0,((v|0)<0)<<31>>31|0,u|0,((u|0)<0)<<31>>31|0)|0;f=t+y|0}while((e|0)!=0);c[m+(j*72|0)+(i<<2)>>2]=f;if(!i)break;else i=i+-1|0}if(!j){j=1;continue}v=m+(j*72|0)|0;e=c[v>>2]|0;u=((e|0)<0)<<31>>31;w=rb(e|0,u|0,1841452035,0)|0;i=y;t=j+-1|0;h=m+(t*72|0)+68|0;g=c[h>>2]|0;f=((g|0)<0)<<31>>31;x=rb(g|0,f|0,1104871221,0)|0;i=nb(x|0,y|0,w|0,i|0)|0;i=pb(i|0,y|0,31)|0;u=rb(e|0,u|0,-1104871221,-1)|0;e=y;f=rb(g|0,f|0,1841452035,0)|0;e=nb(f|0,y|0,u|0,e|0)|0;e=pb(e|0,y|0,31)|0;c[h>>2]=e;c[v>>2]=i;v=m+(j*72|0)+4|0;i=c[v>>2]|0;h=((i|0)<0)<<31>>31;e=rb(i|0,h|0,1893526520,0)|0;u=y;f=m+(t*72|0)+64|0;g=c[f>>2]|0;w=((g|0)<0)<<31>>31;x=rb(g|0,w|0,1013036688,0)|0;u=nb(x|0,y|0,e|0,u|0)|0;u=pb(u|0,y|0,31)|0;h=rb(i|0,h|0,-1013036688,-1)|0;i=y;w=rb(g|0,w|0,1893526520,0)|0;i=nb(w|0,y|0,h|0,i|0)|0;i=pb(i|0,y|0,31)|0;c[f>>2]=i;c[v>>2]=u;v=m+(j*72|0)+8|0;u=c[v>>2]|0;f=((u|0)<0)<<31>>31;i=rb(u|0,f|0,2039311994,0)|0;h=y;w=m+(t*72|0)+60|0;g=c[w>>2]|0;e=((g|0)<0)<<31>>31;x=rb(g|0,e|0,672972958,0)|0;h=nb(x|0,y|0,i|0,h|0)|0;h=pb(h|0,y|0,31)|0;f=rb(u|0,f|0,-672972958,-1)|0;u=y;e=rb(g|0,e|0,2039311994,0)|0;u=nb(e|0,y|0,f|0,u|0)|0;u=pb(u|0,y|0,31)|0;c[w>>2]=u;c[v>>2]=h;v=m+(j*72|0)+12|0;h=c[v>>2]|0;w=((h|0)<0)<<31>>31;u=rb(h|0,w|0,2111652007,0)|0;f=y;e=m+(t*72|0)+56|0;g=c[e>>2]|0;i=((g|0)<0)<<31>>31;x=rb(g|0,i|0,390655621,0)|0;f=nb(x|0,y|0,u|0,f|0)|0;f=pb(f|0,y|0,31)|0;w=rb(h|0,w|0,-390655621,-1)|0;h=y;i=rb(g|0,i|0,2111652007,0)|0;h=nb(i|0,y|0,w|0,h|0)|0;h=pb(h|0,y|0,31)|0;c[e>>2]=h;c[v>>2]=f;v=m+(j*72|0)+16|0;f=c[v>>2]|0;e=((f|0)<0)<<31>>31;h=rb(f|0,e|0,2137858230,0)|0;w=y;i=m+(t*72|0)+52|0;g=c[i>>2]|0;u=((g|0)<0)<<31>>31;x=rb(g|0,u|0,203096531,0)|0;w=nb(x|0,y|0,h|0,w|0)|0;w=pb(w|0,y|0,31)|0;e=rb(f|0,e|0,-203096531,-1)|0;f=y;u=rb(g|0,u|0,2137858230,0)|0;f=nb(u|0,y|0,e|0,f|0)|0;f=pb(f|0,y|0,31)|0;c[i>>2]=f;c[v>>2]=w;v=m+(j*72|0)+20|0;w=c[v>>2]|0;i=((w|0)<0)<<31>>31;f=rb(w|0,i|0,2145680959,0)|0;e=y;u=m+(t*72|0)+48|0;g=c[u>>2]|0;h=((g|0)<0)<<31>>31;x=rb(g|0,h|0,87972919,0)|0;e=nb(x|0,y|0,f|0,e|0)|0;e=pb(e|0,y|0,31)|0;i=rb(w|0,i|0,-87972919,-1)|0;w=y;h=rb(g|0,h|0,2145680959,0)|0;w=nb(h|0,y|0,i|0,w|0)|0;w=pb(w|0,y|0,31)|0;c[u>>2]=w;c[v>>2]=e;v=m+(j*72|0)+24|0;e=c[v>>2]|0;u=((e|0)<0)<<31>>31;w=rb(e|0,u|0,2147267170,0)|0;i=y;h=m+(t*72|0)+44|0;g=c[h>>2]|0;f=((g|0)<0)<<31>>31;x=rb(g|0,f|0,30491193,0)|0;i=nb(x|0,y|0,w|0,i|0)|0;i=pb(i|0,y|0,31)|0;u=rb(e|0,u|0,-30491193,-1)|0;e=y;f=rb(g|0,f|0,2147267170,0)|0;e=nb(f|0,y|0,u|0,e|0)|0;e=pb(e|0,y|0,31)|0;c[h>>2]=e;c[v>>2]=i;v=m+(j*72|0)+28|0;i=c[v>>2]|0;h=((i|0)<0)<<31>>31;e=rb(i|0,h|0,2147468947,0)|0;u=y;t=m+(t*72|0)+40|0;f=c[t>>2]|0;g=((f|0)<0)<<31>>31;w=rb(f|0,g|0,7945635,0)|0;u=nb(w|0,y|0,e|0,u|0)|0;u=pb(u|0,y|0,31)|0;h=rb(i|0,h|0,-7945635,-1)|0;i=y;g=rb(f|0,g|0,2147468947,0)|0;i=nb(g|0,y|0,h|0,i|0)|0;i=pb(i|0,y|0,31)|0;c[t>>2]=i;c[v>>2]=u;j=j+1|0;if((j|0)==32)break}e=c[q>>2]|0}while((n|0)<(e|0))}tb(a+11440+(d*6912|0)|0,a+11440+(d*6912|0)+(e*2304|0)|0,2304)|0}while((d|0)!=0);l=s;return}function Da(a){a=a|0;var b=0,d=0.0,e=0,f=0,g=0,i=0,j=0;j=l;l=l+16|0;e=j;c[a+83588>>2]=0;c[a+83584>>2]=0;ob(a+91784|0,0,4096)|0;g=31;while(1){i=g<<1|1;b=64;f=63;while(1){d=+D(+(+(N(17-b|0,i)|0)*.049087385212))*1.0e9;h[e>>3]=d;if(!(d>=0.0))+bb(d+-.5,e);else+bb(d+.5,e);c[a+83592+(g<<8)+(f<<2)>>2]=~~(+h[e>>3]*2.147483647);if(!f)break;else{b=f;f=f+-1|0}}if(!g)break;else g=g+-1|0}l=j;return}function Ea(a,b,d,f,g){a=a|0;b=b|0;d=d|0;f=f|0;g=g|0;var h=0,i=0,j=0,k=0,m=0,n=0,o=0,p=0;p=l;l=l+256|0;o=p;j=c[a>>2]|0;n=f+83584+(d<<2)|0;k=g<<5;h=j;i=31;m=c[n>>2]|0;while(1){c[f+91784+(d<<11)+(i+m<<2)>>2]=(e[h>>1]|0)<<16;m=c[n>>2]|0;if(!i)break;else{h=h+(g<<1)|0;i=i+-1|0}}c[a>>2]=j+(k<<1);h=64;a=63;while(1){j=a+m|0;k=c[f+91784+(d<<11)+((j&511)<<2)>>2]|0;g=c[2292+(a<<2)>>2]|0;rb(g|0,((g|0)<0)<<31>>31|0,k|0,((k|0)<0)<<31>>31|0)|0;k=y;g=c[f+91784+(d<<11)+((j+64&511)<<2)>>2]|0;i=c[2292+(h+63<<2)>>2]|0;rb(i|0,((i|0)<0)<<31>>31|0,g|0,((g|0)<0)<<31>>31|0)|0;k=y+k|0;g=c[f+91784+(d<<11)+((j+128&511)<<2)>>2]|0;i=c[2292+(h+127<<2)>>2]|0;rb(i|0,((i|0)<0)<<31>>31|0,g|0,((g|0)<0)<<31>>31|0)|0;k=k+y|0;g=c[f+91784+(d<<11)+((j+192&511)<<2)>>2]|0;i=c[2292+(h+191<<2)>>2]|0;rb(i|0,((i|0)<0)<<31>>31|0,g|0,((g|0)<0)<<31>>31|0)|0;k=k+y|0;g=c[f+91784+(d<<11)+((j+256&511)<<2)>>2]|0;i=c[2292+(h+255<<2)>>2]|0;rb(i|0,((i|0)<0)<<31>>31|0,g|0,((g|0)<0)<<31>>31|0)|0;k=k+y|0;g=c[f+91784+(d<<11)+((j+320&511)<<2)>>2]|0;i=c[2292+(h+319<<2)>>2]|0;rb(i|0,((i|0)<0)<<31>>31|0,g|0,((g|0)<0)<<31>>31|0)|0;k=k+y|0;g=c[f+91784+(d<<11)+((j+384&511)<<2)>>2]|0;i=c[2292+(h+383<<2)>>2]|0;rb(i|0,((i|0)<0)<<31>>31|0,g|0,((g|0)<0)<<31>>31|0)|0;k=k+y|0;j=c[f+91784+(d<<11)+((j+448&511)<<2)>>2]|0;g=c[2292+(h+447<<2)>>2]|0;rb(g|0,((g|0)<0)<<31>>31|0,j|0,((j|0)<0)<<31>>31|0)|0;c[o+(a<<2)>>2]=k+y;if(!a)break;else{h=a;a=a+-1|0}}c[n>>2]=m+480&511;i=c[o+252>>2]|0;g=((i|0)<0)<<31>>31;j=31;while(1){h=c[f+83592+(j<<8)+252>>2]|0;rb(i|0,g|0,h|0,((h|0)<0)<<31>>31|0)|0;h=y;a=63;do{m=a+-1|0;n=c[f+83592+(j<<8)+(m<<2)>>2]|0;m=c[o+(m<<2)>>2]|0;rb(m|0,((m|0)<0)<<31>>31|0,n|0,((n|0)<0)<<31>>31|0)|0;n=y+h|0;m=a+-2|0;d=c[f+83592+(j<<8)+(m<<2)>>2]|0;m=c[o+(m<<2)>>2]|0;rb(m|0,((m|0)<0)<<31>>31|0,d|0,((d|0)<0)<<31>>31|0)|0;n=n+y|0;d=a+-3|0;m=c[f+83592+(j<<8)+(d<<2)>>2]|0;d=c[o+(d<<2)>>2]|0;rb(d|0,((d|0)<0)<<31>>31|0,m|0,((m|0)<0)<<31>>31|0)|0;n=n+y|0;m=a+-4|0;d=c[f+83592+(j<<8)+(m<<2)>>2]|0;m=c[o+(m<<2)>>2]|0;rb(m|0,((m|0)<0)<<31>>31|0,d|0,((d|0)<0)<<31>>31|0)|0;n=n+y|0;d=a+-5|0;m=c[f+83592+(j<<8)+(d<<2)>>2]|0;d=c[o+(d<<2)>>2]|0;rb(d|0,((d|0)<0)<<31>>31|0,m|0,((m|0)<0)<<31>>31|0)|0;n=n+y|0;m=a+-6|0;d=c[f+83592+(j<<8)+(m<<2)>>2]|0;m=c[o+(m<<2)>>2]|0;rb(m|0,((m|0)<0)<<31>>31|0,d|0,((d|0)<0)<<31>>31|0)|0;n=n+y|0;a=a+-7|0;d=c[f+83592+(j<<8)+(a<<2)>>2]|0;m=c[o+(a<<2)>>2]|0;rb(m|0,((m|0)<0)<<31>>31|0,d|0,((d|0)<0)<<31>>31|0)|0;h=n+y|0}while((a|0)!=0);c[b+(j<<2)>>2]=h;if(!j)break;else j=j+-1|0}l=p;return}function Fa(a){a=a|0;c[a+4>>2]=128;c[a+8>>2]=0;c[a+12>>2]=0;c[a+16>>2]=1;return}function Ga(a,b){a=a|0;b=b|0;if((c[1208+(b<<2)>>2]|0)==(a|0)){b=0;return b|0}if((c[1224+(b<<2)>>2]|0)==(a|0)){b=1;return b|0}if((c[1240+(b<<2)>>2]|0)==(a|0)){b=2;return b|0}if((c[1256+(b<<2)>>2]|0)==(a|0)){b=3;return b|0}if((c[1272+(b<<2)>>2]|0)==(a|0)){b=4;return b|0}if((c[1288+(b<<2)>>2]|0)==(a|0)){b=5;return b|0}if((c[1304+(b<<2)>>2]|0)==(a|0)){b=6;return b|0}if((c[1320+(b<<2)>>2]|0)==(a|0)){b=7;return b|0}if((c[1336+(b<<2)>>2]|0)==(a|0)){b=8;return b|0}if((c[1352+(b<<2)>>2]|0)==(a|0)){b=9;return b|0}if((c[1368+(b<<2)>>2]|0)==(a|0)){b=10;return b|0}if((c[1384+(b<<2)>>2]|0)==(a|0)){b=11;return b|0}if((c[1400+(b<<2)>>2]|0)==(a|0)){b=12;return b|0}if((c[1416+(b<<2)>>2]|0)==(a|0)){b=13;return b|0}if((c[1432+(b<<2)>>2]|0)==(a|0)){b=14;return b|0}else return ((c[1448+(b<<2)>>2]|0)==(a|0)?15:-1)|0;return 0}function Ha(a,b){a=a|0;b=b|0;if((c[293]|0)!=(a|0))if((c[294]|0)!=(a|0))if((c[295]|0)!=(a|0))if((c[296]|0)!=(a|0))if((c[297]|0)!=(a|0))if((c[298]|0)!=(a|0))if((c[299]|0)!=(a|0))if((c[300]|0)!=(a|0))if((c[301]|0)==(a|0))a=8;else{b=-1;return b|0}else a=7;else a=6;else a=5;else a=4;else a=3;else a=2;else a=1;else a=0;a=a>>>0<3?3:a>>>0<6?2:0;b=(Ga(b,a)|0)<0;b=b?-1:a;return b|0}function Ia(a){a=a|0;return (c[a+16>>2]|0)*576|0}function Ja(a){a=a|0;var b=0,d=0,e=0,f=0,g=0,i=0,j=0,k=0.0;e=a+4|0;b=c[e>>2]|0;i=a+12|0;d=c[i>>2]|0;j=c[293]|0;if((j|0)!=(b|0))if((c[294]|0)!=(b|0))if((c[295]|0)!=(b|0))if((c[296]|0)!=(b|0))if((c[297]|0)!=(b|0))if((c[298]|0)!=(b|0))if((c[299]|0)!=(b|0))if((c[300]|0)!=(b|0))if((c[301]|0)==(b|0))b=8;else{j=0;return j|0}else b=7;else b=6;else b=5;else b=4;else b=3;else b=2;else b=1;else b=0;if((Ga(d,b>>>0<3?3:b>>>0<6?2:0)|0)<0){j=0;return j|0}g=ib(1,95880)|0;if(!g){j=g;return j|0}Da(g);Ba(g);Aa(g);c[g>>2]=c[a>>2];f=c[e>>2]|0;c[g+4>>2]=f;d=g+8|0;c[g+20>>2]=c[a+8>>2];e=c[i>>2]|0;c[g+24>>2]=e;c[g+28>>2]=c[a+16>>2];c[g+88>>2]=c[a+20>>2];c[g+92>>2]=c[a+24>>2];c[g+34484>>2]=0;c[g+34480>>2]=0;c[g+12>>2]=1;c[g+76>>2]=0;c[g+80>>2]=0;c[g+84>>2]=0;c[g+40>>2]=8;if((j|0)!=(f|0))if((c[294]|0)!=(f|0))if((c[295]|0)!=(f|0))if((c[296]|0)!=(f|0))if((c[297]|0)!=(f|0))if((c[298]|0)!=(f|0))if((c[299]|0)!=(f|0))if((c[300]|0)==(f|0))b=7;else b=(c[301]|0)==(f|0)?8:-1;else b=6;else b=5;else b=4;else b=3;else b=2;else b=1;else b=0;c[g+72>>2]=b;j=(b|0)<3?3:(b|0)<6?2:0;c[d>>2]=j;c[g+68>>2]=Ga(e,j)|0;j=c[1028+(j<<2)>>2]|0;b=g+16|0;c[b>>2]=j;k=+(j|0)*576.0/+(f|0)*(+(e|0)*1.0e3*.125);j=~~k;c[g+64>>2]=j;k=k-+(j|0);h[g+48>>3]=k;h[g+56>>3]=-k;if(k==0.0)c[g+32>>2]=0;ra(g+96|0,4096);ob(g+116|0,0,408)|0;j=(c[g>>2]|0)==1;c[g+524>>2]=(c[b>>2]|0)==2?(j?168:288):j?104:168;j=g;return j|0}function Ka(a,b,d){a=a|0;b=b|0;d=d|0;var e=0.0,f=0,g=0,i=0.0;c[a+2184>>2]=c[b>>2];if((c[a>>2]|0)==2)c[a+2188>>2]=c[b+4>>2];e=+h[a+48>>3];if(e!=0.0){f=a+56|0;i=+h[f>>3];g=i<=e+-1.0;b=g&1;c[a+32>>2]=b;h[f>>3]=i+(+(g&1)-e)}else b=c[a+32>>2]|0;g=(c[a+64>>2]|0)+b<<3;c[a+36>>2]=g;c[a+528>>2]=(g-(c[a+524>>2]|0)|0)/(c[a+16>>2]|0)|0;Ca(a,1);za(a);va(a);g=a+104|0;c[d>>2]=c[g>>2];c[g>>2]=0;return c[a+96>>2]|0}function La(a,b){a=a|0;b=b|0;var d=0;d=a+104|0;c[b>>2]=c[d>>2];c[d>>2]=0;return c[a+96>>2]|0}function Ma(a){a=a|0;sa(a+96|0);hb(a);return}function Na(a,b){a=a|0;b=b|0;var d=0,e=0,f=0;d=(c[b+528>>2]|0)/(c[b>>2]|0)|0;e=(d|0)<4095?d:4095;f=c[b+34484>>2]|0;if(!f){f=e;return f|0}a=~~(+h[a>>3]*3.1-+(d|0));d=c[b+34480>>2]|0;if((a|0)>100){b=(d*6|0)/10|0;a=(b|0)<(a|0)?b:a}else a=0;f=d-((f<<3|0)/10|0)|0;f=((f|0)>(a|0)?f:a)+e|0;f=(f|0)<4095?f:4095;return f|0}function Oa(a,b){a=a|0;b=b|0;var d=0;d=b+34480|0;c[d>>2]=((c[b+528>>2]|0)/(c[b>>2]|0)|0)-(c[a>>2]|0)+(c[d>>2]|0);return}function Pa(a){a=a|0;var b=0,d=0,e=0,f=0,g=0,h=0,i=0;f=c[a>>2]|0;if((f|0)==2?c[a+528>>2]&1|0:0){h=a+34480|0;c[h>>2]=(c[h>>2]|0)+1}h=a+34480|0;e=c[h>>2]|0;b=e-(c[a+34484>>2]|0)|0;b=(b|0)>0?b:0;e=e-b|0;g=(e|0)%8|0;b=g+b|0;c[h>>2]=e-g;if(!b)return;d=a+156|0;e=(c[d>>2]|0)+b|0;if(e>>>0<4095){c[d>>2]=e;return}h=a+16|0;d=c[h>>2]|0;if((d|0)>0){g=0;e=f;do{if((e|0)>0){f=0;d=e;while(1){if(!b){b=0;e=d;break}e=a+156+(g*184|0)+(f*92|0)|0;i=c[e>>2]|0;d=4095-i|0;d=(d|0)<(b|0)?d:b;c[e>>2]=d+i;b=b-d|0;f=f+1|0;d=c[a>>2]|0;if((f|0)>=(d|0)){e=d;break}}d=c[h>>2]|0}g=g+1|0}while((g|0)<(d|0))}c[a+120>>2]=b;return}function Qa(a,b,d,e){a=a|0;b=b|0;d=d|0;e=e|0;var f=0,g=0;f=l;l=l+32|0;g=f;c[g>>2]=a;c[g+4>>2]=b;b=g+8|0;Fa(b);c[b>>2]=d;c[g+12>>2]=e;e=Ja(g)|0;l=f;return e|0}function Ra(){return 8944}function Sa(a){a=a|0;var b=0,d=0;b=l;l=l+16|0;d=b;c[d>>2]=Za(c[a+60>>2]|0)|0;a=Va(ba(6,d|0)|0)|0;l=b;return a|0}function Ta(a,b,d){a=a|0;b=b|0;d=d|0;var e=0,f=0,g=0,h=0,i=0,j=0,k=0,m=0,n=0,o=0,p=0;n=l;l=l+48|0;k=n+16|0;g=n;f=n+32|0;i=a+28|0;e=c[i>>2]|0;c[f>>2]=e;j=a+20|0;e=(c[j>>2]|0)-e|0;c[f+4>>2]=e;c[f+8>>2]=b;c[f+12>>2]=d;e=e+d|0;h=a+60|0;c[g>>2]=c[h>>2];c[g+4>>2]=f;c[g+8>>2]=2;g=Va(ga(146,g|0)|0)|0;a:do if((e|0)!=(g|0)){b=2;while(1){if((g|0)<0)break;e=e-g|0;p=c[f+4>>2]|0;o=g>>>0>p>>>0;f=o?f+8|0:f;b=(o<<31>>31)+b|0;p=g-(o?p:0)|0;c[f>>2]=(c[f>>2]|0)+p;o=f+4|0;c[o>>2]=(c[o>>2]|0)-p;c[k>>2]=c[h>>2];c[k+4>>2]=f;c[k+8>>2]=b;g=Va(ga(146,k|0)|0)|0;if((e|0)==(g|0)){m=3;break a}}c[a+16>>2]=0;c[i>>2]=0;c[j>>2]=0;c[a>>2]=c[a>>2]|32;if((b|0)==2)d=0;else d=d-(c[f+4>>2]|0)|0}else m=3;while(0);if((m|0)==3){p=c[a+44>>2]|0;c[a+16>>2]=p+(c[a+48>>2]|0);c[i>>2]=p;c[j>>2]=p}l=n;return d|0}function Ua(a,b,d){a=a|0;b=b|0;d=d|0;var e=0,f=0,g=0;f=l;l=l+32|0;g=f;e=f+20|0;c[g>>2]=c[a+60>>2];c[g+4>>2]=0;c[g+8>>2]=b;c[g+12>>2]=e;c[g+16>>2]=d;if((Va(ca(140,g|0)|0)|0)<0){c[e>>2]=-1;a=-1}else a=c[e>>2]|0;l=f;return a|0}function Va(a){a=a|0;if(a>>>0>4294963200){c[(Wa()|0)>>2]=0-a;a=-1}return a|0}function Wa(){return (Xa()|0)+64|0}function Xa(){return Ya()|0}function Ya(){return 4340}function Za(a){a=a|0;return a|0}function _a(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0;g=l;l=l+32|0;f=g;c[b+36>>2]=3;if((c[b>>2]&64|0)==0?(c[f>>2]=c[b+60>>2],c[f+4>>2]=21523,c[f+8>>2]=g+16,ea(54,f|0)|0):0)a[b+75>>0]=-1;f=Ta(b,d,e)|0;l=g;return f|0}function $a(a){a=a|0;return 0}function ab(a){a=a|0;return}function bb(a,b){a=+a;b=b|0;var d=0,e=0,f=0,g=0,i=0.0;h[j>>3]=a;f=c[j>>2]|0;g=c[j+4>>2]|0;d=pb(f|0,g|0,52)|0;d=d&2047;e=d+-1023|0;if((e|0)>51){h[b>>3]=a;c[j>>2]=0;c[j+4>>2]=g&-2147483648;return +((f|0)==0&(g&1048575|0)==0|(e|0)!=1024?+h[j>>3]:a)}do if(d>>>0>=1023){d=pb(-1,1048575,e|0)|0;e=y;if((d&f|0)==0&(e&g|0)==0){h[b>>3]=a;c[j>>2]=0;c[j+4>>2]=g&-2147483648;a=+h[j>>3];break}else{d=f&~d;f=g&~e;c[j>>2]=d;c[j+4>>2]=f;i=+h[j>>3];g=b;c[g>>2]=d;c[g+4>>2]=f;a=a-i;break}}else{f=b;c[f>>2]=0;c[f+4>>2]=g&-2147483648}while(0);return +a}function cb(){Z(9008);return 9016}function db(){fa(9008);return}function eb(a){a=a|0;var b=0,d=0;do if(a){if((c[a+76>>2]|0)<=-1){b=fb(a)|0;break}d=($a(a)|0)==0;b=fb(a)|0;if(!d)ab(a)}else{if(!(c[1177]|0))b=0;else b=eb(c[1177]|0)|0;a=c[(cb()|0)>>2]|0;if(a)do{if((c[a+76>>2]|0)>-1)d=$a(a)|0;else d=0;if((c[a+20>>2]|0)>>>0>(c[a+28>>2]|0)>>>0)b=fb(a)|0|b;if(d|0)ab(a);a=c[a+56>>2]|0}while((a|0)!=0);db()}while(0);return b|0}function fb(a){a=a|0;var b=0,d=0,e=0,f=0,g=0,h=0;b=a+20|0;h=a+28|0;if((c[b>>2]|0)>>>0>(c[h>>2]|0)>>>0?(ja[c[a+36>>2]&3](a,0,0)|0,(c[b>>2]|0)==0):0)a=-1;else{d=a+4|0;e=c[d>>2]|0;f=a+8|0;g=c[f>>2]|0;if(e>>>0<g>>>0)ja[c[a+40>>2]&3](a,e-g|0,1)|0;c[a+16>>2]=0;c[h>>2]=0;c[b>>2]=0;c[f>>2]=0;c[d>>2]=0;a=0}return a|0}function gb(a){a=a|0;var b=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,F=0,G=0,H=0,I=0,J=0,K=0;K=l;l=l+16|0;o=K;do if(a>>>0<245){p=a>>>0<11?16:a+11&-8;a=p>>>3;t=c[2255]|0;d=t>>>a;if(d&3|0){a=(d&1^1)+a|0;d=9060+(a<<1<<2)|0;e=d+8|0;f=c[e>>2]|0;g=f+8|0;h=c[g>>2]|0;do if((d|0)!=(h|0)){if(h>>>0<(c[2259]|0)>>>0)$();b=h+12|0;if((c[b>>2]|0)==(f|0)){c[b>>2]=d;c[e>>2]=h;break}else $()}else c[2255]=t&~(1<<a);while(0);J=a<<3;c[f+4>>2]=J|3;J=f+J+4|0;c[J>>2]=c[J>>2]|1;J=g;l=K;return J|0}s=c[2257]|0;if(p>>>0>s>>>0){if(d|0){i=2<<a;a=d<<a&(i|0-i);a=(a&0-a)+-1|0;i=a>>>12&16;a=a>>>i;e=a>>>5&8;a=a>>>e;g=a>>>2&4;a=a>>>g;d=a>>>1&2;a=a>>>d;b=a>>>1&1;b=(e|i|g|d|b)+(a>>>b)|0;a=9060+(b<<1<<2)|0;d=a+8|0;g=c[d>>2]|0;i=g+8|0;e=c[i>>2]|0;do if((a|0)!=(e|0)){if(e>>>0<(c[2259]|0)>>>0)$();f=e+12|0;if((c[f>>2]|0)==(g|0)){c[f>>2]=a;c[d>>2]=e;j=t;break}else $()}else{j=t&~(1<<b);c[2255]=j}while(0);h=(b<<3)-p|0;c[g+4>>2]=p|3;e=g+p|0;c[e+4>>2]=h|1;c[e+h>>2]=h;if(s|0){f=c[2260]|0;b=s>>>3;d=9060+(b<<1<<2)|0;b=1<<b;if(j&b){b=d+8|0;a=c[b>>2]|0;if(a>>>0<(c[2259]|0)>>>0)$();else{k=a;m=b}}else{c[2255]=j|b;k=d;m=d+8|0}c[m>>2]=f;c[k+12>>2]=f;c[f+8>>2]=k;c[f+12>>2]=d}c[2257]=h;c[2260]=e;J=i;l=K;return J|0}k=c[2256]|0;if(k){a=(k&0-k)+-1|0;I=a>>>12&16;a=a>>>I;H=a>>>5&8;a=a>>>H;J=a>>>2&4;a=a>>>J;d=a>>>1&2;a=a>>>d;b=a>>>1&1;b=c[9324+((H|I|J|d|b)+(a>>>b)<<2)>>2]|0;a=(c[b+4>>2]&-8)-p|0;d=c[b+16+(((c[b+16>>2]|0)==0&1)<<2)>>2]|0;if(!d){j=b;h=a}else{do{I=(c[d+4>>2]&-8)-p|0;J=I>>>0<a>>>0;a=J?I:a;b=J?d:b;d=c[d+16+(((c[d+16>>2]|0)==0&1)<<2)>>2]|0}while((d|0)!=0);j=b;h=a}f=c[2259]|0;if(j>>>0<f>>>0)$();i=j+p|0;if(j>>>0>=i>>>0)$();g=c[j+24>>2]|0;d=c[j+12>>2]|0;do if((d|0)==(j|0)){a=j+20|0;b=c[a>>2]|0;if(!b){a=j+16|0;b=c[a>>2]|0;if(!b){n=0;break}}while(1){d=b+20|0;e=c[d>>2]|0;if(e|0){b=e;a=d;continue}d=b+16|0;e=c[d>>2]|0;if(!e)break;else{b=e;a=d}}if(a>>>0<f>>>0)$();else{c[a>>2]=0;n=b;break}}else{e=c[j+8>>2]|0;if(e>>>0<f>>>0)$();b=e+12|0;if((c[b>>2]|0)!=(j|0))$();a=d+8|0;if((c[a>>2]|0)==(j|0)){c[b>>2]=d;c[a>>2]=e;n=d;break}else $()}while(0);a:do if(g|0){b=c[j+28>>2]|0;a=9324+(b<<2)|0;do if((j|0)==(c[a>>2]|0)){c[a>>2]=n;if(!n){c[2256]=k&~(1<<b);break a}}else if(g>>>0>=(c[2259]|0)>>>0){c[g+16+(((c[g+16>>2]|0)!=(j|0)&1)<<2)>>2]=n;if(!n)break a;else break}else $();while(0);a=c[2259]|0;if(n>>>0<a>>>0)$();c[n+24>>2]=g;b=c[j+16>>2]|0;do if(b|0)if(b>>>0<a>>>0)$();else{c[n+16>>2]=b;c[b+24>>2]=n;break}while(0);b=c[j+20>>2]|0;if(b|0)if(b>>>0<(c[2259]|0)>>>0)$();else{c[n+20>>2]=b;c[b+24>>2]=n;break}}while(0);if(h>>>0<16){J=h+p|0;c[j+4>>2]=J|3;J=j+J+4|0;c[J>>2]=c[J>>2]|1}else{c[j+4>>2]=p|3;c[i+4>>2]=h|1;c[i+h>>2]=h;if(s|0){e=c[2260]|0;b=s>>>3;d=9060+(b<<1<<2)|0;b=1<<b;if(t&b){b=d+8|0;a=c[b>>2]|0;if(a>>>0<(c[2259]|0)>>>0)$();else{q=a;r=b}}else{c[2255]=t|b;q=d;r=d+8|0}c[r>>2]=e;c[q+12>>2]=e;c[e+8>>2]=q;c[e+12>>2]=d}c[2257]=h;c[2260]=i}J=j+8|0;l=K;return J|0}}}else if(a>>>0<=4294967231){a=a+11|0;p=a&-8;k=c[2256]|0;if(k){e=0-p|0;a=a>>>8;if(a)if(p>>>0>16777215)i=31;else{r=(a+1048320|0)>>>16&8;C=a<<r;q=(C+520192|0)>>>16&4;C=C<<q;i=(C+245760|0)>>>16&2;i=14-(q|r|i)+(C<<i>>>15)|0;i=p>>>(i+7|0)&1|i<<1}else i=0;d=c[9324+(i<<2)>>2]|0;b:do if(!d){d=0;a=0;C=81}else{a=0;h=p<<((i|0)==31?0:25-(i>>>1)|0);g=0;while(1){f=(c[d+4>>2]&-8)-p|0;if(f>>>0<e>>>0)if(!f){a=d;e=0;f=d;C=85;break b}else{a=d;e=f}f=c[d+20>>2]|0;d=c[d+16+(h>>>31<<2)>>2]|0;g=(f|0)==0|(f|0)==(d|0)?g:f;f=(d|0)==0;if(f){d=g;C=81;break}else h=h<<((f^1)&1)}}while(0);if((C|0)==81){if((d|0)==0&(a|0)==0){a=2<<i;a=k&(a|0-a);if(!a)break;r=(a&0-a)+-1|0;m=r>>>12&16;r=r>>>m;j=r>>>5&8;r=r>>>j;n=r>>>2&4;r=r>>>n;q=r>>>1&2;r=r>>>q;d=r>>>1&1;a=0;d=c[9324+((j|m|n|q|d)+(r>>>d)<<2)>>2]|0}if(!d){j=a;i=e}else{f=d;C=85}}if((C|0)==85)while(1){C=0;d=(c[f+4>>2]&-8)-p|0;r=d>>>0<e>>>0;d=r?d:e;a=r?f:a;f=c[f+16+(((c[f+16>>2]|0)==0&1)<<2)>>2]|0;if(!f){j=a;i=d;break}else{e=d;C=85}}if((j|0)!=0?i>>>0<((c[2257]|0)-p|0)>>>0:0){f=c[2259]|0;if(j>>>0<f>>>0)$();h=j+p|0;if(j>>>0>=h>>>0)$();g=c[j+24>>2]|0;d=c[j+12>>2]|0;do if((d|0)==(j|0)){a=j+20|0;b=c[a>>2]|0;if(!b){a=j+16|0;b=c[a>>2]|0;if(!b){s=0;break}}while(1){d=b+20|0;e=c[d>>2]|0;if(e|0){b=e;a=d;continue}d=b+16|0;e=c[d>>2]|0;if(!e)break;else{b=e;a=d}}if(a>>>0<f>>>0)$();else{c[a>>2]=0;s=b;break}}else{e=c[j+8>>2]|0;if(e>>>0<f>>>0)$();b=e+12|0;if((c[b>>2]|0)!=(j|0))$();a=d+8|0;if((c[a>>2]|0)==(j|0)){c[b>>2]=d;c[a>>2]=e;s=d;break}else $()}while(0);c:do if(g){b=c[j+28>>2]|0;a=9324+(b<<2)|0;do if((j|0)==(c[a>>2]|0)){c[a>>2]=s;if(!s){t=k&~(1<<b);c[2256]=t;break c}}else if(g>>>0>=(c[2259]|0)>>>0){c[g+16+(((c[g+16>>2]|0)!=(j|0)&1)<<2)>>2]=s;if(!s){t=k;break c}else break}else $();while(0);a=c[2259]|0;if(s>>>0<a>>>0)$();c[s+24>>2]=g;b=c[j+16>>2]|0;do if(b|0)if(b>>>0<a>>>0)$();else{c[s+16>>2]=b;c[b+24>>2]=s;break}while(0);b=c[j+20>>2]|0;if(b)if(b>>>0<(c[2259]|0)>>>0)$();else{c[s+20>>2]=b;c[b+24>>2]=s;t=k;break}else t=k}else t=k;while(0);do if(i>>>0>=16){c[j+4>>2]=p|3;c[h+4>>2]=i|1;c[h+i>>2]=i;b=i>>>3;if(i>>>0<256){d=9060+(b<<1<<2)|0;a=c[2255]|0;b=1<<b;if(a&b){b=d+8|0;a=c[b>>2]|0;if(a>>>0<(c[2259]|0)>>>0)$();else{x=a;y=b}}else{c[2255]=a|b;x=d;y=d+8|0}c[y>>2]=h;c[x+12>>2]=h;c[h+8>>2]=x;c[h+12>>2]=d;break}b=i>>>8;if(b)if(i>>>0>16777215)b=31;else{I=(b+1048320|0)>>>16&8;J=b<<I;H=(J+520192|0)>>>16&4;J=J<<H;b=(J+245760|0)>>>16&2;b=14-(H|I|b)+(J<<b>>>15)|0;b=i>>>(b+7|0)&1|b<<1}else b=0;d=9324+(b<<2)|0;c[h+28>>2]=b;a=h+16|0;c[a+4>>2]=0;c[a>>2]=0;a=1<<b;if(!(t&a)){c[2256]=t|a;c[d>>2]=h;c[h+24>>2]=d;c[h+12>>2]=h;c[h+8>>2]=h;break}a=i<<((b|0)==31?0:25-(b>>>1)|0);e=c[d>>2]|0;while(1){if((c[e+4>>2]&-8|0)==(i|0)){C=139;break}d=e+16+(a>>>31<<2)|0;b=c[d>>2]|0;if(!b){C=136;break}else{a=a<<1;e=b}}if((C|0)==136)if(d>>>0<(c[2259]|0)>>>0)$();else{c[d>>2]=h;c[h+24>>2]=e;c[h+12>>2]=h;c[h+8>>2]=h;break}else if((C|0)==139){b=e+8|0;a=c[b>>2]|0;J=c[2259]|0;if(a>>>0>=J>>>0&e>>>0>=J>>>0){c[a+12>>2]=h;c[b>>2]=h;c[h+8>>2]=a;c[h+12>>2]=e;c[h+24>>2]=0;break}else $()}}else{J=i+p|0;c[j+4>>2]=J|3;J=j+J+4|0;c[J>>2]=c[J>>2]|1}while(0);J=j+8|0;l=K;return J|0}}}else p=-1;while(0);d=c[2257]|0;if(d>>>0>=p>>>0){b=d-p|0;a=c[2260]|0;if(b>>>0>15){J=a+p|0;c[2260]=J;c[2257]=b;c[J+4>>2]=b|1;c[J+b>>2]=b;c[a+4>>2]=p|3}else{c[2257]=0;c[2260]=0;c[a+4>>2]=d|3;J=a+d+4|0;c[J>>2]=c[J>>2]|1}J=a+8|0;l=K;return J|0}h=c[2258]|0;if(h>>>0>p>>>0){H=h-p|0;c[2258]=H;J=c[2261]|0;I=J+p|0;c[2261]=I;c[I+4>>2]=H|1;c[J+4>>2]=p|3;J=J+8|0;l=K;return J|0}if(!(c[2373]|0)){c[2375]=4096;c[2374]=4096;c[2376]=-1;c[2377]=-1;c[2378]=0;c[2366]=0;a=o&-16^1431655768;c[o>>2]=a;c[2373]=a;a=4096}else a=c[2375]|0;i=p+48|0;j=p+47|0;g=a+j|0;f=0-a|0;k=g&f;if(k>>>0<=p>>>0){J=0;l=K;return J|0}a=c[2365]|0;if(a|0?(x=c[2363]|0,y=x+k|0,y>>>0<=x>>>0|y>>>0>a>>>0):0){J=0;l=K;return J|0}d:do if(!(c[2366]&4)){d=c[2261]|0;e:do if(d){e=9468;while(1){a=c[e>>2]|0;if(a>>>0<=d>>>0?(w=e+4|0,(a+(c[w>>2]|0)|0)>>>0>d>>>0):0)break;a=c[e+8>>2]|0;if(!a){C=163;break e}else e=a}b=g-h&f;if(b>>>0<2147483647){a=sb(b|0)|0;if((a|0)==((c[e>>2]|0)+(c[w>>2]|0)|0)){if((a|0)!=(-1|0)){h=b;g=a;C=180;break d}}else{e=a;C=171}}else b=0}else C=163;while(0);do if((C|0)==163){d=sb(0)|0;if((d|0)!=(-1|0)?(b=d,u=c[2374]|0,v=u+-1|0,b=((v&b|0)==0?0:(v+b&0-u)-b|0)+k|0,u=c[2363]|0,v=b+u|0,b>>>0>p>>>0&b>>>0<2147483647):0){y=c[2365]|0;if(y|0?v>>>0<=u>>>0|v>>>0>y>>>0:0){b=0;break}a=sb(b|0)|0;if((a|0)==(d|0)){h=b;g=d;C=180;break d}else{e=a;C=171}}else b=0}while(0);do if((C|0)==171){d=0-b|0;if(!(i>>>0>b>>>0&(b>>>0<2147483647&(e|0)!=(-1|0))))if((e|0)==(-1|0)){b=0;break}else{h=b;g=e;C=180;break d}a=c[2375]|0;a=j-b+a&0-a;if(a>>>0>=2147483647){h=b;g=e;C=180;break d}if((sb(a|0)|0)==(-1|0)){sb(d|0)|0;b=0;break}else{h=a+b|0;g=e;C=180;break d}}while(0);c[2366]=c[2366]|4;C=178}else{b=0;C=178}while(0);if(((C|0)==178?k>>>0<2147483647:0)?(B=sb(k|0)|0,y=sb(0)|0,z=y-B|0,A=z>>>0>(p+40|0)>>>0,!((B|0)==(-1|0)|A^1|B>>>0<y>>>0&((B|0)!=(-1|0)&(y|0)!=(-1|0))^1)):0){h=A?z:b;g=B;C=180}if((C|0)==180){b=(c[2363]|0)+h|0;c[2363]=b;if(b>>>0>(c[2364]|0)>>>0)c[2364]=b;k=c[2261]|0;do if(k){b=9468;while(1){a=c[b>>2]|0;d=b+4|0;e=c[d>>2]|0;if((g|0)==(a+e|0)){C=190;break}f=c[b+8>>2]|0;if(!f)break;else b=f}if(((C|0)==190?(c[b+12>>2]&8|0)==0:0)?k>>>0<g>>>0&k>>>0>=a>>>0:0){c[d>>2]=e+h;J=k+8|0;J=(J&7|0)==0?0:0-J&7;I=k+J|0;J=(c[2258]|0)+(h-J)|0;c[2261]=I;c[2258]=J;c[I+4>>2]=J|1;c[I+J+4>>2]=40;c[2262]=c[2377];break}b=c[2259]|0;if(g>>>0<b>>>0){c[2259]=g;i=g}else i=b;d=g+h|0;b=9468;while(1){if((c[b>>2]|0)==(d|0)){C=198;break}a=c[b+8>>2]|0;if(!a)break;else b=a}if((C|0)==198?(c[b+12>>2]&8|0)==0:0){c[b>>2]=g;n=b+4|0;c[n>>2]=(c[n>>2]|0)+h;n=g+8|0;n=g+((n&7|0)==0?0:0-n&7)|0;b=d+8|0;b=d+((b&7|0)==0?0:0-b&7)|0;m=n+p|0;j=b-n-p|0;c[n+4>>2]=p|3;do if((b|0)!=(k|0)){if((b|0)==(c[2260]|0)){J=(c[2257]|0)+j|0;c[2257]=J;c[2260]=m;c[m+4>>2]=J|1;c[m+J>>2]=J;break}a=c[b+4>>2]|0;if((a&3|0)==1){h=a&-8;f=a>>>3;f:do if(a>>>0>=256){g=c[b+24>>2]|0;e=c[b+12>>2]|0;do if((e|0)==(b|0)){e=b+16|0;d=e+4|0;a=c[d>>2]|0;if(!a){a=c[e>>2]|0;if(!a){H=0;break}else d=e}while(1){e=a+20|0;f=c[e>>2]|0;if(f|0){a=f;d=e;continue}e=a+16|0;f=c[e>>2]|0;if(!f)break;else{a=f;d=e}}if(d>>>0<i>>>0)$();else{c[d>>2]=0;H=a;break}}else{f=c[b+8>>2]|0;if(f>>>0<i>>>0)$();a=f+12|0;if((c[a>>2]|0)!=(b|0))$();d=e+8|0;if((c[d>>2]|0)==(b|0)){c[a>>2]=e;c[d>>2]=f;H=e;break}else $()}while(0);if(!g)break;a=c[b+28>>2]|0;d=9324+(a<<2)|0;do if((b|0)!=(c[d>>2]|0))if(g>>>0>=(c[2259]|0)>>>0){c[g+16+(((c[g+16>>2]|0)!=(b|0)&1)<<2)>>2]=H;if(!H)break f;else break}else $();else{c[d>>2]=H;if(H|0)break;c[2256]=c[2256]&~(1<<a);break f}while(0);e=c[2259]|0;if(H>>>0<e>>>0)$();c[H+24>>2]=g;a=b+16|0;d=c[a>>2]|0;do if(d|0)if(d>>>0<e>>>0)$();else{c[H+16>>2]=d;c[d+24>>2]=H;break}while(0);a=c[a+4>>2]|0;if(!a)break;if(a>>>0<(c[2259]|0)>>>0)$();else{c[H+20>>2]=a;c[a+24>>2]=H;break}}else{d=c[b+8>>2]|0;e=c[b+12>>2]|0;a=9060+(f<<1<<2)|0;do if((d|0)!=(a|0)){if(d>>>0<i>>>0)$();if((c[d+12>>2]|0)==(b|0))break;$()}while(0);if((e|0)==(d|0)){c[2255]=c[2255]&~(1<<f);break}do if((e|0)==(a|0))E=e+8|0;else{if(e>>>0<i>>>0)$();a=e+8|0;if((c[a>>2]|0)==(b|0)){E=a;break}$()}while(0);c[d+12>>2]=e;c[E>>2]=d}while(0);b=b+h|0;f=h+j|0}else f=j;b=b+4|0;c[b>>2]=c[b>>2]&-2;c[m+4>>2]=f|1;c[m+f>>2]=f;b=f>>>3;if(f>>>0<256){d=9060+(b<<1<<2)|0;a=c[2255]|0;b=1<<b;do if(!(a&b)){c[2255]=a|b;I=d;J=d+8|0}else{b=d+8|0;a=c[b>>2]|0;if(a>>>0>=(c[2259]|0)>>>0){I=a;J=b;break}$()}while(0);c[J>>2]=m;c[I+12>>2]=m;c[m+8>>2]=I;c[m+12>>2]=d;break}b=f>>>8;do if(!b)b=0;else{if(f>>>0>16777215){b=31;break}I=(b+1048320|0)>>>16&8;J=b<<I;H=(J+520192|0)>>>16&4;J=J<<H;b=(J+245760|0)>>>16&2;b=14-(H|I|b)+(J<<b>>>15)|0;b=f>>>(b+7|0)&1|b<<1}while(0);e=9324+(b<<2)|0;c[m+28>>2]=b;a=m+16|0;c[a+4>>2]=0;c[a>>2]=0;a=c[2256]|0;d=1<<b;if(!(a&d)){c[2256]=a|d;c[e>>2]=m;c[m+24>>2]=e;c[m+12>>2]=m;c[m+8>>2]=m;break}a=f<<((b|0)==31?0:25-(b>>>1)|0);e=c[e>>2]|0;while(1){if((c[e+4>>2]&-8|0)==(f|0)){C=265;break}d=e+16+(a>>>31<<2)|0;b=c[d>>2]|0;if(!b){C=262;break}else{a=a<<1;e=b}}if((C|0)==262)if(d>>>0<(c[2259]|0)>>>0)$();else{c[d>>2]=m;c[m+24>>2]=e;c[m+12>>2]=m;c[m+8>>2]=m;break}else if((C|0)==265){b=e+8|0;a=c[b>>2]|0;J=c[2259]|0;if(a>>>0>=J>>>0&e>>>0>=J>>>0){c[a+12>>2]=m;c[b>>2]=m;c[m+8>>2]=a;c[m+12>>2]=e;c[m+24>>2]=0;break}else $()}}else{J=(c[2258]|0)+j|0;c[2258]=J;c[2261]=m;c[m+4>>2]=J|1}while(0);J=n+8|0;l=K;return J|0}b=9468;while(1){a=c[b>>2]|0;if(a>>>0<=k>>>0?(D=a+(c[b+4>>2]|0)|0,D>>>0>k>>>0):0)break;b=c[b+8>>2]|0}f=D+-47|0;a=f+8|0;a=f+((a&7|0)==0?0:0-a&7)|0;f=k+16|0;a=a>>>0<f>>>0?k:a;b=a+8|0;d=g+8|0;d=(d&7|0)==0?0:0-d&7;J=g+d|0;d=h+-40-d|0;c[2261]=J;c[2258]=d;c[J+4>>2]=d|1;c[J+d+4>>2]=40;c[2262]=c[2377];d=a+4|0;c[d>>2]=27;c[b>>2]=c[2367];c[b+4>>2]=c[2368];c[b+8>>2]=c[2369];c[b+12>>2]=c[2370];c[2367]=g;c[2368]=h;c[2370]=0;c[2369]=b;b=a+24|0;do{J=b;b=b+4|0;c[b>>2]=7}while((J+8|0)>>>0<D>>>0);if((a|0)!=(k|0)){g=a-k|0;c[d>>2]=c[d>>2]&-2;c[k+4>>2]=g|1;c[a>>2]=g;b=g>>>3;if(g>>>0<256){d=9060+(b<<1<<2)|0;a=c[2255]|0;b=1<<b;if(a&b){b=d+8|0;a=c[b>>2]|0;if(a>>>0<(c[2259]|0)>>>0)$();else{F=a;G=b}}else{c[2255]=a|b;F=d;G=d+8|0}c[G>>2]=k;c[F+12>>2]=k;c[k+8>>2]=F;c[k+12>>2]=d;break}b=g>>>8;if(b)if(g>>>0>16777215)d=31;else{I=(b+1048320|0)>>>16&8;J=b<<I;H=(J+520192|0)>>>16&4;J=J<<H;d=(J+245760|0)>>>16&2;d=14-(H|I|d)+(J<<d>>>15)|0;d=g>>>(d+7|0)&1|d<<1}else d=0;e=9324+(d<<2)|0;c[k+28>>2]=d;c[k+20>>2]=0;c[f>>2]=0;b=c[2256]|0;a=1<<d;if(!(b&a)){c[2256]=b|a;c[e>>2]=k;c[k+24>>2]=e;c[k+12>>2]=k;c[k+8>>2]=k;break}a=g<<((d|0)==31?0:25-(d>>>1)|0);e=c[e>>2]|0;while(1){if((c[e+4>>2]&-8|0)==(g|0)){C=292;break}d=e+16+(a>>>31<<2)|0;b=c[d>>2]|0;if(!b){C=289;break}else{a=a<<1;e=b}}if((C|0)==289)if(d>>>0<(c[2259]|0)>>>0)$();else{c[d>>2]=k;c[k+24>>2]=e;c[k+12>>2]=k;c[k+8>>2]=k;break}else if((C|0)==292){b=e+8|0;a=c[b>>2]|0;J=c[2259]|0;if(a>>>0>=J>>>0&e>>>0>=J>>>0){c[a+12>>2]=k;c[b>>2]=k;c[k+8>>2]=a;c[k+12>>2]=e;c[k+24>>2]=0;break}else $()}}}else{J=c[2259]|0;if((J|0)==0|g>>>0<J>>>0)c[2259]=g;c[2367]=g;c[2368]=h;c[2370]=0;c[2264]=c[2373];c[2263]=-1;b=0;do{J=9060+(b<<1<<2)|0;c[J+12>>2]=J;c[J+8>>2]=J;b=b+1|0}while((b|0)!=32);J=g+8|0;J=(J&7|0)==0?0:0-J&7;I=g+J|0;J=h+-40-J|0;c[2261]=I;c[2258]=J;c[I+4>>2]=J|1;c[I+J+4>>2]=40;c[2262]=c[2377]}while(0);b=c[2258]|0;if(b>>>0>p>>>0){H=b-p|0;c[2258]=H;J=c[2261]|0;I=J+p|0;c[2261]=I;c[I+4>>2]=H|1;c[J+4>>2]=p|3;J=J+8|0;l=K;return J|0}}c[(Wa()|0)>>2]=12;J=0;l=K;return J|0}function hb(a){a=a|0;var b=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0;if(!a)return;d=a+-8|0;h=c[2259]|0;if(d>>>0<h>>>0)$();a=c[a+-4>>2]|0;b=a&3;if((b|0)==1)$();e=a&-8;o=d+e|0;a:do if(!(a&1)){a=c[d>>2]|0;if(!b)return;k=d+(0-a)|0;j=a+e|0;if(k>>>0<h>>>0)$();if((k|0)==(c[2260]|0)){a=o+4|0;b=c[a>>2]|0;if((b&3|0)!=3){r=k;f=j;m=k;break}c[2257]=j;c[a>>2]=b&-2;c[k+4>>2]=j|1;c[k+j>>2]=j;return}e=a>>>3;if(a>>>0<256){b=c[k+8>>2]|0;d=c[k+12>>2]|0;a=9060+(e<<1<<2)|0;if((b|0)!=(a|0)){if(b>>>0<h>>>0)$();if((c[b+12>>2]|0)!=(k|0))$()}if((d|0)==(b|0)){c[2255]=c[2255]&~(1<<e);r=k;f=j;m=k;break}if((d|0)!=(a|0)){if(d>>>0<h>>>0)$();a=d+8|0;if((c[a>>2]|0)==(k|0))g=a;else $()}else g=d+8|0;c[b+12>>2]=d;c[g>>2]=b;r=k;f=j;m=k;break}g=c[k+24>>2]|0;d=c[k+12>>2]|0;do if((d|0)==(k|0)){d=k+16|0;b=d+4|0;a=c[b>>2]|0;if(!a){a=c[d>>2]|0;if(!a){i=0;break}else b=d}while(1){d=a+20|0;e=c[d>>2]|0;if(e|0){a=e;b=d;continue}d=a+16|0;e=c[d>>2]|0;if(!e)break;else{a=e;b=d}}if(b>>>0<h>>>0)$();else{c[b>>2]=0;i=a;break}}else{e=c[k+8>>2]|0;if(e>>>0<h>>>0)$();a=e+12|0;if((c[a>>2]|0)!=(k|0))$();b=d+8|0;if((c[b>>2]|0)==(k|0)){c[a>>2]=d;c[b>>2]=e;i=d;break}else $()}while(0);if(g){a=c[k+28>>2]|0;b=9324+(a<<2)|0;do if((k|0)==(c[b>>2]|0)){c[b>>2]=i;if(!i){c[2256]=c[2256]&~(1<<a);r=k;f=j;m=k;break a}}else if(g>>>0>=(c[2259]|0)>>>0){c[g+16+(((c[g+16>>2]|0)!=(k|0)&1)<<2)>>2]=i;if(!i){r=k;f=j;m=k;break a}else break}else $();while(0);d=c[2259]|0;if(i>>>0<d>>>0)$();c[i+24>>2]=g;a=k+16|0;b=c[a>>2]|0;do if(b|0)if(b>>>0<d>>>0)$();else{c[i+16>>2]=b;c[b+24>>2]=i;break}while(0);a=c[a+4>>2]|0;if(a)if(a>>>0<(c[2259]|0)>>>0)$();else{c[i+20>>2]=a;c[a+24>>2]=i;r=k;f=j;m=k;break}else{r=k;f=j;m=k}}else{r=k;f=j;m=k}}else{r=d;f=e;m=d}while(0);if(m>>>0>=o>>>0)$();a=o+4|0;b=c[a>>2]|0;if(!(b&1))$();if(!(b&2)){a=c[2260]|0;if((o|0)==(c[2261]|0)){q=(c[2258]|0)+f|0;c[2258]=q;c[2261]=r;c[r+4>>2]=q|1;if((r|0)!=(a|0))return;c[2260]=0;c[2257]=0;return}if((o|0)==(a|0)){q=(c[2257]|0)+f|0;c[2257]=q;c[2260]=m;c[r+4>>2]=q|1;c[m+q>>2]=q;return}f=(b&-8)+f|0;e=b>>>3;b:do if(b>>>0>=256){g=c[o+24>>2]|0;a=c[o+12>>2]|0;do if((a|0)==(o|0)){d=o+16|0;b=d+4|0;a=c[b>>2]|0;if(!a){a=c[d>>2]|0;if(!a){n=0;break}else b=d}while(1){d=a+20|0;e=c[d>>2]|0;if(e|0){a=e;b=d;continue}d=a+16|0;e=c[d>>2]|0;if(!e)break;else{a=e;b=d}}if(b>>>0<(c[2259]|0)>>>0)$();else{c[b>>2]=0;n=a;break}}else{b=c[o+8>>2]|0;if(b>>>0<(c[2259]|0)>>>0)$();d=b+12|0;if((c[d>>2]|0)!=(o|0))$();e=a+8|0;if((c[e>>2]|0)==(o|0)){c[d>>2]=a;c[e>>2]=b;n=a;break}else $()}while(0);if(g|0){a=c[o+28>>2]|0;b=9324+(a<<2)|0;do if((o|0)==(c[b>>2]|0)){c[b>>2]=n;if(!n){c[2256]=c[2256]&~(1<<a);break b}}else if(g>>>0>=(c[2259]|0)>>>0){c[g+16+(((c[g+16>>2]|0)!=(o|0)&1)<<2)>>2]=n;if(!n)break b;else break}else $();while(0);d=c[2259]|0;if(n>>>0<d>>>0)$();c[n+24>>2]=g;a=o+16|0;b=c[a>>2]|0;do if(b|0)if(b>>>0<d>>>0)$();else{c[n+16>>2]=b;c[b+24>>2]=n;break}while(0);a=c[a+4>>2]|0;if(a|0)if(a>>>0<(c[2259]|0)>>>0)$();else{c[n+20>>2]=a;c[a+24>>2]=n;break}}}else{b=c[o+8>>2]|0;d=c[o+12>>2]|0;a=9060+(e<<1<<2)|0;if((b|0)!=(a|0)){if(b>>>0<(c[2259]|0)>>>0)$();if((c[b+12>>2]|0)!=(o|0))$()}if((d|0)==(b|0)){c[2255]=c[2255]&~(1<<e);break}if((d|0)!=(a|0)){if(d>>>0<(c[2259]|0)>>>0)$();a=d+8|0;if((c[a>>2]|0)==(o|0))l=a;else $()}else l=d+8|0;c[b+12>>2]=d;c[l>>2]=b}while(0);c[r+4>>2]=f|1;c[m+f>>2]=f;if((r|0)==(c[2260]|0)){c[2257]=f;return}}else{c[a>>2]=b&-2;c[r+4>>2]=f|1;c[m+f>>2]=f}a=f>>>3;if(f>>>0<256){d=9060+(a<<1<<2)|0;b=c[2255]|0;a=1<<a;if(b&a){a=d+8|0;b=c[a>>2]|0;if(b>>>0<(c[2259]|0)>>>0)$();else{p=b;q=a}}else{c[2255]=b|a;p=d;q=d+8|0}c[q>>2]=r;c[p+12>>2]=r;c[r+8>>2]=p;c[r+12>>2]=d;return}a=f>>>8;if(a)if(f>>>0>16777215)a=31;else{p=(a+1048320|0)>>>16&8;q=a<<p;o=(q+520192|0)>>>16&4;q=q<<o;a=(q+245760|0)>>>16&2;a=14-(o|p|a)+(q<<a>>>15)|0;a=f>>>(a+7|0)&1|a<<1}else a=0;e=9324+(a<<2)|0;c[r+28>>2]=a;c[r+20>>2]=0;c[r+16>>2]=0;b=c[2256]|0;d=1<<a;do if(b&d){b=f<<((a|0)==31?0:25-(a>>>1)|0);e=c[e>>2]|0;while(1){if((c[e+4>>2]&-8|0)==(f|0)){a=124;break}d=e+16+(b>>>31<<2)|0;a=c[d>>2]|0;if(!a){a=121;break}else{b=b<<1;e=a}}if((a|0)==121)if(d>>>0<(c[2259]|0)>>>0)$();else{c[d>>2]=r;c[r+24>>2]=e;c[r+12>>2]=r;c[r+8>>2]=r;break}else if((a|0)==124){a=e+8|0;b=c[a>>2]|0;q=c[2259]|0;if(b>>>0>=q>>>0&e>>>0>=q>>>0){c[b+12>>2]=r;c[a>>2]=r;c[r+8>>2]=b;c[r+12>>2]=e;c[r+24>>2]=0;break}else $()}}else{c[2256]=b|d;c[e>>2]=r;c[r+24>>2]=e;c[r+12>>2]=r;c[r+8>>2]=r}while(0);r=(c[2263]|0)+-1|0;c[2263]=r;if(!r)a=9476;else return;while(1){a=c[a>>2]|0;if(!a)break;else a=a+8|0}c[2263]=-1;return}function ib(a,b){a=a|0;b=b|0;var d=0;if(a){d=N(b,a)|0;if((b|a)>>>0>65535)d=((d>>>0)/(a>>>0)|0|0)==(b|0)?d:-1}else d=0;a=gb(d)|0;if(!a)return a|0;if(!(c[a+-4>>2]&3))return a|0;ob(a|0,0,d|0)|0;return a|0}function jb(a,b){a=a|0;b=b|0;var d=0,e=0;if(!a){b=gb(b)|0;return b|0}if(b>>>0>4294967231){c[(Wa()|0)>>2]=12;b=0;return b|0}d=kb(a+-8|0,b>>>0<11?16:b+11&-8)|0;if(d|0){b=d+8|0;return b|0}d=gb(b)|0;if(!d){b=0;return b|0}e=c[a+-4>>2]|0;e=(e&-8)-((e&3|0)==0?8:4)|0;tb(d|0,a|0,(e>>>0<b>>>0?e:b)|0)|0;hb(a);b=d;return b|0}function kb(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0;o=a+4|0;n=c[o>>2]|0;d=n&-8;k=a+d|0;i=c[2259]|0;e=n&3;if(!((e|0)!=1&a>>>0>=i>>>0&a>>>0<k>>>0))$();f=c[k+4>>2]|0;if(!(f&1))$();if(!e){if(b>>>0<256){a=0;return a|0}if(d>>>0>=(b+4|0)>>>0?(d-b|0)>>>0<=c[2375]<<1>>>0:0)return a|0;a=0;return a|0}if(d>>>0>=b>>>0){d=d-b|0;if(d>>>0<=15)return a|0;m=a+b|0;c[o>>2]=n&1|b|2;c[m+4>>2]=d|3;o=m+d+4|0;c[o>>2]=c[o>>2]|1;lb(m,d);return a|0}if((k|0)==(c[2261]|0)){m=(c[2258]|0)+d|0;d=m-b|0;e=a+b|0;if(m>>>0<=b>>>0){a=0;return a|0}c[o>>2]=n&1|b|2;c[e+4>>2]=d|1;c[2261]=e;c[2258]=d;return a|0}if((k|0)==(c[2260]|0)){f=(c[2257]|0)+d|0;if(f>>>0<b>>>0){a=0;return a|0}d=f-b|0;e=n&1;if(d>>>0>15){n=a+b|0;m=n+d|0;c[o>>2]=e|b|2;c[n+4>>2]=d|1;c[m>>2]=d;e=m+4|0;c[e>>2]=c[e>>2]&-2;e=n}else{c[o>>2]=e|f|2;e=a+f+4|0;c[e>>2]=c[e>>2]|1;e=0;d=0}c[2257]=d;c[2260]=e;return a|0}if(f&2|0){a=0;return a|0}l=(f&-8)+d|0;if(l>>>0<b>>>0){a=0;return a|0}m=l-b|0;g=f>>>3;a:do if(f>>>0>=256){h=c[k+24>>2]|0;f=c[k+12>>2]|0;do if((f|0)==(k|0)){f=k+16|0;e=f+4|0;d=c[e>>2]|0;if(!d){d=c[f>>2]|0;if(!d){j=0;break}else e=f}while(1){f=d+20|0;g=c[f>>2]|0;if(g|0){d=g;e=f;continue}f=d+16|0;g=c[f>>2]|0;if(!g)break;else{d=g;e=f}}if(e>>>0<i>>>0)$();else{c[e>>2]=0;j=d;break}}else{g=c[k+8>>2]|0;if(g>>>0<i>>>0)$();d=g+12|0;if((c[d>>2]|0)!=(k|0))$();e=f+8|0;if((c[e>>2]|0)==(k|0)){c[d>>2]=f;c[e>>2]=g;j=f;break}else $()}while(0);if(h|0){d=c[k+28>>2]|0;e=9324+(d<<2)|0;do if((k|0)==(c[e>>2]|0)){c[e>>2]=j;if(!j){c[2256]=c[2256]&~(1<<d);break a}}else if(h>>>0>=(c[2259]|0)>>>0){c[h+16+(((c[h+16>>2]|0)!=(k|0)&1)<<2)>>2]=j;if(!j)break a;else break}else $();while(0);f=c[2259]|0;if(j>>>0<f>>>0)$();c[j+24>>2]=h;d=k+16|0;e=c[d>>2]|0;do if(e|0)if(e>>>0<f>>>0)$();else{c[j+16>>2]=e;c[e+24>>2]=j;break}while(0);d=c[d+4>>2]|0;if(d|0)if(d>>>0<(c[2259]|0)>>>0)$();else{c[j+20>>2]=d;c[d+24>>2]=j;break}}}else{e=c[k+8>>2]|0;f=c[k+12>>2]|0;d=9060+(g<<1<<2)|0;if((e|0)!=(d|0)){if(e>>>0<i>>>0)$();if((c[e+12>>2]|0)!=(k|0))$()}if((f|0)==(e|0)){c[2255]=c[2255]&~(1<<g);break}if((f|0)!=(d|0)){if(f>>>0<i>>>0)$();d=f+8|0;if((c[d>>2]|0)==(k|0))h=d;else $()}else h=f+8|0;c[e+12>>2]=f;c[h>>2]=e}while(0);d=n&1;if(m>>>0<16){c[o>>2]=l|d|2;o=a+l+4|0;c[o>>2]=c[o>>2]|1;return a|0}else{n=a+b|0;c[o>>2]=d|b|2;c[n+4>>2]=m|3;o=n+m+4|0;c[o>>2]=c[o>>2]|1;lb(n,m);return a|0}return 0}function lb(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0;o=a+b|0;d=c[a+4>>2]|0;a:do if(!(d&1)){g=c[a>>2]|0;if(!(d&3))return;l=a+(0-g)|0;k=g+b|0;i=c[2259]|0;if(l>>>0<i>>>0)$();if((l|0)==(c[2260]|0)){a=o+4|0;d=c[a>>2]|0;if((d&3|0)!=3){r=l;f=k;break}c[2257]=k;c[a>>2]=d&-2;c[l+4>>2]=k|1;c[l+k>>2]=k;return}e=g>>>3;if(g>>>0<256){d=c[l+8>>2]|0;b=c[l+12>>2]|0;a=9060+(e<<1<<2)|0;if((d|0)!=(a|0)){if(d>>>0<i>>>0)$();if((c[d+12>>2]|0)!=(l|0))$()}if((b|0)==(d|0)){c[2255]=c[2255]&~(1<<e);r=l;f=k;break}if((b|0)!=(a|0)){if(b>>>0<i>>>0)$();a=b+8|0;if((c[a>>2]|0)==(l|0))h=a;else $()}else h=b+8|0;c[d+12>>2]=b;c[h>>2]=d;r=l;f=k;break}g=c[l+24>>2]|0;b=c[l+12>>2]|0;do if((b|0)==(l|0)){b=l+16|0;d=b+4|0;a=c[d>>2]|0;if(!a){a=c[b>>2]|0;if(!a){j=0;break}else d=b}while(1){b=a+20|0;e=c[b>>2]|0;if(e|0){a=e;d=b;continue}b=a+16|0;e=c[b>>2]|0;if(!e)break;else{a=e;d=b}}if(d>>>0<i>>>0)$();else{c[d>>2]=0;j=a;break}}else{e=c[l+8>>2]|0;if(e>>>0<i>>>0)$();a=e+12|0;if((c[a>>2]|0)!=(l|0))$();d=b+8|0;if((c[d>>2]|0)==(l|0)){c[a>>2]=b;c[d>>2]=e;j=b;break}else $()}while(0);if(g){a=c[l+28>>2]|0;d=9324+(a<<2)|0;do if((l|0)==(c[d>>2]|0)){c[d>>2]=j;if(!j){c[2256]=c[2256]&~(1<<a);r=l;f=k;break a}}else if(g>>>0>=(c[2259]|0)>>>0){c[g+16+(((c[g+16>>2]|0)!=(l|0)&1)<<2)>>2]=j;if(!j){r=l;f=k;break a}else break}else $();while(0);b=c[2259]|0;if(j>>>0<b>>>0)$();c[j+24>>2]=g;a=l+16|0;d=c[a>>2]|0;do if(d|0)if(d>>>0<b>>>0)$();else{c[j+16>>2]=d;c[d+24>>2]=j;break}while(0);a=c[a+4>>2]|0;if(a)if(a>>>0<(c[2259]|0)>>>0)$();else{c[j+20>>2]=a;c[a+24>>2]=j;r=l;f=k;break}else{r=l;f=k}}else{r=l;f=k}}else{r=a;f=b}while(0);h=c[2259]|0;if(o>>>0<h>>>0)$();a=o+4|0;d=c[a>>2]|0;if(!(d&2)){a=c[2260]|0;if((o|0)==(c[2261]|0)){q=(c[2258]|0)+f|0;c[2258]=q;c[2261]=r;c[r+4>>2]=q|1;if((r|0)!=(a|0))return;c[2260]=0;c[2257]=0;return}if((o|0)==(a|0)){q=(c[2257]|0)+f|0;c[2257]=q;c[2260]=r;c[r+4>>2]=q|1;c[r+q>>2]=q;return}f=(d&-8)+f|0;e=d>>>3;b:do if(d>>>0>=256){g=c[o+24>>2]|0;b=c[o+12>>2]|0;do if((b|0)==(o|0)){b=o+16|0;d=b+4|0;a=c[d>>2]|0;if(!a){a=c[b>>2]|0;if(!a){n=0;break}else d=b}while(1){b=a+20|0;e=c[b>>2]|0;if(e|0){a=e;d=b;continue}b=a+16|0;e=c[b>>2]|0;if(!e)break;else{a=e;d=b}}if(d>>>0<h>>>0)$();else{c[d>>2]=0;n=a;break}}else{e=c[o+8>>2]|0;if(e>>>0<h>>>0)$();a=e+12|0;if((c[a>>2]|0)!=(o|0))$();d=b+8|0;if((c[d>>2]|0)==(o|0)){c[a>>2]=b;c[d>>2]=e;n=b;break}else $()}while(0);if(g|0){a=c[o+28>>2]|0;d=9324+(a<<2)|0;do if((o|0)==(c[d>>2]|0)){c[d>>2]=n;if(!n){c[2256]=c[2256]&~(1<<a);break b}}else if(g>>>0>=(c[2259]|0)>>>0){c[g+16+(((c[g+16>>2]|0)!=(o|0)&1)<<2)>>2]=n;if(!n)break b;else break}else $();while(0);b=c[2259]|0;if(n>>>0<b>>>0)$();c[n+24>>2]=g;a=o+16|0;d=c[a>>2]|0;do if(d|0)if(d>>>0<b>>>0)$();else{c[n+16>>2]=d;c[d+24>>2]=n;break}while(0);a=c[a+4>>2]|0;if(a|0)if(a>>>0<(c[2259]|0)>>>0)$();else{c[n+20>>2]=a;c[a+24>>2]=n;break}}}else{d=c[o+8>>2]|0;b=c[o+12>>2]|0;a=9060+(e<<1<<2)|0;if((d|0)!=(a|0)){if(d>>>0<h>>>0)$();if((c[d+12>>2]|0)!=(o|0))$()}if((b|0)==(d|0)){c[2255]=c[2255]&~(1<<e);break}if((b|0)!=(a|0)){if(b>>>0<h>>>0)$();a=b+8|0;if((c[a>>2]|0)==(o|0))m=a;else $()}else m=b+8|0;c[d+12>>2]=b;c[m>>2]=d}while(0);c[r+4>>2]=f|1;c[r+f>>2]=f;if((r|0)==(c[2260]|0)){c[2257]=f;return}}else{c[a>>2]=d&-2;c[r+4>>2]=f|1;c[r+f>>2]=f}a=f>>>3;if(f>>>0<256){b=9060+(a<<1<<2)|0;d=c[2255]|0;a=1<<a;if(d&a){a=b+8|0;d=c[a>>2]|0;if(d>>>0<(c[2259]|0)>>>0)$();else{p=d;q=a}}else{c[2255]=d|a;p=b;q=b+8|0}c[q>>2]=r;c[p+12>>2]=r;c[r+8>>2]=p;c[r+12>>2]=b;return}a=f>>>8;if(a)if(f>>>0>16777215)a=31;else{p=(a+1048320|0)>>>16&8;q=a<<p;o=(q+520192|0)>>>16&4;q=q<<o;a=(q+245760|0)>>>16&2;a=14-(o|p|a)+(q<<a>>>15)|0;a=f>>>(a+7|0)&1|a<<1}else a=0;e=9324+(a<<2)|0;c[r+28>>2]=a;c[r+20>>2]=0;c[r+16>>2]=0;d=c[2256]|0;b=1<<a;if(!(d&b)){c[2256]=d|b;c[e>>2]=r;c[r+24>>2]=e;c[r+12>>2]=r;c[r+8>>2]=r;return}d=f<<((a|0)==31?0:25-(a>>>1)|0);e=c[e>>2]|0;while(1){if((c[e+4>>2]&-8|0)==(f|0)){a=121;break}b=e+16+(d>>>31<<2)|0;a=c[b>>2]|0;if(!a){a=118;break}else{d=d<<1;e=a}}if((a|0)==118){if(b>>>0<(c[2259]|0)>>>0)$();c[b>>2]=r;c[r+24>>2]=e;c[r+12>>2]=r;c[r+8>>2]=r;return}else if((a|0)==121){a=e+8|0;d=c[a>>2]|0;q=c[2259]|0;if(!(d>>>0>=q>>>0&e>>>0>=q>>>0))$();c[d+12>>2]=r;c[a>>2]=r;c[r+8>>2]=d;c[r+12>>2]=e;c[r+24>>2]=0;return}}function mb(){}function nb(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;c=a+c>>>0;return (y=b+d+(c>>>0<a>>>0|0)>>>0,c|0)|0}function ob(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0,h=0,i=0;h=b+e|0;d=d&255;if((e|0)>=67){while(b&3){a[b>>0]=d;b=b+1|0}f=h&-4|0;g=f-64|0;i=d|d<<8|d<<16|d<<24;while((b|0)<=(g|0)){c[b>>2]=i;c[b+4>>2]=i;c[b+8>>2]=i;c[b+12>>2]=i;c[b+16>>2]=i;c[b+20>>2]=i;c[b+24>>2]=i;c[b+28>>2]=i;c[b+32>>2]=i;c[b+36>>2]=i;c[b+40>>2]=i;c[b+44>>2]=i;c[b+48>>2]=i;c[b+52>>2]=i;c[b+56>>2]=i;c[b+60>>2]=i;b=b+64|0}while((b|0)<(f|0)){c[b>>2]=i;b=b+4|0}}while((b|0)<(h|0)){a[b>>0]=d;b=b+1|0}return h-e|0}function pb(a,b,c){a=a|0;b=b|0;c=c|0;if((c|0)<32){y=b>>>c;return a>>>c|(b&(1<<c)-1)<<32-c}y=0;return b>>>c-32|0}function qb(a,b){a=a|0;b=b|0;var c=0,d=0,e=0,f=0;f=a&65535;e=b&65535;c=N(e,f)|0;d=a>>>16;a=(c>>>16)+(N(e,d)|0)|0;e=b>>>16;b=N(e,f)|0;return (y=(a>>>16)+(N(e,d)|0)+(((a&65535)+b|0)>>>16)|0,a+b<<16|c&65535|0)|0}function rb(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;var e=0,f=0;e=a;f=c;c=qb(e,f)|0;a=y;return (y=(N(b,f)|0)+(N(d,e)|0)+a|a&0,c|0|0)|0}function sb(a){a=a|0;var b=0,d=0;d=a+15&-16|0;b=c[i>>2]|0;a=b+d|0;if((d|0)>0&(a|0)<(b|0)|(a|0)<0){V()|0;aa(12);return -1}c[i>>2]=a;if((a|0)>(U()|0)?(T()|0)==0:0){c[i>>2]=b;aa(12);return -1}return b|0}function tb(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0,h=0;if((e|0)>=8192)return da(b|0,d|0,e|0)|0;h=b|0;g=b+e|0;if((b&3)==(d&3)){while(b&3){if(!e)return h|0;a[b>>0]=a[d>>0]|0;b=b+1|0;d=d+1|0;e=e-1|0}e=g&-4|0;f=e-64|0;while((b|0)<=(f|0)){c[b>>2]=c[d>>2];c[b+4>>2]=c[d+4>>2];c[b+8>>2]=c[d+8>>2];c[b+12>>2]=c[d+12>>2];c[b+16>>2]=c[d+16>>2];c[b+20>>2]=c[d+20>>2];c[b+24>>2]=c[d+24>>2];c[b+28>>2]=c[d+28>>2];c[b+32>>2]=c[d+32>>2];c[b+36>>2]=c[d+36>>2];c[b+40>>2]=c[d+40>>2];c[b+44>>2]=c[d+44>>2];c[b+48>>2]=c[d+48>>2];c[b+52>>2]=c[d+52>>2];c[b+56>>2]=c[d+56>>2];c[b+60>>2]=c[d+60>>2];b=b+64|0;d=d+64|0}while((b|0)<(e|0)){c[b>>2]=c[d>>2];b=b+4|0;d=d+4|0}}else{e=g-4|0;while((b|0)<(e|0)){a[b>>0]=a[d>>0]|0;a[b+1>>0]=a[d+1>>0]|0;a[b+2>>0]=a[d+2>>0]|0;a[b+3>>0]=a[d+3>>0]|0;b=b+4|0;d=d+4|0}}while((b|0)<(g|0)){a[b>>0]=a[d>>0]|0;b=b+1|0;d=d+1|0}return h|0}function ub(a){a=a|0;return (a&255)<<24|(a>>8&255)<<16|(a>>16&255)<<8|a>>>24|0}function vb(a,b){a=a|0;b=b|0;return ia[a&1](b|0)|0}function wb(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;return ja[a&3](b|0,c|0,d|0)|0}function xb(a){a=a|0;R(0);return 0}function yb(a,b,c){a=a|0;b=b|0;c=c|0;R(1);return 0} -- --// EMSCRIPTEN_END_FUNCS --var ia=[xb,Sa];var ja=[yb,_a,Ua,Ta];return{_llvm_bswap_i32:ub,_shine_check_config:Ha,_shine_flush:La,setThrew:oa,_bitshift64Lshr:pb,_shine_samples_per_pass:Ia,_fflush:eb,_shine_js_init:Qa,_memset:ob,_sbrk:sb,_memcpy:tb,___errno_location:Wa,_shine_encode_buffer:Ka,_shine_close:Ma,stackAlloc:ka,getTempRet0:qa,___muldi3:rb,setTempRet0:pa,_i64Add:nb,_emscripten_get_global_libc:Ra,stackSave:la,___muldsi3:qb,_free:hb,runPostSets:mb,establishStackSpace:na,stackRestore:ma,_malloc:gb,stackAlloc:ka,stackSave:la,stackRestore:ma,establishStackSpace:na,setThrew:oa,setTempRet0:pa,getTempRet0:qa,dynCall_ii:vb,dynCall_iiii:wb}}) -- -- --// EMSCRIPTEN_END_ASM --(Module.asmGlobalArg,Module.asmLibraryArg,buffer);var _llvm_bswap_i32=Module["_llvm_bswap_i32"]=asm["_llvm_bswap_i32"];var _shine_check_config=Module["_shine_check_config"]=asm["_shine_check_config"];var _shine_flush=Module["_shine_flush"]=asm["_shine_flush"];var setThrew=Module["setThrew"]=asm["setThrew"];var _bitshift64Lshr=Module["_bitshift64Lshr"]=asm["_bitshift64Lshr"];var _shine_samples_per_pass=Module["_shine_samples_per_pass"]=asm["_shine_samples_per_pass"];var _fflush=Module["_fflush"]=asm["_fflush"];var _shine_js_init=Module["_shine_js_init"]=asm["_shine_js_init"];var _memset=Module["_memset"]=asm["_memset"];var _sbrk=Module["_sbrk"]=asm["_sbrk"];var _memcpy=Module["_memcpy"]=asm["_memcpy"];var ___errno_location=Module["___errno_location"]=asm["___errno_location"];var _shine_encode_buffer=Module["_shine_encode_buffer"]=asm["_shine_encode_buffer"];var _shine_close=Module["_shine_close"]=asm["_shine_close"];var stackAlloc=Module["stackAlloc"]=asm["stackAlloc"];var getTempRet0=Module["getTempRet0"]=asm["getTempRet0"];var ___muldi3=Module["___muldi3"]=asm["___muldi3"];var setTempRet0=Module["setTempRet0"]=asm["setTempRet0"];var _i64Add=Module["_i64Add"]=asm["_i64Add"];var _emscripten_get_global_libc=Module["_emscripten_get_global_libc"]=asm["_emscripten_get_global_libc"];var stackSave=Module["stackSave"]=asm["stackSave"];var ___muldsi3=Module["___muldsi3"]=asm["___muldsi3"];var _free=Module["_free"]=asm["_free"];var runPostSets=Module["runPostSets"]=asm["runPostSets"];var establishStackSpace=Module["establishStackSpace"]=asm["establishStackSpace"];var stackRestore=Module["stackRestore"]=asm["stackRestore"];var _malloc=Module["_malloc"]=asm["_malloc"];var dynCall_ii=Module["dynCall_ii"]=asm["dynCall_ii"];var dynCall_iiii=Module["dynCall_iiii"]=asm["dynCall_iiii"];Runtime.stackAlloc=Module["stackAlloc"];Runtime.stackSave=Module["stackSave"];Runtime.stackRestore=Module["stackRestore"];Runtime.establishStackSpace=Module["establishStackSpace"];Runtime.setTempRet0=Module["setTempRet0"];Runtime.getTempRet0=Module["getTempRet0"];Module["asm"]=asm;function ExitStatus(status){this.name="ExitStatus";this.message="Program terminated with exit("+status+")";this.status=status}ExitStatus.prototype=new Error;ExitStatus.prototype.constructor=ExitStatus;var initialStackTop;var preloadStartTime=null;var calledMain=false;dependenciesFulfilled=function runCaller(){if(!Module["calledRun"])run();if(!Module["calledRun"])dependenciesFulfilled=runCaller};Module["callMain"]=Module.callMain=function callMain(args){args=args||[];ensureInitRuntime();var argc=args.length+1;function pad(){for(var i=0;i<4-1;i++){argv.push(0)}}var argv=[allocate(intArrayFromString(Module["thisProgram"]),"i8",ALLOC_NORMAL)];pad();for(var i=0;i<argc-1;i=i+1){argv.push(allocate(intArrayFromString(args[i]),"i8",ALLOC_NORMAL));pad()}argv.push(0);argv=allocate(argv,"i32",ALLOC_NORMAL);try{var ret=Module["_main"](argc,argv,0);exit(ret,true)}catch(e){if(e instanceof ExitStatus){return}else if(e=="SimulateInfiniteLoop"){Module["noExitRuntime"]=true;return}else{var toLog=e;if(e&&typeof e==="object"&&e.stack){toLog=[e,e.stack]}Module.printErr("exception thrown: "+toLog);Module["quit"](1,e)}}finally{calledMain=true}};function run(args){args=args||Module["arguments"];if(preloadStartTime===null)preloadStartTime=Date.now();if(runDependencies>0){return}preRun();if(runDependencies>0)return;if(Module["calledRun"])return;function doRun(){if(Module["calledRun"])return;Module["calledRun"]=true;if(ABORT)return;ensureInitRuntime();preMain();if(Module["onRuntimeInitialized"])Module["onRuntimeInitialized"]();if(Module["_main"]&&shouldRunNow)Module["callMain"](args);postRun()}if(Module["setStatus"]){Module["setStatus"]("Running...");setTimeout((function(){setTimeout((function(){Module["setStatus"]("")}),1);doRun()}),1)}else{doRun()}}Module["run"]=Module.run=run;function exit(status,implicit){if(implicit&&Module["noExitRuntime"]){return}if(Module["noExitRuntime"]){}else{ABORT=true;EXITSTATUS=status;STACKTOP=initialStackTop;exitRuntime();if(Module["onExit"])Module["onExit"](status)}if(ENVIRONMENT_IS_NODE){process["exit"](status)}Module["quit"](status,new ExitStatus(status))}Module["exit"]=Module.exit=exit;var abortDecorators=[];function abort(what){if(Module["onAbort"]){Module["onAbort"](what)}if(what!==undefined){Module.print(what);Module.printErr(what);what=JSON.stringify(what)}else{what=""}ABORT=true;EXITSTATUS=1;var extra="\nIf this abort() is unexpected, build with -s ASSERTIONS=1 which can give more information.";var output="abort("+what+") at "+stackTrace()+extra;if(abortDecorators){abortDecorators.forEach((function(decorator){output=decorator(output,what)}))}throw output}Module["abort"]=Module.abort=abort;if(Module["preInit"]){if(typeof Module["preInit"]=="function")Module["preInit"]=[Module["preInit"]];while(Module["preInit"].length>0){Module["preInit"].pop()()}}var shouldRunNow=true;if(Module["noInitialRun"]){shouldRunNow=false}run();var isNode=typeof process==="object"&&typeof require==="function";var int16Len=Module.HEAP16.BYTES_PER_ELEMENT;var ptrLen=Module.HEAP32.BYTES_PER_ELEMENT;function Shine(args){if(_shine_check_config(args.samplerate,args.bitrate)<0)throw"Invalid configuration";var mode;if(!args.mode){if(args.channels===1){mode=Shine.MONO}else{mode=Shine.JOINT_STEREO}}else{mode=args.mode}this._handle=_shine_js_init(args.channels,args.samplerate,mode,args.bitrate);this._channels=args.channels;this._samples_per_pass=_shine_samples_per_pass(this._handle);this._buffer=_malloc(this._channels*ptrLen);this._pcm=new Array(this._channels);this._rem=new Array(this._channels);this._written=_malloc(int16Len);var _tmp,chan;for(chan=0;chan<this._channels;chan++){this._rem[chan]=new Int16Array;_tmp=_malloc(this._samples_per_pass*int16Len);setValue(this._buffer+chan*ptrLen,_tmp,"*");this._pcm[chan]=Module.HEAP16.subarray(_tmp/int16Len,_tmp/int16Len+this._samples_per_pass)}return this}Shine.STEREO=0;Shine.JOINT_STEREO=1;Shine.DUAL_CHANNEL=2;Shine.MONO=3;Shine.prototype._encodePass=(function(data){if(!this._handle)throw"Closed";var chan;for(chan=0;chan<this._channels;chan++)this._pcm[chan].set(data[chan]);var _buf=_shine_encode_buffer(this._handle,this._buffer,this._written);var written=getValue(this._written,"i16");return Module.HEAPU8.subarray(_buf,_buf+written)});function concat(ctr,a,b){if(typeof b==="undefined"){return a}var ret=new ctr(a.length+b.length);ret.set(a);ret.subarray(a.length).set(b);return ret}function clip(x){return x>1?1:x<-1?-1:x}function convertFloat32(buf){var ret=new Array(buf.length);var samples=buf[0].length;var chan,i;for(chan=0;chan<buf.length;chan++){ret[chan]=new Int16Array(samples);for(i=0;i<samples;i++){ret[chan][i]=parseInt(clip(buf[chan][i])*32767)}}return ret}Shine.prototype.encode=(function(data){if(data.length!=this._channels)throw"Invalid data";var encoded=new Uint8Array;var tmp=new Array(this._channels);if(data[0]instanceof Float32Array){data=convertFloat32(data)}var chan;for(chan=0;chan<this._channels;chan++){tmp[chan]=new Float32Array;this._rem[chan]=concat(Int16Array,this._rem[chan],data[chan])}var i,enc;for(i=0;i<this._rem[0].length;i+=this._samples_per_pass){for(chan=0;chan<this._channels;chan++){tmp[chan]=this._rem[chan].subarray(i,i+this._samples_per_pass)}if(tmp[0].length<this._samples_per_pass){break}else{enc=this._encodePass(tmp);if(enc.length>0){encoded=concat(Uint8Array,encoded,enc)}}}if(tmp[0].length<this._samples_per_pass){this._rem=tmp}else{for(chan=0;chan<this._channels;chan++){this._rem[chan]=new Int16Array}}return encoded});Shine.prototype.close=(function(){if(!this._handle){throw"Closed"}var _buf=_shine_flush(this._handle,this._written);var written=getValue(this._written,"i16");var encoded=new Uint8Array(written);encoded.set(Module.HEAPU8.subarray(_buf,_buf+written));_free(this._written);_shine_close(this._handle);this._handle=null;var chan;for(chan=0;chan<this._channels;chan++){_free(getValue(this._buffer+chan*ptrLen,"*"))}_free(this._buffer);return encoded});if(isNode){module.exports=Shine}return Shine}).call(context)})() -- -- -- -- -diff --git a/js/dist/libshine_browser.js b/js/dist/libshine_browser.js -new file mode 100644 -index 0000000..5e8cd74 ---- /dev/null -+++ b/js/dist/libshine_browser.js -@@ -0,0 +1,183 @@ -+// libshine function wrappers -+ -+var StereoMode = { -+ '0': 'STEREO', -+ '1': 'JOINT_STEREO', -+ '2': 'DUAL_CHANNEL', -+ '3': 'MONO', -+ STEREO: 0, -+ JOINT_STEREO: 1, -+ DUAL_CHANNEL: 2, -+ MONO: 3 -+}; -+ -+var ShineModule; -+var int16Len; -+var ptrLen; -+ -+function shineInit() { -+ int16Len = ShineModule._shine_js_int16_len(); -+ ptrLen = ShineModule._shine_js_ptr_len(); -+}; -+ -+function Shine(args) { -+ if (ShineModule._shine_check_config(args.samplerate, args.bitrate) < 0) -+ throw "Invalid configuration"; -+ -+ var stereoMode; -+ if (!args.stereoMode) { -+ if (args.channels === 1) { -+ stereoMode = Shine.MONO; -+ } else { -+ stereoMode = Shine.JOINT_STEREO; -+ } -+ } else { -+ stereoMode = args.stereoMode; -+ } -+ -+ this._handle = ShineModule._shine_js_init(args.channels, args.samplerate, stereoMode, args.bitrate); -+ -+ this._channels = args.channels; -+ this._samples_per_pass = ShineModule._shine_samples_per_pass(this._handle); -+ -+ this._buffer = ShineModule._malloc(this._channels * ptrLen); -+ this._pcm = new Array(this._channels); -+ this._rem = new Array(this._channels); -+ this._written = ShineModule._malloc(int16Len); -+ -+ var _tmp, chan; -+ for (chan=0; chan<this._channels; chan++) { -+ this._rem[chan] = new Int16Array; -+ _tmp = ShineModule._malloc(this._samples_per_pass * int16Len); -+ ShineModule.setValue(this._buffer + chan*ptrLen, _tmp, "*") -+ this._pcm[chan] = ShineModule.HEAP16.subarray(_tmp/int16Len, _tmp/int16Len+this._samples_per_pass) -+ } -+ -+ return this; -+}; -+ -+Shine.checkConfig = function (samplerate, bitrate) { -+ return ShineModule._shine_check_config(samplerate, bitrate) >= 0; -+}; -+ -+Shine.prototype._encodePass = function (data) { -+ if (!this._handle) -+ throw "Closed"; -+ -+ var chan; -+ for (chan=0;chan<this._channels;chan++) -+ this._pcm[chan].set(data[chan]); -+ -+ var _buf = ShineModule._shine_encode_buffer(this._handle, this._buffer, this._written); -+ -+ var written = ShineModule.getValue(this._written, "i16"); -+ -+ return ShineModule.HEAPU8.subarray(_buf, _buf+written); -+}; -+ -+function concat(ctr, a, b) { -+ if (typeof b === "undefined") { -+ return a; -+ } -+ var ret = new ctr(a.length+b.length); -+ ret.set(a); -+ ret.subarray(a.length).set(b); -+ return ret; -+} -+ -+function clip(x) { -+ return (x > 1 ? 1 : (x < -1 ? -1 : x)); -+} -+ -+function convertFloat32(buf) { -+ var ret = new Array(buf.length); -+ var samples = buf[0].length; -+ var chan, i; -+ -+ for (chan=0;chan<buf.length;chan++) { -+ ret[chan] = new Int16Array(samples); -+ for (i=0;i<samples;i++) { -+ ret[chan][i] = parseInt(clip(buf[chan][i]) * 32767); -+ } -+ } -+ return ret; -+} -+ -+Shine.prototype.encode = function (data) { -+ if (data.length != this._channels) -+ throw "Invalid data"; -+ -+ var encoded = new Uint8Array; -+ var tmp = new Array(this._channels); -+ -+ if (data[0] instanceof Float32Array) { -+ data = convertFloat32(data); -+ } -+ -+ var chan; -+ for (chan=0;chan<this._channels; chan++) { -+ tmp[chan] = new Float32Array; -+ this._rem[chan] = concat(Int16Array, this._rem[chan], data[chan]); -+ } -+ -+ var i, enc; -+ for (i=0;i<this._rem[0].length;i+=this._samples_per_pass) { -+ for (chan=0; chan<this._channels; chan++) { -+ tmp[chan] = this._rem[chan].subarray(i, i+this._samples_per_pass); -+ } -+ -+ if (tmp[0].length < this._samples_per_pass) { -+ break; -+ } else { -+ enc = this._encodePass(tmp); -+ if (enc.length > 0) { -+ encoded = concat(Uint8Array, encoded, enc); -+ } -+ } -+ } -+ -+ if (tmp[0].length < this._samples_per_pass) { -+ this._rem = tmp; -+ } else { -+ for (chan=0; chan<this._channels; chan++) { -+ this._rem[chan] = new Int16Array; -+ } -+ } -+ -+ return encoded; -+}; -+ -+Shine.prototype.close = function () { -+ if (!this._handle) { -+ throw "Closed"; -+ } -+ -+ var _buf = ShineModule._shine_flush(this._handle, this._written); -+ -+ var written = ShineModule.getValue(this._written, "i16"); -+ var encoded = new Uint8Array(written); -+ -+ encoded.set(ShineModule.HEAPU8.subarray(_buf, _buf + written)); -+ -+ ShineModule._free(this._written); -+ ShineModule._shine_close(this._handle); -+ this._handle = null; -+ -+ var chan; -+ for (chan=0; chan<this._channels; chan++) { -+ ShineModule._free(ShineModule.getValue(this._buffer + chan*ptrLen, "*")); -+ } -+ ShineModule._free(this._buffer); -+ -+ return encoded; -+}; -+var createModule = require("./libshine_browser_stubs").default; -+ -+Shine.initialized = (createModule()).then(function (Module) { -+ ShineModule = Module; -+ shineInit(); -+}); -+ -+module.exports.Shine = Shine; -+ -+module.exports.StereoMode = StereoMode; -diff --git a/js/dist/libshine_browser_stubs.js b/js/dist/libshine_browser_stubs.js -new file mode 100644 -index 0000000..23863a3 ---- /dev/null -+++ b/js/dist/libshine_browser_stubs.js -@@ -0,0 +1,16 @@ -+ -+var createModule = (() => { -+ var _scriptDir = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : undefined; -+ -+ return ( -+function(createModule) { -+ createModule = createModule || {}; -+ -+var Module=typeof createModule!="undefined"?createModule:{};var readyPromiseResolve,readyPromiseReject;Module["ready"]=new Promise(function(resolve,reject){readyPromiseResolve=resolve;readyPromiseReject=reject});var moduleOverrides=Object.assign({},Module);var arguments_=[];var thisProgram="./this.program";var quit_=(status,toThrow)=>{throw toThrow};var ENVIRONMENT_IS_WEB=true;var ENVIRONMENT_IS_WORKER=false;var scriptDirectory="";function locateFile(path){if(Module["locateFile"]){return Module["locateFile"](path,scriptDirectory)}return scriptDirectory+path}var read_,readAsync,readBinary,setWindowTitle;if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){if(ENVIRONMENT_IS_WORKER){scriptDirectory=self.location.href}else if(typeof document!="undefined"&&document.currentScript){scriptDirectory=document.currentScript.src}if(_scriptDir){scriptDirectory=_scriptDir}if(scriptDirectory.indexOf("blob:")!==0){scriptDirectory=scriptDirectory.substr(0,scriptDirectory.replace(/[?#].*/,"").lastIndexOf("/")+1)}else{scriptDirectory=""}{read_=url=>{try{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.send(null);return xhr.responseText}catch(err){var data=tryParseAsDataURI(url);if(data){return intArrayToString(data)}throw err}};if(ENVIRONMENT_IS_WORKER){readBinary=url=>{try{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.responseType="arraybuffer";xhr.send(null);return new Uint8Array(xhr.response)}catch(err){var data=tryParseAsDataURI(url);if(data){return data}throw err}}}readAsync=(url,onload,onerror)=>{var xhr=new XMLHttpRequest;xhr.open("GET",url,true);xhr.responseType="arraybuffer";xhr.onload=()=>{if(xhr.status==200||xhr.status==0&&xhr.response){onload(xhr.response);return}var data=tryParseAsDataURI(url);if(data){onload(data.buffer);return}onerror()};xhr.onerror=onerror;xhr.send(null)}}setWindowTitle=title=>document.title=title}else{}var out=Module["print"]||console.log.bind(console);var err=Module["printErr"]||console.warn.bind(console);Object.assign(Module,moduleOverrides);moduleOverrides=null;if(Module["arguments"])arguments_=Module["arguments"];if(Module["thisProgram"])thisProgram=Module["thisProgram"];if(Module["quit"])quit_=Module["quit"];var wasmBinary;if(Module["wasmBinary"])wasmBinary=Module["wasmBinary"];var noExitRuntime=Module["noExitRuntime"]||true;if(typeof WebAssembly!="object"){abort("no native wasm support detected")}var wasmMemory;var ABORT=false;var EXITSTATUS;function assert(condition,text){if(!condition){abort(text)}}var buffer,HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;function updateGlobalBufferAndViews(buf){buffer=buf;Module["HEAP8"]=HEAP8=new Int8Array(buf);Module["HEAP16"]=HEAP16=new Int16Array(buf);Module["HEAP32"]=HEAP32=new Int32Array(buf);Module["HEAPU8"]=HEAPU8=new Uint8Array(buf);Module["HEAPU16"]=HEAPU16=new Uint16Array(buf);Module["HEAPU32"]=HEAPU32=new Uint32Array(buf);Module["HEAPF32"]=HEAPF32=new Float32Array(buf);Module["HEAPF64"]=HEAPF64=new Float64Array(buf)}var INITIAL_MEMORY=Module["INITIAL_MEMORY"]||16777216;var wasmTable;var __ATPRERUN__=[];var __ATINIT__=[];var __ATPOSTRUN__=[];var runtimeInitialized=false;function preRun(){if(Module["preRun"]){if(typeof Module["preRun"]=="function")Module["preRun"]=[Module["preRun"]];while(Module["preRun"].length){addOnPreRun(Module["preRun"].shift())}}callRuntimeCallbacks(__ATPRERUN__)}function initRuntime(){runtimeInitialized=true;callRuntimeCallbacks(__ATINIT__)}function postRun(){if(Module["postRun"]){if(typeof Module["postRun"]=="function")Module["postRun"]=[Module["postRun"]];while(Module["postRun"].length){addOnPostRun(Module["postRun"].shift())}}callRuntimeCallbacks(__ATPOSTRUN__)}function addOnPreRun(cb){__ATPRERUN__.unshift(cb)}function addOnInit(cb){__ATINIT__.unshift(cb)}function addOnPostRun(cb){__ATPOSTRUN__.unshift(cb)}var runDependencies=0;var runDependencyWatcher=null;var dependenciesFulfilled=null;function addRunDependency(id){runDependencies++;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}}function removeRunDependency(id){runDependencies--;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}if(runDependencies==0){if(runDependencyWatcher!==null){clearInterval(runDependencyWatcher);runDependencyWatcher=null}if(dependenciesFulfilled){var callback=dependenciesFulfilled;dependenciesFulfilled=null;callback()}}}function abort(what){if(Module["onAbort"]){Module["onAbort"](what)}what="Aborted("+what+")";err(what);ABORT=true;EXITSTATUS=1;what+=". Build with -sASSERTIONS for more info.";var e=new WebAssembly.RuntimeError(what);readyPromiseReject(e);throw e}var dataURIPrefix="data:application/octet-stream;base64,";function isDataURI(filename){return filename.startsWith(dataURIPrefix)}var wasmBinaryFile;wasmBinaryFile="data:application/octet-stream;base64,AGFzbQEAAAABVg9gAX8Bf2ADf39/AGACf38Bf2AEf39/fwF/YAN/f38Bf2ACf38AYAF/AGABfAF8YAABf2ADfHx/AXxgAnx8AXxgAnx/AXxgAABgBH9/f38AYAJ8fwF/Ag0CAWEBYQAAAWEBYgABAxsaAQMBAAQFAAkKBgsCBwwNBQcOAgQAAgMICAYEBQFwAQEBBQYBAYACgAIGCAF/AUHglwULBzUNAWMCAAFkAA8BZQAIAWYACwFnABcBaAAWAWkAFQFqABQBawAbAWwAGgFtABkBbgAYAW8BAArC+gEahQoBDX8gAiAAKAIQIgRJBEAgACAEIAJrIgI2AhAgACAAKAIMIAEgAnRyNgIMDwsgACgCACEKIAAoAgQiBSAAKAIIIgNBBGpNBEAgAAJ/IAVBAm0gBWohCyAKRQRAIAsQCAwBCyALQUBPBEBB5JMBQTA2AgBBAAwBCwJ/QRAgC0ELakF4cSALQQtJGyEHQQAhAyAKQQhrIgUoAgQiDEF4cSEGAkAgDEEDcUUEQEEAIAdBgAJJDQIaIAdBBGogBk0EQCAFIQMgBiAHa0HIlwEoAgBBAXRNDQILQQAMAgsgBSAGaiEIAkAgBiAHTwRAIAYgB2siBEEQSQ0BIAUgDEEBcSAHckECcjYCBCAFIAdqIgMgBEEDcjYCBCAIIAgoAgRBAXI2AgQgAyAEEBEMAQtBgJQBKAIAIAhGBEBB9JMBKAIAIAZqIgYgB00NAiAFIAxBAXEgB3JBAnI2AgQgBSAHaiIEIAYgB2siA0EBcjYCBEH0kwEgAzYCAEGAlAEgBDYCAAwBC0H8kwEoAgAgCEYEQEHwkwEoAgAgBmoiBCAHSQ0CAkAgBCAHayIDQRBPBEAgBSAMQQFxIAdyQQJyNgIEIAUgB2oiBiADQQFyNgIEIAQgBWoiBCADNgIAIAQgBCgCBEF+cTYCBAwBCyAFIAxBAXEgBHJBAnI2AgQgBCAFaiIDIAMoAgRBAXI2AgRBACEDQQAhBgtB/JMBIAY2AgBB8JMBIAM2AgAMAQsgCCgCBCIEQQJxDQEgBEF4cSAGaiINIAdJDQEgDSAHayEPAkAgBEH/AU0EQCAIKAIIIgYgBEEDdiIDQQN0QZCUAWpGGiAGIAgoAgwiBEYEQEHokwFB6JMBKAIAQX4gA3dxNgIADAILIAYgBDYCDCAEIAY2AggMAQsgCCgCGCEOAkAgCCAIKAIMIglHBEAgCCgCCCIDQfiTASgCAEkaIAMgCTYCDCAJIAM2AggMAQsCQCAIQRRqIgYoAgAiAw0AIAhBEGoiBigCACIDDQBBACEJDAELA0AgBiEEIAMiCUEUaiIGKAIAIgMNACAJQRBqIQYgCSgCECIDDQALIARBADYCAAsgDkUNAAJAIAgoAhwiBEECdEGYlgFqIgMoAgAgCEYEQCADIAk2AgAgCQ0BQeyTAUHskwEoAgBBfiAEd3E2AgAMAgsgDkEQQRQgDigCECAIRhtqIAk2AgAgCUUNAQsgCSAONgIYIAgoAhAiAwRAIAkgAzYCECADIAk2AhgLIAgoAhQiA0UNACAJIAM2AhQgAyAJNgIYCyAPQQ9NBEAgBSAMQQFxIA1yQQJyNgIEIAUgDWoiAyADKAIEQQFyNgIEDAELIAUgDEEBcSAHckECcjYCBCAFIAdqIgQgD0EDcjYCBCAFIA1qIgMgAygCBEEBcjYCBCAEIA8QEQsgBSEDCyADCyIDBEAgA0EIagwBC0EAIAsQCCIFRQ0AGiAFIApBfEF4IApBBGsoAgAiA0EDcRsgA0F4cWoiAyALIAMgC0kbEAQgChALIAULIgo2AgAgACAAKAIEIgNBAm0gA2o2AgQgACgCECEEIAAoAgghAwsgAyAKaiAAKAIMIAEgAiAEayIDdnIiBUEYdCAFQYD+A3FBCHRyIAVBCHZBgP4DcSAFQRh2cnI2AgAgAEEgIANrIgM2AhAgACAAKAIIQQRqNgIIIAIgBEcEQCAAIAEgA3Q2AgwPCyAAQQA2AgwLgQIBBn8CQCADRQ0AIANBGGxB0ClqIgUoAgQhByADQQ9NBEAgASACTw0BIANBGGxB0ClqKAIUIQMDQCAEIAAgAUECdGoiBSgCACIGQQBHaiAFKAIEIgRBAEdqIAMgBiAHbCAEamotAABqIQQgAUECaiIBIAJJDQALDAELIAEgAk8NACAFKAIIIQUgA0EYbEHQKWooAhQhAwNAIAQgBUEAIAAgAUECdGoiBCgCACIGQQ5KIggbaiAFQQAgBCgCBCIEQQ5KIgkbaiADQQ8gBCAJGyIEQQ8gBiAIGyIGIAdsamotAABqIAZBAEdqIARBAEdqIQQgAUECaiIBIAJJDQALCyAEC/wDAQJ/IAJBgARPBEAgACABIAIQAQ8LIAAgAmohAwJAIAAgAXNBA3FFBEACQCAAQQNxRQRAIAAhAgwBCyACRQRAIAAhAgwBCyAAIQIDQCACIAEtAAA6AAAgAUEBaiEBIAJBAWoiAkEDcUUNASACIANJDQALCwJAIANBfHEiAEHAAEkNACACIABBQGoiBEsNAANAIAIgASgCADYCACACIAEoAgQ2AgQgAiABKAIINgIIIAIgASgCDDYCDCACIAEoAhA2AhAgAiABKAIUNgIUIAIgASgCGDYCGCACIAEoAhw2AhwgAiABKAIgNgIgIAIgASgCJDYCJCACIAEoAig2AiggAiABKAIsNgIsIAIgASgCMDYCMCACIAEoAjQ2AjQgAiABKAI4NgI4IAIgASgCPDYCPCABQUBrIQEgAkFAayICIARNDQALCyAAIAJNDQEDQCACIAEoAgA2AgAgAUEEaiEBIAJBBGoiAiAASQ0ACwwBCyADQQRJBEAgACECDAELIAAgA0EEayIESwRAIAAhAgwBCyAAIQIDQCACIAEtAAA6AAAgAiABLQABOgABIAIgAS0AAjoAAiACIAEtAAM6AAMgAUEEaiEBIAJBBGoiAiAETQ0ACwsgAiADSQRAA0AgAiABLQAAOgAAIAFBAWohASACQQFqIgIgA0cNAAsLC1IBAn9B4JMBKAIAIgEgAEEHakF4cSICaiEAAkAgAkEAIAAgAU0bDQAgAD8AQRB0SwRAIAAQAEUNAQtB4JMBIAA2AgAgAQ8LQeSTAUEwNgIAQX8L0gsBCH8CQCABIAJJBH8gAiABayIFQQNxIQYgASEEIAFBf3MgAmpBA08EQCAFQXxxIQkDQCADIAAgBEECdGoiBSgCACIKIAMgCkobIgMgBSgCBCIKIAMgCkobIgMgBSgCCCIKIAMgCkobIgMgBSgCDCIFIAMgBUobIQMgBEEEaiEEIAhBBGoiCCAJRw0ACwsgBgRAA0AgAyAAIARBAnRqKAIAIgUgAyAFShshAyAEQQFqIQQgB0EBaiIHIAZHDQALCyADRQRAQQAPCyADQQ5MBEAgA0GILCgCAE8EQEEMIQQCQAJAAkACQAJAQfArKAIAIANLDQBBCyEEQdgrKAIAIANLDQBBwCsoAgAgA0sNBEEJIQRBqCsoAgAgA0sNAEEIIQRBkCsoAgAgA0sNAEH4KigCACADSw0DQQYhBEHgKigCACADSw0AQcgqKAIAIANLDQJBBCEEQbAqKAIAIANLDQBBAyEEQZgqKAIAIANLDQBBgCooAgAgA0sNAUEBIQRB6CkoAgAgA0sNAEEAIQRB0CkoAgAgA00NCAsgACABIAIgBBADGiAEDwtBrCooAgAhBEGcKigCACEFIAAgASACQQIQAyEGQQAhAwNAIAMgACABQQJ0aiIHKAIAIghBAEdqIAcoAgQiA0EAR2ogBCAFIAhsIANqai0AAGohAyABQQJqIgEgAkkNAAtBAkEDIAMgBkobDwtB9CooAgAhBEHkKigCACEFIAAgASACQQUQAyEGQQAhAwNAIAMgACABQQJ0aiIHKAIAIghBAEdqIAcoAgQiA0EAR2ogBCAFIAhsIANqai0AAGohAyABQQJqIgEgAkkNAAtBBUEGIAMgBkobDwtBpCsoAgAhBkGUKygCACEHIAAgASACQQcQAyEFQQAhBCABIQMDQCAEIAAgA0ECdGoiCCgCACIJQQBHaiAIKAIEIgRBAEdqIAYgByAJbCAEamotAABqIQQgA0ECaiIDIAJJDQALIAQgBSAEIAVIGyEGQQdBCCAEIAVKGyEEQbwrKAIAIQVBrCsoAgAhB0EAIQMDQCADIAAgAUECdGoiCCgCACIJQQBHaiAIKAIEIgNBAEdqIAUgByAJbCADamotAABqIQMgAUECaiIBIAJJDQALQQkgBCADIAZMGw8LQewrKAIAIQZB3CsoAgAhByAAIAEgAkEKEAMhBUEAIQQgASEDA0AgBCAAIANBAnRqIggoAgAiCUEAR2ogCCgCBCIEQQBHaiAGIAcgCWwgBGpqLQAAaiEEIANBAmoiAyACSQ0ACyAEIAUgBCAFSBshBkEKQQsgBCAFShshBEGELCgCACEFQfQrKAIAIQdBACEDA0AgAyAAIAFBAnRqIggoAgAiCUEAR2ogCCgCBCIDQQBHaiAFIAcgCWwgA2pqLQAAaiEDIAFBAmoiASACSQ0AC0EMIAQgAyAGTBsPC0HMLCgCACEEQbwsKAIAIQUgACABIAJBDRADIQZBACEDA0AgAyAAIAFBAnRqIgcoAgAiCEEAR2ogBygCBCIDQQBHaiAEIAUgCGwgA2pqLQAAaiEDIAFBAmoiASACSQ0AC0ENQQ8gAyAGShsPCwJ/QQ8gA0EPayIFQcQsKAIATQ0AGkEQQdwsKAIAIAVPDQAaQRFB9CwoAgAgBU8NABpBEkGMLSgCACAFTw0AGkETQaQtKAIAIAVPDQAaQRRBvC0oAgAgBU8NABpBFUHULSgCACAFTw0AGkEWQewtKAIAIAVPDQAaQRdBAEGELigCACAFTxsLIQQCf0EYQZwuKAIAIAVPDQAaQRlBtC4oAgAgBU8NABpBGkHMLigCACAFTw0AGkEbQeQuKAIAIAVPDQAaQRxB/C4oAgAgBU8NABpBHUGULygCACAFTw0AGkEeQawvKAIAIAVPDQAaQR9BAEHELygCACAFTxsLIQMgACABIAIgBBADIQUgAyAEIAAgASACIAMQAyAFSBsFQQALDwsgACABIAJBABADGkEAC9YCAQF/AkAgAUUNACAAQQA6AAAgACABaiICQQFrQQA6AAAgAUEDSQ0AIABBADoAAiAAQQA6AAEgAkEDa0EAOgAAIAJBAmtBADoAACABQQdJDQAgAEEAOgADIAJBBGtBADoAACABQQlJDQAgAEEAIABrQQNxIgJqIgBBADYCACAAIAEgAmtBfHEiAmoiAUEEa0EANgIAIAJBCUkNACAAQQA2AgggAEEANgIEIAFBCGtBADYCACABQQxrQQA2AgAgAkEZSQ0AIABBADYCGCAAQQA2AhQgAEEANgIQIABBADYCDCABQRBrQQA2AgAgAUEUa0EANgIAIAFBGGtBADYCACABQRxrQQA2AgAgAiAAQQRxQRhyIgJrIgFBIEkNACAAIAJqIQADQCAAQgA3AxggAEIANwMQIABCADcDCCAAQgA3AwAgAEEgaiEAIAFBIGsiAUEfSw0ACwsLtykBC38jAEEQayILJAACQAJAAkACQAJAAkACQAJAAkAgAEH0AU0EQEHokwEoAgAiBkEQIABBC2pBeHEgAEELSRsiBUEDdiIAdiIBQQNxBEACQCABQX9zQQFxIABqIgJBA3QiAUGQlAFqIgAgAUGYlAFqKAIAIgEoAggiBEYEQEHokwEgBkF+IAJ3cTYCAAwBCyAEIAA2AgwgACAENgIICyABQQhqIQAgASACQQN0IgJBA3I2AgQgASACaiIBIAEoAgRBAXI2AgQMCgsgBUHwkwEoAgAiB00NASABBEACQEECIAB0IgJBACACa3IgASAAdHEiAEEAIABrcWgiAUEDdCIAQZCUAWoiAiAAQZiUAWooAgAiACgCCCIERgRAQeiTASAGQX4gAXdxIgY2AgAMAQsgBCACNgIMIAIgBDYCCAsgACAFQQNyNgIEIAAgBWoiCCABQQN0IgEgBWsiBEEBcjYCBCAAIAFqIAQ2AgAgBwRAIAdBeHFBkJQBaiEBQfyTASgCACECAn8gBkEBIAdBA3Z0IgNxRQRAQeiTASADIAZyNgIAIAEMAQsgASgCCAshAyABIAI2AgggAyACNgIMIAIgATYCDCACIAM2AggLIABBCGohAEH8kwEgCDYCAEHwkwEgBDYCAAwKC0HskwEoAgAiCkUNASAKQQAgCmtxaEECdEGYlgFqKAIAIgIoAgRBeHEgBWshAyACIQEDQAJAIAEoAhAiAEUEQCABKAIUIgBFDQELIAAoAgRBeHEgBWsiASADIAEgA0kiARshAyAAIAIgARshAiAAIQEMAQsLIAIoAhghCSACIAIoAgwiBEcEQCACKAIIIgBB+JMBKAIASRogACAENgIMIAQgADYCCAwJCyACQRRqIgEoAgAiAEUEQCACKAIQIgBFDQMgAkEQaiEBCwNAIAEhCCAAIgRBFGoiASgCACIADQAgBEEQaiEBIAQoAhAiAA0ACyAIQQA2AgAMCAtBfyEFIABBv39LDQAgAEELaiIAQXhxIQVB7JMBKAIAIghFDQBBACAFayEDAkACQAJAAn9BACAFQYACSQ0AGkEfIAVB////B0sNABogBUEmIABBCHZnIgBrdkEBcSAAQQF0a0E+agsiB0ECdEGYlgFqKAIAIgFFBEBBACEADAELQQAhACAFQRkgB0EBdmtBACAHQR9HG3QhAgNAAkAgASgCBEF4cSAFayIGIANPDQAgASEEIAYiAw0AQQAhAyABIQAMAwsgACABKAIUIgYgBiABIAJBHXZBBHFqKAIQIgFGGyAAIAYbIQAgAkEBdCECIAENAAsLIAAgBHJFBEBBACEEQQIgB3QiAEEAIABrciAIcSIARQ0DIABBACAAa3FoQQJ0QZiWAWooAgAhAAsgAEUNAQsDQCAAKAIEQXhxIAVrIgIgA0khASACIAMgARshAyAAIAQgARshBCAAKAIQIgEEfyABBSAAKAIUCyIADQALCyAERQ0AIANB8JMBKAIAIAVrTw0AIAQoAhghByAEIAQoAgwiAkcEQCAEKAIIIgBB+JMBKAIASRogACACNgIMIAIgADYCCAwHCyAEQRRqIgEoAgAiAEUEQCAEKAIQIgBFDQMgBEEQaiEBCwNAIAEhBiAAIgJBFGoiASgCACIADQAgAkEQaiEBIAIoAhAiAA0ACyAGQQA2AgAMBgsgBUHwkwEoAgAiAU0EQEH8kwEoAgAhAAJAIAEgBWsiAkEQTwRAQfCTASACNgIAQfyTASAAIAVqIgQ2AgAgBCACQQFyNgIEIAAgAWogAjYCACAAIAVBA3I2AgQMAQtB/JMBQQA2AgBB8JMBQQA2AgAgACABQQNyNgIEIAAgAWoiASABKAIEQQFyNgIECyAAQQhqIQAMCAsgBUH0kwEoAgAiAkkEQEH0kwEgAiAFayIBNgIAQYCUAUGAlAEoAgAiACAFaiICNgIAIAIgAUEBcjYCBCAAIAVBA3I2AgQgAEEIaiEADAgLQQAhACAFQS9qIgMCf0HAlwEoAgAEQEHIlwEoAgAMAQtBzJcBQn83AgBBxJcBQoCggICAgAQ3AgBBwJcBIAtBDGpBcHFB2KrVqgVzNgIAQdSXAUEANgIAQaSXAUEANgIAQYAgCyIBaiIGQQAgAWsiCHEiASAFTQ0HQaCXASgCACIEBEBBmJcBKAIAIgcgAWoiCSAHTQ0IIAQgCUkNCAsCQEGklwEtAABBBHFFBEACQAJAAkACQEGAlAEoAgAiBARAQaiXASEAA0AgBCAAKAIAIgdPBEAgByAAKAIEaiAESw0DCyAAKAIIIgANAAsLQQAQBSICQX9GDQMgASEGQcSXASgCACIAQQFrIgQgAnEEQCABIAJrIAIgBGpBACAAa3FqIQYLIAUgBk8NA0GglwEoAgAiAARAQZiXASgCACIEIAZqIgggBE0NBCAAIAhJDQQLIAYQBSIAIAJHDQEMBQsgBiACayAIcSIGEAUiAiAAKAIAIAAoAgRqRg0BIAIhAAsgAEF/Rg0BIAYgBUEwak8EQCAAIQIMBAtByJcBKAIAIgIgAyAGa2pBACACa3EiAhAFQX9GDQEgAiAGaiEGIAAhAgwDCyACQX9HDQILQaSXAUGklwEoAgBBBHI2AgALIAEQBSECQQAQBSEAIAJBf0YNBSAAQX9GDQUgACACTQ0FIAAgAmsiBiAFQShqTQ0FC0GYlwFBmJcBKAIAIAZqIgA2AgBBnJcBKAIAIABJBEBBnJcBIAA2AgALAkBBgJQBKAIAIgMEQEGolwEhAANAIAIgACgCACIBIAAoAgQiBGpGDQIgACgCCCIADQALDAQLQfiTASgCACIAQQAgACACTRtFBEBB+JMBIAI2AgALQQAhAEGslwEgBjYCAEGolwEgAjYCAEGIlAFBfzYCAEGMlAFBwJcBKAIANgIAQbSXAUEANgIAA0AgAEEDdCIBQZiUAWogAUGQlAFqIgQ2AgAgAUGclAFqIAQ2AgAgAEEBaiIAQSBHDQALQfSTASAGQShrIgBBeCACa0EHcUEAIAJBCGpBB3EbIgFrIgQ2AgBBgJQBIAEgAmoiATYCACABIARBAXI2AgQgACACakEoNgIEQYSUAUHQlwEoAgA2AgAMBAsgAC0ADEEIcQ0CIAEgA0sNAiACIANNDQIgACAEIAZqNgIEQYCUASADQXggA2tBB3FBACADQQhqQQdxGyIAaiIBNgIAQfSTAUH0kwEoAgAgBmoiAiAAayIANgIAIAEgAEEBcjYCBCACIANqQSg2AgRBhJQBQdCXASgCADYCAAwDC0EAIQQMBQtBACECDAMLQfiTASgCACACSwRAQfiTASACNgIACyACIAZqIQFBqJcBIQACQAJAAkACQAJAAkADQCABIAAoAgBHBEAgACgCCCIADQEMAgsLIAAtAAxBCHFFDQELQaiXASEAA0AgAyAAKAIAIgFPBEAgASAAKAIEaiIEIANLDQMLIAAoAgghAAwACwALIAAgAjYCACAAIAAoAgQgBmo2AgQgAkF4IAJrQQdxQQAgAkEIakEHcRtqIgcgBUEDcjYCBCABQXggAWtBB3FBACABQQhqQQdxG2oiBiAFIAdqIgVrIQAgAyAGRgRAQYCUASAFNgIAQfSTAUH0kwEoAgAgAGoiADYCACAFIABBAXI2AgQMAwtB/JMBKAIAIAZGBEBB/JMBIAU2AgBB8JMBQfCTASgCACAAaiIANgIAIAUgAEEBcjYCBCAAIAVqIAA2AgAMAwsgBigCBCIDQQNxQQFGBEAgA0F4cSEJAkAgA0H/AU0EQCAGKAIIIgEgA0EDdiIEQQN0QZCUAWpGGiABIAYoAgwiAkYEQEHokwFB6JMBKAIAQX4gBHdxNgIADAILIAEgAjYCDCACIAE2AggMAQsgBigCGCEIAkAgBiAGKAIMIgJHBEAgBigCCCIBIAI2AgwgAiABNgIIDAELAkAgBkEUaiIDKAIAIgENACAGQRBqIgMoAgAiAQ0AQQAhAgwBCwNAIAMhBCABIgJBFGoiAygCACIBDQAgAkEQaiEDIAIoAhAiAQ0ACyAEQQA2AgALIAhFDQACQCAGKAIcIgFBAnRBmJYBaiIEKAIAIAZGBEAgBCACNgIAIAINAUHskwFB7JMBKAIAQX4gAXdxNgIADAILIAhBEEEUIAgoAhAgBkYbaiACNgIAIAJFDQELIAIgCDYCGCAGKAIQIgEEQCACIAE2AhAgASACNgIYCyAGKAIUIgFFDQAgAiABNgIUIAEgAjYCGAsgBiAJaiIGKAIEIQMgACAJaiEACyAGIANBfnE2AgQgBSAAQQFyNgIEIAAgBWogADYCACAAQf8BTQRAIABBeHFBkJQBaiEBAn9B6JMBKAIAIgJBASAAQQN2dCIAcUUEQEHokwEgACACcjYCACABDAELIAEoAggLIQAgASAFNgIIIAAgBTYCDCAFIAE2AgwgBSAANgIIDAMLQR8hAyAAQf///wdNBEAgAEEmIABBCHZnIgFrdkEBcSABQQF0a0E+aiEDCyAFIAM2AhwgBUIANwIQIANBAnRBmJYBaiEBAkBB7JMBKAIAIgJBASADdCIEcUUEQEHskwEgAiAEcjYCACABIAU2AgAMAQsgAEEZIANBAXZrQQAgA0EfRxt0IQMgASgCACECA0AgAiIBKAIEQXhxIABGDQMgA0EddiECIANBAXQhAyABIAJBBHFqIgQoAhAiAg0ACyAEIAU2AhALIAUgATYCGCAFIAU2AgwgBSAFNgIIDAILQfSTASAGQShrIgBBeCACa0EHcUEAIAJBCGpBB3EbIgFrIgg2AgBBgJQBIAEgAmoiATYCACABIAhBAXI2AgQgACACakEoNgIEQYSUAUHQlwEoAgA2AgAgAyAEQScgBGtBB3FBACAEQSdrQQdxG2pBL2siACAAIANBEGpJGyIBQRs2AgQgAUGwlwEpAgA3AhAgAUGolwEpAgA3AghBsJcBIAFBCGo2AgBBrJcBIAY2AgBBqJcBIAI2AgBBtJcBQQA2AgAgAUEYaiEAA0AgAEEHNgIEIABBCGohAiAAQQRqIQAgAiAESQ0ACyABIANGDQMgASABKAIEQX5xNgIEIAMgASADayICQQFyNgIEIAEgAjYCACACQf8BTQRAIAJBeHFBkJQBaiEAAn9B6JMBKAIAIgFBASACQQN2dCICcUUEQEHokwEgASACcjYCACAADAELIAAoAggLIQEgACADNgIIIAEgAzYCDCADIAA2AgwgAyABNgIIDAQLQR8hACACQf///wdNBEAgAkEmIAJBCHZnIgBrdkEBcSAAQQF0a0E+aiEACyADIAA2AhwgA0IANwIQIABBAnRBmJYBaiEBAkBB7JMBKAIAIgRBASAAdCIGcUUEQEHskwEgBCAGcjYCACABIAM2AgAMAQsgAkEZIABBAXZrQQAgAEEfRxt0IQAgASgCACEEA0AgBCIBKAIEQXhxIAJGDQQgAEEddiEEIABBAXQhACABIARBBHFqIgYoAhAiBA0ACyAGIAM2AhALIAMgATYCGCADIAM2AgwgAyADNgIIDAMLIAEoAggiACAFNgIMIAEgBTYCCCAFQQA2AhggBSABNgIMIAUgADYCCAsgB0EIaiEADAULIAEoAggiACADNgIMIAEgAzYCCCADQQA2AhggAyABNgIMIAMgADYCCAtB9JMBKAIAIgAgBU0NAEH0kwEgACAFayIBNgIAQYCUAUGAlAEoAgAiACAFaiICNgIAIAIgAUEBcjYCBCAAIAVBA3I2AgQgAEEIaiEADAMLQeSTAUEwNgIAQQAhAAwCCwJAIAdFDQACQCAEKAIcIgBBAnRBmJYBaiIBKAIAIARGBEAgASACNgIAIAINAUHskwEgCEF+IAB3cSIINgIADAILIAdBEEEUIAcoAhAgBEYbaiACNgIAIAJFDQELIAIgBzYCGCAEKAIQIgAEQCACIAA2AhAgACACNgIYCyAEKAIUIgBFDQAgAiAANgIUIAAgAjYCGAsCQCADQQ9NBEAgBCADIAVqIgBBA3I2AgQgACAEaiIAIAAoAgRBAXI2AgQMAQsgBCAFQQNyNgIEIAQgBWoiAiADQQFyNgIEIAIgA2ogAzYCACADQf8BTQRAIANBeHFBkJQBaiEAAn9B6JMBKAIAIgFBASADQQN2dCIDcUUEQEHokwEgASADcjYCACAADAELIAAoAggLIQEgACACNgIIIAEgAjYCDCACIAA2AgwgAiABNgIIDAELQR8hACADQf///wdNBEAgA0EmIANBCHZnIgBrdkEBcSAAQQF0a0E+aiEACyACIAA2AhwgAkIANwIQIABBAnRBmJYBaiEBAkACQCAIQQEgAHQiBnFFBEBB7JMBIAYgCHI2AgAgASACNgIADAELIANBGSAAQQF2a0EAIABBH0cbdCEAIAEoAgAhBQNAIAUiASgCBEF4cSADRg0CIABBHXYhBiAAQQF0IQAgASAGQQRxaiIGKAIQIgUNAAsgBiACNgIQCyACIAE2AhggAiACNgIMIAIgAjYCCAwBCyABKAIIIgAgAjYCDCABIAI2AgggAkEANgIYIAIgATYCDCACIAA2AggLIARBCGohAAwBCwJAIAlFDQACQCACKAIcIgBBAnRBmJYBaiIBKAIAIAJGBEAgASAENgIAIAQNAUHskwEgCkF+IAB3cTYCAAwCCyAJQRBBFCAJKAIQIAJGG2ogBDYCACAERQ0BCyAEIAk2AhggAigCECIABEAgBCAANgIQIAAgBDYCGAsgAigCFCIARQ0AIAQgADYCFCAAIAQ2AhgLAkAgA0EPTQRAIAIgAyAFaiIAQQNyNgIEIAAgAmoiACAAKAIEQQFyNgIEDAELIAIgBUEDcjYCBCACIAVqIgQgA0EBcjYCBCADIARqIAM2AgAgBwRAIAdBeHFBkJQBaiEAQfyTASgCACEBAn9BASAHQQN2dCIFIAZxRQRAQeiTASAFIAZyNgIAIAAMAQsgACgCCAshBiAAIAE2AgggBiABNgIMIAEgADYCDCABIAY2AggLQfyTASAENgIAQfCTASADNgIACyACQQhqIQALIAtBEGokACAAC5kBAQN8IAAgAKIiAyADIAOioiADRHzVz1o62eU9okTrnCuK5uVavqCiIAMgA0R9/rFX4x3HPqJE1WHBGaABKr+gokSm+BARERGBP6CgIQUgAyAAoiEEIAJFBEAgBCADIAWiRElVVVVVVcW/oKIgAKAPCyAAIAMgAUQAAAAAAADgP6IgBSAEoqGiIAGhIARESVVVVVVVxT+ioKELkgEBA3xEAAAAAAAA8D8gACAAoiICRAAAAAAAAOA/oiIDoSIERAAAAAAAAPA/IAShIAOhIAIgAiACIAJEkBXLGaAB+j6iRHdRwRZswVa/oKJETFVVVVVVpT+goiACIAKiIgMgA6IgAiACRNQ4iL7p+qi9okTEsbS9nu4hPqCiRK1SnIBPfpK+oKKgoiAAIAGioaCgC4kMAQd/AkAgAEUNACAAQQhrIgIgAEEEaygCACIBQXhxIgBqIQUCQCABQQFxDQAgAUEDcUUNASACIAIoAgAiAWsiAkH4kwEoAgBJDQEgACABaiEAQfyTASgCACACRwRAIAFB/wFNBEAgAigCCCIEIAFBA3YiAUEDdEGQlAFqRhogBCACKAIMIgNGBEBB6JMBQeiTASgCAEF+IAF3cTYCAAwDCyAEIAM2AgwgAyAENgIIDAILIAIoAhghBgJAIAIgAigCDCIBRwRAIAIoAggiAyABNgIMIAEgAzYCCAwBCwJAIAJBFGoiBCgCACIDDQAgAkEQaiIEKAIAIgMNAEEAIQEMAQsDQCAEIQcgAyIBQRRqIgQoAgAiAw0AIAFBEGohBCABKAIQIgMNAAsgB0EANgIACyAGRQ0BAkAgAigCHCIEQQJ0QZiWAWoiAygCACACRgRAIAMgATYCACABDQFB7JMBQeyTASgCAEF+IAR3cTYCAAwDCyAGQRBBFCAGKAIQIAJGG2ogATYCACABRQ0CCyABIAY2AhggAigCECIDBEAgASADNgIQIAMgATYCGAsgAigCFCIDRQ0BIAEgAzYCFCADIAE2AhgMAQsgBSgCBCIBQQNxQQNHDQBB8JMBIAA2AgAgBSABQX5xNgIEIAIgAEEBcjYCBCAAIAJqIAA2AgAPCyACIAVPDQAgBSgCBCIBQQFxRQ0AAkAgAUECcUUEQEGAlAEoAgAgBUYEQEGAlAEgAjYCAEH0kwFB9JMBKAIAIABqIgA2AgAgAiAAQQFyNgIEIAJB/JMBKAIARw0DQfCTAUEANgIAQfyTAUEANgIADwtB/JMBKAIAIAVGBEBB/JMBIAI2AgBB8JMBQfCTASgCACAAaiIANgIAIAIgAEEBcjYCBCAAIAJqIAA2AgAPCyABQXhxIABqIQACQCABQf8BTQRAIAUoAggiBCABQQN2IgFBA3RBkJQBakYaIAQgBSgCDCIDRgRAQeiTAUHokwEoAgBBfiABd3E2AgAMAgsgBCADNgIMIAMgBDYCCAwBCyAFKAIYIQYCQCAFIAUoAgwiAUcEQCAFKAIIIgNB+JMBKAIASRogAyABNgIMIAEgAzYCCAwBCwJAIAVBFGoiBCgCACIDDQAgBUEQaiIEKAIAIgMNAEEAIQEMAQsDQCAEIQcgAyIBQRRqIgQoAgAiAw0AIAFBEGohBCABKAIQIgMNAAsgB0EANgIACyAGRQ0AAkAgBSgCHCIEQQJ0QZiWAWoiAygCACAFRgRAIAMgATYCACABDQFB7JMBQeyTASgCAEF+IAR3cTYCAAwCCyAGQRBBFCAGKAIQIAVGG2ogATYCACABRQ0BCyABIAY2AhggBSgCECIDBEAgASADNgIQIAMgATYCGAsgBSgCFCIDRQ0AIAEgAzYCFCADIAE2AhgLIAIgAEEBcjYCBCAAIAJqIAA2AgAgAkH8kwEoAgBHDQFB8JMBIAA2AgAPCyAFIAFBfnE2AgQgAiAAQQFyNgIEIAAgAmogADYCAAsgAEH/AU0EQCAAQXhxQZCUAWohAQJ/QeiTASgCACIDQQEgAEEDdnQiAHFFBEBB6JMBIAAgA3I2AgAgAQwBCyABKAIICyEAIAEgAjYCCCAAIAI2AgwgAiABNgIMIAIgADYCCA8LQR8hBCAAQf///wdNBEAgAEEmIABBCHZnIgFrdkEBcSABQQF0a0E+aiEECyACIAQ2AhwgAkIANwIQIARBAnRBmJYBaiEHAkACQAJAQeyTASgCACIDQQEgBHQiAXFFBEBB7JMBIAEgA3I2AgAgByACNgIAIAIgBzYCGAwBCyAAQRkgBEEBdmtBACAEQR9HG3QhBCAHKAIAIQEDQCABIgMoAgRBeHEgAEYNAiAEQR12IQEgBEEBdCEEIAMgAUEEcWoiB0EQaigCACIBDQALIAcgAjYCECACIAM2AhgLIAIgAjYCDCACIAI2AggMAQsgAygCCCIAIAI2AgwgAyACNgIIIAJBADYCGCACIAM2AgwgAiAANgIIC0GIlAFBiJQBKAIAQQFrIgBBfyAAGzYCAAsLqAEAAkAgAUGACE4EQCAARAAAAAAAAOB/oiEAIAFB/w9JBEAgAUH/B2shAQwCCyAARAAAAAAAAOB/oiEAQf0XIAEgAUH9F04bQf4PayEBDAELIAFBgXhKDQAgAEQAAAAAAABgA6IhACABQbhwSwRAIAFByQdqIQEMAQsgAEQAAAAAAABgA6IhAEHwaCABIAFB8GhMG0GSD2ohAQsgACABQf8Haq1CNIa/ogu8AgEBfwJ/QQAgAUECdEGAM2oiAigCACAARg0AGkEBIAIoAhAgAEYNABpBAiABQQJ0QaAzaigCACAARg0AGkEDIAFBAnQiAkGwM2ooAgAgAEYNABpBBCACQcAzaigCACAARg0AGkEFIAFBAnQiAkHQM2ooAgAgAEYNABpBBiACQeAzaigCACAARg0AGkEHIAFBAnQiAkHwM2ooAgAgAEYNABpBCCACQYA0aigCACAARg0AGkEJIAFBAnQiAkGQNGooAgAgAEYNABpBCiACQaA0aigCACAARg0AGkELIAFBAnQiAkGwNGooAgAgAEYNABpBDCACQcA0aigCACAARg0AGkENIAFBAnQiAkHQNGooAgAgAEYNABpBDiACQeA0aigCACAARg0AGkEPQX8gAUECdEHwNGooAgAgAEYbCwvoBAMBfwZ8An4gAL0iCEIwiKchASAIQoCAgICAgID3P31C//////+fwgFYBEAgCEKAgICAgICA+D9RBEBEAAAAAAAAAAAPCyAARAAAAAAAAPC/oCIAIAAgAEQAAAAAAACgQaIiAqAgAqEiAiACokGI8wArAwAiBaIiBqAiByAAIAAgAKIiA6IiBCAEIAQgBEHY8wArAwCiIANB0PMAKwMAoiAAQcjzACsDAKJBwPMAKwMAoKCgoiADQbjzACsDAKIgAEGw8wArAwCiQajzACsDAKCgoKIgA0Gg8wArAwCiIABBmPMAKwMAokGQ8wArAwCgoKCiIAAgAqEgBaIgACACoKIgBiAAIAehoKCgoA8LAkAgAUHw/wFrQZ+Afk0EQCAIQv///////////wCDUARAIwBBEGsiAUQAAAAAAADwvzkDCCABKwMIRAAAAAAAAAAAow8LIAhCgICAgICAgPj/AFENASABQYCAAnFFIAFB8P8BcUHw/wFHcUUEQCAAIAChIgAgAKMPCyAARAAAAAAAADBDor1CgICAgICAgKADfSEICyAIQoCAgICAgIDzP30iCUI0h6e3IgNB0PIAKwMAoiAJQi2Ip0H/AHFBBHQiAUHo8wBqKwMAoCIEIAFB4PMAaisDACAIIAlCgICAgICAgHiDfb8gAUHggwFqKwMAoSABQeiDAWorAwChoiIAoCIFIAAgACAAoiICoiACIABBgPMAKwMAokH48gArAwCgoiAAQfDyACsDAKJB6PIAKwMAoKCiIAJB4PIAKwMAoiADQdjyACsDAKIgACAEIAWhoKCgoKAhAAsgAAsDAAELkwwCB38BfiMAQYACayIHJAAgA0GAjQVqIgQgAkECdGoiBSgCAEECdCAEIAJBC3QiCGpBiMAAaiICaiAAKAIAIgQvAQBBEHQ2AnwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AnggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AnQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AnAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AmwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AmggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AmQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AmAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AlwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AlggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AlQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AlAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AkwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AkggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AkQgBSgCAEECdCACakFAayAEQQJqIgQvAQBBEHQ2AgAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AjwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AjggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AjQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AjAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AiwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AiggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AiQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AiAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AhwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AhggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AhQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AhAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AgwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AgggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AgQgAiAFKAIAQQJ0aiAEQQJqIgIvAQBBEHQ2AgAgACACQQJqNgIAIAUoAgAhCUHAACECA0AgByACQQFrIgBBAnQiCmogAkECdEHAO2oiBjQC/AEgAyAIakGIzQVqIgIgACAJaiIEQUBrQf8DcUECdGo0AgB+QiCIpyAKQcA7ajQCACACIARB/wNxQQJ0ajQCAH5CIIinaiAGNAL8AyACIARBgAFqQf8DcUECdGo0AgB+QiCIp2ogBjQC/AUgAiAEQcABakH/A3FBAnRqNAIAfkIgiKdqIAY0AvwHIAIgBEGAAmpB/wNxQQJ0ajQCAH5CIIinaiAGQfwJajQCACACIARBwAJqQf8DcUECdGo0AgB+QiCIp2ogBkH8C2o0AgAgAiAEQYADakH/A3FBAnRqNAIAfkIgiKdqIAZB/A1qNAIAIAIgBEHAA2pB/wNxQQJ0ajQCAH5CIIinajYCACAAIgINAAsgBSAFKAIAQeADakH/A3E2AgBBHyECIAc0AvwBIQsDQCALIAMgAiIFQQh0aiIIQYSPBWo0AgB+QiCIpyEGQT8hAANAIAYgByAAQQJ0IgRBBGsiCWo0AgAgCSAIQYiNBWoiAmo0AgB+QiCIp2ogByAEQQhrIgZqNAIAIAIgBmo0AgB+QiCIp2ogByAEQQxrIgZqNAIAIAIgBmo0AgB+QiCIp2ogByAEQRBrIgZqNAIAIAIgBmo0AgB+QiCIp2ogByAEQRRrIgZqNAIAIAIgBmo0AgB+QiCIp2ogByAEQRhrIgRqNAIAIAIgBGo0AgB+QiCIp2ogByAAQQdrIgBBAnQiBGo0AgAgAiAEajQCAH5CIIinaiEGIAANAAsgASAFQQJ0aiAGNgIAIAVBAWshAiAFDQALIAdBgAJqJAALyAsBBn8gACABaiEFAkACQCAAKAIEIgJBAXENACACQQNxRQ0BIAAoAgAiAiABaiEBAkAgACACayIAQfyTASgCAEcEQCACQf8BTQRAIAAoAggiBCACQQN2IgJBA3RBkJQBakYaIAAoAgwiAyAERw0CQeiTAUHokwEoAgBBfiACd3E2AgAMAwsgACgCGCEGAkAgACAAKAIMIgJHBEAgACgCCCIDQfiTASgCAEkaIAMgAjYCDCACIAM2AggMAQsCQCAAQRRqIgQoAgAiAw0AIABBEGoiBCgCACIDDQBBACECDAELA0AgBCEHIAMiAkEUaiIEKAIAIgMNACACQRBqIQQgAigCECIDDQALIAdBADYCAAsgBkUNAgJAIAAoAhwiBEECdEGYlgFqIgMoAgAgAEYEQCADIAI2AgAgAg0BQeyTAUHskwEoAgBBfiAEd3E2AgAMBAsgBkEQQRQgBigCECAARhtqIAI2AgAgAkUNAwsgAiAGNgIYIAAoAhAiAwRAIAIgAzYCECADIAI2AhgLIAAoAhQiA0UNAiACIAM2AhQgAyACNgIYDAILIAUoAgQiAkEDcUEDRw0BQfCTASABNgIAIAUgAkF+cTYCBCAAIAFBAXI2AgQgBSABNgIADwsgBCADNgIMIAMgBDYCCAsCQCAFKAIEIgJBAnFFBEBBgJQBKAIAIAVGBEBBgJQBIAA2AgBB9JMBQfSTASgCACABaiIBNgIAIAAgAUEBcjYCBCAAQfyTASgCAEcNA0HwkwFBADYCAEH8kwFBADYCAA8LQfyTASgCACAFRgRAQfyTASAANgIAQfCTAUHwkwEoAgAgAWoiATYCACAAIAFBAXI2AgQgACABaiABNgIADwsgAkF4cSABaiEBAkAgAkH/AU0EQCAFKAIIIgQgAkEDdiICQQN0QZCUAWpGGiAEIAUoAgwiA0YEQEHokwFB6JMBKAIAQX4gAndxNgIADAILIAQgAzYCDCADIAQ2AggMAQsgBSgCGCEGAkAgBSAFKAIMIgJHBEAgBSgCCCIDQfiTASgCAEkaIAMgAjYCDCACIAM2AggMAQsCQCAFQRRqIgMoAgAiBA0AIAVBEGoiAygCACIEDQBBACECDAELA0AgAyEHIAQiAkEUaiIDKAIAIgQNACACQRBqIQMgAigCECIEDQALIAdBADYCAAsgBkUNAAJAIAUoAhwiBEECdEGYlgFqIgMoAgAgBUYEQCADIAI2AgAgAg0BQeyTAUHskwEoAgBBfiAEd3E2AgAMAgsgBkEQQRQgBigCECAFRhtqIAI2AgAgAkUNAQsgAiAGNgIYIAUoAhAiAwRAIAIgAzYCECADIAI2AhgLIAUoAhQiA0UNACACIAM2AhQgAyACNgIYCyAAIAFBAXI2AgQgACABaiABNgIAIABB/JMBKAIARw0BQfCTASABNgIADwsgBSACQX5xNgIEIAAgAUEBcjYCBCAAIAFqIAE2AgALIAFB/wFNBEAgAUF4cUGQlAFqIQICf0HokwEoAgAiA0EBIAFBA3Z0IgFxRQRAQeiTASABIANyNgIAIAIMAQsgAigCCAshASACIAA2AgggASAANgIMIAAgAjYCDCAAIAE2AggPC0EfIQQgAUH///8HTQRAIAFBJiABQQh2ZyICa3ZBAXEgAkEBdGtBPmohBAsgACAENgIcIABCADcCECAEQQJ0QZiWAWohBwJAAkBB7JMBKAIAIgNBASAEdCICcUUEQEHskwEgAiADcjYCACAHIAA2AgAgACAHNgIYDAELIAFBGSAEQQF2a0EAIARBH0cbdCEEIAcoAgAhAgNAIAIiAygCBEF4cSABRg0CIARBHXYhAiAEQQF0IQQgAyACQQRxaiIHQRBqKAIAIgINAAsgByAANgIQIAAgAzYCGAsgACAANgIMIAAgADYCCA8LIAMoAggiASAANgIMIAMgADYCCCAAQQA2AhggACADNgIMIAAgATYCCAsLwQEBAn8jAEEQayIBJAACfCAAvUIgiKdB/////wdxIgJB+8Ok/wNNBEBEAAAAAAAA8D8gAkGewZryA0kNARogAEQAAAAAAAAAABAKDAELIAAgAKEgAkGAgMD/B08NABoCQAJAAkACQCAAIAEQE0EDcQ4DAAECAwsgASsDACABKwMIEAoMAwsgASsDACABKwMIQQEQCZoMAgsgASsDACABKwMIEAqaDAELIAErAwAgASsDCEEBEAkLIQAgAUEQaiQAIAALzxgDFH8EfAF+IwBBMGsiCSQAAkACQAJAIAC9IhpCIIinIgNB/////wdxIgZB+tS9gARNBEAgA0H//z9xQfvDJEYNASAGQfyyi4AETQRAIBpCAFkEQCABIABEAABAVPsh+b+gIgBEMWNiGmG00L2gIhY5AwAgASAAIBahRDFjYhphtNC9oDkDCEEBIQMMBQsgASAARAAAQFT7Ifk/oCIARDFjYhphtNA9oCIWOQMAIAEgACAWoUQxY2IaYbTQPaA5AwhBfyEDDAQLIBpCAFkEQCABIABEAABAVPshCcCgIgBEMWNiGmG04L2gIhY5AwAgASAAIBahRDFjYhphtOC9oDkDCEECIQMMBAsgASAARAAAQFT7IQlAoCIARDFjYhphtOA9oCIWOQMAIAEgACAWoUQxY2IaYbTgPaA5AwhBfiEDDAMLIAZBu4zxgARNBEAgBkG8+9eABE0EQCAGQfyyy4AERg0CIBpCAFkEQCABIABEAAAwf3zZEsCgIgBEypSTp5EO6b2gIhY5AwAgASAAIBahRMqUk6eRDum9oDkDCEEDIQMMBQsgASAARAAAMH982RJAoCIARMqUk6eRDuk9oCIWOQMAIAEgACAWoUTKlJOnkQ7pPaA5AwhBfSEDDAQLIAZB+8PkgARGDQEgGkIAWQRAIAEgAEQAAEBU+yEZwKAiAEQxY2IaYbTwvaAiFjkDACABIAAgFqFEMWNiGmG08L2gOQMIQQQhAwwECyABIABEAABAVPshGUCgIgBEMWNiGmG08D2gIhY5AwAgASAAIBahRDFjYhphtPA9oDkDCEF8IQMMAwsgBkH6w+SJBEsNAQsgACAARIPIyW0wX+Q/okQAAAAAAAA4Q6BEAAAAAAAAOMOgIhdEAABAVPsh+b+ioCIWIBdEMWNiGmG00D2iIhihIhlEGC1EVPsh6b9jIQICfyAXmUQAAAAAAADgQWMEQCAXqgwBC0GAgICAeAshAwJAIAIEQCADQQFrIQMgF0QAAAAAAADwv6AiF0QxY2IaYbTQPaIhGCAAIBdEAABAVPsh+b+ioCEWDAELIBlEGC1EVPsh6T9kRQ0AIANBAWohAyAXRAAAAAAAAPA/oCIXRDFjYhphtNA9oiEYIAAgF0QAAEBU+yH5v6KgIRYLIAEgFiAYoSIAOQMAAkAgBkEUdiICIAC9QjSIp0H/D3FrQRFIDQAgASAWIBdEAABgGmG00D2iIgChIhkgF0RzcAMuihmjO6IgFiAZoSAAoaEiGKEiADkDACACIAC9QjSIp0H/D3FrQTJIBEAgGSEWDAELIAEgGSAXRAAAAC6KGaM7oiIAoSIWIBdEwUkgJZqDezmiIBkgFqEgAKGhIhihIgA5AwALIAEgFiAAoSAYoTkDCAwBCyAGQYCAwP8HTwRAIAEgACAAoSIAOQMAIAEgADkDCEEAIQMMAQsgGkL/////////B4NCgICAgICAgLDBAIS/IQBBACEDQQEhAgNAIAlBEGogA0EDdGoCfyAAmUQAAAAAAADgQWMEQCAAqgwBC0GAgICAeAu3IhY5AwAgACAWoUQAAAAAAABwQaIhAEEBIQMgAiEEQQAhAiAEDQALIAkgADkDIEECIQMDQCADIgJBAWshAyAJQRBqIAJBA3RqKwMARAAAAAAAAAAAYQ0ACyAJQRBqIQ5BACEEIwBBsARrIgUkACAGQRR2QZYIayIDQQNrQRhtIgZBACAGQQBKGyIPQWhsIANqIQZBxMsAKAIAIgggAkEBaiIKQQFrIgdqQQBOBEAgCCAKaiEDIA8gB2shAgNAIAVBwAJqIARBA3RqIAJBAEgEfEQAAAAAAAAAAAUgAkECdEHQywBqKAIAtws5AwAgAkEBaiECIARBAWoiBCADRw0ACwsgBkEYayELQQAhAyAIQQAgCEEAShshBCAKQQBMIQwDQAJAIAwEQEQAAAAAAAAAACEADAELIAMgB2ohDUEAIQJEAAAAAAAAAAAhAANAIA4gAkEDdGorAwAgBUHAAmogDSACa0EDdGorAwCiIACgIQAgAkEBaiICIApHDQALCyAFIANBA3RqIAA5AwAgAyAERiECIANBAWohAyACRQ0AC0EvIAZrIRJBMCAGayEQIAZBGWshEyAIIQMCQANAIAUgA0EDdGorAwAhAEEAIQIgAyEEIANBAEwiB0UEQANAIAVB4ANqIAJBAnRqAn8CfyAARAAAAAAAAHA+oiIWmUQAAAAAAADgQWMEQCAWqgwBC0GAgICAeAu3IhZEAAAAAAAAcMGiIACgIgCZRAAAAAAAAOBBYwRAIACqDAELQYCAgIB4CzYCACAFIARBAWsiBEEDdGorAwAgFqAhACACQQFqIgIgA0cNAAsLAn8gACALEAwiACAARAAAAAAAAMA/opxEAAAAAAAAIMCioCIAmUQAAAAAAADgQWMEQCAAqgwBC0GAgICAeAshDCAAIAy3oSEAAkACQAJAAn8gC0EATCIURQRAIANBAnQgBWoiAiACKALcAyICIAIgEHUiAiAQdGsiBDYC3AMgAiAMaiEMIAQgEnUMAQsgCw0BIANBAnQgBWooAtwDQRd1CyINQQBMDQIMAQtBAiENIABEAAAAAAAA4D9mDQBBACENDAELQQAhAkEAIQQgB0UEQANAIAVB4ANqIAJBAnRqIhUoAgAhEUH///8HIQcCfwJAIAQNAEGAgIAIIQcgEQ0AQQAMAQsgFSAHIBFrNgIAQQELIQQgAkEBaiICIANHDQALCwJAIBQNAEH///8DIQICQAJAIBMOAgEAAgtB////ASECCyADQQJ0IAVqIgcgBygC3AMgAnE2AtwDCyAMQQFqIQwgDUECRw0ARAAAAAAAAPA/IAChIQBBAiENIARFDQAgAEQAAAAAAADwPyALEAyhIQALIABEAAAAAAAAAABhBEBBACEEIAMhAgJAIAMgCEwNAANAIAVB4ANqIAJBAWsiAkECdGooAgAgBHIhBCACIAhKDQALIARFDQAgCyEGA0AgBkEYayEGIAVB4ANqIANBAWsiA0ECdGooAgBFDQALDAMLQQEhAgNAIAIiBEEBaiECIAVB4ANqIAggBGtBAnRqKAIARQ0ACyADIARqIQQDQCAFQcACaiADIApqIgdBA3RqIANBAWoiAyAPakECdEHQywBqKAIAtzkDAEEAIQJEAAAAAAAAAAAhACAKQQBKBEADQCAOIAJBA3RqKwMAIAVBwAJqIAcgAmtBA3RqKwMAoiAAoCEAIAJBAWoiAiAKRw0ACwsgBSADQQN0aiAAOQMAIAMgBEgNAAsgBCEDDAELCwJAIABBGCAGaxAMIgBEAAAAAAAAcEFmBEAgBUHgA2ogA0ECdGoCfwJ/IABEAAAAAAAAcD6iIhaZRAAAAAAAAOBBYwRAIBaqDAELQYCAgIB4CyICt0QAAAAAAABwwaIgAKAiAJlEAAAAAAAA4EFjBEAgAKoMAQtBgICAgHgLNgIAIANBAWohAwwBCwJ/IACZRAAAAAAAAOBBYwRAIACqDAELQYCAgIB4CyECIAshBgsgBUHgA2ogA0ECdGogAjYCAAtEAAAAAAAA8D8gBhAMIQACQCADQQBIDQAgAyECA0AgBSACIgRBA3RqIAAgBUHgA2ogAkECdGooAgC3ojkDACACQQFrIQIgAEQAAAAAAABwPqIhACAEDQALQQAhByADQQBIDQAgCEEAIAhBAEobIQYgAyEEA0AgBiAHIAYgB0kbIQsgAyAEayEIQQAhAkQAAAAAAAAAACEAA0AgAkEDdEGg4QBqKwMAIAUgAiAEakEDdGorAwCiIACgIQAgAiALRyEKIAJBAWohAiAKDQALIAVBoAFqIAhBA3RqIAA5AwAgBEEBayEEIAMgB0chAiAHQQFqIQcgAg0ACwtEAAAAAAAAAAAhACADQQBOBEAgAyECA0AgAiIEQQFrIQIgACAFQaABaiAEQQN0aisDAKAhACAEDQALCyAJIACaIAAgDRs5AwAgBSsDoAEgAKEhAEEBIQIgA0EASgRAA0AgACAFQaABaiACQQN0aisDAKAhACACIANHIQQgAkEBaiECIAQNAAsLIAkgAJogACANGzkDCCAFQbAEaiQAIAxBB3EhAyAJKwMAIQAgGkIAUwRAIAEgAJo5AwAgASAJKwMImjkDCEEAIANrIQMMAQsgASAAOQMAIAEgCSsDCDkDCAsgCUEwaiQAIAMLGAAgASAAKAJoNgIAIABBADYCaCAAKAJgC7xUAyF/JH4CfCAAIAEoAgA2AogRIAAoAgBBAkYEQCAAQYwRaiABKAIENgIACwJAIAArAzAiSEQAAAAAAAAAAGEEQCAAKAIgIQEMAQsgACAAKwM4IkkgSEQAAAAAAADwv6BlIgE2AiAgACBJRAAAAAAAAPA/RAAAAAAAAAAAIAEbIEihoDkDOAsgACAAQUBrKAIAIAFqQQN0IgE2AiQgACABIAAoAowEayAAKAIQbTYCkAQCQCAAIgEoAgAiBUUNACAFQQFrIQAgASgCECIEQQBKBEAgAUHg+ARqIQcDQCAAIQMgBEEASgRAIAEgA0ECdGpBiBFqIQpBACEFA0AgBUEBaiEGQQAhAANAIAogASADQYA2bGoiCSAGQYASbCIQakGw2QBqIgQgAEEHdCIIaiADIAEQECAKIAQgCEGAAXJqIgQgAyABEBAgBEEAIAQoAgRrNgIEIARBACAEKAIMazYCDCAEQQAgBCgCFGs2AhQgBEEAIAQoAhxrNgIcIARBACAEKAIkazYCJCAEQQAgBCgCLGs2AiwgBEEAIAQoAjRrNgI0IARBACAEKAI8azYCPCAEQQAgBCgCRGs2AkQgBEEAIAQoAkxrNgJMIARBACAEKAJUazYCVCAEQQAgBCgCXGs2AlwgBEEAIAQoAmRrNgJkIARBACAEKAJsazYCbCAEQQAgBCgCdGs2AnQgBEEAIAQoAnxrNgJ8IABBEEkhBCAAQQJqIQAgBA0ACyAFQYASbCINIAEgA0GAJGxqakGwxQFqIQxBACEFA0AgBUECdCIEIAlBsNkAaiIIIA1qaiIANAIAISQgCCAQaiAEaiIENAIAISUgADQCgAEhJiAANAKAAiEnIAA0AoADISggADQCgAQhKSAANAKABSEqIAA0AoAGISsgADQCgAchLCAAQYAIajQCACEtIABBgAlqNAIAIS4gAEGACmo0AgAhLyAAQYALajQCACEwIABBgAxqNAIAITEgAEGADWo0AgAhMiAAQYAOajQCACEzIABBgA9qNAIAITQgAEGAEGo0AgAhNSAAQYARajQCACE2IAQ0AoABITcgBDQCgAIhOCAENAKAAyE5IAQ0AoAEITogBDQCgAUhOyAENAKABiE8IAQ0AoAHIT0gBEGACGo0AgAhPiAEQYAJajQCACE/IARBgApqNAIAIUAgBEGAC2o0AgAhQSAEQYAMajQCACFCIARBgA1qNAIAIUMgBEGADmo0AgAhRCAEQYAPajQCACFFIARBgBBqNAIAIUYgBEGAEWo0AgAhR0ERIQQDQCAMIAVByABsaiIIIAQiAEECdGogByAAQZABbGoiBDQCjAEgR35CIIinIAQ0AogBIEZ+QiCIp2ogBDQChAEgRX5CIIinaiAENAKAASBEfkIgiKdqIAQ0AnwgQ35CIIinaiAENAJ4IEJ+QiCIp2ogBDQCdCBBfkIgiKdqIAQ0AnAgQH5CIIinaiAENAJsID9+QiCIp2ogBDQCaCA+fkIgiKdqIAQ0AmQgPX5CIIinaiAENAJgIDx+QiCIp2ogBDQCXCA7fkIgiKdqIAQ0AlggOn5CIIinaiAENAJUIDl+QiCIp2ogBDQCUCA4fkIgiKdqIAQ0AkwgN35CIIinaiAENAJIICV+QiCIp2ogBDQCRCA2fkIgiKdqIAQ0AkAgNX5CIIinaiAENAI8IDR+QiCIp2ogBDQCOCAzfkIgiKdqIAQ0AjQgMn5CIIinaiAENAIwIDF+QiCIp2ogBDQCLCAwfkIgiKdqIAQ0AiggL35CIIinaiAENAIkIC5+QiCIp2ogBDQCICAtfkIgiKdqIAQ0AhwgLH5CIIinaiAENAIYICt+QiCIp2ogBDQCFCAqfkIgiKdqIAQ0AhAgKX5CIIinaiAENAIMICh+QiCIp2ogBDQCCCAnfkIgiKdqIAQ0AgQgJn5CIIinaiAENAIAICR+QiCIp2o2AgAgAEEBayEEIAANAAsgBQRAIAhByABrIgAgADQCRCIkQoOoie4GfiAINAIAIiVCy4GU8fv/////AH58Qh+IPgJEIAggADQCQCImQpDthuMDfiAINAIEIidC+Nfzhgd+fEIfiD4CBCAIICRCtf7rjgR+ICVCg6iJ7gZ+fEIfiD4CACAAICZC+Nfzhgd+ICdC8JL5nPz/////AH58Qh+IPgJAIAggADQCPCIkQp6B88ACfiAINAIIIiVC+ty1zAd+fEIfiD4CCCAAICRC+ty1zAd+ICVC4v6Mv/3/////AH58Qh+IPgI8IAAgADQCOCIkQqeB9e4HfiAINAIMIiVC+6Lcxf7/////AH58Qh+IPgI4IAggJEKF3aO6AX4gJUKngfXuB358Qh+IPgIMIAAgADQCNCIkQrbBtPsHfiAINAIQIiVCrfyTn///////AH58Qh+IPgI0IAggJELTg+zgAH4gJUK2wbT7B358Qh+IPgIQIAAgADQCMCIkQr/8kf8HfiAINAIUIiVCyceG1v//////AH58Qh+IPgIwIAggJEK3uPkpfiAlQr/8kf8HfnxCH4g+AhQgACAANAIsIiRC4uTy/wd+IAg0AhgiJULH+7rx//////8AfnxCH4g+AiwgCCAkQrmExQ5+ICVC4uTy/wd+fEIfiD4CGCAIIAA0AigiJEKj++QDfiAINAIcIiVCk43//wd+fEIfiD4CHCAAICRCk43//wd+ICVC3YSb/P//////AH58Qh+IPgIoCyAFQQFqIgVBIEcNAAsgASgCECIEIAYiBUoNAAsLIAEgA0GANmxqQbDZAGoiACAAIARBgBJsakGAEhAEIANBAWshACADDQALDAELIAVBA3EiAwRAA0AgASAAQYA2bGpBsNkAaiIIIAggBEGAEmxqQYASEAQgAEEBayEAIAZBAWoiBiADRw0ACwsgBUEESQ0AA0AgASAAQYA2bGoiBUGw2QBqIgYgBiAEQYASbCIDakGAEhAEIAVBsCNqIgYgAyAGakGAEhAEIAVB0BJrIgYgAyAGakGAEhAEIAVB0MgAayIFIAMgBWpBgBIQBCAAQQNGIQUgAEEEayEAIAVFDQALCyMAQaAFayIVJAACQCABIgMoAgAiEEUNACADKAIQIgFBAEwNACADQbgJaiEZIBBB3ABsQYwBaiEaA0AgEEEBayEQIAFBAEoEQCAaIBdBpH9saiEdIBBBqAFsIRggAyAQQQR0aiEMQQAhDQNAIANBADYCvLECIAMgAyAQQYAkbGogDUGAEmxqIg9BsMUBaiIFNgK4jQIgAyAdIA1BuAFsIghqaiEJQb8EIQADQCADIAAiAUECdCIAaiIGQbyfAmogACAFaigCACIEIARBH3UiAHMgAGsiADYCACAGQbyNAmogBKwiJCAkfkKAgICABHxCH4g+AgAgAygCvLECIgYgAEgEQCADIAA2AryxAiAAIQYLIAFBAWshACABDQALIAMgCGogEEHcAGxqIhFBFTYC1AEgFSANQdACbCISIBhqakGoARAHAkAgAygCCEEDRw0AIAMoAkghBCADIA1BAnRqIghBmLQCaiAGNgIAQcAEIQFBACEFA0AgAUECdCEAIANBvI0CaiIGIAFBBGsiAUECdGooAgBBCnUgACAGaiIAQQxrKAIAQQp1IABBBGsoAgBBCnUgBWogAEEIaygCAEEKdWpqaiEFIAENAAsgBEHcAGxBgDVqIQsgCEHAsQJqAn9BACAFRQ0AGiAFt0RoXxwAAACgPqIQDkScRK3+Qi7mP6MiSJlEAAAAAAAA4EFjBEAgSKoMAQtBgICAgHgLNgIAIAsoAlQhBUEUIQADQEEAIQoCf0EAIAUgCyAAIghBAnQiE2ooAgAiBEwNABogBSAEayIHQQNxIQ5BACEGQQAhACAFIAQiAUF/c2pBA08EQCAHQXxxIRRBACEFA0AgAyABQQJ0aiIHQciNAmooAgBBCnUgB0G8jQJqKAIAQQp1IABqIAdBwI0CaigCAEEKdWogB0HEjQJqKAIAQQp1amohACABQQRqIQEgBUEEaiIFIBRHDQALCyAOBEADQCADIAFBAnRqQbyNAmooAgBBCnUgAGohACABQQFqIQEgBkEBaiIGIA5HDQALC0EAIABFDQAaIAC3RGhfHAAAAKA+ohAORJxErf5CLuY/oyJImUQAAAAAAADgQWMEQCBIqgwBC0GAgICAeAshACADIA1B1ABsaiATaiIBQcixAmogADYCAAJAIBIgFWogGGogCEEDdGorAwAiSEQAAAAAAAAAAGENACBIEA5EnESt/kIu5j+jIkiZRAAAAAAAAOBBYwRAIEiqIQoMAQtBgICAgHghCgsgAUHwsgJqIAo2AgAgCEEBayEAIAQhBSAIDQALIA1BAUcNACADKAKYtAJBAEdBA0ECIAMoApy0AhtqIAMoAsCxAiADKALEsQJrIgAgAEEfdSIAcyAAa0EKSWogAygC0LECIAMoAqSyAmsiACAAQR91IgBzIABrIgAgAygC1LECIAMoAqiyAmsiASABQR91IgFzIAFrIgEgAygC5LECIAMoAriyAmsiBCAEQR91IgRzIARrIgQgAygClLICIAMoAuiyAmsiBSAFQR91IgVzIAVrIAMoApiyAiADKALssgJrIgUgBUEfdSIFcyAFa2ogAygCkLICIAMoAuSyAmsiBSAFQR91IgVzIAVraiADKAKMsgIgAygC4LICayIFIAVBH3UiBXMgBWtqIAMoAoiyAiADKALcsgJrIgUgBUEfdSIFcyAFa2ogAygChLICIAMoAtiyAiIFayIGIAZBH3UiBnMgBmtqIAMoAoCyAiADKALUsgJrIgYgBkEfdSIGcyAGa2ogAygC/LECIAMoAtCyAmsiBiAGQR91IgZzIAZraiADKAL4sQIiBiADKALMsgJrIgggCEEfdSIIcyAIa2ogAygC9LECIAMoAsiyAiIIayIKIApBH3UiCnMgCmtqIAMoAvCxAiADKALEsgIiCmsiByAHQR91IgdzIAdraiADKALssQIgAygCwLICayIHIAdBH3UiB3MgB2tqIAMoAuixAiIHIAMoAryyAmsiCyALQR91IgtzIAtramogAygC4LECIAMoArSyAiILayIOIA5BH3UiDnMgDmtqIAMoAtyxAiADKAKwsgIiDmsiEiASQR91IhJzIBJraiADKALYsQIiEiADKAKssgJrIhMgE0EfdSITcyATa2pqaiADKALMsQIgAygCoLICIhNrIhQgFEEfdSIUcyAUa2ogAygCyLECIhQgAygCnLICayIWIBZBH3UiFnMgFmtqQeQASWpBBkcEQCAMQgA3AnwgDEIANwKEAQwBCyAMQQA2AnwgDCAAIAFqIAMoAtyxAiAOayIAIABBH3UiAHMgAGtqIBIgAygCrLICayIAIABBH3UiAHMgAGtqIAMoAsyxAiATayIAIABBH3UiAHMgAGtqIBQgAygCnLICayIAIABBH3UiAHMgAGtqQQpJIAMoAoCzAiADKALUswJrIgAgAEEfdSIAcyAAayADKAKEswIgAygC2LMCayIAIABBH3UiAHMgAGtqIAMoAvyyAiADKALQswJrIgAgAEEfdSIAcyAAa2ogAygC+LICIAMoAsyzAmsiACAAQR91IgBzIABraiADKAL0sgIgAygCyLMCayIAIABBH3UiAHMgAGtqIAMoAvCyAiADKALEswJrIgAgAEEfdSIAcyAAa2pBCklxNgJ8IAxBADYCgAEgDCADKALwsQIgCmsiACAAQR91IgBzIABrIARqIAMoAuyxAiADKALAsgJrIgAgAEEfdSIAcyAAa2ogByADKAK8sgJrIgAgAEEfdSIAcyAAa2ogAygC4LECIAtrIgAgAEEfdSIAcyAAa2pBCkkgAygClLMCIAMoAuizAmsiACAAQR91IgBzIABrIAMoApizAiADKALsswJrIgAgAEEfdSIAcyAAa2ogAygCkLMCIAMoAuSzAmsiACAAQR91IgBzIABraiADKAKMswIgAygC4LMCayIAIABBH3UiAHMgAGtqIAMoAoizAiADKALcswJrIgAgAEEfdSIAcyAAa2pBCklxNgKAASAMQQA2AoQBIAwgAygCgLICIAMoAtSyAmsiACAAQR91IgBzIABrIAMoAoSyAiAFayIAIABBH3UiAHMgAGtqIAMoAvyxAiADKALQsgJrIgAgAEEfdSIAcyAAa2ogBiADKALMsgJrIgAgAEEfdSIAcyAAa2ogAygC9LECIAhrIgAgAEEfdSIAcyAAa2pBCkkgAygCqLMCIAMoAvyzAmsiACAAQR91IgBzIABrIAMoAqyzAiADKAKAtAJrIgAgAEEfdSIAcyAAa2ogAygCpLMCIAMoAvizAmsiACAAQR91IgBzIABraiADKAKgswIgAygC9LMCayIAIABBH3UiAHMgAGtqIAMoApyzAiADKALwswJrIgAgAEEfdSIAcyAAa2pBCklxNgKEASAMQQA2AogBIAwgAygClLICIAMoAuiyAmsiACAAQR91IgBzIABrIAMoApiyAiADKALssgJrIgAgAEEfdSIAcyAAa2ogAygCkLICIAMoAuSyAmsiACAAQR91IgBzIABraiADKAKMsgIgAygC4LICayIAIABBH3UiAHMgAGtqIAMoAoiyAiADKALcsgJrIgAgAEEfdSIAcyAAa2pBCkkgAygCvLMCIAMoApC0AmsiACAAQR91IgBzIABrIAMoAsCzAiADKAKUtAJrIgAgAEEfdSIAcyAAa2ogAygCuLMCIAMoAoy0AmsiACAAQR91IgBzIABraiADKAK0swIgAygCiLQCayIAIABBH3UiAHMgAGtqIAMoArCzAiADKAKEtAJrIgAgAEEfdSIAcyAAa2pBCklxNgKIAQtB/x8gAygCkAQgAygCAG0iBCAEQf8fThshACADKAK0jQIiBQRAQQAhAUH/HyAAISMgAygCsI0CIgYgBUEDdEF2bWoiBSEiAn8gDCANQQN0akGQEWorAwBEzczMzMzMCECiIAS3oSJImUQAAAAAAADgQWMEQCBIqgwBC0GAgICAeAsiBEHlAE4EQCAGQQZsQQptIgEgBCABIARIGyEBCyAjICIgASABIAVIG2oiACAAQf8fThshAAsgGSANQbABbGogEEHYAGxqQdgAEAcgAyANQbgCbGogEEGcAWxqQZgMakGcARAHIAlCADcCCCAJQgA3AgAgEUIANwKsASARQQA2AqQBIBFCADcCnAEgEUIANwK0ASARQgA3ArwBIBFCADcCxAEgEUIANwLMASADKAK8sQIEQCAAIQogD0GwEWohBiADIA1BuAFsakGcAWoiFCAQQdwAbGohCUH8LygCACEWQeQvKAIAIRtB+AAhEkGIfyEPIANBuI0CaiEeA0BBoI0GIQgCQCADIBJBAXYiEyAPaiIfQf8AaiIAQQJ0akGgvAJqNAIAIiQgAzQCvLECfkKAgICACHxCIIinQZSKCkoNACAeIABBA3RqQegmaiEHIAMoAriNAiELQQAhAEEAIQUDQAJ/IAsgAEECdCIEaigCACIBIAFBH3UiAXMgAWutICR+QoCAgIAIfEIgiKciAUGPzgBMBEAgAyABQQJ0akGgwAJqKAIADAELIAcrAwAgAyAEakG8nwJqKAIAt6JEaF8cAAAAAD6iIkggSJ+inyJImUQAAAAAAADgQWMEQCBIqgwBC0GAgICAeAshASAEIAZqIAE2AgAgBSABIAEgBUgbIQUgAEEBaiIAQcAERw0AC0HABCEAIAVBgMAASg0AAkACQAJAAkADQCAARQRAIAlBADYCCCAAIQQMAgsCQCAAQQJ0IAZqIgFBBGsoAgAEQCAAIQQMAQsgBiAAQQJrIgRBAnRqKAIABEAgACEEDAELIAFBDGsoAgANACAGIABBBGsiAEECdGooAgBFDQELC0EAIQsgCUEANgIIIARBA0wNAAJAAkADQCAEQQJ0IAZqIgBBBGsoAgBBAUoNASAAQQhrKAIAQQFKDQEgAEEMaygCAEEBSg0BIAYgBEEEayIAQQJ0aigCAEECTg0BIAkgC0EBaiILNgIIIARBB0shASAAIQQgAQ0ACyAJIARBAXU2AgQMAQsgCSAEQQF1NgIEIAtFDQILQQAhAUEAIQcgBCEFQQAhCANAIAFBAkEBIAYgBUECdCIcaiIAKAIAIg4bIA5BAEcgBiAcQQRyaigCACIcGyAAKAIIIiBBAEdqIAAoAgwiAEEAR2oiIWogFiAcQQF0IA5qICBBAnRqIABBA3RqIgBqLQAAaiEBIAcgACAbai0AAGogIWohByAFQQRqIQUgCEEBaiIIIAtHDQALQQAhBSABIAdMDQIMAwsgCSAEQQF1NgIEC0EAIQELQQEhBSABIQcLIAkgBTYCMAJAIARFBEAgCUIANwIgIAkoAjwhAQwBCyADKAJIQdwAbEGANWohCEEAIQADQCAAIgVBAWohACAIIAVBAnRqKAIAIARIDQALQQAhAQJAIAVBA3QiC0GAMGooAgAiAEUNAANAIAQgAEECdCAIaigCBE4EQCAAIQEMAgsgAEEBayIADQALCyAJIAE2AiAgCSABQQJ0IAhqQQRqIggoAgAiATYCPCALQYQwaigCACEAAkAgBUEFSQ0AA0AgAEECdCAIaigCBCAETA0BIABBAWsiAA0AC0EAIQALIAkgBDYCRCAJIAA2AiQgCSAAQQJ0IAhqKAIENgJAC0EAIQggCUEANgIcIAlCADcCFEEAIQsgAQRAIAkgBkEAIAEQBiILNgIUCyABIAkoAkAiDkkEQCAJIAYgASAOEAYiCDYCGAtBACEFQQAhACAEIA5LBEAgCSAGIA4gBBAGIgA2AhwLIAsEQCAGQQAgASALEAMhBQsgCARAIAYgASAOIAgQAyAFaiEFCyAABH8gBiAOIAkoAkQgABADIAVqBSAFCyAHaiEICyAPIB8gCCAKSCIAGyEPIBMgEiATayAAGyISQQFKDQALIAkgDzYCSCAUIBBB3ABsaigCEEECdCIBQZAyaigCACEAIAFB0DFqKAIAIQECQAJAIA1FBEAgAEEFbCIAIAFBC2xqIQQMAQtBACABQQVsIAMgEEEEdGoiBSgCgAEbQQAgAUEGbCAFKAJ8G2pBACAAQQVsIgAgBSgChAEbaiEEIAUoAogBDQELIAAgBGohBAsgCSAENgI0IAogBGsiDkEASARAIAkgCSgCSEEBazYCSAsgBiEKQfwvKAIAIQ9B5C8oAgAhEiADQbiNAmohEwNAIAkgCSgCSCIAQQFqNgJIQYCAASEGIAMgAEGAAWoiAEECdGpBoLwCajQCACIkIAM0AryxAn5CgICAgAh8QiCIp0GUigpMBEAgEyAAQQN0akHoJmohBSADKAK4jQIhCEEAIQBBACEGA0ACfyAIIABBAnQiBGooAgAiASABQR91IgFzIAFrrSAkfkKAgICACHxCIIinIgFBj84ATARAIAMgAUECdGpBoMACaigCAAwBCyAFKwMAIAMgBGpBvJ8CaigCALeiRGhfHAAAAAA+oiJIIEifop8iSJlEAAAAAAAA4EFjBEAgSKoMAQtBgICAgHgLIQEgBCAKaiABNgIAIAYgASABIAZIGyEGIABBAWoiAEHABEcNAAsLQcAEIQAgBkGAwABKDQACQAJAAkACQANAIABFBEAgCUEANgIIIAAhAQwCCwJAIABBAnQgCmoiBEEEaygCAARAIAAhAQwBCyAKIABBAmsiAUECdGooAgAEQCAAIQEMAQsgBEEMaygCAA0AIAogAEEEayIAQQJ0aigCAEUNAQsLQQAhBCAJQQA2AgggAUEDTA0AAkACQANAIAFBAnQgCmoiAEEEaygCAEEBSg0BIABBCGsoAgBBAUoNASAAQQxrKAIAQQFKDQEgCiABQQRrIgBBAnRqKAIAQQJODQEgCSAEQQFqIgQ2AgggAUEHSyEFIAAhASAFDQALIAkgAUEBdTYCBAwBCyAJIAFBAXU2AgQgBEUNAgtBACEFQQAhCCABIQZBACEAA0AgBUECQQEgCiAGQQJ0IhRqIgcoAgAiCxsgC0EARyAKIBRBBHJqKAIAIhQbIAcoAggiFkEAR2ogBygCDCIHQQBHaiIbaiAPIBRBAXQgC2ogFkECdGogB0EDdGoiB2otAABqIQUgCCAHIBJqLQAAaiAbaiEIIAZBBGohBiAAQQFqIgAgBEcNAAtBACEGIAUgCEwNAgwDCyAJIAFBAXU2AgQLQQAhBQtBASEGIAUhCAsgCSAGNgIwAkAgAUUEQCAJQgA3AiAgCSgCPCEFDAELIAMoAkhB3ABsQYA1aiEGQQAhAANAIAAiBEEBaiEAIAYgBEECdGooAgAgAUgNAAtBACEFAkAgBEEDdCIHQYAwaigCACIARQ0AA0AgASAAQQJ0IAZqKAIETgRAIAAhBQwCCyAAQQFrIgANAAsLIAkgBTYCICAJIAVBAnQgBmpBBGoiBigCACIFNgI8IAdBhDBqKAIAIQACQCAEQQVJDQADQCAAQQJ0IAZqKAIEIAFMDQEgAEEBayIADQALQQAhAAsgCSABNgJEIAkgADYCJCAJIABBAnQgBmooAgQ2AkALQQAhACAJQQA2AhwgCUIANwIUQQAhByAFBEAgCSAKQQAgBRAGIgc2AhQLIAUgCSgCQCILSQRAIAkgCiAFIAsQBiIANgIYC0EAIQZBACEEIAEgC0sEQCAJIAogCyABEAYiBDYCHAsgBwRAIApBACAFIAcQAyEGCyAABEAgCiAFIAsgABADIAZqIQYLIAQEfyAKIAsgCSgCRCAEEAMgBmoFIAYLIAhqIgAgDkoNAAsgCSAJKAI0IABqIgA2AgAgESAANgKcAQsgAyADKAKwjQIgAygCkAQgAygCAG0gESgCnAFrajYCsI0CIBEgESgC5AFB0gFqNgKoASANQQFqIg0gAygCECIBSA0ACwsgF0EBaiEXIBANAAsLAkAgAygCACIEQQJHDQAgAy0AkARBAXFFDQAgAyADKAKwjQJBAWo2ArCNAgsgAyADKAKwjQIiACADKAK0jQIiASAAIAFIGyIFIAVBCG8iBWs2ArCNAgJAAkAgBSAAIAFrIgBBACAAQQBKG2oiAARAIAMoApwBIABqIgFB/x9JDQECQCADKAIQIgZBAEwNACAEQQBMDQBBACEFA0AgAyAFQbgBbGpBnAFqIQhBACEBA0ACQCAARQRAQQAhAAwBCyAIIAFB3ABsaiIKQf8fIAooAgAiCmsiByAAIAAgB0obIgcgCmo2AgAgACAHayEAIAFBAWoiASAERw0BCwsgBUEBaiIFIAZHDQALCyADIAA2AngLDAELIAMgATYCnAELIBVBoAVqJABBACEEIwBBoANrIggkAAJAIAMoAgAiBUEATA0AIAMoAhAiAEEATA0AA0BBACEGIABBAEoEQANAIAMgBEGAJGxqIAZBgBJsaiIAQbDFAWohASAAQbARaiEFQQAhAANAAkAgASAAQQJ0IgpqKAIAQQBODQAgBSAKaiIKKAIAIgdBAEwNACAKQQAgB2s2AgALAkAgASAAQQFyQQJ0IgpqKAIAQQBODQAgBSAKaiIKKAIAIgdBAEwNACAKQQAgB2s2AgALIABBAmoiAEHABEcNAAsgBkEBaiIGIAMoAhAiAEgNAAsgAygCACEFCyAEQQFqIgQgBUgNAAsLIAhBCGogA0H0AGoiBkGYAxAEIANB4ABqIgBB/w9BCxACIAAgAygCCEECEAIgACADKAIMQQIQAiAAIAMoAkxFQQEQAiAAIAMoAkRBBBACIAAgAygCSEEDb0ECEAIgACADKAIgQQEQAiAAIAMoAlBBARACIAAgAygCFEECEAIgACADKAJUQQIQAiAAIAMoAlhBARACIAAgAygCXEEBEAIgACADKAIcQQIQAgJAIAMoAghBA0YEQCAAQQBBCRACIAgoAgghASADKAIAQQJGBEAgACABQQMQAgwCCyAAIAFBBRACDAELIABBAEEIEAIgCCgCCCEBIAMoAgBBAkYEQCAAIAFBAhACDAELIAAgAUEBEAILAkAgAygCCEEDRw0AIAMoAgBBAEwNAEEAIQQDQCAAIAhBCGogBEEEdGoiASgCCEEBEAIgACABKAIMQQEQAiAAIAEoAhBBARACIAAgASgCFEEBEAIgBEEBaiIEIAMoAgBIDQALC0EAIQECQCADKAIQIgRBAEwNACADKAIAIgVBAEwNAANAIAVBAEoEQCABQbgBbCAIakEwaiEKQQAhBANAIAAgCiAEQdwAbGoiBSgCAEEMEAIgACAFKAIEQQkQAiAAIAUoAgxBCBACIAAgBSgCEEEEQQkgAygCCEEDRhsQAiAAQQBBARACIAAgBSgCFEEFEAIgACAFKAIYQQUQAiAAIAUoAhxBBRACIAAgBSgCIEEEEAIgACAFKAIkQQMQAiADKAIIQQNGBEAgACAFKAIoQQEQAgsgACAFKAIsQQEQAiAAIAUoAjBBARACIARBAWoiBCADKAIAIgVIDQALIAMoAhAhBAsgAUEBaiIBIARIDQALIAhBCGogBkGYAxAEIARBAEwNACAFQQBMDQAgA0G4CWohCUEAIQEDQCAFQQBKBEAgAUG4AWwgCGpBMGohGEEAIQQDQCADIARBgCRsaiABQYASbGohECAYIARB3ABsaiIKKAIQQQJ0IgVBkDJqKAIAIQYgBUHQMWooAgAhBQJAAkACQAJAAkACQAJAIAEEQCAEQQR0IAhqKAIQDQELIAAgCSABQbABbGogBEHYAGxqIgcoAgAgBRACIAAgBygCBCAFEAIgACAHKAIIIAUQAiAAIAcoAgwgBRACIAAgBygCECAFEAIgACAHKAIUIAUQAiABRQ0BCyAEQQR0IAhqKAIUDQELIAAgCSABQbABbGogBEHYAGxqIgcoAhggBRACIAAgBygCHCAFEAIgACAHKAIgIAUQAiAAIAcoAiQgBRACIAAgBygCKCAFEAIgAUUNAQsgBEEEdCAIaigCGA0BCyAAIAkgAUGwAWxqIARB2ABsaiIFKAIsIAYQAiAAIAUoAjAgBhACIAAgBSgCNCAGEAIgACAFKAI4IAYQAiAAIAUoAjwgBhACIAFFDQELIARBBHQgCGooAhwNAQsgACAJIAFBsAFsaiAEQdgAbGoiBSgCQCAGEAIgACAFKAJEIAYQAiAAIAUoAkggBhACIAAgBSgCTCAGEAIgACAFKAJQIAYQAgsgEEGwEWohECADKAJIIQUgACgCCEEDdCAAKAIQa0EgaiETIAooAgRBAXQiBkEASgRAIAVB3ABsQYA1aiIFIAooAiAiB0ECdGooAgQhGSAHIAooAiRqQQJ0IAVqKAIIIRpBACEFA0ACQCAKIAUgGU4gBSAaTmpBAnRqKAIUIg5FDQAgECAFQQJ0IgdqKAIAIg0gDUEfdSIMcyAMayEMIBAgB0EEcmooAgAiESARQR91IgdzIAdrIQsgDUEATCEPIBFBAEwhFyAOQRhsQdApaiIHKAIEIRUgDkEQTgRAIAAgBygCEEEPIAsgC0EOSyINGyIRIBVBDyAMIAxBDksiDhsiEmxqIhVBAXRqLwEAIAcoAhQgFWotAAAQAiAAIAtBD2sgDEEPa0EAIA4bIgxBAXQgD3IgDCASGyIMIAcoAggiB3RyIAwgDRsiDEEBdCAXciAMIBEbIBFBAEcgEkEAR2ogB0EAIA4baiAHQQAgDRtqEAIMAQsgACAHKAIQIAwgFWwgC2oiDEEBdGovAQAiC0EBdCAPciALIA0bIgtBAXQgF3IgCyARGyAHKAIUIAxqLQAAIBFBAEcgDUEAR2pqEAILIAVBAmoiBSAGSA0ACwsgCigCCEECdCAGaiIRIAZKBEAgCigCMEEYbEHQKWoiBSgClAYhCyAFKAKQBiEOA0AgACAOIBAgBkECdCIHQQRyaigCACIFIAVBH3UiDXMgDWtBAXQgByAQaiIMKAIAIgcgB0EfdSINcyANa2ogDCgCCCINIA1BH3UiD3MgD2tBAnRqIAwoAgwiDCAMQR91Ig9zIA9rQQN0aiIPQQF0ai8BACALIA9qLQAAEAIgACAHQR92Ig9BAXQgBUEATHIgDyAFGyIPQQF0IA1BAExyIA8gDRsiD0EBdCAMQQBMciAPIAwbIA1BAEdBAkEBIAcbIAdBAEcgBRtqIAxBAEdqEAIgBkEEaiIGIBFIDQALCwJAIAooAgAgCigCNGsgEyAAKAIIQQN0IAAoAhBrQSBqa2oiBkUNACAGIAZBIG0iBUEFdGshCiAGQR9qQT9PBEADQCAAQX9BIBACIAVBAWsiBQ0ACwsgCkUNACAAQX8gCnRBf3MgChACCyAEQQFqIgQgAygCACIFSA0ACyADKAIQIQQLIAFBAWoiASAESA0ACwsgCEGgA2okACACIAMoAmg2AgAgA0EANgJoIAMoAmALCwAgACgCEEHABGwLigEBAX9BAyECAn8CQEHQMigCACAARg0AQdQyKAIAIABGDQBB2DIoAgAgAEYNAEECIQJB3DIoAgAgAEYNAEHgMigCACAARg0AQeQyKAIAIABGDQBBACECQegyKAIAIABGDQBB7DIoAgAgAEYNAEF/QfAyKAIAIABHDQEaC0F/IAIgASACEA1BAEgbCwvsEgMEfAl/An4jAEEgayIJJAAgCSABNgIEIAkgADYCACAJQoCAgIAQNwIUIAlCgAE3AgwgCSADNgIMIAkgAjYCCAJ/IAkoAgwhAUHYMigCACEMQdQyKAIAIQ1BAyEDAkACQEHQMigCACIOIAkoAgQiAEYNACAAIA1GDQAgACAMRg0AQQIhA0HcMigCACAARg0AQeAyKAIAIABGDQBB5DIoAgAgAEYNAEEAIQNB6DIoAgAgAEYNAEHsMigCACAARg0AQfAyKAIAIABHDQELQQAgASADEA1BAEgNARpBACEDAkBBiO0FEAgiAkUNACACQQRrLQAAQQNxRQ0AIAJBiO0FEAcLIAJFDQAjAEEQayIKJAAgAkIANwKAjQUgAkGIzQVqQYAgEAdBHyEBA0AgASIIQQF0QQFyIQtBwAAhAUE/IQADQCAKQREgAWsgC2y3RGZtQ1T7Iak/ohASRAAAAABlzc1BoiIEOQMIIAREAAAAAAAA4D9EAAAAAAAA4L8gBEQAAAAAAAAAAGYboCIEvSIRQjSIp0H/D3EiAUH/B2shDwJAIAFBswhPBEAgCiAEOQMIDAELIAFB/gdNBEAgCiARQoCAgICAgICAgH+DNwMIDAELIBEgD60iEoZC/////////weDUARAIAogBDkDCAwBCyAKQoCAgICAgIB4IBKHIBGDNwMICyACIAhBCHRqIAAiAUECdGpBiI0FagJ/IAorAwhEfXoE6AsuAUCiIgSZRAAAAAAAAOBBYwRAIASqDAELQYCAgIB4CzYCACABQQFrIQAgAQ0ACyAIQQFrIQEgCA0ACyAKQRBqJAAgAkHg+ARqIQtBESEAA0AgACIBQQF0QQFytyEFQSQhAANAIAsgAUGQAWxqIABBAWsiAEECdGoCfyMAQRBrIggkAAJAIAC3RAAAAAAAAOA/oEStROdKGFe2P6IiBL1CIIinQf////8HcSIKQfvDpP8DTQRAIApBgIDA8gNJDQEgBEQAAAAAAAAAAEEAEAkhBAwBCyAKQYCAwP8HTwRAIAQgBKEhBAwBCwJAAkACQAJAIAQgCBATQQNxDgMAAQIDCyAIKwMAIAgrAwhBARAJIQQMAwsgCCsDACAIKwMIEAohBAwCCyAIKwMAIAgrAwhBARAJmiEEDAELIAgrAwAgCCsDCBAKmiEECyAIQRBqJAAgBCAAQQF0QRNqt0SBROdKGFemP6IgBaIQEqJEAADA////30GiIgSZRAAAAAAAAOBBYwRAIASqDAELQYCAgIB4CzYCACAADQALIAFBAWshACABDQALQf8AIQEgAkG4jQJqIQpBgAEhCANAIAogASIAQQN0akHoJmoCfEGAASAIa7dEAAAAAAAA0D+iIgS9QjSIp0H/D3EiAUHJB2siCEE/TwRAIAREAAAAAAAA8D+gIAhBAEgNARogBL0hEQJAIAFBiQhJDQBEAAAAAAAAAAAgEUKAgICAgICAeFENAhogBEQAAAAAAADwP6AgAUH/D08NAhogEUIAWQRAIwBBEGsiAUQAAAAAAAAAcDkDCCABKwMIRAAAAAAAAABwogwDCyARQoCAgICAgLPIQFQNACMAQRBrIgFEAAAAAAAAABA5AwggASsDCEQAAAAAAAAAEKIMAgsgAUEAIBFCAYZCgICAgICAgI2Bf1gbIQELIARBoOIAKwMAIgUgBKAiBiAFoaEiBCAEoiIFIAWiIARByOIAKwMAokHA4gArAwCgoiAFIARBuOIAKwMAokGw4gArAwCgoiAEQajiACsDAKIgBr0iEqdBBHRB8A9xIghB0OIAaisDAKCgoCEEIAhB2OIAaikDACASQi2GfCERIAFFBEACfCASQoCAgIAIg1AEQCARQoCAgICAgIAIfb8iBSAEoiAFoCIEIASgDAELIBFCgICAgICAgPA/fL8iBSAEoiIGIAWgIgREAAAAAAAA8D9jBHwjAEEQayIBIRAgAUKAgICAgICACDcDCCAQIAErAwhEAAAAAAAAEACiOQMIRAAAAAAAAAAAIAREAAAAAAAA8D+gIgcgBiAFIAShoCAERAAAAAAAAPA/IAehoKCgRAAAAAAAAPC/oCIEIAREAAAAAAAAAABhGwUgBAtEAAAAAAAAEACiCwwBCyARvyIFIASiIAWgCyIEOQMAIAQgBKAiBEQAAMD////fQWQhASAKIABBAnRqQeguakH/////BwJ/IAREAAAAAAAA4D+gIgSZRAAAAAAAAOBBYwRAIASqDAELQYCAgIB4CyABGzYCACAAQQFrIQEgACIIDQALQZDOACEAIAJBoMACaiEBA0AgASAAQQFrIghBAnRqAn8gCLciBJ8gBKKfRA+cM6K0N7i/oEQAAAAAAADgP6AiBJlEAAAAAAAA4EFjBEAgBKoMAQtBgICAgHgLNgIAIAEgAEECayIAQQJ0agJ/IAC3IgSfIASin0QPnDOitDe4v6BEAAAAAAAA4D+gIgSZRAAAAAAAAOBBYwRAIASqDAELQYCAgIB4CzYCACAADQALIAIgCSgCADYCACACIAkoAgQiADYCBCACIAkoAgg2AhQgAiAJKAIMIgg2AhggAiAJKAIQNgIcIAIgCSgCFDYCWCACIAkoAhg2AlwgAkIANwOwjQIgAkEANgJUIAJCADcCTCACQQE2AgwgAkEINgIoAn8CQCAAIA5GDQBBASEDIAAgDUYNAEECIQMgACAMRg0AQQIhAUEDQdwyKAIAIABGDQEaQQRB4DIoAgAgAEYNARpBBUHkMigCACAARg0BGkEAIQFBBkHoMigCACAARg0BGkEHQewyKAIAIABGDQEaQX8hA0EIQfAyKAIAIABGDQEaC0EDIQEgAwshAyACIAE2AgggAiADNgJIIAIgAUECdEHAMWooAgAiAzYCECACIAggARANNgJEIAJBQGsCfyAIt0QAAAAAAECPQKJEAAAAAAAAwD+iIAO3RAAAAAAAAIJAoiAAt6OiIgSZRAAAAAAAAOBBYwRAIASqDAELQYCAgIB4CyIANgIAIAIgBCAAt6EiBDkDMCACIASaOQM4IAREAAAAAAAAAABhBEAgAkEANgIgC0GAIBAIIQAgAkEgNgJwIAJCADcCaCACQYAgNgJkIAIgADYCYCACQfQAakGYAxAHIAJBqAFBoAIgAigCAEEBRiIAG0HoAEGoASAAGyACKAIQQQJGGzYCjAQgAiEDCyADCyEAIAlBIGokACAACwQAQQQLBABBAgsWAQF/IAAoAmAiAQRAIAEQCwsgABALCwvXiQEiAEGACAv1AQEAAQABAAAAAQMCAwAAAAABAAIAAQADAAEAAQADAAIAAAABAwYDAwUFBQYAAAAAAAMAAgABAAEAAQABAAMAAgAAAAICBgMCBQUFBgAAAAAAAQACAAYABQADAAEABAAEAAcABQAHAAEABgABAAEAAAABAwYHAwMGBwYGBwgHBgcIBwADAAUAAQAGAAIAAwACAAUABAAEAAEAAwADAAIAAAADAwUHAwIEBQQEBQYGBQYHAQACAAoAEwAQAAoAAwADAAcACgAFAAMACwAEAA0AEQAIAAQADAALABIADwALAAIABwAGAAkADgADAAEABgAEAAUAAwACAEGACgskAQMGCAgJAwQGBwcIBgUHCAgJBwcICQkJBwcICQkKCAgJCgoKAEGwCgtFAwAEAAYAEgAMAAUABQABAAIAEAAJAAMABwADAAUADgAHAAMAEwARAA8ADQAKAAQADQAFAAgACwAFAAEADAAEAAQAAQABAEGACwskAgMGCAgJAwIECAgIBgQGCAgJCAgICQkKCAcICQoKCQgJCQsLAEGwCwtFBwAFAAkADgAPAAcABgAEAAUABQAGAAcABwAGAAgACAAIAAUADwAGAAkACgAFAAEACwAHAAkABgAEAAEADgAEAAYAAgAGAEGADAskAwMFBggJAwMEBQYIBAQFBgcIBgUGBwcIBwYHBwgJCAcICAkJAEGwDAugHQEAAgAKABcAIwAeAAwAEQADAAMACAAMABIAFQAMAAcACwAJAA8AFQAgACgAEwAGAA4ADQAWACIALgAXABIABwAUABMAIQAvABsAFgAJAAMAHwAWACkAGgAVABQABQADAA4ADQAKAAsAEAAGAAUAAQAJAAgABwAIAAQABAACAAAAAQMGCAkJCQoDBAYHCAkICAYGBwgJCgkJBwcICQoKCQoICAkKCgoKCgkJCgoLCwoLCAgJCgoKCwsJCAkKCgsLCwMABAAKABgAIgAhABUADwAFAAMABAAKACAAEQALAAoACwAHAA0AEgAeAB8AFAAFABkACwATADsAGwASAAwABQAjACEAHwA6AB4AEAAHAAUAHAAaACAAEwARAA8ACAAOAA4ADAAJAA0ADgAJAAQAAQALAAQABgAGAAYAAwACAAAAAgMFBwgJCAkDAwQGCAgHCAUFBgcICQgIBwYHCQgKCAkICAgJCQoJCggICQoKCwoLCAcHCAkKCgoIBwgJCgoKCgkABgAQACEAKQAnACYAGgAHAAUABgAJABcAEAAaAAsAEQAHAAsADgAVAB4ACgAHABEACgAPAAwAEgAcAA4ABQAgAA0AFgATABIAEAAJAAUAKAARAB8AHQARAA0ABAACABsADAALAA8ACgAHAAQAAQAbAAwACAAMAAYAAwABAAAABAMFBwgJCQkDAwQFBwcICAUEBQYHCAcIBgUGBgcICAgHBgcHCAgICQgHCAgICQgJCAcHCAgJCQoJCAgJCQkJCgEABQAOABUAIgAzAC4ARwAqADQARAA0AEMALAArABMAAwAEAAwAEwAfABoALAAhAB8AGAAgABgAHwAjABYADgAPAA0AFwAkADsAMQBNAEEAHQAoAB4AKAAbACEAKgAQABYAFAAlAD0AOABPAEkAQAArAEwAOAAlABoAHwAZAA4AIwAQADwAOQBhAEsAcgBbADYASQA3ACkAMAA1ABcAGAA6ABsAMgBgAEwARgBdAFQATQA6AE8AHQBKADEAKQARAC8ALQBOAEoAcwBeAFoATwBFAFMARwAyADsAJgAkAA8ASAAiADgAXwBcAFUAWwBaAFYASQBNAEEAMwAsACsAKgArABQAHgAsADcATgBIAFcATgA9AC4ANgAlAB4AFAAQADUAGQApACUALAA7ADYAUQBCAEwAOQA2ACUAEgAnAAsAIwAhAB8AOQAqAFIASABQAC8AOgA3ABUAFgAaACYAFgA1ABkAFwAmAEYAPAAzACQANwAaACIAFwAbAA4ACQAHACIAIAAcACcAMQBLAB4ANAAwACgANAAcABIAEQAJAAUALQAVACIAQAA4ADIAMQAtAB8AEwAMAA8ACgAHAAYAAwAwABcAFAAnACQAIwA1ABUAEAAXAA0ACgAGAAEABAACABAADwARABsAGQAUAB0ACwARAAwAEAAIAAEAAQAAAAEAAQQGBwgJCQoJCgsLDAwNDQMEBgcICAkJCQkKCgsMDAwGBgcICQkKCgkKCgsLDA0NBwcICQkKCgoKCwsLCwwNDQgHCQkKCgsLCgsLDAwNDQ4JCAkKCgoLCwsLDAsNDQ4OCQkKCgsLCwsLDAwMDQ0ODgoJCgsLCwwMDAwNDQ0OEBAJCAkKCgsLDAwMDA0NDg8PCgkKCgsLCw0MDQ0ODg4QDwoKCgsLDAwNDA0ODQ4PEBELCgoLDAwMDA0NDQ4PDw8QCwsLDAwNDA0ODg8PDxAQEAwLDA0NDQ4ODg4ODxAPEBANDAwNDQ0PDg4RDw8PERAQDAwNDg4ODw4PDxAQExITEAcADAASADUALwBMAHwAbABZAHsAbAB3AGsAUQB6AD8ADQAFABAAGwAuACQAPQAzACoARgA0AFMAQQApADsAJAATABEADwAYACkAIgA7ADAAKABAADIATgA+AFAAOAAhAB0AHAAZACsAJwA/ADcAXQBMADsAXQBIADYASwAyAB0ANAAWACoAKABDADkAXwBPAEgAOQBZAEUAMQBCAC4AGwBNACUAIwBCADoANABbAEoAPgAwAE8APwBaAD4AKAAmAH0AIAA8ADgAMgBcAE4AQQA3AFcARwAzAEkAMwBGAB4AbQA1ADEAXgBYAEsAQgB6AFsASQA4ACoAQAAsABUAGQBaACsAKQBNAEkAPwA4AFwATQBCAC8AQwAwADUAJAAUAEcAIgBDADwAOgAxAFgATABDAGoARwA2ACYAJwAXAA8AbQA1ADMALwBaAFIAOgA5ADAASAA5ACkAFwAbAD4ACQBWACoAKAAlAEYAQAA0ACsARgA3ACoAGQAdABIACwALAHYARAAeADcAMgAuAEoAQQAxACcAGAAQABYADQAOAAcAWwAsACcAJgAiAD8ANAAtAB8ANAAcABMADgAIAAkAAwB7ADwAOgA1AC8AKwAgABYAJQAYABEADAAPAAoAAgABAEcAJQAiAB4AHAAUABEAGgAVABAACgAGAAgABgACAAAAAwQFBwcICQkJCgoLCwsMDQQDBQYHBwgICAkJCgoKCwsFBQUGBwcICAgJCQoKCwsLBgYGBwcICAkJCQoKCgsLCwcGBwcICAkJCQkKCgoLCwsIBwcICAgJCQkJCgoLCwsMCQcICAgJCQkJCgoKCwsMDAkICAkJCQkKCgoKCgsLCwwJCAgJCQkJCgoKCgsLDAwMCQgJCQkJCgoKCwsLCwwMDAoJCQkKCgoKCgsLCwsMDQwKCQkJCgoKCgsLCwsMDAwNCwoJCgoKCwsLCwsLDAwNDQsKCgoKCwsLCwwMDAwMDQ0MCwsLCwsLCwwMDAwNDQwNDAsLCwsLCwwMDAwMDQ0NDQEABQAOACwASgA/AG4AXQCsAJUAigDyAOEAwwB4AREAAwAEAAwAFAAjAD4ANQAvAFMASwBEAHcAyQBrAM8ACQAPAA0AFwAmAEMAOgBnAFoAoQBIAH8AdQBuANEAzgAQAC0AFQAnAEUAQAByAGMAVwCeAIwA/ADUAMcAgwFtARoASwAkAEQAQQBzAGUAswCkAJsACAH2AOIAiwF+AWoBCQBCAB4AOwA4AGYAuQCtAAkBjgD9AOgAkAGEAXoBvQEQAG8ANgA0AGQAuACyAKAAhQABAfQA5ADZAIEBbgHLAgoAYgAwAFsAWAClAJ0AlAAFAfgAlwGNAXQBfAF5A3QDCABVAFQAUQCfAJwAjwAEAfkAqwGRAYgBfwHXAskCxAIHAJoATABJAI0AgwAAAfUAqgGWAYoBgAHfAmcBxgJgAQsAiwCBAEMAfQD3AOkA5QDbAIkB5wLhAtACdQNyA7cBBADzAHgAdgBzAOMA3wCMAeoC5gLgAtECyALCAt8AtAEGAMoA4ADeANoA2ACFAYIBfQFsAXgDuwHDArgBtQHABgQA6wLTANIA0AByAXsB3gLTAsoCxwZzA20DbAODDWEDAgB5AXEBZgC7ANYC0gJmAccCxQJiA8YGZwOCDWYDsgEAAAwACgAHAAsACgARAAsACQANAAwACgAHAAUAAwABAAMAAQQGCAkJCgoLCwsMDAwNCQMEBgcICQkJCgoKCwwLDAgGBgcICQkKCgsKCwsLDAwJCAcICQkKCgoLCwwMDA0NCgkICQkKCgsLCwwMDA0NDQkJCAkJCgsLDAsMDA0NDQ4KCgkJCgsLCwsMDAwMDQ0OCgoJCgoLCwsMDA0NDQ0PDwoKCgoLCwsMDA0NDQ0ODg4KCwoKCwsMDA0NDQ0ODQ4NCwsLCgsMDAwMDQ4ODg8PDgoMCwsLDAwNDg4ODg4ODQ4LDAwMDAwNDQ0NDw4ODg4QCw4MDAwNDQ4ODhAPDw8RDwsNDQsMDg4NDg4PEA8RDw4LCQgICQkKCgoLCwsLCwsLCA8ADQAuAFAAkgAGAfgAsgGqAZ0CjQKJAm0CBQIIBFgADgAMABUAJgBHAIIAegDYANEAxgBHAVkBPwEpARcBKgAvABYAKQBKAEQAgAB4AN0AzwDCALYAVAE7AScBHQISAFEAJwBLAEYAhgB9AHQA3ADMAL4AsgBFATcBJQEPARAAkwBIAEUAhwB/AHYAcADSAMgAvABgAUMBMgEdARwCDgAHAUIAgQB+AHcAcgDWAMoAwAC0AFUBPQEtARkBBgEMAPkAewB5AHUAcQDXAM4AwwC5AFsBSgE0ASMBEAEIAgoAswFzAG8AbQDTAMsAxAC7AGEBTAE5ASoBGwETAn0BEQCrAdQA0ADNAMkAwQC6ALEAqQBAAS8BHgEMAQICeQEQAE8BxwDFAL8AvQC1AK4ATQFBATEBIQETAQkCewFzAQsAnAK4ALcAswCvAFgBSwE6ATABIgEVARICfwF1AW4BCgCMAloBqwCoAKQAPgE1ASsBHwEUAQcBAQJ3AXABagEGAIgCQgE8ATgBMwEuASQBHAENAQUBAAJ4AXIBbAFnAQQAbAIsASgBJgEgARoBEQEKAQMCfAF2AXEBbQFpAWUBAgAJBBgBFgESAQsBCAEDAX4BegF0AW8BawFoAWYBZAEAACsAFAATABEADwANAAsACQAHAAYABAAHAAUAAwABAAMABAQGBwgJCQoKCwsLCwsMCQQEBQYHCAgJCQkKCgoKCggGBQYHBwgICQkJCQoKCgsHBwYHBwgICAkJCQkKCgoKBwgHBwgICAgJCQkKCgoKCwcJBwgICAgJCQkJCgoKCgoHCQgICAgJCQkJCgoKCgoLBwoICAgJCQkJCgoKCgoLCwgKCQkJCQkJCQkKCgoKCwsICgkJCQkJCQoKCgoKCwsLCAsJCQkJCgoKCgoKCwsLCwgLCgkJCQoKCgoKCgsLCwsICwoKCgoKCgoKCgsLCwsLCAsKCgoKCgoKCwsLCwsLCwgMCgoKCgoKCwsLCwsLCwsICAcHBwcHBwcHBwcICAgIBAEABQAEAAUABgAFAAQABAAHAAMABgAAAAcAAgADAAEAAQQEBQQGBQYEBQUGBQYGBg8ADgANAAwACwAKAAkACAAHAAYABQAEAAMAAgABAAAABAQEBAQEBAQEBAQEBAQEBABB6CkLBQIAAAACAEH5KQsMBAAACAQAAAMAAAADAEGQKgsNEAQAACIEAAADAAAAAwBBqCoLBjAEAABCBABByCoLBQQAAAAEAEHYKgsNUAQAAHAEAAAEAAAABABB8CoLDYAEAACgBAAABgAAAAYAQYgrCw2wBAAAAAUAAAYAAAAGAEGgKwsNMAUAAIAFAAAGAAAABgBBuCsLDbAFAAAABgAACAAAAAgAQdArCw0wBgAAsAYAAAgAAAAIAEHoKwsN8AYAAHAHAAAIAAAACABBgCwLDbAHAAAwCAAAEAAAABAAQZgsCwZwCAAAcAoAQbgsCwUQAAAAEABByCwLjQNwCwAAcA0AABAAAAAQAAAAAQAAAAEAAABwDgAAcBAAABAAAAAQAAAAAgAAAAMAAABwDgAAcBAAABAAAAAQAAAAAwAAAAcAAABwDgAAcBAAABAAAAAQAAAABAAAAA8AAABwDgAAcBAAABAAAAAQAAAABgAAAD8AAABwDgAAcBAAABAAAAAQAAAACAAAAP8AAABwDgAAcBAAABAAAAAQAAAACgAAAP8DAABwDgAAcBAAABAAAAAQAAAADQAAAP8fAABwDgAAcBAAABAAAAAQAAAABAAAAA8AAABwEQAAcBMAABAAAAAQAAAABQAAAB8AAABwEQAAcBMAABAAAAAQAAAABgAAAD8AAABwEQAAcBMAABAAAAAQAAAABwAAAH8AAABwEQAAcBMAABAAAAAQAAAACAAAAP8AAABwEQAAcBMAABAAAAAQAAAACQAAAP8BAABwEQAAcBMAABAAAAAQAAAACwAAAP8HAABwEQAAcBMAABAAAAAQAAAADQAAAP8fAABwEQAAcBMAAAEAAAAQAEHgLwsNcBQAAJAUAAABAAAAEABB+C8LBqAUAADAFABBrDALiQEBAAAAAQAAAAEAAAABAAAAAQAAAAEAAAACAAAAAgAAAAIAAAACAAAAAwAAAAIAAAADAAAAAwAAAAQAAAADAAAABAAAAAMAAAAEAAAABAAAAAUAAAAEAAAABQAAAAQAAAAGAAAABQAAAAYAAAAFAAAABgAAAAUAAAAHAAAABgAAAAcAAAAGAAAABwBBwDELDQEAAAD/////AQAAAAIAQeAxC5IBAwAAAAEAAAABAAAAAQAAAAIAAAACAAAAAgAAAAMAAAADAAAAAwAAAAQAAAAEAAAAAAAAAAEAAAACAAAAAwAAAAAAAAABAAAAAgAAAAMAAAABAAAAAgAAAAMAAAABAAAAAgAAAAMAAAACAAAAAwAAAESsAACAuwAAAH0AACJWAADAXQAAgD4AABErAADgLgAAQB8AQYAzC7oI/////////////////////wgAAAD/////CAAAACAAAAAQAAAA/////xAAAAAoAAAAGAAAAP////8YAAAAMAAAACAAAAD/////IAAAADgAAAAoAAAA/////ygAAABAAAAAMAAAAP////8wAAAAUAAAADgAAAD/////OAAAAGAAAABAAAAA/////0AAAABwAAAA//////////9QAAAAgAAAAP//////////YAAAAKAAAAD//////////3AAAADAAAAA//////////+AAAAA4AAAAP//////////kAAAAAABAAD//////////6AAAABAAQAA/////////////////////wAAAAAEAAAACAAAAAwAAAAQAAAAFAAAABgAAAAeAAAAJAAAACwAAAA0AAAAPgAAAEoAAABaAAAAbgAAAIYAAACiAAAAxAAAAO4AAAAgAQAAVgEAAKIBAABAAgAAAAAAAAQAAAAIAAAADAAAABAAAAAUAAAAGAAAAB4AAAAkAAAAKgAAADIAAAA8AAAASAAAAFgAAABqAAAAgAAAAJwAAAC+AAAA5gAAABQBAABKAQAAgAEAAEACAAAAAAAABAAAAAgAAAAMAAAAEAAAABQAAAAYAAAAHgAAACQAAAAsAAAANgAAAEIAAABSAAAAZgAAAH4AAACcAAAAwgAAAPAAAAAoAQAAbAEAAMABAAAmAgAAQAIAAAAAAAAGAAAADAAAABIAAAAYAAAAHgAAACQAAAAsAAAANgAAAEIAAABQAAAAYAAAAHQAAACMAAAAqAAAAMgAAADuAAAAHAEAAFABAACMAQAA0AEAAAoCAABAAgAAAAAAAAYAAAAMAAAAEgAAABgAAAAeAAAAJAAAACwAAAA2AAAAQgAAAFAAAABgAAAAcgAAAIgAAACiAAAAwgAAAOgAAAAWAQAASgEAAIoBAADQAQAAHAIAAEACAAAAAAAABgAAAAwAAAASAAAAGAAAAB4AAAAkAAAALAAAAC0AAABCAAAAUAAAAGAAAAB0AAAAjAAAAKgAAADIAAAA7gAAAPgAAABQAQAAjAEAANABAAAKAgAAQAIAAAAAAAAGAAAADAAAABIAAAAYAAAAHgAAACQAAAAsAAAANgAAAEIAAABQAAAAYAAAAHQAAACMAAAAqAAAAMgAAADuAAAAHAEAAFABAACMAQAA0AEAAAoCAABAAgAAAAAAAAYAAAAMAAAAEgAAABgAAAAeAAAAJAAAACwAAAA2AAAAQgAAAFAAAABgAAAAdAAAAIwAAACoAAAAyAAAAO4AAAAcAQAAUAEAAIwBAADQAQAACgIAAEACAAAAAAAADAAAABgAAAAkAAAAMAAAADwAAABIAAAAWAAAAGwAAACEAAAAoAAAAMAAAADoAAAAGAEAAFABAACQAQAA3AEAADYCAAA4AgAAOgIAADwCAAA+AgAAQAIAQdw7C8oPnff//533//+d9///nff//533//+d9///Ou///zrv//867///Ou///9bm///W5v//1ub//3Pe//9z3v//D9b//w/W//+szf//SMX//+W8///lvP//gbT//x6s//+6o///V5v//5CK//8sgv//ZXH//wJp//87WP//10///xA///9JLv//HxX//1gE//+R8/7/Z9r+/zzB/v8SqP7/S5f+/yB+/v+SXP7/aEP+/z0q/v+vCP7/he/9/1vW/f/NtP3/opv9/xR6/f+GWP3/XD/9/zEm/f+jBP3/3fP8/7La/P+Iwfz/o1cDAGpoAwAxeQMAlIEDAPiJAwBbkgMAW5IDAPiJAwCUgQMAzXADAAZgAwB4PgMA6hwDAPnyAgCkwAIAT44CADNLAgC0/wEA0asBAItPAQB+4gAAcHUAAJ33//9lcf//yuL+/2hD/v+im/3/eev8/+wy/P+Zafv/4pf6/8e9+f/m0vj/BOj3/1zs9v9Q6PX/ROT0/9TX8/8Bw/L/y6Xx/zGA8P/6Yu//YD3u/8YX7f8t8uv/k8zq/1yv6f+Jmuj/toXn/0d55v87deX/9oHk/3if4/9dxeL/bQTi/0RU4f9FveD/cT/g/8fa3/+rl9//um3f/1Zl3/+Bft//ncHf/1bRHwC7Qh8Ay4EeAOmWHQCzeRwAJyobAKuwGQB2/BcA6xUWAA39EwB1qREA7CsPAEhrDADrbwkAnEoGADLiAgDXT///w4L7//d69/85SfP/JuXu/75O6v9ljuX/G6Tg/0KY2/94Ytb/hBPR/wKjy/9VGcb/RYfA/wrcuv/PMLX/MX2v/5PJqf+8JqT/SIye//8Kmf/gopP/s2SO/xNIif8sZoT//r5//4dSe/+QMXf/fGRz/67zb/8n32z/EEBq/6MFaP8LSWb/qhJl/4FiZP9WSWT/Ksdk/2HkZf9dqWf/gh5q/zRMbf9zMnH/BeJ1/4dSe/9djIH/TqCI//WFkP9JumYACRhdABGkUgA4RUcA4gM7AA3gLQBW0R8AhegQANIUAQAGZ/D/u9be/1VszP/VJ7n/ARql/3Y6kP+XkXr/yCdk/20FTf/oMjX/OrAc/46WA//j5en+nKbP/oLptP5av5n+JSh+/qk0Yv4S/kX++3sp/vPPDP5cAvD9/yPT/T89tv3iXpn9E6J8/dEGYP2srkP9o5kn/UPpC/2NnfD8q8/V/AGIu/xW16H81NaI/N+OcPzaB1n871pC/IKQLPz3sBf8eNUD/GkG8fssTN/7Jq/O+x1Av/t1B7H7kQ2k+9ZamPul9437AOSE+64wffut3Xb7/+px+wdhbvvFP2z7yHiUBDvAkwT5npEEARWOBFMiiQRSz4IEABx7BFsIcgQqpWcEb/JbBIv4TgTjv0AE2lAxBNSzIASX+Q4EiCr8AwlP6AN+b9MDEaW9Ayb4pgMhcY8DLCl3A6ooXgP/d0QDVTAqA3NiDwO9FvQCXWbYAlRRvAIv+Z8C7V2DAh6hZgLBwkkCAdwsAqT9DwINMPMBBYTWAe4BugFXy50B29eBAaZAZgF+FksBZFkwAR0aFgFyafwAxk/jABjNygCT+rIAONibAGluhQCKxW8A/+VaACvYRgCrkzMARSkhAPqYDwAu6/7/exfv/6ou4P/zH9L/HvzE/8i6uP/vW63/9+ei/0m6ZgALem8Asl93AKNzfgB5rYQA+x2KAI3NjgDMs5IAfuGVAKNWmACfG5oA1jibAKq2mwB/nZsAVu2aAPW2mQBd+pcA8L+VANkgkwBSDJAAhJuMAHDOiAB5rYQAAkGAANSZewDtt3YATZtxACBdbAAB9WYAuHNhAETZWwBtNlYAz4JQADHPSgD2I0UAu3g/AKvmOQD+XDQAfOwuAIidKQC+ZyQA5VsfAJtxGgBCsRUA2hoRAMe2DAAJhQgAPX0EACmwAADOHf3/ZLX5/xWQ9v+4lPP/FNTw/4tW7v/zAuz/Ferp/4oD6P9VT+b/2dXk/02G4/8XaeL/NX7h/0W94P9W0R8AYz4gAH+BIACqmiAARpIgAFVoIAA5JSAAj8AfALtCHwC8qx4Ak/sdAKM6HQCIYBwACn4bAMWKGgC5hhkASnoYAHdlFwCkUBYAbTMVANMNFAA66BIAoMIRAAadEADPfw8ANVoOAP88DQAsKAwAvBsLALAXCgCkEwkA/BcIABotBwA5QgYAHmgFAGeWBAAUzQMAhxQDAF5kAgCYvAEANh0BAJuOAABjCAAAkIr//4Id//91sP7/L1T+/0wA/v/NtP3/sXH9/1w//f8HDf3/FuP8/4jB/P/6n/z/M4/8/2x+/P8Idvz/pW38/6Vt/P8Idvz/bH78/8+G/P+Wl/z/o1cDAHg+AwBOJQMAIwwDAF37AgDP2QIApMACAHqnAgDshQIAXmQCADNLAgClKQIAexACAFH3AQDD1QEAmLwBAG6jAQDggQEAtWgBAO5XAQDEPgEAmSUBAG8MAQCo+wAA4eoAALfRAADwwAAAKbAAAMWnAAD+lgAAm44AANR9AABwdQAAqWQAAEZcAADiUwAAf0sAABtDAAAbQwAAuDoAAFQyAADxKQAA8SkAAI0hAACNIQAAKhkAACoZAAAqGQAAxhAAAMYQAADGEAAAxhAAAGMIAABjCAAAYwgAAGMIAABjCAAAYwgAQcDLAAvXFQMAAAAEAAAABAAAAAYAAACD+aIARE5uAPwpFQDRVycA3TT1AGLbwAA8mZUAQZBDAGNR/gC73qsAt2HFADpuJADSTUIASQbgAAnqLgAcktEA6x3+ACmxHADoPqcA9TWCAES7LgCc6YQAtCZwAEF+XwDWkTkAU4M5AJz0OQCLX4QAKPm9APgfOwDe/5cAD5gFABEv7wAKWosAbR9tAM9+NgAJyycARk+3AJ5mPwAt6l8Auid1AOXrxwA9e/EA9zkHAJJSigD7a+oAH7FfAAhdjQAwA1YAe/xGAPCrawAgvM8ANvSaAOOpHQBeYZEACBvmAIWZZQCgFF8AjUBoAIDY/wAnc00ABgYxAMpWFQDJqHMAe+JgAGuMwAAZxEcAzWfDAAno3ABZgyoAi3bEAKYclgBEr90AGVfRAKU+BQAFB/8AM34/AMIy6ACYT94Au30yACY9wwAea+8An/heADUfOgB/8soA8YcdAHyQIQBqJHwA1W76ADAtdwAVO0MAtRTGAMMZnQCtxMIALE1BAAwAXQCGfUYA43EtAJvGmgAzYgAAtNJ8ALSnlwA3VdUA1z72AKMQGABNdvwAZJ0qAHDXqwBjfPgAerBXABcV5wDASVYAO9bZAKeEOAAkI8sA1op3AFpUIwAAH7kA8QobABnO3wCfMf8AZh5qAJlXYQCs+0cAfn/YACJltwAy6IkA5r9gAO/EzQBsNgkAXT/UABbe1wBYO94A3puSANIiKAAohugA4lhNAMbKMgAI4xYA4H3LABfAUADzHacAGOBbAC4TNACDEmIAg0gBAPWOWwCtsH8AHunyAEhKQwAQZ9MAqt3YAK5fQgBqYc4ACiikANOZtAAGpvIAXHd/AKPCgwBhPIgAinN4AK+MWgBv170ALaZjAPS/ywCNge8AJsFnAFXKRQDK2TYAKKjSAMJhjQASyXcABCYUABJGmwDEWcQAyMVEAE2ykQAAF/MA1EOtAClJ5QD91RAAAL78AB6UzABwzu4AEz71AOzxgACz58MAx/goAJMFlADBcT4ALgmzAAtF8wCIEpwAqyB7AC61nwBHksIAezIvAAxVbQByp5AAa+cfADHLlgB5FkoAQXniAPTfiQDolJcA4uaEAJkxlwCI7WsAX182ALv9DgBImrQAZ6RsAHFyQgCNXTIAnxW4ALzlCQCNMSUA93Q5ADAFHAANDAEASwhoACzuWABHqpAAdOcCAL3WJAD3faYAbkhyAJ8W7wCOlKYAtJH2ANFTUQDPCvIAIJgzAPVLfgCyY2gA3T5fAEBdAwCFiX8AVVIpADdkwABt2BAAMkgyAFtMdQBOcdQARVRuAAsJwQAq9WkAFGbVACcHnQBdBFAAtDvbAOp2xQCH+RcASWt9AB0nugCWaSkAxsysAK0UVACQ4moAiNmJACxyUAAEpL4AdweUAPMwcAAA/CcA6nGoAGbCSQBk4D0Al92DAKM/lwBDlP0ADYaMADFB3gCSOZ0A3XCMABe35wAI3zsAFTcrAFyAoABagJMAEBGSAA/o2ABsgK8A2/9LADiQDwBZGHYAYqUVAGHLuwDHibkAEEC9ANLyBABJdScA67b2ANsiuwAKFKoAiSYvAGSDdgAJOzMADpQaAFE6qgAdo8IAr+2uAFwmEgBtwk0ALXqcAMBWlwADP4MACfD2ACtAjABtMZkAObQHAAwgFQDYw1sA9ZLEAMatSwBOyqUApzfNAOapNgCrkpQA3UJoABlj3gB2jO8AaItSAPzbNwCuoasA3xUxAACuoQAM+9oAZE1mAO0FtwApZTAAV1a/AEf/OgBq+bkAdb7zACiT3wCrgDAAZoz2AATLFQD6IgYA2eQdAD2zpABXG48ANs0JAE5C6QATvqQAMyO1APCqGgBPZagA0sGlAAs/DwBbeM0AI/l2AHuLBACJF3IAxqZTAG9u4gDv6wAAm0pYAMTatwCqZroAds/PANECHQCx8S0AjJnBAMOtdwCGSNoA912gAMaA9ACs8C8A3eyaAD9cvADQ3m0AkMcfACrbtgCjJToAAK+aAK1TkwC2VwQAKS20AEuAfgDaB6cAdqoOAHtZoQAWEioA3LctAPrl/QCJ2/4Aib79AOR2bAAGqfwAPoBwAIVuFQD9h/8AKD4HAGFnMwAqGIYATb3qALPnrwCPbW4AlWc5ADG/WwCE10gAMN8WAMctQwAlYTUAyXDOADDLuAC/bP0ApACiAAVs5ABa3aAAIW9HAGIS0gC5XIQAcGFJAGtW4ACZUgEAUFU3AB7VtwAz8cQAE25fAF0w5ACFLqkAHbLDAKEyNgAIt6QA6rHUABb3IQCPaeQAJ/93AAwDgACNQC0AT82gACClmQCzotMAL10KALT5QgAR2ssAfb7QAJvbwQCrF70AyqKBAAhqXAAuVRcAJwBVAH8U8ADhB4YAFAtkAJZBjQCHvt4A2v0qAGsltgB7iTQABfP+ALm/ngBoak8ASiqoAE/EWgAt+LwA11qYAPTHlQANTY0AIDqmAKRXXwAUP7EAgDiVAMwgAQBx3YYAyd62AL9g9QBNZREAAQdrAIywrACywNAAUVVIAB77DgCVcsMAowY7AMBANQAG3HsA4EXMAE4p+gDWysgA6PNBAHxk3gCbZNgA2b4xAKSXwwB3WNQAaePFAPDaEwC6OjwARhhGAFV1XwDSvfUAbpLGAKwuXQAORO0AHD5CAGHEhwAp/ekA59bzACJ8ygBvkTUACODFAP/XjQBuauIAsP3GAJMIwQB8XXQAa62yAM1unQA+cnsAxhFqAPfPqQApc98Atcm6ALcAUQDisg0AdLokAOV9YAB02IoADRUsAIEYDAB+ZpQAASkWAJ96dgD9/b4AVkXvANl+NgDs2RMAi7q5AMSX/AAxqCcA8W7DAJTFNgDYqFYAtKi1AM/MDgASiS0Ab1c0ACxWiQCZzuMA1iC5AGteqgA+KpwAEV/MAP0LSgDh9PsAjjttAOKGLADp1IQA/LSpAO/u0QAuNckALzlhADghRAAb2cgAgfwKAPtKagAvHNgAU7SEAE6ZjABUIswAKlXcAMDG1gALGZYAGnC4AGmVZAAmWmAAP1LuAH8RDwD0tREA/Mv1ADS8LQA0vO4A6F3MAN1eYABnjpsAkjPvAMkXuABhWJsA4Ve8AFGDxgDYPhAA3XFIAC0c3QCvGKEAISxGAFnz1wDZepgAnlTAAE+G+gBWBvwA5XmuAIkiNgA4rSIAZ5PcAFXoqgCCJjgAyuebAFENpACZM7EAqdcOAGkFSABlsvAAf4inAIhMlwD50TYAIZKzAHuCSgCYzyEAQJ/cANxHVQDhdDoAZ+tCAP6d3wBe1F8Ae2ekALqsegBV9qIAK4gjAEG6VQBZbggAISqGADlHgwCJ4+YA5Z7UAEn7QAD/VukAHA/KAMVZigCU+isA08HFAA/FzwDbWq4AR8WGAIVDYgAhhjsALHmUABBhhwAqTHsAgCwaAEO/EgCIJpAAeDyJAKjE5ADl23sAxDrCACb06gD3Z4oADZK/AGWjKwA9k7EAvXwLAKRR3AAn3WMAaeHdAJqUGQCoKZUAaM4oAAnttABEnyAATpjKAHCCYwB+fCMAD7kyAKf1jgAUVucAIfEIALWdKgBvfk0ApRlRALX5qwCC39YAlt1hABY2AgDEOp8Ag6KhAHLtbQA5jXoAgripAGsyXABGJ1sAADTtANIAdwD89FUAAVlNAOBxgABBo+EAC60BQPsh+T8AAAAALUR0PgAAAICYRvg8AAAAYFHMeDsAAACAgxvwOQAAAEAgJXo4AAAAgCKC4zYAAAAAHfNpNf6CK2VHFWdAAAAAAAAAOEMAAPr+Qi52vzo7nrya9wy9vf3/////3z88VFVVVVXFP5ErF89VVaU/F9CkZxERgT8AAAAAAADIQu85+v5CLuY/JMSC/72/zj+19AzXCGusP8xQRtKrsoM/hDpOm+DXVT8AQd7iAAuCMfA/br+IGk87mzw1M/upPfbvP13c2JwTYHG8YYB3Pprs7z/RZocQel6QvIV/bugV4+8/E/ZnNVLSjDx0hRXTsNnvP/qO+SOAzou83vbdKWvQ7z9hyOZhTvdgPMibdRhFx+8/mdMzW+SjkDyD88bKPr7vP217g12mmpc8D4n5bFi17z/87/2SGrWOPPdHciuSrO8/0ZwvcD2+Pjyi0dMy7KPvPwtukIk0A2q8G9P+r2ab7z8OvS8qUlaVvFFbEtABk+8/VepOjO+AULzMMWzAvYrvPxb01bkjyZG84C2prpqC7z+vVVzp49OAPFGOpciYeu8/SJOl6hUbgLx7UX08uHLvPz0y3lXwH4+86o2MOPlq7z+/UxM/jImLPHXLb+tbY+8/JusRdpzZlrzUXASE4FvvP2AvOj737Jo8qrloMYdU7z+dOIbLguePvB3Z/CJQTe8/jcOmREFvijzWjGKIO0bvP30E5LAFeoA8ltx9kUk/7z+UqKjj/Y6WPDhidW56OO8/fUh08hhehzw/prJPzjHvP/LnH5grR4A83XziZUUr7z9eCHE/e7iWvIFj9eHfJO8/MasJbeH3gjzh3h/1nR7vP/q/bxqbIT28kNna0H8Y7z+0CgxygjeLPAsD5KaFEu8/j8vOiZIUbjxWLz6prwzvP7arsE11TYM8FbcxCv4G7z9MdKziAUKGPDHYTPxwAe8/SvjTXTndjzz/FmSyCPzuPwRbjjuAo4a88Z+SX8X27j9oUEvM7UqSvMupOjen8e4/ji1RG/gHmbxm2AVtruzuP9I2lD7o0XG895/lNNvn7j8VG86zGRmZvOWoE8Mt4+4/bUwqp0ifhTwiNBJMpt7uP4ppKHpgEpO8HICsBEXa7j9biRdIj6dYvCou9yEK1u4/G5pJZ5ssfLyXqFDZ9dHuPxGswmDtY0M8LYlhYAjO7j/vZAY7CWaWPFcAHe1Byu4/eQOh2uHMbjzQPMG1osbuPzASDz+O/5M83tPX8CrD7j+wr3q7zpB2PCcqNtXav+4/d+BU670dkzwN3f2ZsrzuP46jcQA0lI+8pyyddrK57j9Jo5PczN6HvEJmz6Latu4/XzgPvcbeeLyCT51WK7TuP/Zce+xGEoa8D5JdyqSx7j+O1/0YBTWTPNontTZHr+4/BZuKL7eYezz9x5fUEq3uPwlUHOLhY5A8KVRI3Qer7j/qxhlQhcc0PLdGWYomqe4/NcBkK+YylDxIIa0Vb6fuP592mWFK5Iy8Cdx2ueGl7j+oTe87xTOMvIVVOrB+pO4/rukriXhThLwgw8w0RqPuP1hYVnjdzpO8JSJVgjii7j9kGX6AqhBXPHOpTNRVoe4/KCJev++zk7zNO39mnqDuP4K5NIetEmq8v9oLdRKg7j/uqW2472djvC8aZTyyn+4/UYjgVD3cgLyElFH5fZ/uP88+Wn5kH3i8dF/s6HWf7j+wfYvASu6GvHSBpUian+4/iuZVHjIZhrzJZ0JW65/uP9PUCV7LnJA8P13eT2mg7j8dpU253DJ7vIcB63MUoe4/a8BnVP3slDwywTAB7aHuP1Vs1qvh62U8Yk7PNvOi7j9Cz7MvxaGIvBIaPlQnpO4/NDc78bZpk7wTzkyZiaXuPx7/GTqEXoC8rccjRhqn7j9uV3LYUNSUvO2SRJvZqO4/AIoOW2etkDyZZorZx6ruP7Tq8MEvt40826AqQuWs7j//58WcYLZlvIxEtRYyr+4/RF/zWYP2ezw2dxWZrrHuP4M9HqcfCZO8xv+RC1u07j8pHmyLuKldvOXFzbA3t+4/WbmQfPkjbLwPUsjLRLruP6r59CJDQ5K8UE7en4K97j9LjmbXbMqFvLoHynDxwO4/J86RK/yvcTyQ8KOCkcTuP7tzCuE10m08IyPjGWPI7j9jImIiBMWHvGXlXXtmzO4/1THi44YcizwzLUrsm9DuPxW7vNPRu5G8XSU+sgPV7j/SMe6cMcyQPFizMBOe2e4/s1pzboRphDy//XlVa97uP7SdjpfN34K8evPTv2vj7j+HM8uSdxqMPK3TWpmf6O4/+tnRSo97kLxmto0pB+7uP7qu3FbZw1W8+xVPuKLz7j9A9qY9DqSQvDpZ5Y1y+e4/NJOtOPTWaLxHXvvydv/uPzWKWGvi7pG8SgahMLAF7z/N3V8K1/90PNLBS5AeDO8/rJiS+vu9kbwJHtdbwhLvP7MMrzCubnM8nFKF3ZsZ7z+U/Z9cMuOOPHrQ/1+rIO8/rFkJ0Y/ghDxL0Vcu8SfvP2caTjivzWM8tecGlG0v7z9oGZJsLGtnPGmQ79wgN+8/0rXMgxiKgLz6w11VCz/vP2/6/z9drY+8fIkHSi1H7z9JqXU4rg2QvPKJDQiHT+8/pwc9poWjdDyHpPvcGFjvPw8iQCCekYK8mIPJFuNg7z+sksHVUFqOPIUy2wPmae8/S2sBrFk6hDxgtAHzIXPvPx8+tAch1YK8X5t7M5d87z/JDUc7uSqJvCmh9RRGhu8/04g6YAS2dDz2P4vnLpDvP3FynVHsxYM8g0zH+1Ga7z/wkdOPEvePvNqQpKKvpO8/fXQj4piujbzxZ44tSK/vPwggqkG8w448J1ph7hu67z8y66nDlCuEPJe6azcrxe8/7oXRMalkijxARW5bdtDvP+3jO+S6N468FL6crf3b7z+dzZFNO4l3PNiQnoHB5+8/icxgQcEFUzzxcY8rwvPvPwA4+v5CLuY/MGfHk1fzLj0BAAAAAADgv1swUVVVVdU/kEXr////z78RAfEks5nJP5/IBuV1VcW/AAAAAAAA4L93VVVVVVXVP8v9/////8+/DN2VmZmZyT+nRWdVVVXFvzDeRKMkScI/ZT1CpP//v7/K1ioohHG8P/9osEPrmbm/hdCv94KBtz/NRdF1E1K1v5/e4MPwNPc/AJDmeX/M178f6SxqeBP3PwAADcLub9e/oLX6CGDy9j8A4FET4xPXv32MEx+m0fY/AHgoOFu41r/RtMULSbH2PwB4gJBVXda/ugwvM0eR9j8AABh20ALWvyNCIhifcfY/AJCQhsqo1b/ZHqWZT1L2PwBQA1ZDT9W/xCSPqlYz9j8AQGvDN/bUvxTcnWuzFPY/AFCo/aed1L9MXMZSZPb1PwCoiTmSRdS/TyyRtWfY9T8AuLA59O3Tv96QW8u8uvU/AHCPRM6W0794GtnyYZ31PwCgvRceQNO/h1ZGElaA9T8AgEbv4unSv9Nr586XY/U/AOAwOBuU0r+Tf6fiJUf1PwCI2ozFPtK/g0UGQv8q9T8AkCcp4enRv9+9stsiD/U/APhIK22V0b/X3jRHj/P0PwD4uZpnQdG/QCjez0PY9D8AmO+U0O3Qv8ijeMA+vfQ/ABDbGKWa0L+KJeDDf6L0PwC4Y1LmR9C/NITUJAWI9D8A8IZFIuvPvwstGRvObfQ/ALAXdUpHz79UGDnT2VP0PwAwED1EpM6/WoS0RCc69D8AsOlEDQLOv/v4FUG1IPQ/APB3KaJgzb+x9D7aggf0PwCQlQQBwMy/j/5XXY/u8z8AEIlWKSDMv+lMC6DZ1fM/ABCBjReBy78rwRDAYL3zPwDQ08zJ4sq/uNp1KySl8z8AkBIuQEXKvwLQn80ijfM/APAdaHeoyb8ceoTFW3XzPwAwSGltDMm/4jatSc5d8z8AwEWmIHHIv0DUTZh5RvM/ADAUtI/Wx78ky//OXC/zPwBwYjy4PMe/SQ2hdXcY8z8AYDebmqPGv5A5PjfIAfM/AKC3VDELxr9B+JW7TuvyPwAwJHZ9c8W/0akZAgrV8j8AMMKPe9zEvyr9t6j5vvI/AADSUSxGxL+rGwx6HKnyPwAAg7yKsMO/MLUUYHKT8j8AAElrmRvDv/WhV1f6ffI/AECkkFSHwr+/Ox2bs2jyPwCgefi588G/vfWPg51T8j8AoCwlyGDBvzsIyaq3PvI/ACD3V3/OwL+2QKkrASryPwCg/kncPMC/MkHMlnkV8j8AgEu8vVe/v5v80h0gAfI/AEBAlgg3vr8LSE1J9OzxPwBA+T6YF72/aWWPUvXY8T8AoNhOZ/m7v3x+VxEjxfE/AGAvIHncur/pJst0fLHxPwCAKOfDwLm/thosDAGe8T8AwHKzRqa4v71wtnuwivE/AACsswGNt7+2vO8linfxPwAAOEXxdLa/2jFMNY1k8T8AgIdtDl61v91fJ5C5UfE/AOCh3lxItL9M0jKkDj/xPwCgak3ZM7O/2vkQcoss8T8AYMX4eSCyvzG17CgwGvE/ACBimEYOsb+vNITa+wfxPwAA0mps+q+/s2tOD+718D8AQHdKjdqtv86fKl0G5PA/AACF5Oy8q78hpSxjRNLwPwDAEkCJoam/GpjifKfA8D8AwAIzWIinv9E2xoMvr/A/AIDWZ15xpb85E6CY253wPwCAZUmKXKO/3+dSr6uM8D8AQBVk40mhv/soTi+fe/A/AIDrgsBynr8ZjzWMtWrwPwCAUlLxVZq/LPnspe5Z8D8AgIHPYj2Wv5As0c1JSfA/AACqjPsokr+prfDGxjjwPwAA+SB7MYy/qTJ5E2Uo8D8AAKpdNRmEv0hz6ickGPA/AADswgMSeL+VsRQGBAjwPwAAJHkJBGC/Gvom9x/g7z8AAJCE8+9vP3TqYcIcoe8/AAA9NUHchz8umYGwEGPvPwCAwsSjzpM/za3uPPYl7z8AAIkUwZ+bP+cTkQPI6e4/AAARztiwoT+rsct4gK7uPwDAAdBbiqU/mwydohp07j8AgNhAg1ypP7WZCoOROu4/AIBX72onrT9WmmAJ4AHuPwDAmOWYdbA/mLt35QHK7T8AIA3j9VOyPwORfAvyku0/AAA4i90utD/OXPtmrFztPwDAV4dZBrY/nd5eqiwn7T8AAGo1dtq3P80saz5u8uw/AGAcTkOruT8Ceaeibb7sPwBgDbvHeLs/bQg3bSaL7D8AIOcyE0O9PwRYXb2UWOw/AGDecTEKvz+Mn7sztSbsPwBAkSsVZ8A/P+fs7oP16z8AsJKChUfBP8GW23X9xOs/ADDKzW4mwj8oSoYMHpXrPwBQxabXA8M/LD7vxeJl6z8AEDM8w9/DP4uIyWdIN+s/AIB6aza6xD9KMB0hSwnrPwDw0Sg5k8U/fu/yhejb6j8A8BgkzWrGP6I9YDEdr+o/AJBm7PhAxz+nWNM/5oLqPwDwGvXAFcg/i3MJ70BX6j8AgPZUKenIPydLq5AqLOo/AED4Aja7yT/R8pMToAHqPwAALBzti8o/GzzbJJ/X6T8A0AFcUVvLP5CxxwUlruk/AMC8zGcpzD8vzpfyLoXpPwBgSNU19sw/dUuk7rpc6T8AwEY0vcHNPzhI553GNOk/AODPuAGMzj/mUmcvTw3pPwCQF8AJVc8/ndf/jlLm6D8AuB8SbA7QP3wAzJ/Ov+g/ANCTDrhx0D8Ow77awJnoPwBwhp5r1NA/+xcjqid06D8A0EszhzbRPwias6wAT+g/AEgjZw2Y0T9VPmXoSSroPwCAzOD/+NE/YAL0lQEG6D8AaGPXX1nSPymj4GMl4uc/AKgUCTC50j+ttdx3s77nPwBgQxByGNM/wiWXZ6qb5z8AGOxtJnfTP1cGF/IHeec/ADCv+0/V0z8ME9bbylbnPwDgL+PuMtQ/a7ZPAQAQ5j88W0KRbAJ+PJW0TQMAMOY/QV0ASOq/jTx41JQNAFDmP7el1oanf448rW9OBwBw5j9MJVRr6vxhPK4P3/7/j+Y//Q5ZTCd+fLy8xWMHALDmPwHa3EhowYq89sFcHgDQ5j8Rk0mdHD+DPD72Bev/7+Y/Uy3iGgSAfryAl4YOABDnP1J5CXFm/3s8Euln/P8v5z8kh70m4gCMPGoRgd//T+c/0gHxbpECbryQnGcPAHDnP3ScVM1x/Ge8Nch++v+P5z+DBPWewb6BPObCIP7/r+c/ZWTMKRd+cLwAyT/t/8/nPxyLewhygIC8dhom6f/v5z+u+Z1tKMCNPOijnAQAEOg/M0zlUdJ/iTyPLJMXADDoP4HzMLbp/oq8nHMzBgBQ6D+8NWVrv7+JPMaJQiAAcOg/dXsR82W/i7wEefXr/4/oP1fLPaJuAIm83wS8IgCw6D8KS+A43wB9vIobDOX/z+g/BZ//RnEAiLxDjpH8/+/oPzhwetB7gYM8x1/6HgAQ6T8DtN92kT6JPLl7RhMAMOk/dgKYS06AfzxvB+7m/0/pPy5i/9nwfo+80RI83v9v6T+6OCaWqoJwvA2KRfT/j+k/76hkkRuAh7w+Lpjd/6/pPzeTWorgQIe8ZvtJ7f/P6T8A4JvBCM4/PFGc8SAA8Ok/CluIJ6o/irwGsEURABDqP1baWJlI/3Q8+va7BwAw6j8YbSuKq76MPHkdlxAAUOo/MHl43cr+iDxILvUdAHDqP9ur2D12QY+8UjNZHACQ6j8SdsKEAr+OvEs+TyoAsOo/Xz//PAT9abzRHq7X/8/qP7RwkBLnPoK8eARR7v/v6j+j3g7gPgZqPFsNZdv/D+s/uQofOMgGWjxXyqr+/y/rPx08I3QeAXm83LqV2f9P6z+fKoZoEP95vJxlniQAcOs/Pk+G0EX/ijxAFof5/4/rP/nDwpZ3/nw8T8sE0v+v6z/EK/LuJ/9jvEVcQdL/z+s/Ieo77rf/bLzfCWP4/+/rP1wLLpcDQYG8U3a14f8P7D8ZareUZMGLPONX+vH/L+w/7cYwje/+ZLwk5L/c/0/sP3VH7LxoP4S897lU7f9v7D/s4FPwo36EPNWPmev/j+w/8ZL5jQaDczyaISUhALDsPwQOGGSO/Wi8nEaU3f/P7D9y6sccvn6OPHbE/er/7+w//oifrTm+jjwr+JoWABDtP3FauaiRfXU8HfcPDQAw7T/ax3BpkMGJPMQPeer/T+0/DP5YxTcOWLzlh9wuAHDtP0QPwU3WgH+8qoLcIQCQ7T9cXP2Uj3x0vIMCa9j/r+0/fmEhxR1/jDw5R2wpANDtP1Ox/7KeAYg89ZBE5f/v7T+JzFLG0gBuPJT2q83/D+4/0mktIECDf7zdyFLb/y/uP2QIG8rBAHs87xZC8v9P7j9Rq5SwqP9yPBFeiuj/b+4/Wb7vsXP2V7wN/54RAJDuPwHIC16NgIS8RBel3/+v7j+1IEPVBgB4PKF/EhoA0O4/klxWYPgCULzEvLoHAPDuPxHmNV1EQIW8Ao169f8P7z8Fke85MftPvMeK5R4AMO8/VRFz8qyBijyUNIL1/0/vP0PH19RBP4o8a0yp/P9v7z91eJgc9AJivEHE+eH/j+8/S+d39NF9dzx+4+DS/6/vPzGjfJoZAW+8nuR3HADQ7z+xrM5L7oFxPDHD4Pf/7+8/WodwATcFbrxuYGX0/w/wP9oKHEmtfoq8WHqG8/8v8D/gsvzDaX+XvBcN/P3/T/A/W5TLNP6/lzyCTc0DAHDwP8tW5MCDAII86Mvy+f+P8D8adTe+3/9tvGXaDAEAsPA/6ybmrn8/kbw406QBANDwP/efSHn6fYA8/f3a+v/v8D/Aa9ZwBQR3vJb9ugsAEPE/YgtthNSAjjxd9OX6/y/xP+82/WT6v5082ZrVDQBQ8T+uUBJwdwCaPJpVIQ8AcPE/7t7j4vn9jTwmVCf8/4/xP3NyO9wwAJE8WTw9EgCw8T+IAQOAeX+ZPLeeKfj/z/E/Z4yfqzL5ZbwA1Ir0/+/xP+tbp52/f5M8pIaLDAAQ8j8iW/2Ra4CfPANDhQMAMPI/M7+f68L/kzyE9rz//0/yP3IuLn7nAXY82SEp9f9v8j9hDH92u/x/PDw6kxQAkPI/K0ECPMoCcrwTY1UUALDyPwIf8jOCgJK8O1L+6//P8j/y3E84fv+IvJatuAsA8PI/xUEwUFH/hbyv4nr7/w/zP50oXohxAIG8f1+s/v8v8z8Vt7c/Xf+RvFZnpgwAUPM/vYKLIoJ/lTwh9/sRAHDzP8zVDcS6AIA8uS9Z+f+P8z9Rp7ItnT+UvELS3QQAsPM/4Th2cGt/hTxXybL1/8/zPzESvxA6Ano8GLSw6v/v8z+wUrFmbX+YPPSvMhUAEPQ/JIUZXzf4Zzwpi0cXADD0P0NR3HLmAYM8Y7SV5/9P9D9aibK4af+JPOB1BOj/b/Q/VPLCm7HAlbznwW/v/4/0P3IqOvIJQJs8BKe+5f+v9D9FfQ2/t/+UvN4nEBcA0PQ/PWrccWTAmbziPvAPAPD0PxxThQuJf5c80UvcEgAQ9T82pGZxZQRgPHonBRYAMPU/CTIjzs6/lrxMcNvs/0/1P9ehBQVyAom8qVRf7/9v9T8SZMkO5r+bPBIQ5hcAkPU/kO+vgcV+iDySPskDALD1P8AMvwoIQZ+8vBlJHQDQ9T8pRyX7KoGYvIl6uOf/7/U/BGntgLd+lLwAQeCTAQsD4EsB";if(!isDataURI(wasmBinaryFile)){wasmBinaryFile=locateFile(wasmBinaryFile)}function getBinary(file){try{if(file==wasmBinaryFile&&wasmBinary){return new Uint8Array(wasmBinary)}var binary=tryParseAsDataURI(file);if(binary){return binary}if(readBinary){return readBinary(file)}throw"both async and sync fetching of the wasm failed"}catch(err){abort(err)}}function getBinaryPromise(){if(!wasmBinary&&(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER)){if(typeof fetch=="function"){return fetch(wasmBinaryFile,{credentials:"same-origin"}).then(function(response){if(!response["ok"]){throw"failed to load wasm binary file at '"+wasmBinaryFile+"'"}return response["arrayBuffer"]()}).catch(function(){return getBinary(wasmBinaryFile)})}}return Promise.resolve().then(function(){return getBinary(wasmBinaryFile)})}function createWasm(){var info={"a":asmLibraryArg};function receiveInstance(instance,module){var exports=instance.exports;Module["asm"]=exports;wasmMemory=Module["asm"]["c"];updateGlobalBufferAndViews(wasmMemory.buffer);wasmTable=Module["asm"]["o"];addOnInit(Module["asm"]["d"]);removeRunDependency("wasm-instantiate")}addRunDependency("wasm-instantiate");function receiveInstantiationResult(result){receiveInstance(result["instance"])}function instantiateArrayBuffer(receiver){return getBinaryPromise().then(function(binary){return WebAssembly.instantiate(binary,info)}).then(function(instance){return instance}).then(receiver,function(reason){err("failed to asynchronously prepare wasm: "+reason);abort(reason)})}function instantiateAsync(){if(!wasmBinary&&typeof WebAssembly.instantiateStreaming=="function"&&!isDataURI(wasmBinaryFile)&&typeof fetch=="function"){return fetch(wasmBinaryFile,{credentials:"same-origin"}).then(function(response){var result=WebAssembly.instantiateStreaming(response,info);return result.then(receiveInstantiationResult,function(reason){err("wasm streaming compile failed: "+reason);err("falling back to ArrayBuffer instantiation");return instantiateArrayBuffer(receiveInstantiationResult)})})}else{return instantiateArrayBuffer(receiveInstantiationResult)}}if(Module["instantiateWasm"]){try{var exports=Module["instantiateWasm"](info,receiveInstance);return exports}catch(e){err("Module.instantiateWasm callback failed with error: "+e);readyPromiseReject(e)}}instantiateAsync().catch(readyPromiseReject);return{}}var tempDouble;var tempI64;function callRuntimeCallbacks(callbacks){while(callbacks.length>0){callbacks.shift()(Module)}}function getValue(ptr,type="i8"){if(type.endsWith("*"))type="*";switch(type){case"i1":return HEAP8[ptr>>0];case"i8":return HEAP8[ptr>>0];case"i16":return HEAP16[ptr>>1];case"i32":return HEAP32[ptr>>2];case"i64":return HEAP32[ptr>>2];case"float":return HEAPF32[ptr>>2];case"double":return HEAPF64[ptr>>3];case"*":return HEAPU32[ptr>>2];default:abort("invalid type for getValue: "+type)}return null}function intArrayToString(array){var ret=[];for(var i=0;i<array.length;i++){var chr=array[i];if(chr>255){if(ASSERTIONS){assert(false,"Character code "+chr+" ("+String.fromCharCode(chr)+") at offset "+i+" not in 0x00-0xFF.")}chr&=255}ret.push(String.fromCharCode(chr))}return ret.join("")}function setValue(ptr,value,type="i8"){if(type.endsWith("*"))type="*";switch(type){case"i1":HEAP8[ptr>>0]=value;break;case"i8":HEAP8[ptr>>0]=value;break;case"i16":HEAP16[ptr>>1]=value;break;case"i32":HEAP32[ptr>>2]=value;break;case"i64":tempI64=[value>>>0,(tempDouble=value,+Math.abs(tempDouble)>=1?tempDouble>0?(Math.min(+Math.floor(tempDouble/4294967296),4294967295)|0)>>>0:~~+Math.ceil((tempDouble-+(~~tempDouble>>>0))/4294967296)>>>0:0)],HEAP32[ptr>>2]=tempI64[0],HEAP32[ptr+4>>2]=tempI64[1];break;case"float":HEAPF32[ptr>>2]=value;break;case"double":HEAPF64[ptr>>3]=value;break;case"*":HEAPU32[ptr>>2]=value;break;default:abort("invalid type for setValue: "+type)}}function _emscripten_memcpy_big(dest,src,num){HEAPU8.copyWithin(dest,src,src+num)}function abortOnCannotGrowMemory(requestedSize){abort("OOM")}function _emscripten_resize_heap(requestedSize){var oldSize=HEAPU8.length;requestedSize=requestedSize>>>0;abortOnCannotGrowMemory(requestedSize)}var ASSERTIONS=false;var decodeBase64=typeof atob=="function"?atob:function(input){var keyStr="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";var output="";var chr1,chr2,chr3;var enc1,enc2,enc3,enc4;var i=0;input=input.replace(/[^A-Za-z0-9\+\/\=]/g,"");do{enc1=keyStr.indexOf(input.charAt(i++));enc2=keyStr.indexOf(input.charAt(i++));enc3=keyStr.indexOf(input.charAt(i++));enc4=keyStr.indexOf(input.charAt(i++));chr1=enc1<<2|enc2>>4;chr2=(enc2&15)<<4|enc3>>2;chr3=(enc3&3)<<6|enc4;output=output+String.fromCharCode(chr1);if(enc3!==64){output=output+String.fromCharCode(chr2)}if(enc4!==64){output=output+String.fromCharCode(chr3)}}while(i<input.length);return output};function intArrayFromBase64(s){try{var decoded=decodeBase64(s);var bytes=new Uint8Array(decoded.length);for(var i=0;i<decoded.length;++i){bytes[i]=decoded.charCodeAt(i)}return bytes}catch(_){throw new Error("Converting base64 string to bytes failed.")}}function tryParseAsDataURI(filename){if(!isDataURI(filename)){return}return intArrayFromBase64(filename.slice(dataURIPrefix.length))}var asmLibraryArg={"b":_emscripten_memcpy_big,"a":_emscripten_resize_heap};var asm=createWasm();var ___wasm_call_ctors=Module["___wasm_call_ctors"]=function(){return(___wasm_call_ctors=Module["___wasm_call_ctors"]=Module["asm"]["d"]).apply(null,arguments)};var _malloc=Module["_malloc"]=function(){return(_malloc=Module["_malloc"]=Module["asm"]["e"]).apply(null,arguments)};var _free=Module["_free"]=function(){return(_free=Module["_free"]=Module["asm"]["f"]).apply(null,arguments)};var _shine_check_config=Module["_shine_check_config"]=function(){return(_shine_check_config=Module["_shine_check_config"]=Module["asm"]["g"]).apply(null,arguments)};var _shine_samples_per_pass=Module["_shine_samples_per_pass"]=function(){return(_shine_samples_per_pass=Module["_shine_samples_per_pass"]=Module["asm"]["h"]).apply(null,arguments)};var _shine_encode_buffer=Module["_shine_encode_buffer"]=function(){return(_shine_encode_buffer=Module["_shine_encode_buffer"]=Module["asm"]["i"]).apply(null,arguments)};var _shine_flush=Module["_shine_flush"]=function(){return(_shine_flush=Module["_shine_flush"]=Module["asm"]["j"]).apply(null,arguments)};var _shine_close=Module["_shine_close"]=function(){return(_shine_close=Module["_shine_close"]=Module["asm"]["k"]).apply(null,arguments)};var _shine_js_int16_len=Module["_shine_js_int16_len"]=function(){return(_shine_js_int16_len=Module["_shine_js_int16_len"]=Module["asm"]["l"]).apply(null,arguments)};var _shine_js_ptr_len=Module["_shine_js_ptr_len"]=function(){return(_shine_js_ptr_len=Module["_shine_js_ptr_len"]=Module["asm"]["m"]).apply(null,arguments)};var _shine_js_init=Module["_shine_js_init"]=function(){return(_shine_js_init=Module["_shine_js_init"]=Module["asm"]["n"]).apply(null,arguments)};Module["setValue"]=setValue;Module["getValue"]=getValue;var calledRun;dependenciesFulfilled=function runCaller(){if(!calledRun)run();if(!calledRun)dependenciesFulfilled=runCaller};function run(args){args=args||arguments_;if(runDependencies>0){return}preRun();if(runDependencies>0){return}function doRun(){if(calledRun)return;calledRun=true;Module["calledRun"]=true;if(ABORT)return;initRuntime();readyPromiseResolve(Module);if(Module["onRuntimeInitialized"])Module["onRuntimeInitialized"]();postRun()}if(Module["setStatus"]){Module["setStatus"]("Running...");setTimeout(function(){setTimeout(function(){Module["setStatus"]("")},1);doRun()},1)}else{doRun()}}if(Module["preInit"]){if(typeof Module["preInit"]=="function")Module["preInit"]=[Module["preInit"]];while(Module["preInit"].length>0){Module["preInit"].pop()()}}run(); -+ -+ -+ return createModule.ready -+} -+); -+})(); -+export default createModule; -\ No newline at end of file -diff --git a/js/dist/libshine_node.js b/js/dist/libshine_node.js -new file mode 100644 -index 0000000..02d7990 ---- /dev/null -+++ b/js/dist/libshine_node.js -@@ -0,0 +1 @@ -+var Module=typeof Module!="undefined"?Module:{};var moduleOverrides=Object.assign({},Module);var arguments_=[];var thisProgram="./this.program";var quit_=(status,toThrow)=>{throw toThrow};var ENVIRONMENT_IS_WEB=typeof window=="object";var ENVIRONMENT_IS_WORKER=typeof importScripts=="function";var ENVIRONMENT_IS_NODE=typeof process=="object"&&typeof process.versions=="object"&&typeof process.versions.node=="string";var scriptDirectory="";function locateFile(path){if(Module["locateFile"]){return Module["locateFile"](path,scriptDirectory)}return scriptDirectory+path}var read_,readAsync,readBinary,setWindowTitle;function logExceptionOnExit(e){if(e instanceof ExitStatus)return;let toLog=e;err("exiting due to exception: "+toLog)}if(ENVIRONMENT_IS_NODE){var fs=require("fs");var nodePath=require("path");if(ENVIRONMENT_IS_WORKER){scriptDirectory=nodePath.dirname(scriptDirectory)+"/"}else{scriptDirectory=__dirname+"/"}read_=(filename,binary)=>{var ret=tryParseAsDataURI(filename);if(ret){return binary?ret:ret.toString()}filename=isFileURI(filename)?new URL(filename):nodePath.normalize(filename);return fs.readFileSync(filename,binary?undefined:"utf8")};readBinary=filename=>{var ret=read_(filename,true);if(!ret.buffer){ret=new Uint8Array(ret)}return ret};readAsync=(filename,onload,onerror)=>{var ret=tryParseAsDataURI(filename);if(ret){onload(ret)}filename=isFileURI(filename)?new URL(filename):nodePath.normalize(filename);fs.readFile(filename,function(err,data){if(err)onerror(err);else onload(data.buffer)})};if(process["argv"].length>1){thisProgram=process["argv"][1].replace(/\\/g,"/")}arguments_=process["argv"].slice(2);if(typeof module!="undefined"){module["exports"]=Module}process["on"]("uncaughtException",function(ex){if(!(ex instanceof ExitStatus)){throw ex}});process["on"]("unhandledRejection",function(reason){throw reason});quit_=(status,toThrow)=>{if(keepRuntimeAlive()){process["exitCode"]=status;throw toThrow}logExceptionOnExit(toThrow);process["exit"](status)};Module["inspect"]=function(){return"[Emscripten Module object]"}}else if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){if(ENVIRONMENT_IS_WORKER){scriptDirectory=self.location.href}else if(typeof document!="undefined"&&document.currentScript){scriptDirectory=document.currentScript.src}if(scriptDirectory.indexOf("blob:")!==0){scriptDirectory=scriptDirectory.substr(0,scriptDirectory.replace(/[?#].*/,"").lastIndexOf("/")+1)}else{scriptDirectory=""}{read_=url=>{try{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.send(null);return xhr.responseText}catch(err){var data=tryParseAsDataURI(url);if(data){return intArrayToString(data)}throw err}};if(ENVIRONMENT_IS_WORKER){readBinary=url=>{try{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.responseType="arraybuffer";xhr.send(null);return new Uint8Array(xhr.response)}catch(err){var data=tryParseAsDataURI(url);if(data){return data}throw err}}}readAsync=(url,onload,onerror)=>{var xhr=new XMLHttpRequest;xhr.open("GET",url,true);xhr.responseType="arraybuffer";xhr.onload=()=>{if(xhr.status==200||xhr.status==0&&xhr.response){onload(xhr.response);return}var data=tryParseAsDataURI(url);if(data){onload(data.buffer);return}onerror()};xhr.onerror=onerror;xhr.send(null)}}setWindowTitle=title=>document.title=title}else{}var out=Module["print"]||console.log.bind(console);var err=Module["printErr"]||console.warn.bind(console);Object.assign(Module,moduleOverrides);moduleOverrides=null;if(Module["arguments"])arguments_=Module["arguments"];if(Module["thisProgram"])thisProgram=Module["thisProgram"];if(Module["quit"])quit_=Module["quit"];var wasmBinary;if(Module["wasmBinary"])wasmBinary=Module["wasmBinary"];var noExitRuntime=Module["noExitRuntime"]||true;if(typeof WebAssembly!="object"){abort("no native wasm support detected")}var wasmMemory;var ABORT=false;var EXITSTATUS;function assert(condition,text){if(!condition){abort(text)}}var buffer,HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;function updateGlobalBufferAndViews(buf){buffer=buf;Module["HEAP8"]=HEAP8=new Int8Array(buf);Module["HEAP16"]=HEAP16=new Int16Array(buf);Module["HEAP32"]=HEAP32=new Int32Array(buf);Module["HEAPU8"]=HEAPU8=new Uint8Array(buf);Module["HEAPU16"]=HEAPU16=new Uint16Array(buf);Module["HEAPU32"]=HEAPU32=new Uint32Array(buf);Module["HEAPF32"]=HEAPF32=new Float32Array(buf);Module["HEAPF64"]=HEAPF64=new Float64Array(buf)}var INITIAL_MEMORY=Module["INITIAL_MEMORY"]||16777216;var wasmTable;var __ATPRERUN__=[];var __ATINIT__=[];var __ATPOSTRUN__=[];var runtimeInitialized=false;function keepRuntimeAlive(){return noExitRuntime}function preRun(){if(Module["preRun"]){if(typeof Module["preRun"]=="function")Module["preRun"]=[Module["preRun"]];while(Module["preRun"].length){addOnPreRun(Module["preRun"].shift())}}callRuntimeCallbacks(__ATPRERUN__)}function initRuntime(){runtimeInitialized=true;callRuntimeCallbacks(__ATINIT__)}function postRun(){if(Module["postRun"]){if(typeof Module["postRun"]=="function")Module["postRun"]=[Module["postRun"]];while(Module["postRun"].length){addOnPostRun(Module["postRun"].shift())}}callRuntimeCallbacks(__ATPOSTRUN__)}function addOnPreRun(cb){__ATPRERUN__.unshift(cb)}function addOnInit(cb){__ATINIT__.unshift(cb)}function addOnPostRun(cb){__ATPOSTRUN__.unshift(cb)}var runDependencies=0;var runDependencyWatcher=null;var dependenciesFulfilled=null;function addRunDependency(id){runDependencies++;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}}function removeRunDependency(id){runDependencies--;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}if(runDependencies==0){if(runDependencyWatcher!==null){clearInterval(runDependencyWatcher);runDependencyWatcher=null}if(dependenciesFulfilled){var callback=dependenciesFulfilled;dependenciesFulfilled=null;callback()}}}function abort(what){if(Module["onAbort"]){Module["onAbort"](what)}what="Aborted("+what+")";err(what);ABORT=true;EXITSTATUS=1;what+=". Build with -sASSERTIONS for more info.";var e=new WebAssembly.RuntimeError(what);throw e}var dataURIPrefix="data:application/octet-stream;base64,";function isDataURI(filename){return filename.startsWith(dataURIPrefix)}function isFileURI(filename){return filename.startsWith("file://")}var wasmBinaryFile;wasmBinaryFile="data:application/octet-stream;base64,AGFzbQEAAAABVg9gAX8Bf2ADf39/AGACf38Bf2AEf39/fwF/YAN/f38Bf2ACf38AYAF/AGABfAF8YAABf2ADfHx/AXxgAnx8AXxgAnx/AXxgAABgBH9/f38AYAJ8fwF/Ag0CAWEBYQAAAWEBYgABAxsaAQMBAAQFAAkKBgsCBwwNBQcOAgQAAgMICAYEBQFwAQEBBQYBAYACgAIGCAF/AUHglwULBzUNAWMCAAFkAA8BZQAIAWYACwFnABcBaAAWAWkAFQFqABQBawAbAWwAGgFtABkBbgAYAW8BAArC+gEahQoBDX8gAiAAKAIQIgRJBEAgACAEIAJrIgI2AhAgACAAKAIMIAEgAnRyNgIMDwsgACgCACEKIAAoAgQiBSAAKAIIIgNBBGpNBEAgAAJ/IAVBAm0gBWohCyAKRQRAIAsQCAwBCyALQUBPBEBB5JMBQTA2AgBBAAwBCwJ/QRAgC0ELakF4cSALQQtJGyEHQQAhAyAKQQhrIgUoAgQiDEF4cSEGAkAgDEEDcUUEQEEAIAdBgAJJDQIaIAdBBGogBk0EQCAFIQMgBiAHa0HIlwEoAgBBAXRNDQILQQAMAgsgBSAGaiEIAkAgBiAHTwRAIAYgB2siBEEQSQ0BIAUgDEEBcSAHckECcjYCBCAFIAdqIgMgBEEDcjYCBCAIIAgoAgRBAXI2AgQgAyAEEBEMAQtBgJQBKAIAIAhGBEBB9JMBKAIAIAZqIgYgB00NAiAFIAxBAXEgB3JBAnI2AgQgBSAHaiIEIAYgB2siA0EBcjYCBEH0kwEgAzYCAEGAlAEgBDYCAAwBC0H8kwEoAgAgCEYEQEHwkwEoAgAgBmoiBCAHSQ0CAkAgBCAHayIDQRBPBEAgBSAMQQFxIAdyQQJyNgIEIAUgB2oiBiADQQFyNgIEIAQgBWoiBCADNgIAIAQgBCgCBEF+cTYCBAwBCyAFIAxBAXEgBHJBAnI2AgQgBCAFaiIDIAMoAgRBAXI2AgRBACEDQQAhBgtB/JMBIAY2AgBB8JMBIAM2AgAMAQsgCCgCBCIEQQJxDQEgBEF4cSAGaiINIAdJDQEgDSAHayEPAkAgBEH/AU0EQCAIKAIIIgYgBEEDdiIDQQN0QZCUAWpGGiAGIAgoAgwiBEYEQEHokwFB6JMBKAIAQX4gA3dxNgIADAILIAYgBDYCDCAEIAY2AggMAQsgCCgCGCEOAkAgCCAIKAIMIglHBEAgCCgCCCIDQfiTASgCAEkaIAMgCTYCDCAJIAM2AggMAQsCQCAIQRRqIgYoAgAiAw0AIAhBEGoiBigCACIDDQBBACEJDAELA0AgBiEEIAMiCUEUaiIGKAIAIgMNACAJQRBqIQYgCSgCECIDDQALIARBADYCAAsgDkUNAAJAIAgoAhwiBEECdEGYlgFqIgMoAgAgCEYEQCADIAk2AgAgCQ0BQeyTAUHskwEoAgBBfiAEd3E2AgAMAgsgDkEQQRQgDigCECAIRhtqIAk2AgAgCUUNAQsgCSAONgIYIAgoAhAiAwRAIAkgAzYCECADIAk2AhgLIAgoAhQiA0UNACAJIAM2AhQgAyAJNgIYCyAPQQ9NBEAgBSAMQQFxIA1yQQJyNgIEIAUgDWoiAyADKAIEQQFyNgIEDAELIAUgDEEBcSAHckECcjYCBCAFIAdqIgQgD0EDcjYCBCAFIA1qIgMgAygCBEEBcjYCBCAEIA8QEQsgBSEDCyADCyIDBEAgA0EIagwBC0EAIAsQCCIFRQ0AGiAFIApBfEF4IApBBGsoAgAiA0EDcRsgA0F4cWoiAyALIAMgC0kbEAQgChALIAULIgo2AgAgACAAKAIEIgNBAm0gA2o2AgQgACgCECEEIAAoAgghAwsgAyAKaiAAKAIMIAEgAiAEayIDdnIiBUEYdCAFQYD+A3FBCHRyIAVBCHZBgP4DcSAFQRh2cnI2AgAgAEEgIANrIgM2AhAgACAAKAIIQQRqNgIIIAIgBEcEQCAAIAEgA3Q2AgwPCyAAQQA2AgwLgQIBBn8CQCADRQ0AIANBGGxB0ClqIgUoAgQhByADQQ9NBEAgASACTw0BIANBGGxB0ClqKAIUIQMDQCAEIAAgAUECdGoiBSgCACIGQQBHaiAFKAIEIgRBAEdqIAMgBiAHbCAEamotAABqIQQgAUECaiIBIAJJDQALDAELIAEgAk8NACAFKAIIIQUgA0EYbEHQKWooAhQhAwNAIAQgBUEAIAAgAUECdGoiBCgCACIGQQ5KIggbaiAFQQAgBCgCBCIEQQ5KIgkbaiADQQ8gBCAJGyIEQQ8gBiAIGyIGIAdsamotAABqIAZBAEdqIARBAEdqIQQgAUECaiIBIAJJDQALCyAEC/wDAQJ/IAJBgARPBEAgACABIAIQAQ8LIAAgAmohAwJAIAAgAXNBA3FFBEACQCAAQQNxRQRAIAAhAgwBCyACRQRAIAAhAgwBCyAAIQIDQCACIAEtAAA6AAAgAUEBaiEBIAJBAWoiAkEDcUUNASACIANJDQALCwJAIANBfHEiAEHAAEkNACACIABBQGoiBEsNAANAIAIgASgCADYCACACIAEoAgQ2AgQgAiABKAIINgIIIAIgASgCDDYCDCACIAEoAhA2AhAgAiABKAIUNgIUIAIgASgCGDYCGCACIAEoAhw2AhwgAiABKAIgNgIgIAIgASgCJDYCJCACIAEoAig2AiggAiABKAIsNgIsIAIgASgCMDYCMCACIAEoAjQ2AjQgAiABKAI4NgI4IAIgASgCPDYCPCABQUBrIQEgAkFAayICIARNDQALCyAAIAJNDQEDQCACIAEoAgA2AgAgAUEEaiEBIAJBBGoiAiAASQ0ACwwBCyADQQRJBEAgACECDAELIAAgA0EEayIESwRAIAAhAgwBCyAAIQIDQCACIAEtAAA6AAAgAiABLQABOgABIAIgAS0AAjoAAiACIAEtAAM6AAMgAUEEaiEBIAJBBGoiAiAETQ0ACwsgAiADSQRAA0AgAiABLQAAOgAAIAFBAWohASACQQFqIgIgA0cNAAsLC1IBAn9B4JMBKAIAIgEgAEEHakF4cSICaiEAAkAgAkEAIAAgAU0bDQAgAD8AQRB0SwRAIAAQAEUNAQtB4JMBIAA2AgAgAQ8LQeSTAUEwNgIAQX8L0gsBCH8CQCABIAJJBH8gAiABayIFQQNxIQYgASEEIAFBf3MgAmpBA08EQCAFQXxxIQkDQCADIAAgBEECdGoiBSgCACIKIAMgCkobIgMgBSgCBCIKIAMgCkobIgMgBSgCCCIKIAMgCkobIgMgBSgCDCIFIAMgBUobIQMgBEEEaiEEIAhBBGoiCCAJRw0ACwsgBgRAA0AgAyAAIARBAnRqKAIAIgUgAyAFShshAyAEQQFqIQQgB0EBaiIHIAZHDQALCyADRQRAQQAPCyADQQ5MBEAgA0GILCgCAE8EQEEMIQQCQAJAAkACQAJAQfArKAIAIANLDQBBCyEEQdgrKAIAIANLDQBBwCsoAgAgA0sNBEEJIQRBqCsoAgAgA0sNAEEIIQRBkCsoAgAgA0sNAEH4KigCACADSw0DQQYhBEHgKigCACADSw0AQcgqKAIAIANLDQJBBCEEQbAqKAIAIANLDQBBAyEEQZgqKAIAIANLDQBBgCooAgAgA0sNAUEBIQRB6CkoAgAgA0sNAEEAIQRB0CkoAgAgA00NCAsgACABIAIgBBADGiAEDwtBrCooAgAhBEGcKigCACEFIAAgASACQQIQAyEGQQAhAwNAIAMgACABQQJ0aiIHKAIAIghBAEdqIAcoAgQiA0EAR2ogBCAFIAhsIANqai0AAGohAyABQQJqIgEgAkkNAAtBAkEDIAMgBkobDwtB9CooAgAhBEHkKigCACEFIAAgASACQQUQAyEGQQAhAwNAIAMgACABQQJ0aiIHKAIAIghBAEdqIAcoAgQiA0EAR2ogBCAFIAhsIANqai0AAGohAyABQQJqIgEgAkkNAAtBBUEGIAMgBkobDwtBpCsoAgAhBkGUKygCACEHIAAgASACQQcQAyEFQQAhBCABIQMDQCAEIAAgA0ECdGoiCCgCACIJQQBHaiAIKAIEIgRBAEdqIAYgByAJbCAEamotAABqIQQgA0ECaiIDIAJJDQALIAQgBSAEIAVIGyEGQQdBCCAEIAVKGyEEQbwrKAIAIQVBrCsoAgAhB0EAIQMDQCADIAAgAUECdGoiCCgCACIJQQBHaiAIKAIEIgNBAEdqIAUgByAJbCADamotAABqIQMgAUECaiIBIAJJDQALQQkgBCADIAZMGw8LQewrKAIAIQZB3CsoAgAhByAAIAEgAkEKEAMhBUEAIQQgASEDA0AgBCAAIANBAnRqIggoAgAiCUEAR2ogCCgCBCIEQQBHaiAGIAcgCWwgBGpqLQAAaiEEIANBAmoiAyACSQ0ACyAEIAUgBCAFSBshBkEKQQsgBCAFShshBEGELCgCACEFQfQrKAIAIQdBACEDA0AgAyAAIAFBAnRqIggoAgAiCUEAR2ogCCgCBCIDQQBHaiAFIAcgCWwgA2pqLQAAaiEDIAFBAmoiASACSQ0AC0EMIAQgAyAGTBsPC0HMLCgCACEEQbwsKAIAIQUgACABIAJBDRADIQZBACEDA0AgAyAAIAFBAnRqIgcoAgAiCEEAR2ogBygCBCIDQQBHaiAEIAUgCGwgA2pqLQAAaiEDIAFBAmoiASACSQ0AC0ENQQ8gAyAGShsPCwJ/QQ8gA0EPayIFQcQsKAIATQ0AGkEQQdwsKAIAIAVPDQAaQRFB9CwoAgAgBU8NABpBEkGMLSgCACAFTw0AGkETQaQtKAIAIAVPDQAaQRRBvC0oAgAgBU8NABpBFUHULSgCACAFTw0AGkEWQewtKAIAIAVPDQAaQRdBAEGELigCACAFTxsLIQQCf0EYQZwuKAIAIAVPDQAaQRlBtC4oAgAgBU8NABpBGkHMLigCACAFTw0AGkEbQeQuKAIAIAVPDQAaQRxB/C4oAgAgBU8NABpBHUGULygCACAFTw0AGkEeQawvKAIAIAVPDQAaQR9BAEHELygCACAFTxsLIQMgACABIAIgBBADIQUgAyAEIAAgASACIAMQAyAFSBsFQQALDwsgACABIAJBABADGkEAC9YCAQF/AkAgAUUNACAAQQA6AAAgACABaiICQQFrQQA6AAAgAUEDSQ0AIABBADoAAiAAQQA6AAEgAkEDa0EAOgAAIAJBAmtBADoAACABQQdJDQAgAEEAOgADIAJBBGtBADoAACABQQlJDQAgAEEAIABrQQNxIgJqIgBBADYCACAAIAEgAmtBfHEiAmoiAUEEa0EANgIAIAJBCUkNACAAQQA2AgggAEEANgIEIAFBCGtBADYCACABQQxrQQA2AgAgAkEZSQ0AIABBADYCGCAAQQA2AhQgAEEANgIQIABBADYCDCABQRBrQQA2AgAgAUEUa0EANgIAIAFBGGtBADYCACABQRxrQQA2AgAgAiAAQQRxQRhyIgJrIgFBIEkNACAAIAJqIQADQCAAQgA3AxggAEIANwMQIABCADcDCCAAQgA3AwAgAEEgaiEAIAFBIGsiAUEfSw0ACwsLtykBC38jAEEQayILJAACQAJAAkACQAJAAkACQAJAAkAgAEH0AU0EQEHokwEoAgAiBkEQIABBC2pBeHEgAEELSRsiBUEDdiIAdiIBQQNxBEACQCABQX9zQQFxIABqIgJBA3QiAUGQlAFqIgAgAUGYlAFqKAIAIgEoAggiBEYEQEHokwEgBkF+IAJ3cTYCAAwBCyAEIAA2AgwgACAENgIICyABQQhqIQAgASACQQN0IgJBA3I2AgQgASACaiIBIAEoAgRBAXI2AgQMCgsgBUHwkwEoAgAiB00NASABBEACQEECIAB0IgJBACACa3IgASAAdHEiAEEAIABrcWgiAUEDdCIAQZCUAWoiAiAAQZiUAWooAgAiACgCCCIERgRAQeiTASAGQX4gAXdxIgY2AgAMAQsgBCACNgIMIAIgBDYCCAsgACAFQQNyNgIEIAAgBWoiCCABQQN0IgEgBWsiBEEBcjYCBCAAIAFqIAQ2AgAgBwRAIAdBeHFBkJQBaiEBQfyTASgCACECAn8gBkEBIAdBA3Z0IgNxRQRAQeiTASADIAZyNgIAIAEMAQsgASgCCAshAyABIAI2AgggAyACNgIMIAIgATYCDCACIAM2AggLIABBCGohAEH8kwEgCDYCAEHwkwEgBDYCAAwKC0HskwEoAgAiCkUNASAKQQAgCmtxaEECdEGYlgFqKAIAIgIoAgRBeHEgBWshAyACIQEDQAJAIAEoAhAiAEUEQCABKAIUIgBFDQELIAAoAgRBeHEgBWsiASADIAEgA0kiARshAyAAIAIgARshAiAAIQEMAQsLIAIoAhghCSACIAIoAgwiBEcEQCACKAIIIgBB+JMBKAIASRogACAENgIMIAQgADYCCAwJCyACQRRqIgEoAgAiAEUEQCACKAIQIgBFDQMgAkEQaiEBCwNAIAEhCCAAIgRBFGoiASgCACIADQAgBEEQaiEBIAQoAhAiAA0ACyAIQQA2AgAMCAtBfyEFIABBv39LDQAgAEELaiIAQXhxIQVB7JMBKAIAIghFDQBBACAFayEDAkACQAJAAn9BACAFQYACSQ0AGkEfIAVB////B0sNABogBUEmIABBCHZnIgBrdkEBcSAAQQF0a0E+agsiB0ECdEGYlgFqKAIAIgFFBEBBACEADAELQQAhACAFQRkgB0EBdmtBACAHQR9HG3QhAgNAAkAgASgCBEF4cSAFayIGIANPDQAgASEEIAYiAw0AQQAhAyABIQAMAwsgACABKAIUIgYgBiABIAJBHXZBBHFqKAIQIgFGGyAAIAYbIQAgAkEBdCECIAENAAsLIAAgBHJFBEBBACEEQQIgB3QiAEEAIABrciAIcSIARQ0DIABBACAAa3FoQQJ0QZiWAWooAgAhAAsgAEUNAQsDQCAAKAIEQXhxIAVrIgIgA0khASACIAMgARshAyAAIAQgARshBCAAKAIQIgEEfyABBSAAKAIUCyIADQALCyAERQ0AIANB8JMBKAIAIAVrTw0AIAQoAhghByAEIAQoAgwiAkcEQCAEKAIIIgBB+JMBKAIASRogACACNgIMIAIgADYCCAwHCyAEQRRqIgEoAgAiAEUEQCAEKAIQIgBFDQMgBEEQaiEBCwNAIAEhBiAAIgJBFGoiASgCACIADQAgAkEQaiEBIAIoAhAiAA0ACyAGQQA2AgAMBgsgBUHwkwEoAgAiAU0EQEH8kwEoAgAhAAJAIAEgBWsiAkEQTwRAQfCTASACNgIAQfyTASAAIAVqIgQ2AgAgBCACQQFyNgIEIAAgAWogAjYCACAAIAVBA3I2AgQMAQtB/JMBQQA2AgBB8JMBQQA2AgAgACABQQNyNgIEIAAgAWoiASABKAIEQQFyNgIECyAAQQhqIQAMCAsgBUH0kwEoAgAiAkkEQEH0kwEgAiAFayIBNgIAQYCUAUGAlAEoAgAiACAFaiICNgIAIAIgAUEBcjYCBCAAIAVBA3I2AgQgAEEIaiEADAgLQQAhACAFQS9qIgMCf0HAlwEoAgAEQEHIlwEoAgAMAQtBzJcBQn83AgBBxJcBQoCggICAgAQ3AgBBwJcBIAtBDGpBcHFB2KrVqgVzNgIAQdSXAUEANgIAQaSXAUEANgIAQYAgCyIBaiIGQQAgAWsiCHEiASAFTQ0HQaCXASgCACIEBEBBmJcBKAIAIgcgAWoiCSAHTQ0IIAQgCUkNCAsCQEGklwEtAABBBHFFBEACQAJAAkACQEGAlAEoAgAiBARAQaiXASEAA0AgBCAAKAIAIgdPBEAgByAAKAIEaiAESw0DCyAAKAIIIgANAAsLQQAQBSICQX9GDQMgASEGQcSXASgCACIAQQFrIgQgAnEEQCABIAJrIAIgBGpBACAAa3FqIQYLIAUgBk8NA0GglwEoAgAiAARAQZiXASgCACIEIAZqIgggBE0NBCAAIAhJDQQLIAYQBSIAIAJHDQEMBQsgBiACayAIcSIGEAUiAiAAKAIAIAAoAgRqRg0BIAIhAAsgAEF/Rg0BIAYgBUEwak8EQCAAIQIMBAtByJcBKAIAIgIgAyAGa2pBACACa3EiAhAFQX9GDQEgAiAGaiEGIAAhAgwDCyACQX9HDQILQaSXAUGklwEoAgBBBHI2AgALIAEQBSECQQAQBSEAIAJBf0YNBSAAQX9GDQUgACACTQ0FIAAgAmsiBiAFQShqTQ0FC0GYlwFBmJcBKAIAIAZqIgA2AgBBnJcBKAIAIABJBEBBnJcBIAA2AgALAkBBgJQBKAIAIgMEQEGolwEhAANAIAIgACgCACIBIAAoAgQiBGpGDQIgACgCCCIADQALDAQLQfiTASgCACIAQQAgACACTRtFBEBB+JMBIAI2AgALQQAhAEGslwEgBjYCAEGolwEgAjYCAEGIlAFBfzYCAEGMlAFBwJcBKAIANgIAQbSXAUEANgIAA0AgAEEDdCIBQZiUAWogAUGQlAFqIgQ2AgAgAUGclAFqIAQ2AgAgAEEBaiIAQSBHDQALQfSTASAGQShrIgBBeCACa0EHcUEAIAJBCGpBB3EbIgFrIgQ2AgBBgJQBIAEgAmoiATYCACABIARBAXI2AgQgACACakEoNgIEQYSUAUHQlwEoAgA2AgAMBAsgAC0ADEEIcQ0CIAEgA0sNAiACIANNDQIgACAEIAZqNgIEQYCUASADQXggA2tBB3FBACADQQhqQQdxGyIAaiIBNgIAQfSTAUH0kwEoAgAgBmoiAiAAayIANgIAIAEgAEEBcjYCBCACIANqQSg2AgRBhJQBQdCXASgCADYCAAwDC0EAIQQMBQtBACECDAMLQfiTASgCACACSwRAQfiTASACNgIACyACIAZqIQFBqJcBIQACQAJAAkACQAJAAkADQCABIAAoAgBHBEAgACgCCCIADQEMAgsLIAAtAAxBCHFFDQELQaiXASEAA0AgAyAAKAIAIgFPBEAgASAAKAIEaiIEIANLDQMLIAAoAgghAAwACwALIAAgAjYCACAAIAAoAgQgBmo2AgQgAkF4IAJrQQdxQQAgAkEIakEHcRtqIgcgBUEDcjYCBCABQXggAWtBB3FBACABQQhqQQdxG2oiBiAFIAdqIgVrIQAgAyAGRgRAQYCUASAFNgIAQfSTAUH0kwEoAgAgAGoiADYCACAFIABBAXI2AgQMAwtB/JMBKAIAIAZGBEBB/JMBIAU2AgBB8JMBQfCTASgCACAAaiIANgIAIAUgAEEBcjYCBCAAIAVqIAA2AgAMAwsgBigCBCIDQQNxQQFGBEAgA0F4cSEJAkAgA0H/AU0EQCAGKAIIIgEgA0EDdiIEQQN0QZCUAWpGGiABIAYoAgwiAkYEQEHokwFB6JMBKAIAQX4gBHdxNgIADAILIAEgAjYCDCACIAE2AggMAQsgBigCGCEIAkAgBiAGKAIMIgJHBEAgBigCCCIBIAI2AgwgAiABNgIIDAELAkAgBkEUaiIDKAIAIgENACAGQRBqIgMoAgAiAQ0AQQAhAgwBCwNAIAMhBCABIgJBFGoiAygCACIBDQAgAkEQaiEDIAIoAhAiAQ0ACyAEQQA2AgALIAhFDQACQCAGKAIcIgFBAnRBmJYBaiIEKAIAIAZGBEAgBCACNgIAIAINAUHskwFB7JMBKAIAQX4gAXdxNgIADAILIAhBEEEUIAgoAhAgBkYbaiACNgIAIAJFDQELIAIgCDYCGCAGKAIQIgEEQCACIAE2AhAgASACNgIYCyAGKAIUIgFFDQAgAiABNgIUIAEgAjYCGAsgBiAJaiIGKAIEIQMgACAJaiEACyAGIANBfnE2AgQgBSAAQQFyNgIEIAAgBWogADYCACAAQf8BTQRAIABBeHFBkJQBaiEBAn9B6JMBKAIAIgJBASAAQQN2dCIAcUUEQEHokwEgACACcjYCACABDAELIAEoAggLIQAgASAFNgIIIAAgBTYCDCAFIAE2AgwgBSAANgIIDAMLQR8hAyAAQf///wdNBEAgAEEmIABBCHZnIgFrdkEBcSABQQF0a0E+aiEDCyAFIAM2AhwgBUIANwIQIANBAnRBmJYBaiEBAkBB7JMBKAIAIgJBASADdCIEcUUEQEHskwEgAiAEcjYCACABIAU2AgAMAQsgAEEZIANBAXZrQQAgA0EfRxt0IQMgASgCACECA0AgAiIBKAIEQXhxIABGDQMgA0EddiECIANBAXQhAyABIAJBBHFqIgQoAhAiAg0ACyAEIAU2AhALIAUgATYCGCAFIAU2AgwgBSAFNgIIDAILQfSTASAGQShrIgBBeCACa0EHcUEAIAJBCGpBB3EbIgFrIgg2AgBBgJQBIAEgAmoiATYCACABIAhBAXI2AgQgACACakEoNgIEQYSUAUHQlwEoAgA2AgAgAyAEQScgBGtBB3FBACAEQSdrQQdxG2pBL2siACAAIANBEGpJGyIBQRs2AgQgAUGwlwEpAgA3AhAgAUGolwEpAgA3AghBsJcBIAFBCGo2AgBBrJcBIAY2AgBBqJcBIAI2AgBBtJcBQQA2AgAgAUEYaiEAA0AgAEEHNgIEIABBCGohAiAAQQRqIQAgAiAESQ0ACyABIANGDQMgASABKAIEQX5xNgIEIAMgASADayICQQFyNgIEIAEgAjYCACACQf8BTQRAIAJBeHFBkJQBaiEAAn9B6JMBKAIAIgFBASACQQN2dCICcUUEQEHokwEgASACcjYCACAADAELIAAoAggLIQEgACADNgIIIAEgAzYCDCADIAA2AgwgAyABNgIIDAQLQR8hACACQf///wdNBEAgAkEmIAJBCHZnIgBrdkEBcSAAQQF0a0E+aiEACyADIAA2AhwgA0IANwIQIABBAnRBmJYBaiEBAkBB7JMBKAIAIgRBASAAdCIGcUUEQEHskwEgBCAGcjYCACABIAM2AgAMAQsgAkEZIABBAXZrQQAgAEEfRxt0IQAgASgCACEEA0AgBCIBKAIEQXhxIAJGDQQgAEEddiEEIABBAXQhACABIARBBHFqIgYoAhAiBA0ACyAGIAM2AhALIAMgATYCGCADIAM2AgwgAyADNgIIDAMLIAEoAggiACAFNgIMIAEgBTYCCCAFQQA2AhggBSABNgIMIAUgADYCCAsgB0EIaiEADAULIAEoAggiACADNgIMIAEgAzYCCCADQQA2AhggAyABNgIMIAMgADYCCAtB9JMBKAIAIgAgBU0NAEH0kwEgACAFayIBNgIAQYCUAUGAlAEoAgAiACAFaiICNgIAIAIgAUEBcjYCBCAAIAVBA3I2AgQgAEEIaiEADAMLQeSTAUEwNgIAQQAhAAwCCwJAIAdFDQACQCAEKAIcIgBBAnRBmJYBaiIBKAIAIARGBEAgASACNgIAIAINAUHskwEgCEF+IAB3cSIINgIADAILIAdBEEEUIAcoAhAgBEYbaiACNgIAIAJFDQELIAIgBzYCGCAEKAIQIgAEQCACIAA2AhAgACACNgIYCyAEKAIUIgBFDQAgAiAANgIUIAAgAjYCGAsCQCADQQ9NBEAgBCADIAVqIgBBA3I2AgQgACAEaiIAIAAoAgRBAXI2AgQMAQsgBCAFQQNyNgIEIAQgBWoiAiADQQFyNgIEIAIgA2ogAzYCACADQf8BTQRAIANBeHFBkJQBaiEAAn9B6JMBKAIAIgFBASADQQN2dCIDcUUEQEHokwEgASADcjYCACAADAELIAAoAggLIQEgACACNgIIIAEgAjYCDCACIAA2AgwgAiABNgIIDAELQR8hACADQf///wdNBEAgA0EmIANBCHZnIgBrdkEBcSAAQQF0a0E+aiEACyACIAA2AhwgAkIANwIQIABBAnRBmJYBaiEBAkACQCAIQQEgAHQiBnFFBEBB7JMBIAYgCHI2AgAgASACNgIADAELIANBGSAAQQF2a0EAIABBH0cbdCEAIAEoAgAhBQNAIAUiASgCBEF4cSADRg0CIABBHXYhBiAAQQF0IQAgASAGQQRxaiIGKAIQIgUNAAsgBiACNgIQCyACIAE2AhggAiACNgIMIAIgAjYCCAwBCyABKAIIIgAgAjYCDCABIAI2AgggAkEANgIYIAIgATYCDCACIAA2AggLIARBCGohAAwBCwJAIAlFDQACQCACKAIcIgBBAnRBmJYBaiIBKAIAIAJGBEAgASAENgIAIAQNAUHskwEgCkF+IAB3cTYCAAwCCyAJQRBBFCAJKAIQIAJGG2ogBDYCACAERQ0BCyAEIAk2AhggAigCECIABEAgBCAANgIQIAAgBDYCGAsgAigCFCIARQ0AIAQgADYCFCAAIAQ2AhgLAkAgA0EPTQRAIAIgAyAFaiIAQQNyNgIEIAAgAmoiACAAKAIEQQFyNgIEDAELIAIgBUEDcjYCBCACIAVqIgQgA0EBcjYCBCADIARqIAM2AgAgBwRAIAdBeHFBkJQBaiEAQfyTASgCACEBAn9BASAHQQN2dCIFIAZxRQRAQeiTASAFIAZyNgIAIAAMAQsgACgCCAshBiAAIAE2AgggBiABNgIMIAEgADYCDCABIAY2AggLQfyTASAENgIAQfCTASADNgIACyACQQhqIQALIAtBEGokACAAC5kBAQN8IAAgAKIiAyADIAOioiADRHzVz1o62eU9okTrnCuK5uVavqCiIAMgA0R9/rFX4x3HPqJE1WHBGaABKr+gokSm+BARERGBP6CgIQUgAyAAoiEEIAJFBEAgBCADIAWiRElVVVVVVcW/oKIgAKAPCyAAIAMgAUQAAAAAAADgP6IgBSAEoqGiIAGhIARESVVVVVVVxT+ioKELkgEBA3xEAAAAAAAA8D8gACAAoiICRAAAAAAAAOA/oiIDoSIERAAAAAAAAPA/IAShIAOhIAIgAiACIAJEkBXLGaAB+j6iRHdRwRZswVa/oKJETFVVVVVVpT+goiACIAKiIgMgA6IgAiACRNQ4iL7p+qi9okTEsbS9nu4hPqCiRK1SnIBPfpK+oKKgoiAAIAGioaCgC4kMAQd/AkAgAEUNACAAQQhrIgIgAEEEaygCACIBQXhxIgBqIQUCQCABQQFxDQAgAUEDcUUNASACIAIoAgAiAWsiAkH4kwEoAgBJDQEgACABaiEAQfyTASgCACACRwRAIAFB/wFNBEAgAigCCCIEIAFBA3YiAUEDdEGQlAFqRhogBCACKAIMIgNGBEBB6JMBQeiTASgCAEF+IAF3cTYCAAwDCyAEIAM2AgwgAyAENgIIDAILIAIoAhghBgJAIAIgAigCDCIBRwRAIAIoAggiAyABNgIMIAEgAzYCCAwBCwJAIAJBFGoiBCgCACIDDQAgAkEQaiIEKAIAIgMNAEEAIQEMAQsDQCAEIQcgAyIBQRRqIgQoAgAiAw0AIAFBEGohBCABKAIQIgMNAAsgB0EANgIACyAGRQ0BAkAgAigCHCIEQQJ0QZiWAWoiAygCACACRgRAIAMgATYCACABDQFB7JMBQeyTASgCAEF+IAR3cTYCAAwDCyAGQRBBFCAGKAIQIAJGG2ogATYCACABRQ0CCyABIAY2AhggAigCECIDBEAgASADNgIQIAMgATYCGAsgAigCFCIDRQ0BIAEgAzYCFCADIAE2AhgMAQsgBSgCBCIBQQNxQQNHDQBB8JMBIAA2AgAgBSABQX5xNgIEIAIgAEEBcjYCBCAAIAJqIAA2AgAPCyACIAVPDQAgBSgCBCIBQQFxRQ0AAkAgAUECcUUEQEGAlAEoAgAgBUYEQEGAlAEgAjYCAEH0kwFB9JMBKAIAIABqIgA2AgAgAiAAQQFyNgIEIAJB/JMBKAIARw0DQfCTAUEANgIAQfyTAUEANgIADwtB/JMBKAIAIAVGBEBB/JMBIAI2AgBB8JMBQfCTASgCACAAaiIANgIAIAIgAEEBcjYCBCAAIAJqIAA2AgAPCyABQXhxIABqIQACQCABQf8BTQRAIAUoAggiBCABQQN2IgFBA3RBkJQBakYaIAQgBSgCDCIDRgRAQeiTAUHokwEoAgBBfiABd3E2AgAMAgsgBCADNgIMIAMgBDYCCAwBCyAFKAIYIQYCQCAFIAUoAgwiAUcEQCAFKAIIIgNB+JMBKAIASRogAyABNgIMIAEgAzYCCAwBCwJAIAVBFGoiBCgCACIDDQAgBUEQaiIEKAIAIgMNAEEAIQEMAQsDQCAEIQcgAyIBQRRqIgQoAgAiAw0AIAFBEGohBCABKAIQIgMNAAsgB0EANgIACyAGRQ0AAkAgBSgCHCIEQQJ0QZiWAWoiAygCACAFRgRAIAMgATYCACABDQFB7JMBQeyTASgCAEF+IAR3cTYCAAwCCyAGQRBBFCAGKAIQIAVGG2ogATYCACABRQ0BCyABIAY2AhggBSgCECIDBEAgASADNgIQIAMgATYCGAsgBSgCFCIDRQ0AIAEgAzYCFCADIAE2AhgLIAIgAEEBcjYCBCAAIAJqIAA2AgAgAkH8kwEoAgBHDQFB8JMBIAA2AgAPCyAFIAFBfnE2AgQgAiAAQQFyNgIEIAAgAmogADYCAAsgAEH/AU0EQCAAQXhxQZCUAWohAQJ/QeiTASgCACIDQQEgAEEDdnQiAHFFBEBB6JMBIAAgA3I2AgAgAQwBCyABKAIICyEAIAEgAjYCCCAAIAI2AgwgAiABNgIMIAIgADYCCA8LQR8hBCAAQf///wdNBEAgAEEmIABBCHZnIgFrdkEBcSABQQF0a0E+aiEECyACIAQ2AhwgAkIANwIQIARBAnRBmJYBaiEHAkACQAJAQeyTASgCACIDQQEgBHQiAXFFBEBB7JMBIAEgA3I2AgAgByACNgIAIAIgBzYCGAwBCyAAQRkgBEEBdmtBACAEQR9HG3QhBCAHKAIAIQEDQCABIgMoAgRBeHEgAEYNAiAEQR12IQEgBEEBdCEEIAMgAUEEcWoiB0EQaigCACIBDQALIAcgAjYCECACIAM2AhgLIAIgAjYCDCACIAI2AggMAQsgAygCCCIAIAI2AgwgAyACNgIIIAJBADYCGCACIAM2AgwgAiAANgIIC0GIlAFBiJQBKAIAQQFrIgBBfyAAGzYCAAsLqAEAAkAgAUGACE4EQCAARAAAAAAAAOB/oiEAIAFB/w9JBEAgAUH/B2shAQwCCyAARAAAAAAAAOB/oiEAQf0XIAEgAUH9F04bQf4PayEBDAELIAFBgXhKDQAgAEQAAAAAAABgA6IhACABQbhwSwRAIAFByQdqIQEMAQsgAEQAAAAAAABgA6IhAEHwaCABIAFB8GhMG0GSD2ohAQsgACABQf8Haq1CNIa/ogu8AgEBfwJ/QQAgAUECdEGAM2oiAigCACAARg0AGkEBIAIoAhAgAEYNABpBAiABQQJ0QaAzaigCACAARg0AGkEDIAFBAnQiAkGwM2ooAgAgAEYNABpBBCACQcAzaigCACAARg0AGkEFIAFBAnQiAkHQM2ooAgAgAEYNABpBBiACQeAzaigCACAARg0AGkEHIAFBAnQiAkHwM2ooAgAgAEYNABpBCCACQYA0aigCACAARg0AGkEJIAFBAnQiAkGQNGooAgAgAEYNABpBCiACQaA0aigCACAARg0AGkELIAFBAnQiAkGwNGooAgAgAEYNABpBDCACQcA0aigCACAARg0AGkENIAFBAnQiAkHQNGooAgAgAEYNABpBDiACQeA0aigCACAARg0AGkEPQX8gAUECdEHwNGooAgAgAEYbCwvoBAMBfwZ8An4gAL0iCEIwiKchASAIQoCAgICAgID3P31C//////+fwgFYBEAgCEKAgICAgICA+D9RBEBEAAAAAAAAAAAPCyAARAAAAAAAAPC/oCIAIAAgAEQAAAAAAACgQaIiAqAgAqEiAiACokGI8wArAwAiBaIiBqAiByAAIAAgAKIiA6IiBCAEIAQgBEHY8wArAwCiIANB0PMAKwMAoiAAQcjzACsDAKJBwPMAKwMAoKCgoiADQbjzACsDAKIgAEGw8wArAwCiQajzACsDAKCgoKIgA0Gg8wArAwCiIABBmPMAKwMAokGQ8wArAwCgoKCiIAAgAqEgBaIgACACoKIgBiAAIAehoKCgoA8LAkAgAUHw/wFrQZ+Afk0EQCAIQv///////////wCDUARAIwBBEGsiAUQAAAAAAADwvzkDCCABKwMIRAAAAAAAAAAAow8LIAhCgICAgICAgPj/AFENASABQYCAAnFFIAFB8P8BcUHw/wFHcUUEQCAAIAChIgAgAKMPCyAARAAAAAAAADBDor1CgICAgICAgKADfSEICyAIQoCAgICAgIDzP30iCUI0h6e3IgNB0PIAKwMAoiAJQi2Ip0H/AHFBBHQiAUHo8wBqKwMAoCIEIAFB4PMAaisDACAIIAlCgICAgICAgHiDfb8gAUHggwFqKwMAoSABQeiDAWorAwChoiIAoCIFIAAgACAAoiICoiACIABBgPMAKwMAokH48gArAwCgoiAAQfDyACsDAKJB6PIAKwMAoKCiIAJB4PIAKwMAoiADQdjyACsDAKIgACAEIAWhoKCgoKAhAAsgAAsDAAELkwwCB38BfiMAQYACayIHJAAgA0GAjQVqIgQgAkECdGoiBSgCAEECdCAEIAJBC3QiCGpBiMAAaiICaiAAKAIAIgQvAQBBEHQ2AnwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AnggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AnQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AnAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AmwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AmggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AmQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AmAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AlwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AlggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AlQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AlAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AkwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AkggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AkQgBSgCAEECdCACakFAayAEQQJqIgQvAQBBEHQ2AgAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AjwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AjggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AjQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AjAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AiwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AiggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AiQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AiAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AhwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AhggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AhQgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AhAgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AgwgBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AgggBSgCAEECdCACaiAEQQJqIgQvAQBBEHQ2AgQgAiAFKAIAQQJ0aiAEQQJqIgIvAQBBEHQ2AgAgACACQQJqNgIAIAUoAgAhCUHAACECA0AgByACQQFrIgBBAnQiCmogAkECdEHAO2oiBjQC/AEgAyAIakGIzQVqIgIgACAJaiIEQUBrQf8DcUECdGo0AgB+QiCIpyAKQcA7ajQCACACIARB/wNxQQJ0ajQCAH5CIIinaiAGNAL8AyACIARBgAFqQf8DcUECdGo0AgB+QiCIp2ogBjQC/AUgAiAEQcABakH/A3FBAnRqNAIAfkIgiKdqIAY0AvwHIAIgBEGAAmpB/wNxQQJ0ajQCAH5CIIinaiAGQfwJajQCACACIARBwAJqQf8DcUECdGo0AgB+QiCIp2ogBkH8C2o0AgAgAiAEQYADakH/A3FBAnRqNAIAfkIgiKdqIAZB/A1qNAIAIAIgBEHAA2pB/wNxQQJ0ajQCAH5CIIinajYCACAAIgINAAsgBSAFKAIAQeADakH/A3E2AgBBHyECIAc0AvwBIQsDQCALIAMgAiIFQQh0aiIIQYSPBWo0AgB+QiCIpyEGQT8hAANAIAYgByAAQQJ0IgRBBGsiCWo0AgAgCSAIQYiNBWoiAmo0AgB+QiCIp2ogByAEQQhrIgZqNAIAIAIgBmo0AgB+QiCIp2ogByAEQQxrIgZqNAIAIAIgBmo0AgB+QiCIp2ogByAEQRBrIgZqNAIAIAIgBmo0AgB+QiCIp2ogByAEQRRrIgZqNAIAIAIgBmo0AgB+QiCIp2ogByAEQRhrIgRqNAIAIAIgBGo0AgB+QiCIp2ogByAAQQdrIgBBAnQiBGo0AgAgAiAEajQCAH5CIIinaiEGIAANAAsgASAFQQJ0aiAGNgIAIAVBAWshAiAFDQALIAdBgAJqJAALyAsBBn8gACABaiEFAkACQCAAKAIEIgJBAXENACACQQNxRQ0BIAAoAgAiAiABaiEBAkAgACACayIAQfyTASgCAEcEQCACQf8BTQRAIAAoAggiBCACQQN2IgJBA3RBkJQBakYaIAAoAgwiAyAERw0CQeiTAUHokwEoAgBBfiACd3E2AgAMAwsgACgCGCEGAkAgACAAKAIMIgJHBEAgACgCCCIDQfiTASgCAEkaIAMgAjYCDCACIAM2AggMAQsCQCAAQRRqIgQoAgAiAw0AIABBEGoiBCgCACIDDQBBACECDAELA0AgBCEHIAMiAkEUaiIEKAIAIgMNACACQRBqIQQgAigCECIDDQALIAdBADYCAAsgBkUNAgJAIAAoAhwiBEECdEGYlgFqIgMoAgAgAEYEQCADIAI2AgAgAg0BQeyTAUHskwEoAgBBfiAEd3E2AgAMBAsgBkEQQRQgBigCECAARhtqIAI2AgAgAkUNAwsgAiAGNgIYIAAoAhAiAwRAIAIgAzYCECADIAI2AhgLIAAoAhQiA0UNAiACIAM2AhQgAyACNgIYDAILIAUoAgQiAkEDcUEDRw0BQfCTASABNgIAIAUgAkF+cTYCBCAAIAFBAXI2AgQgBSABNgIADwsgBCADNgIMIAMgBDYCCAsCQCAFKAIEIgJBAnFFBEBBgJQBKAIAIAVGBEBBgJQBIAA2AgBB9JMBQfSTASgCACABaiIBNgIAIAAgAUEBcjYCBCAAQfyTASgCAEcNA0HwkwFBADYCAEH8kwFBADYCAA8LQfyTASgCACAFRgRAQfyTASAANgIAQfCTAUHwkwEoAgAgAWoiATYCACAAIAFBAXI2AgQgACABaiABNgIADwsgAkF4cSABaiEBAkAgAkH/AU0EQCAFKAIIIgQgAkEDdiICQQN0QZCUAWpGGiAEIAUoAgwiA0YEQEHokwFB6JMBKAIAQX4gAndxNgIADAILIAQgAzYCDCADIAQ2AggMAQsgBSgCGCEGAkAgBSAFKAIMIgJHBEAgBSgCCCIDQfiTASgCAEkaIAMgAjYCDCACIAM2AggMAQsCQCAFQRRqIgMoAgAiBA0AIAVBEGoiAygCACIEDQBBACECDAELA0AgAyEHIAQiAkEUaiIDKAIAIgQNACACQRBqIQMgAigCECIEDQALIAdBADYCAAsgBkUNAAJAIAUoAhwiBEECdEGYlgFqIgMoAgAgBUYEQCADIAI2AgAgAg0BQeyTAUHskwEoAgBBfiAEd3E2AgAMAgsgBkEQQRQgBigCECAFRhtqIAI2AgAgAkUNAQsgAiAGNgIYIAUoAhAiAwRAIAIgAzYCECADIAI2AhgLIAUoAhQiA0UNACACIAM2AhQgAyACNgIYCyAAIAFBAXI2AgQgACABaiABNgIAIABB/JMBKAIARw0BQfCTASABNgIADwsgBSACQX5xNgIEIAAgAUEBcjYCBCAAIAFqIAE2AgALIAFB/wFNBEAgAUF4cUGQlAFqIQICf0HokwEoAgAiA0EBIAFBA3Z0IgFxRQRAQeiTASABIANyNgIAIAIMAQsgAigCCAshASACIAA2AgggASAANgIMIAAgAjYCDCAAIAE2AggPC0EfIQQgAUH///8HTQRAIAFBJiABQQh2ZyICa3ZBAXEgAkEBdGtBPmohBAsgACAENgIcIABCADcCECAEQQJ0QZiWAWohBwJAAkBB7JMBKAIAIgNBASAEdCICcUUEQEHskwEgAiADcjYCACAHIAA2AgAgACAHNgIYDAELIAFBGSAEQQF2a0EAIARBH0cbdCEEIAcoAgAhAgNAIAIiAygCBEF4cSABRg0CIARBHXYhAiAEQQF0IQQgAyACQQRxaiIHQRBqKAIAIgINAAsgByAANgIQIAAgAzYCGAsgACAANgIMIAAgADYCCA8LIAMoAggiASAANgIMIAMgADYCCCAAQQA2AhggACADNgIMIAAgATYCCAsLwQEBAn8jAEEQayIBJAACfCAAvUIgiKdB/////wdxIgJB+8Ok/wNNBEBEAAAAAAAA8D8gAkGewZryA0kNARogAEQAAAAAAAAAABAKDAELIAAgAKEgAkGAgMD/B08NABoCQAJAAkACQCAAIAEQE0EDcQ4DAAECAwsgASsDACABKwMIEAoMAwsgASsDACABKwMIQQEQCZoMAgsgASsDACABKwMIEAqaDAELIAErAwAgASsDCEEBEAkLIQAgAUEQaiQAIAALzxgDFH8EfAF+IwBBMGsiCSQAAkACQAJAIAC9IhpCIIinIgNB/////wdxIgZB+tS9gARNBEAgA0H//z9xQfvDJEYNASAGQfyyi4AETQRAIBpCAFkEQCABIABEAABAVPsh+b+gIgBEMWNiGmG00L2gIhY5AwAgASAAIBahRDFjYhphtNC9oDkDCEEBIQMMBQsgASAARAAAQFT7Ifk/oCIARDFjYhphtNA9oCIWOQMAIAEgACAWoUQxY2IaYbTQPaA5AwhBfyEDDAQLIBpCAFkEQCABIABEAABAVPshCcCgIgBEMWNiGmG04L2gIhY5AwAgASAAIBahRDFjYhphtOC9oDkDCEECIQMMBAsgASAARAAAQFT7IQlAoCIARDFjYhphtOA9oCIWOQMAIAEgACAWoUQxY2IaYbTgPaA5AwhBfiEDDAMLIAZBu4zxgARNBEAgBkG8+9eABE0EQCAGQfyyy4AERg0CIBpCAFkEQCABIABEAAAwf3zZEsCgIgBEypSTp5EO6b2gIhY5AwAgASAAIBahRMqUk6eRDum9oDkDCEEDIQMMBQsgASAARAAAMH982RJAoCIARMqUk6eRDuk9oCIWOQMAIAEgACAWoUTKlJOnkQ7pPaA5AwhBfSEDDAQLIAZB+8PkgARGDQEgGkIAWQRAIAEgAEQAAEBU+yEZwKAiAEQxY2IaYbTwvaAiFjkDACABIAAgFqFEMWNiGmG08L2gOQMIQQQhAwwECyABIABEAABAVPshGUCgIgBEMWNiGmG08D2gIhY5AwAgASAAIBahRDFjYhphtPA9oDkDCEF8IQMMAwsgBkH6w+SJBEsNAQsgACAARIPIyW0wX+Q/okQAAAAAAAA4Q6BEAAAAAAAAOMOgIhdEAABAVPsh+b+ioCIWIBdEMWNiGmG00D2iIhihIhlEGC1EVPsh6b9jIQICfyAXmUQAAAAAAADgQWMEQCAXqgwBC0GAgICAeAshAwJAIAIEQCADQQFrIQMgF0QAAAAAAADwv6AiF0QxY2IaYbTQPaIhGCAAIBdEAABAVPsh+b+ioCEWDAELIBlEGC1EVPsh6T9kRQ0AIANBAWohAyAXRAAAAAAAAPA/oCIXRDFjYhphtNA9oiEYIAAgF0QAAEBU+yH5v6KgIRYLIAEgFiAYoSIAOQMAAkAgBkEUdiICIAC9QjSIp0H/D3FrQRFIDQAgASAWIBdEAABgGmG00D2iIgChIhkgF0RzcAMuihmjO6IgFiAZoSAAoaEiGKEiADkDACACIAC9QjSIp0H/D3FrQTJIBEAgGSEWDAELIAEgGSAXRAAAAC6KGaM7oiIAoSIWIBdEwUkgJZqDezmiIBkgFqEgAKGhIhihIgA5AwALIAEgFiAAoSAYoTkDCAwBCyAGQYCAwP8HTwRAIAEgACAAoSIAOQMAIAEgADkDCEEAIQMMAQsgGkL/////////B4NCgICAgICAgLDBAIS/IQBBACEDQQEhAgNAIAlBEGogA0EDdGoCfyAAmUQAAAAAAADgQWMEQCAAqgwBC0GAgICAeAu3IhY5AwAgACAWoUQAAAAAAABwQaIhAEEBIQMgAiEEQQAhAiAEDQALIAkgADkDIEECIQMDQCADIgJBAWshAyAJQRBqIAJBA3RqKwMARAAAAAAAAAAAYQ0ACyAJQRBqIQ5BACEEIwBBsARrIgUkACAGQRR2QZYIayIDQQNrQRhtIgZBACAGQQBKGyIPQWhsIANqIQZBxMsAKAIAIgggAkEBaiIKQQFrIgdqQQBOBEAgCCAKaiEDIA8gB2shAgNAIAVBwAJqIARBA3RqIAJBAEgEfEQAAAAAAAAAAAUgAkECdEHQywBqKAIAtws5AwAgAkEBaiECIARBAWoiBCADRw0ACwsgBkEYayELQQAhAyAIQQAgCEEAShshBCAKQQBMIQwDQAJAIAwEQEQAAAAAAAAAACEADAELIAMgB2ohDUEAIQJEAAAAAAAAAAAhAANAIA4gAkEDdGorAwAgBUHAAmogDSACa0EDdGorAwCiIACgIQAgAkEBaiICIApHDQALCyAFIANBA3RqIAA5AwAgAyAERiECIANBAWohAyACRQ0AC0EvIAZrIRJBMCAGayEQIAZBGWshEyAIIQMCQANAIAUgA0EDdGorAwAhAEEAIQIgAyEEIANBAEwiB0UEQANAIAVB4ANqIAJBAnRqAn8CfyAARAAAAAAAAHA+oiIWmUQAAAAAAADgQWMEQCAWqgwBC0GAgICAeAu3IhZEAAAAAAAAcMGiIACgIgCZRAAAAAAAAOBBYwRAIACqDAELQYCAgIB4CzYCACAFIARBAWsiBEEDdGorAwAgFqAhACACQQFqIgIgA0cNAAsLAn8gACALEAwiACAARAAAAAAAAMA/opxEAAAAAAAAIMCioCIAmUQAAAAAAADgQWMEQCAAqgwBC0GAgICAeAshDCAAIAy3oSEAAkACQAJAAn8gC0EATCIURQRAIANBAnQgBWoiAiACKALcAyICIAIgEHUiAiAQdGsiBDYC3AMgAiAMaiEMIAQgEnUMAQsgCw0BIANBAnQgBWooAtwDQRd1CyINQQBMDQIMAQtBAiENIABEAAAAAAAA4D9mDQBBACENDAELQQAhAkEAIQQgB0UEQANAIAVB4ANqIAJBAnRqIhUoAgAhEUH///8HIQcCfwJAIAQNAEGAgIAIIQcgEQ0AQQAMAQsgFSAHIBFrNgIAQQELIQQgAkEBaiICIANHDQALCwJAIBQNAEH///8DIQICQAJAIBMOAgEAAgtB////ASECCyADQQJ0IAVqIgcgBygC3AMgAnE2AtwDCyAMQQFqIQwgDUECRw0ARAAAAAAAAPA/IAChIQBBAiENIARFDQAgAEQAAAAAAADwPyALEAyhIQALIABEAAAAAAAAAABhBEBBACEEIAMhAgJAIAMgCEwNAANAIAVB4ANqIAJBAWsiAkECdGooAgAgBHIhBCACIAhKDQALIARFDQAgCyEGA0AgBkEYayEGIAVB4ANqIANBAWsiA0ECdGooAgBFDQALDAMLQQEhAgNAIAIiBEEBaiECIAVB4ANqIAggBGtBAnRqKAIARQ0ACyADIARqIQQDQCAFQcACaiADIApqIgdBA3RqIANBAWoiAyAPakECdEHQywBqKAIAtzkDAEEAIQJEAAAAAAAAAAAhACAKQQBKBEADQCAOIAJBA3RqKwMAIAVBwAJqIAcgAmtBA3RqKwMAoiAAoCEAIAJBAWoiAiAKRw0ACwsgBSADQQN0aiAAOQMAIAMgBEgNAAsgBCEDDAELCwJAIABBGCAGaxAMIgBEAAAAAAAAcEFmBEAgBUHgA2ogA0ECdGoCfwJ/IABEAAAAAAAAcD6iIhaZRAAAAAAAAOBBYwRAIBaqDAELQYCAgIB4CyICt0QAAAAAAABwwaIgAKAiAJlEAAAAAAAA4EFjBEAgAKoMAQtBgICAgHgLNgIAIANBAWohAwwBCwJ/IACZRAAAAAAAAOBBYwRAIACqDAELQYCAgIB4CyECIAshBgsgBUHgA2ogA0ECdGogAjYCAAtEAAAAAAAA8D8gBhAMIQACQCADQQBIDQAgAyECA0AgBSACIgRBA3RqIAAgBUHgA2ogAkECdGooAgC3ojkDACACQQFrIQIgAEQAAAAAAABwPqIhACAEDQALQQAhByADQQBIDQAgCEEAIAhBAEobIQYgAyEEA0AgBiAHIAYgB0kbIQsgAyAEayEIQQAhAkQAAAAAAAAAACEAA0AgAkEDdEGg4QBqKwMAIAUgAiAEakEDdGorAwCiIACgIQAgAiALRyEKIAJBAWohAiAKDQALIAVBoAFqIAhBA3RqIAA5AwAgBEEBayEEIAMgB0chAiAHQQFqIQcgAg0ACwtEAAAAAAAAAAAhACADQQBOBEAgAyECA0AgAiIEQQFrIQIgACAFQaABaiAEQQN0aisDAKAhACAEDQALCyAJIACaIAAgDRs5AwAgBSsDoAEgAKEhAEEBIQIgA0EASgRAA0AgACAFQaABaiACQQN0aisDAKAhACACIANHIQQgAkEBaiECIAQNAAsLIAkgAJogACANGzkDCCAFQbAEaiQAIAxBB3EhAyAJKwMAIQAgGkIAUwRAIAEgAJo5AwAgASAJKwMImjkDCEEAIANrIQMMAQsgASAAOQMAIAEgCSsDCDkDCAsgCUEwaiQAIAMLGAAgASAAKAJoNgIAIABBADYCaCAAKAJgC7xUAyF/JH4CfCAAIAEoAgA2AogRIAAoAgBBAkYEQCAAQYwRaiABKAIENgIACwJAIAArAzAiSEQAAAAAAAAAAGEEQCAAKAIgIQEMAQsgACAAKwM4IkkgSEQAAAAAAADwv6BlIgE2AiAgACBJRAAAAAAAAPA/RAAAAAAAAAAAIAEbIEihoDkDOAsgACAAQUBrKAIAIAFqQQN0IgE2AiQgACABIAAoAowEayAAKAIQbTYCkAQCQCAAIgEoAgAiBUUNACAFQQFrIQAgASgCECIEQQBKBEAgAUHg+ARqIQcDQCAAIQMgBEEASgRAIAEgA0ECdGpBiBFqIQpBACEFA0AgBUEBaiEGQQAhAANAIAogASADQYA2bGoiCSAGQYASbCIQakGw2QBqIgQgAEEHdCIIaiADIAEQECAKIAQgCEGAAXJqIgQgAyABEBAgBEEAIAQoAgRrNgIEIARBACAEKAIMazYCDCAEQQAgBCgCFGs2AhQgBEEAIAQoAhxrNgIcIARBACAEKAIkazYCJCAEQQAgBCgCLGs2AiwgBEEAIAQoAjRrNgI0IARBACAEKAI8azYCPCAEQQAgBCgCRGs2AkQgBEEAIAQoAkxrNgJMIARBACAEKAJUazYCVCAEQQAgBCgCXGs2AlwgBEEAIAQoAmRrNgJkIARBACAEKAJsazYCbCAEQQAgBCgCdGs2AnQgBEEAIAQoAnxrNgJ8IABBEEkhBCAAQQJqIQAgBA0ACyAFQYASbCINIAEgA0GAJGxqakGwxQFqIQxBACEFA0AgBUECdCIEIAlBsNkAaiIIIA1qaiIANAIAISQgCCAQaiAEaiIENAIAISUgADQCgAEhJiAANAKAAiEnIAA0AoADISggADQCgAQhKSAANAKABSEqIAA0AoAGISsgADQCgAchLCAAQYAIajQCACEtIABBgAlqNAIAIS4gAEGACmo0AgAhLyAAQYALajQCACEwIABBgAxqNAIAITEgAEGADWo0AgAhMiAAQYAOajQCACEzIABBgA9qNAIAITQgAEGAEGo0AgAhNSAAQYARajQCACE2IAQ0AoABITcgBDQCgAIhOCAENAKAAyE5IAQ0AoAEITogBDQCgAUhOyAENAKABiE8IAQ0AoAHIT0gBEGACGo0AgAhPiAEQYAJajQCACE/IARBgApqNAIAIUAgBEGAC2o0AgAhQSAEQYAMajQCACFCIARBgA1qNAIAIUMgBEGADmo0AgAhRCAEQYAPajQCACFFIARBgBBqNAIAIUYgBEGAEWo0AgAhR0ERIQQDQCAMIAVByABsaiIIIAQiAEECdGogByAAQZABbGoiBDQCjAEgR35CIIinIAQ0AogBIEZ+QiCIp2ogBDQChAEgRX5CIIinaiAENAKAASBEfkIgiKdqIAQ0AnwgQ35CIIinaiAENAJ4IEJ+QiCIp2ogBDQCdCBBfkIgiKdqIAQ0AnAgQH5CIIinaiAENAJsID9+QiCIp2ogBDQCaCA+fkIgiKdqIAQ0AmQgPX5CIIinaiAENAJgIDx+QiCIp2ogBDQCXCA7fkIgiKdqIAQ0AlggOn5CIIinaiAENAJUIDl+QiCIp2ogBDQCUCA4fkIgiKdqIAQ0AkwgN35CIIinaiAENAJIICV+QiCIp2ogBDQCRCA2fkIgiKdqIAQ0AkAgNX5CIIinaiAENAI8IDR+QiCIp2ogBDQCOCAzfkIgiKdqIAQ0AjQgMn5CIIinaiAENAIwIDF+QiCIp2ogBDQCLCAwfkIgiKdqIAQ0AiggL35CIIinaiAENAIkIC5+QiCIp2ogBDQCICAtfkIgiKdqIAQ0AhwgLH5CIIinaiAENAIYICt+QiCIp2ogBDQCFCAqfkIgiKdqIAQ0AhAgKX5CIIinaiAENAIMICh+QiCIp2ogBDQCCCAnfkIgiKdqIAQ0AgQgJn5CIIinaiAENAIAICR+QiCIp2o2AgAgAEEBayEEIAANAAsgBQRAIAhByABrIgAgADQCRCIkQoOoie4GfiAINAIAIiVCy4GU8fv/////AH58Qh+IPgJEIAggADQCQCImQpDthuMDfiAINAIEIidC+Nfzhgd+fEIfiD4CBCAIICRCtf7rjgR+ICVCg6iJ7gZ+fEIfiD4CACAAICZC+Nfzhgd+ICdC8JL5nPz/////AH58Qh+IPgJAIAggADQCPCIkQp6B88ACfiAINAIIIiVC+ty1zAd+fEIfiD4CCCAAICRC+ty1zAd+ICVC4v6Mv/3/////AH58Qh+IPgI8IAAgADQCOCIkQqeB9e4HfiAINAIMIiVC+6Lcxf7/////AH58Qh+IPgI4IAggJEKF3aO6AX4gJUKngfXuB358Qh+IPgIMIAAgADQCNCIkQrbBtPsHfiAINAIQIiVCrfyTn///////AH58Qh+IPgI0IAggJELTg+zgAH4gJUK2wbT7B358Qh+IPgIQIAAgADQCMCIkQr/8kf8HfiAINAIUIiVCyceG1v//////AH58Qh+IPgIwIAggJEK3uPkpfiAlQr/8kf8HfnxCH4g+AhQgACAANAIsIiRC4uTy/wd+IAg0AhgiJULH+7rx//////8AfnxCH4g+AiwgCCAkQrmExQ5+ICVC4uTy/wd+fEIfiD4CGCAIIAA0AigiJEKj++QDfiAINAIcIiVCk43//wd+fEIfiD4CHCAAICRCk43//wd+ICVC3YSb/P//////AH58Qh+IPgIoCyAFQQFqIgVBIEcNAAsgASgCECIEIAYiBUoNAAsLIAEgA0GANmxqQbDZAGoiACAAIARBgBJsakGAEhAEIANBAWshACADDQALDAELIAVBA3EiAwRAA0AgASAAQYA2bGpBsNkAaiIIIAggBEGAEmxqQYASEAQgAEEBayEAIAZBAWoiBiADRw0ACwsgBUEESQ0AA0AgASAAQYA2bGoiBUGw2QBqIgYgBiAEQYASbCIDakGAEhAEIAVBsCNqIgYgAyAGakGAEhAEIAVB0BJrIgYgAyAGakGAEhAEIAVB0MgAayIFIAMgBWpBgBIQBCAAQQNGIQUgAEEEayEAIAVFDQALCyMAQaAFayIVJAACQCABIgMoAgAiEEUNACADKAIQIgFBAEwNACADQbgJaiEZIBBB3ABsQYwBaiEaA0AgEEEBayEQIAFBAEoEQCAaIBdBpH9saiEdIBBBqAFsIRggAyAQQQR0aiEMQQAhDQNAIANBADYCvLECIAMgAyAQQYAkbGogDUGAEmxqIg9BsMUBaiIFNgK4jQIgAyAdIA1BuAFsIghqaiEJQb8EIQADQCADIAAiAUECdCIAaiIGQbyfAmogACAFaigCACIEIARBH3UiAHMgAGsiADYCACAGQbyNAmogBKwiJCAkfkKAgICABHxCH4g+AgAgAygCvLECIgYgAEgEQCADIAA2AryxAiAAIQYLIAFBAWshACABDQALIAMgCGogEEHcAGxqIhFBFTYC1AEgFSANQdACbCISIBhqakGoARAHAkAgAygCCEEDRw0AIAMoAkghBCADIA1BAnRqIghBmLQCaiAGNgIAQcAEIQFBACEFA0AgAUECdCEAIANBvI0CaiIGIAFBBGsiAUECdGooAgBBCnUgACAGaiIAQQxrKAIAQQp1IABBBGsoAgBBCnUgBWogAEEIaygCAEEKdWpqaiEFIAENAAsgBEHcAGxBgDVqIQsgCEHAsQJqAn9BACAFRQ0AGiAFt0RoXxwAAACgPqIQDkScRK3+Qi7mP6MiSJlEAAAAAAAA4EFjBEAgSKoMAQtBgICAgHgLNgIAIAsoAlQhBUEUIQADQEEAIQoCf0EAIAUgCyAAIghBAnQiE2ooAgAiBEwNABogBSAEayIHQQNxIQ5BACEGQQAhACAFIAQiAUF/c2pBA08EQCAHQXxxIRRBACEFA0AgAyABQQJ0aiIHQciNAmooAgBBCnUgB0G8jQJqKAIAQQp1IABqIAdBwI0CaigCAEEKdWogB0HEjQJqKAIAQQp1amohACABQQRqIQEgBUEEaiIFIBRHDQALCyAOBEADQCADIAFBAnRqQbyNAmooAgBBCnUgAGohACABQQFqIQEgBkEBaiIGIA5HDQALC0EAIABFDQAaIAC3RGhfHAAAAKA+ohAORJxErf5CLuY/oyJImUQAAAAAAADgQWMEQCBIqgwBC0GAgICAeAshACADIA1B1ABsaiATaiIBQcixAmogADYCAAJAIBIgFWogGGogCEEDdGorAwAiSEQAAAAAAAAAAGENACBIEA5EnESt/kIu5j+jIkiZRAAAAAAAAOBBYwRAIEiqIQoMAQtBgICAgHghCgsgAUHwsgJqIAo2AgAgCEEBayEAIAQhBSAIDQALIA1BAUcNACADKAKYtAJBAEdBA0ECIAMoApy0AhtqIAMoAsCxAiADKALEsQJrIgAgAEEfdSIAcyAAa0EKSWogAygC0LECIAMoAqSyAmsiACAAQR91IgBzIABrIgAgAygC1LECIAMoAqiyAmsiASABQR91IgFzIAFrIgEgAygC5LECIAMoAriyAmsiBCAEQR91IgRzIARrIgQgAygClLICIAMoAuiyAmsiBSAFQR91IgVzIAVrIAMoApiyAiADKALssgJrIgUgBUEfdSIFcyAFa2ogAygCkLICIAMoAuSyAmsiBSAFQR91IgVzIAVraiADKAKMsgIgAygC4LICayIFIAVBH3UiBXMgBWtqIAMoAoiyAiADKALcsgJrIgUgBUEfdSIFcyAFa2ogAygChLICIAMoAtiyAiIFayIGIAZBH3UiBnMgBmtqIAMoAoCyAiADKALUsgJrIgYgBkEfdSIGcyAGa2ogAygC/LECIAMoAtCyAmsiBiAGQR91IgZzIAZraiADKAL4sQIiBiADKALMsgJrIgggCEEfdSIIcyAIa2ogAygC9LECIAMoAsiyAiIIayIKIApBH3UiCnMgCmtqIAMoAvCxAiADKALEsgIiCmsiByAHQR91IgdzIAdraiADKALssQIgAygCwLICayIHIAdBH3UiB3MgB2tqIAMoAuixAiIHIAMoAryyAmsiCyALQR91IgtzIAtramogAygC4LECIAMoArSyAiILayIOIA5BH3UiDnMgDmtqIAMoAtyxAiADKAKwsgIiDmsiEiASQR91IhJzIBJraiADKALYsQIiEiADKAKssgJrIhMgE0EfdSITcyATa2pqaiADKALMsQIgAygCoLICIhNrIhQgFEEfdSIUcyAUa2ogAygCyLECIhQgAygCnLICayIWIBZBH3UiFnMgFmtqQeQASWpBBkcEQCAMQgA3AnwgDEIANwKEAQwBCyAMQQA2AnwgDCAAIAFqIAMoAtyxAiAOayIAIABBH3UiAHMgAGtqIBIgAygCrLICayIAIABBH3UiAHMgAGtqIAMoAsyxAiATayIAIABBH3UiAHMgAGtqIBQgAygCnLICayIAIABBH3UiAHMgAGtqQQpJIAMoAoCzAiADKALUswJrIgAgAEEfdSIAcyAAayADKAKEswIgAygC2LMCayIAIABBH3UiAHMgAGtqIAMoAvyyAiADKALQswJrIgAgAEEfdSIAcyAAa2ogAygC+LICIAMoAsyzAmsiACAAQR91IgBzIABraiADKAL0sgIgAygCyLMCayIAIABBH3UiAHMgAGtqIAMoAvCyAiADKALEswJrIgAgAEEfdSIAcyAAa2pBCklxNgJ8IAxBADYCgAEgDCADKALwsQIgCmsiACAAQR91IgBzIABrIARqIAMoAuyxAiADKALAsgJrIgAgAEEfdSIAcyAAa2ogByADKAK8sgJrIgAgAEEfdSIAcyAAa2ogAygC4LECIAtrIgAgAEEfdSIAcyAAa2pBCkkgAygClLMCIAMoAuizAmsiACAAQR91IgBzIABrIAMoApizAiADKALsswJrIgAgAEEfdSIAcyAAa2ogAygCkLMCIAMoAuSzAmsiACAAQR91IgBzIABraiADKAKMswIgAygC4LMCayIAIABBH3UiAHMgAGtqIAMoAoizAiADKALcswJrIgAgAEEfdSIAcyAAa2pBCklxNgKAASAMQQA2AoQBIAwgAygCgLICIAMoAtSyAmsiACAAQR91IgBzIABrIAMoAoSyAiAFayIAIABBH3UiAHMgAGtqIAMoAvyxAiADKALQsgJrIgAgAEEfdSIAcyAAa2ogBiADKALMsgJrIgAgAEEfdSIAcyAAa2ogAygC9LECIAhrIgAgAEEfdSIAcyAAa2pBCkkgAygCqLMCIAMoAvyzAmsiACAAQR91IgBzIABrIAMoAqyzAiADKAKAtAJrIgAgAEEfdSIAcyAAa2ogAygCpLMCIAMoAvizAmsiACAAQR91IgBzIABraiADKAKgswIgAygC9LMCayIAIABBH3UiAHMgAGtqIAMoApyzAiADKALwswJrIgAgAEEfdSIAcyAAa2pBCklxNgKEASAMQQA2AogBIAwgAygClLICIAMoAuiyAmsiACAAQR91IgBzIABrIAMoApiyAiADKALssgJrIgAgAEEfdSIAcyAAa2ogAygCkLICIAMoAuSyAmsiACAAQR91IgBzIABraiADKAKMsgIgAygC4LICayIAIABBH3UiAHMgAGtqIAMoAoiyAiADKALcsgJrIgAgAEEfdSIAcyAAa2pBCkkgAygCvLMCIAMoApC0AmsiACAAQR91IgBzIABrIAMoAsCzAiADKAKUtAJrIgAgAEEfdSIAcyAAa2ogAygCuLMCIAMoAoy0AmsiACAAQR91IgBzIABraiADKAK0swIgAygCiLQCayIAIABBH3UiAHMgAGtqIAMoArCzAiADKAKEtAJrIgAgAEEfdSIAcyAAa2pBCklxNgKIAQtB/x8gAygCkAQgAygCAG0iBCAEQf8fThshACADKAK0jQIiBQRAQQAhAUH/HyAAISMgAygCsI0CIgYgBUEDdEF2bWoiBSEiAn8gDCANQQN0akGQEWorAwBEzczMzMzMCECiIAS3oSJImUQAAAAAAADgQWMEQCBIqgwBC0GAgICAeAsiBEHlAE4EQCAGQQZsQQptIgEgBCABIARIGyEBCyAjICIgASABIAVIG2oiACAAQf8fThshAAsgGSANQbABbGogEEHYAGxqQdgAEAcgAyANQbgCbGogEEGcAWxqQZgMakGcARAHIAlCADcCCCAJQgA3AgAgEUIANwKsASARQQA2AqQBIBFCADcCnAEgEUIANwK0ASARQgA3ArwBIBFCADcCxAEgEUIANwLMASADKAK8sQIEQCAAIQogD0GwEWohBiADIA1BuAFsakGcAWoiFCAQQdwAbGohCUH8LygCACEWQeQvKAIAIRtB+AAhEkGIfyEPIANBuI0CaiEeA0BBoI0GIQgCQCADIBJBAXYiEyAPaiIfQf8AaiIAQQJ0akGgvAJqNAIAIiQgAzQCvLECfkKAgICACHxCIIinQZSKCkoNACAeIABBA3RqQegmaiEHIAMoAriNAiELQQAhAEEAIQUDQAJ/IAsgAEECdCIEaigCACIBIAFBH3UiAXMgAWutICR+QoCAgIAIfEIgiKciAUGPzgBMBEAgAyABQQJ0akGgwAJqKAIADAELIAcrAwAgAyAEakG8nwJqKAIAt6JEaF8cAAAAAD6iIkggSJ+inyJImUQAAAAAAADgQWMEQCBIqgwBC0GAgICAeAshASAEIAZqIAE2AgAgBSABIAEgBUgbIQUgAEEBaiIAQcAERw0AC0HABCEAIAVBgMAASg0AAkACQAJAAkADQCAARQRAIAlBADYCCCAAIQQMAgsCQCAAQQJ0IAZqIgFBBGsoAgAEQCAAIQQMAQsgBiAAQQJrIgRBAnRqKAIABEAgACEEDAELIAFBDGsoAgANACAGIABBBGsiAEECdGooAgBFDQELC0EAIQsgCUEANgIIIARBA0wNAAJAAkADQCAEQQJ0IAZqIgBBBGsoAgBBAUoNASAAQQhrKAIAQQFKDQEgAEEMaygCAEEBSg0BIAYgBEEEayIAQQJ0aigCAEECTg0BIAkgC0EBaiILNgIIIARBB0shASAAIQQgAQ0ACyAJIARBAXU2AgQMAQsgCSAEQQF1NgIEIAtFDQILQQAhAUEAIQcgBCEFQQAhCANAIAFBAkEBIAYgBUECdCIcaiIAKAIAIg4bIA5BAEcgBiAcQQRyaigCACIcGyAAKAIIIiBBAEdqIAAoAgwiAEEAR2oiIWogFiAcQQF0IA5qICBBAnRqIABBA3RqIgBqLQAAaiEBIAcgACAbai0AAGogIWohByAFQQRqIQUgCEEBaiIIIAtHDQALQQAhBSABIAdMDQIMAwsgCSAEQQF1NgIEC0EAIQELQQEhBSABIQcLIAkgBTYCMAJAIARFBEAgCUIANwIgIAkoAjwhAQwBCyADKAJIQdwAbEGANWohCEEAIQADQCAAIgVBAWohACAIIAVBAnRqKAIAIARIDQALQQAhAQJAIAVBA3QiC0GAMGooAgAiAEUNAANAIAQgAEECdCAIaigCBE4EQCAAIQEMAgsgAEEBayIADQALCyAJIAE2AiAgCSABQQJ0IAhqQQRqIggoAgAiATYCPCALQYQwaigCACEAAkAgBUEFSQ0AA0AgAEECdCAIaigCBCAETA0BIABBAWsiAA0AC0EAIQALIAkgBDYCRCAJIAA2AiQgCSAAQQJ0IAhqKAIENgJAC0EAIQggCUEANgIcIAlCADcCFEEAIQsgAQRAIAkgBkEAIAEQBiILNgIUCyABIAkoAkAiDkkEQCAJIAYgASAOEAYiCDYCGAtBACEFQQAhACAEIA5LBEAgCSAGIA4gBBAGIgA2AhwLIAsEQCAGQQAgASALEAMhBQsgCARAIAYgASAOIAgQAyAFaiEFCyAABH8gBiAOIAkoAkQgABADIAVqBSAFCyAHaiEICyAPIB8gCCAKSCIAGyEPIBMgEiATayAAGyISQQFKDQALIAkgDzYCSCAUIBBB3ABsaigCEEECdCIBQZAyaigCACEAIAFB0DFqKAIAIQECQAJAIA1FBEAgAEEFbCIAIAFBC2xqIQQMAQtBACABQQVsIAMgEEEEdGoiBSgCgAEbQQAgAUEGbCAFKAJ8G2pBACAAQQVsIgAgBSgChAEbaiEEIAUoAogBDQELIAAgBGohBAsgCSAENgI0IAogBGsiDkEASARAIAkgCSgCSEEBazYCSAsgBiEKQfwvKAIAIQ9B5C8oAgAhEiADQbiNAmohEwNAIAkgCSgCSCIAQQFqNgJIQYCAASEGIAMgAEGAAWoiAEECdGpBoLwCajQCACIkIAM0AryxAn5CgICAgAh8QiCIp0GUigpMBEAgEyAAQQN0akHoJmohBSADKAK4jQIhCEEAIQBBACEGA0ACfyAIIABBAnQiBGooAgAiASABQR91IgFzIAFrrSAkfkKAgICACHxCIIinIgFBj84ATARAIAMgAUECdGpBoMACaigCAAwBCyAFKwMAIAMgBGpBvJ8CaigCALeiRGhfHAAAAAA+oiJIIEifop8iSJlEAAAAAAAA4EFjBEAgSKoMAQtBgICAgHgLIQEgBCAKaiABNgIAIAYgASABIAZIGyEGIABBAWoiAEHABEcNAAsLQcAEIQAgBkGAwABKDQACQAJAAkACQANAIABFBEAgCUEANgIIIAAhAQwCCwJAIABBAnQgCmoiBEEEaygCAARAIAAhAQwBCyAKIABBAmsiAUECdGooAgAEQCAAIQEMAQsgBEEMaygCAA0AIAogAEEEayIAQQJ0aigCAEUNAQsLQQAhBCAJQQA2AgggAUEDTA0AAkACQANAIAFBAnQgCmoiAEEEaygCAEEBSg0BIABBCGsoAgBBAUoNASAAQQxrKAIAQQFKDQEgCiABQQRrIgBBAnRqKAIAQQJODQEgCSAEQQFqIgQ2AgggAUEHSyEFIAAhASAFDQALIAkgAUEBdTYCBAwBCyAJIAFBAXU2AgQgBEUNAgtBACEFQQAhCCABIQZBACEAA0AgBUECQQEgCiAGQQJ0IhRqIgcoAgAiCxsgC0EARyAKIBRBBHJqKAIAIhQbIAcoAggiFkEAR2ogBygCDCIHQQBHaiIbaiAPIBRBAXQgC2ogFkECdGogB0EDdGoiB2otAABqIQUgCCAHIBJqLQAAaiAbaiEIIAZBBGohBiAAQQFqIgAgBEcNAAtBACEGIAUgCEwNAgwDCyAJIAFBAXU2AgQLQQAhBQtBASEGIAUhCAsgCSAGNgIwAkAgAUUEQCAJQgA3AiAgCSgCPCEFDAELIAMoAkhB3ABsQYA1aiEGQQAhAANAIAAiBEEBaiEAIAYgBEECdGooAgAgAUgNAAtBACEFAkAgBEEDdCIHQYAwaigCACIARQ0AA0AgASAAQQJ0IAZqKAIETgRAIAAhBQwCCyAAQQFrIgANAAsLIAkgBTYCICAJIAVBAnQgBmpBBGoiBigCACIFNgI8IAdBhDBqKAIAIQACQCAEQQVJDQADQCAAQQJ0IAZqKAIEIAFMDQEgAEEBayIADQALQQAhAAsgCSABNgJEIAkgADYCJCAJIABBAnQgBmooAgQ2AkALQQAhACAJQQA2AhwgCUIANwIUQQAhByAFBEAgCSAKQQAgBRAGIgc2AhQLIAUgCSgCQCILSQRAIAkgCiAFIAsQBiIANgIYC0EAIQZBACEEIAEgC0sEQCAJIAogCyABEAYiBDYCHAsgBwRAIApBACAFIAcQAyEGCyAABEAgCiAFIAsgABADIAZqIQYLIAQEfyAKIAsgCSgCRCAEEAMgBmoFIAYLIAhqIgAgDkoNAAsgCSAJKAI0IABqIgA2AgAgESAANgKcAQsgAyADKAKwjQIgAygCkAQgAygCAG0gESgCnAFrajYCsI0CIBEgESgC5AFB0gFqNgKoASANQQFqIg0gAygCECIBSA0ACwsgF0EBaiEXIBANAAsLAkAgAygCACIEQQJHDQAgAy0AkARBAXFFDQAgAyADKAKwjQJBAWo2ArCNAgsgAyADKAKwjQIiACADKAK0jQIiASAAIAFIGyIFIAVBCG8iBWs2ArCNAgJAAkAgBSAAIAFrIgBBACAAQQBKG2oiAARAIAMoApwBIABqIgFB/x9JDQECQCADKAIQIgZBAEwNACAEQQBMDQBBACEFA0AgAyAFQbgBbGpBnAFqIQhBACEBA0ACQCAARQRAQQAhAAwBCyAIIAFB3ABsaiIKQf8fIAooAgAiCmsiByAAIAAgB0obIgcgCmo2AgAgACAHayEAIAFBAWoiASAERw0BCwsgBUEBaiIFIAZHDQALCyADIAA2AngLDAELIAMgATYCnAELIBVBoAVqJABBACEEIwBBoANrIggkAAJAIAMoAgAiBUEATA0AIAMoAhAiAEEATA0AA0BBACEGIABBAEoEQANAIAMgBEGAJGxqIAZBgBJsaiIAQbDFAWohASAAQbARaiEFQQAhAANAAkAgASAAQQJ0IgpqKAIAQQBODQAgBSAKaiIKKAIAIgdBAEwNACAKQQAgB2s2AgALAkAgASAAQQFyQQJ0IgpqKAIAQQBODQAgBSAKaiIKKAIAIgdBAEwNACAKQQAgB2s2AgALIABBAmoiAEHABEcNAAsgBkEBaiIGIAMoAhAiAEgNAAsgAygCACEFCyAEQQFqIgQgBUgNAAsLIAhBCGogA0H0AGoiBkGYAxAEIANB4ABqIgBB/w9BCxACIAAgAygCCEECEAIgACADKAIMQQIQAiAAIAMoAkxFQQEQAiAAIAMoAkRBBBACIAAgAygCSEEDb0ECEAIgACADKAIgQQEQAiAAIAMoAlBBARACIAAgAygCFEECEAIgACADKAJUQQIQAiAAIAMoAlhBARACIAAgAygCXEEBEAIgACADKAIcQQIQAgJAIAMoAghBA0YEQCAAQQBBCRACIAgoAgghASADKAIAQQJGBEAgACABQQMQAgwCCyAAIAFBBRACDAELIABBAEEIEAIgCCgCCCEBIAMoAgBBAkYEQCAAIAFBAhACDAELIAAgAUEBEAILAkAgAygCCEEDRw0AIAMoAgBBAEwNAEEAIQQDQCAAIAhBCGogBEEEdGoiASgCCEEBEAIgACABKAIMQQEQAiAAIAEoAhBBARACIAAgASgCFEEBEAIgBEEBaiIEIAMoAgBIDQALC0EAIQECQCADKAIQIgRBAEwNACADKAIAIgVBAEwNAANAIAVBAEoEQCABQbgBbCAIakEwaiEKQQAhBANAIAAgCiAEQdwAbGoiBSgCAEEMEAIgACAFKAIEQQkQAiAAIAUoAgxBCBACIAAgBSgCEEEEQQkgAygCCEEDRhsQAiAAQQBBARACIAAgBSgCFEEFEAIgACAFKAIYQQUQAiAAIAUoAhxBBRACIAAgBSgCIEEEEAIgACAFKAIkQQMQAiADKAIIQQNGBEAgACAFKAIoQQEQAgsgACAFKAIsQQEQAiAAIAUoAjBBARACIARBAWoiBCADKAIAIgVIDQALIAMoAhAhBAsgAUEBaiIBIARIDQALIAhBCGogBkGYAxAEIARBAEwNACAFQQBMDQAgA0G4CWohCUEAIQEDQCAFQQBKBEAgAUG4AWwgCGpBMGohGEEAIQQDQCADIARBgCRsaiABQYASbGohECAYIARB3ABsaiIKKAIQQQJ0IgVBkDJqKAIAIQYgBUHQMWooAgAhBQJAAkACQAJAAkACQAJAIAEEQCAEQQR0IAhqKAIQDQELIAAgCSABQbABbGogBEHYAGxqIgcoAgAgBRACIAAgBygCBCAFEAIgACAHKAIIIAUQAiAAIAcoAgwgBRACIAAgBygCECAFEAIgACAHKAIUIAUQAiABRQ0BCyAEQQR0IAhqKAIUDQELIAAgCSABQbABbGogBEHYAGxqIgcoAhggBRACIAAgBygCHCAFEAIgACAHKAIgIAUQAiAAIAcoAiQgBRACIAAgBygCKCAFEAIgAUUNAQsgBEEEdCAIaigCGA0BCyAAIAkgAUGwAWxqIARB2ABsaiIFKAIsIAYQAiAAIAUoAjAgBhACIAAgBSgCNCAGEAIgACAFKAI4IAYQAiAAIAUoAjwgBhACIAFFDQELIARBBHQgCGooAhwNAQsgACAJIAFBsAFsaiAEQdgAbGoiBSgCQCAGEAIgACAFKAJEIAYQAiAAIAUoAkggBhACIAAgBSgCTCAGEAIgACAFKAJQIAYQAgsgEEGwEWohECADKAJIIQUgACgCCEEDdCAAKAIQa0EgaiETIAooAgRBAXQiBkEASgRAIAVB3ABsQYA1aiIFIAooAiAiB0ECdGooAgQhGSAHIAooAiRqQQJ0IAVqKAIIIRpBACEFA0ACQCAKIAUgGU4gBSAaTmpBAnRqKAIUIg5FDQAgECAFQQJ0IgdqKAIAIg0gDUEfdSIMcyAMayEMIBAgB0EEcmooAgAiESARQR91IgdzIAdrIQsgDUEATCEPIBFBAEwhFyAOQRhsQdApaiIHKAIEIRUgDkEQTgRAIAAgBygCEEEPIAsgC0EOSyINGyIRIBVBDyAMIAxBDksiDhsiEmxqIhVBAXRqLwEAIAcoAhQgFWotAAAQAiAAIAtBD2sgDEEPa0EAIA4bIgxBAXQgD3IgDCASGyIMIAcoAggiB3RyIAwgDRsiDEEBdCAXciAMIBEbIBFBAEcgEkEAR2ogB0EAIA4baiAHQQAgDRtqEAIMAQsgACAHKAIQIAwgFWwgC2oiDEEBdGovAQAiC0EBdCAPciALIA0bIgtBAXQgF3IgCyARGyAHKAIUIAxqLQAAIBFBAEcgDUEAR2pqEAILIAVBAmoiBSAGSA0ACwsgCigCCEECdCAGaiIRIAZKBEAgCigCMEEYbEHQKWoiBSgClAYhCyAFKAKQBiEOA0AgACAOIBAgBkECdCIHQQRyaigCACIFIAVBH3UiDXMgDWtBAXQgByAQaiIMKAIAIgcgB0EfdSINcyANa2ogDCgCCCINIA1BH3UiD3MgD2tBAnRqIAwoAgwiDCAMQR91Ig9zIA9rQQN0aiIPQQF0ai8BACALIA9qLQAAEAIgACAHQR92Ig9BAXQgBUEATHIgDyAFGyIPQQF0IA1BAExyIA8gDRsiD0EBdCAMQQBMciAPIAwbIA1BAEdBAkEBIAcbIAdBAEcgBRtqIAxBAEdqEAIgBkEEaiIGIBFIDQALCwJAIAooAgAgCigCNGsgEyAAKAIIQQN0IAAoAhBrQSBqa2oiBkUNACAGIAZBIG0iBUEFdGshCiAGQR9qQT9PBEADQCAAQX9BIBACIAVBAWsiBQ0ACwsgCkUNACAAQX8gCnRBf3MgChACCyAEQQFqIgQgAygCACIFSA0ACyADKAIQIQQLIAFBAWoiASAESA0ACwsgCEGgA2okACACIAMoAmg2AgAgA0EANgJoIAMoAmALCwAgACgCEEHABGwLigEBAX9BAyECAn8CQEHQMigCACAARg0AQdQyKAIAIABGDQBB2DIoAgAgAEYNAEECIQJB3DIoAgAgAEYNAEHgMigCACAARg0AQeQyKAIAIABGDQBBACECQegyKAIAIABGDQBB7DIoAgAgAEYNAEF/QfAyKAIAIABHDQEaC0F/IAIgASACEA1BAEgbCwvsEgMEfAl/An4jAEEgayIJJAAgCSABNgIEIAkgADYCACAJQoCAgIAQNwIUIAlCgAE3AgwgCSADNgIMIAkgAjYCCAJ/IAkoAgwhAUHYMigCACEMQdQyKAIAIQ1BAyEDAkACQEHQMigCACIOIAkoAgQiAEYNACAAIA1GDQAgACAMRg0AQQIhA0HcMigCACAARg0AQeAyKAIAIABGDQBB5DIoAgAgAEYNAEEAIQNB6DIoAgAgAEYNAEHsMigCACAARg0AQfAyKAIAIABHDQELQQAgASADEA1BAEgNARpBACEDAkBBiO0FEAgiAkUNACACQQRrLQAAQQNxRQ0AIAJBiO0FEAcLIAJFDQAjAEEQayIKJAAgAkIANwKAjQUgAkGIzQVqQYAgEAdBHyEBA0AgASIIQQF0QQFyIQtBwAAhAUE/IQADQCAKQREgAWsgC2y3RGZtQ1T7Iak/ohASRAAAAABlzc1BoiIEOQMIIAREAAAAAAAA4D9EAAAAAAAA4L8gBEQAAAAAAAAAAGYboCIEvSIRQjSIp0H/D3EiAUH/B2shDwJAIAFBswhPBEAgCiAEOQMIDAELIAFB/gdNBEAgCiARQoCAgICAgICAgH+DNwMIDAELIBEgD60iEoZC/////////weDUARAIAogBDkDCAwBCyAKQoCAgICAgIB4IBKHIBGDNwMICyACIAhBCHRqIAAiAUECdGpBiI0FagJ/IAorAwhEfXoE6AsuAUCiIgSZRAAAAAAAAOBBYwRAIASqDAELQYCAgIB4CzYCACABQQFrIQAgAQ0ACyAIQQFrIQEgCA0ACyAKQRBqJAAgAkHg+ARqIQtBESEAA0AgACIBQQF0QQFytyEFQSQhAANAIAsgAUGQAWxqIABBAWsiAEECdGoCfyMAQRBrIggkAAJAIAC3RAAAAAAAAOA/oEStROdKGFe2P6IiBL1CIIinQf////8HcSIKQfvDpP8DTQRAIApBgIDA8gNJDQEgBEQAAAAAAAAAAEEAEAkhBAwBCyAKQYCAwP8HTwRAIAQgBKEhBAwBCwJAAkACQAJAIAQgCBATQQNxDgMAAQIDCyAIKwMAIAgrAwhBARAJIQQMAwsgCCsDACAIKwMIEAohBAwCCyAIKwMAIAgrAwhBARAJmiEEDAELIAgrAwAgCCsDCBAKmiEECyAIQRBqJAAgBCAAQQF0QRNqt0SBROdKGFemP6IgBaIQEqJEAADA////30GiIgSZRAAAAAAAAOBBYwRAIASqDAELQYCAgIB4CzYCACAADQALIAFBAWshACABDQALQf8AIQEgAkG4jQJqIQpBgAEhCANAIAogASIAQQN0akHoJmoCfEGAASAIa7dEAAAAAAAA0D+iIgS9QjSIp0H/D3EiAUHJB2siCEE/TwRAIAREAAAAAAAA8D+gIAhBAEgNARogBL0hEQJAIAFBiQhJDQBEAAAAAAAAAAAgEUKAgICAgICAeFENAhogBEQAAAAAAADwP6AgAUH/D08NAhogEUIAWQRAIwBBEGsiAUQAAAAAAAAAcDkDCCABKwMIRAAAAAAAAABwogwDCyARQoCAgICAgLPIQFQNACMAQRBrIgFEAAAAAAAAABA5AwggASsDCEQAAAAAAAAAEKIMAgsgAUEAIBFCAYZCgICAgICAgI2Bf1gbIQELIARBoOIAKwMAIgUgBKAiBiAFoaEiBCAEoiIFIAWiIARByOIAKwMAokHA4gArAwCgoiAFIARBuOIAKwMAokGw4gArAwCgoiAEQajiACsDAKIgBr0iEqdBBHRB8A9xIghB0OIAaisDAKCgoCEEIAhB2OIAaikDACASQi2GfCERIAFFBEACfCASQoCAgIAIg1AEQCARQoCAgICAgIAIfb8iBSAEoiAFoCIEIASgDAELIBFCgICAgICAgPA/fL8iBSAEoiIGIAWgIgREAAAAAAAA8D9jBHwjAEEQayIBIRAgAUKAgICAgICACDcDCCAQIAErAwhEAAAAAAAAEACiOQMIRAAAAAAAAAAAIAREAAAAAAAA8D+gIgcgBiAFIAShoCAERAAAAAAAAPA/IAehoKCgRAAAAAAAAPC/oCIEIAREAAAAAAAAAABhGwUgBAtEAAAAAAAAEACiCwwBCyARvyIFIASiIAWgCyIEOQMAIAQgBKAiBEQAAMD////fQWQhASAKIABBAnRqQeguakH/////BwJ/IAREAAAAAAAA4D+gIgSZRAAAAAAAAOBBYwRAIASqDAELQYCAgIB4CyABGzYCACAAQQFrIQEgACIIDQALQZDOACEAIAJBoMACaiEBA0AgASAAQQFrIghBAnRqAn8gCLciBJ8gBKKfRA+cM6K0N7i/oEQAAAAAAADgP6AiBJlEAAAAAAAA4EFjBEAgBKoMAQtBgICAgHgLNgIAIAEgAEECayIAQQJ0agJ/IAC3IgSfIASin0QPnDOitDe4v6BEAAAAAAAA4D+gIgSZRAAAAAAAAOBBYwRAIASqDAELQYCAgIB4CzYCACAADQALIAIgCSgCADYCACACIAkoAgQiADYCBCACIAkoAgg2AhQgAiAJKAIMIgg2AhggAiAJKAIQNgIcIAIgCSgCFDYCWCACIAkoAhg2AlwgAkIANwOwjQIgAkEANgJUIAJCADcCTCACQQE2AgwgAkEINgIoAn8CQCAAIA5GDQBBASEDIAAgDUYNAEECIQMgACAMRg0AQQIhAUEDQdwyKAIAIABGDQEaQQRB4DIoAgAgAEYNARpBBUHkMigCACAARg0BGkEAIQFBBkHoMigCACAARg0BGkEHQewyKAIAIABGDQEaQX8hA0EIQfAyKAIAIABGDQEaC0EDIQEgAwshAyACIAE2AgggAiADNgJIIAIgAUECdEHAMWooAgAiAzYCECACIAggARANNgJEIAJBQGsCfyAIt0QAAAAAAECPQKJEAAAAAAAAwD+iIAO3RAAAAAAAAIJAoiAAt6OiIgSZRAAAAAAAAOBBYwRAIASqDAELQYCAgIB4CyIANgIAIAIgBCAAt6EiBDkDMCACIASaOQM4IAREAAAAAAAAAABhBEAgAkEANgIgC0GAIBAIIQAgAkEgNgJwIAJCADcCaCACQYAgNgJkIAIgADYCYCACQfQAakGYAxAHIAJBqAFBoAIgAigCAEEBRiIAG0HoAEGoASAAGyACKAIQQQJGGzYCjAQgAiEDCyADCyEAIAlBIGokACAACwQAQQQLBABBAgsWAQF/IAAoAmAiAQRAIAEQCwsgABALCwvXiQEiAEGACAv1AQEAAQABAAAAAQMCAwAAAAABAAIAAQADAAEAAQADAAIAAAABAwYDAwUFBQYAAAAAAAMAAgABAAEAAQABAAMAAgAAAAICBgMCBQUFBgAAAAAAAQACAAYABQADAAEABAAEAAcABQAHAAEABgABAAEAAAABAwYHAwMGBwYGBwgHBgcIBwADAAUAAQAGAAIAAwACAAUABAAEAAEAAwADAAIAAAADAwUHAwIEBQQEBQYGBQYHAQACAAoAEwAQAAoAAwADAAcACgAFAAMACwAEAA0AEQAIAAQADAALABIADwALAAIABwAGAAkADgADAAEABgAEAAUAAwACAEGACgskAQMGCAgJAwQGBwcIBgUHCAgJBwcICQkJBwcICQkKCAgJCgoKAEGwCgtFAwAEAAYAEgAMAAUABQABAAIAEAAJAAMABwADAAUADgAHAAMAEwARAA8ADQAKAAQADQAFAAgACwAFAAEADAAEAAQAAQABAEGACwskAgMGCAgJAwIECAgIBgQGCAgJCAgICQkKCAcICQoKCQgJCQsLAEGwCwtFBwAFAAkADgAPAAcABgAEAAUABQAGAAcABwAGAAgACAAIAAUADwAGAAkACgAFAAEACwAHAAkABgAEAAEADgAEAAYAAgAGAEGADAskAwMFBggJAwMEBQYIBAQFBgcIBgUGBwcIBwYHBwgJCAcICAkJAEGwDAugHQEAAgAKABcAIwAeAAwAEQADAAMACAAMABIAFQAMAAcACwAJAA8AFQAgACgAEwAGAA4ADQAWACIALgAXABIABwAUABMAIQAvABsAFgAJAAMAHwAWACkAGgAVABQABQADAA4ADQAKAAsAEAAGAAUAAQAJAAgABwAIAAQABAACAAAAAQMGCAkJCQoDBAYHCAkICAYGBwgJCgkJBwcICQoKCQoICAkKCgoKCgkJCgoLCwoLCAgJCgoKCwsJCAkKCgsLCwMABAAKABgAIgAhABUADwAFAAMABAAKACAAEQALAAoACwAHAA0AEgAeAB8AFAAFABkACwATADsAGwASAAwABQAjACEAHwA6AB4AEAAHAAUAHAAaACAAEwARAA8ACAAOAA4ADAAJAA0ADgAJAAQAAQALAAQABgAGAAYAAwACAAAAAgMFBwgJCAkDAwQGCAgHCAUFBgcICQgIBwYHCQgKCAkICAgJCQoJCggICQoKCwoLCAcHCAkKCgoIBwgJCgoKCgkABgAQACEAKQAnACYAGgAHAAUABgAJABcAEAAaAAsAEQAHAAsADgAVAB4ACgAHABEACgAPAAwAEgAcAA4ABQAgAA0AFgATABIAEAAJAAUAKAARAB8AHQARAA0ABAACABsADAALAA8ACgAHAAQAAQAbAAwACAAMAAYAAwABAAAABAMFBwgJCQkDAwQFBwcICAUEBQYHCAcIBgUGBgcICAgHBgcHCAgICQgHCAgICQgJCAcHCAgJCQoJCAgJCQkJCgEABQAOABUAIgAzAC4ARwAqADQARAA0AEMALAArABMAAwAEAAwAEwAfABoALAAhAB8AGAAgABgAHwAjABYADgAPAA0AFwAkADsAMQBNAEEAHQAoAB4AKAAbACEAKgAQABYAFAAlAD0AOABPAEkAQAArAEwAOAAlABoAHwAZAA4AIwAQADwAOQBhAEsAcgBbADYASQA3ACkAMAA1ABcAGAA6ABsAMgBgAEwARgBdAFQATQA6AE8AHQBKADEAKQARAC8ALQBOAEoAcwBeAFoATwBFAFMARwAyADsAJgAkAA8ASAAiADgAXwBcAFUAWwBaAFYASQBNAEEAMwAsACsAKgArABQAHgAsADcATgBIAFcATgA9AC4ANgAlAB4AFAAQADUAGQApACUALAA7ADYAUQBCAEwAOQA2ACUAEgAnAAsAIwAhAB8AOQAqAFIASABQAC8AOgA3ABUAFgAaACYAFgA1ABkAFwAmAEYAPAAzACQANwAaACIAFwAbAA4ACQAHACIAIAAcACcAMQBLAB4ANAAwACgANAAcABIAEQAJAAUALQAVACIAQAA4ADIAMQAtAB8AEwAMAA8ACgAHAAYAAwAwABcAFAAnACQAIwA1ABUAEAAXAA0ACgAGAAEABAACABAADwARABsAGQAUAB0ACwARAAwAEAAIAAEAAQAAAAEAAQQGBwgJCQoJCgsLDAwNDQMEBgcICAkJCQkKCgsMDAwGBgcICQkKCgkKCgsLDA0NBwcICQkKCgoKCwsLCwwNDQgHCQkKCgsLCgsLDAwNDQ4JCAkKCgoLCwsLDAsNDQ4OCQkKCgsLCwsLDAwMDQ0ODgoJCgsLCwwMDAwNDQ0OEBAJCAkKCgsLDAwMDA0NDg8PCgkKCgsLCw0MDQ0ODg4QDwoKCgsLDAwNDA0ODQ4PEBELCgoLDAwMDA0NDQ4PDw8QCwsLDAwNDA0ODg8PDxAQEAwLDA0NDQ4ODg4ODxAPEBANDAwNDQ0PDg4RDw8PERAQDAwNDg4ODw4PDxAQExITEAcADAASADUALwBMAHwAbABZAHsAbAB3AGsAUQB6AD8ADQAFABAAGwAuACQAPQAzACoARgA0AFMAQQApADsAJAATABEADwAYACkAIgA7ADAAKABAADIATgA+AFAAOAAhAB0AHAAZACsAJwA/ADcAXQBMADsAXQBIADYASwAyAB0ANAAWACoAKABDADkAXwBPAEgAOQBZAEUAMQBCAC4AGwBNACUAIwBCADoANABbAEoAPgAwAE8APwBaAD4AKAAmAH0AIAA8ADgAMgBcAE4AQQA3AFcARwAzAEkAMwBGAB4AbQA1ADEAXgBYAEsAQgB6AFsASQA4ACoAQAAsABUAGQBaACsAKQBNAEkAPwA4AFwATQBCAC8AQwAwADUAJAAUAEcAIgBDADwAOgAxAFgATABDAGoARwA2ACYAJwAXAA8AbQA1ADMALwBaAFIAOgA5ADAASAA5ACkAFwAbAD4ACQBWACoAKAAlAEYAQAA0ACsARgA3ACoAGQAdABIACwALAHYARAAeADcAMgAuAEoAQQAxACcAGAAQABYADQAOAAcAWwAsACcAJgAiAD8ANAAtAB8ANAAcABMADgAIAAkAAwB7ADwAOgA1AC8AKwAgABYAJQAYABEADAAPAAoAAgABAEcAJQAiAB4AHAAUABEAGgAVABAACgAGAAgABgACAAAAAwQFBwcICQkJCgoLCwsMDQQDBQYHBwgICAkJCgoKCwsFBQUGBwcICAgJCQoKCwsLBgYGBwcICAkJCQoKCgsLCwcGBwcICAkJCQkKCgoLCwsIBwcICAgJCQkJCgoLCwsMCQcICAgJCQkJCgoKCwsMDAkICAkJCQkKCgoKCgsLCwwJCAgJCQkJCgoKCgsLDAwMCQgJCQkJCgoKCwsLCwwMDAoJCQkKCgoKCgsLCwsMDQwKCQkJCgoKCgsLCwsMDAwNCwoJCgoKCwsLCwsLDAwNDQsKCgoKCwsLCwwMDAwMDQ0MCwsLCwsLCwwMDAwNDQwNDAsLCwsLCwwMDAwMDQ0NDQEABQAOACwASgA/AG4AXQCsAJUAigDyAOEAwwB4AREAAwAEAAwAFAAjAD4ANQAvAFMASwBEAHcAyQBrAM8ACQAPAA0AFwAmAEMAOgBnAFoAoQBIAH8AdQBuANEAzgAQAC0AFQAnAEUAQAByAGMAVwCeAIwA/ADUAMcAgwFtARoASwAkAEQAQQBzAGUAswCkAJsACAH2AOIAiwF+AWoBCQBCAB4AOwA4AGYAuQCtAAkBjgD9AOgAkAGEAXoBvQEQAG8ANgA0AGQAuACyAKAAhQABAfQA5ADZAIEBbgHLAgoAYgAwAFsAWAClAJ0AlAAFAfgAlwGNAXQBfAF5A3QDCABVAFQAUQCfAJwAjwAEAfkAqwGRAYgBfwHXAskCxAIHAJoATABJAI0AgwAAAfUAqgGWAYoBgAHfAmcBxgJgAQsAiwCBAEMAfQD3AOkA5QDbAIkB5wLhAtACdQNyA7cBBADzAHgAdgBzAOMA3wCMAeoC5gLgAtECyALCAt8AtAEGAMoA4ADeANoA2ACFAYIBfQFsAXgDuwHDArgBtQHABgQA6wLTANIA0AByAXsB3gLTAsoCxwZzA20DbAODDWEDAgB5AXEBZgC7ANYC0gJmAccCxQJiA8YGZwOCDWYDsgEAAAwACgAHAAsACgARAAsACQANAAwACgAHAAUAAwABAAMAAQQGCAkJCgoLCwsMDAwNCQMEBgcICQkJCgoKCwwLDAgGBgcICQkKCgsKCwsLDAwJCAcICQkKCgoLCwwMDA0NCgkICQkKCgsLCwwMDA0NDQkJCAkJCgsLDAsMDA0NDQ4KCgkJCgsLCwsMDAwMDQ0OCgoJCgoLCwsMDA0NDQ0PDwoKCgoLCwsMDA0NDQ0ODg4KCwoKCwsMDA0NDQ0ODQ4NCwsLCgsMDAwMDQ4ODg8PDgoMCwsLDAwNDg4ODg4ODQ4LDAwMDAwNDQ0NDw4ODg4QCw4MDAwNDQ4ODhAPDw8RDwsNDQsMDg4NDg4PEA8RDw4LCQgICQkKCgoLCwsLCwsLCA8ADQAuAFAAkgAGAfgAsgGqAZ0CjQKJAm0CBQIIBFgADgAMABUAJgBHAIIAegDYANEAxgBHAVkBPwEpARcBKgAvABYAKQBKAEQAgAB4AN0AzwDCALYAVAE7AScBHQISAFEAJwBLAEYAhgB9AHQA3ADMAL4AsgBFATcBJQEPARAAkwBIAEUAhwB/AHYAcADSAMgAvABgAUMBMgEdARwCDgAHAUIAgQB+AHcAcgDWAMoAwAC0AFUBPQEtARkBBgEMAPkAewB5AHUAcQDXAM4AwwC5AFsBSgE0ASMBEAEIAgoAswFzAG8AbQDTAMsAxAC7AGEBTAE5ASoBGwETAn0BEQCrAdQA0ADNAMkAwQC6ALEAqQBAAS8BHgEMAQICeQEQAE8BxwDFAL8AvQC1AK4ATQFBATEBIQETAQkCewFzAQsAnAK4ALcAswCvAFgBSwE6ATABIgEVARICfwF1AW4BCgCMAloBqwCoAKQAPgE1ASsBHwEUAQcBAQJ3AXABagEGAIgCQgE8ATgBMwEuASQBHAENAQUBAAJ4AXIBbAFnAQQAbAIsASgBJgEgARoBEQEKAQMCfAF2AXEBbQFpAWUBAgAJBBgBFgESAQsBCAEDAX4BegF0AW8BawFoAWYBZAEAACsAFAATABEADwANAAsACQAHAAYABAAHAAUAAwABAAMABAQGBwgJCQoKCwsLCwsMCQQEBQYHCAgJCQkKCgoKCggGBQYHBwgICQkJCQoKCgsHBwYHBwgICAkJCQkKCgoKBwgHBwgICAgJCQkKCgoKCwcJBwgICAgJCQkJCgoKCgoHCQgICAgJCQkJCgoKCgoLBwoICAgJCQkJCgoKCgoLCwgKCQkJCQkJCQkKCgoKCwsICgkJCQkJCQoKCgoKCwsLCAsJCQkJCgoKCgoKCwsLCwgLCgkJCQoKCgoKCgsLCwsICwoKCgoKCgoKCgsLCwsLCAsKCgoKCgoKCwsLCwsLCwgMCgoKCgoKCwsLCwsLCwsICAcHBwcHBwcHBwcICAgIBAEABQAEAAUABgAFAAQABAAHAAMABgAAAAcAAgADAAEAAQQEBQQGBQYEBQUGBQYGBg8ADgANAAwACwAKAAkACAAHAAYABQAEAAMAAgABAAAABAQEBAQEBAQEBAQEBAQEBABB6CkLBQIAAAACAEH5KQsMBAAACAQAAAMAAAADAEGQKgsNEAQAACIEAAADAAAAAwBBqCoLBjAEAABCBABByCoLBQQAAAAEAEHYKgsNUAQAAHAEAAAEAAAABABB8CoLDYAEAACgBAAABgAAAAYAQYgrCw2wBAAAAAUAAAYAAAAGAEGgKwsNMAUAAIAFAAAGAAAABgBBuCsLDbAFAAAABgAACAAAAAgAQdArCw0wBgAAsAYAAAgAAAAIAEHoKwsN8AYAAHAHAAAIAAAACABBgCwLDbAHAAAwCAAAEAAAABAAQZgsCwZwCAAAcAoAQbgsCwUQAAAAEABByCwLjQNwCwAAcA0AABAAAAAQAAAAAQAAAAEAAABwDgAAcBAAABAAAAAQAAAAAgAAAAMAAABwDgAAcBAAABAAAAAQAAAAAwAAAAcAAABwDgAAcBAAABAAAAAQAAAABAAAAA8AAABwDgAAcBAAABAAAAAQAAAABgAAAD8AAABwDgAAcBAAABAAAAAQAAAACAAAAP8AAABwDgAAcBAAABAAAAAQAAAACgAAAP8DAABwDgAAcBAAABAAAAAQAAAADQAAAP8fAABwDgAAcBAAABAAAAAQAAAABAAAAA8AAABwEQAAcBMAABAAAAAQAAAABQAAAB8AAABwEQAAcBMAABAAAAAQAAAABgAAAD8AAABwEQAAcBMAABAAAAAQAAAABwAAAH8AAABwEQAAcBMAABAAAAAQAAAACAAAAP8AAABwEQAAcBMAABAAAAAQAAAACQAAAP8BAABwEQAAcBMAABAAAAAQAAAACwAAAP8HAABwEQAAcBMAABAAAAAQAAAADQAAAP8fAABwEQAAcBMAAAEAAAAQAEHgLwsNcBQAAJAUAAABAAAAEABB+C8LBqAUAADAFABBrDALiQEBAAAAAQAAAAEAAAABAAAAAQAAAAEAAAACAAAAAgAAAAIAAAACAAAAAwAAAAIAAAADAAAAAwAAAAQAAAADAAAABAAAAAMAAAAEAAAABAAAAAUAAAAEAAAABQAAAAQAAAAGAAAABQAAAAYAAAAFAAAABgAAAAUAAAAHAAAABgAAAAcAAAAGAAAABwBBwDELDQEAAAD/////AQAAAAIAQeAxC5IBAwAAAAEAAAABAAAAAQAAAAIAAAACAAAAAgAAAAMAAAADAAAAAwAAAAQAAAAEAAAAAAAAAAEAAAACAAAAAwAAAAAAAAABAAAAAgAAAAMAAAABAAAAAgAAAAMAAAABAAAAAgAAAAMAAAACAAAAAwAAAESsAACAuwAAAH0AACJWAADAXQAAgD4AABErAADgLgAAQB8AQYAzC7oI/////////////////////wgAAAD/////CAAAACAAAAAQAAAA/////xAAAAAoAAAAGAAAAP////8YAAAAMAAAACAAAAD/////IAAAADgAAAAoAAAA/////ygAAABAAAAAMAAAAP////8wAAAAUAAAADgAAAD/////OAAAAGAAAABAAAAA/////0AAAABwAAAA//////////9QAAAAgAAAAP//////////YAAAAKAAAAD//////////3AAAADAAAAA//////////+AAAAA4AAAAP//////////kAAAAAABAAD//////////6AAAABAAQAA/////////////////////wAAAAAEAAAACAAAAAwAAAAQAAAAFAAAABgAAAAeAAAAJAAAACwAAAA0AAAAPgAAAEoAAABaAAAAbgAAAIYAAACiAAAAxAAAAO4AAAAgAQAAVgEAAKIBAABAAgAAAAAAAAQAAAAIAAAADAAAABAAAAAUAAAAGAAAAB4AAAAkAAAAKgAAADIAAAA8AAAASAAAAFgAAABqAAAAgAAAAJwAAAC+AAAA5gAAABQBAABKAQAAgAEAAEACAAAAAAAABAAAAAgAAAAMAAAAEAAAABQAAAAYAAAAHgAAACQAAAAsAAAANgAAAEIAAABSAAAAZgAAAH4AAACcAAAAwgAAAPAAAAAoAQAAbAEAAMABAAAmAgAAQAIAAAAAAAAGAAAADAAAABIAAAAYAAAAHgAAACQAAAAsAAAANgAAAEIAAABQAAAAYAAAAHQAAACMAAAAqAAAAMgAAADuAAAAHAEAAFABAACMAQAA0AEAAAoCAABAAgAAAAAAAAYAAAAMAAAAEgAAABgAAAAeAAAAJAAAACwAAAA2AAAAQgAAAFAAAABgAAAAcgAAAIgAAACiAAAAwgAAAOgAAAAWAQAASgEAAIoBAADQAQAAHAIAAEACAAAAAAAABgAAAAwAAAASAAAAGAAAAB4AAAAkAAAALAAAAC0AAABCAAAAUAAAAGAAAAB0AAAAjAAAAKgAAADIAAAA7gAAAPgAAABQAQAAjAEAANABAAAKAgAAQAIAAAAAAAAGAAAADAAAABIAAAAYAAAAHgAAACQAAAAsAAAANgAAAEIAAABQAAAAYAAAAHQAAACMAAAAqAAAAMgAAADuAAAAHAEAAFABAACMAQAA0AEAAAoCAABAAgAAAAAAAAYAAAAMAAAAEgAAABgAAAAeAAAAJAAAACwAAAA2AAAAQgAAAFAAAABgAAAAdAAAAIwAAACoAAAAyAAAAO4AAAAcAQAAUAEAAIwBAADQAQAACgIAAEACAAAAAAAADAAAABgAAAAkAAAAMAAAADwAAABIAAAAWAAAAGwAAACEAAAAoAAAAMAAAADoAAAAGAEAAFABAACQAQAA3AEAADYCAAA4AgAAOgIAADwCAAA+AgAAQAIAQdw7C8oPnff//533//+d9///nff//533//+d9///Ou///zrv//867///Ou///9bm///W5v//1ub//3Pe//9z3v//D9b//w/W//+szf//SMX//+W8///lvP//gbT//x6s//+6o///V5v//5CK//8sgv//ZXH//wJp//87WP//10///xA///9JLv//HxX//1gE//+R8/7/Z9r+/zzB/v8SqP7/S5f+/yB+/v+SXP7/aEP+/z0q/v+vCP7/he/9/1vW/f/NtP3/opv9/xR6/f+GWP3/XD/9/zEm/f+jBP3/3fP8/7La/P+Iwfz/o1cDAGpoAwAxeQMAlIEDAPiJAwBbkgMAW5IDAPiJAwCUgQMAzXADAAZgAwB4PgMA6hwDAPnyAgCkwAIAT44CADNLAgC0/wEA0asBAItPAQB+4gAAcHUAAJ33//9lcf//yuL+/2hD/v+im/3/eev8/+wy/P+Zafv/4pf6/8e9+f/m0vj/BOj3/1zs9v9Q6PX/ROT0/9TX8/8Bw/L/y6Xx/zGA8P/6Yu//YD3u/8YX7f8t8uv/k8zq/1yv6f+Jmuj/toXn/0d55v87deX/9oHk/3if4/9dxeL/bQTi/0RU4f9FveD/cT/g/8fa3/+rl9//um3f/1Zl3/+Bft//ncHf/1bRHwC7Qh8Ay4EeAOmWHQCzeRwAJyobAKuwGQB2/BcA6xUWAA39EwB1qREA7CsPAEhrDADrbwkAnEoGADLiAgDXT///w4L7//d69/85SfP/JuXu/75O6v9ljuX/G6Tg/0KY2/94Ytb/hBPR/wKjy/9VGcb/RYfA/wrcuv/PMLX/MX2v/5PJqf+8JqT/SIye//8Kmf/gopP/s2SO/xNIif8sZoT//r5//4dSe/+QMXf/fGRz/67zb/8n32z/EEBq/6MFaP8LSWb/qhJl/4FiZP9WSWT/Ksdk/2HkZf9dqWf/gh5q/zRMbf9zMnH/BeJ1/4dSe/9djIH/TqCI//WFkP9JumYACRhdABGkUgA4RUcA4gM7AA3gLQBW0R8AhegQANIUAQAGZ/D/u9be/1VszP/VJ7n/ARql/3Y6kP+XkXr/yCdk/20FTf/oMjX/OrAc/46WA//j5en+nKbP/oLptP5av5n+JSh+/qk0Yv4S/kX++3sp/vPPDP5cAvD9/yPT/T89tv3iXpn9E6J8/dEGYP2srkP9o5kn/UPpC/2NnfD8q8/V/AGIu/xW16H81NaI/N+OcPzaB1n871pC/IKQLPz3sBf8eNUD/GkG8fssTN/7Jq/O+x1Av/t1B7H7kQ2k+9ZamPul9437AOSE+64wffut3Xb7/+px+wdhbvvFP2z7yHiUBDvAkwT5npEEARWOBFMiiQRSz4IEABx7BFsIcgQqpWcEb/JbBIv4TgTjv0AE2lAxBNSzIASX+Q4EiCr8AwlP6AN+b9MDEaW9Ayb4pgMhcY8DLCl3A6ooXgP/d0QDVTAqA3NiDwO9FvQCXWbYAlRRvAIv+Z8C7V2DAh6hZgLBwkkCAdwsAqT9DwINMPMBBYTWAe4BugFXy50B29eBAaZAZgF+FksBZFkwAR0aFgFyafwAxk/jABjNygCT+rIAONibAGluhQCKxW8A/+VaACvYRgCrkzMARSkhAPqYDwAu6/7/exfv/6ou4P/zH9L/HvzE/8i6uP/vW63/9+ei/0m6ZgALem8Asl93AKNzfgB5rYQA+x2KAI3NjgDMs5IAfuGVAKNWmACfG5oA1jibAKq2mwB/nZsAVu2aAPW2mQBd+pcA8L+VANkgkwBSDJAAhJuMAHDOiAB5rYQAAkGAANSZewDtt3YATZtxACBdbAAB9WYAuHNhAETZWwBtNlYAz4JQADHPSgD2I0UAu3g/AKvmOQD+XDQAfOwuAIidKQC+ZyQA5VsfAJtxGgBCsRUA2hoRAMe2DAAJhQgAPX0EACmwAADOHf3/ZLX5/xWQ9v+4lPP/FNTw/4tW7v/zAuz/Ferp/4oD6P9VT+b/2dXk/02G4/8XaeL/NX7h/0W94P9W0R8AYz4gAH+BIACqmiAARpIgAFVoIAA5JSAAj8AfALtCHwC8qx4Ak/sdAKM6HQCIYBwACn4bAMWKGgC5hhkASnoYAHdlFwCkUBYAbTMVANMNFAA66BIAoMIRAAadEADPfw8ANVoOAP88DQAsKAwAvBsLALAXCgCkEwkA/BcIABotBwA5QgYAHmgFAGeWBAAUzQMAhxQDAF5kAgCYvAEANh0BAJuOAABjCAAAkIr//4Id//91sP7/L1T+/0wA/v/NtP3/sXH9/1w//f8HDf3/FuP8/4jB/P/6n/z/M4/8/2x+/P8Idvz/pW38/6Vt/P8Idvz/bH78/8+G/P+Wl/z/o1cDAHg+AwBOJQMAIwwDAF37AgDP2QIApMACAHqnAgDshQIAXmQCADNLAgClKQIAexACAFH3AQDD1QEAmLwBAG6jAQDggQEAtWgBAO5XAQDEPgEAmSUBAG8MAQCo+wAA4eoAALfRAADwwAAAKbAAAMWnAAD+lgAAm44AANR9AABwdQAAqWQAAEZcAADiUwAAf0sAABtDAAAbQwAAuDoAAFQyAADxKQAA8SkAAI0hAACNIQAAKhkAACoZAAAqGQAAxhAAAMYQAADGEAAAxhAAAGMIAABjCAAAYwgAAGMIAABjCAAAYwgAQcDLAAvXFQMAAAAEAAAABAAAAAYAAACD+aIARE5uAPwpFQDRVycA3TT1AGLbwAA8mZUAQZBDAGNR/gC73qsAt2HFADpuJADSTUIASQbgAAnqLgAcktEA6x3+ACmxHADoPqcA9TWCAES7LgCc6YQAtCZwAEF+XwDWkTkAU4M5AJz0OQCLX4QAKPm9APgfOwDe/5cAD5gFABEv7wAKWosAbR9tAM9+NgAJyycARk+3AJ5mPwAt6l8Auid1AOXrxwA9e/EA9zkHAJJSigD7a+oAH7FfAAhdjQAwA1YAe/xGAPCrawAgvM8ANvSaAOOpHQBeYZEACBvmAIWZZQCgFF8AjUBoAIDY/wAnc00ABgYxAMpWFQDJqHMAe+JgAGuMwAAZxEcAzWfDAAno3ABZgyoAi3bEAKYclgBEr90AGVfRAKU+BQAFB/8AM34/AMIy6ACYT94Au30yACY9wwAea+8An/heADUfOgB/8soA8YcdAHyQIQBqJHwA1W76ADAtdwAVO0MAtRTGAMMZnQCtxMIALE1BAAwAXQCGfUYA43EtAJvGmgAzYgAAtNJ8ALSnlwA3VdUA1z72AKMQGABNdvwAZJ0qAHDXqwBjfPgAerBXABcV5wDASVYAO9bZAKeEOAAkI8sA1op3AFpUIwAAH7kA8QobABnO3wCfMf8AZh5qAJlXYQCs+0cAfn/YACJltwAy6IkA5r9gAO/EzQBsNgkAXT/UABbe1wBYO94A3puSANIiKAAohugA4lhNAMbKMgAI4xYA4H3LABfAUADzHacAGOBbAC4TNACDEmIAg0gBAPWOWwCtsH8AHunyAEhKQwAQZ9MAqt3YAK5fQgBqYc4ACiikANOZtAAGpvIAXHd/AKPCgwBhPIgAinN4AK+MWgBv170ALaZjAPS/ywCNge8AJsFnAFXKRQDK2TYAKKjSAMJhjQASyXcABCYUABJGmwDEWcQAyMVEAE2ykQAAF/MA1EOtAClJ5QD91RAAAL78AB6UzABwzu4AEz71AOzxgACz58MAx/goAJMFlADBcT4ALgmzAAtF8wCIEpwAqyB7AC61nwBHksIAezIvAAxVbQByp5AAa+cfADHLlgB5FkoAQXniAPTfiQDolJcA4uaEAJkxlwCI7WsAX182ALv9DgBImrQAZ6RsAHFyQgCNXTIAnxW4ALzlCQCNMSUA93Q5ADAFHAANDAEASwhoACzuWABHqpAAdOcCAL3WJAD3faYAbkhyAJ8W7wCOlKYAtJH2ANFTUQDPCvIAIJgzAPVLfgCyY2gA3T5fAEBdAwCFiX8AVVIpADdkwABt2BAAMkgyAFtMdQBOcdQARVRuAAsJwQAq9WkAFGbVACcHnQBdBFAAtDvbAOp2xQCH+RcASWt9AB0nugCWaSkAxsysAK0UVACQ4moAiNmJACxyUAAEpL4AdweUAPMwcAAA/CcA6nGoAGbCSQBk4D0Al92DAKM/lwBDlP0ADYaMADFB3gCSOZ0A3XCMABe35wAI3zsAFTcrAFyAoABagJMAEBGSAA/o2ABsgK8A2/9LADiQDwBZGHYAYqUVAGHLuwDHibkAEEC9ANLyBABJdScA67b2ANsiuwAKFKoAiSYvAGSDdgAJOzMADpQaAFE6qgAdo8IAr+2uAFwmEgBtwk0ALXqcAMBWlwADP4MACfD2ACtAjABtMZkAObQHAAwgFQDYw1sA9ZLEAMatSwBOyqUApzfNAOapNgCrkpQA3UJoABlj3gB2jO8AaItSAPzbNwCuoasA3xUxAACuoQAM+9oAZE1mAO0FtwApZTAAV1a/AEf/OgBq+bkAdb7zACiT3wCrgDAAZoz2AATLFQD6IgYA2eQdAD2zpABXG48ANs0JAE5C6QATvqQAMyO1APCqGgBPZagA0sGlAAs/DwBbeM0AI/l2AHuLBACJF3IAxqZTAG9u4gDv6wAAm0pYAMTatwCqZroAds/PANECHQCx8S0AjJnBAMOtdwCGSNoA912gAMaA9ACs8C8A3eyaAD9cvADQ3m0AkMcfACrbtgCjJToAAK+aAK1TkwC2VwQAKS20AEuAfgDaB6cAdqoOAHtZoQAWEioA3LctAPrl/QCJ2/4Aib79AOR2bAAGqfwAPoBwAIVuFQD9h/8AKD4HAGFnMwAqGIYATb3qALPnrwCPbW4AlWc5ADG/WwCE10gAMN8WAMctQwAlYTUAyXDOADDLuAC/bP0ApACiAAVs5ABa3aAAIW9HAGIS0gC5XIQAcGFJAGtW4ACZUgEAUFU3AB7VtwAz8cQAE25fAF0w5ACFLqkAHbLDAKEyNgAIt6QA6rHUABb3IQCPaeQAJ/93AAwDgACNQC0AT82gACClmQCzotMAL10KALT5QgAR2ssAfb7QAJvbwQCrF70AyqKBAAhqXAAuVRcAJwBVAH8U8ADhB4YAFAtkAJZBjQCHvt4A2v0qAGsltgB7iTQABfP+ALm/ngBoak8ASiqoAE/EWgAt+LwA11qYAPTHlQANTY0AIDqmAKRXXwAUP7EAgDiVAMwgAQBx3YYAyd62AL9g9QBNZREAAQdrAIywrACywNAAUVVIAB77DgCVcsMAowY7AMBANQAG3HsA4EXMAE4p+gDWysgA6PNBAHxk3gCbZNgA2b4xAKSXwwB3WNQAaePFAPDaEwC6OjwARhhGAFV1XwDSvfUAbpLGAKwuXQAORO0AHD5CAGHEhwAp/ekA59bzACJ8ygBvkTUACODFAP/XjQBuauIAsP3GAJMIwQB8XXQAa62yAM1unQA+cnsAxhFqAPfPqQApc98Atcm6ALcAUQDisg0AdLokAOV9YAB02IoADRUsAIEYDAB+ZpQAASkWAJ96dgD9/b4AVkXvANl+NgDs2RMAi7q5AMSX/AAxqCcA8W7DAJTFNgDYqFYAtKi1AM/MDgASiS0Ab1c0ACxWiQCZzuMA1iC5AGteqgA+KpwAEV/MAP0LSgDh9PsAjjttAOKGLADp1IQA/LSpAO/u0QAuNckALzlhADghRAAb2cgAgfwKAPtKagAvHNgAU7SEAE6ZjABUIswAKlXcAMDG1gALGZYAGnC4AGmVZAAmWmAAP1LuAH8RDwD0tREA/Mv1ADS8LQA0vO4A6F3MAN1eYABnjpsAkjPvAMkXuABhWJsA4Ve8AFGDxgDYPhAA3XFIAC0c3QCvGKEAISxGAFnz1wDZepgAnlTAAE+G+gBWBvwA5XmuAIkiNgA4rSIAZ5PcAFXoqgCCJjgAyuebAFENpACZM7EAqdcOAGkFSABlsvAAf4inAIhMlwD50TYAIZKzAHuCSgCYzyEAQJ/cANxHVQDhdDoAZ+tCAP6d3wBe1F8Ae2ekALqsegBV9qIAK4gjAEG6VQBZbggAISqGADlHgwCJ4+YA5Z7UAEn7QAD/VukAHA/KAMVZigCU+isA08HFAA/FzwDbWq4AR8WGAIVDYgAhhjsALHmUABBhhwAqTHsAgCwaAEO/EgCIJpAAeDyJAKjE5ADl23sAxDrCACb06gD3Z4oADZK/AGWjKwA9k7EAvXwLAKRR3AAn3WMAaeHdAJqUGQCoKZUAaM4oAAnttABEnyAATpjKAHCCYwB+fCMAD7kyAKf1jgAUVucAIfEIALWdKgBvfk0ApRlRALX5qwCC39YAlt1hABY2AgDEOp8Ag6KhAHLtbQA5jXoAgripAGsyXABGJ1sAADTtANIAdwD89FUAAVlNAOBxgABBo+EAC60BQPsh+T8AAAAALUR0PgAAAICYRvg8AAAAYFHMeDsAAACAgxvwOQAAAEAgJXo4AAAAgCKC4zYAAAAAHfNpNf6CK2VHFWdAAAAAAAAAOEMAAPr+Qi52vzo7nrya9wy9vf3/////3z88VFVVVVXFP5ErF89VVaU/F9CkZxERgT8AAAAAAADIQu85+v5CLuY/JMSC/72/zj+19AzXCGusP8xQRtKrsoM/hDpOm+DXVT8AQd7iAAuCMfA/br+IGk87mzw1M/upPfbvP13c2JwTYHG8YYB3Pprs7z/RZocQel6QvIV/bugV4+8/E/ZnNVLSjDx0hRXTsNnvP/qO+SOAzou83vbdKWvQ7z9hyOZhTvdgPMibdRhFx+8/mdMzW+SjkDyD88bKPr7vP217g12mmpc8D4n5bFi17z/87/2SGrWOPPdHciuSrO8/0ZwvcD2+Pjyi0dMy7KPvPwtukIk0A2q8G9P+r2ab7z8OvS8qUlaVvFFbEtABk+8/VepOjO+AULzMMWzAvYrvPxb01bkjyZG84C2prpqC7z+vVVzp49OAPFGOpciYeu8/SJOl6hUbgLx7UX08uHLvPz0y3lXwH4+86o2MOPlq7z+/UxM/jImLPHXLb+tbY+8/JusRdpzZlrzUXASE4FvvP2AvOj737Jo8qrloMYdU7z+dOIbLguePvB3Z/CJQTe8/jcOmREFvijzWjGKIO0bvP30E5LAFeoA8ltx9kUk/7z+UqKjj/Y6WPDhidW56OO8/fUh08hhehzw/prJPzjHvP/LnH5grR4A83XziZUUr7z9eCHE/e7iWvIFj9eHfJO8/MasJbeH3gjzh3h/1nR7vP/q/bxqbIT28kNna0H8Y7z+0CgxygjeLPAsD5KaFEu8/j8vOiZIUbjxWLz6prwzvP7arsE11TYM8FbcxCv4G7z9MdKziAUKGPDHYTPxwAe8/SvjTXTndjzz/FmSyCPzuPwRbjjuAo4a88Z+SX8X27j9oUEvM7UqSvMupOjen8e4/ji1RG/gHmbxm2AVtruzuP9I2lD7o0XG895/lNNvn7j8VG86zGRmZvOWoE8Mt4+4/bUwqp0ifhTwiNBJMpt7uP4ppKHpgEpO8HICsBEXa7j9biRdIj6dYvCou9yEK1u4/G5pJZ5ssfLyXqFDZ9dHuPxGswmDtY0M8LYlhYAjO7j/vZAY7CWaWPFcAHe1Byu4/eQOh2uHMbjzQPMG1osbuPzASDz+O/5M83tPX8CrD7j+wr3q7zpB2PCcqNtXav+4/d+BU670dkzwN3f2ZsrzuP46jcQA0lI+8pyyddrK57j9Jo5PczN6HvEJmz6Latu4/XzgPvcbeeLyCT51WK7TuP/Zce+xGEoa8D5JdyqSx7j+O1/0YBTWTPNontTZHr+4/BZuKL7eYezz9x5fUEq3uPwlUHOLhY5A8KVRI3Qer7j/qxhlQhcc0PLdGWYomqe4/NcBkK+YylDxIIa0Vb6fuP592mWFK5Iy8Cdx2ueGl7j+oTe87xTOMvIVVOrB+pO4/rukriXhThLwgw8w0RqPuP1hYVnjdzpO8JSJVgjii7j9kGX6AqhBXPHOpTNRVoe4/KCJev++zk7zNO39mnqDuP4K5NIetEmq8v9oLdRKg7j/uqW2472djvC8aZTyyn+4/UYjgVD3cgLyElFH5fZ/uP88+Wn5kH3i8dF/s6HWf7j+wfYvASu6GvHSBpUian+4/iuZVHjIZhrzJZ0JW65/uP9PUCV7LnJA8P13eT2mg7j8dpU253DJ7vIcB63MUoe4/a8BnVP3slDwywTAB7aHuP1Vs1qvh62U8Yk7PNvOi7j9Cz7MvxaGIvBIaPlQnpO4/NDc78bZpk7wTzkyZiaXuPx7/GTqEXoC8rccjRhqn7j9uV3LYUNSUvO2SRJvZqO4/AIoOW2etkDyZZorZx6ruP7Tq8MEvt40826AqQuWs7j//58WcYLZlvIxEtRYyr+4/RF/zWYP2ezw2dxWZrrHuP4M9HqcfCZO8xv+RC1u07j8pHmyLuKldvOXFzbA3t+4/WbmQfPkjbLwPUsjLRLruP6r59CJDQ5K8UE7en4K97j9LjmbXbMqFvLoHynDxwO4/J86RK/yvcTyQ8KOCkcTuP7tzCuE10m08IyPjGWPI7j9jImIiBMWHvGXlXXtmzO4/1THi44YcizwzLUrsm9DuPxW7vNPRu5G8XSU+sgPV7j/SMe6cMcyQPFizMBOe2e4/s1pzboRphDy//XlVa97uP7SdjpfN34K8evPTv2vj7j+HM8uSdxqMPK3TWpmf6O4/+tnRSo97kLxmto0pB+7uP7qu3FbZw1W8+xVPuKLz7j9A9qY9DqSQvDpZ5Y1y+e4/NJOtOPTWaLxHXvvydv/uPzWKWGvi7pG8SgahMLAF7z/N3V8K1/90PNLBS5AeDO8/rJiS+vu9kbwJHtdbwhLvP7MMrzCubnM8nFKF3ZsZ7z+U/Z9cMuOOPHrQ/1+rIO8/rFkJ0Y/ghDxL0Vcu8SfvP2caTjivzWM8tecGlG0v7z9oGZJsLGtnPGmQ79wgN+8/0rXMgxiKgLz6w11VCz/vP2/6/z9drY+8fIkHSi1H7z9JqXU4rg2QvPKJDQiHT+8/pwc9poWjdDyHpPvcGFjvPw8iQCCekYK8mIPJFuNg7z+sksHVUFqOPIUy2wPmae8/S2sBrFk6hDxgtAHzIXPvPx8+tAch1YK8X5t7M5d87z/JDUc7uSqJvCmh9RRGhu8/04g6YAS2dDz2P4vnLpDvP3FynVHsxYM8g0zH+1Ga7z/wkdOPEvePvNqQpKKvpO8/fXQj4piujbzxZ44tSK/vPwggqkG8w448J1ph7hu67z8y66nDlCuEPJe6azcrxe8/7oXRMalkijxARW5bdtDvP+3jO+S6N468FL6crf3b7z+dzZFNO4l3PNiQnoHB5+8/icxgQcEFUzzxcY8rwvPvPwA4+v5CLuY/MGfHk1fzLj0BAAAAAADgv1swUVVVVdU/kEXr////z78RAfEks5nJP5/IBuV1VcW/AAAAAAAA4L93VVVVVVXVP8v9/////8+/DN2VmZmZyT+nRWdVVVXFvzDeRKMkScI/ZT1CpP//v7/K1ioohHG8P/9osEPrmbm/hdCv94KBtz/NRdF1E1K1v5/e4MPwNPc/AJDmeX/M178f6SxqeBP3PwAADcLub9e/oLX6CGDy9j8A4FET4xPXv32MEx+m0fY/AHgoOFu41r/RtMULSbH2PwB4gJBVXda/ugwvM0eR9j8AABh20ALWvyNCIhifcfY/AJCQhsqo1b/ZHqWZT1L2PwBQA1ZDT9W/xCSPqlYz9j8AQGvDN/bUvxTcnWuzFPY/AFCo/aed1L9MXMZSZPb1PwCoiTmSRdS/TyyRtWfY9T8AuLA59O3Tv96QW8u8uvU/AHCPRM6W0794GtnyYZ31PwCgvRceQNO/h1ZGElaA9T8AgEbv4unSv9Nr586XY/U/AOAwOBuU0r+Tf6fiJUf1PwCI2ozFPtK/g0UGQv8q9T8AkCcp4enRv9+9stsiD/U/APhIK22V0b/X3jRHj/P0PwD4uZpnQdG/QCjez0PY9D8AmO+U0O3Qv8ijeMA+vfQ/ABDbGKWa0L+KJeDDf6L0PwC4Y1LmR9C/NITUJAWI9D8A8IZFIuvPvwstGRvObfQ/ALAXdUpHz79UGDnT2VP0PwAwED1EpM6/WoS0RCc69D8AsOlEDQLOv/v4FUG1IPQ/APB3KaJgzb+x9D7aggf0PwCQlQQBwMy/j/5XXY/u8z8AEIlWKSDMv+lMC6DZ1fM/ABCBjReBy78rwRDAYL3zPwDQ08zJ4sq/uNp1KySl8z8AkBIuQEXKvwLQn80ijfM/APAdaHeoyb8ceoTFW3XzPwAwSGltDMm/4jatSc5d8z8AwEWmIHHIv0DUTZh5RvM/ADAUtI/Wx78ky//OXC/zPwBwYjy4PMe/SQ2hdXcY8z8AYDebmqPGv5A5PjfIAfM/AKC3VDELxr9B+JW7TuvyPwAwJHZ9c8W/0akZAgrV8j8AMMKPe9zEvyr9t6j5vvI/AADSUSxGxL+rGwx6HKnyPwAAg7yKsMO/MLUUYHKT8j8AAElrmRvDv/WhV1f6ffI/AECkkFSHwr+/Ox2bs2jyPwCgefi588G/vfWPg51T8j8AoCwlyGDBvzsIyaq3PvI/ACD3V3/OwL+2QKkrASryPwCg/kncPMC/MkHMlnkV8j8AgEu8vVe/v5v80h0gAfI/AEBAlgg3vr8LSE1J9OzxPwBA+T6YF72/aWWPUvXY8T8AoNhOZ/m7v3x+VxEjxfE/AGAvIHncur/pJst0fLHxPwCAKOfDwLm/thosDAGe8T8AwHKzRqa4v71wtnuwivE/AACsswGNt7+2vO8linfxPwAAOEXxdLa/2jFMNY1k8T8AgIdtDl61v91fJ5C5UfE/AOCh3lxItL9M0jKkDj/xPwCgak3ZM7O/2vkQcoss8T8AYMX4eSCyvzG17CgwGvE/ACBimEYOsb+vNITa+wfxPwAA0mps+q+/s2tOD+718D8AQHdKjdqtv86fKl0G5PA/AACF5Oy8q78hpSxjRNLwPwDAEkCJoam/GpjifKfA8D8AwAIzWIinv9E2xoMvr/A/AIDWZ15xpb85E6CY253wPwCAZUmKXKO/3+dSr6uM8D8AQBVk40mhv/soTi+fe/A/AIDrgsBynr8ZjzWMtWrwPwCAUlLxVZq/LPnspe5Z8D8AgIHPYj2Wv5As0c1JSfA/AACqjPsokr+prfDGxjjwPwAA+SB7MYy/qTJ5E2Uo8D8AAKpdNRmEv0hz6ickGPA/AADswgMSeL+VsRQGBAjwPwAAJHkJBGC/Gvom9x/g7z8AAJCE8+9vP3TqYcIcoe8/AAA9NUHchz8umYGwEGPvPwCAwsSjzpM/za3uPPYl7z8AAIkUwZ+bP+cTkQPI6e4/AAARztiwoT+rsct4gK7uPwDAAdBbiqU/mwydohp07j8AgNhAg1ypP7WZCoOROu4/AIBX72onrT9WmmAJ4AHuPwDAmOWYdbA/mLt35QHK7T8AIA3j9VOyPwORfAvyku0/AAA4i90utD/OXPtmrFztPwDAV4dZBrY/nd5eqiwn7T8AAGo1dtq3P80saz5u8uw/AGAcTkOruT8Ceaeibb7sPwBgDbvHeLs/bQg3bSaL7D8AIOcyE0O9PwRYXb2UWOw/AGDecTEKvz+Mn7sztSbsPwBAkSsVZ8A/P+fs7oP16z8AsJKChUfBP8GW23X9xOs/ADDKzW4mwj8oSoYMHpXrPwBQxabXA8M/LD7vxeJl6z8AEDM8w9/DP4uIyWdIN+s/AIB6aza6xD9KMB0hSwnrPwDw0Sg5k8U/fu/yhejb6j8A8BgkzWrGP6I9YDEdr+o/AJBm7PhAxz+nWNM/5oLqPwDwGvXAFcg/i3MJ70BX6j8AgPZUKenIPydLq5AqLOo/AED4Aja7yT/R8pMToAHqPwAALBzti8o/GzzbJJ/X6T8A0AFcUVvLP5CxxwUlruk/AMC8zGcpzD8vzpfyLoXpPwBgSNU19sw/dUuk7rpc6T8AwEY0vcHNPzhI553GNOk/AODPuAGMzj/mUmcvTw3pPwCQF8AJVc8/ndf/jlLm6D8AuB8SbA7QP3wAzJ/Ov+g/ANCTDrhx0D8Ow77awJnoPwBwhp5r1NA/+xcjqid06D8A0EszhzbRPwias6wAT+g/AEgjZw2Y0T9VPmXoSSroPwCAzOD/+NE/YAL0lQEG6D8AaGPXX1nSPymj4GMl4uc/AKgUCTC50j+ttdx3s77nPwBgQxByGNM/wiWXZ6qb5z8AGOxtJnfTP1cGF/IHeec/ADCv+0/V0z8ME9bbylbnPwDgL+PuMtQ/a7ZPAQAQ5j88W0KRbAJ+PJW0TQMAMOY/QV0ASOq/jTx41JQNAFDmP7el1oanf448rW9OBwBw5j9MJVRr6vxhPK4P3/7/j+Y//Q5ZTCd+fLy8xWMHALDmPwHa3EhowYq89sFcHgDQ5j8Rk0mdHD+DPD72Bev/7+Y/Uy3iGgSAfryAl4YOABDnP1J5CXFm/3s8Euln/P8v5z8kh70m4gCMPGoRgd//T+c/0gHxbpECbryQnGcPAHDnP3ScVM1x/Ge8Nch++v+P5z+DBPWewb6BPObCIP7/r+c/ZWTMKRd+cLwAyT/t/8/nPxyLewhygIC8dhom6f/v5z+u+Z1tKMCNPOijnAQAEOg/M0zlUdJ/iTyPLJMXADDoP4HzMLbp/oq8nHMzBgBQ6D+8NWVrv7+JPMaJQiAAcOg/dXsR82W/i7wEefXr/4/oP1fLPaJuAIm83wS8IgCw6D8KS+A43wB9vIobDOX/z+g/BZ//RnEAiLxDjpH8/+/oPzhwetB7gYM8x1/6HgAQ6T8DtN92kT6JPLl7RhMAMOk/dgKYS06AfzxvB+7m/0/pPy5i/9nwfo+80RI83v9v6T+6OCaWqoJwvA2KRfT/j+k/76hkkRuAh7w+Lpjd/6/pPzeTWorgQIe8ZvtJ7f/P6T8A4JvBCM4/PFGc8SAA8Ok/CluIJ6o/irwGsEURABDqP1baWJlI/3Q8+va7BwAw6j8YbSuKq76MPHkdlxAAUOo/MHl43cr+iDxILvUdAHDqP9ur2D12QY+8UjNZHACQ6j8SdsKEAr+OvEs+TyoAsOo/Xz//PAT9abzRHq7X/8/qP7RwkBLnPoK8eARR7v/v6j+j3g7gPgZqPFsNZdv/D+s/uQofOMgGWjxXyqr+/y/rPx08I3QeAXm83LqV2f9P6z+fKoZoEP95vJxlniQAcOs/Pk+G0EX/ijxAFof5/4/rP/nDwpZ3/nw8T8sE0v+v6z/EK/LuJ/9jvEVcQdL/z+s/Ieo77rf/bLzfCWP4/+/rP1wLLpcDQYG8U3a14f8P7D8ZareUZMGLPONX+vH/L+w/7cYwje/+ZLwk5L/c/0/sP3VH7LxoP4S897lU7f9v7D/s4FPwo36EPNWPmev/j+w/8ZL5jQaDczyaISUhALDsPwQOGGSO/Wi8nEaU3f/P7D9y6sccvn6OPHbE/er/7+w//oifrTm+jjwr+JoWABDtP3FauaiRfXU8HfcPDQAw7T/ax3BpkMGJPMQPeer/T+0/DP5YxTcOWLzlh9wuAHDtP0QPwU3WgH+8qoLcIQCQ7T9cXP2Uj3x0vIMCa9j/r+0/fmEhxR1/jDw5R2wpANDtP1Ox/7KeAYg89ZBE5f/v7T+JzFLG0gBuPJT2q83/D+4/0mktIECDf7zdyFLb/y/uP2QIG8rBAHs87xZC8v9P7j9Rq5SwqP9yPBFeiuj/b+4/Wb7vsXP2V7wN/54RAJDuPwHIC16NgIS8RBel3/+v7j+1IEPVBgB4PKF/EhoA0O4/klxWYPgCULzEvLoHAPDuPxHmNV1EQIW8Ao169f8P7z8Fke85MftPvMeK5R4AMO8/VRFz8qyBijyUNIL1/0/vP0PH19RBP4o8a0yp/P9v7z91eJgc9AJivEHE+eH/j+8/S+d39NF9dzx+4+DS/6/vPzGjfJoZAW+8nuR3HADQ7z+xrM5L7oFxPDHD4Pf/7+8/WodwATcFbrxuYGX0/w/wP9oKHEmtfoq8WHqG8/8v8D/gsvzDaX+XvBcN/P3/T/A/W5TLNP6/lzyCTc0DAHDwP8tW5MCDAII86Mvy+f+P8D8adTe+3/9tvGXaDAEAsPA/6ybmrn8/kbw406QBANDwP/efSHn6fYA8/f3a+v/v8D/Aa9ZwBQR3vJb9ugsAEPE/YgtthNSAjjxd9OX6/y/xP+82/WT6v5082ZrVDQBQ8T+uUBJwdwCaPJpVIQ8AcPE/7t7j4vn9jTwmVCf8/4/xP3NyO9wwAJE8WTw9EgCw8T+IAQOAeX+ZPLeeKfj/z/E/Z4yfqzL5ZbwA1Ir0/+/xP+tbp52/f5M8pIaLDAAQ8j8iW/2Ra4CfPANDhQMAMPI/M7+f68L/kzyE9rz//0/yP3IuLn7nAXY82SEp9f9v8j9hDH92u/x/PDw6kxQAkPI/K0ECPMoCcrwTY1UUALDyPwIf8jOCgJK8O1L+6//P8j/y3E84fv+IvJatuAsA8PI/xUEwUFH/hbyv4nr7/w/zP50oXohxAIG8f1+s/v8v8z8Vt7c/Xf+RvFZnpgwAUPM/vYKLIoJ/lTwh9/sRAHDzP8zVDcS6AIA8uS9Z+f+P8z9Rp7ItnT+UvELS3QQAsPM/4Th2cGt/hTxXybL1/8/zPzESvxA6Ano8GLSw6v/v8z+wUrFmbX+YPPSvMhUAEPQ/JIUZXzf4Zzwpi0cXADD0P0NR3HLmAYM8Y7SV5/9P9D9aibK4af+JPOB1BOj/b/Q/VPLCm7HAlbznwW/v/4/0P3IqOvIJQJs8BKe+5f+v9D9FfQ2/t/+UvN4nEBcA0PQ/PWrccWTAmbziPvAPAPD0PxxThQuJf5c80UvcEgAQ9T82pGZxZQRgPHonBRYAMPU/CTIjzs6/lrxMcNvs/0/1P9ehBQVyAom8qVRf7/9v9T8SZMkO5r+bPBIQ5hcAkPU/kO+vgcV+iDySPskDALD1P8AMvwoIQZ+8vBlJHQDQ9T8pRyX7KoGYvIl6uOf/7/U/BGntgLd+lLwAQeCTAQsD4EsB";if(!isDataURI(wasmBinaryFile)){wasmBinaryFile=locateFile(wasmBinaryFile)}function getBinary(file){try{if(file==wasmBinaryFile&&wasmBinary){return new Uint8Array(wasmBinary)}var binary=tryParseAsDataURI(file);if(binary){return binary}if(readBinary){return readBinary(file)}throw"both async and sync fetching of the wasm failed"}catch(err){abort(err)}}function getBinaryPromise(){if(!wasmBinary&&(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER)){if(typeof fetch=="function"&&!isFileURI(wasmBinaryFile)){return fetch(wasmBinaryFile,{credentials:"same-origin"}).then(function(response){if(!response["ok"]){throw"failed to load wasm binary file at '"+wasmBinaryFile+"'"}return response["arrayBuffer"]()}).catch(function(){return getBinary(wasmBinaryFile)})}else{if(readAsync){return new Promise(function(resolve,reject){readAsync(wasmBinaryFile,function(response){resolve(new Uint8Array(response))},reject)})}}}return Promise.resolve().then(function(){return getBinary(wasmBinaryFile)})}function createWasm(){var info={"a":asmLibraryArg};function receiveInstance(instance,module){var exports=instance.exports;Module["asm"]=exports;wasmMemory=Module["asm"]["c"];updateGlobalBufferAndViews(wasmMemory.buffer);wasmTable=Module["asm"]["o"];addOnInit(Module["asm"]["d"]);removeRunDependency("wasm-instantiate")}addRunDependency("wasm-instantiate");function receiveInstantiationResult(result){receiveInstance(result["instance"])}function instantiateArrayBuffer(receiver){return getBinaryPromise().then(function(binary){return WebAssembly.instantiate(binary,info)}).then(function(instance){return instance}).then(receiver,function(reason){err("failed to asynchronously prepare wasm: "+reason);abort(reason)})}function instantiateAsync(){if(!wasmBinary&&typeof WebAssembly.instantiateStreaming=="function"&&!isDataURI(wasmBinaryFile)&&!isFileURI(wasmBinaryFile)&&!ENVIRONMENT_IS_NODE&&typeof fetch=="function"){return fetch(wasmBinaryFile,{credentials:"same-origin"}).then(function(response){var result=WebAssembly.instantiateStreaming(response,info);return result.then(receiveInstantiationResult,function(reason){err("wasm streaming compile failed: "+reason);err("falling back to ArrayBuffer instantiation");return instantiateArrayBuffer(receiveInstantiationResult)})})}else{return instantiateArrayBuffer(receiveInstantiationResult)}}if(Module["instantiateWasm"]){try{var exports=Module["instantiateWasm"](info,receiveInstance);return exports}catch(e){err("Module.instantiateWasm callback failed with error: "+e);return false}}instantiateAsync();return{}}var tempDouble;var tempI64;function ExitStatus(status){this.name="ExitStatus";this.message="Program terminated with exit("+status+")";this.status=status}function callRuntimeCallbacks(callbacks){while(callbacks.length>0){callbacks.shift()(Module)}}function getValue(ptr,type="i8"){if(type.endsWith("*"))type="*";switch(type){case"i1":return HEAP8[ptr>>0];case"i8":return HEAP8[ptr>>0];case"i16":return HEAP16[ptr>>1];case"i32":return HEAP32[ptr>>2];case"i64":return HEAP32[ptr>>2];case"float":return HEAPF32[ptr>>2];case"double":return HEAPF64[ptr>>3];case"*":return HEAPU32[ptr>>2];default:abort("invalid type for getValue: "+type)}return null}function intArrayToString(array){var ret=[];for(var i=0;i<array.length;i++){var chr=array[i];if(chr>255){if(ASSERTIONS){assert(false,"Character code "+chr+" ("+String.fromCharCode(chr)+") at offset "+i+" not in 0x00-0xFF.")}chr&=255}ret.push(String.fromCharCode(chr))}return ret.join("")}function setValue(ptr,value,type="i8"){if(type.endsWith("*"))type="*";switch(type){case"i1":HEAP8[ptr>>0]=value;break;case"i8":HEAP8[ptr>>0]=value;break;case"i16":HEAP16[ptr>>1]=value;break;case"i32":HEAP32[ptr>>2]=value;break;case"i64":tempI64=[value>>>0,(tempDouble=value,+Math.abs(tempDouble)>=1?tempDouble>0?(Math.min(+Math.floor(tempDouble/4294967296),4294967295)|0)>>>0:~~+Math.ceil((tempDouble-+(~~tempDouble>>>0))/4294967296)>>>0:0)],HEAP32[ptr>>2]=tempI64[0],HEAP32[ptr+4>>2]=tempI64[1];break;case"float":HEAPF32[ptr>>2]=value;break;case"double":HEAPF64[ptr>>3]=value;break;case"*":HEAPU32[ptr>>2]=value;break;default:abort("invalid type for setValue: "+type)}}function _emscripten_memcpy_big(dest,src,num){HEAPU8.copyWithin(dest,src,src+num)}function abortOnCannotGrowMemory(requestedSize){abort("OOM")}function _emscripten_resize_heap(requestedSize){var oldSize=HEAPU8.length;requestedSize=requestedSize>>>0;abortOnCannotGrowMemory(requestedSize)}var ASSERTIONS=false;var decodeBase64=typeof atob=="function"?atob:function(input){var keyStr="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";var output="";var chr1,chr2,chr3;var enc1,enc2,enc3,enc4;var i=0;input=input.replace(/[^A-Za-z0-9\+\/\=]/g,"");do{enc1=keyStr.indexOf(input.charAt(i++));enc2=keyStr.indexOf(input.charAt(i++));enc3=keyStr.indexOf(input.charAt(i++));enc4=keyStr.indexOf(input.charAt(i++));chr1=enc1<<2|enc2>>4;chr2=(enc2&15)<<4|enc3>>2;chr3=(enc3&3)<<6|enc4;output=output+String.fromCharCode(chr1);if(enc3!==64){output=output+String.fromCharCode(chr2)}if(enc4!==64){output=output+String.fromCharCode(chr3)}}while(i<input.length);return output};function intArrayFromBase64(s){if(typeof ENVIRONMENT_IS_NODE=="boolean"&&ENVIRONMENT_IS_NODE){var buf=Buffer.from(s,"base64");return new Uint8Array(buf["buffer"],buf["byteOffset"],buf["byteLength"])}try{var decoded=decodeBase64(s);var bytes=new Uint8Array(decoded.length);for(var i=0;i<decoded.length;++i){bytes[i]=decoded.charCodeAt(i)}return bytes}catch(_){throw new Error("Converting base64 string to bytes failed.")}}function tryParseAsDataURI(filename){if(!isDataURI(filename)){return}return intArrayFromBase64(filename.slice(dataURIPrefix.length))}var asmLibraryArg={"b":_emscripten_memcpy_big,"a":_emscripten_resize_heap};var asm=createWasm();var ___wasm_call_ctors=Module["___wasm_call_ctors"]=function(){return(___wasm_call_ctors=Module["___wasm_call_ctors"]=Module["asm"]["d"]).apply(null,arguments)};var _malloc=Module["_malloc"]=function(){return(_malloc=Module["_malloc"]=Module["asm"]["e"]).apply(null,arguments)};var _free=Module["_free"]=function(){return(_free=Module["_free"]=Module["asm"]["f"]).apply(null,arguments)};var _shine_check_config=Module["_shine_check_config"]=function(){return(_shine_check_config=Module["_shine_check_config"]=Module["asm"]["g"]).apply(null,arguments)};var _shine_samples_per_pass=Module["_shine_samples_per_pass"]=function(){return(_shine_samples_per_pass=Module["_shine_samples_per_pass"]=Module["asm"]["h"]).apply(null,arguments)};var _shine_encode_buffer=Module["_shine_encode_buffer"]=function(){return(_shine_encode_buffer=Module["_shine_encode_buffer"]=Module["asm"]["i"]).apply(null,arguments)};var _shine_flush=Module["_shine_flush"]=function(){return(_shine_flush=Module["_shine_flush"]=Module["asm"]["j"]).apply(null,arguments)};var _shine_close=Module["_shine_close"]=function(){return(_shine_close=Module["_shine_close"]=Module["asm"]["k"]).apply(null,arguments)};var _shine_js_int16_len=Module["_shine_js_int16_len"]=function(){return(_shine_js_int16_len=Module["_shine_js_int16_len"]=Module["asm"]["l"]).apply(null,arguments)};var _shine_js_ptr_len=Module["_shine_js_ptr_len"]=function(){return(_shine_js_ptr_len=Module["_shine_js_ptr_len"]=Module["asm"]["m"]).apply(null,arguments)};var _shine_js_init=Module["_shine_js_init"]=function(){return(_shine_js_init=Module["_shine_js_init"]=Module["asm"]["n"]).apply(null,arguments)};Module["setValue"]=setValue;Module["getValue"]=getValue;var calledRun;dependenciesFulfilled=function runCaller(){if(!calledRun)run();if(!calledRun)dependenciesFulfilled=runCaller};function run(args){args=args||arguments_;if(runDependencies>0){return}preRun();if(runDependencies>0){return}function doRun(){if(calledRun)return;calledRun=true;Module["calledRun"]=true;if(ABORT)return;initRuntime();if(Module["onRuntimeInitialized"])Module["onRuntimeInitialized"]();postRun()}if(Module["setStatus"]){Module["setStatus"]("Running...");setTimeout(function(){setTimeout(function(){Module["setStatus"]("")},1);doRun()},1)}else{doRun()}}if(Module["preInit"]){if(typeof Module["preInit"]=="function")Module["preInit"]=[Module["preInit"]];while(Module["preInit"].length>0){Module["preInit"].pop()()}}run();var ShineModule;var int16Len;var ptrLen;function shineInit(){int16Len=ShineModule._shine_js_int16_len();ptrLen=ShineModule._shine_js_ptr_len()}function Shine(args){if(ShineModule._shine_check_config(args.samplerate,args.bitrate)<0)throw"Invalid configuration";var stereoMode;if(!args.stereoMode){if(args.channels===1){stereoMode=Shine.MONO}else{stereoMode=Shine.JOINT_STEREO}}else{stereoMode=args.stereoMode}this._handle=ShineModule._shine_js_init(args.channels,args.samplerate,stereoMode,args.bitrate);this._channels=args.channels;this._samples_per_pass=ShineModule._shine_samples_per_pass(this._handle);this._buffer=ShineModule._malloc(this._channels*ptrLen);this._pcm=new Array(this._channels);this._rem=new Array(this._channels);this._written=ShineModule._malloc(int16Len);var _tmp,chan;for(chan=0;chan<this._channels;chan++){this._rem[chan]=new Int16Array;_tmp=ShineModule._malloc(this._samples_per_pass*int16Len);ShineModule.setValue(this._buffer+chan*ptrLen,_tmp,"*");this._pcm[chan]=ShineModule.HEAP16.subarray(_tmp/int16Len,_tmp/int16Len+this._samples_per_pass)}return this}Shine.checkConfig=function(samplerate,bitrate){return ShineModule._shine_check_config(samplerate,bitrate)>=0};Shine.prototype._encodePass=function(data){if(!this._handle)throw"Closed";var chan;for(chan=0;chan<this._channels;chan++)this._pcm[chan].set(data[chan]);var _buf=ShineModule._shine_encode_buffer(this._handle,this._buffer,this._written);var written=ShineModule.getValue(this._written,"i16");return ShineModule.HEAPU8.subarray(_buf,_buf+written)};function concat(ctr,a,b){if(typeof b==="undefined"){return a}var ret=new ctr(a.length+b.length);ret.set(a);ret.subarray(a.length).set(b);return ret}function clip(x){return x>1?1:x<-1?-1:x}function convertFloat32(buf){var ret=new Array(buf.length);var samples=buf[0].length;var chan,i;for(chan=0;chan<buf.length;chan++){ret[chan]=new Int16Array(samples);for(i=0;i<samples;i++){ret[chan][i]=parseInt(clip(buf[chan][i])*32767)}}return ret}Shine.prototype.encode=function(data){if(data.length!=this._channels)throw"Invalid data";var encoded=new Uint8Array;var tmp=new Array(this._channels);if(data[0]instanceof Float32Array){data=convertFloat32(data)}var chan;for(chan=0;chan<this._channels;chan++){tmp[chan]=new Float32Array;this._rem[chan]=concat(Int16Array,this._rem[chan],data[chan])}var i,enc;for(i=0;i<this._rem[0].length;i+=this._samples_per_pass){for(chan=0;chan<this._channels;chan++){tmp[chan]=this._rem[chan].subarray(i,i+this._samples_per_pass)}if(tmp[0].length<this._samples_per_pass){break}else{enc=this._encodePass(tmp);if(enc.length>0){encoded=concat(Uint8Array,encoded,enc)}}}if(tmp[0].length<this._samples_per_pass){this._rem=tmp}else{for(chan=0;chan<this._channels;chan++){this._rem[chan]=new Int16Array}}return encoded};Shine.prototype.close=function(){if(!this._handle){throw"Closed"}var _buf=ShineModule._shine_flush(this._handle,this._written);var written=ShineModule.getValue(this._written,"i16");var encoded=new Uint8Array(written);encoded.set(ShineModule.HEAPU8.subarray(_buf,_buf+written));ShineModule._free(this._written);ShineModule._shine_close(this._handle);this._handle=null;var chan;for(chan=0;chan<this._channels;chan++){ShineModule._free(ShineModule.getValue(this._buffer+chan*ptrLen,"*"))}ShineModule._free(this._buffer);return encoded};Shine.initialized=new Promise(function(resolve){Module["onRuntimeInitialized"]=function(){ShineModule=Module;shineInit();resolve()}});Module["Shine"]=Shine;Module["StereoMode"]={0:"STEREO",1:"JOINT_STEREO",2:"DUAL_CHANNEL",3:"MONO",STEREO:0,JOINT_STEREO:1,DUAL_CHANNEL:2,MONO:3}; -diff --git a/js/libshine.d.ts b/js/libshine.d.ts -new file mode 100644 -index 0000000..8f00edc ---- /dev/null -+++ b/js/libshine.d.ts -@@ -0,0 +1,19 @@ -+export type Data = Int16Array | Float32Array; -+export declare enum StereoMode { -+ STEREO = 0, -+ JOINT_STEREO = 1, -+ DUAL_CHANNEL = 2, -+ MONO = 3 -+} -+export class Shine { -+ static initialized: Promise<void>; -+ static checkConfig(samplerate: number, bitrate: number): boolean; -+ constructor(args: { -+ samplerate: number; -+ bitrate: number; -+ channels: number; -+ stereoMode?: StereoMode; -+ }); -+ encode(data: Data[]): Uint8Array; -+ close(): Uint8Array; -+} -diff --git a/js/package-lock.json b/js/package-lock.json -new file mode 100644 -index 0000000..38b374d ---- /dev/null -+++ b/js/package-lock.json -@@ -0,0 +1,18 @@ -+{ -+ "name": "@toots/shine.js", -+ "version": "1.0.1", -+ "lockfileVersion": 3, -+ "requires": true, -+ "packages": { -+ "": { -+ "name": "@toots/shine.js", -+ "version": "1.0.1", -+ "license": "LGPL-2.0-only" -+ }, -+ "stubs": { -+ "version": "1.0.0", -+ "extraneous": true, -+ "license": "ISC" -+ } -+ } -+} -diff --git a/js/package.json b/js/package.json -new file mode 100644 -index 0000000..0c83619 ---- /dev/null -+++ b/js/package.json -@@ -0,0 +1,24 @@ -+{ -+ "name": "@toots/shine.js", -+ "version": "1.0.3", -+ "description": "Shine fixed-point mp3 encoder", -+ "main": "dist/libshine_node.js", -+ "browser": "dist/libshine_browser.js", -+ "types": "libshine.d.ts", -+ "repository": { -+ "type": "git", -+ "url": "git+https://github.com/toots/shine.git" -+ }, -+ "keywords": [ -+ "mp3", -+ "encoder", -+ "wasm", -+ "fixed-point" -+ ], -+ "author": "Romain Beauxis <toots@rastageeks.org>", -+ "license": "LGPL-2.0-only", -+ "bugs": { -+ "url": "https://github.com/toots/shine/issues" -+ }, -+ "homepage": "https://github.com/toots/shine#readme" -+} -diff --git a/js/src/libshine_browser_wrapper.js b/js/src/libshine_browser_wrapper.js -new file mode 100644 -index 0000000..f0ef04e ---- /dev/null -+++ b/js/src/libshine_browser_wrapper.js -@@ -0,0 +1,10 @@ -+var createModule = require("./libshine_browser_stubs").default; -+ -+Shine.initialized = (createModule()).then(function (Module) { -+ ShineModule = Module; -+ shineInit(); -+}); -+ -+module.exports.Shine = Shine; -+ -+module.exports.StereoMode = StereoMode; -diff --git a/js/src/post.js b/js/src/libshine_class.js -similarity index 57% -rename from js/src/post.js -rename to js/src/libshine_class.js -index f6a07e6..5d88d9e 100644 ---- a/js/src/post.js -+++ b/js/src/libshine_class.js -@@ -1,50 +1,64 @@ - // libshine function wrappers - --var isNode = typeof process === "object" && typeof require === "function"; -+var StereoMode = { -+ '0': 'STEREO', -+ '1': 'JOINT_STEREO', -+ '2': 'DUAL_CHANNEL', -+ '3': 'MONO', -+ STEREO: 0, -+ JOINT_STEREO: 1, -+ DUAL_CHANNEL: 2, -+ MONO: 3 -+}; -+ -+var ShineModule; -+var int16Len; -+var ptrLen; - --var int16Len = Module.HEAP16.BYTES_PER_ELEMENT; --var ptrLen = Module.HEAP32.BYTES_PER_ELEMENT; -+function shineInit() { -+ int16Len = ShineModule._shine_js_int16_len(); -+ ptrLen = ShineModule._shine_js_ptr_len(); -+}; - - function Shine(args) { -- if (_shine_check_config(args.samplerate, args.bitrate) < 0) -+ if (ShineModule._shine_check_config(args.samplerate, args.bitrate) < 0) - throw "Invalid configuration"; - -- var mode; -- if (!args.mode) { -+ var stereoMode; -+ if (!args.stereoMode) { - if (args.channels === 1) { -- mode = Shine.MONO; -+ stereoMode = Shine.MONO; - } else { -- mode = Shine.JOINT_STEREO; -+ stereoMode = Shine.JOINT_STEREO; - } - } else { -- mode = args.mode; -+ stereoMode = args.stereoMode; - } - -- this._handle = _shine_js_init(args.channels, args.samplerate, mode, args.bitrate); -+ this._handle = ShineModule._shine_js_init(args.channels, args.samplerate, stereoMode, args.bitrate); - - this._channels = args.channels; -- this._samples_per_pass = _shine_samples_per_pass(this._handle); -+ this._samples_per_pass = ShineModule._shine_samples_per_pass(this._handle); - -- this._buffer = _malloc(this._channels * ptrLen); -+ this._buffer = ShineModule._malloc(this._channels * ptrLen); - this._pcm = new Array(this._channels); - this._rem = new Array(this._channels); -- this._written = _malloc(int16Len); -+ this._written = ShineModule._malloc(int16Len); - - var _tmp, chan; - for (chan=0; chan<this._channels; chan++) { - this._rem[chan] = new Int16Array; -- _tmp = _malloc(this._samples_per_pass * int16Len); -- setValue(this._buffer + chan*ptrLen, _tmp, "*") -- this._pcm[chan] = Module.HEAP16.subarray(_tmp/int16Len, _tmp/int16Len+this._samples_per_pass) -+ _tmp = ShineModule._malloc(this._samples_per_pass * int16Len); -+ ShineModule.setValue(this._buffer + chan*ptrLen, _tmp, "*") -+ this._pcm[chan] = ShineModule.HEAP16.subarray(_tmp/int16Len, _tmp/int16Len+this._samples_per_pass) - } - - return this; - }; - --Shine.STEREO = 0; --Shine.JOINT_STEREO = 1; --Shine.DUAL_CHANNEL = 2; --Shine.MONO = 3; -+Shine.checkConfig = function (samplerate, bitrate) { -+ return ShineModule._shine_check_config(samplerate, bitrate) >= 0; -+}; - - Shine.prototype._encodePass = function (data) { - if (!this._handle) -@@ -54,11 +68,11 @@ Shine.prototype._encodePass = function (data) { - for (chan=0;chan<this._channels;chan++) - this._pcm[chan].set(data[chan]); - -- var _buf = _shine_encode_buffer(this._handle, this._buffer, this._written); -+ var _buf = ShineModule._shine_encode_buffer(this._handle, this._buffer, this._written); - -- var written = getValue(this._written, "i16"); -+ var written = ShineModule.getValue(this._written, "i16"); - -- return Module.HEAPU8.subarray(_buf, _buf+written); -+ return ShineModule.HEAPU8.subarray(_buf, _buf+written); - }; - - function concat(ctr, a, b) { -@@ -138,30 +152,22 @@ Shine.prototype.close = function () { - throw "Closed"; - } - -- var _buf = _shine_flush(this._handle, this._written); -+ var _buf = ShineModule._shine_flush(this._handle, this._written); - -- var written = getValue(this._written, "i16"); -+ var written = ShineModule.getValue(this._written, "i16"); - var encoded = new Uint8Array(written); - -- encoded.set(Module.HEAPU8.subarray(_buf, _buf + written)); -+ encoded.set(ShineModule.HEAPU8.subarray(_buf, _buf + written)); - -- _free(this._written); -- _shine_close(this._handle); -+ ShineModule._free(this._written); -+ ShineModule._shine_close(this._handle); - this._handle = null; - - var chan; - for (chan=0; chan<this._channels; chan++) { -- _free(getValue(this._buffer + chan*ptrLen, "*")); -+ ShineModule._free(ShineModule.getValue(this._buffer + chan*ptrLen, "*")); - } -- _free(this._buffer); -+ ShineModule._free(this._buffer); - - return encoded; - }; -- --if (isNode) { -- module.exports = Shine; --} -- --return Shine; -- --}).call(context)})(); -diff --git a/js/src/libshine_node_wrapper.js b/js/src/libshine_node_wrapper.js -new file mode 100644 -index 0000000..aaaf28c ---- /dev/null -+++ b/js/src/libshine_node_wrapper.js -@@ -0,0 +1,10 @@ -+Shine.initialized = new Promise(function (resolve) { -+ Module['onRuntimeInitialized'] = function () { -+ ShineModule = Module; -+ shineInit(); -+ resolve(); -+ } -+}) -+ -+Module["Shine"] = Shine; -+Module["StereoMode"] = StereoMode; -diff --git a/js/src/pre.js b/js/src/pre.js -deleted file mode 100644 -index 8078b87..0000000 ---- a/js/src/pre.js -+++ /dev/null -@@ -1,9 +0,0 @@ --// libshine.js - port of libshine to JavaScript using emscripten --// by Romain Beauxis <toots@rastageeks.org> from code by --// Andreas Krennmair <ak@synflood.at> -- -- --var Shine = (function() { -- var Module; -- var context = {}; -- return (function() { -diff --git a/js/src/wrapper.c b/js/src/wrapper.c -index 506570d..375b35c 100644 ---- a/js/src/wrapper.c -+++ b/js/src/wrapper.c -@@ -1,7 +1,16 @@ -+#include "layer3.h" -+#include "types.h" - #include <stdlib.h> - #include <string.h> --#include "types.h" --#include "layer3.h" -+#include <stdint.h> -+ -+size_t shine_js_int16_len() { -+ return sizeof(int16_t); -+} -+ -+size_t shine_js_ptr_len() { -+ return sizeof(void*); -+} - - shine_t shine_js_init(int channels, int samplerate, int mode, int bitr) { - shine_config_t config; -@@ -13,4 +22,4 @@ shine_t shine_js_init(int channels, int samplerate, int mode, int bitr) { - config.mpeg.bitr = bitr; - - return shine_initialise(&config); --} -+} -diff --git a/js/test/browser/Makefile b/js/test/browser/Makefile -index b3eedc8..befc1ce 100644 ---- a/js/test/browser/Makefile -+++ b/js/test/browser/Makefile -@@ -1,2 +1,2 @@ - all: -- python -m SimpleHTTPServer -+ python -m http.server -diff --git a/js/test/browser/encode.js b/js/test/browser/encode.js -index 65e009d..af17116 100644 ---- a/js/test/browser/encode.js -+++ b/js/test/browser/encode.js -@@ -4,24 +4,22 @@ function runEncodeTest(log, callback) { - var samplerate = 44100; - var channels = 2; - var bitrate = 128; -- var mode = Shine.STEREO; - - var shine = new Shine({ - samplerate: samplerate, - channels: channels, - bitrate: bitrate, -- mode: mode - }); - -- var started = new Date; -+ var started = new Date(); - var duration = 0.0; - var encoded = []; - - var xhr = new XMLHttpRequest(); - xhr.open("GET", "encode.wav", true); - xhr.responseType = "arraybuffer"; -- xhr.onload = function() { -- var samples = xhr.response.byteLength / (2*channels); -+ xhr.onload = function () { -+ var samples = xhr.response.byteLength / (2 * channels); - var data = new Int16Array(xhr.response); - var buf = convertInterleavedBuffer(data, channels, samples); - duration += parseFloat(samples) / samplerate; -@@ -33,12 +31,12 @@ function runEncodeTest(log, callback) { - xhr.addEventListener("load", function () { - encoded.push(shine.close()); - -- var ended = new Date -- var encodingTime = (ended.getTime() - started.getTime())/1000 -+ var ended = new Date(); -+ var encodingTime = (ended.getTime() - started.getTime()) / 1000; - log("Done encoding."); - log("File duration: " + duration.toFixed(2) + " seconds"); - log("Encoding time: " + encodingTime.toFixed(2) + " seconds"); -- log("Encoding rate: " + (duration/encodingTime).toFixed(2) + "X"); -+ log("Encoding rate: " + (duration / encodingTime).toFixed(2) + "X"); - callback(new Blob(encoded)); - }); - -@@ -48,10 +46,10 @@ function runEncodeTest(log, callback) { - function convertInterleavedBuffer(buf, channels, samples) { - var chan, i; - ret = new Array(channels); -- for (chan=0; chan<channels; chan++) { -+ for (chan = 0; chan < channels; chan++) { - ret[chan] = new Int16Array(samples); -- for (i=0; i<samples; i++) { -- ret[chan][i] = buf[i*channels + chan]; -+ for (i = 0; i < samples; i++) { -+ ret[chan][i] = buf[i * channels + chan]; - } - } - return ret; -diff --git a/js/test/browser/index.html b/js/test/browser/index.html -index b3a4ee3..6496e46 100644 ---- a/js/test/browser/index.html -+++ b/js/test/browser/index.html -@@ -1,4 +1,4 @@ --<script src="libshine.js"></script> -+<script src="libshine_node.js"></script> - <script src="encode.js"></script> - <script src="rounds.js"></script> - <script> -@@ -7,20 +7,21 @@ - el.innerHTML = el.innerHTML + "<br>" + msg; - }; - -- var load = function() { -- runEncodeTest(log, function (blob) { -- if (typeof window.URL !== "undefined") { -- var link = document.getElementById("download-link"); -- link.href = URL.createObjectURL(blob); -- link.download = "encoded.mp3"; -- } -+ function onLoad() { -+ Shine.initialized.then(function () { -+ runEncodeTest(log, function (blob) { -+ if (typeof window.URL !== "undefined") { -+ var link = document.getElementById("download-link"); -+ link.href = URL.createObjectURL(blob); -+ link.download = "encoded.mp3"; -+ } - -- log(""); -- runRoundsTest(Shine, log); -+ log(""); -+ runRoundsTest(Shine, log); -+ }); - }); - }; -- -- window.addEventListener("load", load, false); -+ window.addEventListener("load", onLoad, false); - </script> - <a href="#" id="download-link">Download encoded file</a> - <div id="output"></div> -diff --git a/js/test/browser/libshine.js b/js/test/browser/libshine.js -deleted file mode 120000 -index fb57470..0000000 ---- a/js/test/browser/libshine.js -+++ /dev/null -@@ -1 +0,0 @@ --../../dist/libshine.js -\ No newline at end of file -diff --git a/js/test/browser/libshine_node.js b/js/test/browser/libshine_node.js -new file mode 120000 -index 0000000..07f07a4 ---- /dev/null -+++ b/js/test/browser/libshine_node.js -@@ -0,0 +1 @@ -+../../dist/libshine_node.js -\ No newline at end of file -diff --git a/js/test/lib/rounds.js b/js/test/lib/rounds.js -index f76410a..1b388b5 100644 ---- a/js/test/lib/rounds.js -+++ b/js/test/lib/rounds.js -@@ -1,39 +1,35 @@ - var channels = 2; // test.wav is stereo - var samplerate = 44100; // ditto - --var runRoundsTest = function(Shine, log) { -+var runRoundsTest = function (Shine, log) { - log("Executing rounds test"); - - var nPasses = 50; - var frameSize = 4096; - var data = new Array(channels); - var chan; -- for (chan=0; chan<channels; chan++) -- data[chan] = new Int16Array(frameSize); -+ for (chan = 0; chan < channels; chan++) data[chan] = new Int16Array(frameSize); - - log("Encoding " + nPasses + " buffers of " + frameSize + " samples"); -- var started = new Date; -+ var started = new Date(); - - var shine = new Shine({ - samplerate: samplerate, - bitrate: 128, - channels: channels, -- model: Shine.STEREO - }); - - var i; -- for (i=0; i < nPasses; i++) -- shine.encode(data); -+ for (i = 0; i < nPasses; i++) shine.encode(data); - shine.close(); - -- var ended = new Date; -- var duration = (parseFloat(nPasses*frameSize) / parseFloat(samplerate)).toFixed(2); -- var encodingTime = (ended.getTime() - started.getTime())/1000; -+ var ended = new Date(); -+ var duration = (parseFloat(nPasses * frameSize) / parseFloat(samplerate)).toFixed(2); -+ var encodingTime = (ended.getTime() - started.getTime()) / 1000; - log("Done encoding"); - log("Total duration: " + duration); - log("Encoding time: " + encodingTime.toFixed(2)); -- log("Encoding rate: " + (duration/encodingTime).toFixed(2) + "X"); -+ log("Encoding rate: " + (duration / encodingTime).toFixed(2) + "X"); - }; - --if (typeof process === "object" && typeof require === "function") -- module.exports = runRoundsTest; -+if (typeof process === "object" && typeof require === "function") module.exports = runRoundsTest; -diff --git a/js/test/nextjs/.eslintrc.json b/js/test/nextjs/.eslintrc.json -new file mode 100644 -index 0000000..bffb357 ---- /dev/null -+++ b/js/test/nextjs/.eslintrc.json -@@ -0,0 +1,3 @@ -+{ -+ "extends": "next/core-web-vitals" -+} -diff --git a/js/test/nextjs/.gitignore b/js/test/nextjs/.gitignore -new file mode 100644 -index 0000000..c87c9b3 ---- /dev/null -+++ b/js/test/nextjs/.gitignore -@@ -0,0 +1,36 @@ -+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. -+ -+# dependencies -+/node_modules -+/.pnp -+.pnp.js -+ -+# testing -+/coverage -+ -+# next.js -+/.next/ -+/out/ -+ -+# production -+/build -+ -+# misc -+.DS_Store -+*.pem -+ -+# debug -+npm-debug.log* -+yarn-debug.log* -+yarn-error.log* -+.pnpm-debug.log* -+ -+# local env files -+.env*.local -+ -+# vercel -+.vercel -+ -+# typescript -+*.tsbuildinfo -+next-env.d.ts -diff --git a/js/test/nextjs/.prettierignore b/js/test/nextjs/.prettierignore -new file mode 100644 -index 0000000..799a1ca ---- /dev/null -+++ b/js/test/nextjs/.prettierignore -@@ -0,0 +1,4 @@ -+.next/ -+out/ -+public/audio -+__ENV.js -diff --git a/js/test/nextjs/.prettierrc b/js/test/nextjs/.prettierrc -new file mode 100644 -index 0000000..a36a92f ---- /dev/null -+++ b/js/test/nextjs/.prettierrc -@@ -0,0 +1,12 @@ -+{ -+ "singleQuote": false, -+ "quoteProps": "as-needed", -+ "arrowParens": "avoid", -+ "tabWidth": 2, -+ "trailingComma": "es5", -+ "semi": false, -+ "jsxSingleQuote": true, -+ "bracketSameLine": false, -+ "printWidth": 120, -+ "parser": "typescript" -+} -diff --git a/js/test/nextjs/README.md b/js/test/nextjs/README.md -new file mode 100644 -index 0000000..fb9bcc9 ---- /dev/null -+++ b/js/test/nextjs/README.md -@@ -0,0 +1,36 @@ -+This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app). -+ -+## Getting Started -+ -+First, run the development server: -+ -+```bash -+npm run dev -+# or -+yarn dev -+``` -+ -+Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. -+ -+You can start editing the page by modifying `pages/index.tsx`. The page auto-updates as you edit the file. -+ -+[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.ts`. -+ -+The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages. -+ -+This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font. -+ -+## Learn More -+ -+To learn more about Next.js, take a look at the following resources: -+ -+- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. -+- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. -+ -+You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome! -+ -+## Deploy on Vercel -+ -+The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. -+ -+Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details. -diff --git a/js/test/nextjs/lib/encode.ts b/js/test/nextjs/lib/encode.ts -new file mode 100644 -index 0000000..6e1ef2d ---- /dev/null -+++ b/js/test/nextjs/lib/encode.ts -@@ -0,0 +1,59 @@ -+import { Shine } from "@toots/shine.js" -+ -+const convertInterleavedBuffer = (buf: Int16Array, channels: number, samples: number) => { -+ const ret = new Array(channels) -+ for (let chan = 0; chan < channels; chan++) { -+ ret[chan] = new Int16Array(samples) -+ for (let i = 0; i < samples; i++) { -+ ret[chan][i] = buf[i * channels + chan] -+ } -+ } -+ return ret -+} -+ -+export const runEncodeTest = (log: (_: string) => void, callback: (_: Blob) => void) => { -+ log("Executing encoding test") -+ -+ const samplerate = 44100 -+ const channels = 2 -+ const bitrate = 128 -+ //const stereoMode = StereoMode.STEREO -+ -+ const shine = new Shine({ -+ samplerate: samplerate, -+ channels: channels, -+ bitrate: bitrate, -+ // stereoMode: stereoMode, -+ }) -+ -+ const started = new Date() -+ let duration = 0.0 -+ const encoded: Uint8Array[] = [] -+ -+ const xhr = new XMLHttpRequest() -+ xhr.open("GET", "encode.wav", true) -+ xhr.responseType = "arraybuffer" -+ xhr.onload = () => { -+ const samples = xhr.response.byteLength / (2 * channels) -+ const data = new Int16Array(xhr.response) -+ const buf = convertInterleavedBuffer(data, channels, samples) -+ duration += samples / samplerate -+ encoded.push(shine.encode(buf)) -+ } -+ -+ log("Got WAV file.") -+ log("Encoding..") -+ xhr.addEventListener("load", () => { -+ encoded.push(shine.close()) -+ -+ const ended = new Date() -+ const encodingTime = (ended.getTime() - started.getTime()) / 1000 -+ log("Done encoding.") -+ log("File duration: " + duration.toFixed(2) + " seconds") -+ log("Encoding time: " + encodingTime.toFixed(2) + " seconds") -+ log("Encoding rate: " + (duration / encodingTime).toFixed(2) + "X") -+ callback(new Blob(encoded)) -+ }) -+ -+ xhr.send() -+} -diff --git a/js/test/nextjs/lib/encode.wav b/js/test/nextjs/lib/encode.wav -new file mode 100644 -index 0000000..c8cd595 -Binary files /dev/null and b/js/test/nextjs/lib/encode.wav differ -diff --git a/js/test/nextjs/lib/rounds.ts b/js/test/nextjs/lib/rounds.ts -new file mode 100644 -index 0000000..fab9b7c ---- /dev/null -+++ b/js/test/nextjs/lib/rounds.ts -@@ -0,0 +1,34 @@ -+import { Shine, StereoMode } from "@toots/shine.js" -+ -+const channels = 2 // test.wav is stereo -+const samplerate = 44100 // ditto -+ -+export const runRoundsTest = (log: (_: string) => void) => { -+ log("Executing rounds test") -+ -+ const nPasses = 50 -+ const frameSize = 4096 -+ const data = new Array(channels) -+ for (let chan = 0; chan < channels; chan++) data[chan] = new Int16Array(frameSize) -+ -+ log("Encoding " + nPasses + " buffers of " + frameSize + " samples") -+ const started = new Date() -+ -+ const shine = new Shine({ -+ samplerate: samplerate, -+ bitrate: 128, -+ channels: channels, -+ stereoMode: StereoMode.STEREO, -+ }) -+ -+ for (let i = 0; i < nPasses; i++) shine.encode(data) -+ shine.close() -+ -+ const ended = new Date() -+ const duration = (nPasses * frameSize) / samplerate -+ const encodingTime = (ended.getTime() - started.getTime()) / 1000 -+ log("Done encoding") -+ log("Total duration: " + duration.toFixed(2)) -+ log("Encoding time: " + encodingTime.toFixed(2)) -+ log("Encoding rate: " + (duration / encodingTime).toFixed(2) + "X") -+} -diff --git a/js/test/nextjs/next.config.js b/js/test/nextjs/next.config.js -new file mode 100644 -index 0000000..a843cbe ---- /dev/null -+++ b/js/test/nextjs/next.config.js -@@ -0,0 +1,6 @@ -+/** @type {import('next').NextConfig} */ -+const nextConfig = { -+ reactStrictMode: true, -+} -+ -+module.exports = nextConfig -diff --git a/js/test/nextjs/package-lock.json b/js/test/nextjs/package-lock.json -new file mode 100644 -index 0000000..02208b0 ---- /dev/null -+++ b/js/test/nextjs/package-lock.json -@@ -0,0 +1,3084 @@ -+{ -+ "name": "shine-nextjs-test-app", -+ "version": "0.1.0", -+ "lockfileVersion": 3, -+ "requires": true, -+ "packages": { -+ "": { -+ "name": "shine-nextjs-test-app", -+ "version": "0.1.0", -+ "dependencies": { -+ "@next/font": "13.1.1", -+ "@toots/shine.js": "file:../..", -+ "@types/node": "18.11.18", -+ "@types/react": "18.0.26", -+ "@types/react-dom": "18.0.10", -+ "eslint": "8.31.0", -+ "eslint-config-next": "13.1.1", -+ "next": "13.1.1", -+ "react": "18.2.0", -+ "react-dom": "18.2.0", -+ "typescript": "4.9.4" -+ }, -+ "devDependencies": { -+ "prettier": "^2.8.1" -+ } -+ }, -+ "node_modules/@babel/runtime": { -+ "version": "7.20.7", -+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz", -+ "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==", -+ "dependencies": { -+ "regenerator-runtime": "^0.13.11" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@babel/runtime-corejs3": { -+ "version": "7.20.7", -+ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.7.tgz", -+ "integrity": "sha512-jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg==", -+ "dependencies": { -+ "core-js-pure": "^3.25.1", -+ "regenerator-runtime": "^0.13.11" -+ }, -+ "engines": { -+ "node": ">=6.9.0" -+ } -+ }, -+ "node_modules/@eslint/eslintrc": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", -+ "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", -+ "dependencies": { -+ "ajv": "^6.12.4", -+ "debug": "^4.3.2", -+ "espree": "^9.4.0", -+ "globals": "^13.19.0", -+ "ignore": "^5.2.0", -+ "import-fresh": "^3.2.1", -+ "js-yaml": "^4.1.0", -+ "minimatch": "^3.1.2", -+ "strip-json-comments": "^3.1.1" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/eslint" -+ } -+ }, -+ "node_modules/@humanwhocodes/config-array": { -+ "version": "0.11.8", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", -+ "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", -+ "dependencies": { -+ "@humanwhocodes/object-schema": "^1.2.1", -+ "debug": "^4.1.1", -+ "minimatch": "^3.0.5" -+ }, -+ "engines": { -+ "node": ">=10.10.0" -+ } -+ }, -+ "node_modules/@humanwhocodes/module-importer": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", -+ "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", -+ "engines": { -+ "node": ">=12.22" -+ }, -+ "funding": { -+ "type": "github", -+ "url": "https://github.com/sponsors/nzakas" -+ } -+ }, -+ "node_modules/@humanwhocodes/object-schema": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", -+ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==" -+ }, -+ "node_modules/@next/env": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/env/-/env-13.1.1.tgz", -+ "integrity": "sha512-vFMyXtPjSAiOXOywMojxfKIqE3VWN5RCAx+tT3AS3pcKjMLFTCJFUWsKv8hC+87Z1F4W3r68qTwDFZIFmd5Xkw==" -+ }, -+ "node_modules/@next/eslint-plugin-next": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.1.1.tgz", -+ "integrity": "sha512-SBrOFS8PC3nQ5aeZmawJkjKkWjwK9RoxvBSv/86nZp0ubdoVQoko8r8htALd9ufp16NhacCdqhu9bzZLDWtALQ==", -+ "dependencies": { -+ "glob": "7.1.7" -+ } -+ }, -+ "node_modules/@next/font": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/font/-/font-13.1.1.tgz", -+ "integrity": "sha512-amygRorS05hYK1/XQRZo5qBl7l2fpHnezeKU/cNveWU5QJg+sg8gMGkUXHtvesNKpiKIJshBRH1TzvO+2sKpvQ==" -+ }, -+ "node_modules/@next/swc-android-arm-eabi": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.1.1.tgz", -+ "integrity": "sha512-qnFCx1kT3JTWhWve4VkeWuZiyjG0b5T6J2iWuin74lORCupdrNukxkq9Pm+Z7PsatxuwVJMhjUoYz7H4cWzx2A==", -+ "cpu": [ -+ "arm" -+ ], -+ "optional": true, -+ "os": [ -+ "android" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-android-arm64": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.1.1.tgz", -+ "integrity": "sha512-eCiZhTzjySubNqUnNkQCjU3Fh+ep3C6b5DCM5FKzsTH/3Gr/4Y7EiaPZKILbvnXmhWtKPIdcY6Zjx51t4VeTfA==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "android" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-darwin-arm64": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.1.1.tgz", -+ "integrity": "sha512-9zRJSSIwER5tu9ADDkPw5rIZ+Np44HTXpYMr0rkM656IvssowPxmhK0rTreC1gpUCYwFsRbxarUJnJsTWiutPg==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-darwin-x64": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.1.1.tgz", -+ "integrity": "sha512-qWr9qEn5nrnlhB0rtjSdR00RRZEtxg4EGvicIipqZWEyayPxhUu6NwKiG8wZiYZCLfJ5KWr66PGSNeDMGlNaiA==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-freebsd-x64": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.1.1.tgz", -+ "integrity": "sha512-UwP4w/NcQ7V/VJEj3tGVszgb4pyUCt3lzJfUhjDMUmQbzG9LDvgiZgAGMYH6L21MoyAATJQPDGiAMWAPKsmumA==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "freebsd" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-linux-arm-gnueabihf": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.1.1.tgz", -+ "integrity": "sha512-CnsxmKHco9sosBs1XcvCXP845Db+Wx1G0qouV5+Gr+HT/ZlDYEWKoHVDgnJXLVEQzq4FmHddBNGbXvgqM1Gfkg==", -+ "cpu": [ -+ "arm" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-linux-arm64-gnu": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.1.1.tgz", -+ "integrity": "sha512-JfDq1eri5Dif+VDpTkONRd083780nsMCOKoFG87wA0sa4xL8LGcXIBAkUGIC1uVy9SMsr2scA9CySLD/i+Oqiw==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-linux-arm64-musl": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.1.1.tgz", -+ "integrity": "sha512-GA67ZbDq2AW0CY07zzGt07M5b5Yaq5qUpFIoW3UFfjOPgb0Sqf3DAW7GtFMK1sF4ROHsRDMGQ9rnT0VM2dVfKA==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-linux-x64-gnu": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.1.1.tgz", -+ "integrity": "sha512-nnjuBrbzvqaOJaV+XgT8/+lmXrSCOt1YYZn/irbDb2fR2QprL6Q7WJNgwsZNxiLSfLdv+2RJGGegBx9sLBEzGA==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-linux-x64-musl": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.1.1.tgz", -+ "integrity": "sha512-CM9xnAQNIZ8zf/igbIT/i3xWbQZYaF397H+JroF5VMOCUleElaMdQLL5riJml8wUfPoN3dtfn2s4peSr3azz/g==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-win32-arm64-msvc": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.1.1.tgz", -+ "integrity": "sha512-pzUHOGrbgfGgPlOMx9xk3QdPJoRPU+om84hqVoe6u+E0RdwOG0Ho/2UxCgDqmvpUrMab1Deltlt6RqcXFpnigQ==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "win32" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-win32-ia32-msvc": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.1.1.tgz", -+ "integrity": "sha512-WeX8kVS46aobM9a7Xr/kEPcrTyiwJqQv/tbw6nhJ4fH9xNZ+cEcyPoQkwPo570dCOLz3Zo9S2q0E6lJ/EAUOBg==", -+ "cpu": [ -+ "ia32" -+ ], -+ "optional": true, -+ "os": [ -+ "win32" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@next/swc-win32-x64-msvc": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.1.tgz", -+ "integrity": "sha512-mVF0/3/5QAc5EGVnb8ll31nNvf3BWpPY4pBb84tk+BfQglWLqc5AC9q1Ht/YMWiEgs8ALNKEQ3GQnbY0bJF2Gg==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "win32" -+ ], -+ "engines": { -+ "node": ">= 10" -+ } -+ }, -+ "node_modules/@nodelib/fs.scandir": { -+ "version": "2.1.5", -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", -+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", -+ "dependencies": { -+ "@nodelib/fs.stat": "2.0.5", -+ "run-parallel": "^1.1.9" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/@nodelib/fs.stat": { -+ "version": "2.0.5", -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", -+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/@nodelib/fs.walk": { -+ "version": "1.2.8", -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", -+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", -+ "dependencies": { -+ "@nodelib/fs.scandir": "2.1.5", -+ "fastq": "^1.6.0" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/@pkgr/utils": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.3.1.tgz", -+ "integrity": "sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==", -+ "dependencies": { -+ "cross-spawn": "^7.0.3", -+ "is-glob": "^4.0.3", -+ "open": "^8.4.0", -+ "picocolors": "^1.0.0", -+ "tiny-glob": "^0.2.9", -+ "tslib": "^2.4.0" -+ }, -+ "engines": { -+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/unts" -+ } -+ }, -+ "node_modules/@rushstack/eslint-patch": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz", -+ "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==" -+ }, -+ "node_modules/@swc/helpers": { -+ "version": "0.4.14", -+ "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz", -+ "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==", -+ "dependencies": { -+ "tslib": "^2.4.0" -+ } -+ }, -+ "node_modules/@toots/shine.js": { -+ "version": "1.0.1", -+ "resolved": "file:../..", -+ "license": "LGPL-2.0-only" -+ }, -+ "node_modules/@types/json5": { -+ "version": "0.0.29", -+ "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", -+ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==" -+ }, -+ "node_modules/@types/node": { -+ "version": "18.11.18", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", -+ "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==" -+ }, -+ "node_modules/@types/prop-types": { -+ "version": "15.7.5", -+ "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", -+ "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" -+ }, -+ "node_modules/@types/react": { -+ "version": "18.0.26", -+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz", -+ "integrity": "sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==", -+ "dependencies": { -+ "@types/prop-types": "*", -+ "@types/scheduler": "*", -+ "csstype": "^3.0.2" -+ } -+ }, -+ "node_modules/@types/react-dom": { -+ "version": "18.0.10", -+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.10.tgz", -+ "integrity": "sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg==", -+ "dependencies": { -+ "@types/react": "*" -+ } -+ }, -+ "node_modules/@types/scheduler": { -+ "version": "0.16.2", -+ "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", -+ "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" -+ }, -+ "node_modules/@typescript-eslint/parser": { -+ "version": "5.47.1", -+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.47.1.tgz", -+ "integrity": "sha512-9Vb+KIv29r6GPu4EboWOnQM7T+UjpjXvjCPhNORlgm40a9Ia9bvaPJswvtae1gip2QEeVeGh6YquqAzEgoRAlw==", -+ "dependencies": { -+ "@typescript-eslint/scope-manager": "5.47.1", -+ "@typescript-eslint/types": "5.47.1", -+ "@typescript-eslint/typescript-estree": "5.47.1", -+ "debug": "^4.3.4" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/typescript-eslint" -+ }, -+ "peerDependencies": { -+ "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" -+ }, -+ "peerDependenciesMeta": { -+ "typescript": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/@typescript-eslint/scope-manager": { -+ "version": "5.47.1", -+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.47.1.tgz", -+ "integrity": "sha512-9hsFDsgUwrdOoW1D97Ewog7DYSHaq4WKuNs0LHF9RiCmqB0Z+XRR4Pf7u7u9z/8CciHuJ6yxNws1XznI3ddjEw==", -+ "dependencies": { -+ "@typescript-eslint/types": "5.47.1", -+ "@typescript-eslint/visitor-keys": "5.47.1" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/typescript-eslint" -+ } -+ }, -+ "node_modules/@typescript-eslint/types": { -+ "version": "5.47.1", -+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.47.1.tgz", -+ "integrity": "sha512-CmALY9YWXEpwuu6377ybJBZdtSAnzXLSQcxLSqSQSbC7VfpMu/HLVdrnVJj7ycI138EHqocW02LPJErE35cE9A==", -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/typescript-eslint" -+ } -+ }, -+ "node_modules/@typescript-eslint/typescript-estree": { -+ "version": "5.47.1", -+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.47.1.tgz", -+ "integrity": "sha512-4+ZhFSuISAvRi2xUszEj0xXbNTHceV9GbH9S8oAD2a/F9SW57aJNQVOCxG8GPfSWH/X4eOPdMEU2jYVuWKEpWA==", -+ "dependencies": { -+ "@typescript-eslint/types": "5.47.1", -+ "@typescript-eslint/visitor-keys": "5.47.1", -+ "debug": "^4.3.4", -+ "globby": "^11.1.0", -+ "is-glob": "^4.0.3", -+ "semver": "^7.3.7", -+ "tsutils": "^3.21.0" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/typescript-eslint" -+ }, -+ "peerDependenciesMeta": { -+ "typescript": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/@typescript-eslint/visitor-keys": { -+ "version": "5.47.1", -+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.47.1.tgz", -+ "integrity": "sha512-rF3pmut2JCCjh6BLRhNKdYjULMb1brvoaiWDlHfLNVgmnZ0sBVJrs3SyaKE1XoDDnJuAx/hDQryHYmPUuNq0ig==", -+ "dependencies": { -+ "@typescript-eslint/types": "5.47.1", -+ "eslint-visitor-keys": "^3.3.0" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/typescript-eslint" -+ } -+ }, -+ "node_modules/acorn": { -+ "version": "8.8.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", -+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", -+ "bin": { -+ "acorn": "bin/acorn" -+ }, -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/acorn-jsx": { -+ "version": "5.3.2", -+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", -+ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", -+ "peerDependencies": { -+ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" -+ } -+ }, -+ "node_modules/ajv": { -+ "version": "6.12.6", -+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", -+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", -+ "dependencies": { -+ "fast-deep-equal": "^3.1.1", -+ "fast-json-stable-stringify": "^2.0.0", -+ "json-schema-traverse": "^0.4.1", -+ "uri-js": "^4.2.2" -+ }, -+ "funding": { -+ "type": "github", -+ "url": "https://github.com/sponsors/epoberezkin" -+ } -+ }, -+ "node_modules/ansi-regex": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", -+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/ansi-styles": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", -+ "dependencies": { -+ "color-convert": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ } -+ }, -+ "node_modules/argparse": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", -+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" -+ }, -+ "node_modules/aria-query": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz", -+ "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==", -+ "dependencies": { -+ "@babel/runtime": "^7.10.2", -+ "@babel/runtime-corejs3": "^7.10.2" -+ }, -+ "engines": { -+ "node": ">=6.0" -+ } -+ }, -+ "node_modules/array-includes": { -+ "version": "3.1.6", -+ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", -+ "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.4", -+ "es-abstract": "^1.20.4", -+ "get-intrinsic": "^1.1.3", -+ "is-string": "^1.0.7" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/array-union": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", -+ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/array.prototype.flat": { -+ "version": "1.3.1", -+ "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", -+ "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.4", -+ "es-abstract": "^1.20.4", -+ "es-shim-unscopables": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/array.prototype.flatmap": { -+ "version": "1.3.1", -+ "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", -+ "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.4", -+ "es-abstract": "^1.20.4", -+ "es-shim-unscopables": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/array.prototype.tosorted": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", -+ "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.4", -+ "es-abstract": "^1.20.4", -+ "es-shim-unscopables": "^1.0.0", -+ "get-intrinsic": "^1.1.3" -+ } -+ }, -+ "node_modules/ast-types-flow": { -+ "version": "0.0.7", -+ "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", -+ "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==" -+ }, -+ "node_modules/axe-core": { -+ "version": "4.6.1", -+ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.6.1.tgz", -+ "integrity": "sha512-lCZN5XRuOnpG4bpMq8v0khrWtUOn+i8lZSb6wHZH56ZfbIEv6XwJV84AAueh9/zi7qPVJ/E4yz6fmsiyOmXR4w==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/axobject-query": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", -+ "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==" -+ }, -+ "node_modules/balanced-match": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" -+ }, -+ "node_modules/brace-expansion": { -+ "version": "1.1.11", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", -+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" -+ } -+ }, -+ "node_modules/braces": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", -+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", -+ "dependencies": { -+ "fill-range": "^7.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/call-bind": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", -+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", -+ "dependencies": { -+ "function-bind": "^1.1.1", -+ "get-intrinsic": "^1.0.2" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/callsites": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", -+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/caniuse-lite": { -+ "version": "1.0.30001441", -+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz", -+ "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==", -+ "funding": [ -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/browserslist" -+ }, -+ { -+ "type": "tidelift", -+ "url": "https://tidelift.com/funding/github/npm/caniuse-lite" -+ } -+ ] -+ }, -+ "node_modules/chalk": { -+ "version": "4.1.2", -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", -+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", -+ "dependencies": { -+ "ansi-styles": "^4.1.0", -+ "supports-color": "^7.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/chalk/chalk?sponsor=1" -+ } -+ }, -+ "node_modules/client-only": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", -+ "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==" -+ }, -+ "node_modules/color-convert": { -+ "version": "2.0.1", -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -+ "dependencies": { -+ "color-name": "~1.1.4" -+ }, -+ "engines": { -+ "node": ">=7.0.0" -+ } -+ }, -+ "node_modules/color-name": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" -+ }, -+ "node_modules/concat-map": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", -+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" -+ }, -+ "node_modules/core-js-pure": { -+ "version": "3.27.1", -+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.27.1.tgz", -+ "integrity": "sha512-BS2NHgwwUppfeoqOXqi08mUqS5FiZpuRuJJpKsaME7kJz0xxuk0xkhDdfMIlP/zLa80krBqss1LtD7f889heAw==", -+ "hasInstallScript": true, -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/core-js" -+ } -+ }, -+ "node_modules/cross-spawn": { -+ "version": "7.0.3", -+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", -+ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", -+ "dependencies": { -+ "path-key": "^3.1.0", -+ "shebang-command": "^2.0.0", -+ "which": "^2.0.1" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/csstype": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", -+ "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" -+ }, -+ "node_modules/damerau-levenshtein": { -+ "version": "1.0.8", -+ "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", -+ "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==" -+ }, -+ "node_modules/debug": { -+ "version": "4.3.4", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", -+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", -+ "dependencies": { -+ "ms": "2.1.2" -+ }, -+ "engines": { -+ "node": ">=6.0" -+ }, -+ "peerDependenciesMeta": { -+ "supports-color": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/deep-is": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", -+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" -+ }, -+ "node_modules/define-lazy-prop": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", -+ "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/define-properties": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", -+ "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", -+ "dependencies": { -+ "has-property-descriptors": "^1.0.0", -+ "object-keys": "^1.1.1" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/dir-glob": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", -+ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", -+ "dependencies": { -+ "path-type": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/doctrine": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", -+ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", -+ "dependencies": { -+ "esutils": "^2.0.2" -+ }, -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/emoji-regex": { -+ "version": "9.2.2", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", -+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" -+ }, -+ "node_modules/enhanced-resolve": { -+ "version": "5.12.0", -+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", -+ "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", -+ "dependencies": { -+ "graceful-fs": "^4.2.4", -+ "tapable": "^2.2.0" -+ }, -+ "engines": { -+ "node": ">=10.13.0" -+ } -+ }, -+ "node_modules/es-abstract": { -+ "version": "1.20.5", -+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz", -+ "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "es-to-primitive": "^1.2.1", -+ "function-bind": "^1.1.1", -+ "function.prototype.name": "^1.1.5", -+ "get-intrinsic": "^1.1.3", -+ "get-symbol-description": "^1.0.0", -+ "gopd": "^1.0.1", -+ "has": "^1.0.3", -+ "has-property-descriptors": "^1.0.0", -+ "has-symbols": "^1.0.3", -+ "internal-slot": "^1.0.3", -+ "is-callable": "^1.2.7", -+ "is-negative-zero": "^2.0.2", -+ "is-regex": "^1.1.4", -+ "is-shared-array-buffer": "^1.0.2", -+ "is-string": "^1.0.7", -+ "is-weakref": "^1.0.2", -+ "object-inspect": "^1.12.2", -+ "object-keys": "^1.1.1", -+ "object.assign": "^4.1.4", -+ "regexp.prototype.flags": "^1.4.3", -+ "safe-regex-test": "^1.0.0", -+ "string.prototype.trimend": "^1.0.6", -+ "string.prototype.trimstart": "^1.0.6", -+ "unbox-primitive": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/es-shim-unscopables": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", -+ "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", -+ "dependencies": { -+ "has": "^1.0.3" -+ } -+ }, -+ "node_modules/es-to-primitive": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", -+ "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", -+ "dependencies": { -+ "is-callable": "^1.1.4", -+ "is-date-object": "^1.0.1", -+ "is-symbol": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/escape-string-regexp": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", -+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/eslint": { -+ "version": "8.31.0", -+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz", -+ "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==", -+ "dependencies": { -+ "@eslint/eslintrc": "^1.4.1", -+ "@humanwhocodes/config-array": "^0.11.8", -+ "@humanwhocodes/module-importer": "^1.0.1", -+ "@nodelib/fs.walk": "^1.2.8", -+ "ajv": "^6.10.0", -+ "chalk": "^4.0.0", -+ "cross-spawn": "^7.0.2", -+ "debug": "^4.3.2", -+ "doctrine": "^3.0.0", -+ "escape-string-regexp": "^4.0.0", -+ "eslint-scope": "^7.1.1", -+ "eslint-utils": "^3.0.0", -+ "eslint-visitor-keys": "^3.3.0", -+ "espree": "^9.4.0", -+ "esquery": "^1.4.0", -+ "esutils": "^2.0.2", -+ "fast-deep-equal": "^3.1.3", -+ "file-entry-cache": "^6.0.1", -+ "find-up": "^5.0.0", -+ "glob-parent": "^6.0.2", -+ "globals": "^13.19.0", -+ "grapheme-splitter": "^1.0.4", -+ "ignore": "^5.2.0", -+ "import-fresh": "^3.0.0", -+ "imurmurhash": "^0.1.4", -+ "is-glob": "^4.0.0", -+ "is-path-inside": "^3.0.3", -+ "js-sdsl": "^4.1.4", -+ "js-yaml": "^4.1.0", -+ "json-stable-stringify-without-jsonify": "^1.0.1", -+ "levn": "^0.4.1", -+ "lodash.merge": "^4.6.2", -+ "minimatch": "^3.1.2", -+ "natural-compare": "^1.4.0", -+ "optionator": "^0.9.1", -+ "regexpp": "^3.2.0", -+ "strip-ansi": "^6.0.1", -+ "strip-json-comments": "^3.1.0", -+ "text-table": "^0.2.0" -+ }, -+ "bin": { -+ "eslint": "bin/eslint.js" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/eslint" -+ } -+ }, -+ "node_modules/eslint-config-next": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.1.1.tgz", -+ "integrity": "sha512-/5S2XGWlGaiqrRhzpn51ux5JUSLwx8PVK2keLi5xk7QmhfYB8PqE6R6SlVw6hgnf/VexvUXSrlNJ/su00NhtHQ==", -+ "dependencies": { -+ "@next/eslint-plugin-next": "13.1.1", -+ "@rushstack/eslint-patch": "^1.1.3", -+ "@typescript-eslint/parser": "^5.42.0", -+ "eslint-import-resolver-node": "^0.3.6", -+ "eslint-import-resolver-typescript": "^3.5.2", -+ "eslint-plugin-import": "^2.26.0", -+ "eslint-plugin-jsx-a11y": "^6.5.1", -+ "eslint-plugin-react": "^7.31.7", -+ "eslint-plugin-react-hooks": "^4.5.0" -+ }, -+ "peerDependencies": { -+ "eslint": "^7.23.0 || ^8.0.0", -+ "typescript": ">=3.3.1" -+ }, -+ "peerDependenciesMeta": { -+ "typescript": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/eslint-import-resolver-node": { -+ "version": "0.3.6", -+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", -+ "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==", -+ "dependencies": { -+ "debug": "^3.2.7", -+ "resolve": "^1.20.0" -+ } -+ }, -+ "node_modules/eslint-import-resolver-node/node_modules/debug": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", -+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -+ "dependencies": { -+ "ms": "^2.1.1" -+ } -+ }, -+ "node_modules/eslint-import-resolver-typescript": { -+ "version": "3.5.2", -+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.2.tgz", -+ "integrity": "sha512-zX4ebnnyXiykjhcBvKIf5TNvt8K7yX6bllTRZ14MiurKPjDpCAZujlszTdB8pcNXhZcOf+god4s9SjQa5GnytQ==", -+ "dependencies": { -+ "debug": "^4.3.4", -+ "enhanced-resolve": "^5.10.0", -+ "get-tsconfig": "^4.2.0", -+ "globby": "^13.1.2", -+ "is-core-module": "^2.10.0", -+ "is-glob": "^4.0.3", -+ "synckit": "^0.8.4" -+ }, -+ "engines": { -+ "node": "^14.18.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts" -+ }, -+ "peerDependencies": { -+ "eslint": "*", -+ "eslint-plugin-import": "*" -+ } -+ }, -+ "node_modules/eslint-import-resolver-typescript/node_modules/globby": { -+ "version": "13.1.3", -+ "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz", -+ "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==", -+ "dependencies": { -+ "dir-glob": "^3.0.1", -+ "fast-glob": "^3.2.11", -+ "ignore": "^5.2.0", -+ "merge2": "^1.4.1", -+ "slash": "^4.0.0" -+ }, -+ "engines": { -+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/eslint-import-resolver-typescript/node_modules/slash": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", -+ "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", -+ "engines": { -+ "node": ">=12" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/eslint-module-utils": { -+ "version": "2.7.4", -+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", -+ "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", -+ "dependencies": { -+ "debug": "^3.2.7" -+ }, -+ "engines": { -+ "node": ">=4" -+ }, -+ "peerDependenciesMeta": { -+ "eslint": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/eslint-module-utils/node_modules/debug": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", -+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -+ "dependencies": { -+ "ms": "^2.1.1" -+ } -+ }, -+ "node_modules/eslint-plugin-import": { -+ "version": "2.26.0", -+ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz", -+ "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==", -+ "dependencies": { -+ "array-includes": "^3.1.4", -+ "array.prototype.flat": "^1.2.5", -+ "debug": "^2.6.9", -+ "doctrine": "^2.1.0", -+ "eslint-import-resolver-node": "^0.3.6", -+ "eslint-module-utils": "^2.7.3", -+ "has": "^1.0.3", -+ "is-core-module": "^2.8.1", -+ "is-glob": "^4.0.3", -+ "minimatch": "^3.1.2", -+ "object.values": "^1.1.5", -+ "resolve": "^1.22.0", -+ "tsconfig-paths": "^3.14.1" -+ }, -+ "engines": { -+ "node": ">=4" -+ }, -+ "peerDependencies": { -+ "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" -+ } -+ }, -+ "node_modules/eslint-plugin-import/node_modules/debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "dependencies": { -+ "ms": "2.0.0" -+ } -+ }, -+ "node_modules/eslint-plugin-import/node_modules/doctrine": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", -+ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", -+ "dependencies": { -+ "esutils": "^2.0.2" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/eslint-plugin-import/node_modules/ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" -+ }, -+ "node_modules/eslint-plugin-jsx-a11y": { -+ "version": "6.6.1", -+ "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz", -+ "integrity": "sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==", -+ "dependencies": { -+ "@babel/runtime": "^7.18.9", -+ "aria-query": "^4.2.2", -+ "array-includes": "^3.1.5", -+ "ast-types-flow": "^0.0.7", -+ "axe-core": "^4.4.3", -+ "axobject-query": "^2.2.0", -+ "damerau-levenshtein": "^1.0.8", -+ "emoji-regex": "^9.2.2", -+ "has": "^1.0.3", -+ "jsx-ast-utils": "^3.3.2", -+ "language-tags": "^1.0.5", -+ "minimatch": "^3.1.2", -+ "semver": "^6.3.0" -+ }, -+ "engines": { -+ "node": ">=4.0" -+ }, -+ "peerDependencies": { -+ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" -+ } -+ }, -+ "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/eslint-plugin-react": { -+ "version": "7.31.11", -+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz", -+ "integrity": "sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==", -+ "dependencies": { -+ "array-includes": "^3.1.6", -+ "array.prototype.flatmap": "^1.3.1", -+ "array.prototype.tosorted": "^1.1.1", -+ "doctrine": "^2.1.0", -+ "estraverse": "^5.3.0", -+ "jsx-ast-utils": "^2.4.1 || ^3.0.0", -+ "minimatch": "^3.1.2", -+ "object.entries": "^1.1.6", -+ "object.fromentries": "^2.0.6", -+ "object.hasown": "^1.1.2", -+ "object.values": "^1.1.6", -+ "prop-types": "^15.8.1", -+ "resolve": "^2.0.0-next.3", -+ "semver": "^6.3.0", -+ "string.prototype.matchall": "^4.0.8" -+ }, -+ "engines": { -+ "node": ">=4" -+ }, -+ "peerDependencies": { -+ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" -+ } -+ }, -+ "node_modules/eslint-plugin-react-hooks": { -+ "version": "4.6.0", -+ "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", -+ "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "peerDependencies": { -+ "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0" -+ } -+ }, -+ "node_modules/eslint-plugin-react/node_modules/doctrine": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", -+ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", -+ "dependencies": { -+ "esutils": "^2.0.2" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/eslint-plugin-react/node_modules/resolve": { -+ "version": "2.0.0-next.4", -+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", -+ "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", -+ "dependencies": { -+ "is-core-module": "^2.9.0", -+ "path-parse": "^1.0.7", -+ "supports-preserve-symlinks-flag": "^1.0.0" -+ }, -+ "bin": { -+ "resolve": "bin/resolve" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/eslint-plugin-react/node_modules/semver": { -+ "version": "6.3.0", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", -+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", -+ "bin": { -+ "semver": "bin/semver.js" -+ } -+ }, -+ "node_modules/eslint-scope": { -+ "version": "7.1.1", -+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", -+ "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", -+ "dependencies": { -+ "esrecurse": "^4.3.0", -+ "estraverse": "^5.2.0" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/eslint-utils": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", -+ "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", -+ "dependencies": { -+ "eslint-visitor-keys": "^2.0.0" -+ }, -+ "engines": { -+ "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/mysticatea" -+ }, -+ "peerDependencies": { -+ "eslint": ">=5" -+ } -+ }, -+ "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", -+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/eslint-visitor-keys": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", -+ "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ } -+ }, -+ "node_modules/espree": { -+ "version": "9.4.1", -+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", -+ "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", -+ "dependencies": { -+ "acorn": "^8.8.0", -+ "acorn-jsx": "^5.3.2", -+ "eslint-visitor-keys": "^3.3.0" -+ }, -+ "engines": { -+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/eslint" -+ } -+ }, -+ "node_modules/esquery": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", -+ "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", -+ "dependencies": { -+ "estraverse": "^5.1.0" -+ }, -+ "engines": { -+ "node": ">=0.10" -+ } -+ }, -+ "node_modules/esrecurse": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", -+ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", -+ "dependencies": { -+ "estraverse": "^5.2.0" -+ }, -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/estraverse": { -+ "version": "5.3.0", -+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/esutils": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", -+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/fast-deep-equal": { -+ "version": "3.1.3", -+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", -+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" -+ }, -+ "node_modules/fast-glob": { -+ "version": "3.2.12", -+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", -+ "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", -+ "dependencies": { -+ "@nodelib/fs.stat": "^2.0.2", -+ "@nodelib/fs.walk": "^1.2.3", -+ "glob-parent": "^5.1.2", -+ "merge2": "^1.3.0", -+ "micromatch": "^4.0.4" -+ }, -+ "engines": { -+ "node": ">=8.6.0" -+ } -+ }, -+ "node_modules/fast-glob/node_modules/glob-parent": { -+ "version": "5.1.2", -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", -+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", -+ "dependencies": { -+ "is-glob": "^4.0.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ } -+ }, -+ "node_modules/fast-json-stable-stringify": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", -+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" -+ }, -+ "node_modules/fast-levenshtein": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", -+ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" -+ }, -+ "node_modules/fastq": { -+ "version": "1.14.0", -+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz", -+ "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==", -+ "dependencies": { -+ "reusify": "^1.0.4" -+ } -+ }, -+ "node_modules/file-entry-cache": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", -+ "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", -+ "dependencies": { -+ "flat-cache": "^3.0.4" -+ }, -+ "engines": { -+ "node": "^10.12.0 || >=12.0.0" -+ } -+ }, -+ "node_modules/fill-range": { -+ "version": "7.0.1", -+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", -+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", -+ "dependencies": { -+ "to-regex-range": "^5.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/find-up": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", -+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", -+ "dependencies": { -+ "locate-path": "^6.0.0", -+ "path-exists": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/flat-cache": { -+ "version": "3.0.4", -+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", -+ "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", -+ "dependencies": { -+ "flatted": "^3.1.0", -+ "rimraf": "^3.0.2" -+ }, -+ "engines": { -+ "node": "^10.12.0 || >=12.0.0" -+ } -+ }, -+ "node_modules/flatted": { -+ "version": "3.2.7", -+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", -+ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" -+ }, -+ "node_modules/fs.realpath": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", -+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" -+ }, -+ "node_modules/function-bind": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", -+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" -+ }, -+ "node_modules/function.prototype.name": { -+ "version": "1.1.5", -+ "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", -+ "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.3", -+ "es-abstract": "^1.19.0", -+ "functions-have-names": "^1.2.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/functions-have-names": { -+ "version": "1.2.3", -+ "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", -+ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/get-intrinsic": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", -+ "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", -+ "dependencies": { -+ "function-bind": "^1.1.1", -+ "has": "^1.0.3", -+ "has-symbols": "^1.0.3" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/get-symbol-description": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", -+ "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "get-intrinsic": "^1.1.1" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/get-tsconfig": { -+ "version": "4.2.0", -+ "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.2.0.tgz", -+ "integrity": "sha512-X8u8fREiYOE6S8hLbq99PeykTDoLVnxvF4DjWKJmz9xy2nNRdUcV8ZN9tniJFeKyTU3qnC9lL8n4Chd6LmVKHg==", -+ "funding": { -+ "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" -+ } -+ }, -+ "node_modules/glob": { -+ "version": "7.1.7", -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", -+ "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", -+ "dependencies": { -+ "fs.realpath": "^1.0.0", -+ "inflight": "^1.0.4", -+ "inherits": "2", -+ "minimatch": "^3.0.4", -+ "once": "^1.3.0", -+ "path-is-absolute": "^1.0.0" -+ }, -+ "engines": { -+ "node": "*" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/glob-parent": { -+ "version": "6.0.2", -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", -+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", -+ "dependencies": { -+ "is-glob": "^4.0.3" -+ }, -+ "engines": { -+ "node": ">=10.13.0" -+ } -+ }, -+ "node_modules/globals": { -+ "version": "13.19.0", -+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", -+ "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", -+ "dependencies": { -+ "type-fest": "^0.20.2" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/globalyzer": { -+ "version": "0.1.0", -+ "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz", -+ "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==" -+ }, -+ "node_modules/globby": { -+ "version": "11.1.0", -+ "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", -+ "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", -+ "dependencies": { -+ "array-union": "^2.1.0", -+ "dir-glob": "^3.0.1", -+ "fast-glob": "^3.2.9", -+ "ignore": "^5.2.0", -+ "merge2": "^1.4.1", -+ "slash": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/globrex": { -+ "version": "0.1.2", -+ "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", -+ "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==" -+ }, -+ "node_modules/gopd": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", -+ "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", -+ "dependencies": { -+ "get-intrinsic": "^1.1.3" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/graceful-fs": { -+ "version": "4.2.10", -+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", -+ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" -+ }, -+ "node_modules/grapheme-splitter": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", -+ "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==" -+ }, -+ "node_modules/has": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", -+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", -+ "dependencies": { -+ "function-bind": "^1.1.1" -+ }, -+ "engines": { -+ "node": ">= 0.4.0" -+ } -+ }, -+ "node_modules/has-bigints": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", -+ "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/has-flag": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/has-property-descriptors": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", -+ "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", -+ "dependencies": { -+ "get-intrinsic": "^1.1.1" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/has-symbols": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", -+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/has-tostringtag": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", -+ "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", -+ "dependencies": { -+ "has-symbols": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/ignore": { -+ "version": "5.2.4", -+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", -+ "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", -+ "engines": { -+ "node": ">= 4" -+ } -+ }, -+ "node_modules/import-fresh": { -+ "version": "3.3.0", -+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", -+ "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", -+ "dependencies": { -+ "parent-module": "^1.0.0", -+ "resolve-from": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/imurmurhash": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", -+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", -+ "engines": { -+ "node": ">=0.8.19" -+ } -+ }, -+ "node_modules/inflight": { -+ "version": "1.0.6", -+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", -+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", -+ "dependencies": { -+ "once": "^1.3.0", -+ "wrappy": "1" -+ } -+ }, -+ "node_modules/inherits": { -+ "version": "2.0.4", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", -+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" -+ }, -+ "node_modules/internal-slot": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz", -+ "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==", -+ "dependencies": { -+ "get-intrinsic": "^1.1.3", -+ "has": "^1.0.3", -+ "side-channel": "^1.0.4" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ } -+ }, -+ "node_modules/is-bigint": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", -+ "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", -+ "dependencies": { -+ "has-bigints": "^1.0.1" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-boolean-object": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", -+ "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-callable": { -+ "version": "1.2.7", -+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", -+ "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-core-module": { -+ "version": "2.11.0", -+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", -+ "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", -+ "dependencies": { -+ "has": "^1.0.3" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-date-object": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", -+ "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", -+ "dependencies": { -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-docker": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", -+ "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", -+ "bin": { -+ "is-docker": "cli.js" -+ }, -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/is-extglob": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", -+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/is-glob": { -+ "version": "4.0.3", -+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", -+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", -+ "dependencies": { -+ "is-extglob": "^2.1.1" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/is-negative-zero": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", -+ "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-number": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", -+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", -+ "engines": { -+ "node": ">=0.12.0" -+ } -+ }, -+ "node_modules/is-number-object": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", -+ "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", -+ "dependencies": { -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-path-inside": { -+ "version": "3.0.3", -+ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", -+ "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/is-regex": { -+ "version": "1.1.4", -+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", -+ "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-shared-array-buffer": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", -+ "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", -+ "dependencies": { -+ "call-bind": "^1.0.2" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-string": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", -+ "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", -+ "dependencies": { -+ "has-tostringtag": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-symbol": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", -+ "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", -+ "dependencies": { -+ "has-symbols": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-weakref": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", -+ "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", -+ "dependencies": { -+ "call-bind": "^1.0.2" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-wsl": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", -+ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", -+ "dependencies": { -+ "is-docker": "^2.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/isexe": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", -+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" -+ }, -+ "node_modules/js-sdsl": { -+ "version": "4.2.0", -+ "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", -+ "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/js-sdsl" -+ } -+ }, -+ "node_modules/js-tokens": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", -+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" -+ }, -+ "node_modules/js-yaml": { -+ "version": "4.1.0", -+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", -+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", -+ "dependencies": { -+ "argparse": "^2.0.1" -+ }, -+ "bin": { -+ "js-yaml": "bin/js-yaml.js" -+ } -+ }, -+ "node_modules/json-schema-traverse": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", -+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" -+ }, -+ "node_modules/json-stable-stringify-without-jsonify": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", -+ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" -+ }, -+ "node_modules/json5": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", -+ "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", -+ "dependencies": { -+ "minimist": "^1.2.0" -+ }, -+ "bin": { -+ "json5": "lib/cli.js" -+ } -+ }, -+ "node_modules/jsx-ast-utils": { -+ "version": "3.3.3", -+ "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz", -+ "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==", -+ "dependencies": { -+ "array-includes": "^3.1.5", -+ "object.assign": "^4.1.3" -+ }, -+ "engines": { -+ "node": ">=4.0" -+ } -+ }, -+ "node_modules/language-subtag-registry": { -+ "version": "0.3.22", -+ "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", -+ "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==" -+ }, -+ "node_modules/language-tags": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.7.tgz", -+ "integrity": "sha512-bSytju1/657hFjgUzPAPqszxH62ouE8nQFoFaVlIQfne4wO/wXC9A4+m8jYve7YBBvi59eq0SUpcshvG8h5Usw==", -+ "dependencies": { -+ "language-subtag-registry": "^0.3.20" -+ } -+ }, -+ "node_modules/levn": { -+ "version": "0.4.1", -+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", -+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", -+ "dependencies": { -+ "prelude-ls": "^1.2.1", -+ "type-check": "~0.4.0" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/locate-path": { -+ "version": "6.0.0", -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", -+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", -+ "dependencies": { -+ "p-locate": "^5.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/lodash.merge": { -+ "version": "4.6.2", -+ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", -+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" -+ }, -+ "node_modules/loose-envify": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", -+ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", -+ "dependencies": { -+ "js-tokens": "^3.0.0 || ^4.0.0" -+ }, -+ "bin": { -+ "loose-envify": "cli.js" -+ } -+ }, -+ "node_modules/lru-cache": { -+ "version": "6.0.0", -+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", -+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", -+ "dependencies": { -+ "yallist": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/merge2": { -+ "version": "1.4.1", -+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", -+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/micromatch": { -+ "version": "4.0.5", -+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", -+ "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", -+ "dependencies": { -+ "braces": "^3.0.2", -+ "picomatch": "^2.3.1" -+ }, -+ "engines": { -+ "node": ">=8.6" -+ } -+ }, -+ "node_modules/minimatch": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", -+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" -+ } -+ }, -+ "node_modules/minimist": { -+ "version": "1.2.7", -+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", -+ "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/ms": { -+ "version": "2.1.2", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", -+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" -+ }, -+ "node_modules/nanoid": { -+ "version": "3.3.4", -+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", -+ "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", -+ "bin": { -+ "nanoid": "bin/nanoid.cjs" -+ }, -+ "engines": { -+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" -+ } -+ }, -+ "node_modules/natural-compare": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", -+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" -+ }, -+ "node_modules/next": { -+ "version": "13.1.1", -+ "resolved": "https://registry.npmjs.org/next/-/next-13.1.1.tgz", -+ "integrity": "sha512-R5eBAaIa3X7LJeYvv1bMdGnAVF4fVToEjim7MkflceFPuANY3YyvFxXee/A+acrSYwYPvOvf7f6v/BM/48ea5w==", -+ "dependencies": { -+ "@next/env": "13.1.1", -+ "@swc/helpers": "0.4.14", -+ "caniuse-lite": "^1.0.30001406", -+ "postcss": "8.4.14", -+ "styled-jsx": "5.1.1" -+ }, -+ "bin": { -+ "next": "dist/bin/next" -+ }, -+ "engines": { -+ "node": ">=14.6.0" -+ }, -+ "optionalDependencies": { -+ "@next/swc-android-arm-eabi": "13.1.1", -+ "@next/swc-android-arm64": "13.1.1", -+ "@next/swc-darwin-arm64": "13.1.1", -+ "@next/swc-darwin-x64": "13.1.1", -+ "@next/swc-freebsd-x64": "13.1.1", -+ "@next/swc-linux-arm-gnueabihf": "13.1.1", -+ "@next/swc-linux-arm64-gnu": "13.1.1", -+ "@next/swc-linux-arm64-musl": "13.1.1", -+ "@next/swc-linux-x64-gnu": "13.1.1", -+ "@next/swc-linux-x64-musl": "13.1.1", -+ "@next/swc-win32-arm64-msvc": "13.1.1", -+ "@next/swc-win32-ia32-msvc": "13.1.1", -+ "@next/swc-win32-x64-msvc": "13.1.1" -+ }, -+ "peerDependencies": { -+ "fibers": ">= 3.1.0", -+ "node-sass": "^6.0.0 || ^7.0.0", -+ "react": "^18.2.0", -+ "react-dom": "^18.2.0", -+ "sass": "^1.3.0" -+ }, -+ "peerDependenciesMeta": { -+ "fibers": { -+ "optional": true -+ }, -+ "node-sass": { -+ "optional": true -+ }, -+ "sass": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/object-assign": { -+ "version": "4.1.1", -+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", -+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/object-inspect": { -+ "version": "1.12.2", -+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", -+ "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/object-keys": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", -+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", -+ "engines": { -+ "node": ">= 0.4" -+ } -+ }, -+ "node_modules/object.assign": { -+ "version": "4.1.4", -+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", -+ "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.4", -+ "has-symbols": "^1.0.3", -+ "object-keys": "^1.1.1" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/object.entries": { -+ "version": "1.1.6", -+ "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", -+ "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.4", -+ "es-abstract": "^1.20.4" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ } -+ }, -+ "node_modules/object.fromentries": { -+ "version": "2.0.6", -+ "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", -+ "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.4", -+ "es-abstract": "^1.20.4" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/object.hasown": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz", -+ "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==", -+ "dependencies": { -+ "define-properties": "^1.1.4", -+ "es-abstract": "^1.20.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/object.values": { -+ "version": "1.1.6", -+ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", -+ "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.4", -+ "es-abstract": "^1.20.4" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/once": { -+ "version": "1.4.0", -+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", -+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", -+ "dependencies": { -+ "wrappy": "1" -+ } -+ }, -+ "node_modules/open": { -+ "version": "8.4.0", -+ "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", -+ "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", -+ "dependencies": { -+ "define-lazy-prop": "^2.0.0", -+ "is-docker": "^2.1.1", -+ "is-wsl": "^2.2.0" -+ }, -+ "engines": { -+ "node": ">=12" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/optionator": { -+ "version": "0.9.1", -+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", -+ "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", -+ "dependencies": { -+ "deep-is": "^0.1.3", -+ "fast-levenshtein": "^2.0.6", -+ "levn": "^0.4.1", -+ "prelude-ls": "^1.2.1", -+ "type-check": "^0.4.0", -+ "word-wrap": "^1.2.3" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/p-limit": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", -+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", -+ "dependencies": { -+ "yocto-queue": "^0.1.0" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/p-locate": { -+ "version": "5.0.0", -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", -+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", -+ "dependencies": { -+ "p-limit": "^3.0.2" -+ }, -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/parent-module": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", -+ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", -+ "dependencies": { -+ "callsites": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/path-exists": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", -+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/path-is-absolute": { -+ "version": "1.0.1", -+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", -+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/path-key": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", -+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/path-parse": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", -+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" -+ }, -+ "node_modules/path-type": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", -+ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/picocolors": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", -+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" -+ }, -+ "node_modules/picomatch": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", -+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", -+ "engines": { -+ "node": ">=8.6" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/jonschlinkert" -+ } -+ }, -+ "node_modules/postcss": { -+ "version": "8.4.14", -+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz", -+ "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==", -+ "funding": [ -+ { -+ "type": "opencollective", -+ "url": "https://opencollective.com/postcss/" -+ }, -+ { -+ "type": "tidelift", -+ "url": "https://tidelift.com/funding/github/npm/postcss" -+ } -+ ], -+ "dependencies": { -+ "nanoid": "^3.3.4", -+ "picocolors": "^1.0.0", -+ "source-map-js": "^1.0.2" -+ }, -+ "engines": { -+ "node": "^10 || ^12 || >=14" -+ } -+ }, -+ "node_modules/prelude-ls": { -+ "version": "1.2.1", -+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", -+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/prettier": { -+ "version": "2.8.1", -+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", -+ "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", -+ "dev": true, -+ "bin": { -+ "prettier": "bin-prettier.js" -+ }, -+ "engines": { -+ "node": ">=10.13.0" -+ }, -+ "funding": { -+ "url": "https://github.com/prettier/prettier?sponsor=1" -+ } -+ }, -+ "node_modules/prop-types": { -+ "version": "15.8.1", -+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", -+ "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", -+ "dependencies": { -+ "loose-envify": "^1.4.0", -+ "object-assign": "^4.1.1", -+ "react-is": "^16.13.1" -+ } -+ }, -+ "node_modules/punycode": { -+ "version": "2.1.1", -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", -+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/queue-microtask": { -+ "version": "1.2.3", -+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", -+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ] -+ }, -+ "node_modules/react": { -+ "version": "18.2.0", -+ "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", -+ "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", -+ "dependencies": { -+ "loose-envify": "^1.1.0" -+ }, -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/react-dom": { -+ "version": "18.2.0", -+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", -+ "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", -+ "dependencies": { -+ "loose-envify": "^1.1.0", -+ "scheduler": "^0.23.0" -+ }, -+ "peerDependencies": { -+ "react": "^18.2.0" -+ } -+ }, -+ "node_modules/react-is": { -+ "version": "16.13.1", -+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", -+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" -+ }, -+ "node_modules/regenerator-runtime": { -+ "version": "0.13.11", -+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", -+ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" -+ }, -+ "node_modules/regexp.prototype.flags": { -+ "version": "1.4.3", -+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", -+ "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.3", -+ "functions-have-names": "^1.2.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/regexpp": { -+ "version": "3.2.0", -+ "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", -+ "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/mysticatea" -+ } -+ }, -+ "node_modules/resolve": { -+ "version": "1.22.1", -+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", -+ "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", -+ "dependencies": { -+ "is-core-module": "^2.9.0", -+ "path-parse": "^1.0.7", -+ "supports-preserve-symlinks-flag": "^1.0.0" -+ }, -+ "bin": { -+ "resolve": "bin/resolve" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/resolve-from": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", -+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/reusify": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", -+ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", -+ "engines": { -+ "iojs": ">=1.0.0", -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/rimraf": { -+ "version": "3.0.2", -+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", -+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", -+ "dependencies": { -+ "glob": "^7.1.3" -+ }, -+ "bin": { -+ "rimraf": "bin.js" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, -+ "node_modules/run-parallel": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", -+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/feross" -+ }, -+ { -+ "type": "patreon", -+ "url": "https://www.patreon.com/feross" -+ }, -+ { -+ "type": "consulting", -+ "url": "https://feross.org/support" -+ } -+ ], -+ "dependencies": { -+ "queue-microtask": "^1.2.2" -+ } -+ }, -+ "node_modules/safe-regex-test": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", -+ "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "get-intrinsic": "^1.1.3", -+ "is-regex": "^1.1.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/scheduler": { -+ "version": "0.23.0", -+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", -+ "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", -+ "dependencies": { -+ "loose-envify": "^1.1.0" -+ } -+ }, -+ "node_modules/semver": { -+ "version": "7.3.8", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", -+ "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", -+ "dependencies": { -+ "lru-cache": "^6.0.0" -+ }, -+ "bin": { -+ "semver": "bin/semver.js" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, -+ "node_modules/shebang-command": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", -+ "dependencies": { -+ "shebang-regex": "^3.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/shebang-regex": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", -+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/side-channel": { -+ "version": "1.0.4", -+ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", -+ "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", -+ "dependencies": { -+ "call-bind": "^1.0.0", -+ "get-intrinsic": "^1.0.2", -+ "object-inspect": "^1.9.0" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/slash": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", -+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/source-map-js": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", -+ "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/string.prototype.matchall": { -+ "version": "4.0.8", -+ "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", -+ "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.4", -+ "es-abstract": "^1.20.4", -+ "get-intrinsic": "^1.1.3", -+ "has-symbols": "^1.0.3", -+ "internal-slot": "^1.0.3", -+ "regexp.prototype.flags": "^1.4.3", -+ "side-channel": "^1.0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/string.prototype.trimend": { -+ "version": "1.0.6", -+ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", -+ "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.4", -+ "es-abstract": "^1.20.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/string.prototype.trimstart": { -+ "version": "1.0.6", -+ "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", -+ "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "define-properties": "^1.1.4", -+ "es-abstract": "^1.20.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/strip-ansi": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -+ "dependencies": { -+ "ansi-regex": "^5.0.1" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/strip-bom": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", -+ "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", -+ "engines": { -+ "node": ">=4" -+ } -+ }, -+ "node_modules/strip-json-comments": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", -+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", -+ "engines": { -+ "node": ">=8" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/styled-jsx": { -+ "version": "5.1.1", -+ "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz", -+ "integrity": "sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==", -+ "dependencies": { -+ "client-only": "0.0.1" -+ }, -+ "engines": { -+ "node": ">= 12.0.0" -+ }, -+ "peerDependencies": { -+ "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0" -+ }, -+ "peerDependenciesMeta": { -+ "@babel/core": { -+ "optional": true -+ }, -+ "babel-plugin-macros": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/supports-color": { -+ "version": "7.2.0", -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", -+ "dependencies": { -+ "has-flag": "^4.0.0" -+ }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, -+ "node_modules/supports-preserve-symlinks-flag": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", -+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/synckit": { -+ "version": "0.8.4", -+ "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.4.tgz", -+ "integrity": "sha512-Dn2ZkzMdSX827QbowGbU/4yjWuvNaCoScLLoMo/yKbu+P4GBR6cRGKZH27k6a9bRzdqcyd1DE96pQtQ6uNkmyw==", -+ "dependencies": { -+ "@pkgr/utils": "^2.3.1", -+ "tslib": "^2.4.0" -+ }, -+ "engines": { -+ "node": "^14.18.0 || >=16.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/unts" -+ } -+ }, -+ "node_modules/tapable": { -+ "version": "2.2.1", -+ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", -+ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", -+ "engines": { -+ "node": ">=6" -+ } -+ }, -+ "node_modules/text-table": { -+ "version": "0.2.0", -+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", -+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" -+ }, -+ "node_modules/tiny-glob": { -+ "version": "0.2.9", -+ "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", -+ "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==", -+ "dependencies": { -+ "globalyzer": "0.1.0", -+ "globrex": "^0.1.2" -+ } -+ }, -+ "node_modules/to-regex-range": { -+ "version": "5.0.1", -+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", -+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", -+ "dependencies": { -+ "is-number": "^7.0.0" -+ }, -+ "engines": { -+ "node": ">=8.0" -+ } -+ }, -+ "node_modules/tsconfig-paths": { -+ "version": "3.14.1", -+ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", -+ "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", -+ "dependencies": { -+ "@types/json5": "^0.0.29", -+ "json5": "^1.0.1", -+ "minimist": "^1.2.6", -+ "strip-bom": "^3.0.0" -+ } -+ }, -+ "node_modules/tslib": { -+ "version": "2.4.1", -+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", -+ "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" -+ }, -+ "node_modules/tsutils": { -+ "version": "3.21.0", -+ "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", -+ "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", -+ "dependencies": { -+ "tslib": "^1.8.1" -+ }, -+ "engines": { -+ "node": ">= 6" -+ }, -+ "peerDependencies": { -+ "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" -+ } -+ }, -+ "node_modules/tsutils/node_modules/tslib": { -+ "version": "1.14.1", -+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", -+ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" -+ }, -+ "node_modules/type-check": { -+ "version": "0.4.0", -+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", -+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", -+ "dependencies": { -+ "prelude-ls": "^1.2.1" -+ }, -+ "engines": { -+ "node": ">= 0.8.0" -+ } -+ }, -+ "node_modules/type-fest": { -+ "version": "0.20.2", -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", -+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, -+ "node_modules/typescript": { -+ "version": "4.9.4", -+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", -+ "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", -+ "bin": { -+ "tsc": "bin/tsc", -+ "tsserver": "bin/tsserver" -+ }, -+ "engines": { -+ "node": ">=4.2.0" -+ } -+ }, -+ "node_modules/unbox-primitive": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", -+ "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", -+ "dependencies": { -+ "call-bind": "^1.0.2", -+ "has-bigints": "^1.0.2", -+ "has-symbols": "^1.0.3", -+ "which-boxed-primitive": "^1.0.2" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/uri-js": { -+ "version": "4.4.1", -+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", -+ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", -+ "dependencies": { -+ "punycode": "^2.1.0" -+ } -+ }, -+ "node_modules/which": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", -+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", -+ "dependencies": { -+ "isexe": "^2.0.0" -+ }, -+ "bin": { -+ "node-which": "bin/node-which" -+ }, -+ "engines": { -+ "node": ">= 8" -+ } -+ }, -+ "node_modules/which-boxed-primitive": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", -+ "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", -+ "dependencies": { -+ "is-bigint": "^1.0.1", -+ "is-boolean-object": "^1.1.0", -+ "is-number-object": "^1.0.4", -+ "is-string": "^1.0.5", -+ "is-symbol": "^1.0.3" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/word-wrap": { -+ "version": "1.2.3", -+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", -+ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/wrappy": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", -+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" -+ }, -+ "node_modules/yallist": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" -+ }, -+ "node_modules/yocto-queue": { -+ "version": "0.1.0", -+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", -+ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", -+ "engines": { -+ "node": ">=10" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/sindresorhus" -+ } -+ } -+ } -+} -diff --git a/js/test/nextjs/package.json b/js/test/nextjs/package.json -new file mode 100644 -index 0000000..f57e111 ---- /dev/null -+++ b/js/test/nextjs/package.json -@@ -0,0 +1,28 @@ -+{ -+ "name": "shine-nextjs-test-app", -+ "version": "0.1.0", -+ "private": true, -+ "scripts": { -+ "dev": "next dev", -+ "lint": "next lint --fix", -+ "build": "next build && next export && touch out/.nojekyll", -+ "format": "prettier '**/*.{ts,tsx,js,jsx}' --write", -+ "typecheck": "tsc --noEmit" -+ }, -+ "dependencies": { -+ "@next/font": "13.1.1", -+ "@toots/shine.js": "file:../..", -+ "@types/node": "18.11.18", -+ "@types/react": "18.0.26", -+ "@types/react-dom": "18.0.10", -+ "eslint": "8.31.0", -+ "eslint-config-next": "13.1.1", -+ "next": "13.1.1", -+ "react": "18.2.0", -+ "react-dom": "18.2.0", -+ "typescript": "4.9.4" -+ }, -+ "devDependencies": { -+ "prettier": "^2.8.1" -+ } -+} -diff --git a/js/test/nextjs/pages/index.tsx b/js/test/nextjs/pages/index.tsx -new file mode 100644 -index 0000000..4bf771a ---- /dev/null -+++ b/js/test/nextjs/pages/index.tsx -@@ -0,0 +1,50 @@ -+import { Fragment, useEffect, useState, useCallback } from "react" -+import { runEncodeTest } from "@shine/lib/encode" -+import { runRoundsTest } from "@shine/lib/rounds" -+ -+const logEntries: string[] = [] -+let encoderStarted = false -+ -+export default function Home() { -+ const [logs, setLogs] = useState(logEntries) -+ const [encodedBlobUrl, setEncodedBlobUrl] = useState<string | undefined>() -+ -+ const log = useCallback( -+ (entry: string) => { -+ logEntries.push(entry) -+ setLogs(logEntries) -+ }, -+ [setLogs] -+ ) -+ -+ useEffect(() => { -+ if (encoderStarted) return -+ -+ runEncodeTest(log, blob => { -+ if (!encodedBlobUrl) setEncodedBlobUrl(URL.createObjectURL(blob)) -+ -+ log("") -+ runRoundsTest(log) -+ }) -+ -+ encoderStarted = true -+ }, [log, encodedBlobUrl, setEncodedBlobUrl]) -+ -+ return ( -+ <> -+ {encodedBlobUrl && ( -+ <a href={encodedBlobUrl} download='encoded.mp3'> -+ Download encoded file -+ </a> -+ )} -+ <div> -+ {logs.map(entry => ( -+ <Fragment key={entry}> -+ {entry} -+ <br /> -+ </Fragment> -+ ))} -+ </div> -+ </> -+ ) -+} -diff --git a/js/test/nextjs/pnpm-lock.yaml b/js/test/nextjs/pnpm-lock.yaml -new file mode 100644 -index 0000000..562cc68 ---- /dev/null -+++ b/js/test/nextjs/pnpm-lock.yaml -@@ -0,0 +1,2032 @@ -+lockfileVersion: 5.4 -+ -+specifiers: -+ '@next/font': 13.1.1 -+ '@toots/shine.js': file:../.. -+ '@types/node': 18.11.18 -+ '@types/react': 18.0.26 -+ '@types/react-dom': 18.0.10 -+ eslint: 8.31.0 -+ eslint-config-next: 13.1.1 -+ next: 13.1.1 -+ prettier: ^2.8.1 -+ react: 18.2.0 -+ react-dom: 18.2.0 -+ typescript: 4.9.4 -+ -+dependencies: -+ '@next/font': 13.1.1 -+ '@toots/shine.js': file:../.. -+ '@types/node': 18.11.18 -+ '@types/react': 18.0.26 -+ '@types/react-dom': 18.0.10 -+ eslint: 8.31.0 -+ eslint-config-next: 13.1.1_iukboom6ndih5an6iafl45j2fe -+ next: 13.1.1_biqbaboplfbrettd7655fr4n2y -+ react: 18.2.0 -+ react-dom: 18.2.0_react@18.2.0 -+ typescript: 4.9.4 -+ -+devDependencies: -+ prettier: 2.8.1 -+ -+packages: -+ -+ /@babel/runtime-corejs3/7.20.7: -+ resolution: {integrity: sha512-jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg==} -+ engines: {node: '>=6.9.0'} -+ dependencies: -+ core-js-pure: 3.27.1 -+ regenerator-runtime: 0.13.11 -+ dev: false -+ -+ /@babel/runtime/7.20.7: -+ resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==} -+ engines: {node: '>=6.9.0'} -+ dependencies: -+ regenerator-runtime: 0.13.11 -+ dev: false -+ -+ /@eslint/eslintrc/1.4.1: -+ resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==} -+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -+ dependencies: -+ ajv: 6.12.6 -+ debug: 4.3.4 -+ espree: 9.4.1 -+ globals: 13.19.0 -+ ignore: 5.2.4 -+ import-fresh: 3.3.0 -+ js-yaml: 4.1.0 -+ minimatch: 3.1.2 -+ strip-json-comments: 3.1.1 -+ transitivePeerDependencies: -+ - supports-color -+ dev: false -+ -+ /@humanwhocodes/config-array/0.11.8: -+ resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==} -+ engines: {node: '>=10.10.0'} -+ dependencies: -+ '@humanwhocodes/object-schema': 1.2.1 -+ debug: 4.3.4 -+ minimatch: 3.1.2 -+ transitivePeerDependencies: -+ - supports-color -+ dev: false -+ -+ /@humanwhocodes/module-importer/1.0.1: -+ resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} -+ engines: {node: '>=12.22'} -+ dev: false -+ -+ /@humanwhocodes/object-schema/1.2.1: -+ resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} -+ dev: false -+ -+ /@next/env/13.1.1: -+ resolution: {integrity: sha512-vFMyXtPjSAiOXOywMojxfKIqE3VWN5RCAx+tT3AS3pcKjMLFTCJFUWsKv8hC+87Z1F4W3r68qTwDFZIFmd5Xkw==} -+ dev: false -+ -+ /@next/eslint-plugin-next/13.1.1: -+ resolution: {integrity: sha512-SBrOFS8PC3nQ5aeZmawJkjKkWjwK9RoxvBSv/86nZp0ubdoVQoko8r8htALd9ufp16NhacCdqhu9bzZLDWtALQ==} -+ dependencies: -+ glob: 7.1.7 -+ dev: false -+ -+ /@next/font/13.1.1: -+ resolution: {integrity: sha512-amygRorS05hYK1/XQRZo5qBl7l2fpHnezeKU/cNveWU5QJg+sg8gMGkUXHtvesNKpiKIJshBRH1TzvO+2sKpvQ==} -+ dev: false -+ -+ /@next/swc-android-arm-eabi/13.1.1: -+ resolution: {integrity: sha512-qnFCx1kT3JTWhWve4VkeWuZiyjG0b5T6J2iWuin74lORCupdrNukxkq9Pm+Z7PsatxuwVJMhjUoYz7H4cWzx2A==} -+ engines: {node: '>= 10'} -+ cpu: [arm] -+ os: [android] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-android-arm64/13.1.1: -+ resolution: {integrity: sha512-eCiZhTzjySubNqUnNkQCjU3Fh+ep3C6b5DCM5FKzsTH/3Gr/4Y7EiaPZKILbvnXmhWtKPIdcY6Zjx51t4VeTfA==} -+ engines: {node: '>= 10'} -+ cpu: [arm64] -+ os: [android] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-darwin-arm64/13.1.1: -+ resolution: {integrity: sha512-9zRJSSIwER5tu9ADDkPw5rIZ+Np44HTXpYMr0rkM656IvssowPxmhK0rTreC1gpUCYwFsRbxarUJnJsTWiutPg==} -+ engines: {node: '>= 10'} -+ cpu: [arm64] -+ os: [darwin] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-darwin-x64/13.1.1: -+ resolution: {integrity: sha512-qWr9qEn5nrnlhB0rtjSdR00RRZEtxg4EGvicIipqZWEyayPxhUu6NwKiG8wZiYZCLfJ5KWr66PGSNeDMGlNaiA==} -+ engines: {node: '>= 10'} -+ cpu: [x64] -+ os: [darwin] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-freebsd-x64/13.1.1: -+ resolution: {integrity: sha512-UwP4w/NcQ7V/VJEj3tGVszgb4pyUCt3lzJfUhjDMUmQbzG9LDvgiZgAGMYH6L21MoyAATJQPDGiAMWAPKsmumA==} -+ engines: {node: '>= 10'} -+ cpu: [x64] -+ os: [freebsd] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-linux-arm-gnueabihf/13.1.1: -+ resolution: {integrity: sha512-CnsxmKHco9sosBs1XcvCXP845Db+Wx1G0qouV5+Gr+HT/ZlDYEWKoHVDgnJXLVEQzq4FmHddBNGbXvgqM1Gfkg==} -+ engines: {node: '>= 10'} -+ cpu: [arm] -+ os: [linux] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-linux-arm64-gnu/13.1.1: -+ resolution: {integrity: sha512-JfDq1eri5Dif+VDpTkONRd083780nsMCOKoFG87wA0sa4xL8LGcXIBAkUGIC1uVy9SMsr2scA9CySLD/i+Oqiw==} -+ engines: {node: '>= 10'} -+ cpu: [arm64] -+ os: [linux] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-linux-arm64-musl/13.1.1: -+ resolution: {integrity: sha512-GA67ZbDq2AW0CY07zzGt07M5b5Yaq5qUpFIoW3UFfjOPgb0Sqf3DAW7GtFMK1sF4ROHsRDMGQ9rnT0VM2dVfKA==} -+ engines: {node: '>= 10'} -+ cpu: [arm64] -+ os: [linux] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-linux-x64-gnu/13.1.1: -+ resolution: {integrity: sha512-nnjuBrbzvqaOJaV+XgT8/+lmXrSCOt1YYZn/irbDb2fR2QprL6Q7WJNgwsZNxiLSfLdv+2RJGGegBx9sLBEzGA==} -+ engines: {node: '>= 10'} -+ cpu: [x64] -+ os: [linux] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-linux-x64-musl/13.1.1: -+ resolution: {integrity: sha512-CM9xnAQNIZ8zf/igbIT/i3xWbQZYaF397H+JroF5VMOCUleElaMdQLL5riJml8wUfPoN3dtfn2s4peSr3azz/g==} -+ engines: {node: '>= 10'} -+ cpu: [x64] -+ os: [linux] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-win32-arm64-msvc/13.1.1: -+ resolution: {integrity: sha512-pzUHOGrbgfGgPlOMx9xk3QdPJoRPU+om84hqVoe6u+E0RdwOG0Ho/2UxCgDqmvpUrMab1Deltlt6RqcXFpnigQ==} -+ engines: {node: '>= 10'} -+ cpu: [arm64] -+ os: [win32] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-win32-ia32-msvc/13.1.1: -+ resolution: {integrity: sha512-WeX8kVS46aobM9a7Xr/kEPcrTyiwJqQv/tbw6nhJ4fH9xNZ+cEcyPoQkwPo570dCOLz3Zo9S2q0E6lJ/EAUOBg==} -+ engines: {node: '>= 10'} -+ cpu: [ia32] -+ os: [win32] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@next/swc-win32-x64-msvc/13.1.1: -+ resolution: {integrity: sha512-mVF0/3/5QAc5EGVnb8ll31nNvf3BWpPY4pBb84tk+BfQglWLqc5AC9q1Ht/YMWiEgs8ALNKEQ3GQnbY0bJF2Gg==} -+ engines: {node: '>= 10'} -+ cpu: [x64] -+ os: [win32] -+ requiresBuild: true -+ dev: false -+ optional: true -+ -+ /@nodelib/fs.scandir/2.1.5: -+ resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} -+ engines: {node: '>= 8'} -+ dependencies: -+ '@nodelib/fs.stat': 2.0.5 -+ run-parallel: 1.2.0 -+ dev: false -+ -+ /@nodelib/fs.stat/2.0.5: -+ resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} -+ engines: {node: '>= 8'} -+ dev: false -+ -+ /@nodelib/fs.walk/1.2.8: -+ resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} -+ engines: {node: '>= 8'} -+ dependencies: -+ '@nodelib/fs.scandir': 2.1.5 -+ fastq: 1.14.0 -+ dev: false -+ -+ /@pkgr/utils/2.3.1: -+ resolution: {integrity: sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==} -+ engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} -+ dependencies: -+ cross-spawn: 7.0.3 -+ is-glob: 4.0.3 -+ open: 8.4.0 -+ picocolors: 1.0.0 -+ tiny-glob: 0.2.9 -+ tslib: 2.4.1 -+ dev: false -+ -+ /@rushstack/eslint-patch/1.2.0: -+ resolution: {integrity: sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==} -+ dev: false -+ -+ /@swc/helpers/0.4.14: -+ resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==} -+ dependencies: -+ tslib: 2.4.1 -+ dev: false -+ -+ /@types/json5/0.0.29: -+ resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} -+ dev: false -+ -+ /@types/node/18.11.18: -+ resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==} -+ dev: false -+ -+ /@types/prop-types/15.7.5: -+ resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==} -+ dev: false -+ -+ /@types/react-dom/18.0.10: -+ resolution: {integrity: sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg==} -+ dependencies: -+ '@types/react': 18.0.26 -+ dev: false -+ -+ /@types/react/18.0.26: -+ resolution: {integrity: sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==} -+ dependencies: -+ '@types/prop-types': 15.7.5 -+ '@types/scheduler': 0.16.2 -+ csstype: 3.1.1 -+ dev: false -+ -+ /@types/scheduler/0.16.2: -+ resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==} -+ dev: false -+ -+ /@typescript-eslint/parser/5.47.1_iukboom6ndih5an6iafl45j2fe: -+ resolution: {integrity: sha512-9Vb+KIv29r6GPu4EboWOnQM7T+UjpjXvjCPhNORlgm40a9Ia9bvaPJswvtae1gip2QEeVeGh6YquqAzEgoRAlw==} -+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -+ peerDependencies: -+ eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 -+ typescript: '*' -+ peerDependenciesMeta: -+ typescript: -+ optional: true -+ dependencies: -+ '@typescript-eslint/scope-manager': 5.47.1 -+ '@typescript-eslint/types': 5.47.1 -+ '@typescript-eslint/typescript-estree': 5.47.1_typescript@4.9.4 -+ debug: 4.3.4 -+ eslint: 8.31.0 -+ typescript: 4.9.4 -+ transitivePeerDependencies: -+ - supports-color -+ dev: false -+ -+ /@typescript-eslint/scope-manager/5.47.1: -+ resolution: {integrity: sha512-9hsFDsgUwrdOoW1D97Ewog7DYSHaq4WKuNs0LHF9RiCmqB0Z+XRR4Pf7u7u9z/8CciHuJ6yxNws1XznI3ddjEw==} -+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -+ dependencies: -+ '@typescript-eslint/types': 5.47.1 -+ '@typescript-eslint/visitor-keys': 5.47.1 -+ dev: false -+ -+ /@typescript-eslint/types/5.47.1: -+ resolution: {integrity: sha512-CmALY9YWXEpwuu6377ybJBZdtSAnzXLSQcxLSqSQSbC7VfpMu/HLVdrnVJj7ycI138EHqocW02LPJErE35cE9A==} -+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -+ dev: false -+ -+ /@typescript-eslint/typescript-estree/5.47.1_typescript@4.9.4: -+ resolution: {integrity: sha512-4+ZhFSuISAvRi2xUszEj0xXbNTHceV9GbH9S8oAD2a/F9SW57aJNQVOCxG8GPfSWH/X4eOPdMEU2jYVuWKEpWA==} -+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -+ peerDependencies: -+ typescript: '*' -+ peerDependenciesMeta: -+ typescript: -+ optional: true -+ dependencies: -+ '@typescript-eslint/types': 5.47.1 -+ '@typescript-eslint/visitor-keys': 5.47.1 -+ debug: 4.3.4 -+ globby: 11.1.0 -+ is-glob: 4.0.3 -+ semver: 7.3.8 -+ tsutils: 3.21.0_typescript@4.9.4 -+ typescript: 4.9.4 -+ transitivePeerDependencies: -+ - supports-color -+ dev: false -+ -+ /@typescript-eslint/visitor-keys/5.47.1: -+ resolution: {integrity: sha512-rF3pmut2JCCjh6BLRhNKdYjULMb1brvoaiWDlHfLNVgmnZ0sBVJrs3SyaKE1XoDDnJuAx/hDQryHYmPUuNq0ig==} -+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -+ dependencies: -+ '@typescript-eslint/types': 5.47.1 -+ eslint-visitor-keys: 3.3.0 -+ dev: false -+ -+ /acorn-jsx/5.3.2_acorn@8.8.1: -+ resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} -+ peerDependencies: -+ acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 -+ dependencies: -+ acorn: 8.8.1 -+ dev: false -+ -+ /acorn/8.8.1: -+ resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==} -+ engines: {node: '>=0.4.0'} -+ hasBin: true -+ dev: false -+ -+ /ajv/6.12.6: -+ resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} -+ dependencies: -+ fast-deep-equal: 3.1.3 -+ fast-json-stable-stringify: 2.1.0 -+ json-schema-traverse: 0.4.1 -+ uri-js: 4.4.1 -+ dev: false -+ -+ /ansi-regex/5.0.1: -+ resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /ansi-styles/4.3.0: -+ resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} -+ engines: {node: '>=8'} -+ dependencies: -+ color-convert: 2.0.1 -+ dev: false -+ -+ /argparse/2.0.1: -+ resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} -+ dev: false -+ -+ /aria-query/4.2.2: -+ resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==} -+ engines: {node: '>=6.0'} -+ dependencies: -+ '@babel/runtime': 7.20.7 -+ '@babel/runtime-corejs3': 7.20.7 -+ dev: false -+ -+ /array-includes/3.1.6: -+ resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ get-intrinsic: 1.1.3 -+ is-string: 1.0.7 -+ dev: false -+ -+ /array-union/2.1.0: -+ resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /array.prototype.flat/1.3.1: -+ resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ es-shim-unscopables: 1.0.0 -+ dev: false -+ -+ /array.prototype.flatmap/1.3.1: -+ resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ es-shim-unscopables: 1.0.0 -+ dev: false -+ -+ /array.prototype.tosorted/1.1.1: -+ resolution: {integrity: sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ es-shim-unscopables: 1.0.0 -+ get-intrinsic: 1.1.3 -+ dev: false -+ -+ /ast-types-flow/0.0.7: -+ resolution: {integrity: sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==} -+ dev: false -+ -+ /axe-core/4.6.1: -+ resolution: {integrity: sha512-lCZN5XRuOnpG4bpMq8v0khrWtUOn+i8lZSb6wHZH56ZfbIEv6XwJV84AAueh9/zi7qPVJ/E4yz6fmsiyOmXR4w==} -+ engines: {node: '>=4'} -+ dev: false -+ -+ /axobject-query/2.2.0: -+ resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==} -+ dev: false -+ -+ /balanced-match/1.0.2: -+ resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} -+ dev: false -+ -+ /brace-expansion/1.1.11: -+ resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} -+ dependencies: -+ balanced-match: 1.0.2 -+ concat-map: 0.0.1 -+ dev: false -+ -+ /braces/3.0.2: -+ resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} -+ engines: {node: '>=8'} -+ dependencies: -+ fill-range: 7.0.1 -+ dev: false -+ -+ /call-bind/1.0.2: -+ resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} -+ dependencies: -+ function-bind: 1.1.1 -+ get-intrinsic: 1.1.3 -+ dev: false -+ -+ /callsites/3.1.0: -+ resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} -+ engines: {node: '>=6'} -+ dev: false -+ -+ /caniuse-lite/1.0.30001441: -+ resolution: {integrity: sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==} -+ dev: false -+ -+ /chalk/4.1.2: -+ resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} -+ engines: {node: '>=10'} -+ dependencies: -+ ansi-styles: 4.3.0 -+ supports-color: 7.2.0 -+ dev: false -+ -+ /client-only/0.0.1: -+ resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} -+ dev: false -+ -+ /color-convert/2.0.1: -+ resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} -+ engines: {node: '>=7.0.0'} -+ dependencies: -+ color-name: 1.1.4 -+ dev: false -+ -+ /color-name/1.1.4: -+ resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} -+ dev: false -+ -+ /concat-map/0.0.1: -+ resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} -+ dev: false -+ -+ /core-js-pure/3.27.1: -+ resolution: {integrity: sha512-BS2NHgwwUppfeoqOXqi08mUqS5FiZpuRuJJpKsaME7kJz0xxuk0xkhDdfMIlP/zLa80krBqss1LtD7f889heAw==} -+ requiresBuild: true -+ dev: false -+ -+ /cross-spawn/7.0.3: -+ resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} -+ engines: {node: '>= 8'} -+ dependencies: -+ path-key: 3.1.1 -+ shebang-command: 2.0.0 -+ which: 2.0.2 -+ dev: false -+ -+ /csstype/3.1.1: -+ resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==} -+ dev: false -+ -+ /damerau-levenshtein/1.0.8: -+ resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==} -+ dev: false -+ -+ /debug/2.6.9: -+ resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} -+ peerDependencies: -+ supports-color: '*' -+ peerDependenciesMeta: -+ supports-color: -+ optional: true -+ dependencies: -+ ms: 2.0.0 -+ dev: false -+ -+ /debug/3.2.7: -+ resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} -+ peerDependencies: -+ supports-color: '*' -+ peerDependenciesMeta: -+ supports-color: -+ optional: true -+ dependencies: -+ ms: 2.1.3 -+ dev: false -+ -+ /debug/4.3.4: -+ resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} -+ engines: {node: '>=6.0'} -+ peerDependencies: -+ supports-color: '*' -+ peerDependenciesMeta: -+ supports-color: -+ optional: true -+ dependencies: -+ ms: 2.1.2 -+ dev: false -+ -+ /deep-is/0.1.4: -+ resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} -+ dev: false -+ -+ /define-lazy-prop/2.0.0: -+ resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /define-properties/1.1.4: -+ resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ has-property-descriptors: 1.0.0 -+ object-keys: 1.1.1 -+ dev: false -+ -+ /dir-glob/3.0.1: -+ resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} -+ engines: {node: '>=8'} -+ dependencies: -+ path-type: 4.0.0 -+ dev: false -+ -+ /doctrine/2.1.0: -+ resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==} -+ engines: {node: '>=0.10.0'} -+ dependencies: -+ esutils: 2.0.3 -+ dev: false -+ -+ /doctrine/3.0.0: -+ resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} -+ engines: {node: '>=6.0.0'} -+ dependencies: -+ esutils: 2.0.3 -+ dev: false -+ -+ /emoji-regex/9.2.2: -+ resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} -+ dev: false -+ -+ /enhanced-resolve/5.12.0: -+ resolution: {integrity: sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==} -+ engines: {node: '>=10.13.0'} -+ dependencies: -+ graceful-fs: 4.2.10 -+ tapable: 2.2.1 -+ dev: false -+ -+ /es-abstract/1.20.5: -+ resolution: {integrity: sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ es-to-primitive: 1.2.1 -+ function-bind: 1.1.1 -+ function.prototype.name: 1.1.5 -+ get-intrinsic: 1.1.3 -+ get-symbol-description: 1.0.0 -+ gopd: 1.0.1 -+ has: 1.0.3 -+ has-property-descriptors: 1.0.0 -+ has-symbols: 1.0.3 -+ internal-slot: 1.0.4 -+ is-callable: 1.2.7 -+ is-negative-zero: 2.0.2 -+ is-regex: 1.1.4 -+ is-shared-array-buffer: 1.0.2 -+ is-string: 1.0.7 -+ is-weakref: 1.0.2 -+ object-inspect: 1.12.2 -+ object-keys: 1.1.1 -+ object.assign: 4.1.4 -+ regexp.prototype.flags: 1.4.3 -+ safe-regex-test: 1.0.0 -+ string.prototype.trimend: 1.0.6 -+ string.prototype.trimstart: 1.0.6 -+ unbox-primitive: 1.0.2 -+ dev: false -+ -+ /es-shim-unscopables/1.0.0: -+ resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==} -+ dependencies: -+ has: 1.0.3 -+ dev: false -+ -+ /es-to-primitive/1.2.1: -+ resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ is-callable: 1.2.7 -+ is-date-object: 1.0.5 -+ is-symbol: 1.0.4 -+ dev: false -+ -+ /escape-string-regexp/4.0.0: -+ resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} -+ engines: {node: '>=10'} -+ dev: false -+ -+ /eslint-config-next/13.1.1_iukboom6ndih5an6iafl45j2fe: -+ resolution: {integrity: sha512-/5S2XGWlGaiqrRhzpn51ux5JUSLwx8PVK2keLi5xk7QmhfYB8PqE6R6SlVw6hgnf/VexvUXSrlNJ/su00NhtHQ==} -+ peerDependencies: -+ eslint: ^7.23.0 || ^8.0.0 -+ typescript: '>=3.3.1' -+ peerDependenciesMeta: -+ typescript: -+ optional: true -+ dependencies: -+ '@next/eslint-plugin-next': 13.1.1 -+ '@rushstack/eslint-patch': 1.2.0 -+ '@typescript-eslint/parser': 5.47.1_iukboom6ndih5an6iafl45j2fe -+ eslint: 8.31.0 -+ eslint-import-resolver-node: 0.3.6 -+ eslint-import-resolver-typescript: 3.5.2_ol7jqilc3wemtdbq3nzhywgxq4 -+ eslint-plugin-import: 2.26.0_bpx4furzt4ibermwbsj75osuwi -+ eslint-plugin-jsx-a11y: 6.6.1_eslint@8.31.0 -+ eslint-plugin-react: 7.31.11_eslint@8.31.0 -+ eslint-plugin-react-hooks: 4.6.0_eslint@8.31.0 -+ typescript: 4.9.4 -+ transitivePeerDependencies: -+ - eslint-import-resolver-webpack -+ - supports-color -+ dev: false -+ -+ /eslint-import-resolver-node/0.3.6: -+ resolution: {integrity: sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==} -+ dependencies: -+ debug: 3.2.7 -+ resolve: 1.22.1 -+ transitivePeerDependencies: -+ - supports-color -+ dev: false -+ -+ /eslint-import-resolver-typescript/3.5.2_ol7jqilc3wemtdbq3nzhywgxq4: -+ resolution: {integrity: sha512-zX4ebnnyXiykjhcBvKIf5TNvt8K7yX6bllTRZ14MiurKPjDpCAZujlszTdB8pcNXhZcOf+god4s9SjQa5GnytQ==} -+ engines: {node: ^14.18.0 || >=16.0.0} -+ peerDependencies: -+ eslint: '*' -+ eslint-plugin-import: '*' -+ dependencies: -+ debug: 4.3.4 -+ enhanced-resolve: 5.12.0 -+ eslint: 8.31.0 -+ eslint-plugin-import: 2.26.0_bpx4furzt4ibermwbsj75osuwi -+ get-tsconfig: 4.2.0 -+ globby: 13.1.3 -+ is-core-module: 2.11.0 -+ is-glob: 4.0.3 -+ synckit: 0.8.4 -+ transitivePeerDependencies: -+ - supports-color -+ dev: false -+ -+ /eslint-module-utils/2.7.4_of6uaipqaoaobv57tu2gvxhnhu: -+ resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==} -+ engines: {node: '>=4'} -+ peerDependencies: -+ '@typescript-eslint/parser': '*' -+ eslint: '*' -+ eslint-import-resolver-node: '*' -+ eslint-import-resolver-typescript: '*' -+ eslint-import-resolver-webpack: '*' -+ peerDependenciesMeta: -+ '@typescript-eslint/parser': -+ optional: true -+ eslint: -+ optional: true -+ eslint-import-resolver-node: -+ optional: true -+ eslint-import-resolver-typescript: -+ optional: true -+ eslint-import-resolver-webpack: -+ optional: true -+ dependencies: -+ '@typescript-eslint/parser': 5.47.1_iukboom6ndih5an6iafl45j2fe -+ debug: 3.2.7 -+ eslint: 8.31.0 -+ eslint-import-resolver-node: 0.3.6 -+ eslint-import-resolver-typescript: 3.5.2_ol7jqilc3wemtdbq3nzhywgxq4 -+ transitivePeerDependencies: -+ - supports-color -+ dev: false -+ -+ /eslint-plugin-import/2.26.0_bpx4furzt4ibermwbsj75osuwi: -+ resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==} -+ engines: {node: '>=4'} -+ peerDependencies: -+ '@typescript-eslint/parser': '*' -+ eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 -+ peerDependenciesMeta: -+ '@typescript-eslint/parser': -+ optional: true -+ dependencies: -+ '@typescript-eslint/parser': 5.47.1_iukboom6ndih5an6iafl45j2fe -+ array-includes: 3.1.6 -+ array.prototype.flat: 1.3.1 -+ debug: 2.6.9 -+ doctrine: 2.1.0 -+ eslint: 8.31.0 -+ eslint-import-resolver-node: 0.3.6 -+ eslint-module-utils: 2.7.4_of6uaipqaoaobv57tu2gvxhnhu -+ has: 1.0.3 -+ is-core-module: 2.11.0 -+ is-glob: 4.0.3 -+ minimatch: 3.1.2 -+ object.values: 1.1.6 -+ resolve: 1.22.1 -+ tsconfig-paths: 3.14.1 -+ transitivePeerDependencies: -+ - eslint-import-resolver-typescript -+ - eslint-import-resolver-webpack -+ - supports-color -+ dev: false -+ -+ /eslint-plugin-jsx-a11y/6.6.1_eslint@8.31.0: -+ resolution: {integrity: sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==} -+ engines: {node: '>=4.0'} -+ peerDependencies: -+ eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 -+ dependencies: -+ '@babel/runtime': 7.20.7 -+ aria-query: 4.2.2 -+ array-includes: 3.1.6 -+ ast-types-flow: 0.0.7 -+ axe-core: 4.6.1 -+ axobject-query: 2.2.0 -+ damerau-levenshtein: 1.0.8 -+ emoji-regex: 9.2.2 -+ eslint: 8.31.0 -+ has: 1.0.3 -+ jsx-ast-utils: 3.3.3 -+ language-tags: 1.0.7 -+ minimatch: 3.1.2 -+ semver: 6.3.0 -+ dev: false -+ -+ /eslint-plugin-react-hooks/4.6.0_eslint@8.31.0: -+ resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==} -+ engines: {node: '>=10'} -+ peerDependencies: -+ eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 -+ dependencies: -+ eslint: 8.31.0 -+ dev: false -+ -+ /eslint-plugin-react/7.31.11_eslint@8.31.0: -+ resolution: {integrity: sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==} -+ engines: {node: '>=4'} -+ peerDependencies: -+ eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 -+ dependencies: -+ array-includes: 3.1.6 -+ array.prototype.flatmap: 1.3.1 -+ array.prototype.tosorted: 1.1.1 -+ doctrine: 2.1.0 -+ eslint: 8.31.0 -+ estraverse: 5.3.0 -+ jsx-ast-utils: 3.3.3 -+ minimatch: 3.1.2 -+ object.entries: 1.1.6 -+ object.fromentries: 2.0.6 -+ object.hasown: 1.1.2 -+ object.values: 1.1.6 -+ prop-types: 15.8.1 -+ resolve: 2.0.0-next.4 -+ semver: 6.3.0 -+ string.prototype.matchall: 4.0.8 -+ dev: false -+ -+ /eslint-scope/7.1.1: -+ resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==} -+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -+ dependencies: -+ esrecurse: 4.3.0 -+ estraverse: 5.3.0 -+ dev: false -+ -+ /eslint-utils/3.0.0_eslint@8.31.0: -+ resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} -+ engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} -+ peerDependencies: -+ eslint: '>=5' -+ dependencies: -+ eslint: 8.31.0 -+ eslint-visitor-keys: 2.1.0 -+ dev: false -+ -+ /eslint-visitor-keys/2.1.0: -+ resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==} -+ engines: {node: '>=10'} -+ dev: false -+ -+ /eslint-visitor-keys/3.3.0: -+ resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==} -+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -+ dev: false -+ -+ /eslint/8.31.0: -+ resolution: {integrity: sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==} -+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -+ hasBin: true -+ dependencies: -+ '@eslint/eslintrc': 1.4.1 -+ '@humanwhocodes/config-array': 0.11.8 -+ '@humanwhocodes/module-importer': 1.0.1 -+ '@nodelib/fs.walk': 1.2.8 -+ ajv: 6.12.6 -+ chalk: 4.1.2 -+ cross-spawn: 7.0.3 -+ debug: 4.3.4 -+ doctrine: 3.0.0 -+ escape-string-regexp: 4.0.0 -+ eslint-scope: 7.1.1 -+ eslint-utils: 3.0.0_eslint@8.31.0 -+ eslint-visitor-keys: 3.3.0 -+ espree: 9.4.1 -+ esquery: 1.4.0 -+ esutils: 2.0.3 -+ fast-deep-equal: 3.1.3 -+ file-entry-cache: 6.0.1 -+ find-up: 5.0.0 -+ glob-parent: 6.0.2 -+ globals: 13.19.0 -+ grapheme-splitter: 1.0.4 -+ ignore: 5.2.4 -+ import-fresh: 3.3.0 -+ imurmurhash: 0.1.4 -+ is-glob: 4.0.3 -+ is-path-inside: 3.0.3 -+ js-sdsl: 4.2.0 -+ js-yaml: 4.1.0 -+ json-stable-stringify-without-jsonify: 1.0.1 -+ levn: 0.4.1 -+ lodash.merge: 4.6.2 -+ minimatch: 3.1.2 -+ natural-compare: 1.4.0 -+ optionator: 0.9.1 -+ regexpp: 3.2.0 -+ strip-ansi: 6.0.1 -+ strip-json-comments: 3.1.1 -+ text-table: 0.2.0 -+ transitivePeerDependencies: -+ - supports-color -+ dev: false -+ -+ /espree/9.4.1: -+ resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==} -+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -+ dependencies: -+ acorn: 8.8.1 -+ acorn-jsx: 5.3.2_acorn@8.8.1 -+ eslint-visitor-keys: 3.3.0 -+ dev: false -+ -+ /esquery/1.4.0: -+ resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==} -+ engines: {node: '>=0.10'} -+ dependencies: -+ estraverse: 5.3.0 -+ dev: false -+ -+ /esrecurse/4.3.0: -+ resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} -+ engines: {node: '>=4.0'} -+ dependencies: -+ estraverse: 5.3.0 -+ dev: false -+ -+ /estraverse/5.3.0: -+ resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} -+ engines: {node: '>=4.0'} -+ dev: false -+ -+ /esutils/2.0.3: -+ resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} -+ engines: {node: '>=0.10.0'} -+ dev: false -+ -+ /fast-deep-equal/3.1.3: -+ resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} -+ dev: false -+ -+ /fast-glob/3.2.12: -+ resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} -+ engines: {node: '>=8.6.0'} -+ dependencies: -+ '@nodelib/fs.stat': 2.0.5 -+ '@nodelib/fs.walk': 1.2.8 -+ glob-parent: 5.1.2 -+ merge2: 1.4.1 -+ micromatch: 4.0.5 -+ dev: false -+ -+ /fast-json-stable-stringify/2.1.0: -+ resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} -+ dev: false -+ -+ /fast-levenshtein/2.0.6: -+ resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} -+ dev: false -+ -+ /fastq/1.14.0: -+ resolution: {integrity: sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==} -+ dependencies: -+ reusify: 1.0.4 -+ dev: false -+ -+ /file-entry-cache/6.0.1: -+ resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} -+ engines: {node: ^10.12.0 || >=12.0.0} -+ dependencies: -+ flat-cache: 3.0.4 -+ dev: false -+ -+ /fill-range/7.0.1: -+ resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} -+ engines: {node: '>=8'} -+ dependencies: -+ to-regex-range: 5.0.1 -+ dev: false -+ -+ /find-up/5.0.0: -+ resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} -+ engines: {node: '>=10'} -+ dependencies: -+ locate-path: 6.0.0 -+ path-exists: 4.0.0 -+ dev: false -+ -+ /flat-cache/3.0.4: -+ resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==} -+ engines: {node: ^10.12.0 || >=12.0.0} -+ dependencies: -+ flatted: 3.2.7 -+ rimraf: 3.0.2 -+ dev: false -+ -+ /flatted/3.2.7: -+ resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} -+ dev: false -+ -+ /fs.realpath/1.0.0: -+ resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} -+ dev: false -+ -+ /function-bind/1.1.1: -+ resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} -+ dev: false -+ -+ /function.prototype.name/1.1.5: -+ resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ functions-have-names: 1.2.3 -+ dev: false -+ -+ /functions-have-names/1.2.3: -+ resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} -+ dev: false -+ -+ /get-intrinsic/1.1.3: -+ resolution: {integrity: sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==} -+ dependencies: -+ function-bind: 1.1.1 -+ has: 1.0.3 -+ has-symbols: 1.0.3 -+ dev: false -+ -+ /get-symbol-description/1.0.0: -+ resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ get-intrinsic: 1.1.3 -+ dev: false -+ -+ /get-tsconfig/4.2.0: -+ resolution: {integrity: sha512-X8u8fREiYOE6S8hLbq99PeykTDoLVnxvF4DjWKJmz9xy2nNRdUcV8ZN9tniJFeKyTU3qnC9lL8n4Chd6LmVKHg==} -+ dev: false -+ -+ /glob-parent/5.1.2: -+ resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} -+ engines: {node: '>= 6'} -+ dependencies: -+ is-glob: 4.0.3 -+ dev: false -+ -+ /glob-parent/6.0.2: -+ resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} -+ engines: {node: '>=10.13.0'} -+ dependencies: -+ is-glob: 4.0.3 -+ dev: false -+ -+ /glob/7.1.7: -+ resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==} -+ dependencies: -+ fs.realpath: 1.0.0 -+ inflight: 1.0.6 -+ inherits: 2.0.4 -+ minimatch: 3.1.2 -+ once: 1.4.0 -+ path-is-absolute: 1.0.1 -+ dev: false -+ -+ /glob/7.2.3: -+ resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} -+ dependencies: -+ fs.realpath: 1.0.0 -+ inflight: 1.0.6 -+ inherits: 2.0.4 -+ minimatch: 3.1.2 -+ once: 1.4.0 -+ path-is-absolute: 1.0.1 -+ dev: false -+ -+ /globals/13.19.0: -+ resolution: {integrity: sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==} -+ engines: {node: '>=8'} -+ dependencies: -+ type-fest: 0.20.2 -+ dev: false -+ -+ /globalyzer/0.1.0: -+ resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==} -+ dev: false -+ -+ /globby/11.1.0: -+ resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} -+ engines: {node: '>=10'} -+ dependencies: -+ array-union: 2.1.0 -+ dir-glob: 3.0.1 -+ fast-glob: 3.2.12 -+ ignore: 5.2.4 -+ merge2: 1.4.1 -+ slash: 3.0.0 -+ dev: false -+ -+ /globby/13.1.3: -+ resolution: {integrity: sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==} -+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} -+ dependencies: -+ dir-glob: 3.0.1 -+ fast-glob: 3.2.12 -+ ignore: 5.2.4 -+ merge2: 1.4.1 -+ slash: 4.0.0 -+ dev: false -+ -+ /globrex/0.1.2: -+ resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==} -+ dev: false -+ -+ /gopd/1.0.1: -+ resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} -+ dependencies: -+ get-intrinsic: 1.1.3 -+ dev: false -+ -+ /graceful-fs/4.2.10: -+ resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} -+ dev: false -+ -+ /grapheme-splitter/1.0.4: -+ resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==} -+ dev: false -+ -+ /has-bigints/1.0.2: -+ resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} -+ dev: false -+ -+ /has-flag/4.0.0: -+ resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /has-property-descriptors/1.0.0: -+ resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==} -+ dependencies: -+ get-intrinsic: 1.1.3 -+ dev: false -+ -+ /has-symbols/1.0.3: -+ resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} -+ engines: {node: '>= 0.4'} -+ dev: false -+ -+ /has-tostringtag/1.0.0: -+ resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ has-symbols: 1.0.3 -+ dev: false -+ -+ /has/1.0.3: -+ resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} -+ engines: {node: '>= 0.4.0'} -+ dependencies: -+ function-bind: 1.1.1 -+ dev: false -+ -+ /ignore/5.2.4: -+ resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} -+ engines: {node: '>= 4'} -+ dev: false -+ -+ /import-fresh/3.3.0: -+ resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} -+ engines: {node: '>=6'} -+ dependencies: -+ parent-module: 1.0.1 -+ resolve-from: 4.0.0 -+ dev: false -+ -+ /imurmurhash/0.1.4: -+ resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} -+ engines: {node: '>=0.8.19'} -+ dev: false -+ -+ /inflight/1.0.6: -+ resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} -+ dependencies: -+ once: 1.4.0 -+ wrappy: 1.0.2 -+ dev: false -+ -+ /inherits/2.0.4: -+ resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} -+ dev: false -+ -+ /internal-slot/1.0.4: -+ resolution: {integrity: sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ get-intrinsic: 1.1.3 -+ has: 1.0.3 -+ side-channel: 1.0.4 -+ dev: false -+ -+ /is-bigint/1.0.4: -+ resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==} -+ dependencies: -+ has-bigints: 1.0.2 -+ dev: false -+ -+ /is-boolean-object/1.1.2: -+ resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ has-tostringtag: 1.0.0 -+ dev: false -+ -+ /is-callable/1.2.7: -+ resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} -+ engines: {node: '>= 0.4'} -+ dev: false -+ -+ /is-core-module/2.11.0: -+ resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==} -+ dependencies: -+ has: 1.0.3 -+ dev: false -+ -+ /is-date-object/1.0.5: -+ resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ has-tostringtag: 1.0.0 -+ dev: false -+ -+ /is-docker/2.2.1: -+ resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} -+ engines: {node: '>=8'} -+ hasBin: true -+ dev: false -+ -+ /is-extglob/2.1.1: -+ resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} -+ engines: {node: '>=0.10.0'} -+ dev: false -+ -+ /is-glob/4.0.3: -+ resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} -+ engines: {node: '>=0.10.0'} -+ dependencies: -+ is-extglob: 2.1.1 -+ dev: false -+ -+ /is-negative-zero/2.0.2: -+ resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==} -+ engines: {node: '>= 0.4'} -+ dev: false -+ -+ /is-number-object/1.0.7: -+ resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ has-tostringtag: 1.0.0 -+ dev: false -+ -+ /is-number/7.0.0: -+ resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} -+ engines: {node: '>=0.12.0'} -+ dev: false -+ -+ /is-path-inside/3.0.3: -+ resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /is-regex/1.1.4: -+ resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ has-tostringtag: 1.0.0 -+ dev: false -+ -+ /is-shared-array-buffer/1.0.2: -+ resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==} -+ dependencies: -+ call-bind: 1.0.2 -+ dev: false -+ -+ /is-string/1.0.7: -+ resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ has-tostringtag: 1.0.0 -+ dev: false -+ -+ /is-symbol/1.0.4: -+ resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ has-symbols: 1.0.3 -+ dev: false -+ -+ /is-weakref/1.0.2: -+ resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} -+ dependencies: -+ call-bind: 1.0.2 -+ dev: false -+ -+ /is-wsl/2.2.0: -+ resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} -+ engines: {node: '>=8'} -+ dependencies: -+ is-docker: 2.2.1 -+ dev: false -+ -+ /isexe/2.0.0: -+ resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} -+ dev: false -+ -+ /js-sdsl/4.2.0: -+ resolution: {integrity: sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==} -+ dev: false -+ -+ /js-tokens/4.0.0: -+ resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} -+ dev: false -+ -+ /js-yaml/4.1.0: -+ resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} -+ hasBin: true -+ dependencies: -+ argparse: 2.0.1 -+ dev: false -+ -+ /json-schema-traverse/0.4.1: -+ resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} -+ dev: false -+ -+ /json-stable-stringify-without-jsonify/1.0.1: -+ resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} -+ dev: false -+ -+ /json5/1.0.2: -+ resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==} -+ hasBin: true -+ dependencies: -+ minimist: 1.2.7 -+ dev: false -+ -+ /jsx-ast-utils/3.3.3: -+ resolution: {integrity: sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==} -+ engines: {node: '>=4.0'} -+ dependencies: -+ array-includes: 3.1.6 -+ object.assign: 4.1.4 -+ dev: false -+ -+ /language-subtag-registry/0.3.22: -+ resolution: {integrity: sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==} -+ dev: false -+ -+ /language-tags/1.0.7: -+ resolution: {integrity: sha512-bSytju1/657hFjgUzPAPqszxH62ouE8nQFoFaVlIQfne4wO/wXC9A4+m8jYve7YBBvi59eq0SUpcshvG8h5Usw==} -+ dependencies: -+ language-subtag-registry: 0.3.22 -+ dev: false -+ -+ /levn/0.4.1: -+ resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} -+ engines: {node: '>= 0.8.0'} -+ dependencies: -+ prelude-ls: 1.2.1 -+ type-check: 0.4.0 -+ dev: false -+ -+ /locate-path/6.0.0: -+ resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} -+ engines: {node: '>=10'} -+ dependencies: -+ p-locate: 5.0.0 -+ dev: false -+ -+ /lodash.merge/4.6.2: -+ resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} -+ dev: false -+ -+ /loose-envify/1.4.0: -+ resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} -+ hasBin: true -+ dependencies: -+ js-tokens: 4.0.0 -+ dev: false -+ -+ /lru-cache/6.0.0: -+ resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} -+ engines: {node: '>=10'} -+ dependencies: -+ yallist: 4.0.0 -+ dev: false -+ -+ /merge2/1.4.1: -+ resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} -+ engines: {node: '>= 8'} -+ dev: false -+ -+ /micromatch/4.0.5: -+ resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} -+ engines: {node: '>=8.6'} -+ dependencies: -+ braces: 3.0.2 -+ picomatch: 2.3.1 -+ dev: false -+ -+ /minimatch/3.1.2: -+ resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} -+ dependencies: -+ brace-expansion: 1.1.11 -+ dev: false -+ -+ /minimist/1.2.7: -+ resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==} -+ dev: false -+ -+ /ms/2.0.0: -+ resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} -+ dev: false -+ -+ /ms/2.1.2: -+ resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} -+ dev: false -+ -+ /ms/2.1.3: -+ resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} -+ dev: false -+ -+ /nanoid/3.3.4: -+ resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==} -+ engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} -+ hasBin: true -+ dev: false -+ -+ /natural-compare/1.4.0: -+ resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} -+ dev: false -+ -+ /next/13.1.1_biqbaboplfbrettd7655fr4n2y: -+ resolution: {integrity: sha512-R5eBAaIa3X7LJeYvv1bMdGnAVF4fVToEjim7MkflceFPuANY3YyvFxXee/A+acrSYwYPvOvf7f6v/BM/48ea5w==} -+ engines: {node: '>=14.6.0'} -+ hasBin: true -+ peerDependencies: -+ fibers: '>= 3.1.0' -+ node-sass: ^6.0.0 || ^7.0.0 -+ react: ^18.2.0 -+ react-dom: ^18.2.0 -+ sass: ^1.3.0 -+ peerDependenciesMeta: -+ fibers: -+ optional: true -+ node-sass: -+ optional: true -+ sass: -+ optional: true -+ dependencies: -+ '@next/env': 13.1.1 -+ '@swc/helpers': 0.4.14 -+ caniuse-lite: 1.0.30001441 -+ postcss: 8.4.14 -+ react: 18.2.0 -+ react-dom: 18.2.0_react@18.2.0 -+ styled-jsx: 5.1.1_react@18.2.0 -+ optionalDependencies: -+ '@next/swc-android-arm-eabi': 13.1.1 -+ '@next/swc-android-arm64': 13.1.1 -+ '@next/swc-darwin-arm64': 13.1.1 -+ '@next/swc-darwin-x64': 13.1.1 -+ '@next/swc-freebsd-x64': 13.1.1 -+ '@next/swc-linux-arm-gnueabihf': 13.1.1 -+ '@next/swc-linux-arm64-gnu': 13.1.1 -+ '@next/swc-linux-arm64-musl': 13.1.1 -+ '@next/swc-linux-x64-gnu': 13.1.1 -+ '@next/swc-linux-x64-musl': 13.1.1 -+ '@next/swc-win32-arm64-msvc': 13.1.1 -+ '@next/swc-win32-ia32-msvc': 13.1.1 -+ '@next/swc-win32-x64-msvc': 13.1.1 -+ transitivePeerDependencies: -+ - '@babel/core' -+ - babel-plugin-macros -+ dev: false -+ -+ /object-assign/4.1.1: -+ resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} -+ engines: {node: '>=0.10.0'} -+ dev: false -+ -+ /object-inspect/1.12.2: -+ resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==} -+ dev: false -+ -+ /object-keys/1.1.1: -+ resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} -+ engines: {node: '>= 0.4'} -+ dev: false -+ -+ /object.assign/4.1.4: -+ resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ has-symbols: 1.0.3 -+ object-keys: 1.1.1 -+ dev: false -+ -+ /object.entries/1.1.6: -+ resolution: {integrity: sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ dev: false -+ -+ /object.fromentries/2.0.6: -+ resolution: {integrity: sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ dev: false -+ -+ /object.hasown/1.1.2: -+ resolution: {integrity: sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==} -+ dependencies: -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ dev: false -+ -+ /object.values/1.1.6: -+ resolution: {integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ dev: false -+ -+ /once/1.4.0: -+ resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} -+ dependencies: -+ wrappy: 1.0.2 -+ dev: false -+ -+ /open/8.4.0: -+ resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==} -+ engines: {node: '>=12'} -+ dependencies: -+ define-lazy-prop: 2.0.0 -+ is-docker: 2.2.1 -+ is-wsl: 2.2.0 -+ dev: false -+ -+ /optionator/0.9.1: -+ resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} -+ engines: {node: '>= 0.8.0'} -+ dependencies: -+ deep-is: 0.1.4 -+ fast-levenshtein: 2.0.6 -+ levn: 0.4.1 -+ prelude-ls: 1.2.1 -+ type-check: 0.4.0 -+ word-wrap: 1.2.3 -+ dev: false -+ -+ /p-limit/3.1.0: -+ resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} -+ engines: {node: '>=10'} -+ dependencies: -+ yocto-queue: 0.1.0 -+ dev: false -+ -+ /p-locate/5.0.0: -+ resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} -+ engines: {node: '>=10'} -+ dependencies: -+ p-limit: 3.1.0 -+ dev: false -+ -+ /parent-module/1.0.1: -+ resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} -+ engines: {node: '>=6'} -+ dependencies: -+ callsites: 3.1.0 -+ dev: false -+ -+ /path-exists/4.0.0: -+ resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /path-is-absolute/1.0.1: -+ resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} -+ engines: {node: '>=0.10.0'} -+ dev: false -+ -+ /path-key/3.1.1: -+ resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /path-parse/1.0.7: -+ resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} -+ dev: false -+ -+ /path-type/4.0.0: -+ resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /picocolors/1.0.0: -+ resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} -+ dev: false -+ -+ /picomatch/2.3.1: -+ resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} -+ engines: {node: '>=8.6'} -+ dev: false -+ -+ /postcss/8.4.14: -+ resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==} -+ engines: {node: ^10 || ^12 || >=14} -+ dependencies: -+ nanoid: 3.3.4 -+ picocolors: 1.0.0 -+ source-map-js: 1.0.2 -+ dev: false -+ -+ /prelude-ls/1.2.1: -+ resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} -+ engines: {node: '>= 0.8.0'} -+ dev: false -+ -+ /prettier/2.8.1: -+ resolution: {integrity: sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==} -+ engines: {node: '>=10.13.0'} -+ hasBin: true -+ dev: true -+ -+ /prop-types/15.8.1: -+ resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==} -+ dependencies: -+ loose-envify: 1.4.0 -+ object-assign: 4.1.1 -+ react-is: 16.13.1 -+ dev: false -+ -+ /punycode/2.1.1: -+ resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} -+ engines: {node: '>=6'} -+ dev: false -+ -+ /queue-microtask/1.2.3: -+ resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} -+ dev: false -+ -+ /react-dom/18.2.0_react@18.2.0: -+ resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} -+ peerDependencies: -+ react: ^18.2.0 -+ dependencies: -+ loose-envify: 1.4.0 -+ react: 18.2.0 -+ scheduler: 0.23.0 -+ dev: false -+ -+ /react-is/16.13.1: -+ resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} -+ dev: false -+ -+ /react/18.2.0: -+ resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==} -+ engines: {node: '>=0.10.0'} -+ dependencies: -+ loose-envify: 1.4.0 -+ dev: false -+ -+ /regenerator-runtime/0.13.11: -+ resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} -+ dev: false -+ -+ /regexp.prototype.flags/1.4.3: -+ resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==} -+ engines: {node: '>= 0.4'} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ functions-have-names: 1.2.3 -+ dev: false -+ -+ /regexpp/3.2.0: -+ resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /resolve-from/4.0.0: -+ resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} -+ engines: {node: '>=4'} -+ dev: false -+ -+ /resolve/1.22.1: -+ resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==} -+ hasBin: true -+ dependencies: -+ is-core-module: 2.11.0 -+ path-parse: 1.0.7 -+ supports-preserve-symlinks-flag: 1.0.0 -+ dev: false -+ -+ /resolve/2.0.0-next.4: -+ resolution: {integrity: sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==} -+ hasBin: true -+ dependencies: -+ is-core-module: 2.11.0 -+ path-parse: 1.0.7 -+ supports-preserve-symlinks-flag: 1.0.0 -+ dev: false -+ -+ /reusify/1.0.4: -+ resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} -+ engines: {iojs: '>=1.0.0', node: '>=0.10.0'} -+ dev: false -+ -+ /rimraf/3.0.2: -+ resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} -+ hasBin: true -+ dependencies: -+ glob: 7.2.3 -+ dev: false -+ -+ /run-parallel/1.2.0: -+ resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} -+ dependencies: -+ queue-microtask: 1.2.3 -+ dev: false -+ -+ /safe-regex-test/1.0.0: -+ resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==} -+ dependencies: -+ call-bind: 1.0.2 -+ get-intrinsic: 1.1.3 -+ is-regex: 1.1.4 -+ dev: false -+ -+ /scheduler/0.23.0: -+ resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} -+ dependencies: -+ loose-envify: 1.4.0 -+ dev: false -+ -+ /semver/6.3.0: -+ resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} -+ hasBin: true -+ dev: false -+ -+ /semver/7.3.8: -+ resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==} -+ engines: {node: '>=10'} -+ hasBin: true -+ dependencies: -+ lru-cache: 6.0.0 -+ dev: false -+ -+ /shebang-command/2.0.0: -+ resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} -+ engines: {node: '>=8'} -+ dependencies: -+ shebang-regex: 3.0.0 -+ dev: false -+ -+ /shebang-regex/3.0.0: -+ resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /side-channel/1.0.4: -+ resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} -+ dependencies: -+ call-bind: 1.0.2 -+ get-intrinsic: 1.1.3 -+ object-inspect: 1.12.2 -+ dev: false -+ -+ /slash/3.0.0: -+ resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /slash/4.0.0: -+ resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==} -+ engines: {node: '>=12'} -+ dev: false -+ -+ /source-map-js/1.0.2: -+ resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} -+ engines: {node: '>=0.10.0'} -+ dev: false -+ -+ /string.prototype.matchall/4.0.8: -+ resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ get-intrinsic: 1.1.3 -+ has-symbols: 1.0.3 -+ internal-slot: 1.0.4 -+ regexp.prototype.flags: 1.4.3 -+ side-channel: 1.0.4 -+ dev: false -+ -+ /string.prototype.trimend/1.0.6: -+ resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ dev: false -+ -+ /string.prototype.trimstart/1.0.6: -+ resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==} -+ dependencies: -+ call-bind: 1.0.2 -+ define-properties: 1.1.4 -+ es-abstract: 1.20.5 -+ dev: false -+ -+ /strip-ansi/6.0.1: -+ resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} -+ engines: {node: '>=8'} -+ dependencies: -+ ansi-regex: 5.0.1 -+ dev: false -+ -+ /strip-bom/3.0.0: -+ resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} -+ engines: {node: '>=4'} -+ dev: false -+ -+ /strip-json-comments/3.1.1: -+ resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} -+ engines: {node: '>=8'} -+ dev: false -+ -+ /styled-jsx/5.1.1_react@18.2.0: -+ resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==} -+ engines: {node: '>= 12.0.0'} -+ peerDependencies: -+ '@babel/core': '*' -+ babel-plugin-macros: '*' -+ react: '>= 16.8.0 || 17.x.x || ^18.0.0-0' -+ peerDependenciesMeta: -+ '@babel/core': -+ optional: true -+ babel-plugin-macros: -+ optional: true -+ dependencies: -+ client-only: 0.0.1 -+ react: 18.2.0 -+ dev: false -+ -+ /supports-color/7.2.0: -+ resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} -+ engines: {node: '>=8'} -+ dependencies: -+ has-flag: 4.0.0 -+ dev: false -+ -+ /supports-preserve-symlinks-flag/1.0.0: -+ resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} -+ engines: {node: '>= 0.4'} -+ dev: false -+ -+ /synckit/0.8.4: -+ resolution: {integrity: sha512-Dn2ZkzMdSX827QbowGbU/4yjWuvNaCoScLLoMo/yKbu+P4GBR6cRGKZH27k6a9bRzdqcyd1DE96pQtQ6uNkmyw==} -+ engines: {node: ^14.18.0 || >=16.0.0} -+ dependencies: -+ '@pkgr/utils': 2.3.1 -+ tslib: 2.4.1 -+ dev: false -+ -+ /tapable/2.2.1: -+ resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} -+ engines: {node: '>=6'} -+ dev: false -+ -+ /text-table/0.2.0: -+ resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} -+ dev: false -+ -+ /tiny-glob/0.2.9: -+ resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==} -+ dependencies: -+ globalyzer: 0.1.0 -+ globrex: 0.1.2 -+ dev: false -+ -+ /to-regex-range/5.0.1: -+ resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} -+ engines: {node: '>=8.0'} -+ dependencies: -+ is-number: 7.0.0 -+ dev: false -+ -+ /tsconfig-paths/3.14.1: -+ resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==} -+ dependencies: -+ '@types/json5': 0.0.29 -+ json5: 1.0.2 -+ minimist: 1.2.7 -+ strip-bom: 3.0.0 -+ dev: false -+ -+ /tslib/1.14.1: -+ resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} -+ dev: false -+ -+ /tslib/2.4.1: -+ resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==} -+ dev: false -+ -+ /tsutils/3.21.0_typescript@4.9.4: -+ resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} -+ engines: {node: '>= 6'} -+ peerDependencies: -+ typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' -+ dependencies: -+ tslib: 1.14.1 -+ typescript: 4.9.4 -+ dev: false -+ -+ /type-check/0.4.0: -+ resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} -+ engines: {node: '>= 0.8.0'} -+ dependencies: -+ prelude-ls: 1.2.1 -+ dev: false -+ -+ /type-fest/0.20.2: -+ resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} -+ engines: {node: '>=10'} -+ dev: false -+ -+ /typescript/4.9.4: -+ resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==} -+ engines: {node: '>=4.2.0'} -+ hasBin: true -+ dev: false -+ -+ /unbox-primitive/1.0.2: -+ resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} -+ dependencies: -+ call-bind: 1.0.2 -+ has-bigints: 1.0.2 -+ has-symbols: 1.0.3 -+ which-boxed-primitive: 1.0.2 -+ dev: false -+ -+ /uri-js/4.4.1: -+ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} -+ dependencies: -+ punycode: 2.1.1 -+ dev: false -+ -+ /which-boxed-primitive/1.0.2: -+ resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} -+ dependencies: -+ is-bigint: 1.0.4 -+ is-boolean-object: 1.1.2 -+ is-number-object: 1.0.7 -+ is-string: 1.0.7 -+ is-symbol: 1.0.4 -+ dev: false -+ -+ /which/2.0.2: -+ resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} -+ engines: {node: '>= 8'} -+ hasBin: true -+ dependencies: -+ isexe: 2.0.0 -+ dev: false -+ -+ /word-wrap/1.2.3: -+ resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==} -+ engines: {node: '>=0.10.0'} -+ dev: false -+ -+ /wrappy/1.0.2: -+ resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} -+ dev: false -+ -+ /yallist/4.0.0: -+ resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} -+ dev: false -+ -+ /yocto-queue/0.1.0: -+ resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} -+ engines: {node: '>=10'} -+ dev: false -+ -+ file:../..: -+ resolution: {directory: ../.., type: directory} -+ name: '@toots/shine.js' -+ version: 1.0.1 -+ dev: false -diff --git a/js/test/nextjs/public/encode.wav b/js/test/nextjs/public/encode.wav -new file mode 120000 -index 0000000..0f5f127 ---- /dev/null -+++ b/js/test/nextjs/public/encode.wav -@@ -0,0 +1 @@ -+../lib/encode.wav -\ No newline at end of file -diff --git a/js/test/nextjs/tsconfig.json b/js/test/nextjs/tsconfig.json -new file mode 100644 -index 0000000..66151f2 ---- /dev/null -+++ b/js/test/nextjs/tsconfig.json -@@ -0,0 +1,23 @@ -+{ -+ "compilerOptions": { -+ "target": "es5", -+ "lib": ["dom", "dom.iterable", "esnext"], -+ "allowJs": true, -+ "skipLibCheck": true, -+ "strict": true, -+ "forceConsistentCasingInFileNames": true, -+ "noEmit": true, -+ "esModuleInterop": true, -+ "module": "esnext", -+ "moduleResolution": "node", -+ "resolveJsonModule": true, -+ "isolatedModules": true, -+ "jsx": "preserve", -+ "incremental": true, -+ "paths": { -+ "@shine/*": ["./*"] -+ } -+ }, -+ "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], -+ "exclude": ["node_modules"] -+} -diff --git a/js/test/node/encode.coffee b/js/test/node/encode.coffee -deleted file mode 100644 -index 3e1ba72..0000000 ---- a/js/test/node/encode.coffee -+++ /dev/null -@@ -1,58 +0,0 @@ --Shine = require "../../dist/libshine.js" --{Reader} = require "wav" --fs = require "fs" -- --console.log "" --console.log "Executing encoding test" -- --bitrate = 128 --str = fs.createReadStream "../lib/encode.wav" --fd = fs.openSync "./encode.mp3", "w" --reader = new Reader -- --str.pipe reader -- --write = (encoded) -> -- return unless encoded.length > 0 -- buf = new Buffer encoded -- fs.writeSync fd, buf, 0, buf.length -- --reader.on "format", (format) -> -- console.log "Got WAV file." -- -- shine = new Shine -- bitrate: bitrate -- samplerate: format.sampleRate -- channels: format.channels -- -- console.log "Encoding.." -- started = new Date -- duration = 0.0 -- samplerate = parseFloat format.sampleRate -- -- reader.on "data", (buf) -> -- samples = buf.length/(2*format.channels) -- -- duration += parseFloat(samples) / samplerate -- -- write shine.encode(convertInterleavedBuffer(buf, format.channels, samples)) -- -- reader.on "end", -> -- write shine.close() -- -- ended = new Date -- encodingTime = (ended.getTime() - started.getTime())/1000 -- console.log "Done encoding." -- console.log "File duration: #{duration.toFixed(2)} seconds" -- console.log "Encoding time: #{encodingTime.toFixed(2)} seconds" -- console.log "Encoding rate: #{(duration/encodingTime).toFixed(2)}X" -- process.exit 0 -- --convertInterleavedBuffer = (buf, channels, samples) -> -- ret = new Array channels -- for chan in [0..channels-1] -- ret[chan] = new Int16Array samples -- for i in [0..samples-1] -- ret[chan][i] = buf.readInt16LE 2*(i*channels + chan) -- -- ret -diff --git a/js/test/node/encode.ts b/js/test/node/encode.ts -new file mode 100644 -index 0000000..cc971e1 ---- /dev/null -+++ b/js/test/node/encode.ts -@@ -0,0 +1,73 @@ -+import { Shine } from "@toots/shine.js"; -+import { Reader } from "wav"; -+import fs from "fs"; -+ -+const convertInterleavedBuffer = (buf, channels, samples) => { -+ const ret = new Array(channels); -+ for (let chan = 0; chan < channels; chan++) { -+ ret[chan] = new Int16Array(samples); -+ for (let i = 0; i < samples; i++) { -+ ret[chan][i] = buf.readInt16LE(2 * (i * channels + chan)); -+ } -+ } -+ -+ return ret; -+}; -+ -+const exec = async () => { -+ await Shine.initialized; -+ -+ console.log(""); -+ console.log("Executing encoding test"); -+ -+ const bitrate = 128; -+ const str = fs.createReadStream("../lib/encode.wav"); -+ const fd = fs.openSync("./encode.mp3", "w"); -+ const reader = new Reader(); -+ -+ str.pipe(reader); -+ -+ const write = encoded => { -+ if (encoded.length <= 0) return; -+ -+ const buf = Buffer.from(encoded); -+ fs.writeSync(fd, buf, 0, buf.length); -+ }; -+ -+ reader.on("format", format => { -+ console.log("Got WAV file."); -+ -+ const shine = new Shine({ -+ bitrate: bitrate, -+ samplerate: format.sampleRate, -+ channels: format.channels, -+ }); -+ -+ console.log("Encoding.."); -+ const started = new Date(); -+ let duration = 0.0; -+ const samplerate = format.sampleRate; -+ -+ reader.on("data", buf => { -+ const samples = buf.length / (2 * format.channels); -+ -+ duration += samples / samplerate; -+ -+ write(shine.encode(convertInterleavedBuffer(buf, format.channels, samples))); -+ }); -+ -+ reader.on("end", () => { -+ write(shine.close()); -+ -+ const ended = new Date(); -+ const encodingTime = (ended.getTime() - started.getTime()) / 1000; -+ console.log("Done encoding."); -+ console.log(`File duration: ${duration.toFixed(2)} seconds`); -+ console.log(`Encoding time: ${encodingTime.toFixed(2)} seconds`); -+ console.log(`Encoding rate: ${(duration / encodingTime).toFixed(2)}X`); -+ process.exit(0); -+ }); -+ }); -+}; -+ -+exec(); -diff --git a/js/test/node/package-lock.json b/js/test/node/package-lock.json -index 0096742..752a7c7 100644 ---- a/js/test/node/package-lock.json -+++ b/js/test/node/package-lock.json -@@ -1,49 +1,493 @@ - { - "name": "shine-js-test", - "version": "0.0.1", -- "lockfileVersion": 1, -+ "lockfileVersion": 2, - "requires": true, -+ "packages": { -+ "": { -+ "name": "shine-js-test", -+ "version": "0.0.1", -+ "dependencies": { -+ "@toots/shine.js": "file:../..", -+ "@types/node": "^18.11.18", -+ "ts-node": "^10.9.1", -+ "typescript": "^4.9.4", -+ "wav": "^1.0.2" -+ } -+ }, -+ "../..": { -+ "name": "@toots/shine.js", -+ "version": "1.0.1", -+ "license": "LGPL-2.0-only" -+ }, -+ "node_modules/@cspotcode/source-map-support": { -+ "version": "0.8.1", -+ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", -+ "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", -+ "dependencies": { -+ "@jridgewell/trace-mapping": "0.3.9" -+ }, -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@jridgewell/resolve-uri": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", -+ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", -+ "engines": { -+ "node": ">=6.0.0" -+ } -+ }, -+ "node_modules/@jridgewell/sourcemap-codec": { -+ "version": "1.4.14", -+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", -+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" -+ }, -+ "node_modules/@jridgewell/trace-mapping": { -+ "version": "0.3.9", -+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", -+ "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", -+ "dependencies": { -+ "@jridgewell/resolve-uri": "^3.0.3", -+ "@jridgewell/sourcemap-codec": "^1.4.10" -+ } -+ }, -+ "node_modules/@toots/shine.js": { -+ "resolved": "../..", -+ "link": true -+ }, -+ "node_modules/@tsconfig/node10": { -+ "version": "1.0.9", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", -+ "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==" -+ }, -+ "node_modules/@tsconfig/node12": { -+ "version": "1.0.11", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", -+ "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==" -+ }, -+ "node_modules/@tsconfig/node14": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", -+ "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==" -+ }, -+ "node_modules/@tsconfig/node16": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz", -+ "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==" -+ }, -+ "node_modules/@types/node": { -+ "version": "18.11.18", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", -+ "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==" -+ }, -+ "node_modules/acorn": { -+ "version": "8.8.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", -+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", -+ "bin": { -+ "acorn": "bin/acorn" -+ }, -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/acorn-walk": { -+ "version": "8.2.0", -+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", -+ "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", -+ "engines": { -+ "node": ">=0.4.0" -+ } -+ }, -+ "node_modules/arg": { -+ "version": "4.1.3", -+ "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", -+ "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==" -+ }, -+ "node_modules/buffer-alloc": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", -+ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", -+ "dependencies": { -+ "buffer-alloc-unsafe": "^1.1.0", -+ "buffer-fill": "^1.0.0" -+ } -+ }, -+ "node_modules/buffer-alloc-unsafe": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", -+ "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" -+ }, -+ "node_modules/buffer-fill": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", -+ "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=" -+ }, -+ "node_modules/buffer-from": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", -+ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" -+ }, -+ "node_modules/core-util-is": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", -+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" -+ }, -+ "node_modules/create-require": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", -+ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" -+ }, -+ "node_modules/debug": { -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", -+ "dependencies": { -+ "ms": "2.0.0" -+ } -+ }, -+ "node_modules/diff": { -+ "version": "4.0.2", -+ "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", -+ "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", -+ "engines": { -+ "node": ">=0.3.1" -+ } -+ }, -+ "node_modules/inherits": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", -+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" -+ }, -+ "node_modules/isarray": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", -+ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" -+ }, -+ "node_modules/make-error": { -+ "version": "1.3.6", -+ "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", -+ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" -+ }, -+ "node_modules/ms": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" -+ }, -+ "node_modules/readable-stream": { -+ "version": "1.1.14", -+ "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", -+ "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", -+ "dependencies": { -+ "core-util-is": "~1.0.0", -+ "inherits": "~2.0.1", -+ "isarray": "0.0.1", -+ "string_decoder": "~0.10.x" -+ } -+ }, -+ "node_modules/stream-parser": { -+ "version": "0.3.1", -+ "resolved": "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz", -+ "integrity": "sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=", -+ "dependencies": { -+ "debug": "2" -+ } -+ }, -+ "node_modules/string_decoder": { -+ "version": "0.10.31", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", -+ "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" -+ }, -+ "node_modules/ts-node": { -+ "version": "10.9.1", -+ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", -+ "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", -+ "dependencies": { -+ "@cspotcode/source-map-support": "^0.8.0", -+ "@tsconfig/node10": "^1.0.7", -+ "@tsconfig/node12": "^1.0.7", -+ "@tsconfig/node14": "^1.0.0", -+ "@tsconfig/node16": "^1.0.2", -+ "acorn": "^8.4.1", -+ "acorn-walk": "^8.1.1", -+ "arg": "^4.1.0", -+ "create-require": "^1.1.0", -+ "diff": "^4.0.1", -+ "make-error": "^1.1.1", -+ "v8-compile-cache-lib": "^3.0.1", -+ "yn": "3.1.1" -+ }, -+ "bin": { -+ "ts-node": "dist/bin.js", -+ "ts-node-cwd": "dist/bin-cwd.js", -+ "ts-node-esm": "dist/bin-esm.js", -+ "ts-node-script": "dist/bin-script.js", -+ "ts-node-transpile-only": "dist/bin-transpile.js", -+ "ts-script": "dist/bin-script-deprecated.js" -+ }, -+ "peerDependencies": { -+ "@swc/core": ">=1.2.50", -+ "@swc/wasm": ">=1.2.50", -+ "@types/node": "*", -+ "typescript": ">=2.7" -+ }, -+ "peerDependenciesMeta": { -+ "@swc/core": { -+ "optional": true -+ }, -+ "@swc/wasm": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/typescript": { -+ "version": "4.9.4", -+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", -+ "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", -+ "bin": { -+ "tsc": "bin/tsc", -+ "tsserver": "bin/tsserver" -+ }, -+ "engines": { -+ "node": ">=4.2.0" -+ } -+ }, -+ "node_modules/v8-compile-cache-lib": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", -+ "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==" -+ }, -+ "node_modules/wav": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/wav/-/wav-1.0.2.tgz", -+ "integrity": "sha512-viHtz3cDd/Tcr/HbNqzQCofKdF6kWUymH9LGDdskfWFoIy/HJ+RTihgjEcHfnsy1PO4e9B+y4HwgTwMrByquhg==", -+ "dependencies": { -+ "buffer-alloc": "^1.1.0", -+ "buffer-from": "^1.0.0", -+ "debug": "^2.2.0", -+ "readable-stream": "^1.1.14", -+ "stream-parser": "^0.3.1" -+ } -+ }, -+ "node_modules/yn": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", -+ "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", -+ "engines": { -+ "node": ">=6" -+ } -+ } -+ }, - "dependencies": { -- "coffee-script": { -- "version": "1.6.3", -- "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz", -- "integrity": "sha1-Y1XTLPGwTN/2tITl5xF4Ky8MOb4=" -+ "@cspotcode/source-map-support": { -+ "version": "0.8.1", -+ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", -+ "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", -+ "requires": { -+ "@jridgewell/trace-mapping": "0.3.9" -+ } -+ }, -+ "@jridgewell/resolve-uri": { -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", -+ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" -+ }, -+ "@jridgewell/sourcemap-codec": { -+ "version": "1.4.14", -+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", -+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" -+ }, -+ "@jridgewell/trace-mapping": { -+ "version": "0.3.9", -+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", -+ "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", -+ "requires": { -+ "@jridgewell/resolve-uri": "^3.0.3", -+ "@jridgewell/sourcemap-codec": "^1.4.10" -+ } -+ }, -+ "@toots/shine.js": { -+ "version": "file:../.." -+ }, -+ "@tsconfig/node10": { -+ "version": "1.0.9", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", -+ "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==" -+ }, -+ "@tsconfig/node12": { -+ "version": "1.0.11", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", -+ "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==" -+ }, -+ "@tsconfig/node14": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", -+ "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==" -+ }, -+ "@tsconfig/node16": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz", -+ "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==" -+ }, -+ "@types/node": { -+ "version": "18.11.18", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", -+ "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==" -+ }, -+ "acorn": { -+ "version": "8.8.1", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", -+ "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==" -+ }, -+ "acorn-walk": { -+ "version": "8.2.0", -+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", -+ "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==" -+ }, -+ "arg": { -+ "version": "4.1.3", -+ "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", -+ "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==" -+ }, -+ "buffer-alloc": { -+ "version": "1.2.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", -+ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", -+ "requires": { -+ "buffer-alloc-unsafe": "^1.1.0", -+ "buffer-fill": "^1.0.0" -+ } -+ }, -+ "buffer-alloc-unsafe": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", -+ "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" -+ }, -+ "buffer-fill": { -+ "version": "1.0.0", -+ "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", -+ "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=" -+ }, -+ "buffer-from": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", -+ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" -+ }, -+ "core-util-is": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", -+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" -+ }, -+ "create-require": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", -+ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" - }, - "debug": { -- "version": "2.6.8", -- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", -- "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", -+ "version": "2.6.9", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, -+ "diff": { -+ "version": "4.0.2", -+ "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", -+ "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==" -+ }, -+ "inherits": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", -+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" -+ }, -+ "isarray": { -+ "version": "0.0.1", -+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", -+ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" -+ }, -+ "make-error": { -+ "version": "1.3.6", -+ "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", -+ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" -+ }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "readable-stream": { -- "version": "0.0.4", -- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-0.0.4.tgz", -- "integrity": "sha1-8y124/uGM0SlSNeZIwBxc2ZbO40=" -+ "version": "1.1.14", -+ "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", -+ "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", -+ "requires": { -+ "core-util-is": "~1.0.0", -+ "inherits": "~2.0.1", -+ "isarray": "0.0.1", -+ "string_decoder": "~0.10.x" -+ } - }, - "stream-parser": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz", - "integrity": "sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=", - "requires": { -- "debug": "2.6.8" -+ "debug": "2" - } - }, -+ "string_decoder": { -+ "version": "0.10.31", -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", -+ "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" -+ }, -+ "ts-node": { -+ "version": "10.9.1", -+ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", -+ "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", -+ "requires": { -+ "@cspotcode/source-map-support": "^0.8.0", -+ "@tsconfig/node10": "^1.0.7", -+ "@tsconfig/node12": "^1.0.7", -+ "@tsconfig/node14": "^1.0.0", -+ "@tsconfig/node16": "^1.0.2", -+ "acorn": "^8.4.1", -+ "acorn-walk": "^8.1.1", -+ "arg": "^4.1.0", -+ "create-require": "^1.1.0", -+ "diff": "^4.0.1", -+ "make-error": "^1.1.1", -+ "v8-compile-cache-lib": "^3.0.1", -+ "yn": "3.1.1" -+ } -+ }, -+ "typescript": { -+ "version": "4.9.4", -+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", -+ "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==" -+ }, -+ "v8-compile-cache-lib": { -+ "version": "3.0.1", -+ "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", -+ "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==" -+ }, - "wav": { -- "version": "0.1.0", -- "resolved": "https://registry.npmjs.org/wav/-/wav-0.1.0.tgz", -- "integrity": "sha1-5wTSp2nqIz858tZ5Xout1l9YsAk=", -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/wav/-/wav-1.0.2.tgz", -+ "integrity": "sha512-viHtz3cDd/Tcr/HbNqzQCofKdF6kWUymH9LGDdskfWFoIy/HJ+RTihgjEcHfnsy1PO4e9B+y4HwgTwMrByquhg==", - "requires": { -- "debug": "2.6.8", -- "readable-stream": "0.0.4", -- "stream-parser": "0.3.1" -+ "buffer-alloc": "^1.1.0", -+ "buffer-from": "^1.0.0", -+ "debug": "^2.2.0", -+ "readable-stream": "^1.1.14", -+ "stream-parser": "^0.3.1" - } -+ }, -+ "yn": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", -+ "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==" - } - } - } -diff --git a/js/test/node/package.json b/js/test/node/package.json -index 5160dab..650299c 100644 ---- a/js/test/node/package.json -+++ b/js/test/node/package.json -@@ -2,26 +2,16 @@ - "name": "shine-js-test", - "description": "Test encoder for libshine.js", - "version": "0.0.1", -- "homepage": "https://github.com/savonet/shine", - "author": "Romain Beauxis <toots@rastageeks.org", -- "repository": { -- "type": "git", -- "url": "git://github.com/savonet/shine" -- }, -- "bugs": { -- "mail": "toots@rastageeks.org", -- "url": "http://github.com/savonet/shine/issues" -- }, -- "main": "test.coffee", - "scripts": { -- "test": "coffee ./encode.coffee && coffee ./rounds.coffee" -- }, -- "engine": { -- "node": ">= 0.10.7", -- "npm": "1" -+ "test": "ts-node ./encode.ts && ts-node ./rounds.ts" - }, - "dependencies": { -- "coffee-script": "1.6.3", -- "wav": "0.1.0" -+ "@toots/shine.js": "file:../..", -+ "@types/node": "^18.11.18", -+ "@types/wav": "^1.0.1", -+ "ts-node": "^10.9.1", -+ "typescript": "^4.9.4", -+ "wav": "^1.0.2" - } - } -diff --git a/js/test/node/pnpm-lock.yaml b/js/test/node/pnpm-lock.yaml -new file mode 100644 -index 0000000..58a8b69 ---- /dev/null -+++ b/js/test/node/pnpm-lock.yaml -@@ -0,0 +1,227 @@ -+lockfileVersion: 5.4 -+ -+specifiers: -+ '@toots/shine.js': file:../.. -+ '@types/node': ^18.11.18 -+ '@types/wav': ^1.0.1 -+ ts-node: ^10.9.1 -+ typescript: ^4.9.4 -+ wav: ^1.0.2 -+ -+dependencies: -+ '@toots/shine.js': file:../.. -+ '@types/node': 18.11.18 -+ '@types/wav': 1.0.1 -+ ts-node: 10.9.1_awa2wsr5thmg3i7jqycphctjfq -+ typescript: 4.9.4 -+ wav: 1.0.2 -+ -+packages: -+ -+ /@cspotcode/source-map-support/0.8.1: -+ resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} -+ engines: {node: '>=12'} -+ dependencies: -+ '@jridgewell/trace-mapping': 0.3.9 -+ dev: false -+ -+ /@jridgewell/resolve-uri/3.1.0: -+ resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} -+ engines: {node: '>=6.0.0'} -+ dev: false -+ -+ /@jridgewell/sourcemap-codec/1.4.14: -+ resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} -+ dev: false -+ -+ /@jridgewell/trace-mapping/0.3.9: -+ resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} -+ dependencies: -+ '@jridgewell/resolve-uri': 3.1.0 -+ '@jridgewell/sourcemap-codec': 1.4.14 -+ dev: false -+ -+ /@tsconfig/node10/1.0.9: -+ resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==} -+ dev: false -+ -+ /@tsconfig/node12/1.0.11: -+ resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==} -+ dev: false -+ -+ /@tsconfig/node14/1.0.3: -+ resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==} -+ dev: false -+ -+ /@tsconfig/node16/1.0.3: -+ resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==} -+ dev: false -+ -+ /@types/node/18.11.18: -+ resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==} -+ dev: false -+ -+ /@types/wav/1.0.1: -+ resolution: {integrity: sha512-AKJeM5mqO1pdR2/HaTUQzSCm12No36KUM1larivXUmsLx+4JmMuC2Tv0kCdZzTx66h7IH2Xr92DGc9NQsXxa9Q==} -+ dependencies: -+ '@types/node': 18.11.18 -+ dev: false -+ -+ /acorn-walk/8.2.0: -+ resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==} -+ engines: {node: '>=0.4.0'} -+ dev: false -+ -+ /acorn/8.8.1: -+ resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==} -+ engines: {node: '>=0.4.0'} -+ hasBin: true -+ dev: false -+ -+ /arg/4.1.3: -+ resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} -+ dev: false -+ -+ /buffer-alloc-unsafe/1.1.0: -+ resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==} -+ dev: false -+ -+ /buffer-alloc/1.2.0: -+ resolution: {integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==} -+ dependencies: -+ buffer-alloc-unsafe: 1.1.0 -+ buffer-fill: 1.0.0 -+ dev: false -+ -+ /buffer-fill/1.0.0: -+ resolution: {integrity: sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==} -+ dev: false -+ -+ /buffer-from/1.1.2: -+ resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} -+ dev: false -+ -+ /core-util-is/1.0.3: -+ resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} -+ dev: false -+ -+ /create-require/1.1.1: -+ resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} -+ dev: false -+ -+ /debug/2.6.9: -+ resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} -+ peerDependencies: -+ supports-color: '*' -+ peerDependenciesMeta: -+ supports-color: -+ optional: true -+ dependencies: -+ ms: 2.0.0 -+ dev: false -+ -+ /diff/4.0.2: -+ resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} -+ engines: {node: '>=0.3.1'} -+ dev: false -+ -+ /inherits/2.0.4: -+ resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} -+ dev: false -+ -+ /isarray/0.0.1: -+ resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==} -+ dev: false -+ -+ /make-error/1.3.6: -+ resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} -+ dev: false -+ -+ /ms/2.0.0: -+ resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} -+ dev: false -+ -+ /readable-stream/1.1.14: -+ resolution: {integrity: sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==} -+ dependencies: -+ core-util-is: 1.0.3 -+ inherits: 2.0.4 -+ isarray: 0.0.1 -+ string_decoder: 0.10.31 -+ dev: false -+ -+ /stream-parser/0.3.1: -+ resolution: {integrity: sha512-bJ/HgKq41nlKvlhccD5kaCr/P+Hu0wPNKPJOH7en+YrJu/9EgqUF+88w5Jb6KNcjOFMhfX4B2asfeAtIGuHObQ==} -+ dependencies: -+ debug: 2.6.9 -+ transitivePeerDependencies: -+ - supports-color -+ dev: false -+ -+ /string_decoder/0.10.31: -+ resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==} -+ dev: false -+ -+ /ts-node/10.9.1_awa2wsr5thmg3i7jqycphctjfq: -+ resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} -+ hasBin: true -+ peerDependencies: -+ '@swc/core': '>=1.2.50' -+ '@swc/wasm': '>=1.2.50' -+ '@types/node': '*' -+ typescript: '>=2.7' -+ peerDependenciesMeta: -+ '@swc/core': -+ optional: true -+ '@swc/wasm': -+ optional: true -+ dependencies: -+ '@cspotcode/source-map-support': 0.8.1 -+ '@tsconfig/node10': 1.0.9 -+ '@tsconfig/node12': 1.0.11 -+ '@tsconfig/node14': 1.0.3 -+ '@tsconfig/node16': 1.0.3 -+ '@types/node': 18.11.18 -+ acorn: 8.8.1 -+ acorn-walk: 8.2.0 -+ arg: 4.1.3 -+ create-require: 1.1.1 -+ diff: 4.0.2 -+ make-error: 1.3.6 -+ typescript: 4.9.4 -+ v8-compile-cache-lib: 3.0.1 -+ yn: 3.1.1 -+ dev: false -+ -+ /typescript/4.9.4: -+ resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==} -+ engines: {node: '>=4.2.0'} -+ hasBin: true -+ dev: false -+ -+ /v8-compile-cache-lib/3.0.1: -+ resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} -+ dev: false -+ -+ /wav/1.0.2: -+ resolution: {integrity: sha512-viHtz3cDd/Tcr/HbNqzQCofKdF6kWUymH9LGDdskfWFoIy/HJ+RTihgjEcHfnsy1PO4e9B+y4HwgTwMrByquhg==} -+ dependencies: -+ buffer-alloc: 1.2.0 -+ buffer-from: 1.1.2 -+ debug: 2.6.9 -+ readable-stream: 1.1.14 -+ stream-parser: 0.3.1 -+ transitivePeerDependencies: -+ - supports-color -+ dev: false -+ -+ /yn/3.1.1: -+ resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==} -+ engines: {node: '>=6'} -+ dev: false -+ -+ file:../..: -+ resolution: {directory: ../.., type: directory} -+ name: '@toots/shine.js' -+ version: 1.0.3 -+ dev: false -diff --git a/js/test/node/rounds.coffee b/js/test/node/rounds.coffee -deleted file mode 100644 -index 7be6690..0000000 ---- a/js/test/node/rounds.coffee -+++ /dev/null -@@ -1,6 +0,0 @@ --Shine = require "../../dist/libshine.js" --runRoundsTest = require "../lib/rounds.js" -- --console.log "" --runRoundsTest Shine, (s) -> -- console.log s -diff --git a/js/test/node/rounds.ts b/js/test/node/rounds.ts -new file mode 100644 -index 0000000..6f3e664 ---- /dev/null -+++ b/js/test/node/rounds.ts -@@ -0,0 +1,11 @@ -+import { Shine } from "@toots/shine.js"; -+import runRoundsTest from "../lib/rounds"; -+ -+const exec = async () => { -+ await Shine.initialized; -+ -+ console.log(""); -+ runRoundsTest(Shine, s => console.log(s)); -+}; -+ -+exec(); -diff --git a/js/test/node/tsconfig.json b/js/test/node/tsconfig.json -new file mode 100644 -index 0000000..d1045e4 ---- /dev/null -+++ b/js/test/node/tsconfig.json -@@ -0,0 +1,8 @@ -+{ -+ "include": ["**/*.ts"], -+ "compilerOptions": { -+ "allowJs": true, -+ "skipLibCheck": true, -+ "esModuleInterop": true -+ } -+} -diff --git a/src/bin/main.c b/src/bin/main.c -index ab16fea..b7b70a4 100644 ---- a/src/bin/main.c -+++ b/src/bin/main.c -@@ -35,32 +35,25 @@ int _verbose = 0; - int stereo = STEREO; - int force_mono = 0; - --int verbose() --{ -- return _verbose; --} -+int verbose() { return _verbose; } - - /* Write out the MP3 file */ --int write_mp3(long bytes, void *buffer, void *config) --{ -- return fwrite(buffer, sizeof(unsigned char), bytes, outfile) / sizeof(unsigned char); -+int write_mp3(long bytes, void *buffer, void *config) { -+ return fwrite(buffer, sizeof(unsigned char), bytes, outfile) / -+ sizeof(unsigned char); - } - - /* Output error message and exit */ --void error(char *s) --{ -+void error(char *s) { - fprintf(stderr, "Error: %s\n", s); - exit(1); - } - --static void print_name() --{ -- printf("shineenc (Liquidsoap version)\n"); --} -+static void print_name() { printf("shineenc (Liquidsoap version)\n"); } - --static void print_usage() --{ -+static void print_usage() { - printf("Usage: shineenc [options] <infile> <outfile>\n\n"); -+ printf("Use \"-\" for standard input or output.\n\n"); - printf("Options:\n"); - printf(" -h this help message\n"); - printf(" -b <bitrate> set the bitrate [8-320], default 128kbit\n"); -@@ -73,88 +66,88 @@ static void print_usage() - } - - /* Use these default settings, can be overridden */ --static void set_defaults(shine_config_t *config) --{ -+static void set_defaults(shine_config_t *config) { - shine_set_config_mpeg_defaults(&config->mpeg); - } - - /* Parse command line arguments */ --static int parse_command(int argc, char** argv, shine_config_t *config) --{ -+static int parse_command(int argc, char **argv, shine_config_t *config) { - int i = 0; - -- if(argc < 3) return 0; -+ if (argc < 3) -+ return 0; - - while (argv[++i][0] == '-' && argv[i][1] != '\000' && argv[i][1] != ' ') - switch (argv[i][1]) { -- case 'b': -- config->mpeg.bitr = atoi(argv[++i]); -- break; -- -- case 'm': -- force_mono = 1; -- break; -- -- case 'j': -- stereo = JOINT_STEREO; -- break; -- -- case 'd': -- stereo = DUAL_CHANNEL; -- break; -- -- case 'c': -- config->mpeg.copyright = 1; -- break; -- -- case 'q': -- quiet = 1; -- _verbose = 0; -- break; -- -- case 'v': -- _verbose = 1; -- quiet = 0; -- break; -- -- case 'h': -- default : -- return 0; -+ case 'b': -+ config->mpeg.bitr = atoi(argv[++i]); -+ break; -+ -+ case 'm': -+ force_mono = 1; -+ break; -+ -+ case 'j': -+ stereo = JOINT_STEREO; -+ break; -+ -+ case 'd': -+ stereo = DUAL_CHANNEL; -+ break; -+ -+ case 'c': -+ config->mpeg.copyright = 1; -+ break; -+ -+ case 'q': -+ quiet = 1; -+ _verbose = 0; -+ break; -+ -+ case 'v': -+ _verbose = 1; -+ quiet = 0; -+ break; -+ -+ case 'h': -+ default: -+ return 0; - } - -- if (argc - i != 2) return 0; -+ if (argc - i != 2) -+ return 0; - infname = argv[i++]; - outfname = argv[i]; - return 1; - } - - /* Print some info about what we're going to encode */ --static void check_config(shine_config_t *config) --{ -- static char *version_names[4] = { "2.5", "reserved", "II", "I" }; -- static char *mode_names[4] = { "stereo", "joint-stereo", "dual-channel", "mono" }; -- static char *demp_names[4] = { "none", "50/15us", "", "CITT" }; -+static void check_config(shine_config_t *config) { -+ static char *version_names[4] = {"2.5", "reserved", "II", "I"}; -+ static char *mode_names[4] = {"stereo", "joint-stereo", "dual-channel", -+ "mono"}; -+ static char *demp_names[4] = {"none", "50/15us", "", "CITT"}; - - printf("MPEG-%s layer III, %s Psychoacoustic Model: Shine\n", -- version_names[shine_check_config(config->wave.samplerate, config->mpeg.bitr)], -- mode_names[config->mpeg.mode]); -+ version_names[shine_check_config(config->wave.samplerate, -+ config->mpeg.bitr)], -+ mode_names[config->mpeg.mode]); - printf("Bitrate: %d kbps ", config->mpeg.bitr); -- printf("De-emphasis: %s %s %s\n", -- demp_names[config->mpeg.emph], -- ((config->mpeg.original) ? "Original" : ""), -- ((config->mpeg.copyright) ? "(C)" : "")); -+ printf("De-emphasis: %s %s %s\n", demp_names[config->mpeg.emph], -+ ((config->mpeg.original) ? "Original" : ""), -+ ((config->mpeg.copyright) ? "(C)" : "")); - printf("Encoding \"%s\" to \"%s\"\n", infname, outfname); - } - --int main(int argc, char **argv) --{ -- wave_t wave; -- time_t start_time, end_time; -- int16_t buffer[2*SHINE_MAX_SAMPLES]; -+int main(int argc, char **argv) { -+ wave_t wave; -+ time_t start_time, end_time; -+ int16_t buffer[2 * SHINE_MAX_SAMPLES]; - shine_config_t config; -- shine_t s; -- int written; -- unsigned char *data; -+ shine_t s; -+ int written; -+ unsigned char *data; -+ int samples_per_pass; - - time(&start_time); - -@@ -168,7 +161,8 @@ int main(int argc, char **argv) - - quiet = quiet || !strcmp(outfname, "-"); - -- if (!quiet) print_name(); -+ if (!quiet) -+ print_name(); - - /* Open the input file and fill the config shine_wave_t header */ - if (!wave_open(infname, &wave, &config, quiet)) -@@ -205,17 +199,17 @@ int main(int argc, char **argv) - // assert(s != NULL); - - /* Print some info about the file about to be created (optional) */ -- if (!quiet) check_config(&config); -+ if (!quiet) -+ check_config(&config); - -- int samples_per_pass = shine_samples_per_pass(s); -+ samples_per_pass = shine_samples_per_pass(s); - - /* All the magic happens here */ - while (wave_get(buffer, &wave, samples_per_pass)) { - data = shine_encode_buffer_interleaved(s, buffer, &written); -- if ( write_mp3(written, data, &config) != written ) -- { -- fprintf(stderr, "shineenc: write error\n"); -- return 1; -+ if (write_mp3(written, data, &config) != written) { -+ fprintf(stderr, "shineenc: write error\n"); -+ return 1; - } - } - -@@ -235,7 +229,9 @@ int main(int argc, char **argv) - time(&end_time); - end_time -= start_time; - if (!quiet) -- printf("Finished in %02ld:%02ld:%02ld (%01.1fx realtime)\n", end_time / 3600, (end_time / 60) % 60, end_time % 60, (float)wave.duration / (float)end_time); -+ printf("Finished in %02ld:%02ld:%02ld (%01.1fx realtime)\n", -+ end_time / 3600, (end_time / 60) % 60, end_time % 60, -+ (float)wave.duration / (float)end_time); - - return 0; - } -diff --git a/src/bin/main.h b/src/bin/main.h -index 52fbbb2..7ab9691 100644 ---- a/src/bin/main.h -+++ b/src/bin/main.h -@@ -2,6 +2,6 @@ - #define MAIN_H - - void error(char *s); --int verbose(); -+int verbose(); - - #endif -diff --git a/src/bin/wave.c b/src/bin/wave.c -index 5d19004..3c7ab81 100644 ---- a/src/bin/wave.c -+++ b/src/bin/wave.c -@@ -9,17 +9,32 @@ - #include "layer3.h" - - /* Local header */ --#include <stdint.h> --#include <string.h> - #include "main.h" - #include "wave.h" -+#include <stdint.h> -+#include <string.h> - - /* RISC OS specifics */ --#define WAVE 0xfb1 /* Wave filetype */ --#define DATA 0xffd /* Data filetype */ -+#define WAVE 0xfb1 /* Wave filetype */ -+#define DATA 0xffd /* Data filetype */ - - #define MODE_MONO 3 - -+#ifdef SHINE_BIG_ENDIAN -+#if defined(SHINE_HAVE_BSWAP_H) -+#include <byteswap.h> -+#elif defined(__GNUC__) && \ -+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) -+#define bswap_16(x) __builtin_bswap16(x) -+#define bswap_32(x) __builtin_bswap32(x) -+#else -+#define bswap_16(x) ((((x) >> 8) & 0xff) | (((x)&0xff) << 8)) -+#define bswap_32(x) \ -+ ((((x)&0xFF) << 24) | (((x) >> 24) & 0xFF) | (((x)&0x0000FF00) << 8) | \ -+ (((x)&0x00FF0000) >> 8)) -+#endif -+#endif -+ - typedef struct { - char id[4]; - uint32_t length; -@@ -32,14 +47,28 @@ typedef struct { - - typedef struct { - riff_chunk_header_t header; -- uint16_t format; /* MS PCM = 1 */ -- uint16_t channels; /* channels, mono = 1, stereo = 2 */ -- uint32_t sample_rate; /* samples per second = 44100 */ -- uint32_t byte_rate; /* bytes per second = samp_rate * byte_samp = 176400 */ -- uint16_t frame_size; /* block align (bytes per sample) = channels * bits_per_sample / 8 = 4 */ -- uint16_t depth; /* bits per sample = 16 for MS PCM (format specific) */ -+ uint16_t format; /* MS PCM = 1 */ -+ uint16_t channels; /* channels, mono = 1, stereo = 2 */ -+ uint32_t sample_rate; /* samples per second = 44100 */ -+ uint32_t byte_rate; /* bytes per second = samp_rate * byte_samp = 176400 */ -+ uint16_t frame_size; /* block align (bytes per sample) = channels * -+ bits_per_sample / 8 = 4 */ -+ uint16_t depth; /* bits per sample = 16 for MS PCM (format specific) */ - } fmt_chunk_t; - -+#ifdef SHINE_BIG_ENDIAN -+#define native_fmt_chunk(fmt) \ -+ { \ -+ fmt.header.length = bswap_32(fmt.header.length); \ -+ fmt.format = bswap_16(fmt.format); \ -+ fmt.channels = bswap_16(fmt.channels); \ -+ fmt.sample_rate = bswap_32(fmt.sample_rate); \ -+ fmt.byte_rate = bswap_32(fmt.byte_rate); \ -+ fmt.frame_size = bswap_16(fmt.frame_size); \ -+ fmt.depth = bswap_16(fmt.depth); \ -+ } -+#endif -+ - void wave_seek(FILE *file, int has_seek, uint32_t bytes) { - uint32_t i; - if (has_seek == 1) -@@ -50,15 +79,15 @@ void wave_seek(FILE *file, int has_seek, uint32_t bytes) { - } - } - --unsigned char wave_get_chunk_header(FILE *file, int has_seek, const char id[4], riff_chunk_header_t *header) --{ -+unsigned char wave_get_chunk_header(FILE *file, int has_seek, const char id[4], -+ riff_chunk_header_t *header) { - unsigned char found = 0; - uint32_t chunk_length; - - if (verbose()) - fprintf(stderr, "Looking for chunk '%s'\n", id); - -- while(!found) { -+ while (!found) { - if (fread(header, sizeof(riff_chunk_header_t), 1, file) != 1) { - if (feof(file)) - return 0; -@@ -69,24 +98,20 @@ unsigned char wave_get_chunk_header(FILE *file, int has_seek, const char id[4], - /* chunks must be word-aligned, chunk data doesn't need to */ - chunk_length = header->length + header->length % 2; - if (verbose()) { -- fprintf(stderr, "Found chunk '%.4s', length: %u\n", header->id, header->length); -+ fprintf(stderr, "Found chunk '%.4s', length: %u\n", header->id, -+ header->length); - } - - if (strncmp(header->id, id, 4) == 0) - return 1; -- -+ - wave_seek(file, has_seek, chunk_length); - } - - return 1; - } - -- --void wave_close(wave_t *wave) --{ -- fclose(wave->file); --} -- -+void wave_close(wave_t *wave) { fclose(wave->file); } - - /* - * wave_open: -@@ -94,16 +119,17 @@ void wave_close(wave_t *wave) - * Opens and verifies the header of the Input Wave file. The file pointer is - * left pointing to the start of the samples. - */ --unsigned char wave_open(const char *fname, wave_t *wave, shine_config_t *config, int quiet) --{ -- static char *channel_mappings[] = { NULL, "mono", "stereo" }; -+unsigned char wave_open(const char *fname, wave_t *wave, shine_config_t *config, -+ int quiet) { -+ static char *channel_mappings[] = {NULL, "mono", "stereo"}; - wave_chunk_t wave_chunk; - fmt_chunk_t fmt_chunk; - riff_chunk_header_t data_chunk; - uint32_t fmt_data, fmt_length; - - if (!strcmp(fname, "-")) { -- /* TODO: support raw PCM stream with commandline parameters specifying format */ -+ /* TODO: support raw PCM stream with commandline parameters specifying -+ * format */ - wave->file = stdin; - wave->has_seek = 0; - } else { -@@ -124,14 +150,19 @@ unsigned char wave_open(const char *fname, wave_t *wave, shine_config_t *config, - error("Not a WAVE audio file"); - - /* Check the fmt chunk */ -- if (!wave_get_chunk_header(wave->file, wave->has_seek, "fmt ", (riff_chunk_header_t *)&fmt_chunk)) -+ if (!wave_get_chunk_header(wave->file, wave->has_seek, "fmt ", -+ (riff_chunk_header_t *)&fmt_chunk)) - error("WAVE fmt chunk not found"); - - fmt_data = sizeof(fmt_chunk_t) - sizeof(riff_chunk_header_t); - -- if(fread(&fmt_chunk.format, fmt_data, 1, wave->file) != 1) -+ if (fread(&fmt_chunk.format, fmt_data, 1, wave->file) != 1) - error("Read error"); - -+#ifdef SHINE_BIG_ENDIAN -+ native_fmt_chunk(fmt_chunk); -+#endif -+ - if (verbose()) - fprintf(stderr, "WAVE format: %u\n", fmt_chunk.format); - -@@ -153,34 +184,31 @@ unsigned char wave_open(const char *fname, wave_t *wave, shine_config_t *config, - if (!wave_get_chunk_header(wave->file, wave->has_seek, "data", &data_chunk)) - error("WAVE data chunk not found"); - -- config->wave.channels = fmt_chunk.channels; -+ config->wave.channels = fmt_chunk.channels; - config->wave.samplerate = fmt_chunk.sample_rate; - - wave->channels = fmt_chunk.channels; -- wave->length = data_chunk.length; -+ wave->length = data_chunk.length; - wave->duration = data_chunk.length / fmt_chunk.byte_rate; - - if (!quiet) - printf("%s, %s %ldHz %ldbit, duration: %02ld:%02ld:%02ld\n", -- "WAVE PCM Data", channel_mappings[fmt_chunk.channels], (long)fmt_chunk.sample_rate, (long)fmt_chunk.depth, -- (long)wave->duration / 3600, (long)(wave->duration / 60) % 60, (long)wave->duration % 60); -+ "WAVE PCM Data", channel_mappings[fmt_chunk.channels], -+ (long)fmt_chunk.sample_rate, (long)fmt_chunk.depth, -+ (long)wave->duration / 3600, (long)(wave->duration / 60) % 60, -+ (long)wave->duration % 60); - return 1; - } - - #ifdef SHINE_BIG_ENDIAN --#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) --#define bswap_16(x) __builtin_bswap16(x) --#else --#define bswap_16(x) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) --#endif -- --void swap_buffer(int16_t *sample_buffer, int length) --{ -+void swap_buffer(int16_t *sample_buffer, int length) { - int16_t *end = sample_buffer + length; - - if (length >= 2 * sizeof(long) / sizeof(int16_t)) { -- const unsigned long mask = (~0UL / 0xffff) * 0xff; /* 0x00ff00ff or 0x00ff00ff00ff00ff */ -- unsigned long *long_ptr = (unsigned long *)((unsigned long)sample_buffer & -sizeof(long)); -+ const unsigned long mask = -+ (~0UL / 0xffff) * 0xff; /* 0x00ff00ff or 0x00ff00ff00ff00ff */ -+ unsigned long *long_ptr = -+ (unsigned long *)((unsigned long)sample_buffer & -sizeof(long)); - - /* make sample_buffer aligned on word boundary */ - if ((int16_t *)long_ptr != sample_buffer) { -@@ -212,18 +240,19 @@ void swap_buffer(int16_t *sample_buffer, int length) - */ - - /* TODO: respect data chunk length */ --int read_samples(int16_t *sample_buffer, int frame_size, FILE *file) --{ -- int samples_read=0; -+int read_samples(int16_t *sample_buffer, int frame_size, FILE *file) { -+ int samples_read = 0; - -- samples_read = fread(sample_buffer,sizeof(int16_t),frame_size, file); -+ samples_read = fread(sample_buffer, sizeof(int16_t), frame_size, file); - - #ifdef SHINE_BIG_ENDIAN - swap_buffer(sample_buffer, samples_read); - #endif - -- if(samples_read<frame_size && samples_read>0) { /* Pad sample with zero's */ -- memset(sample_buffer + samples_read, 0, (frame_size - samples_read) * sizeof(int16_t)); -+ if (samples_read < frame_size && -+ samples_read > 0) { /* Pad sample with zero's */ -+ memset(sample_buffer + samples_read, 0, -+ (frame_size - samples_read) * sizeof(int16_t)); - samples_read = frame_size; - } - -@@ -236,8 +265,6 @@ int read_samples(int16_t *sample_buffer, int frame_size, FILE *file) - * Expects an interleaved 16bit pcm stream from read_samples, which it - * reads into the given buffer. - */ --int wave_get(int16_t *buffer, wave_t *wave, int samp_per_pass) --{ -- return read_samples(buffer,samp_per_pass*wave->channels, wave->file); -+int wave_get(int16_t *buffer, wave_t *wave, int samp_per_pass) { -+ return read_samples(buffer, samp_per_pass * wave->channels, wave->file); - } -- -diff --git a/src/bin/wave.h b/src/bin/wave.h -index 5a290a0..b77f0b5 100644 ---- a/src/bin/wave.h -+++ b/src/bin/wave.h -@@ -4,15 +4,16 @@ - #include <stdio.h> - - typedef struct { -- FILE *file; -- int has_seek; -- int channels; -- long length; -- long duration; -+ FILE *file; -+ int has_seek; -+ int channels; -+ long length; -+ long duration; - } wave_t; - --unsigned char wave_open(const char *fname, wave_t *wave, shine_config_t *config, int quiet); --int wave_get(int16_t *buffer, wave_t *wave, int samp_per_frame); -+unsigned char wave_open(const char *fname, wave_t *wave, shine_config_t *config, -+ int quiet); -+int wave_get(int16_t *buffer, wave_t *wave, int samp_per_frame); - void wave_close(wave_t *wave); - - #endif -diff --git a/src/lib/bitstream.c b/src/lib/bitstream.c -index 29afcb1..9408f2c 100644 ---- a/src/lib/bitstream.c -+++ b/src/lib/bitstream.c -@@ -7,17 +7,16 @@ - * Removed unused functions. Feb 2001 P.Everett - */ - --#include "types.h" - #include "bitstream.h" -+#include "types.h" - --#if !defined(__APPLE__) -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include <malloc.h> - #endif - - /* open the device to write the bit stream into it */ --void shine_open_bit_stream(bitstream_t *bs, int size) --{ -- bs->data = (unsigned char *)malloc(size*sizeof(unsigned char)); -+void shine_open_bit_stream(bitstream_t *bs, int size) { -+ bs->data = (unsigned char *)malloc(size * sizeof(unsigned char)); - bs->data_size = size; - bs->data_position = 0; - bs->cache = 0; -@@ -25,8 +24,7 @@ void shine_open_bit_stream(bitstream_t *bs, int size) - } - - /*close the device containing the bit stream */ --void shine_close_bit_stream(bitstream_t *bs) --{ -+void shine_close_bit_stream(bitstream_t *bs) { - if (bs->data) - free(bs->data); - } -@@ -39,42 +37,40 @@ void shine_close_bit_stream(bitstream_t *bs) - * val = value to write into the buffer - * N = number of bits of val - */ --void shine_putbits(bitstream_t *bs, unsigned int val, unsigned int N) --{ -+void shine_putbits(bitstream_t *bs, unsigned int val, unsigned int N) { - #ifdef DEBUG -- if (N > 32) -- printf("Cannot write more than 32 bits at a time.\n"); -- if (N < 32 && (val >> N) != 0) -- printf("Upper bits (higher than %d) are not all zeros.\n", N); -+ if (N > 32) -+ printf("Cannot write more than 32 bits at a time.\n"); -+ if (N < 32 && (val >> N) != 0) -+ printf("Upper bits (higher than %d) are not all zeros.\n", N); - #endif - -- if (bs->cache_bits > N) { -- bs->cache_bits -= N; -- bs->cache |= val << bs->cache_bits; -- } else { -- if (bs->data_position + sizeof(unsigned int) >= bs->data_size) { -- bs->data = (unsigned char *)realloc(bs->data, bs->data_size + (bs->data_size / 2)); -- bs->data_size += (bs->data_size / 2); -- } -+ if (bs->cache_bits > N) { -+ bs->cache_bits -= N; -+ bs->cache |= val << bs->cache_bits; -+ } else { -+ if (bs->data_position + sizeof(unsigned int) >= bs->data_size) { -+ bs->data = (unsigned char *)realloc(bs->data, -+ bs->data_size + (bs->data_size / 2)); -+ bs->data_size += (bs->data_size / 2); -+ } - -- N -= bs->cache_bits; -- bs->cache |= val >> N; -+ N -= bs->cache_bits; -+ bs->cache |= val >> N; - #ifdef SHINE_BIG_ENDIAN -- *(unsigned int*)(bs->data + bs->data_position) = bs->cache; -+ *(unsigned int *)(bs->data + bs->data_position) = bs->cache; - #else -- *(unsigned int*)(bs->data + bs->data_position) = SWAB32(bs->cache); -+ *(unsigned int *)(bs->data + bs->data_position) = SWAB32(bs->cache); - #endif -- bs->data_position += sizeof(unsigned int); -- bs->cache_bits = 32 - N; -- if (N != 0) -- bs->cache = val << bs->cache_bits; -- else -- bs->cache = 0; -- } -+ bs->data_position += sizeof(unsigned int); -+ bs->cache_bits = 32 - N; -+ if (N != 0) -+ bs->cache = val << bs->cache_bits; -+ else -+ bs->cache = 0; -+ } - } - --int shine_get_bits_count(bitstream_t *bs) --{ -- return bs->data_position * 8 + 32 - bs->cache_bits; -+int shine_get_bits_count(bitstream_t *bs) { -+ return bs->data_position * 8 + 32 - bs->cache_bits; - } -- -diff --git a/src/lib/bitstream.h b/src/lib/bitstream.h -index d910ef9..4f7efb6 100644 ---- a/src/lib/bitstream.h -+++ b/src/lib/bitstream.h -@@ -1,28 +1,29 @@ - #ifndef BITSTREAM_H - #define BITSTREAM_H - --typedef struct bit_stream_struc { -- unsigned char *data; /* Processed data */ -- int data_size; /* Total data size */ -- int data_position; /* Data position */ -- unsigned int cache; /* bit stream cache */ -- int cache_bits; /* free bits in cache */ -+typedef struct bit_stream_struc { -+ unsigned char *data; /* Processed data */ -+ int data_size; /* Total data size */ -+ int data_position; /* Data position */ -+ unsigned int cache; /* bit stream cache */ -+ int cache_bits; /* free bits in cache */ - } bitstream_t; - - /* "bit_stream.h" Definitions */ - --#define MINIMUM 4 /* Minimum size of the buffer in bytes */ --#define MAX_LENGTH 32 /* Maximum length of word written or -- read from bit stream */ -+#define MINIMUM 4 /* Minimum size of the buffer in bytes */ -+#define MAX_LENGTH \ -+ 32 /* Maximum length of word written or \ -+ read from bit stream */ - --#define BUFFER_SIZE 4096 -+#define BUFFER_SIZE 4096 - --#define MIN(A, B) ((A) < (B) ? (A) : (B)) --#define MAX(A, B) ((A) > (B) ? (A) : (B)) -+#define MIN(A, B) ((A) < (B) ? (A) : (B)) -+#define MAX(A, B) ((A) > (B) ? (A) : (B)) - --void shine_open_bit_stream(bitstream_t *bs,const int size); -+void shine_open_bit_stream(bitstream_t *bs, const int size); - void shine_close_bit_stream(bitstream_t *bs); --void shine_putbits(bitstream_t *bs,unsigned int val, unsigned int N); --int shine_get_bits_count(bitstream_t *bs); -+void shine_putbits(bitstream_t *bs, unsigned int val, unsigned int N); -+int shine_get_bits_count(bitstream_t *bs); - - #endif -diff --git a/src/lib/huffman.c b/src/lib/huffman.c -index d4bd6aa..854ae41 100644 ---- a/src/lib/huffman.c -+++ b/src/lib/huffman.c -@@ -1,120 +1,248 @@ - /* huffman.c */ - --#include "types.h" - #include "huffman.h" - #include "bitstream.h" - #include "l3bitstream.h" -+#include "types.h" - --const HUFFBITS dmask = 1 << (((sizeof(HUFFBITS))<<3)-1); --const unsigned int hs = sizeof(HUFFBITS)<<3; -+const HUFFBITS dmask = 1 << (((sizeof(HUFFBITS)) << 3) - 1); -+const unsigned int hs = sizeof(HUFFBITS) << 3; - --static const HUFFBITS t1HB[] = {1, 1, 1, 0}; --static const HUFFBITS t2HB[] = {1, 2, 1, 3, 1, 1, 3, 2, 0}; --static const HUFFBITS t3HB[] = {3, 2, 1, 1, 1, 1, 3, 2, 0}; --static const HUFFBITS t5HB[] = {1, 2, 6, 5, 3, 1, 4, 4, 7, 5, 7, 1, 6, 1, 1, 0}; --static const HUFFBITS t6HB[] = {7, 3, 5, 1, 6, 2, 3, 2, 5, 4, 4, 1, 3, 3, 2, 0}; --static const HUFFBITS t7HB[] = {1, 2, 10, 19, 16, 10, 3, 3, 7, 10, 5, 3, 11, 4, 13, 17, 8, 4, 12, 11, 18, 15, 11, 2, 7, 6, 9, 14, 3, 1, 6, 4, 5, 3, 2, 0}; --static const HUFFBITS t8HB[] = {3, 4, 6, 18, 12, 5, 5, 1, 2, 16, 9, 3, 7, 3, 5, 14, 7, 3, 19, 17, 15, 13, 10, 4, 13, 5, 8, 11, 5, 1, 12, 4, 4, 1, 1, 0}; --static const HUFFBITS t9HB[] = {7, 5, 9, 14, 15, 7, 6, 4, 5, 5, 6, 7, 7, 6, 8, 8, 8, 5, 15, 6, 9, 10, 5, 1, 11, 7, 9, 6, 4, 1, 14, 4, 6, 2, 6, 0}; --static const HUFFBITS t10HB[] = {1, 2, 10, 23, 35, 30, 12, 17, 3, 3, 8, 12, 18, 21, 12, 7, 11, 9, 15, 21, 32, 40, 19, 6, 14, 13, 22, 34, 46, 23, 18, 7, 20, 19, 33, 47, 27, 22, 9, 3, 31, 22, 41, 26, 21, 20, 5, 3, 14, 13, 10, 11, 16, 6, 5, 1, 9, 8, 7, 8, 4 , 4, 2, 0}; --static const HUFFBITS t11HB[] = {3, 4, 10, 24, 34, 33, 21, 15, 5, 3, 4, 10, 32, 17, 11, 10, 11, 7, 13, 18, 30, 31, 20, 5, 25, 11, 19, 59, 27, 18, 12, 5, 35, 33, 31, 58, 30, 16, 7, 5, 28, 26, 32, 19, 17, 15, 8, 14, 14, 12, 9, 13, 14, 9, 4, 1, 11, 4, 6, 6, 6, 3, 2, 0}; --static const HUFFBITS t12HB[] = {9, 6, 16, 33, 41, 39, 38, 26, 7, 5, 6, 9, 23, 16, 26, 11, 17, 7, 11, 14, 21, 30, 10, 7, 17, 10, 15, 12, 18, 28, 14, 5, 32, 13, 22, 19, 18, 16, 9, 5, 40, 17, 31, 29, 17, 13, 4, 2, 27, 12, 11, 15, 10, 7, 4, 1, 27, 12, 8, 12 , 6, 3, 1, 0}; --static const HUFFBITS t13HB[] = {1, 5, 14, 21, 34, 51, 46, 71, 42, 52, 68, 52, 67, 44, 43, 19, 3, 4, 12, 19, 31, 26, 44, 33, 31, 24, 32, 24, 31, 35, 22, 14, 15, 13, 23, 36, 59, 49, 77, 65, 29, 40, 30, 40, 27, 33, 42, 16, 22, -- 20, 37, 61, 56, 79, 73, 64, 43, 76, 56, 37, 26, 31, 25, 14, 35, 16, 60, 57, 97, 75, 114, 91, 54, 73, 55, 41, 48, 53, 23, 24, 58, 27, 50, 96, 76, 70, 93, 84, 77, 58, 79, 29, 74, 49, 41, 17, 47, -- 45, 78, 74, 115, 94, 90, 79, 69, 83, 71, 50, 59, 38, 36, 15, 72, 34, 56, 95, 92, 85, 91, 90, 86, 73, 77, 65, 51, 44, 43, 42, 43, 20, 30, 44, 55, 78, 72, 87, 78, 61, 46, 54, 37, 30, 20, 16, 53, -- 25, 41, 37, 44, 59, 54, 81, 66, 76, 57, 54, 37, 18, 39, 11, 35, 33, 31, 57, 42, 82, 72, 80, 47, 58, 55, 21, 22, 26, 38, 22, 53, 25, 23, 38, 70, 60, 51, 36, 55, 26, 34, 23, 27, 14, 9, 7, 34, 32, -- 28, 39, 49, 75, 30, 52, 48, 40, 52, 28, 18, 17, 9, 5, 45, 21, 34, 64, 56, 50, 49, 45, 31, 19, 12, 15, 10, 7, 6, 3, 48, 23, 20, 39, 36, 35, 53, 21, 16, 23, 13, 10, 6, 1, 4, 2, 16, 15, 17, 27, 25, -- 20, 29, 11, 17, 12, 16, 8, 1, 1, 0, 1}; --static const HUFFBITS t15HB[] = {7, 12, 18, 53, 47, 76, 124, 108, 89, 123, 108, 119, 107, 81, 122, 63, 13, 5, 16, 27, 46, 36, 61, 51, 42, 70, 52, 83, 65, 41, 59, 36, 19, 17, 15, 24, 41, 34, 59, 48, 40, 64, 50, 78, 62, 80, 56, -- 33, 29, 28, 25, 43, 39, 63, 55, 93, 76, 59, 93, 72, 54, 75, 50, 29, 52, 22, 42, 40, 67, 57, 95, 79, 72, 57, 89, 69, 49, 66, 46, 27, 77, 37, 35, 66, 58, 52, 91, 74, 62, 48, 79, 63, 90, 62, 40, 38, -- 125, 32, 60, 56, 50, 92, 78, 65, 55, 87, 71, 51, 73, 51, 70, 30, 109, 53, 49, 94, 88, 75, 66, 122, 91, 73, 56, 42, 64, 44, 21, 25, 90, 43, 41, 77, 73, 63, 56, 92, 77, 66, 47, 67, 48, 53, 36, 20, -- 71, 34, 67, 60, 58, 49, 88, 76, 67, 106, 71, 54, 38, 39, 23, 15, 109, 53, 51, 47, 90, 82, 58, 57, 48, 72, 57, 41, 23, 27, 62, 9, 86, 42, 40, 37, 70, 64, 52, 43, 70, 55, 42, 25, 29, 18, 11, 11, -- 118, 68, 30, 55, 50, 46, 74, 65, 49, 39, 24, 16, 22, 13, 14, 7, 91, 44, 39, 38, 34, 63, 52, 45, 31, 52, 28, 19, 14, 8, 9, 3, 123, 60, 58, 53, 47, 43, 32, 22, 37, 24, 17, 12, 15, 10, 2, 1, 71, -- 37, 34, 30, 28, 20, 17, 26, 21, 16, 10, 6, 8, 6, 2, 0}; --static const HUFFBITS t16HB[] = {1, 5, 14, 44, 74, 63, 110, 93, 172, 149, 138, 242, 225, 195, 376, 17, 3, 4, 12, 20, 35, 62, 53, 47, 83, 75, 68, 119, 201, 107, 207, 9, 15, 13, 23, 38, 67, 58, 103, 90, 161, 72, 127, 117, -- 110, 209, 206, 16, 45, 21, 39, 69, 64, 114, 99, 87, 158, 140, 252, 212, 199, 387, 365, 26, 75, 36, 68, 65, 115, 101, 179, 164, 155, 264, 246, 226, 395, 382, 362, 9, 66, 30, 59, 56, 102, -- 185, 173, 265, 142, 253, 232, 400, 388, 378, 445, 16, 111, 54, 52, 100, 184, 178, 160, 133, 257, 244, 228, 217, 385, 366, 715, 10, 98, 48, 91, 88, 165, 157, 148, 261, 248, 407, 397, 372, -- 380, 889, 884, 8, 85, 84, 81, 159, 156, 143, 260, 249, 427, 401, 392, 383, 727, 713, 708, 7, 154, 76, 73, 141, 131, 256, 245, 426, 406, 394, 384, 735, 359, 710, 352, 11, 139, 129, 67, 125, -- 247, 233, 229, 219, 393, 743, 737, 720, 885, 882, 439, 4, 243, 120, 118, 115, 227, 223, 396, 746, 742, 736, 721, 712, 706, 223, 436, 6, 202, 224, 222, 218, 216, 389, 386, 381, 364, 888, -- 443, 707, 440, 437, 1728, 4, 747, 211, 210, 208, 370, 379, 734, 723, 714, 1735, 883, 877, 876, 3459, 865, 2, 377, 369, 102, 187, 726, 722, 358, 711, 709, 866, 1734, 871, 3458, 870, 434, -- 0, 12, 10, 7, 11, 10, 17, 11, 9, 13, 12, 10, 7, 5, 3, 1, 3}; --static const HUFFBITS t24HB[] = {15, 13, 46, 80, 146, 262, 248, 434, 426, 669, 653, 649, 621, 517, 1032, 88, 14, 12, 21, 38, 71, 130, 122, 216, 209, 198, 327, 345, 319, 297, 279, 42, 47, 22, 41, 74, 68, 128, 120, 221, -- 207, 194, 182, 340, 315, 295, 541, 18, 81, 39, 75, 70, 134, 125, 116, 220, 204, 190, 178, 325, 311, 293, 271, 16, 147, 72, 69, 135, 127, 118, 112, 210, 200, 188, 352, 323, 306, 285, -- 540, 14, 263, 66, 129, 126, 119, 114, 214, 202, 192, 180, 341, 317, 301, 281, 262, 12, 249, 123, 121, 117, 113, 215, 206, 195, 185, 347, 330, 308, 291, 272, 520, 10, 435, 115, 111, -- 109, 211, 203, 196, 187, 353, 332, 313, 298, 283, 531, 381, 17, 427, 212, 208, 205, 201, 193, 186, 177, 169, 320, 303, 286, 268, 514, 377, 16, 335, 199, 197, 191, 189, 181, 174, 333, -- 321, 305, 289, 275, 521, 379, 371, 11, 668, 184, 183, 179, 175, 344, 331, 314, 304, 290, 277, 530, 383, 373, 366, 10, 652, 346, 171, 168, 164, 318, 309, 299, 287, 276, 263, 513, 375, -- 368, 362, 6, 648, 322, 316, 312, 307, 302, 292, 284, 269, 261, 512, 376, 370, 364, 359, 4, 620, 300, 296, 294, 288, 282, 273, 266, 515, 380, 374, 369, 365, 361, 357, 2, 1033, 280, 278, -- 274, 267, 264, 259, 382, 378, 372, 367, 363, 360, 358, 356, 0, 43, 20, 19, 17, 15, 13, 11, 9, 7, 6, 4, 7, 5, 3, 1, 3}; --static const HUFFBITS t32HB[] = {1, 5, 4, 5, 6, 5, 4, 4, 7, 3, 6, 0, 7, 2, 3, 1}; --static const HUFFBITS t33HB[] = {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}; -+static const HUFFBITS t1HB[] = {1, 1, 1, 0}; -+static const HUFFBITS t2HB[] = {1, 2, 1, 3, 1, 1, 3, 2, 0}; -+static const HUFFBITS t3HB[] = {3, 2, 1, 1, 1, 1, 3, 2, 0}; -+static const HUFFBITS t5HB[] = {1, 2, 6, 5, 3, 1, 4, 4, 7, 5, 7, 1, 6, 1, 1, 0}; -+static const HUFFBITS t6HB[] = {7, 3, 5, 1, 6, 2, 3, 2, 5, 4, 4, 1, 3, 3, 2, 0}; -+static const HUFFBITS t7HB[] = {1, 2, 10, 19, 16, 10, 3, 3, 7, 10, 5, 3, -+ 11, 4, 13, 17, 8, 4, 12, 11, 18, 15, 11, 2, -+ 7, 6, 9, 14, 3, 1, 6, 4, 5, 3, 2, 0}; -+static const HUFFBITS t8HB[] = {3, 4, 6, 18, 12, 5, 5, 1, 2, 16, 9, 3, -+ 7, 3, 5, 14, 7, 3, 19, 17, 15, 13, 10, 4, -+ 13, 5, 8, 11, 5, 1, 12, 4, 4, 1, 1, 0}; -+static const HUFFBITS t9HB[] = {7, 5, 9, 14, 15, 7, 6, 4, 5, 5, 6, 7, -+ 7, 6, 8, 8, 8, 5, 15, 6, 9, 10, 5, 1, -+ 11, 7, 9, 6, 4, 1, 14, 4, 6, 2, 6, 0}; -+static const HUFFBITS t10HB[] = { -+ 1, 2, 10, 23, 35, 30, 12, 17, 3, 3, 8, 12, 18, 21, 12, 7, -+ 11, 9, 15, 21, 32, 40, 19, 6, 14, 13, 22, 34, 46, 23, 18, 7, -+ 20, 19, 33, 47, 27, 22, 9, 3, 31, 22, 41, 26, 21, 20, 5, 3, -+ 14, 13, 10, 11, 16, 6, 5, 1, 9, 8, 7, 8, 4, 4, 2, 0}; -+static const HUFFBITS t11HB[] = { -+ 3, 4, 10, 24, 34, 33, 21, 15, 5, 3, 4, 10, 32, 17, 11, 10, -+ 11, 7, 13, 18, 30, 31, 20, 5, 25, 11, 19, 59, 27, 18, 12, 5, -+ 35, 33, 31, 58, 30, 16, 7, 5, 28, 26, 32, 19, 17, 15, 8, 14, -+ 14, 12, 9, 13, 14, 9, 4, 1, 11, 4, 6, 6, 6, 3, 2, 0}; -+static const HUFFBITS t12HB[] = { -+ 9, 6, 16, 33, 41, 39, 38, 26, 7, 5, 6, 9, 23, 16, 26, 11, -+ 17, 7, 11, 14, 21, 30, 10, 7, 17, 10, 15, 12, 18, 28, 14, 5, -+ 32, 13, 22, 19, 18, 16, 9, 5, 40, 17, 31, 29, 17, 13, 4, 2, -+ 27, 12, 11, 15, 10, 7, 4, 1, 27, 12, 8, 12, 6, 3, 1, 0}; -+static const HUFFBITS t13HB[] = { -+ 1, 5, 14, 21, 34, 51, 46, 71, 42, 52, 68, 52, 67, 44, 43, 19, 3, 4, -+ 12, 19, 31, 26, 44, 33, 31, 24, 32, 24, 31, 35, 22, 14, 15, 13, 23, 36, -+ 59, 49, 77, 65, 29, 40, 30, 40, 27, 33, 42, 16, 22, 20, 37, 61, 56, 79, -+ 73, 64, 43, 76, 56, 37, 26, 31, 25, 14, 35, 16, 60, 57, 97, 75, 114, 91, -+ 54, 73, 55, 41, 48, 53, 23, 24, 58, 27, 50, 96, 76, 70, 93, 84, 77, 58, -+ 79, 29, 74, 49, 41, 17, 47, 45, 78, 74, 115, 94, 90, 79, 69, 83, 71, 50, -+ 59, 38, 36, 15, 72, 34, 56, 95, 92, 85, 91, 90, 86, 73, 77, 65, 51, 44, -+ 43, 42, 43, 20, 30, 44, 55, 78, 72, 87, 78, 61, 46, 54, 37, 30, 20, 16, -+ 53, 25, 41, 37, 44, 59, 54, 81, 66, 76, 57, 54, 37, 18, 39, 11, 35, 33, -+ 31, 57, 42, 82, 72, 80, 47, 58, 55, 21, 22, 26, 38, 22, 53, 25, 23, 38, -+ 70, 60, 51, 36, 55, 26, 34, 23, 27, 14, 9, 7, 34, 32, 28, 39, 49, 75, -+ 30, 52, 48, 40, 52, 28, 18, 17, 9, 5, 45, 21, 34, 64, 56, 50, 49, 45, -+ 31, 19, 12, 15, 10, 7, 6, 3, 48, 23, 20, 39, 36, 35, 53, 21, 16, 23, -+ 13, 10, 6, 1, 4, 2, 16, 15, 17, 27, 25, 20, 29, 11, 17, 12, 16, 8, -+ 1, 1, 0, 1}; -+static const HUFFBITS t15HB[] = { -+ 7, 12, 18, 53, 47, 76, 124, 108, 89, 123, 108, 119, 107, 81, 122, 63, -+ 13, 5, 16, 27, 46, 36, 61, 51, 42, 70, 52, 83, 65, 41, 59, 36, -+ 19, 17, 15, 24, 41, 34, 59, 48, 40, 64, 50, 78, 62, 80, 56, 33, -+ 29, 28, 25, 43, 39, 63, 55, 93, 76, 59, 93, 72, 54, 75, 50, 29, -+ 52, 22, 42, 40, 67, 57, 95, 79, 72, 57, 89, 69, 49, 66, 46, 27, -+ 77, 37, 35, 66, 58, 52, 91, 74, 62, 48, 79, 63, 90, 62, 40, 38, -+ 125, 32, 60, 56, 50, 92, 78, 65, 55, 87, 71, 51, 73, 51, 70, 30, -+ 109, 53, 49, 94, 88, 75, 66, 122, 91, 73, 56, 42, 64, 44, 21, 25, -+ 90, 43, 41, 77, 73, 63, 56, 92, 77, 66, 47, 67, 48, 53, 36, 20, -+ 71, 34, 67, 60, 58, 49, 88, 76, 67, 106, 71, 54, 38, 39, 23, 15, -+ 109, 53, 51, 47, 90, 82, 58, 57, 48, 72, 57, 41, 23, 27, 62, 9, -+ 86, 42, 40, 37, 70, 64, 52, 43, 70, 55, 42, 25, 29, 18, 11, 11, -+ 118, 68, 30, 55, 50, 46, 74, 65, 49, 39, 24, 16, 22, 13, 14, 7, -+ 91, 44, 39, 38, 34, 63, 52, 45, 31, 52, 28, 19, 14, 8, 9, 3, -+ 123, 60, 58, 53, 47, 43, 32, 22, 37, 24, 17, 12, 15, 10, 2, 1, -+ 71, 37, 34, 30, 28, 20, 17, 26, 21, 16, 10, 6, 8, 6, 2, 0}; -+static const HUFFBITS t16HB[] = { -+ 1, 5, 14, 44, 74, 63, 110, 93, 172, 149, 138, 242, 225, 195, -+ 376, 17, 3, 4, 12, 20, 35, 62, 53, 47, 83, 75, 68, 119, -+ 201, 107, 207, 9, 15, 13, 23, 38, 67, 58, 103, 90, 161, 72, -+ 127, 117, 110, 209, 206, 16, 45, 21, 39, 69, 64, 114, 99, 87, -+ 158, 140, 252, 212, 199, 387, 365, 26, 75, 36, 68, 65, 115, 101, -+ 179, 164, 155, 264, 246, 226, 395, 382, 362, 9, 66, 30, 59, 56, -+ 102, 185, 173, 265, 142, 253, 232, 400, 388, 378, 445, 16, 111, 54, -+ 52, 100, 184, 178, 160, 133, 257, 244, 228, 217, 385, 366, 715, 10, -+ 98, 48, 91, 88, 165, 157, 148, 261, 248, 407, 397, 372, 380, 889, -+ 884, 8, 85, 84, 81, 159, 156, 143, 260, 249, 427, 401, 392, 383, -+ 727, 713, 708, 7, 154, 76, 73, 141, 131, 256, 245, 426, 406, 394, -+ 384, 735, 359, 710, 352, 11, 139, 129, 67, 125, 247, 233, 229, 219, -+ 393, 743, 737, 720, 885, 882, 439, 4, 243, 120, 118, 115, 227, 223, -+ 396, 746, 742, 736, 721, 712, 706, 223, 436, 6, 202, 224, 222, 218, -+ 216, 389, 386, 381, 364, 888, 443, 707, 440, 437, 1728, 4, 747, 211, -+ 210, 208, 370, 379, 734, 723, 714, 1735, 883, 877, 876, 3459, 865, 2, -+ 377, 369, 102, 187, 726, 722, 358, 711, 709, 866, 1734, 871, 3458, 870, -+ 434, 0, 12, 10, 7, 11, 10, 17, 11, 9, 13, 12, 10, 7, -+ 5, 3, 1, 3}; -+static const HUFFBITS t24HB[] = { -+ 15, 13, 46, 80, 146, 262, 248, 434, 426, 669, 653, 649, 621, 517, 1032, -+ 88, 14, 12, 21, 38, 71, 130, 122, 216, 209, 198, 327, 345, 319, 297, -+ 279, 42, 47, 22, 41, 74, 68, 128, 120, 221, 207, 194, 182, 340, 315, -+ 295, 541, 18, 81, 39, 75, 70, 134, 125, 116, 220, 204, 190, 178, 325, -+ 311, 293, 271, 16, 147, 72, 69, 135, 127, 118, 112, 210, 200, 188, 352, -+ 323, 306, 285, 540, 14, 263, 66, 129, 126, 119, 114, 214, 202, 192, 180, -+ 341, 317, 301, 281, 262, 12, 249, 123, 121, 117, 113, 215, 206, 195, 185, -+ 347, 330, 308, 291, 272, 520, 10, 435, 115, 111, 109, 211, 203, 196, 187, -+ 353, 332, 313, 298, 283, 531, 381, 17, 427, 212, 208, 205, 201, 193, 186, -+ 177, 169, 320, 303, 286, 268, 514, 377, 16, 335, 199, 197, 191, 189, 181, -+ 174, 333, 321, 305, 289, 275, 521, 379, 371, 11, 668, 184, 183, 179, 175, -+ 344, 331, 314, 304, 290, 277, 530, 383, 373, 366, 10, 652, 346, 171, 168, -+ 164, 318, 309, 299, 287, 276, 263, 513, 375, 368, 362, 6, 648, 322, 316, -+ 312, 307, 302, 292, 284, 269, 261, 512, 376, 370, 364, 359, 4, 620, 300, -+ 296, 294, 288, 282, 273, 266, 515, 380, 374, 369, 365, 361, 357, 2, 1033, -+ 280, 278, 274, 267, 264, 259, 382, 378, 372, 367, 363, 360, 358, 356, 0, -+ 43, 20, 19, 17, 15, 13, 11, 9, 7, 6, 4, 7, 5, 3, 1, -+ 3}; -+static const HUFFBITS t32HB[] = {1, 5, 4, 5, 6, 5, 4, 4, -+ 7, 3, 6, 0, 7, 2, 3, 1}; -+static const HUFFBITS t33HB[] = {15, 14, 13, 12, 11, 10, 9, 8, -+ 7, 6, 5, 4, 3, 2, 1, 0}; - --static const unsigned char t1l[] = {1, 3, 2, 3}; --static const unsigned char t2l[] = {1, 3, 6, 3, 3, 5, 5, 5, 6}; --static const unsigned char t3l[] = {2, 2, 6, 3, 2, 5, 5, 5, 6}; --static const unsigned char t5l[] = {1, 3, 6, 7, 3, 3, 6, 7, 6, 6, 7, 8, 7, 6, 7, 8}; --static const unsigned char t6l[] = {3, 3, 5, 7, 3, 2, 4, 5, 4, 4, 5, 6, 6, 5, 6, 7}; --static const unsigned char t7l[] = {1, 3, 6, 8, 8, 9, 3, 4, 6, 7, 7, 8, 6, 5, 7, 8, 8, 9, 7, 7, 8, 9, 9, 9, 7, 7, 8, 9, 9, 10, 8, 8, 9, 10, 10, 10}; --static const unsigned char t8l[] = {2, 3, 6, 8, 8, 9, 3, 2, 4, 8, 8, 8, 6, 4, 6, 8, 8, 9, 8, 8, 8, 9, 9, 10, 8, 7, 8, 9, 10, 10, 9, 8, 9, 9, 11, 11}; --static const unsigned char t9l[] = {3, 3, 5, 6, 8, 9, 3, 3, 4, 5, 6, 8, 4, 4, 5, 6, 7, 8, 6, 5, 6, 7, 7, 8, 7, 6, 7, 7, 8, 9, 8, 7, 8, 8, 9, 9}; --static const unsigned char t10l[] = {1, 3, 6, 8, 9, 9, 9, 10, 3, 4, 6, 7, 8, 9, 8, 8, 6, 6, 7, 8, 9, 10, 9, 9, 7, 7, 8, 9, 10, 10, 9, 10, 8, 8, 9, 10, 10, 10, 10, 10, 9, 9, 10, 10, 11, 11, 10, 11, 8, 8, 9, 10, 10, 10, 11, 11, 9, 8, 9, 10, 10, 11, 11, 11}; --static const unsigned char t11l[] = {2, 3, 5, 7, 8, 9, 8, 9, 3, 3, 4, 6, 8, 8, 7, 8, 5, 5, 6, 7, 8, 9, 8, 8, 7, 6, 7, 9, 8, 10, 8, 9, 8, 8, 8, 9, 9, 10, 9, 10, 8, 8, 9, 10, 10, 11, 10, 11, 8, 7, 7, 8, 9, 10, 10, 10, 8, 7, 8, 9, 10, 10, 10, 10}; --static const unsigned char t12l[] = {4, 3, 5, 7, 8, 9, 9, 9, 3, 3, 4, 5, 7, 7, 8, 8, 5, 4, 5, 6, 7, 8, 7, 8, 6, 5, 6, 6, 7, 8, 8, 8, 7, 6, 7, 7, 8, 8, 8, 9, 8, 7, 8, 8, 8, 9, 8, 9, 8, 7, 7, 8, 8, 9, 9, 10, 9, 8, 8, 9, 9, 9, 9, 10}; --static const unsigned char t13l[] = {1, 4, 6, 7, 8, 9, 9, 10, 9, 10, 11, 11, 12, 12, 13, 13, 3, 4, 6, 7, 8, 8, 9, 9, 9, 9, 10, 10, 11, 12, 12, 12, 6, 6, 7, 8, 9, 9, 10, 10, 9, 10, 10, 11, 11, 12, 13, 13, 7, 7, 8, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 13, 13, --8, 7, 9, 9, 10, 10, 11, 11, 10, 11, 11, 12, 12, 13, 13, 14, 9, 8, 9, 10, 10, 10, 11, 11, 11, 11, 12, 11, 13, 13, 14, 14, 9, 9, 10, 10, 11, 11, 11, 11, 11, 12, 12, 12, 13, 13, 14, 14, 10, 9, 10, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 14, 16, 16, 9, 8, 9, 10, --10, 11, 11, 12, 12, 12, 12, 13, 13, 14, 15, 15, 10, 9, 10, 10, 11, 11, 11, 13, 12, 13, 13, 14, 14, 14, 16, 15, 10, 10, 10, 11, 11, 12, 12, 13, 12, 13, 14, 13, 14, 15, 16, 17, 11, 10, 10, 11, 12, 12, 12, 12, 13, 13, 13, 14, 15, 15, 15, 16, 11, 11, 11, 12, 12, --13, 12, 13, 14, 14, 15, 15, 15, 16, 16, 16, 12, 11, 12, 13, 13, 13, 14, 14, 14, 14, 14, 15, 16, 15, 16, 16, 13, 12, 12, 13, 13, 13, 15, 14, 14, 17, 15, 15, 15, 17, 16, 16, 12, 12, 13, 14, 14, 14, 15, 14, 15, 15, 16, 16, 19, 18, 19, 16}; --static const unsigned char t15l[] = {3, 4, 5, 7, 7, 8, 9, 9, 9, 10, 10, 11, 11, 11, 12, 13, 4, 3, 5, 6, 7, 7, 8, 8, 8, 9, 9, 10, 10, 10, 11, 11, 5, 5, 5, 6, 7, 7, 8, 8, 8, 9, 9, 10, 10, 11, 11, 11, 6, 6, 6, 7, 7, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11, 11, 7, 6, 7, -- 7, 8, 8, 9, 9, 9, 9, 10, 10, 10, 11, 11, 11, 8, 7, 7, 8, 8, 8, 9, 9, 9, 9, 10, 10, 11, 11, 11, 12, 9, 7, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 11, 11, 12, 12, 9, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11, 12, 9, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, -- 12, 12, 12, 9, 8, 9, 9, 9, 9, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 10, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11, 11, 12, 13, 12, 10, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 13, 11, 10, 9, 10, 10, 10, 11, 11, 11, 11, 11, 11, 12, 12, 13, 13, --11, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 12, 13, 13, 12, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 12, 13, 12, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 13, 13, 13, 13}; --static const unsigned char t16l[] = {1, 4, 6, 8, 9, 9, 10, 10, 11, 11, 11, 12, 12, 12, 13, 9, 3, 4, 6, 7, 8, 9, 9, 9, 10, 10, 10, 11, 12, 11, 12, 8, 6, 6, 7, 8, 9, 9, 10, 10, 11, 10, 11, 11, 11, 12, 12, 9, 8, 7, 8, 9, 9, 10, 10, 10, 11, 11, 12, 12, 12, 13, 13, -- 10, 9, 8, 9, 9, 10, 10, 11, 11, 11, 12, 12, 12, 13, 13, 13, 9, 9, 8, 9, 9, 10, 11, 11, 12, 11, 12, 12, 13, 13, 13, 14, 10, 10, 9, 9, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 14, 10, 10, 9, 10, 10, 11, 11, 11, 12, 12, 13, 13, 13, 13, 15, 15, 10, 10, 10, -- 10, 11, 11, 11, 12, 12, 13, 13, 13, 13, 14, 14, 14, 10, 11, 10, 10, 11, 11, 12, 12, 13, 13, 13, 13, 14, 13, 14, 13, 11, 11, 11, 10, 11, 12, 12, 12, 12, 13, 14, 14, 14, 15, 15, 14, 10, 12, 11, 11, 11, 12, 12, 13, 14, 14, 14, 14, 14, 14, 13, 14, 11, 12, 12, -- 12, 12, 12, 13, 13, 13, 13, 15, 14, 14, 14, 14, 16, 11, 14, 12, 12, 12, 13, 13, 14, 14, 14, 16, 15, 15, 15, 17, 15, 11, 13, 13, 11, 12, 14, 14, 13, 14, 14, 15, 16, 15, 17, 15, 14, 11, 9, 8, 8, 9, 9, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 8}; --static const unsigned char t24l[] = {4, 4, 6, 7, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 12, 9, 4, 4, 5, 6, 7, 8, 8, 9, 9, 9, 10, 10, 10, 10, 10, 8, 6, 5, 6, 7, 7, 8, 8, 9, 9, 9, 9, 10, 10, 10, 11, 7, 7, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 7, 8, 7, 7, 8, -- 8, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 7, 9, 7, 8, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 7, 9, 8, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 7, 10, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 8, 10, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, --8, 10, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11, 8, 11, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 8, 11, 10, 9, 9, 9, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 8, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 8, 11, 10, 10, -- 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 8, 12, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 4}; --static const unsigned char t32l[] = {1, 4, 4, 5, 4, 6, 5, 6, 4, 5, 5, 6, 5, 6, 6, 6}; --static const unsigned char t33l[] = {4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}; -+static const unsigned char t1l[] = {1, 3, 2, 3}; -+static const unsigned char t2l[] = {1, 3, 6, 3, 3, 5, 5, 5, 6}; -+static const unsigned char t3l[] = {2, 2, 6, 3, 2, 5, 5, 5, 6}; -+static const unsigned char t5l[] = {1, 3, 6, 7, 3, 3, 6, 7, -+ 6, 6, 7, 8, 7, 6, 7, 8}; -+static const unsigned char t6l[] = {3, 3, 5, 7, 3, 2, 4, 5, -+ 4, 4, 5, 6, 6, 5, 6, 7}; -+static const unsigned char t7l[] = {1, 3, 6, 8, 8, 9, 3, 4, 6, 7, 7, 8, -+ 6, 5, 7, 8, 8, 9, 7, 7, 8, 9, 9, 9, -+ 7, 7, 8, 9, 9, 10, 8, 8, 9, 10, 10, 10}; -+static const unsigned char t8l[] = {2, 3, 6, 8, 8, 9, 3, 2, 4, 8, 8, 8, -+ 6, 4, 6, 8, 8, 9, 8, 8, 8, 9, 9, 10, -+ 8, 7, 8, 9, 10, 10, 9, 8, 9, 9, 11, 11}; -+static const unsigned char t9l[] = {3, 3, 5, 6, 8, 9, 3, 3, 4, 5, 6, 8, -+ 4, 4, 5, 6, 7, 8, 6, 5, 6, 7, 7, 8, -+ 7, 6, 7, 7, 8, 9, 8, 7, 8, 8, 9, 9}; -+static const unsigned char t10l[] = { -+ 1, 3, 6, 8, 9, 9, 9, 10, 3, 4, 6, 7, 8, 9, 8, 8, -+ 6, 6, 7, 8, 9, 10, 9, 9, 7, 7, 8, 9, 10, 10, 9, 10, -+ 8, 8, 9, 10, 10, 10, 10, 10, 9, 9, 10, 10, 11, 11, 10, 11, -+ 8, 8, 9, 10, 10, 10, 11, 11, 9, 8, 9, 10, 10, 11, 11, 11}; -+static const unsigned char t11l[] = { -+ 2, 3, 5, 7, 8, 9, 8, 9, 3, 3, 4, 6, 8, 8, 7, 8, -+ 5, 5, 6, 7, 8, 9, 8, 8, 7, 6, 7, 9, 8, 10, 8, 9, -+ 8, 8, 8, 9, 9, 10, 9, 10, 8, 8, 9, 10, 10, 11, 10, 11, -+ 8, 7, 7, 8, 9, 10, 10, 10, 8, 7, 8, 9, 10, 10, 10, 10}; -+static const unsigned char t12l[] = { -+ 4, 3, 5, 7, 8, 9, 9, 9, 3, 3, 4, 5, 7, 7, 8, 8, 5, 4, 5, 6, 7, 8, -+ 7, 8, 6, 5, 6, 6, 7, 8, 8, 8, 7, 6, 7, 7, 8, 8, 8, 9, 8, 7, 8, 8, -+ 8, 9, 8, 9, 8, 7, 7, 8, 8, 9, 9, 10, 9, 8, 8, 9, 9, 9, 9, 10}; -+static const unsigned char t13l[] = { -+ 1, 4, 6, 7, 8, 9, 9, 10, 9, 10, 11, 11, 12, 12, 13, 13, 3, 4, 6, -+ 7, 8, 8, 9, 9, 9, 9, 10, 10, 11, 12, 12, 12, 6, 6, 7, 8, 9, 9, -+ 10, 10, 9, 10, 10, 11, 11, 12, 13, 13, 7, 7, 8, 9, 9, 10, 10, 10, 10, -+ 11, 11, 11, 11, 12, 13, 13, 8, 7, 9, 9, 10, 10, 11, 11, 10, 11, 11, 12, -+ 12, 13, 13, 14, 9, 8, 9, 10, 10, 10, 11, 11, 11, 11, 12, 11, 13, 13, 14, -+ 14, 9, 9, 10, 10, 11, 11, 11, 11, 11, 12, 12, 12, 13, 13, 14, 14, 10, 9, -+ 10, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 14, 16, 16, 9, 8, 9, 10, 10, -+ 11, 11, 12, 12, 12, 12, 13, 13, 14, 15, 15, 10, 9, 10, 10, 11, 11, 11, 13, -+ 12, 13, 13, 14, 14, 14, 16, 15, 10, 10, 10, 11, 11, 12, 12, 13, 12, 13, 14, -+ 13, 14, 15, 16, 17, 11, 10, 10, 11, 12, 12, 12, 12, 13, 13, 13, 14, 15, 15, -+ 15, 16, 11, 11, 11, 12, 12, 13, 12, 13, 14, 14, 15, 15, 15, 16, 16, 16, 12, -+ 11, 12, 13, 13, 13, 14, 14, 14, 14, 14, 15, 16, 15, 16, 16, 13, 12, 12, 13, -+ 13, 13, 15, 14, 14, 17, 15, 15, 15, 17, 16, 16, 12, 12, 13, 14, 14, 14, 15, -+ 14, 15, 15, 16, 16, 19, 18, 19, 16}; -+static const unsigned char t15l[] = { -+ 3, 4, 5, 7, 7, 8, 9, 9, 9, 10, 10, 11, 11, 11, 12, 13, 4, 3, 5, -+ 6, 7, 7, 8, 8, 8, 9, 9, 10, 10, 10, 11, 11, 5, 5, 5, 6, 7, 7, -+ 8, 8, 8, 9, 9, 10, 10, 11, 11, 11, 6, 6, 6, 7, 7, 8, 8, 9, 9, -+ 9, 10, 10, 10, 11, 11, 11, 7, 6, 7, 7, 8, 8, 9, 9, 9, 9, 10, 10, -+ 10, 11, 11, 11, 8, 7, 7, 8, 8, 8, 9, 9, 9, 9, 10, 10, 11, 11, 11, -+ 12, 9, 7, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 11, 11, 12, 12, 9, 8, -+ 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11, 12, 9, 8, 8, 9, 9, -+ 9, 9, 10, 10, 10, 10, 11, 11, 12, 12, 12, 9, 8, 9, 9, 9, 9, 10, 10, -+ 10, 11, 11, 11, 11, 12, 12, 12, 10, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, -+ 11, 11, 12, 13, 12, 10, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, -+ 12, 13, 11, 10, 9, 10, 10, 10, 11, 11, 11, 11, 11, 11, 12, 12, 13, 13, 11, -+ 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 12, 13, 13, 12, 11, 11, 11, -+ 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 12, 13, 12, 11, 11, 11, 11, 11, 11, -+ 12, 12, 12, 12, 12, 13, 13, 13, 13}; -+static const unsigned char t16l[] = { -+ 1, 4, 6, 8, 9, 9, 10, 10, 11, 11, 11, 12, 12, 12, 13, 9, 3, 4, 6, -+ 7, 8, 9, 9, 9, 10, 10, 10, 11, 12, 11, 12, 8, 6, 6, 7, 8, 9, 9, -+ 10, 10, 11, 10, 11, 11, 11, 12, 12, 9, 8, 7, 8, 9, 9, 10, 10, 10, 11, -+ 11, 12, 12, 12, 13, 13, 10, 9, 8, 9, 9, 10, 10, 11, 11, 11, 12, 12, 12, -+ 13, 13, 13, 9, 9, 8, 9, 9, 10, 11, 11, 12, 11, 12, 12, 13, 13, 13, 14, -+ 10, 10, 9, 9, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 14, 10, 10, 9, -+ 10, 10, 11, 11, 11, 12, 12, 13, 13, 13, 13, 15, 15, 10, 10, 10, 10, 11, 11, -+ 11, 12, 12, 13, 13, 13, 13, 14, 14, 14, 10, 11, 10, 10, 11, 11, 12, 12, 13, -+ 13, 13, 13, 14, 13, 14, 13, 11, 11, 11, 10, 11, 12, 12, 12, 12, 13, 14, 14, -+ 14, 15, 15, 14, 10, 12, 11, 11, 11, 12, 12, 13, 14, 14, 14, 14, 14, 14, 13, -+ 14, 11, 12, 12, 12, 12, 12, 13, 13, 13, 13, 15, 14, 14, 14, 14, 16, 11, 14, -+ 12, 12, 12, 13, 13, 14, 14, 14, 16, 15, 15, 15, 17, 15, 11, 13, 13, 11, 12, -+ 14, 14, 13, 14, 14, 15, 16, 15, 17, 15, 14, 11, 9, 8, 8, 9, 9, 10, 10, -+ 10, 11, 11, 11, 11, 11, 11, 11, 8}; -+static const unsigned char t24l[] = { -+ 4, 4, 6, 7, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 12, 9, 4, 4, 5, -+ 6, 7, 8, 8, 9, 9, 9, 10, 10, 10, 10, 10, 8, 6, 5, 6, 7, 7, 8, -+ 8, 9, 9, 9, 9, 10, 10, 10, 11, 7, 7, 6, 7, 7, 8, 8, 8, 9, 9, -+ 9, 9, 10, 10, 10, 10, 7, 8, 7, 7, 8, 8, 8, 8, 9, 9, 9, 10, 10, -+ 10, 10, 11, 7, 9, 7, 8, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, -+ 7, 9, 8, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 7, 10, 8, -+ 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 8, 10, 9, 9, 9, 9, -+ 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 8, 10, 9, 9, 9, 9, 9, 9, 10, -+ 10, 10, 10, 10, 11, 11, 11, 8, 11, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, -+ 11, 11, 11, 11, 8, 11, 10, 9, 9, 9, 10, 10, 10, 10, 10, 10, 11, 11, 11, -+ 11, 8, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 8, 11, -+ 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 8, 12, 10, 10, 10, -+ 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 8, 8, 7, 7, 7, 7, 7, 7, -+ 7, 7, 7, 7, 8, 8, 8, 8, 4}; -+static const unsigned char t32l[] = {1, 4, 4, 5, 4, 6, 5, 6, -+ 4, 5, 5, 6, 5, 6, 6, 6}; -+static const unsigned char t33l[] = {4, 4, 4, 4, 4, 4, 4, 4, -+ 4, 4, 4, 4, 4, 4, 4, 4}; - - #define NOREF -1 --const struct huffcodetab shine_huffman_table[HTN] = --{ --{ 0, 0, 0, 0,NULL,NULL}, --{ 2, 2, 0, 0,t1HB, t1l}, --{ 3, 3, 0, 0,t2HB, t2l}, --{ 3, 3, 0, 0,t3HB, t3l}, --{ 0, 0, 0, 0,NULL,NULL},/* Apparently not used*/ --{ 4, 4, 0, 0,t5HB, t5l}, --{ 4, 4, 0, 0,t6HB, t6l}, --{ 6, 6, 0, 0,t7HB, t7l}, --{ 6, 6, 0, 0,t8HB, t8l}, --{ 6, 6, 0, 0,t9HB, t9l}, --{ 8, 8, 0, 0,t10HB, t10l}, --{ 8, 8, 0, 0,t11HB, t11l}, --{ 8, 8, 0, 0,t12HB, t12l}, --{16,16, 0, 0,t13HB, t13l}, --{ 0, 0, 0, 0,NULL,NULL},/* Apparently not used*/ --{16,16, 0, 0,t15HB, t15l}, --{16,16, 1, 1,t16HB, t16l}, --{16,16, 2, 3,t16HB, t16l}, --{16,16, 3, 7,t16HB, t16l}, --{16,16, 4, 15,t16HB, t16l}, --{16,16, 6, 63,t16HB, t16l}, --{16,16, 8, 255,t16HB, t16l}, --{16,16,10,1023,t16HB, t16l}, --{16,16,13,8191,t16HB, t16l}, --{16,16, 4, 15,t24HB, t24l}, --{16,16, 5, 31,t24HB, t24l}, --{16,16, 6, 63,t24HB, t24l}, --{16,16, 7, 127,t24HB, t24l}, --{16,16, 8, 255,t24HB, t24l}, --{16,16, 9, 511,t24HB, t24l}, --{16,16,11,2047,t24HB, t24l}, --{16,16,13,8191,t24HB, t24l}, --{ 1,16, 0, 0,t32HB, t32l}, --{ 1,16, 0, 0,t33HB, t33l}, -+const struct huffcodetab shine_huffman_table[HTN] = { -+ {0, 0, 0, 0, NULL, NULL}, -+ {2, 2, 0, 0, t1HB, t1l}, -+ {3, 3, 0, 0, t2HB, t2l}, -+ {3, 3, 0, 0, t3HB, t3l}, -+ {0, 0, 0, 0, NULL, NULL}, /* Apparently not used*/ -+ {4, 4, 0, 0, t5HB, t5l}, -+ {4, 4, 0, 0, t6HB, t6l}, -+ {6, 6, 0, 0, t7HB, t7l}, -+ {6, 6, 0, 0, t8HB, t8l}, -+ {6, 6, 0, 0, t9HB, t9l}, -+ {8, 8, 0, 0, t10HB, t10l}, -+ {8, 8, 0, 0, t11HB, t11l}, -+ {8, 8, 0, 0, t12HB, t12l}, -+ {16, 16, 0, 0, t13HB, t13l}, -+ {0, 0, 0, 0, NULL, NULL}, /* Apparently not used*/ -+ {16, 16, 0, 0, t15HB, t15l}, -+ {16, 16, 1, 1, t16HB, t16l}, -+ {16, 16, 2, 3, t16HB, t16l}, -+ {16, 16, 3, 7, t16HB, t16l}, -+ {16, 16, 4, 15, t16HB, t16l}, -+ {16, 16, 6, 63, t16HB, t16l}, -+ {16, 16, 8, 255, t16HB, t16l}, -+ {16, 16, 10, 1023, t16HB, t16l}, -+ {16, 16, 13, 8191, t16HB, t16l}, -+ {16, 16, 4, 15, t24HB, t24l}, -+ {16, 16, 5, 31, t24HB, t24l}, -+ {16, 16, 6, 63, t24HB, t24l}, -+ {16, 16, 7, 127, t24HB, t24l}, -+ {16, 16, 8, 255, t24HB, t24l}, -+ {16, 16, 9, 511, t24HB, t24l}, -+ {16, 16, 11, 2047, t24HB, t24l}, -+ {16, 16, 13, 8191, t24HB, t24l}, -+ {1, 16, 0, 0, t32HB, t32l}, -+ {1, 16, 0, 0, t33HB, t33l}, - }; -- -- -diff --git a/src/lib/huffman.h b/src/lib/huffman.h -index d2d5b51..6a341c7 100644 ---- a/src/lib/huffman.h -+++ b/src/lib/huffman.h -@@ -1,6 +1,8 @@ -+#include <stdint.h> -+ - #define HUFFBITS uint16_t --#define HTN 34 --#define MXOFF 250 -+#define HTN 34 -+#define MXOFF 250 - - struct huffcodetab { - unsigned int xlen; /*max. x-index+ */ -@@ -11,9 +13,8 @@ struct huffcodetab { - const unsigned char *hlen; /*pointer to array[xlen][ylen] */ - }; - --extern const struct huffcodetab shine_huffman_table[HTN];/* global memory block */ -- /* array of all huffcodtable headers */ -- /* 0..31 Huffman code table 0..31 */ -- /* 32,33 count1-tables */ -- -- -+extern const struct huffcodetab -+ shine_huffman_table[HTN]; /* global memory block */ -+ /* array of all huffcodtable headers */ -+ /* 0..31 Huffman code table 0..31 */ -+ /* 32,33 count1-tables */ -diff --git a/src/lib/l3bitstream.c b/src/lib/l3bitstream.c -index ba788e6..1b2849e 100644 ---- a/src/lib/l3bitstream.c -+++ b/src/lib/l3bitstream.c -@@ -1,20 +1,22 @@ - /* l3bitstrea.c */ - --#include "types.h" --#include "l3mdct.h" -+#include "l3bitstream.h" /* the public interface */ -+#include "bitstream.h" -+#include "huffman.h" - #include "l3loop.h" -+#include "l3mdct.h" - #include "layer3.h" --#include "huffman.h" --#include "bitstream.h" - #include "tables.h" --#include "l3bitstream.h" /* the public interface */ -+#include "types.h" - - static void shine_HuffmanCode(bitstream_t *bs, int table_select, int x, int y); --static void shine_huffman_coder_count1(bitstream_t *bs, const struct huffcodetab *h, int v, int w, int x, int y); -+static void shine_huffman_coder_count1(bitstream_t *bs, -+ const struct huffcodetab *h, int v, -+ int w, int x, int y); - --static void encodeSideInfo( shine_global_config *config ); --static void encodeMainData( shine_global_config *config ); --static void Huffmancodebits( shine_global_config *config, int *ix, gr_info *gi); -+static void encodeSideInfo(shine_global_config *config); -+static void encodeMainData(shine_global_config *config); -+static void Huffmancodebits(shine_global_config *config, int *ix, gr_info *gi); - - /* - shine_format_bitstream() -@@ -27,130 +29,121 @@ static void Huffmancodebits( shine_global_config *config, int *ix, gr_info *gi); - in the IS). - */ - --void --shine_format_bitstream(shine_global_config *config) --{ -+void shine_format_bitstream(shine_global_config *config) { - int gr, ch, i; - -- for ( ch = 0; ch < config->wave.channels; ch++ ) -- for ( gr = 0; gr < config->mpeg.granules_per_frame; gr++ ) -- { -- int *pi = &config->l3_enc[ch][gr][0]; -- int32_t *pr = &config->mdct_freq[ch][gr][0]; -- for ( i = 0; i < GRANULE_SIZE; i++ ) -- { -- if ( (pr[i] < 0) && (pi[i] > 0) ) -- pi[i] *= -1; -- } -+ for (ch = 0; ch < config->wave.channels; ch++) -+ for (gr = 0; gr < config->mpeg.granules_per_frame; gr++) { -+ int *pi = &config->l3_enc[ch][gr][0]; -+ int32_t *pr = &config->mdct_freq[ch][gr][0]; -+ for (i = 0; i < GRANULE_SIZE; i++) { -+ if ((pr[i] < 0) && (pi[i] > 0)) -+ pi[i] *= -1; - } -+ } - -- encodeSideInfo( config ); -- encodeMainData( config ); -+ encodeSideInfo(config); -+ encodeMainData(config); - } - --static void encodeMainData(shine_global_config *config) --{ -+static void encodeMainData(shine_global_config *config) { - int gr, ch, sfb; -- shine_side_info_t si = config->side_info; -- -- for ( gr = 0; gr < config->mpeg.granules_per_frame; gr++ ) -- { -- for ( ch = 0; ch < config->wave.channels; ch++ ) -- { -- gr_info *gi = &(si.gr[gr].ch[ch].tt); -- unsigned slen1 = shine_slen1_tab[ gi->scalefac_compress ]; -- unsigned slen2 = shine_slen2_tab[ gi->scalefac_compress ]; -- int *ix = &config->l3_enc[ch][gr][0]; -- -- if ( gr == 0 || si.scfsi[ch][0] == 0 ) -- for ( sfb = 0; sfb < 6; sfb++ ) -- shine_putbits( &config->bs, config->scalefactor.l[gr][ch][sfb], slen1 ); -- if ( gr == 0 || si.scfsi[ch][1] == 0 ) -- for ( sfb = 6; sfb < 11; sfb++ ) -- shine_putbits( &config->bs, config->scalefactor.l[gr][ch][sfb], slen1 ); -- if ( gr == 0 || si.scfsi[ch][2] == 0 ) -- for ( sfb = 11; sfb < 16; sfb++ ) -- shine_putbits( &config->bs, config->scalefactor.l[gr][ch][sfb], slen2 ); -- if ( gr == 0 || si.scfsi[ch][3] == 0 ) -- for ( sfb = 16; sfb < 21; sfb++ ) -- shine_putbits( &config->bs, config->scalefactor.l[gr][ch][sfb], slen2 ); -- -- Huffmancodebits( config, ix, gi ); -- } -+ shine_side_info_t si = config->side_info; -+ -+ for (gr = 0; gr < config->mpeg.granules_per_frame; gr++) { -+ for (ch = 0; ch < config->wave.channels; ch++) { -+ gr_info *gi = &(si.gr[gr].ch[ch].tt); -+ unsigned slen1 = shine_slen1_tab[gi->scalefac_compress]; -+ unsigned slen2 = shine_slen2_tab[gi->scalefac_compress]; -+ int *ix = &config->l3_enc[ch][gr][0]; -+ -+ if (gr == 0 || si.scfsi[ch][0] == 0) -+ for (sfb = 0; sfb < 6; sfb++) -+ shine_putbits(&config->bs, config->scalefactor.l[gr][ch][sfb], slen1); -+ if (gr == 0 || si.scfsi[ch][1] == 0) -+ for (sfb = 6; sfb < 11; sfb++) -+ shine_putbits(&config->bs, config->scalefactor.l[gr][ch][sfb], slen1); -+ if (gr == 0 || si.scfsi[ch][2] == 0) -+ for (sfb = 11; sfb < 16; sfb++) -+ shine_putbits(&config->bs, config->scalefactor.l[gr][ch][sfb], slen2); -+ if (gr == 0 || si.scfsi[ch][3] == 0) -+ for (sfb = 16; sfb < 21; sfb++) -+ shine_putbits(&config->bs, config->scalefactor.l[gr][ch][sfb], slen2); -+ -+ Huffmancodebits(config, ix, gi); - } -+ } - } - --static void encodeSideInfo( shine_global_config *config ) --{ -+static void encodeSideInfo(shine_global_config *config) { - int gr, ch, scfsi_band, region; -- shine_side_info_t si = config->side_info; -- -- shine_putbits( &config->bs, 0x7ff, 11 ); -- shine_putbits( &config->bs, config->mpeg.version, 2 ); -- shine_putbits( &config->bs, config->mpeg.layer, 2 ); -- shine_putbits( &config->bs, !config->mpeg.crc, 1 ); -- shine_putbits( &config->bs, config->mpeg.bitrate_index, 4 ); -- shine_putbits( &config->bs, config->mpeg.samplerate_index % 3, 2 ); -- shine_putbits( &config->bs, config->mpeg.padding, 1 ); -- shine_putbits( &config->bs, config->mpeg.ext, 1 ); -- shine_putbits( &config->bs, config->mpeg.mode, 2 ); -- shine_putbits( &config->bs, config->mpeg.mode_ext, 2 ); -- shine_putbits( &config->bs, config->mpeg.copyright, 1 ); -- shine_putbits( &config->bs, config->mpeg.original, 1 ); -- shine_putbits( &config->bs, config->mpeg.emph, 2 ); -- -- if ( config->mpeg.version == MPEG_I ) { -- shine_putbits( &config->bs, 0, 9 ); -- if ( config->wave.channels == 2 ) -- shine_putbits( &config->bs, si.private_bits, 3 ); -+ shine_side_info_t si = config->side_info; -+ -+ shine_putbits(&config->bs, 0x7ff, 11); -+ shine_putbits(&config->bs, config->mpeg.version, 2); -+ shine_putbits(&config->bs, config->mpeg.layer, 2); -+ shine_putbits(&config->bs, !config->mpeg.crc, 1); -+ shine_putbits(&config->bs, config->mpeg.bitrate_index, 4); -+ shine_putbits(&config->bs, config->mpeg.samplerate_index % 3, 2); -+ shine_putbits(&config->bs, config->mpeg.padding, 1); -+ shine_putbits(&config->bs, config->mpeg.ext, 1); -+ shine_putbits(&config->bs, config->mpeg.mode, 2); -+ shine_putbits(&config->bs, config->mpeg.mode_ext, 2); -+ shine_putbits(&config->bs, config->mpeg.copyright, 1); -+ shine_putbits(&config->bs, config->mpeg.original, 1); -+ shine_putbits(&config->bs, config->mpeg.emph, 2); -+ -+ if (config->mpeg.version == MPEG_I) { -+ shine_putbits(&config->bs, 0, 9); -+ if (config->wave.channels == 2) -+ shine_putbits(&config->bs, si.private_bits, 3); - else -- shine_putbits( &config->bs, si.private_bits, 5 ); -+ shine_putbits(&config->bs, si.private_bits, 5); - } else { -- shine_putbits( &config->bs, 0, 8 ); -- if ( config->wave.channels == 2 ) -- shine_putbits( &config->bs, si.private_bits, 2 ); -+ shine_putbits(&config->bs, 0, 8); -+ if (config->wave.channels == 2) -+ shine_putbits(&config->bs, si.private_bits, 2); - else -- shine_putbits( &config->bs, si.private_bits, 1 ); -+ shine_putbits(&config->bs, si.private_bits, 1); - } - -- if ( config->mpeg.version == MPEG_I ) -- for ( ch = 0; ch < config->wave.channels; ch++ ) { -- for ( scfsi_band = 0; scfsi_band < 4; scfsi_band++ ) -- shine_putbits( &config->bs, si.scfsi[ch][scfsi_band], 1 ); -+ if (config->mpeg.version == MPEG_I) -+ for (ch = 0; ch < config->wave.channels; ch++) { -+ for (scfsi_band = 0; scfsi_band < 4; scfsi_band++) -+ shine_putbits(&config->bs, si.scfsi[ch][scfsi_band], 1); - } - -- for ( gr = 0; gr < config->mpeg.granules_per_frame; gr++ ) -- for ( ch = 0; ch < config->wave.channels ; ch++ ) -- { -- gr_info *gi = &(si.gr[gr].ch[ch].tt); -- -- shine_putbits( &config->bs, gi->part2_3_length, 12 ); -- shine_putbits( &config->bs, gi->big_values, 9 ); -- shine_putbits( &config->bs, gi->global_gain, 8 ); -- if ( config->mpeg.version == MPEG_I ) -- shine_putbits( &config->bs, gi->scalefac_compress, 4 ); -- else -- shine_putbits( &config->bs, gi->scalefac_compress, 9 ); -- shine_putbits( &config->bs, 0, 1 ); -- -- for ( region = 0; region < 3; region++ ) -- shine_putbits( &config->bs, gi->table_select[region], 5 ); -- -- shine_putbits( &config->bs, gi->region0_count, 4 ); -- shine_putbits( &config->bs, gi->region1_count, 3 ); -- -- if ( config->mpeg.version == MPEG_I ) -- shine_putbits( &config->bs, gi->preflag, 1 ); -- shine_putbits( &config->bs, gi->scalefac_scale, 1 ); -- shine_putbits( &config->bs, gi->count1table_select, 1 ); -- } -+ for (gr = 0; gr < config->mpeg.granules_per_frame; gr++) -+ for (ch = 0; ch < config->wave.channels; ch++) { -+ gr_info *gi = &(si.gr[gr].ch[ch].tt); -+ -+ shine_putbits(&config->bs, gi->part2_3_length, 12); -+ shine_putbits(&config->bs, gi->big_values, 9); -+ shine_putbits(&config->bs, gi->global_gain, 8); -+ if (config->mpeg.version == MPEG_I) -+ shine_putbits(&config->bs, gi->scalefac_compress, 4); -+ else -+ shine_putbits(&config->bs, gi->scalefac_compress, 9); -+ shine_putbits(&config->bs, 0, 1); -+ -+ for (region = 0; region < 3; region++) -+ shine_putbits(&config->bs, gi->table_select[region], 5); -+ -+ shine_putbits(&config->bs, gi->region0_count, 4); -+ shine_putbits(&config->bs, gi->region1_count, 3); -+ -+ if (config->mpeg.version == MPEG_I) -+ shine_putbits(&config->bs, gi->preflag, 1); -+ shine_putbits(&config->bs, gi->scalefac_scale, 1); -+ shine_putbits(&config->bs, gi->count1table_select, 1); -+ } - } - - /* Note the discussion of huffmancodebits() on pages 28 and 29 of the IS, as - well as the definitions of the side information on pages 26 and 27. */ --static void Huffmancodebits( shine_global_config *config, int *ix, gr_info *gi ) --{ -- const int *scalefac = &shine_scale_fact_band_index[config->mpeg.samplerate_index][0]; -+static void Huffmancodebits(shine_global_config *config, int *ix, gr_info *gi) { -+ const int *scalefac = -+ &shine_scale_fact_band_index[config->mpeg.samplerate_index][0]; - unsigned scalefac_index; - int region1Start, region2Start; - int i, bigvalues, count1End; -@@ -164,168 +157,153 @@ static void Huffmancodebits( shine_global_config *config, int *ix, gr_info *gi ) - bigvalues = gi->big_values << 1; - - scalefac_index = gi->region0_count + 1; -- region1Start = scalefac[ scalefac_index ]; -+ region1Start = scalefac[scalefac_index]; - scalefac_index += gi->region1_count + 1; -- region2Start = scalefac[ scalefac_index ]; -- -- for ( i = 0; i < bigvalues; i += 2 ) -- { -- /* get table pointer */ -- int idx = (i >= region1Start) + (i >= region2Start); -- unsigned tableindex = gi->table_select[idx]; -- /* get huffman code */ -- if ( tableindex ) -- { -- x = ix[i]; -- y = ix[i + 1]; -- shine_HuffmanCode( &config->bs, tableindex, x, y ); -- } -+ region2Start = scalefac[scalefac_index]; -+ -+ for (i = 0; i < bigvalues; i += 2) { -+ /* get table pointer */ -+ int idx = (i >= region1Start) + (i >= region2Start); -+ unsigned tableindex = gi->table_select[idx]; -+ /* get huffman code */ -+ if (tableindex) { -+ x = ix[i]; -+ y = ix[i + 1]; -+ shine_HuffmanCode(&config->bs, tableindex, x, y); - } -+ } - - /* 2: Write count1 area */ - h = &shine_huffman_table[gi->count1table_select + 32]; -- count1End = bigvalues + (gi->count1 <<2); -- for ( i = bigvalues; i < count1End; i += 4 ) -- { -- v = ix[i]; -- w = ix[i+1]; -- x = ix[i+2]; -- y = ix[i+3]; -- shine_huffman_coder_count1( &config->bs, h, v, w, x, y ); -- } -+ count1End = bigvalues + (gi->count1 << 2); -+ for (i = bigvalues; i < count1End; i += 4) { -+ v = ix[i]; -+ w = ix[i + 1]; -+ x = ix[i + 2]; -+ y = ix[i + 3]; -+ shine_huffman_coder_count1(&config->bs, h, v, w, x, y); -+ } - - bits = shine_get_bits_count(&config->bs) - bits; - bits = gi->part2_3_length - gi->part2_length - bits; -- if (bits) -- { -- int stuffingWords = bits / 32; -- int remainingBits = bits % 32; -- -- /* Due to the nature of the Huffman code tables, we will pad with ones */ -- while ( stuffingWords-- ) -- shine_putbits( &config->bs, ~0, 32 ); -- if ( remainingBits ) -- shine_putbits( &config->bs, (1UL << remainingBits) - 1, remainingBits ); -- } -+ if (bits) { -+ int stuffingWords = bits / 32; -+ int remainingBits = bits % 32; -+ -+ /* Due to the nature of the Huffman code tables, we will pad with ones */ -+ while (stuffingWords--) -+ shine_putbits(&config->bs, ~0, 32); -+ if (remainingBits) -+ shine_putbits(&config->bs, (1UL << remainingBits) - 1, remainingBits); -+ } - } - --static inline int shine_abs_and_sign( int *x ) --{ -- if ( *x > 0 ) return 0; -+static inline int shine_abs_and_sign(int *x) { -+ if (*x > 0) -+ return 0; - *x *= -1; - return 1; - } - --static void shine_huffman_coder_count1( bitstream_t *bs, const struct huffcodetab *h, int v, int w, int x, int y ) --{ -+static void shine_huffman_coder_count1(bitstream_t *bs, -+ const struct huffcodetab *h, int v, -+ int w, int x, int y) { - unsigned int signv, signw, signx, signy; - unsigned int code = 0; - int p, cbits = 0; - -- signv = shine_abs_and_sign( &v ); -- signw = shine_abs_and_sign( &w ); -- signx = shine_abs_and_sign( &x ); -- signy = shine_abs_and_sign( &y ); -+ signv = shine_abs_and_sign(&v); -+ signw = shine_abs_and_sign(&w); -+ signx = shine_abs_and_sign(&x); -+ signy = shine_abs_and_sign(&y); - - p = v + (w << 1) + (x << 2) + (y << 3); -- shine_putbits( bs, h->table[p], h->hlen[p] ); -+ shine_putbits(bs, h->table[p], h->hlen[p]); - -- if ( v ) { -+ if (v) { - code = signv; - cbits = 1; - } -- if ( w ) { -+ if (w) { - code = (code << 1) | signw; - cbits++; - } -- if ( x ) { -+ if (x) { - code = (code << 1) | signx; - cbits++; - } -- if ( y ) { -+ if (y) { - code = (code << 1) | signy; - cbits++; - } -- shine_putbits( bs, code, cbits ); -+ shine_putbits(bs, code, cbits); - } - - /* Implements the pseudocode of page 98 of the IS */ --static void shine_HuffmanCode(bitstream_t *bs, int table_select, int x, int y) --{ -+static void shine_HuffmanCode(bitstream_t *bs, int table_select, int x, int y) { - int cbits = 0, xbits = 0; - unsigned int code = 0, ext = 0; - unsigned signx, signy, ylen, idx; - const struct huffcodetab *h; - -- signx = shine_abs_and_sign( &x ); -- signy = shine_abs_and_sign( &y ); -+ signx = shine_abs_and_sign(&x); -+ signy = shine_abs_and_sign(&y); - - h = &(shine_huffman_table[table_select]); - ylen = h->ylen; - -- if ( table_select > 15 ) -- { /* ESC-table is used */ -- unsigned linbitsx = 0, linbitsy = 0, linbits = h->linbits; -- -- if ( x > 14 ) -- { -- linbitsx = x - 15; -- x = 15; -- } -- if ( y > 14 ) -- { -- linbitsy = y - 15; -- y = 15; -- } -- -- idx = (x * ylen) + y; -- code = h->table[idx]; -- cbits = h->hlen [idx]; -- if ( x > 14 ) -- { -- ext |= linbitsx; -- xbits += linbits; -- } -- if ( x != 0 ) -- { -- ext <<= 1; -- ext |= signx; -- xbits += 1; -- } -- if ( y > 14 ) -- { -- ext <<= linbits; -- ext |= linbitsy; -- xbits += linbits; -- } -- if ( y != 0 ) -- { -- ext <<= 1; -- ext |= signy; -- xbits += 1; -- } -- -- shine_putbits( bs, code, cbits); -- shine_putbits( bs, ext, xbits); -+ if (table_select > 15) { /* ESC-table is used */ -+ unsigned linbitsx = 0, linbitsy = 0, linbits = h->linbits; -+ -+ if (x > 14) { -+ linbitsx = x - 15; -+ x = 15; -+ } -+ if (y > 14) { -+ linbitsy = y - 15; -+ y = 15; -+ } -+ -+ idx = (x * ylen) + y; -+ code = h->table[idx]; -+ cbits = h->hlen[idx]; -+ if (x > 14) { -+ ext |= linbitsx; -+ xbits += linbits; - } -- else -- { /* No ESC-words */ -- idx = (x * ylen) + y; -- code = h->table[idx]; -- cbits = h->hlen[idx]; -- if ( x != 0 ) -- { -- code <<= 1; -- code |= signx; -- cbits += 1; -- } -- if ( y != 0 ) -- { -- code <<= 1; -- code |= signy; -- cbits += 1; -- } -- -- shine_putbits( bs, code, cbits); -+ if (x != 0) { -+ ext <<= 1; -+ ext |= signx; -+ xbits += 1; - } -+ if (y > 14) { -+ ext <<= linbits; -+ ext |= linbitsy; -+ xbits += linbits; -+ } -+ if (y != 0) { -+ ext <<= 1; -+ ext |= signy; -+ xbits += 1; -+ } -+ -+ shine_putbits(bs, code, cbits); -+ shine_putbits(bs, ext, xbits); -+ } else { /* No ESC-words */ -+ idx = (x * ylen) + y; -+ code = h->table[idx]; -+ cbits = h->hlen[idx]; -+ if (x != 0) { -+ code <<= 1; -+ code |= signx; -+ cbits += 1; -+ } -+ if (y != 0) { -+ code <<= 1; -+ code |= signy; -+ cbits += 1; -+ } -+ -+ shine_putbits(bs, code, cbits); -+ } - } -diff --git a/src/lib/l3bitstream.h b/src/lib/l3bitstream.h -index 6e165f5..fa61899 100644 ---- a/src/lib/l3bitstream.h -+++ b/src/lib/l3bitstream.h -@@ -1,6 +1,8 @@ - #ifndef shine_BITSTREAM_H - #define shine_BITSTREAM_H - -+#include "types.h" -+ - void shine_format_bitstream(shine_global_config *config); - - #endif -diff --git a/src/lib/l3loop.c b/src/lib/l3loop.c -index 609c2b2..d3799fb 100644 ---- a/src/lib/l3loop.c -+++ b/src/lib/l3loop.c -@@ -1,34 +1,40 @@ - /* l3loop.c */ - --#include "types.h" --#include "tables.h" - #include "l3loop.h" --#include "layer3.h" --#include "huffman.h" - #include "bitstream.h" -+#include "huffman.h" - #include "l3bitstream.h" -+#include "layer3.h" - #include "reservoir.h" -+#include "tables.h" -+#include "types.h" - --#define e 2.71828182845 --#define CBLIMIT 21 -+#define e 2.71828182845 -+#define CBLIMIT 21 - #define SFB_LMAX 22 - #define en_tot_krit 10 - #define en_dif_krit 100 - #define en_scfsi_band_krit 10 - #define xm_scfsi_band_krit 10 - --static void calc_scfsi(shine_psy_xmin_t *l3_xmin, int ch, int gr, shine_global_config *config); -+static void calc_scfsi(shine_psy_xmin_t *l3_xmin, int ch, int gr, -+ shine_global_config *config); - static int part2_length(int gr, int ch, shine_global_config *config); --static int bin_search_StepSize(int desired_rate, int ix[GRANULE_SIZE], gr_info * cod_info, shine_global_config *config); --static int count_bit(int ix[GRANULE_SIZE], unsigned int start, unsigned int end, unsigned int table ); -+static int bin_search_StepSize(int desired_rate, int ix[GRANULE_SIZE], -+ gr_info *cod_info, shine_global_config *config); -+static int count_bit(int ix[GRANULE_SIZE], unsigned int start, unsigned int end, -+ unsigned int table); - static int bigv_bitcount(int ix[GRANULE_SIZE], gr_info *gi); --static int new_choose_table( int ix[GRANULE_SIZE], unsigned int begin, unsigned int end ); --static void bigv_tab_select( int ix[GRANULE_SIZE], gr_info *cod_info ); --static void subdivide(gr_info *cod_info, shine_global_config *config ); --static int count1_bitcount( int ix[ GRANULE_SIZE ], gr_info *cod_info ); --static void calc_runlen( int ix[GRANULE_SIZE], gr_info *cod_info ); --static void calc_xmin(shine_psy_ratio_t *ratio, gr_info *cod_info, shine_psy_xmin_t *l3_xmin, int gr, int ch ); --static int quantize(int ix[GRANULE_SIZE], int stepsize, shine_global_config *config); -+static int new_choose_table(int ix[GRANULE_SIZE], unsigned int begin, -+ unsigned int end); -+static void bigv_tab_select(int ix[GRANULE_SIZE], gr_info *cod_info); -+static void subdivide(gr_info *cod_info, shine_global_config *config); -+static int count1_bitcount(int ix[GRANULE_SIZE], gr_info *cod_info); -+static void calc_runlen(int ix[GRANULE_SIZE], gr_info *cod_info); -+static void calc_xmin(shine_psy_ratio_t *ratio, gr_info *cod_info, -+ shine_psy_xmin_t *l3_xmin, int gr, int ch); -+static int quantize(int ix[GRANULE_SIZE], int stepsize, -+ shine_global_config *config); - - /* - * shine_inner_loop: -@@ -36,25 +42,22 @@ static int quantize(int ix[GRANULE_SIZE], int stepsize, shine_global_config *con - * The code selects the best quantizerStepSize for a particular set - * of scalefacs. - */ --int shine_inner_loop(int ix[GRANULE_SIZE], -- int max_bits, gr_info *cod_info, int gr, int ch, -- shine_global_config *config ) --{ -+int shine_inner_loop(int ix[GRANULE_SIZE], int max_bits, gr_info *cod_info, -+ int gr, int ch, shine_global_config *config) { - int bits, c1bits, bvbits; - -- if(max_bits<0) -+ if (max_bits < 0) - cod_info->quantizerStepSize--; -- do -- { -- while(quantize(ix,++cod_info->quantizerStepSize,config) > 8192); /* within table range? */ -- -- calc_runlen(ix,cod_info); /* rzero,count1,big_values*/ -- bits = c1bits = count1_bitcount(ix,cod_info); /* count1_table selection*/ -- subdivide(cod_info, config); /* bigvalues sfb division */ -- bigv_tab_select(ix,cod_info); /* codebook selection*/ -- bits += bvbits = bigv_bitcount( ix, cod_info ); /* bit count */ -- } -- while(bits>max_bits); -+ do { -+ while (quantize(ix, ++cod_info->quantizerStepSize, config) > 8192) -+ ; /* within table range? */ -+ -+ calc_runlen(ix, cod_info); /* rzero,count1,big_values*/ -+ bits = c1bits = count1_bitcount(ix, cod_info); /* count1_table selection*/ -+ subdivide(cod_info, config); /* bigvalues sfb division */ -+ bigv_tab_select(ix, cod_info); /* codebook selection*/ -+ bits += bvbits = bigv_bitcount(ix, cod_info); /* bit count */ -+ } while (bits > max_bits); - return bits; - } - -@@ -66,21 +69,22 @@ int shine_inner_loop(int ix[GRANULE_SIZE], - * global gain. This module calls the inner iteration loop. - */ - --int shine_outer_loop( int max_bits, -- shine_psy_xmin_t *l3_xmin, /* the allowed distortion of the scalefactor */ -- int ix[GRANULE_SIZE], /* vector of quantized values ix(0..575) */ -- int gr, int ch, shine_global_config *config) --{ -+int shine_outer_loop( -+ int max_bits, -+ shine_psy_xmin_t *l3_xmin, /* the allowed distortion of the scalefactor */ -+ int ix[GRANULE_SIZE], /* vector of quantized values ix(0..575) */ -+ int gr, int ch, shine_global_config *config) { - int bits, huff_bits; -- shine_side_info_t *side_info = &config->side_info; -+ shine_side_info_t *side_info = &config->side_info; - gr_info *cod_info = &side_info->gr[gr].ch[ch].tt; - -- cod_info->quantizerStepSize = bin_search_StepSize(max_bits,ix,cod_info, config); -+ cod_info->quantizerStepSize = -+ bin_search_StepSize(max_bits, ix, cod_info, config); - -- cod_info->part2_length = part2_length(gr,ch,config); -+ cod_info->part2_length = part2_length(gr, ch, config); - huff_bits = max_bits - cod_info->part2_length; - -- bits = shine_inner_loop(ix, huff_bits, cod_info, gr, ch, config ); -+ bits = shine_inner_loop(ix, huff_bits, cod_info, gr, ch, config); - cod_info->part2_3_length = cod_info->part2_length + bits; - - return cod_info->part2_3_length; -@@ -90,18 +94,15 @@ int shine_outer_loop( int max_bits, - * shine_iteration_loop: - * ------------------ - */ --void shine_iteration_loop(shine_global_config *config) --{ -+void shine_iteration_loop(shine_global_config *config) { - shine_psy_xmin_t l3_xmin; - gr_info *cod_info; - int max_bits; - int ch, gr, i; - int *ix; - -- for(ch=config->wave.channels; ch--; ) -- { -- for(gr=0; gr<config->mpeg.granules_per_frame; gr++) -- { -+ for (ch = config->wave.channels; ch--;) { -+ for (gr = 0; gr < config->mpeg.granules_per_frame; gr++) { - /* setup pointers */ - ix = config->l3_enc[ch][gr]; - config->l3loop.xr = config->mdct_freq[ch][gr]; -@@ -109,56 +110,58 @@ void shine_iteration_loop(shine_global_config *config) - /* Precalculate the square, abs, and maximum, - * for use later on. - */ -- for (i=GRANULE_SIZE, config->l3loop.xrmax=0; i--;) -- { -- config->l3loop.xrsq[i] = mulsr(config->l3loop.xr[i],config->l3loop.xr[i]); -+ for (i = GRANULE_SIZE, config->l3loop.xrmax = 0; i--;) { -+ config->l3loop.xrsq[i] = -+ mulsr(config->l3loop.xr[i], config->l3loop.xr[i]); - config->l3loop.xrabs[i] = labs(config->l3loop.xr[i]); -- if(config->l3loop.xrabs[i]>config->l3loop.xrmax) -- config->l3loop.xrmax=config->l3loop.xrabs[i]; -+ if (config->l3loop.xrabs[i] > config->l3loop.xrmax) -+ config->l3loop.xrmax = config->l3loop.xrabs[i]; - } - -- cod_info = (gr_info *) &(config->side_info.gr[gr].ch[ch]); -+ cod_info = (gr_info *)&(config->side_info.gr[gr].ch[ch]); - cod_info->sfb_lmax = SFB_LMAX - 1; /* gr_deco */ - -- calc_xmin(&config->ratio, cod_info, &l3_xmin, gr, ch ); -+ calc_xmin(&config->ratio, cod_info, &l3_xmin, gr, ch); - -- if ( config->mpeg.version == MPEG_I ) -- calc_scfsi(&l3_xmin,ch,gr,config); -+ if (config->mpeg.version == MPEG_I) -+ calc_scfsi(&l3_xmin, ch, gr, config); - - /* calculation of number of available bit( per granule ) */ -- max_bits = shine_max_reservoir_bits(&config->pe[ch][gr],config); -+ max_bits = shine_max_reservoir_bits(&config->pe[ch][gr], config); - - /* reset of iteration variables */ -- memset(config->scalefactor.l[gr][ch],0,sizeof(config->scalefactor.l[gr][ch])); -- memset(config->scalefactor.s[gr][ch],0,sizeof(config->scalefactor.s[gr][ch])); -+ memset(config->scalefactor.l[gr][ch], 0, -+ sizeof(config->scalefactor.l[gr][ch])); -+ memset(config->scalefactor.s[gr][ch], 0, -+ sizeof(config->scalefactor.s[gr][ch])); - -- for ( i=4; i--; ) -+ for (i = 4; i--;) - cod_info->slen[i] = 0; - -- cod_info->part2_3_length = 0; -- cod_info->big_values = 0; -- cod_info->count1 = 0; -+ cod_info->part2_3_length = 0; -+ cod_info->big_values = 0; -+ cod_info->count1 = 0; - cod_info->scalefac_compress = 0; -- cod_info->table_select[0] = 0; -- cod_info->table_select[1] = 0; -- cod_info->table_select[2] = 0; -- cod_info->region0_count = 0; -- cod_info->region1_count = 0; -- cod_info->part2_length = 0; -- cod_info->preflag = 0; -- cod_info->scalefac_scale = 0; -- cod_info->count1table_select= 0; -+ cod_info->table_select[0] = 0; -+ cod_info->table_select[1] = 0; -+ cod_info->table_select[2] = 0; -+ cod_info->region0_count = 0; -+ cod_info->region1_count = 0; -+ cod_info->part2_length = 0; -+ cod_info->preflag = 0; -+ cod_info->scalefac_scale = 0; -+ cod_info->count1table_select = 0; - - /* all spectral values zero ? */ -- if(config->l3loop.xrmax) -- cod_info->part2_3_length = shine_outer_loop(max_bits,&l3_xmin,ix, -- gr,ch,config); -+ if (config->l3loop.xrmax) -+ cod_info->part2_3_length = -+ shine_outer_loop(max_bits, &l3_xmin, ix, gr, ch, config); - -- shine_ResvAdjust(cod_info, config ); -- cod_info->global_gain = cod_info->quantizerStepSize+210; -+ shine_ResvAdjust(cod_info, config); -+ cod_info->global_gain = cod_info->quantizerStepSize + 210; - - } /* for gr */ -- } /* for ch */ -+ } /* for ch */ - - shine_ResvFrameEnd(config); - } -@@ -168,21 +171,20 @@ void shine_iteration_loop(shine_global_config *config) - * ----------- - * calculation of the scalefactor select information ( scfsi ). - */ --void calc_scfsi( shine_psy_xmin_t *l3_xmin, int ch, int gr, -- shine_global_config *config ) --{ -+void calc_scfsi(shine_psy_xmin_t *l3_xmin, int ch, int gr, -+ shine_global_config *config) { - shine_side_info_t *l3_side = &config->side_info; - /* This is the scfsi_band table from 2.4.2.7 of the IS */ -- static const int scfsi_band_long[5] = { 0, 6, 11, 16, 21 }; -+ static const int scfsi_band_long[5] = {0, 6, 11, 16, 21}; - - int scfsi_band; -- unsigned scfsi_set; - - int sfb, start, end, i; - int condition = 0; - int temp; - -- const int *scalefac_band_long = &shine_scale_fact_band_index[config->mpeg.samplerate_index][0]; -+ const int *scalefac_band_long = -+ &shine_scale_fact_band_index[config->mpeg.samplerate_index][0]; - - /* note. it goes quite a bit faster if you uncomment the next bit and exit - early from scfsi, but you then loose the advantage of common scale factors. -@@ -194,82 +196,75 @@ void calc_scfsi( shine_psy_xmin_t *l3_xmin, int ch, int gr, - */ - - config->l3loop.xrmaxl[gr] = config->l3loop.xrmax; -- scfsi_set = 0; - - /* the total energy of the granule */ -- for ( temp = 0, i =GRANULE_SIZE; i--; ) -- temp += config->l3loop.xrsq[i]>>10; /* a bit of scaling to avoid overflow, (not very good) */ -- if ( temp ) -- config->l3loop.en_tot[gr] = log((double)temp * 4.768371584e-7) / LN2; /* 1024 / 0x7fffffff */ -+ for (temp = 0, i = GRANULE_SIZE; i--;) -+ temp += config->l3loop.xrsq[i] >> -+ 10; /* a bit of scaling to avoid overflow, (not very good) */ -+ if (temp) -+ config->l3loop.en_tot[gr] = -+ log((double)temp * 4.768371584e-7) / LN2; /* 1024 / 0x7fffffff */ - else - config->l3loop.en_tot[gr] = 0; - - /* the energy of each scalefactor band, en */ - /* the allowed distortion of each scalefactor band, xm */ - -- for(sfb=21; sfb--; ) -- { -- start = scalefac_band_long[ sfb ]; -- end = scalefac_band_long[ sfb+1 ]; -+ for (sfb = 21; sfb--;) { -+ start = scalefac_band_long[sfb]; -+ end = scalefac_band_long[sfb + 1]; - -- for ( temp = 0, i = start; i < end; i++ ) -- temp += config->l3loop.xrsq[i]>>10; -- if ( temp ) -- config->l3loop.en[gr][sfb] = log((double)temp * 4.768371584e-7) / LN2; /* 1024 / 0x7fffffff */ -+ for (temp = 0, i = start; i < end; i++) -+ temp += config->l3loop.xrsq[i] >> 10; -+ if (temp) -+ config->l3loop.en[gr][sfb] = -+ log((double)temp * 4.768371584e-7) / LN2; /* 1024 / 0x7fffffff */ - else - config->l3loop.en[gr][sfb] = 0; - -- if ( l3_xmin->l[gr][ch][sfb]) -- config->l3loop.xm[gr][sfb] = log( l3_xmin->l[gr][ch][sfb] ) / LN2; -+ if (l3_xmin->l[gr][ch][sfb]) -+ config->l3loop.xm[gr][sfb] = log(l3_xmin->l[gr][ch][sfb]) / LN2; - else - config->l3loop.xm[gr][sfb] = 0; - } - -- if(gr==1) -- { -+ if (gr == 1) { - int gr2, tp; - -- for(gr2=2; gr2--; ) -- { -+ for (gr2 = 2; gr2--;) { - /* The spectral values are not all zero */ -- if(config->l3loop.xrmaxl[gr2]) -+ if (config->l3loop.xrmaxl[gr2]) - condition++; - - condition++; - } -- if(abs(config->l3loop.en_tot[0]-config->l3loop.en_tot[1]) < en_tot_krit) -+ if (abs(config->l3loop.en_tot[0] - config->l3loop.en_tot[1]) < en_tot_krit) - condition++; -- for(tp=0,sfb=21; sfb--; ) -- tp += abs(config->l3loop.en[0][sfb]-config->l3loop.en[1][sfb]); -+ for (tp = 0, sfb = 21; sfb--;) -+ tp += abs(config->l3loop.en[0][sfb] - config->l3loop.en[1][sfb]); - if (tp < en_dif_krit) - condition++; - -- if(condition==6) -- { -- for(scfsi_band=0;scfsi_band<4;scfsi_band++) -- { -+ if (condition == 6) { -+ for (scfsi_band = 0; scfsi_band < 4; scfsi_band++) { - int sum0 = 0, sum1 = 0; - l3_side->scfsi[ch][scfsi_band] = 0; - start = scfsi_band_long[scfsi_band]; -- end = scfsi_band_long[scfsi_band+1]; -- for ( sfb = start; sfb < end; sfb++ ) -- { -- sum0 += abs( config->l3loop.en[0][sfb] - config->l3loop.en[1][sfb] ); -- sum1 += abs( config->l3loop.xm[0][sfb] - config->l3loop.xm[1][sfb] ); -+ end = scfsi_band_long[scfsi_band + 1]; -+ for (sfb = start; sfb < end; sfb++) { -+ sum0 += abs(config->l3loop.en[0][sfb] - config->l3loop.en[1][sfb]); -+ sum1 += abs(config->l3loop.xm[0][sfb] - config->l3loop.xm[1][sfb]); - } - -- if(sum0<en_scfsi_band_krit && sum1<xm_scfsi_band_krit) -- { -+ if (sum0 < en_scfsi_band_krit && sum1 < xm_scfsi_band_krit) { - l3_side->scfsi[ch][scfsi_band] = 1; -- scfsi_set |= (1 << scfsi_band); -- } -- else -+ } else - l3_side->scfsi[ch][scfsi_band] = 0; - } /* for scfsi_band */ -- } /* if condition == 6 */ -+ } /* if condition == 6 */ - else -- for(scfsi_band=0;scfsi_band<4;scfsi_band++) -- l3_side->scfsi[ch][scfsi_band] = 0; -+ for (scfsi_band = 0; scfsi_band < 4; scfsi_band++) -+ l3_side->scfsi[ch][scfsi_band] = 0; - } /* if gr == 1 */ - } - -@@ -279,27 +274,26 @@ void calc_scfsi( shine_psy_xmin_t *l3_xmin, int ch, int gr, - * calculates the number of bits needed to encode the scalefacs in the - * main data block. - */ --int part2_length(int gr, int ch, shine_global_config *config) --{ -+int part2_length(int gr, int ch, shine_global_config *config) { - int slen1, slen2, bits; - gr_info *gi = &config->side_info.gr[gr].ch[ch].tt; - - bits = 0; - - { -- slen1 = shine_slen1_tab[ gi->scalefac_compress ]; -- slen2 = shine_slen2_tab[ gi->scalefac_compress ]; -+ slen1 = shine_slen1_tab[gi->scalefac_compress]; -+ slen2 = shine_slen2_tab[gi->scalefac_compress]; - -- if ( !gr || !(config->side_info.scfsi[ch][0]) ) -+ if (!gr || !(config->side_info.scfsi[ch][0])) - bits += (6 * slen1); - -- if ( !gr || !(config->side_info.scfsi[ch][1]) ) -+ if (!gr || !(config->side_info.scfsi[ch][1])) - bits += (5 * slen1); - -- if ( !gr || !(config->side_info.scfsi[ch][2]) ) -+ if (!gr || !(config->side_info.scfsi[ch][2])) - bits += (5 * slen2); - -- if ( !gr || !(config->side_info.scfsi[ch][3]) ) -+ if (!gr || !(config->side_info.scfsi[ch][3])) - bits += (5 * slen2); - } - return bits; -@@ -312,26 +306,22 @@ int part2_length(int gr, int ch, shine_global_config *config) - * as determined by the psychoacoustic model. - * xmin(sb) = ratio(sb) * en(sb) / bw(sb) - */ --void calc_xmin(shine_psy_ratio_t *ratio, -- gr_info *cod_info, -- shine_psy_xmin_t *l3_xmin, -- int gr, int ch ) --{ -+void calc_xmin(shine_psy_ratio_t *ratio, gr_info *cod_info, -+ shine_psy_xmin_t *l3_xmin, int gr, int ch) { - int sfb; - -- for ( sfb = cod_info->sfb_lmax; sfb--; ) -- { --/* note. xmin will always be zero with no psychoacoustic model -+ for (sfb = cod_info->sfb_lmax; sfb--;) { -+ /* note. xmin will always be zero with no psychoacoustic model - -- start = scalefac_band_long[ sfb ]; -- end = scalefac_band_long[ sfb+1 ]; -- bw = end - start; -+ start = scalefac_band_long[ sfb ]; -+ end = scalefac_band_long[ sfb+1 ]; -+ bw = end - start; - -- for ( en = 0, l = start; l < end; l++ ) -- en += config->l3loop.xrsq[l]; -+ for ( en = 0, l = start; l < end; l++ ) -+ en += config->l3loop.xrsq[l]; - -- l3_xmin->l[gr][ch][sfb] = ratio->l[gr][ch][sfb] * en / bw; --*/ -+ l3_xmin->l[gr][ch][sfb] = ratio->l[gr][ch][sfb] * en / bw; -+ */ - l3_xmin->l[gr][ch][sfb] = 0; - } - } -@@ -341,8 +331,7 @@ void calc_xmin(shine_psy_ratio_t *ratio, - * ------------------- - * Calculates the look up tables used by the iteration loop. - */ --void shine_loop_initialise(shine_global_config *config) --{ -+void shine_loop_initialise(shine_global_config *config) { - int i; - - /* quantize: stepsize conversion, fourth root of 2 table. -@@ -350,24 +339,26 @@ void shine_loop_initialise(shine_global_config *config) - * in the spec because it is quicker to do x*y than x/y. - * The 0.5 is for rounding. - */ -- for(i=128; i--;) -- { -- config->l3loop.steptab[i] = pow(2.0,(double)(127-i)/4); -- if((config->l3loop.steptab[i]*2)>0x7fffffff) /* MAXINT = 2**31 = 2**(124/4) */ -- config->l3loop.steptabi[i]=0x7fffffff; -+ for (i = 128; i--;) { -+ config->l3loop.steptab[i] = pow(2.0, (double)(127 - i) / 4); -+ if ((config->l3loop.steptab[i] * 2) > -+ 0x7fffffff) /* MAXINT = 2**31 = 2**(124/4) */ -+ config->l3loop.steptabi[i] = 0x7fffffff; - else - /* The table is multiplied by 2 to give an extra bit of accuracy. - * In quantize, the long multiply does not shift it's result left one - * bit to compensate. - */ -- config->l3loop.steptabi[i] = (int32_t)((config->l3loop.steptab[i]*2) + 0.5); -+ config->l3loop.steptabi[i] = -+ (int32_t)((config->l3loop.steptab[i] * 2) + 0.5); - } - - /* quantize: vector conversion, three quarter power table. - * The 0.5 is for rounding, the .0946 comes from the spec. - */ -- for(i=10000; i--;) -- config->l3loop.int2idx[i] = (int)(sqrt(sqrt((double)i)*(double)i) - 0.0946 + 0.5); -+ for (i = 10000; i--;) -+ config->l3loop.int2idx[i] = -+ (int)(sqrt(sqrt((double)i) * (double)i) - 0.0946 + 0.5); - } - - /* -@@ -376,39 +367,37 @@ void shine_loop_initialise(shine_global_config *config) - * Function: Quantization of the vector xr ( -> ix). - * Returns maximum value of ix. - */ --int quantize(int ix[GRANULE_SIZE], int stepsize, shine_global_config *config ) --{ -+int quantize(int ix[GRANULE_SIZE], int stepsize, shine_global_config *config) { - int i, max, ln; - int32_t scalei; - double scale, dbl; - -- scalei = config->l3loop.steptabi[stepsize+127]; /* 2**(-stepsize/4) */ -+ scalei = config->l3loop.steptabi[stepsize + 127]; /* 2**(-stepsize/4) */ - - /* a quick check to see if ixmax will be less than 8192 */ - /* this speeds up the early calls to bin_search_StepSize */ -- if((mulr(config->l3loop.xrmax,scalei)) > 165140) /* 8192**(4/3) */ -+ if ((mulr(config->l3loop.xrmax, scalei)) > 165140) /* 8192**(4/3) */ - max = 16384; /* no point in continuing, stepsize not big enough */ - else -- for(i=0, max=0;i<GRANULE_SIZE;i++) -- { -+ for (i = 0, max = 0; i < GRANULE_SIZE; i++) { - /* This calculation is very sensitive. The multiply must round it's - * result or bad things happen to the quality. - */ -- ln = mulr(labs(config->l3loop.xr[i]),scalei); -+ ln = mulr(labs(config->l3loop.xr[i]), scalei); - -- if(ln<10000) /* ln < 10000 catches most values */ -+ if (ln < 10000) /* ln < 10000 catches most values */ - ix[i] = config->l3loop.int2idx[ln]; /* quick look up method */ -- else -- { -+ else { - /* outside table range so have to do it using floats */ -- scale = config->l3loop.steptab[stepsize+127]; /* 2**(-stepsize/4) */ -- dbl = ((double)config->l3loop.xrabs[i]) * scale * 4.656612875e-10; /* 0x7fffffff */ -- ix[i] = (int)sqrt(sqrt(dbl)*dbl); /* dbl**(3/4) */ -+ scale = config->l3loop.steptab[stepsize + 127]; /* 2**(-stepsize/4) */ -+ dbl = ((double)config->l3loop.xrabs[i]) * scale * -+ 4.656612875e-10; /* 0x7fffffff */ -+ ix[i] = (int)sqrt(sqrt(dbl) * dbl); /* dbl**(3/4) */ - } - - /* calculate ixmax while we're here */ - /* note. ix cannot be negative */ -- if(max < ix[i]) -+ if (max < ix[i]) - max = ix[i]; - } - -@@ -420,13 +409,13 @@ int quantize(int ix[GRANULE_SIZE], int stepsize, shine_global_config *config ) - * ------- - * Function: Calculate the maximum of ix from 0 to 575 - */ --static inline int ix_max( int ix[GRANULE_SIZE], unsigned int begin, unsigned int end ) --{ -+static inline int ix_max(int ix[GRANULE_SIZE], unsigned int begin, -+ unsigned int end) { - register int i; - register int max = 0; - -- for(i=begin;i<end;i++) -- if(max < ix[i]) -+ for (i = begin; i < end; i++) -+ if (max < ix[i]) - max = ix[i]; - return max; - } -@@ -437,28 +426,24 @@ static inline int ix_max( int ix[GRANULE_SIZE], unsigned int begin, unsigned int - * Function: Calculation of rzero, count1, big_values - * (Partitions ix into big values, quadruples and zeros). - */ --void calc_runlen( int ix[GRANULE_SIZE], gr_info *cod_info ) --{ -+void calc_runlen(int ix[GRANULE_SIZE], gr_info *cod_info) { - int i; - int rzero = 0; - -- for ( i = GRANULE_SIZE; i > 1; i -= 2 ) -- if ( !ix[i-1] && !ix[i-2] ) -+ for (i = GRANULE_SIZE; i > 1; i -= 2) -+ if (!ix[i - 1] && !ix[i - 2]) - rzero++; - else - break; - -- cod_info->count1 = 0 ; -- for ( ; i > 3; i -= 4 ) -- if ( ix[i-1] <= 1 -- && ix[i-2] <= 1 -- && ix[i-3] <= 1 -- && ix[i-4] <= 1 ) -+ cod_info->count1 = 0; -+ for (; i > 3; i -= 4) -+ if (ix[i - 1] <= 1 && ix[i - 2] <= 1 && ix[i - 3] <= 1 && ix[i - 4] <= 1) - cod_info->count1++; - else - break; - -- cod_info->big_values = i>>1; -+ cod_info->big_values = i >> 1; - } - - /* -@@ -466,27 +451,29 @@ void calc_runlen( int ix[GRANULE_SIZE], gr_info *cod_info ) - * ---------------- - * Determines the number of bits to encode the quadruples. - */ --int count1_bitcount(int ix[GRANULE_SIZE], gr_info *cod_info) --{ -+int count1_bitcount(int ix[GRANULE_SIZE], gr_info *cod_info) { - int p, i, k; - int v, w, x, y, signbits; -- int sum0 = 0, -- sum1 = 0; -+ int sum0 = 0, sum1 = 0; - -- for(i=cod_info->big_values<<1, k=0; k<cod_info->count1; i+=4, k++) -- { -+ for (i = cod_info->big_values << 1, k = 0; k < cod_info->count1; -+ i += 4, k++) { - v = ix[i]; -- w = ix[i+1]; -- x = ix[i+2]; -- y = ix[i+3]; -+ w = ix[i + 1]; -+ x = ix[i + 2]; -+ y = ix[i + 3]; - -- p = v + (w<<1) + (x<<2) + (y<<3); -+ p = v + (w << 1) + (x << 2) + (y << 3); - - signbits = 0; -- if(v!=0) signbits++; -- if(w!=0) signbits++; -- if(x!=0) signbits++; -- if(y!=0) signbits++; -+ if (v != 0) -+ signbits++; -+ if (w != 0) -+ signbits++; -+ if (x != 0) -+ signbits++; -+ if (y != 0) -+ signbits++; - - sum0 += signbits; - sum1 += signbits; -@@ -495,13 +482,10 @@ int count1_bitcount(int ix[GRANULE_SIZE], gr_info *cod_info) - sum1 += shine_huffman_table[33].hlen[p]; - } - -- if(sum0<sum1) -- { -+ if (sum0 < sum1) { - cod_info->count1table_select = 0; - return sum0; -- } -- else -- { -+ } else { - cod_info->count1table_select = 1; - return sum1; - } -@@ -510,59 +494,56 @@ int count1_bitcount(int ix[GRANULE_SIZE], gr_info *cod_info) - /* - * subdivide: - * ---------- -- * presumable subdivides the bigvalue region which will use separate Huffman tables. -+ * presumable subdivides the bigvalue region which will use separate Huffman -+ * tables. - */ --void subdivide(gr_info *cod_info, shine_global_config *config) --{ -- static const struct -- { -+void subdivide(gr_info *cod_info, shine_global_config *config) { -+ static const struct { - unsigned region0_count; - unsigned region1_count; -- } subdv_table[ 23 ] = -- { -- {0, 0}, /* 0 bands */ -- {0, 0}, /* 1 bands */ -- {0, 0}, /* 2 bands */ -- {0, 0}, /* 3 bands */ -- {0, 0}, /* 4 bands */ -- {0, 1}, /* 5 bands */ -- {1, 1}, /* 6 bands */ -- {1, 1}, /* 7 bands */ -- {1, 2}, /* 8 bands */ -- {2, 2}, /* 9 bands */ -- {2, 3}, /* 10 bands */ -- {2, 3}, /* 11 bands */ -- {3, 4}, /* 12 bands */ -- {3, 4}, /* 13 bands */ -- {3, 4}, /* 14 bands */ -- {4, 5}, /* 15 bands */ -- {4, 5}, /* 16 bands */ -- {4, 6}, /* 17 bands */ -- {5, 6}, /* 18 bands */ -- {5, 6}, /* 19 bands */ -- {5, 7}, /* 20 bands */ -- {6, 7}, /* 21 bands */ -- {6, 7}, /* 22 bands */ -+ } subdv_table[23] = { -+ {0, 0}, /* 0 bands */ -+ {0, 0}, /* 1 bands */ -+ {0, 0}, /* 2 bands */ -+ {0, 0}, /* 3 bands */ -+ {0, 0}, /* 4 bands */ -+ {0, 1}, /* 5 bands */ -+ {1, 1}, /* 6 bands */ -+ {1, 1}, /* 7 bands */ -+ {1, 2}, /* 8 bands */ -+ {2, 2}, /* 9 bands */ -+ {2, 3}, /* 10 bands */ -+ {2, 3}, /* 11 bands */ -+ {3, 4}, /* 12 bands */ -+ {3, 4}, /* 13 bands */ -+ {3, 4}, /* 14 bands */ -+ {4, 5}, /* 15 bands */ -+ {4, 5}, /* 16 bands */ -+ {4, 6}, /* 17 bands */ -+ {5, 6}, /* 18 bands */ -+ {5, 6}, /* 19 bands */ -+ {5, 7}, /* 20 bands */ -+ {6, 7}, /* 21 bands */ -+ {6, 7}, /* 22 bands */ - }; - -- if (!cod_info->big_values) -- { /* no big_values region */ -+ if (!cod_info->big_values) { /* no big_values region */ - cod_info->region0_count = 0; - cod_info->region1_count = 0; -- } -- else -- { -- const int *scalefac_band_long = &shine_scale_fact_band_index[config->mpeg.samplerate_index][0]; -+ } else { -+ const int *scalefac_band_long = -+ &shine_scale_fact_band_index[config->mpeg.samplerate_index][0]; - int bigvalues_region, scfb_anz, thiscount; - - bigvalues_region = 2 * cod_info->big_values; - - /* Calculate scfb_anz */ - scfb_anz = 0; -- while ( scalefac_band_long[scfb_anz] < bigvalues_region ) -+ while (scalefac_band_long[scfb_anz] < bigvalues_region) - scfb_anz++; - -- for (thiscount = subdv_table[scfb_anz].region0_count; thiscount; thiscount--) { -+ for (thiscount = subdv_table[scfb_anz].region0_count; thiscount; -+ thiscount--) { - if (scalefac_band_long[thiscount + 1] <= bigvalues_region) - break; - } -@@ -571,7 +552,8 @@ void subdivide(gr_info *cod_info, shine_global_config *config) - - scalefac_band_long += cod_info->region0_count + 1; - -- for (thiscount = subdv_table[scfb_anz].region1_count; thiscount; thiscount--) { -+ for (thiscount = subdv_table[scfb_anz].region1_count; thiscount; -+ thiscount--) { - if (scalefac_band_long[thiscount + 1] <= bigvalues_region) - break; - } -@@ -587,21 +569,22 @@ void subdivide(gr_info *cod_info, shine_global_config *config) - * ---------------- - * Function: Select huffman code tables for bigvalues regions - */ --void bigv_tab_select( int ix[GRANULE_SIZE], gr_info *cod_info ) --{ -+void bigv_tab_select(int ix[GRANULE_SIZE], gr_info *cod_info) { - cod_info->table_select[0] = 0; - cod_info->table_select[1] = 0; - cod_info->table_select[2] = 0; - - { -- if ( cod_info->address1 > 0 ) -- cod_info->table_select[0] = new_choose_table( ix, 0, cod_info->address1 ); -+ if (cod_info->address1 > 0) -+ cod_info->table_select[0] = new_choose_table(ix, 0, cod_info->address1); - -- if ( cod_info->address2 > cod_info->address1 ) -- cod_info->table_select[1] = new_choose_table( ix, cod_info->address1, cod_info->address2 ); -+ if (cod_info->address2 > cod_info->address1) -+ cod_info->table_select[1] = -+ new_choose_table(ix, cod_info->address1, cod_info->address2); - -- if ( cod_info->big_values<<1 > cod_info->address2 ) -- cod_info->table_select[2] = new_choose_table( ix, cod_info->address2, cod_info->big_values<<1 ); -+ if (cod_info->big_values << 1 > cod_info->address2) -+ cod_info->table_select[2] = -+ new_choose_table(ix, cod_info->address2, cod_info->big_values << 1); - } - } - -@@ -614,98 +597,89 @@ void bigv_tab_select( int ix[GRANULE_SIZE], gr_info *cod_info ) - * of the Huffman tables as defined in the IS (Table B.7), and will not work - * with any arbitrary tables. - */ --int new_choose_table( int ix[GRANULE_SIZE], unsigned int begin, unsigned int end ) --{ -+int new_choose_table(int ix[GRANULE_SIZE], unsigned int begin, -+ unsigned int end) { - int i, max; - int choice[2]; - int sum[2]; - -- max = ix_max(ix,begin,end); -- if(!max) -+ max = ix_max(ix, begin, end); -+ if (!max) - return 0; - - choice[0] = 0; - choice[1] = 0; - -- if(max<15) -- { -+ if (max < 15) { - /* try tables with no linbits */ -- for ( i =14; i--; ) -- if ( shine_huffman_table[i].xlen > max ) -- { -+ for (i = 14; i--;) -+ if (shine_huffman_table[i].xlen > max) { - choice[0] = i; - break; - } - -- sum[0] = count_bit( ix, begin, end, choice[0] ); -+ sum[0] = count_bit(ix, begin, end, choice[0]); - -- switch (choice[0]) -- { -- case 2: -- sum[1] = count_bit( ix, begin, end, 3 ); -- if ( sum[1] <= sum[0] ) -- choice[0] = 3; -- break; -+ switch (choice[0]) { -+ case 2: -+ sum[1] = count_bit(ix, begin, end, 3); -+ if (sum[1] <= sum[0]) -+ choice[0] = 3; -+ break; - -- case 5: -- sum[1] = count_bit( ix, begin, end, 6 ); -- if ( sum[1] <= sum[0] ) -- choice[0] = 6; -- break; -+ case 5: -+ sum[1] = count_bit(ix, begin, end, 6); -+ if (sum[1] <= sum[0]) -+ choice[0] = 6; -+ break; - -- case 7: -- sum[1] = count_bit( ix, begin, end, 8 ); -- if ( sum[1] <= sum[0] ) -- { -- choice[0] = 8; -- sum[0] = sum[1]; -- } -- sum[1] = count_bit( ix, begin, end, 9 ); -- if ( sum[1] <= sum[0] ) -- choice[0] = 9; -- break; -+ case 7: -+ sum[1] = count_bit(ix, begin, end, 8); -+ if (sum[1] <= sum[0]) { -+ choice[0] = 8; -+ sum[0] = sum[1]; -+ } -+ sum[1] = count_bit(ix, begin, end, 9); -+ if (sum[1] <= sum[0]) -+ choice[0] = 9; -+ break; - -- case 10: -- sum[1] = count_bit( ix, begin, end, 11 ); -- if ( sum[1] <= sum[0] ) -- { -- choice[0] = 11; -- sum[0] = sum[1]; -- } -- sum[1] = count_bit( ix, begin, end, 12 ); -- if ( sum[1] <= sum[0] ) -- choice[0] = 12; -- break; -+ case 10: -+ sum[1] = count_bit(ix, begin, end, 11); -+ if (sum[1] <= sum[0]) { -+ choice[0] = 11; -+ sum[0] = sum[1]; -+ } -+ sum[1] = count_bit(ix, begin, end, 12); -+ if (sum[1] <= sum[0]) -+ choice[0] = 12; -+ break; - -- case 13: -- sum[1] = count_bit( ix, begin, end, 15 ); -- if ( sum[1] <= sum[0] ) -- choice[0] = 15; -- break; -+ case 13: -+ sum[1] = count_bit(ix, begin, end, 15); -+ if (sum[1] <= sum[0]) -+ choice[0] = 15; -+ break; - } -- } -- else -- { -+ } else { - /* try tables with linbits */ - max -= 15; - -- for(i=15;i<24;i++) -- if(shine_huffman_table[i].linmax>=max) -- { -+ for (i = 15; i < 24; i++) -+ if (shine_huffman_table[i].linmax >= max) { - choice[0] = i; - break; - } - -- for(i=24;i<32;i++) -- if(shine_huffman_table[i].linmax>=max) -- { -+ for (i = 24; i < 32; i++) -+ if (shine_huffman_table[i].linmax >= max) { - choice[1] = i; - break; - } - -- sum[0] = count_bit(ix,begin,end,choice[0]); -- sum[1] = count_bit(ix,begin,end,choice[1]); -- if (sum[1]<sum[0]) -+ sum[0] = count_bit(ix, begin, end, choice[0]); -+ sum[1] = count_bit(ix, begin, end, choice[1]); -+ if (sum[1] < sum[0]) - choice[0] = choice[1]; - } - return choice[0]; -@@ -716,17 +690,16 @@ int new_choose_table( int ix[GRANULE_SIZE], unsigned int begin, unsigned int end - * -------------- - * Function: Count the number of bits necessary to code the bigvalues region. - */ --int bigv_bitcount(int ix[GRANULE_SIZE], gr_info *gi) --{ -+int bigv_bitcount(int ix[GRANULE_SIZE], gr_info *gi) { - int bits = 0; - unsigned int table; - -- if( (table=gi->table_select[0])) /* region0 */ -- bits += count_bit(ix, 0, gi->address1, table ); -- if( (table=gi->table_select[1])) /* region1 */ -- bits += count_bit(ix, gi->address1, gi->address2, table ); -- if( (table=gi->table_select[2])) /* region2 */ -- bits += count_bit(ix, gi->address2, gi->address3, table ); -+ if ((table = gi->table_select[0])) /* region0 */ -+ bits += count_bit(ix, 0, gi->address1, table); -+ if ((table = gi->table_select[1])) /* region1 */ -+ bits += count_bit(ix, gi->address1, gi->address2, table); -+ if ((table = gi->table_select[2])) /* region2 */ -+ bits += count_bit(ix, gi->address2, gi->address3, table); - return bits; - } - -@@ -735,61 +708,51 @@ int bigv_bitcount(int ix[GRANULE_SIZE], gr_info *gi) - * ---------- - * Function: Count the number of bits necessary to code the subregion. - */ --int count_bit(int ix[GRANULE_SIZE], -- unsigned int start, -- unsigned int end, -- unsigned int table ) --{ -- unsigned linbits, ylen; -- register int i, sum; -- register int x,y; -+int count_bit(int ix[GRANULE_SIZE], unsigned int start, unsigned int end, -+ unsigned int table) { -+ unsigned linbits, ylen; -+ register int i, sum; -+ register int x, y; - const struct huffcodetab *h; - -- if(!table) -+ if (!table) - return 0; - -- h = &(shine_huffman_table[table]); -+ h = &(shine_huffman_table[table]); - sum = 0; - -- ylen = h->ylen; -+ ylen = h->ylen; - linbits = h->linbits; - -- if(table>15) -- { /* ESC-table is used */ -- for(i=start;i<end;i+=2) -- { -+ if (table > 15) { /* ESC-table is used */ -+ for (i = start; i < end; i += 2) { - x = ix[i]; -- y = ix[i+1]; -- if(x>14) -- { -+ y = ix[i + 1]; -+ if (x > 14) { - x = 15; - sum += linbits; - } -- if(y>14) -- { -+ if (y > 14) { - y = 15; - sum += linbits; - } - -- sum += h->hlen[(x*ylen)+y]; -- if(x) -+ sum += h->hlen[(x * ylen) + y]; -+ if (x) - sum++; -- if(y) -+ if (y) - sum++; - } -- } -- else -- { /* No ESC-words */ -- for(i=start;i<end;i+=2) -- { -+ } else { /* No ESC-words */ -+ for (i = start; i < end; i += 2) { - x = ix[i]; -- y = ix[i+1]; -+ y = ix[i + 1]; - -- sum += h->hlen[(x*ylen)+y]; -+ sum += h->hlen[(x * ylen) + y]; - -- if(x!=0) -+ if (x != 0) - sum++; -- if(y!=0) -+ if (y != 0) - sum++; - } - } -@@ -809,20 +772,18 @@ int count_bit(int ix[GRANULE_SIZE], - * returns a good starting quantizerStepSize. - */ - int bin_search_StepSize(int desired_rate, int ix[GRANULE_SIZE], -- gr_info * cod_info, shine_global_config *config) --{ -+ gr_info *cod_info, shine_global_config *config) { - int bit, next, count; - -- next = -120; -+ next = -120; - count = 120; - - do { - int half = count / 2; - - if (quantize(ix, next + half, config) > 8192) -- bit = 100000; /* fail */ -- else -- { -+ bit = 100000; /* fail */ -+ else { - calc_runlen(ix, cod_info); /* rzero,count1,big_values */ - bit = count1_bitcount(ix, cod_info); /* count1_table selection */ - subdivide(cod_info, config); /* bigvalues sfb division */ -@@ -832,8 +793,7 @@ int bin_search_StepSize(int desired_rate, int ix[GRANULE_SIZE], - - if (bit < desired_rate) - count = half; -- else -- { -+ else { - next += half; - count -= half; - } -diff --git a/src/lib/l3loop.h b/src/lib/l3loop.h -index 0e71a91..94ecea3 100644 ---- a/src/lib/l3loop.h -+++ b/src/lib/l3loop.h -@@ -1,9 +1,10 @@ - #ifndef L3LOOP_H - #define L3LOOP_H - -+#include "types.h" -+ - void shine_loop_initialise(shine_global_config *config); - - void shine_iteration_loop(shine_global_config *config); - - #endif -- -diff --git a/src/lib/l3mdct.c b/src/lib/l3mdct.c -index 7553a54..a76b702 100644 ---- a/src/lib/l3mdct.c -+++ b/src/lib/l3mdct.c -@@ -1,88 +1,87 @@ - /* L3mdct */ - --#include "types.h" - #include "l3mdct.h" - #include "l3subband.h" -+#include "types.h" - - /* This is table B.9: coefficients for aliasing reduction */ --#define MDCT_CA(coef) (int32_t)(coef / sqrt(1.0 + (coef * coef)) * 0x7fffffff) --#define MDCT_CS(coef) (int32_t)(1.0 / sqrt(1.0 + (coef * coef)) * 0x7fffffff) -+#define MDCT_CA(coef) (int32_t)(coef / sqrt(1.0 + (coef * coef)) * 0x7fffffff) -+#define MDCT_CS(coef) (int32_t)(1.0 / sqrt(1.0 + (coef * coef)) * 0x7fffffff) - --#define MDCT_CA0 MDCT_CA(-0.6) --#define MDCT_CA1 MDCT_CA(-0.535) --#define MDCT_CA2 MDCT_CA(-0.33) --#define MDCT_CA3 MDCT_CA(-0.185) --#define MDCT_CA4 MDCT_CA(-0.095) --#define MDCT_CA5 MDCT_CA(-0.041) --#define MDCT_CA6 MDCT_CA(-0.0142) --#define MDCT_CA7 MDCT_CA(-0.0037) -+#define MDCT_CA0 MDCT_CA(-0.6) -+#define MDCT_CA1 MDCT_CA(-0.535) -+#define MDCT_CA2 MDCT_CA(-0.33) -+#define MDCT_CA3 MDCT_CA(-0.185) -+#define MDCT_CA4 MDCT_CA(-0.095) -+#define MDCT_CA5 MDCT_CA(-0.041) -+#define MDCT_CA6 MDCT_CA(-0.0142) -+#define MDCT_CA7 MDCT_CA(-0.0037) - --#define MDCT_CS0 MDCT_CS(-0.6) --#define MDCT_CS1 MDCT_CS(-0.535) --#define MDCT_CS2 MDCT_CS(-0.33) --#define MDCT_CS3 MDCT_CS(-0.185) --#define MDCT_CS4 MDCT_CS(-0.095) --#define MDCT_CS5 MDCT_CS(-0.041) --#define MDCT_CS6 MDCT_CS(-0.0142) --#define MDCT_CS7 MDCT_CS(-0.0037) -+#define MDCT_CS0 MDCT_CS(-0.6) -+#define MDCT_CS1 MDCT_CS(-0.535) -+#define MDCT_CS2 MDCT_CS(-0.33) -+#define MDCT_CS3 MDCT_CS(-0.185) -+#define MDCT_CS4 MDCT_CS(-0.095) -+#define MDCT_CS5 MDCT_CS(-0.041) -+#define MDCT_CS6 MDCT_CS(-0.0142) -+#define MDCT_CS7 MDCT_CS(-0.0037) - - /* - * shine_mdct_initialise: - * ------------------- - */ --void shine_mdct_initialise(shine_global_config *config) --{ -- int m,k; -+void shine_mdct_initialise(shine_global_config *config) { -+ int m, k; - - /* prepare the mdct coefficients */ -- for(m=18; m--; ) -- for(k=36; k--; ) -+ for (m = 18; m--;) -+ for (k = 36; k--;) - /* combine window and mdct coefficients into a single table */ - /* scale and convert to fixed point before storing */ -- config->mdct.cos_l[m][k] = (int32_t)(sin(PI36*(k+0.5)) -- * cos((PI/72)*(2*k+19)*(2*m+1)) * 0x7fffffff); -+ config->mdct.cos_l[m][k] = -+ (int32_t)(sin(PI36 * (k + 0.5)) * -+ cos((PI / 72) * (2 * k + 19) * (2 * m + 1)) * 0x7fffffff); - } - - /* - * shine_mdct_sub: - * ------------ - */ --void shine_mdct_sub(shine_global_config *config, int stride) --{ -+void shine_mdct_sub(shine_global_config *config, int stride) { - /* note. we wish to access the array 'config->mdct_freq[2][2][576]' as - * [2][2][32][18]. (32*18=576), - */ -- int32_t (*mdct_enc)[18]; -+ int32_t(*mdct_enc)[18]; - -- int ch,gr,band,j,k; -+ int ch, gr, band, j, k; - int32_t mdct_in[36]; - -- for(ch=config->wave.channels; ch--; ) -- { -- for(gr=0; gr<config->mpeg.granules_per_frame; gr++) -- { -+ for (ch = config->wave.channels; ch--;) { -+ for (gr = 0; gr < config->mpeg.granules_per_frame; gr++) { - /* set up pointer to the part of config->mdct_freq we're using */ -- mdct_enc = (int32_t (*)[18]) config->mdct_freq[ch][gr]; -+ mdct_enc = (int32_t(*)[18])config->mdct_freq[ch][gr]; - - /* polyphase filtering */ -- for(k=0; k<18; k+=2) -- { -- shine_window_filter_subband(&config->buffer[ch], &config->l3_sb_sample[ch][gr+1][k ][0], ch, config, stride); -- shine_window_filter_subband(&config->buffer[ch], &config->l3_sb_sample[ch][gr+1][k+1][0], ch, config, stride); -+ for (k = 0; k < 18; k += 2) { -+ shine_window_filter_subband(&config->buffer[ch], -+ &config->l3_sb_sample[ch][gr + 1][k][0], ch, -+ config, stride); -+ shine_window_filter_subband(&config->buffer[ch], -+ &config->l3_sb_sample[ch][gr + 1][k + 1][0], -+ ch, config, stride); - /* Compensate for inversion in the analysis filter - * (every odd index of band AND k) - */ -- for(band=1; band<32; band+=2) -- config->l3_sb_sample[ch][gr+1][k+1][band] *= -1; -+ for (band = 1; band < 32; band += 2) -+ config->l3_sb_sample[ch][gr + 1][k + 1][band] *= -1; - } - -- /* Perform imdct of 18 previous subband samples + 18 current subband samples */ -- for(band=0; band<32; band++) -- { -- for(k=18; k--; ) -- { -- mdct_in[k ] = config->l3_sb_sample[ch][gr ][k][band]; -- mdct_in[k+18] = config->l3_sb_sample[ch][gr+1][k][band]; -+ /* Perform imdct of 18 previous subband samples + 18 current subband -+ * samples */ -+ for (band = 0; band < 32; band++) { -+ for (k = 18; k--;) { -+ mdct_in[k] = config->l3_sb_sample[ch][gr][k][band]; -+ mdct_in[k + 18] = config->l3_sb_sample[ch][gr + 1][k][band]; - } - - /* Calculation of the MDCT -@@ -90,41 +89,61 @@ void shine_mdct_sub(shine_global_config *config, int stride) - * 36 coefficients in the time domain and 18 in the frequency - * domain. - */ -- for(k=18; k--; ) -- { -+ for (k = 18; k--;) { - int32_t vm; -+#ifdef __BORLANDC__ -+ uint32_t vm_lo; -+#else - uint32_t vm_lo __attribute__((unused)); -+#endif - - mul0(vm, vm_lo, mdct_in[35], config->mdct.cos_l[k][35]); -- for(j=35; j; j-=7) { -- muladd(vm, vm_lo, mdct_in[j-1], config->mdct.cos_l[k][j-1]); -- muladd(vm, vm_lo, mdct_in[j-2], config->mdct.cos_l[k][j-2]); -- muladd(vm, vm_lo, mdct_in[j-3], config->mdct.cos_l[k][j-3]); -- muladd(vm, vm_lo, mdct_in[j-4], config->mdct.cos_l[k][j-4]); -- muladd(vm, vm_lo, mdct_in[j-5], config->mdct.cos_l[k][j-5]); -- muladd(vm, vm_lo, mdct_in[j-6], config->mdct.cos_l[k][j-6]); -- muladd(vm, vm_lo, mdct_in[j-7], config->mdct.cos_l[k][j-7]); -+ for (j = 35; j; j -= 7) { -+ muladd(vm, vm_lo, mdct_in[j - 1], config->mdct.cos_l[k][j - 1]); -+ muladd(vm, vm_lo, mdct_in[j - 2], config->mdct.cos_l[k][j - 2]); -+ muladd(vm, vm_lo, mdct_in[j - 3], config->mdct.cos_l[k][j - 3]); -+ muladd(vm, vm_lo, mdct_in[j - 4], config->mdct.cos_l[k][j - 4]); -+ muladd(vm, vm_lo, mdct_in[j - 5], config->mdct.cos_l[k][j - 5]); -+ muladd(vm, vm_lo, mdct_in[j - 6], config->mdct.cos_l[k][j - 6]); -+ muladd(vm, vm_lo, mdct_in[j - 7], config->mdct.cos_l[k][j - 7]); - } - mulz(vm, vm_lo); - mdct_enc[band][k] = vm; - } - - /* Perform aliasing reduction butterfly */ -- if (band != 0) -- { -- cmuls(mdct_enc[band][0], mdct_enc[band-1][17-0], mdct_enc[band][0], mdct_enc[band-1][17-0], MDCT_CS0, MDCT_CA0); -- cmuls(mdct_enc[band][1], mdct_enc[band-1][17-1], mdct_enc[band][1], mdct_enc[band-1][17-1], MDCT_CS1, MDCT_CA1); -- cmuls(mdct_enc[band][2], mdct_enc[band-1][17-2], mdct_enc[band][2], mdct_enc[band-1][17-2], MDCT_CS2, MDCT_CA2); -- cmuls(mdct_enc[band][3], mdct_enc[band-1][17-3], mdct_enc[band][3], mdct_enc[band-1][17-3], MDCT_CS3, MDCT_CA3); -- cmuls(mdct_enc[band][4], mdct_enc[band-1][17-4], mdct_enc[band][4], mdct_enc[band-1][17-4], MDCT_CS4, MDCT_CA4); -- cmuls(mdct_enc[band][5], mdct_enc[band-1][17-5], mdct_enc[band][5], mdct_enc[band-1][17-5], MDCT_CS5, MDCT_CA5); -- cmuls(mdct_enc[band][6], mdct_enc[band-1][17-6], mdct_enc[band][6], mdct_enc[band-1][17-6], MDCT_CS6, MDCT_CA6); -- cmuls(mdct_enc[band][7], mdct_enc[band-1][17-7], mdct_enc[band][7], mdct_enc[band-1][17-7], MDCT_CS7, MDCT_CA7); -+ if (band != 0) { -+ cmuls(mdct_enc[band][0], mdct_enc[band - 1][17 - 0], -+ mdct_enc[band][0], mdct_enc[band - 1][17 - 0], MDCT_CS0, -+ MDCT_CA0); -+ cmuls(mdct_enc[band][1], mdct_enc[band - 1][17 - 1], -+ mdct_enc[band][1], mdct_enc[band - 1][17 - 1], MDCT_CS1, -+ MDCT_CA1); -+ cmuls(mdct_enc[band][2], mdct_enc[band - 1][17 - 2], -+ mdct_enc[band][2], mdct_enc[band - 1][17 - 2], MDCT_CS2, -+ MDCT_CA2); -+ cmuls(mdct_enc[band][3], mdct_enc[band - 1][17 - 3], -+ mdct_enc[band][3], mdct_enc[band - 1][17 - 3], MDCT_CS3, -+ MDCT_CA3); -+ cmuls(mdct_enc[band][4], mdct_enc[band - 1][17 - 4], -+ mdct_enc[band][4], mdct_enc[band - 1][17 - 4], MDCT_CS4, -+ MDCT_CA4); -+ cmuls(mdct_enc[band][5], mdct_enc[band - 1][17 - 5], -+ mdct_enc[band][5], mdct_enc[band - 1][17 - 5], MDCT_CS5, -+ MDCT_CA5); -+ cmuls(mdct_enc[band][6], mdct_enc[band - 1][17 - 6], -+ mdct_enc[band][6], mdct_enc[band - 1][17 - 6], MDCT_CS6, -+ MDCT_CA6); -+ cmuls(mdct_enc[band][7], mdct_enc[band - 1][17 - 7], -+ mdct_enc[band][7], mdct_enc[band - 1][17 - 7], MDCT_CS7, -+ MDCT_CA7); - } - } - } - - /* Save latest granule's subband samples to be used in the next mdct call */ -- memcpy(config->l3_sb_sample[ch][0], config->l3_sb_sample[ch][config->mpeg.granules_per_frame], sizeof(config->l3_sb_sample[0][0])); -+ memcpy(config->l3_sb_sample[ch][0], -+ config->l3_sb_sample[ch][config->mpeg.granules_per_frame], -+ sizeof(config->l3_sb_sample[0][0])); - } - } -diff --git a/src/lib/l3mdct.h b/src/lib/l3mdct.h -index 1288259..3018eb9 100644 ---- a/src/lib/l3mdct.h -+++ b/src/lib/l3mdct.h -@@ -1,7 +1,9 @@ - #ifndef shine_MDCT_H - #define shine_MDCT_H - --void shine_mdct_initialise(); -+#include "types.h" -+ -+void shine_mdct_initialise(shine_global_config *config); - void shine_mdct_sub(shine_global_config *config, int stride); - - #endif -diff --git a/src/lib/l3subband.c b/src/lib/l3subband.c -index 58abf5f..78f428e 100644 ---- a/src/lib/l3subband.c -+++ b/src/lib/l3subband.c -@@ -1,8 +1,8 @@ - /* L3SubBand */ - --#include "types.h" --#include "tables.h" - #include "l3subband.h" -+#include "tables.h" -+#include "types.h" - - /* - * shine_subband_initialise: -@@ -11,23 +11,21 @@ - * 9th decimal place accuracy of the filterbank tables in the ISO - * document. The coefficients are stored in #filter# - */ --void shine_subband_initialise(shine_global_config *config) --{ -- int i,j; -+void shine_subband_initialise(shine_global_config *config) { -+ int i, j; - double filter; - -- for(i=MAX_CHANNELS; i-- ; ) { -+ for (i = MAX_CHANNELS; i--;) { - config->subband.off[i] = 0; - memset(config->subband.x[i], 0, sizeof(config->subband.x[i])); - } - -- for (i=SBLIMIT; i--; ) -- for (j=64; j--; ) -- { -- if ((filter = 1e9*cos((double)((2*i+1)*(16-j)*PI64))) >= 0) -- modf(filter+0.5, &filter); -+ for (i = SBLIMIT; i--;) -+ for (j = 64; j--;) { -+ if ((filter = 1e9 * cos((double)((2 * i + 1) * (16 - j) * PI64))) >= 0) -+ modf(filter + 0.5, &filter); - else -- modf(filter-0.5, &filter); -+ modf(filter - 0.5, &filter); - /* scale and convert to fixed point before storing */ - config->subband.fl[i][j] = (int32_t)(filter * (0x7fffffff * 1e-9)); - } -@@ -39,58 +37,90 @@ void shine_subband_initialise(shine_global_config *config) - * Overlapping window on PCM samples - * 32 16-bit pcm samples are scaled to fractional 2's complement and - * concatenated to the end of the window buffer #x#. The updated window -- * buffer #x# is then windowed by the analysis window #shine_enwindow# to produce -- * the windowed sample #z# -- * Calculates the analysis filter bank coefficients -- * The windowed samples #z# is filtered by the digital filter matrix #filter# -- * to produce the subband samples #s#. This done by first selectively -- * picking out values from the windowed samples, and then multiplying -- * them by the filter matrix, producing 32 subband samples. -+ * buffer #x# is then windowed by the analysis window #shine_enwindow# to -+ * produce the windowed sample #z# Calculates the analysis filter bank -+ * coefficients The windowed samples #z# is filtered by the digital filter -+ * matrix #filter# to produce the subband samples #s#. This done by first -+ * selectively picking out values from the windowed samples, and then -+ * multiplying them by the filter matrix, producing 32 subband samples. - */ --void shine_window_filter_subband(int16_t **buffer, int32_t s[SBLIMIT], int ch, shine_global_config *config, int stride) --{ -+void shine_window_filter_subband(int16_t **buffer, int32_t s[SBLIMIT], int ch, -+ shine_global_config *config, int stride) { - int32_t y[64]; -- int i,j; -+ int i, j; - int16_t *ptr = *buffer; - - /* replace 32 oldest samples with 32 new samples */ -- for (i=32;i--;) { -- config->subband.x[ch][i+config->subband.off[ch]] = ((int32_t)*ptr) << 16; -+ for (i = 32; i--;) { -+ config->subband.x[ch][i + config->subband.off[ch]] = ((int32_t)*ptr) << 16; - ptr += stride; - } - *buffer = ptr; - -- for (i=64; i--; ) { -+ for (i = 64; i--;) { - int32_t s_value; -+#ifdef __BORLANDC__ -+ uint32_t s_value_lo; -+#else - uint32_t s_value_lo __attribute__((unused)); -+#endif - -- mul0 (s_value, s_value_lo, config->subband.x[ch][(config->subband.off[ch] + i + (0<<6)) & (HAN_SIZE-1)], shine_enwindow[i + (0<<6)]); -- muladd(s_value, s_value_lo, config->subband.x[ch][(config->subband.off[ch] + i + (1<<6)) & (HAN_SIZE-1)], shine_enwindow[i + (1<<6)]); -- muladd(s_value, s_value_lo, config->subband.x[ch][(config->subband.off[ch] + i + (2<<6)) & (HAN_SIZE-1)], shine_enwindow[i + (2<<6)]); -- muladd(s_value, s_value_lo, config->subband.x[ch][(config->subband.off[ch] + i + (3<<6)) & (HAN_SIZE-1)], shine_enwindow[i + (3<<6)]); -- muladd(s_value, s_value_lo, config->subband.x[ch][(config->subband.off[ch] + i + (4<<6)) & (HAN_SIZE-1)], shine_enwindow[i + (4<<6)]); -- muladd(s_value, s_value_lo, config->subband.x[ch][(config->subband.off[ch] + i + (5<<6)) & (HAN_SIZE-1)], shine_enwindow[i + (5<<6)]); -- muladd(s_value, s_value_lo, config->subband.x[ch][(config->subband.off[ch] + i + (6<<6)) & (HAN_SIZE-1)], shine_enwindow[i + (6<<6)]); -- muladd(s_value, s_value_lo, config->subband.x[ch][(config->subband.off[ch] + i + (7<<6)) & (HAN_SIZE-1)], shine_enwindow[i + (7<<6)]); -- mulz (s_value, s_value_lo); -+ mul0(s_value, s_value_lo, -+ config->subband -+ .x[ch][(config->subband.off[ch] + i + (0 << 6)) & (HAN_SIZE - 1)], -+ shine_enwindow[i + (0 << 6)]); -+ muladd(s_value, s_value_lo, -+ config->subband.x[ch][(config->subband.off[ch] + i + (1 << 6)) & -+ (HAN_SIZE - 1)], -+ shine_enwindow[i + (1 << 6)]); -+ muladd(s_value, s_value_lo, -+ config->subband.x[ch][(config->subband.off[ch] + i + (2 << 6)) & -+ (HAN_SIZE - 1)], -+ shine_enwindow[i + (2 << 6)]); -+ muladd(s_value, s_value_lo, -+ config->subband.x[ch][(config->subband.off[ch] + i + (3 << 6)) & -+ (HAN_SIZE - 1)], -+ shine_enwindow[i + (3 << 6)]); -+ muladd(s_value, s_value_lo, -+ config->subband.x[ch][(config->subband.off[ch] + i + (4 << 6)) & -+ (HAN_SIZE - 1)], -+ shine_enwindow[i + (4 << 6)]); -+ muladd(s_value, s_value_lo, -+ config->subband.x[ch][(config->subband.off[ch] + i + (5 << 6)) & -+ (HAN_SIZE - 1)], -+ shine_enwindow[i + (5 << 6)]); -+ muladd(s_value, s_value_lo, -+ config->subband.x[ch][(config->subband.off[ch] + i + (6 << 6)) & -+ (HAN_SIZE - 1)], -+ shine_enwindow[i + (6 << 6)]); -+ muladd(s_value, s_value_lo, -+ config->subband.x[ch][(config->subband.off[ch] + i + (7 << 6)) & -+ (HAN_SIZE - 1)], -+ shine_enwindow[i + (7 << 6)]); -+ mulz(s_value, s_value_lo); - y[i] = s_value; - } - -- config->subband.off[ch] = (config->subband.off[ch] + 480) & (HAN_SIZE-1); /* offset is modulo (HAN_SIZE)*/ -+ config->subband.off[ch] = (config->subband.off[ch] + 480) & -+ (HAN_SIZE - 1); /* offset is modulo (HAN_SIZE)*/ - -- for (i=SBLIMIT; i--; ) { -+ for (i = SBLIMIT; i--;) { - int32_t s_value; -+#ifdef __BORLANDC__ -+ uint32_t s_value_lo; -+#else - uint32_t s_value_lo __attribute__((unused)); -+#endif - - mul0(s_value, s_value_lo, config->subband.fl[i][63], y[63]); -- for (j=63; j; j-=7) { -- muladd(s_value, s_value_lo, config->subband.fl[i][j-1], y[j-1]); -- muladd(s_value, s_value_lo, config->subband.fl[i][j-2], y[j-2]); -- muladd(s_value, s_value_lo, config->subband.fl[i][j-3], y[j-3]); -- muladd(s_value, s_value_lo, config->subband.fl[i][j-4], y[j-4]); -- muladd(s_value, s_value_lo, config->subband.fl[i][j-5], y[j-5]); -- muladd(s_value, s_value_lo, config->subband.fl[i][j-6], y[j-6]); -- muladd(s_value, s_value_lo, config->subband.fl[i][j-7], y[j-7]); -+ for (j = 63; j; j -= 7) { -+ muladd(s_value, s_value_lo, config->subband.fl[i][j - 1], y[j - 1]); -+ muladd(s_value, s_value_lo, config->subband.fl[i][j - 2], y[j - 2]); -+ muladd(s_value, s_value_lo, config->subband.fl[i][j - 3], y[j - 3]); -+ muladd(s_value, s_value_lo, config->subband.fl[i][j - 4], y[j - 4]); -+ muladd(s_value, s_value_lo, config->subband.fl[i][j - 5], y[j - 5]); -+ muladd(s_value, s_value_lo, config->subband.fl[i][j - 6], y[j - 6]); -+ muladd(s_value, s_value_lo, config->subband.fl[i][j - 7], y[j - 7]); - } - mulz(s_value, s_value_lo); - s[i] = s_value; -diff --git a/src/lib/l3subband.h b/src/lib/l3subband.h -index 9bfe861..5cfbef5 100644 ---- a/src/lib/l3subband.h -+++ b/src/lib/l3subband.h -@@ -1,9 +1,11 @@ - #ifndef L3SUBBAND_H - #define L3SUBBAND_H - -+#include "types.h" - #include <stdint.h> - --void shine_subband_initialise( shine_global_config *config ); --void shine_window_filter_subband(int16_t **buffer, int32_t s[SBLIMIT], int k, shine_global_config *config, int stride); -+void shine_subband_initialise(shine_global_config *config); -+void shine_window_filter_subband(int16_t **buffer, int32_t s[SBLIMIT], int k, -+ shine_global_config *config, int stride); - - #endif -diff --git a/src/lib/layer3.c b/src/lib/layer3.c -index 0b574ad..f3d1ecd 100644 ---- a/src/lib/layer3.c -+++ b/src/lib/layer3.c -@@ -1,28 +1,27 @@ - /* layer3.c */ - --#include "types.h" --#include "tables.h" - #include "layer3.h" --#include "l3subband.h" --#include "l3mdct.h" --#include "l3loop.h" - #include "bitstream.h" - #include "l3bitstream.h" -+#include "l3loop.h" -+#include "l3mdct.h" -+#include "l3subband.h" -+#include "tables.h" -+#include "types.h" - - static int granules_per_frame[4] = { - 1, /* MPEG 2.5 */ -- -1, /* Reserved */ -+ -1, /* Reserved */ - 1, /* MPEG II */ -- 2 /* MPEG I */ -+ 2 /* MPEG I */ - }; - - /* Set default values for important vars */ --void shine_set_config_mpeg_defaults(shine_mpeg_t *mpeg) --{ -+void shine_set_config_mpeg_defaults(shine_mpeg_t *mpeg) { - mpeg->bitr = 128; - mpeg->emph = NONE; - mpeg->copyright = 0; -- mpeg->original = 1; -+ mpeg->original = 1; - } - - int shine_mpeg_version(int samplerate_index) { -@@ -38,56 +37,56 @@ int shine_mpeg_version(int samplerate_index) { - return MPEG_25; - } - --int shine_find_samplerate_index(int freq) --{ -+int shine_find_samplerate_index(int freq) { - int i; - -- for(i=0;i<9;i++) -- if(freq==samplerates[i]) return i; -+ for (i = 0; i < 9; i++) -+ if (freq == samplerates[i]) -+ return i; - - return -1; /* error - not a valid samplerate for encoder */ - } - --int shine_find_bitrate_index(int bitr, int mpeg_version) --{ -+int shine_find_bitrate_index(int bitr, int mpeg_version) { - int i; - -- for(i=0;i<16;i++) -- if(bitr==bitrates[i][mpeg_version]) return i; -+ for (i = 0; i < 16; i++) -+ if (bitr == bitrates[i][mpeg_version]) -+ return i; - - return -1; /* error - not a valid samplerate for encoder */ - } - --int shine_check_config(int freq, int bitr) --{ -+int shine_check_config(int freq, int bitr) { - int samplerate_index, bitrate_index, mpeg_version; - - samplerate_index = shine_find_samplerate_index(freq); -- if (samplerate_index < 0) return -1; -+ if (samplerate_index < 0) -+ return -1; - - mpeg_version = shine_mpeg_version(samplerate_index); - - bitrate_index = shine_find_bitrate_index(bitr, mpeg_version); -- if (bitrate_index < 0) return -1; -+ if (bitrate_index < 0) -+ return -1; - - return mpeg_version; - } - --int shine_samples_per_pass(shine_t s) --{ -+int shine_samples_per_pass(shine_t s) { - return s->mpeg.granules_per_frame * GRANULE_SIZE; - } - - /* Compute default encoding values. */ --shine_global_config *shine_initialise(shine_config_t *pub_config) --{ -+shine_global_config *shine_initialise(shine_config_t *pub_config) { - double avg_slots_per_frame; - shine_global_config *config; - -- if (shine_check_config(pub_config->wave.samplerate, pub_config->mpeg.bitr) < 0) -+ if (shine_check_config(pub_config->wave.samplerate, pub_config->mpeg.bitr) < -+ 0) - return NULL; - -- config = calloc(1,sizeof(shine_global_config)); -+ config = calloc(1, sizeof(shine_global_config)); - if (config == NULL) - return config; - -@@ -96,65 +95,71 @@ shine_global_config *shine_initialise(shine_config_t *pub_config) - shine_loop_initialise(config); - - /* Copy public config. */ -- config->wave.channels = pub_config->wave.channels; -- config->wave.samplerate = pub_config->wave.samplerate; -- config->mpeg.mode = pub_config->mpeg.mode; -- config->mpeg.bitr = pub_config->mpeg.bitr; -- config->mpeg.emph = pub_config->mpeg.emph; -- config->mpeg.copyright = pub_config->mpeg.copyright; -- config->mpeg.original = pub_config->mpeg.original; -+ config->wave.channels = pub_config->wave.channels; -+ config->wave.samplerate = pub_config->wave.samplerate; -+ config->mpeg.mode = pub_config->mpeg.mode; -+ config->mpeg.bitr = pub_config->mpeg.bitr; -+ config->mpeg.emph = pub_config->mpeg.emph; -+ config->mpeg.copyright = pub_config->mpeg.copyright; -+ config->mpeg.original = pub_config->mpeg.original; - - /* Set default values. */ -- config->ResvMax = 0; -- config->ResvSize = 0; -- config->mpeg.layer = LAYER_III; -- config->mpeg.crc = 0; -- config->mpeg.ext = 0; -- config->mpeg.mode_ext = 0; -- config->mpeg.bits_per_slot = 8; -- -- config->mpeg.samplerate_index = shine_find_samplerate_index(config->wave.samplerate); -- config->mpeg.version = shine_mpeg_version(config->mpeg.samplerate_index); -- config->mpeg.bitrate_index = shine_find_bitrate_index(config->mpeg.bitr, config->mpeg.version); -+ config->ResvMax = 0; -+ config->ResvSize = 0; -+ config->mpeg.layer = LAYER_III; -+ config->mpeg.crc = 0; -+ config->mpeg.ext = 0; -+ config->mpeg.mode_ext = 0; -+ config->mpeg.bits_per_slot = 8; -+ -+ config->mpeg.samplerate_index = -+ shine_find_samplerate_index(config->wave.samplerate); -+ config->mpeg.version = shine_mpeg_version(config->mpeg.samplerate_index); -+ config->mpeg.bitrate_index = -+ shine_find_bitrate_index(config->mpeg.bitr, config->mpeg.version); - config->mpeg.granules_per_frame = granules_per_frame[config->mpeg.version]; - - /* Figure average number of 'slots' per frame. */ -- avg_slots_per_frame = ((double)config->mpeg.granules_per_frame * GRANULE_SIZE / -- ((double)config->wave.samplerate)) * -- (1000*(double)config->mpeg.bitr / -- (double)config->mpeg.bits_per_slot); -+ avg_slots_per_frame = -+ ((double)config->mpeg.granules_per_frame * GRANULE_SIZE / -+ ((double)config->wave.samplerate)) * -+ (1000 * (double)config->mpeg.bitr / (double)config->mpeg.bits_per_slot); - -- config->mpeg.whole_slots_per_frame = (int)avg_slots_per_frame; -+ config->mpeg.whole_slots_per_frame = (int)avg_slots_per_frame; - -- config->mpeg.frac_slots_per_frame = avg_slots_per_frame - (double)config->mpeg.whole_slots_per_frame; -- config->mpeg.slot_lag = -config->mpeg.frac_slots_per_frame; -+ config->mpeg.frac_slots_per_frame = -+ avg_slots_per_frame - (double)config->mpeg.whole_slots_per_frame; -+ config->mpeg.slot_lag = -config->mpeg.frac_slots_per_frame; - -- if(config->mpeg.frac_slots_per_frame==0) -+ if (config->mpeg.frac_slots_per_frame == 0) - config->mpeg.padding = 0; - - shine_open_bit_stream(&config->bs, BUFFER_SIZE); - -- memset((char *)&config->side_info,0,sizeof(shine_side_info_t)); -+ memset((char *)&config->side_info, 0, sizeof(shine_side_info_t)); - - /* determine the mean bitrate for main data */ - if (config->mpeg.granules_per_frame == 2) /* MPEG 1 */ -- config->sideinfo_len = 8 * ((config->wave.channels==1) ? 4 + 17 : 4 + 32); -- else /* MPEG 2 */ -- config->sideinfo_len = 8 * ((config->wave.channels==1) ? 4 + 9 : 4 + 17); -+ config->sideinfo_len = 8 * ((config->wave.channels == 1) ? 4 + 17 : 4 + 32); -+ else /* MPEG 2 */ -+ config->sideinfo_len = 8 * ((config->wave.channels == 1) ? 4 + 9 : 4 + 17); - - return config; - } - --static unsigned char *shine_encode_buffer_internal(shine_global_config *config, int *written, int stride) --{ -- if(config->mpeg.frac_slots_per_frame) -- { -- config->mpeg.padding = (config->mpeg.slot_lag <= (config->mpeg.frac_slots_per_frame - 1.0)); -- config->mpeg.slot_lag += (config->mpeg.padding - config->mpeg.frac_slots_per_frame); -+static unsigned char *shine_encode_buffer_internal(shine_global_config *config, -+ int *written, int stride) { -+ if (config->mpeg.frac_slots_per_frame) { -+ config->mpeg.padding = -+ (config->mpeg.slot_lag <= (config->mpeg.frac_slots_per_frame - 1.0)); -+ config->mpeg.slot_lag += -+ (config->mpeg.padding - config->mpeg.frac_slots_per_frame); - } - -- config->mpeg.bits_per_frame = 8*(config->mpeg.whole_slots_per_frame + config->mpeg.padding); -- config->mean_bits = (config->mpeg.bits_per_frame - config->sideinfo_len)/config->mpeg.granules_per_frame; -+ config->mpeg.bits_per_frame = -+ 8 * (config->mpeg.whole_slots_per_frame + config->mpeg.padding); -+ config->mean_bits = (config->mpeg.bits_per_frame - config->sideinfo_len) / -+ config->mpeg.granules_per_frame; - - /* apply mdct to the polyphase output */ - shine_mdct_sub(config, stride); -@@ -172,8 +177,8 @@ static unsigned char *shine_encode_buffer_internal(shine_global_config *config, - return config->bs.data; - } - --unsigned char *shine_encode_buffer(shine_global_config *config, int16_t **data, int *written) --{ -+unsigned char *shine_encode_buffer(shine_global_config *config, int16_t **data, -+ int *written) { - config->buffer[0] = data[0]; - if (config->wave.channels == 2) - config->buffer[1] = data[1]; -@@ -181,8 +186,8 @@ unsigned char *shine_encode_buffer(shine_global_config *config, int16_t **data, - return shine_encode_buffer_internal(config, written, 1); - } - --unsigned char *shine_encode_buffer_interleaved(shine_global_config *config, int16_t *data, int *written) --{ -+unsigned char *shine_encode_buffer_interleaved(shine_global_config *config, -+ int16_t *data, int *written) { - config->buffer[0] = data; - if (config->wave.channels == 2) - config->buffer[1] = data + 1; -@@ -197,7 +202,6 @@ unsigned char *shine_flush(shine_global_config *config, int *written) { - return config->bs.data; - } - -- - void shine_close(shine_global_config *config) { - shine_close_bit_stream(&config->bs); - free(config); -diff --git a/src/lib/layer3.h b/src/lib/layer3.h -index 7fb11e0..d72b6a4 100644 ---- a/src/lib/layer3.h -+++ b/src/lib/layer3.h -@@ -5,48 +5,31 @@ - - /* This is the struct used to tell the encoder about the input PCM */ - --enum channels { -- PCM_MONO = 1, -- PCM_STEREO = 2 --}; -+enum channels { PCM_MONO = 1, PCM_STEREO = 2 }; - --enum mpeg_versions { -- MPEG_I = 3, -- MPEG_II = 2, -- MPEG_25 = 0 --}; -+enum mpeg_versions { MPEG_I = 3, MPEG_II = 2, MPEG_25 = 0 }; - - /* Only Layer III currently implemented. */ --enum mpeg_layers { -- LAYER_III = 1 --}; -+enum mpeg_layers { LAYER_III = 1 }; - - typedef struct { -- enum channels channels; -- int samplerate; -+ enum channels channels; -+ int samplerate; - } shine_wave_t; - --/* This is the struct the encoder uses to tell the encoder about the output MP3 */ -+/* This is the struct the encoder uses to tell the encoder about the output MP3 -+ */ - --enum modes { -- STEREO = 0, -- JOINT_STEREO = 1, -- DUAL_CHANNEL = 2, -- MONO = 3 --}; -+enum modes { STEREO = 0, JOINT_STEREO = 1, DUAL_CHANNEL = 2, MONO = 3 }; - --enum emph { -- NONE = 0, -- MU50_15 = 1, -- CITT = 3 --}; -+enum emph { NONE = 0, MU50_15 = 1, CITT = 3 }; - - typedef struct { -- enum modes mode; /* Stereo mode */ -- int bitr; /* Must conform to known bitrate */ -- enum emph emph; /* De-emphasis */ -- int copyright; -- int original; -+ enum modes mode; /* Stereo mode */ -+ int bitr; /* Must conform to known bitrate */ -+ enum emph emph; /* De-emphasis */ -+ int copyright; -+ int original; - } shine_mpeg_t; - - typedef struct { -@@ -60,7 +43,7 @@ typedef struct { - * const int samplerates[9] = { - * 44100, 48000, 32000, // MPEG-I - * 22050, 24000, 16000, // MPEG-II -- * 11025, 12000, 8000 // MPEG-2.5 -+ * 11025, 12000, 8000 // MPEG-2.5 - * }; - * - * const int bitrates[16][4] = { -@@ -92,37 +75,37 @@ typedef struct shine_global_flags *shine_t; - /* Fill in a `mpeg_t` structure with default values. */ - void shine_set_config_mpeg_defaults(shine_mpeg_t *mpeg); - --/* Check if a given bitrate is supported by the encoder (see `bitrates` above for a list -- * of acceptable values. */ -+/* Check if a given bitrate is supported by the encoder (see `bitrates` above -+ * for a list of acceptable values. */ - int shine_find_bitrate_index(int bitr, int mpeg_version); - --/* Check if a given samplerate is supported by the encoder (see `samplerates` above for a list -- * of acceptable values. */ -+/* Check if a given samplerate is supported by the encoder (see `samplerates` -+ * above for a list of acceptable values. */ - int shine_find_samplerate_index(int freq); - - /* Returns the MPEG version used for the given samplerate index. See above -- * `mpeg_versions` for a list of possible values. */ -+ * `mpeg_versions` for a list of possible values. */ - int shine_mpeg_version(int samplerate_index); - --/* Check if a given bitrate and samplerate is supported by the encoder (see `samplerates` -- * and `bitrates` above for a list of acceptable values). -+/* Check if a given bitrate and samplerate is supported by the encoder (see -+ * `samplerates` and `bitrates` above for a list of acceptable values). - * - * Returns -1 on error, mpeg_version on success. */ - int shine_check_config(int freq, int bitr); - - /* Pass a pointer to a `config_t` structure and returns an initialized -- * encoder. -+ * encoder. - * - * Configuration data is copied over to the encoder. It is not possible - * to change its values after initializing the encoder at the moment. - * -- * Checking for valid configuration values is left for the application to -- * implement. You can use the `shine_find_bitrate_index` and -- * `shine_find_samplerate_index` functions or the `bitrates` and -- * `samplerates` arrays above to check those parameters. Mone and stereo -+ * Checking for valid configuration values is left for the application to -+ * implement. You can use the `shine_find_bitrate_index` and -+ * `shine_find_samplerate_index` functions or the `bitrates` and -+ * `samplerates` arrays above to check those parameters. Mone and stereo - * mode for wave and mpeg should also be consistent with each other. - * -- * This function returns NULL if it was not able to allocate memory data for -+ * This function returns NULL if it was not able to allocate memory data for - * the encoder. */ - shine_t shine_initialise(shine_config_t *config); - -@@ -132,26 +115,28 @@ shine_t shine_initialise(shine_config_t *config); - /* Returns audio samples expected in each frame. */ - int shine_samples_per_pass(shine_t s); - --/* Encode audio data. Source data must have `shine_samples_per_pass(s)` audio samples per -- * channels. Mono encoder only expect one channel. -+/* Encode audio data. Source data must have `shine_samples_per_pass(s)` audio -+ * samples per channels. Mono encoder only expect one channel. - * -- * Returns a pointer to freshly encoded data while `written` contains the size of -- * available data. This pointer's memory is handled by the library and is only valid -- * until the next call to `shine_encode_buffer` or `shine_close` and may be NULL if no data -- * was written. */ -+ * Returns a pointer to freshly encoded data while `written` contains the size -+ * of available data. This pointer's memory is handled by the library and is -+ * only valid until the next call to `shine_encode_buffer` or `shine_close` and -+ * may be NULL if no data was written. */ - unsigned char *shine_encode_buffer(shine_t s, int16_t **data, int *written); - --/* Encode interleaved audio data. Source data must have `shine_samples_per_pass(s)` audio samples per -- * channels. Mono encoder only expect one channel. -+/* Encode interleaved audio data. Source data must have -+ * `shine_samples_per_pass(s)` audio samples per channels. Mono encoder only -+ * expect one channel. - * -- * Returns a pointer to freshly encoded data while `written` contains the size of -- * available data. This pointer's memory is handled by the library and is only valid -- * until the next call to `shine_encode_buffer` or `shine_close` and may be NULL if no data -- * was written. */ --unsigned char *shine_encode_buffer_interleaved(shine_t s, int16_t *data, int *written); -- --/* Flush all data currently in the encoding buffer. Should be used before closing -- * the encoder, to make all encoded data has been written. */ -+ * Returns a pointer to freshly encoded data while `written` contains the size -+ * of available data. This pointer's memory is handled by the library and is -+ * only valid until the next call to `shine_encode_buffer` or `shine_close` and -+ * may be NULL if no data was written. */ -+unsigned char *shine_encode_buffer_interleaved(shine_t s, int16_t *data, -+ int *written); -+ -+/* Flush all data currently in the encoding buffer. Should be used before -+ * closing the encoder, to make all encoded data has been written. */ - unsigned char *shine_flush(shine_t s, int *written); - - /* Close an encoder, freeing all associated memory. Encoder handler is not -diff --git a/src/lib/mult_mips_gcc.h b/src/lib/mult_mips_gcc.h -index 092ed84..d49d215 100644 ---- a/src/lib/mult_mips_gcc.h -+++ b/src/lib/mult_mips_gcc.h -@@ -1,51 +1,50 @@ - #include <stdint.h> - --#define mul(a,b) \ --({ \ -- register int32_t res; \ -- __asm__ __volatile__("mult %0, %1" : : "r" (a), "r" (b)); \ -- __asm__ __volatile__("mfhi %0" : "=r" (res)); \ -- res; \ --}) -+#define mul(a, b) \ -+ ({ \ -+ register int32_t res; \ -+ __asm__ __volatile__("mult %0, %1" : : "r"(a), "r"(b)); \ -+ __asm__ __volatile__("mfhi %0" : "=r"(res)); \ -+ res; \ -+ }) - --#define mul0(hi,lo,a,b) \ -- __asm__ __volatile__("mult %0, %1" : : "r" (a), "r" (b)) -+#define mul0(hi, lo, a, b) \ -+ __asm__ __volatile__("mult %0, %1" : : "r"(a), "r"(b)) - --#define muladd(hi,lo,a,b) \ -- __asm__ __volatile__("madd %0, %1" : : "r" (a), "r" (b)) -+#define muladd(hi, lo, a, b) \ -+ __asm__ __volatile__("madd %0, %1" : : "r"(a), "r"(b)) - --#define mulsub(hi,lo,a,b) \ -- __asm__ __volatile__("msub %0, %1" : : "r" (a), "r" (b)) -+#define mulsub(hi, lo, a, b) \ -+ __asm__ __volatile__("msub %0, %1" : : "r"(a), "r"(b)) - --#define mulz(hi,lo) \ --do { \ -- register int32_t t; \ -- __asm__ __volatile__("mfhi %0" : "=r" (t)); \ -- (hi) = t; \ --} while (0) -+#define mulz(hi, lo) \ -+ do { \ -+ register int32_t t; \ -+ __asm__ __volatile__("mfhi %0" : "=r"(t)); \ -+ (hi) = t; \ -+ } while (0) - --#define cmuls(dre, dim, are, aim, bre, bim) \ --do { \ -- register int32_t t1, t2, tre; \ -- __asm__ __volatile__("mult %0, %1" : : "r" (are), "r" (bre)); \ -- __asm__ __volatile__("msub %0, %1" : : "r" (aim), "r" (bim)); \ -- __asm__ __volatile__("mfhi %0; mflo %1" : "=r" (t1), "=r" (t2)); \ -- tre = (t1 << 1) | ((uint32_t)t2 >> 31); \ -- __asm__ __volatile__("mult %0, %1" : : "r" (are), "r" (bim)); \ -- __asm__ __volatile__("madd %0, %1" : : "r" (bre), "r" (aim)); \ -- dre = tre; \ -- __asm__ __volatile__("mfhi %0; mflo %1" : "=r" (t1), "=r" (t2)); \ -- dim = (t1 << 1) | ((uint32_t)t2 >> 31); \ --} while (0) -+#define cmuls(dre, dim, are, aim, bre, bim) \ -+ do { \ -+ register int32_t t1, t2, tre; \ -+ __asm__ __volatile__("mult %0, %1" : : "r"(are), "r"(bre)); \ -+ __asm__ __volatile__("msub %0, %1" : : "r"(aim), "r"(bim)); \ -+ __asm__ __volatile__("mfhi %0; mflo %1" : "=r"(t1), "=r"(t2)); \ -+ tre = (t1 << 1) | ((uint32_t)t2 >> 31); \ -+ __asm__ __volatile__("mult %0, %1" : : "r"(are), "r"(bim)); \ -+ __asm__ __volatile__("madd %0, %1" : : "r"(bre), "r"(aim)); \ -+ dre = tre; \ -+ __asm__ __volatile__("mfhi %0; mflo %1" : "=r"(t1), "=r"(t2)); \ -+ dim = (t1 << 1) | ((uint32_t)t2 >> 31); \ -+ } while (0) - - #if __mips_isa_rev >= 2 --static inline uint32_t SWAB32(uint32_t x) --{ -- __asm__( -- " wsbh %0, %1 \n" -- " rotr %0, %0, 16 \n" -- : "=r" (x) : "r" (x)); -- return x; -+static inline uint32_t SWAB32(uint32_t x) { -+ __asm__(" wsbh %0, %1 \n" -+ " rotr %0, %0, 16 \n" -+ : "=r"(x) -+ : "r"(x)); -+ return x; - } - #define SWAB32 SWAB32 - #endif -diff --git a/src/lib/mult_noarch_gcc.h b/src/lib/mult_noarch_gcc.h -index 516e66c..2ee207e 100644 ---- a/src/lib/mult_noarch_gcc.h -+++ b/src/lib/mult_noarch_gcc.h -@@ -1,34 +1,40 @@ - #include <stdint.h> - - #ifndef mul --#define mul(a,b) (int32_t) ( ( ((int64_t) a) * ((int64_t) b) ) >>32 ) -+#define mul(a, b) (int32_t)((((int64_t)a) * ((int64_t)b)) >> 32) - #endif - - #ifndef muls --#define muls(a,b) (int32_t) ( ( ((int64_t) a) * ((int64_t) b) ) >>31 ) -+#define muls(a, b) (int32_t)((((int64_t)a) * ((int64_t)b)) >> 31) - #endif - - #ifndef mulr --#define mulr(a,b) (int32_t) ( ( ( ((int64_t) a) * ((int64_t) b)) + 0x80000000LL ) >>32 ) -+#define mulr(a, b) \ -+ (int32_t)(((((int64_t)a) * ((int64_t)b)) + 0x80000000LL) >> 32) - #endif - - #ifndef mulsr --#define mulsr(a,b) (int32_t) ( ( ( ((int64_t) a) * ((int64_t) b)) + 0x40000000LL ) >>31 ) -+#define mulsr(a, b) \ -+ (int32_t)(((((int64_t)a) * ((int64_t)b)) + 0x40000000LL) >> 31) - #endif - - #ifndef mul0 --#define mul0(hi,lo,a,b) ((hi) = mul((a), (b))) --#define muladd(hi,lo,a,b) ((hi) += mul((a), (b))) --#define mulsub(hi,lo,a,b) ((hi) -= mul((a), (b))) --#define mulz(hi,lo) -+#define mul0(hi, lo, a, b) ((hi) = mul((a), (b))) -+#define muladd(hi, lo, a, b) ((hi) += mul((a), (b))) -+#define mulsub(hi, lo, a, b) ((hi) -= mul((a), (b))) -+#define mulz(hi, lo) - #endif - - #ifndef cmuls --#define cmuls(dre, dim, are, aim, bre, bim) \ --do { \ -- int32_t tre; \ -- (tre) = (int32_t) (((int64_t) (are) * (int64_t) (bre) - (int64_t) (aim) * (int64_t) (bim)) >> 31); \ -- (dim) = (int32_t) (((int64_t) (are) * (int64_t) (bim) + (int64_t) (aim) * (int64_t) (bre)) >> 31); \ -- (dre) = tre; \ --} while (0) -+#define cmuls(dre, dim, are, aim, bre, bim) \ -+ do { \ -+ int32_t tre; \ -+ (tre) = (int32_t)(((int64_t)(are) * (int64_t)(bre) - \ -+ (int64_t)(aim) * (int64_t)(bim)) >> \ -+ 31); \ -+ (dim) = (int32_t)(((int64_t)(are) * (int64_t)(bim) + \ -+ (int64_t)(aim) * (int64_t)(bre)) >> \ -+ 31); \ -+ (dre) = tre; \ -+ } while (0) - #endif -diff --git a/src/lib/mult_sarm_gcc.h b/src/lib/mult_sarm_gcc.h -index d229eff..0cf8e08 100644 ---- a/src/lib/mult_sarm_gcc.h -+++ b/src/lib/mult_sarm_gcc.h -@@ -2,108 +2,102 @@ - - /* Fractional multiply */ - #if __ARM_ARCH >= 6 --#define mul(x,y) \ --({ \ -- register int32_t result; \ -- asm ("smmul %0, %2, %1" : "=r" (result) : "r" (x), "r" (y)); \ -- result ;\ --}) -+#define mul(x, y) \ -+ ({ \ -+ register int32_t result; \ -+ asm("smmul %0, %2, %1" : "=r"(result) : "r"(x), "r"(y)); \ -+ result; \ -+ }) - #else --#define mul(x,y) \ --({ \ -- register int32_t result; \ -- asm ("smull r3, %0, %2, %1" : "=r" (result) : "r" (x), "r" (y) : "r3"); \ -- result ; \ --}) -+#define mul(x, y) \ -+ ({ \ -+ register int32_t result; \ -+ asm("smull r3, %0, %2, %1" : "=r"(result) : "r"(x), "r"(y) : "r3"); \ -+ result; \ -+ }) - #endif - - /* Fractional multiply with single bit left shift. */ --#define muls(x,y) \ --({ \ -- register int32_t result; \ -- asm ( \ -- "smull r3, %0, %2, %1\n\t" \ -- "movs r3, r3, lsl #1\n\t" \ -- "adc %0, %0, %0" \ -- : "=r" (result) : "r" (x), "r" (y) : "r3", "cc" \ -- ); \ -- result; \ --}) -- -+#define muls(x, y) \ -+ ({ \ -+ register int32_t result; \ -+ asm("smull r3, %0, %2, %1\n\t" \ -+ "movs r3, r3, lsl #1\n\t" \ -+ "adc %0, %0, %0" \ -+ : "=r"(result) \ -+ : "r"(x), "r"(y) \ -+ : "r3", "cc"); \ -+ result; \ -+ }) - - #if __ARM_ARCH >= 6 --#define mulr(x,y) \ --({ \ -- register int32_t result; \ -- asm ( \ -- "smmulr %0, %2, %1" : "=r" (result) : "r" (x), "r" (y) \ -- ); \ -- result; \ --}) -+#define mulr(x, y) \ -+ ({ \ -+ register int32_t result; \ -+ asm("smmulr %0, %2, %1" : "=r"(result) : "r"(x), "r"(y)); \ -+ result; \ -+ }) - #else --#define mulr(x,y) \ --({ \ -- register int32_t result; \ -- asm ( \ -- "smull r3, %0, %2, %1\n\t" \ -- "adds r3, r3, #0x80000000\n\t" \ -- "adc %0, %0, #0" \ -- : "=r" (result) : "r" (x), "r" (y) : "r3", "cc" \ -- ); \ -- result; \ --}) -+#define mulr(x, y) \ -+ ({ \ -+ register int32_t result; \ -+ asm("smull r3, %0, %2, %1\n\t" \ -+ "adds r3, r3, #0x80000000\n\t" \ -+ "adc %0, %0, #0" \ -+ : "=r"(result) \ -+ : "r"(x), "r"(y) \ -+ : "r3", "cc"); \ -+ result; \ -+ }) - #endif - --#define mulsr(x,y) \ --({ \ -- register int32_t result; \ -- asm ( \ -- "smull r3, %0, %1, %2\n\t" \ -- "movs r3, r3, lsl #1\n\t" \ -- "adc %0, %0, %0\n\t" \ -- "adds r3, r3, #0x80000000\n\t" \ -- "adc %0, %0, #0" \ -- : "=r" (result) : "r" (x), "r" (y) : "r3", "cc" \ -- ); \ -- result; \ --}) -+#define mulsr(x, y) \ -+ ({ \ -+ register int32_t result; \ -+ asm("smull r3, %0, %1, %2\n\t" \ -+ "movs r3, r3, lsl #1\n\t" \ -+ "adc %0, %0, %0\n\t" \ -+ "adds r3, r3, #0x80000000\n\t" \ -+ "adc %0, %0, #0" \ -+ : "=r"(result) \ -+ : "r"(x), "r"(y) \ -+ : "r3", "cc"); \ -+ result; \ -+ }) - --#define mul0(hi,lo,a,b) \ -- asm ("smull %0, %1, %2, %3" : "=r" (lo), "=r" (hi) : "r" (a), "r" (b)) -+#define mul0(hi, lo, a, b) \ -+ asm("smull %0, %1, %2, %3" : "=r"(lo), "=r"(hi) : "r"(a), "r"(b)) - --#define muladd(hi,lo,a,b) \ -- asm ("smlal %0, %1, %2, %3" : "+r" (lo), "+r" (hi) : "r" (a), "r" (b)) -+#define muladd(hi, lo, a, b) \ -+ asm("smlal %0, %1, %2, %3" : "+r"(lo), "+r"(hi) : "r"(a), "r"(b)) - --#define mulsub(hi,lo,a,b) \ -- asm ("smlal %0, %1, %2, %3" : "+r" (lo), "+r" (hi) : "r" (a), "r" (-(b))) -+#define mulsub(hi, lo, a, b) \ -+ asm("smlal %0, %1, %2, %3" : "+r"(lo), "+r"(hi) : "r"(a), "r"(-(b))) - --#define mulz(hi,lo) -+#define mulz(hi, lo) - --#define cmuls(dre, dim, are, aim, bre, bim) \ --do { \ -- register int32_t tre, tim; \ -- asm ( \ -- "smull r3, %0, %2, %4\n\t" \ -- "smlal r3, %0, %3, %5\n\t" \ -- "movs r3, r3, lsl #1\n\t" \ -- "adc %0, %0, %0\n\t" \ -- "smull r3, %1, %2, %6\n\t" \ -- "smlal r3, %1, %4, %3\n\t" \ -- "movs r3, r3, lsl #1\n\t" \ -- "adc %1, %1, %1\n\t" \ -- : "=&r" (tre), "=&r" (tim) \ -- : "r" (are), "r" (aim), "r" (bre), "r" (-(bim)), "r" (bim) \ -- : "r3", "cc" \ -- ); \ -- dre = tre; \ -- dim = tim; \ --} while (0) -+#define cmuls(dre, dim, are, aim, bre, bim) \ -+ do { \ -+ register int32_t tre, tim; \ -+ asm("smull r3, %0, %2, %4\n\t" \ -+ "smlal r3, %0, %3, %5\n\t" \ -+ "movs r3, r3, lsl #1\n\t" \ -+ "adc %0, %0, %0\n\t" \ -+ "smull r3, %1, %2, %6\n\t" \ -+ "smlal r3, %1, %4, %3\n\t" \ -+ "movs r3, r3, lsl #1\n\t" \ -+ "adc %1, %1, %1\n\t" \ -+ : "=&r"(tre), "=&r"(tim) \ -+ : "r"(are), "r"(aim), "r"(bre), "r"(-(bim)), "r"(bim) \ -+ : "r3", "cc"); \ -+ dre = tre; \ -+ dim = tim; \ -+ } while (0) - - #if __ARM_ARCH >= 6 --static inline uint32_t SWAB32(uint32_t x) --{ -- asm ("rev %0, %1" : "=r" (x) : "r" (x)); -- return x; -+static inline uint32_t SWAB32(uint32_t x) { -+ asm("rev %0, %1" : "=r"(x) : "r"(x)); -+ return x; - } - #define SWAB32 SWAB32 - #endif -diff --git a/src/lib/reservoir.c b/src/lib/reservoir.c -index ca84f3d..cea0a9b 100644 ---- a/src/lib/reservoir.c -+++ b/src/lib/reservoir.c -@@ -2,13 +2,13 @@ - * Layer3 bit reservoir: Described in C.1.5.4.2.2 of the IS - */ - --#include "types.h" --#include "layer3.h" --#include "l3loop.h" --#include "huffman.h" -+#include "reservoir.h" - #include "bitstream.h" -+#include "huffman.h" - #include "l3bitstream.h" --#include "reservoir.h" -+#include "l3loop.h" -+#include "layer3.h" -+#include "types.h" - - /* - * shine_max_reservoir_bits: -@@ -17,36 +17,34 @@ - * allowance for the current granule based on reservoir size - * and perceptual entropy. - */ --int shine_max_reservoir_bits (double *pe, shine_global_config *config ) --{ -+int shine_max_reservoir_bits(double *pe, shine_global_config *config) { - int more_bits, max_bits, add_bits, over_bits; - int mean_bits = config->mean_bits; - - mean_bits /= config->wave.channels; - max_bits = mean_bits; - -- if(max_bits>4095) -+ if (max_bits > 4095) - max_bits = 4095; -- if(!config->ResvMax) -+ if (!config->ResvMax) - return max_bits; - - more_bits = *pe * 3.1 - mean_bits; - add_bits = 0; -- if(more_bits>100) -- { -+ if (more_bits > 100) { - int frac = (config->ResvSize * 6) / 10; - -- if(frac<more_bits) -+ if (frac < more_bits) - add_bits = frac; - else - add_bits = more_bits; - } -- over_bits = config->ResvSize - ((config->ResvMax <<3) / 10) - add_bits; -- if (over_bits>0) -+ over_bits = config->ResvSize - ((config->ResvMax << 3) / 10) - add_bits; -+ if (over_bits > 0) - add_bits += over_bits; - - max_bits += add_bits; -- if(max_bits>4095) -+ if (max_bits > 4095) - max_bits = 4095; - return max_bits; - } -@@ -57,9 +55,9 @@ int shine_max_reservoir_bits (double *pe, shine_global_config *config ) - * Called after a granule's bit allocation. Readjusts the size of - * the reservoir to reflect the granule's usage. - */ --void shine_ResvAdjust(gr_info *gi, shine_global_config *config ) --{ -- config->ResvSize += (config->mean_bits / config->wave.channels) - gi->part2_3_length; -+void shine_ResvAdjust(gr_info *gi, shine_global_config *config) { -+ config->ResvSize += -+ (config->mean_bits / config->wave.channels) - gi->part2_3_length; - } - - /* -@@ -71,8 +69,7 @@ void shine_ResvAdjust(gr_info *gi, shine_global_config *config ) - * part2_3_length. The bitstream formatter will detect this and write the - * appropriate stuffing bits to the bitstream. - */ --void shine_ResvFrameEnd(shine_global_config *config ) --{ -+void shine_ResvFrameEnd(shine_global_config *config) { - gr_info *gi; - int gr, ch, ancillary_pad, stuffingBits; - int over_bits; -@@ -81,42 +78,38 @@ void shine_ResvFrameEnd(shine_global_config *config ) - ancillary_pad = 0; - - /* just in case mean_bits is odd, this is necessary... */ -- if((config->wave.channels==2) && (config->mean_bits & 1)) -+ if ((config->wave.channels == 2) && (config->mean_bits & 1)) - config->ResvSize += 1; - - over_bits = config->ResvSize - config->ResvMax; -- if(over_bits<0) -+ if (over_bits < 0) - over_bits = 0; - - config->ResvSize -= over_bits; - stuffingBits = over_bits + ancillary_pad; - - /* we must be byte aligned */ -- if((over_bits = config->ResvSize % 8)) -- { -+ if ((over_bits = config->ResvSize % 8)) { - stuffingBits += over_bits; - config->ResvSize -= over_bits; - } - -- if(stuffingBits) -- { -+ if (stuffingBits) { - /* - * plan a: put all into the first granule - * This was preferred by someone designing a - * real-time decoder... - */ -- gi = (gr_info *) &(l3_side->gr[0].ch[0]); -+ gi = (gr_info *)&(l3_side->gr[0].ch[0]); - -- if ( gi->part2_3_length + stuffingBits < 4095 ) -+ if (gi->part2_3_length + stuffingBits < 4095) - gi->part2_3_length += stuffingBits; -- else -- { -+ else { - /* plan b: distribute throughout the granules */ -- for (gr = 0; gr < config->mpeg.granules_per_frame; gr++ ) -- for (ch = 0; ch < config->wave.channels; ch++ ) -- { -+ for (gr = 0; gr < config->mpeg.granules_per_frame; gr++) -+ for (ch = 0; ch < config->wave.channels; ch++) { - int extraBits, bitsThisGr; -- gr_info *gi = (gr_info *) &(l3_side->gr[gr].ch[ch]); -+ gr_info *gi = (gr_info *)&(l3_side->gr[gr].ch[ch]); - if (!stuffingBits) - break; - extraBits = 4095 - gi->part2_3_length; -@@ -133,5 +126,3 @@ void shine_ResvFrameEnd(shine_global_config *config ) - } - } - } -- -- -diff --git a/src/lib/reservoir.h b/src/lib/reservoir.h -index 2f1ffa5..2245778 100644 ---- a/src/lib/reservoir.h -+++ b/src/lib/reservoir.h -@@ -1,9 +1,11 @@ - #ifndef RESERVOIR_H - #define RESERVOIR_H - -+#include "types.h" -+ - void shine_ResvFrameBegin(int frameLength, shine_global_config *config); --int shine_max_reservoir_bits (double *pe, shine_global_config *config); --void shine_ResvAdjust (gr_info *gi, shine_global_config *config ); --void shine_ResvFrameEnd (shine_global_config *config ); -+int shine_max_reservoir_bits(double *pe, shine_global_config *config); -+void shine_ResvAdjust(gr_info *gi, shine_global_config *config); -+void shine_ResvFrameEnd(shine_global_config *config); - - #endif -diff --git a/src/lib/tables.c b/src/lib/tables.c -index ff7e374..3c63b4f 100644 ---- a/src/lib/tables.c -+++ b/src/lib/tables.c -@@ -7,120 +7,171 @@ - - #include "tables.h" - --const int shine_slen1_tab[16] = { 0, 0, 0, 0, 3, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4 }; --const int shine_slen2_tab[16] = { 0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3 }; -+const int shine_slen1_tab[16] = {0, 0, 0, 0, 3, 1, 1, 1, -+ 2, 2, 2, 3, 3, 3, 4, 4}; -+const int shine_slen2_tab[16] = {0, 1, 2, 3, 0, 1, 2, 3, -+ 1, 2, 3, 1, 2, 3, 2, 3}; - - /* Valid samplerates and bitrates. */ - const int samplerates[9] = { -- 44100, 48000, 32000, /* MPEG-I */ -- 22050, 24000, 16000, /* MPEG-II */ -- 11025, 12000, 8000 /* MPEG-2.5 */ -+ 44100, 48000, 32000, /* MPEG-I */ -+ 22050, 24000, 16000, /* MPEG-II */ -+ 11025, 12000, 8000 /* MPEG-2.5 */ - }; - - const int bitrates[16][4] = { -- /* MPEG version: -- * 2.5, reserved, II, I */ -- { -1, -1, -1, -1}, -- { 8, -1, 8, 32}, -- { 16, -1, 16, 40}, -- { 24, -1, 24, 48}, -- { 32, -1, 32, 56}, -- { 40, -1, 40, 64}, -- { 48, -1, 48, 80}, -- { 56, -1, 56, 96}, -- { 64, -1, 64, 112}, -- { -1, -1, 80, 128}, -- { -1, -1, 96, 160}, -- { -1, -1, 112, 192}, -- { -1, -1, 128, 224}, -- { -1, -1, 144, 256}, -- { -1, -1, 160, 320}, -- { -1, -1, -1, -1} --}; -+ /* MPEG version: -+ * 2.5, reserved, II, I */ -+ {-1, -1, -1, -1}, {8, -1, 8, 32}, {16, -1, 16, 40}, -+ {24, -1, 24, 48}, {32, -1, 32, 56}, {40, -1, 40, 64}, -+ {48, -1, 48, 80}, {56, -1, 56, 96}, {64, -1, 64, 112}, -+ {-1, -1, 80, 128}, {-1, -1, 96, 160}, {-1, -1, 112, 192}, -+ {-1, -1, 128, 224}, {-1, -1, 144, 256}, {-1, -1, 160, 320}, -+ {-1, -1, -1, -1}}; - --const int shine_scale_fact_band_index[9][23] = --{ -- /* MPEG-I */ -+const int shine_scale_fact_band_index[9][23] = { -+ /* MPEG-I */ - /* Table B.8.b: 44.1 kHz */ -- {0,4,8,12,16,20,24,30,36,44,52,62,74,90,110,134,162,196,238,288,342,418,576}, -+ {0, 4, 8, 12, 16, 20, 24, 30, 36, 44, 52, 62, -+ 74, 90, 110, 134, 162, 196, 238, 288, 342, 418, 576}, - /* Table B.8.c: 48 kHz */ -- {0,4,8,12,16,20,24,30,36,42,50,60,72,88,106,128,156,190,230,276,330,384,576}, -+ {0, 4, 8, 12, 16, 20, 24, 30, 36, 42, 50, 60, -+ 72, 88, 106, 128, 156, 190, 230, 276, 330, 384, 576}, - /* Table B.8.a: 32 kHz */ -- {0,4,8,12,16,20,24,30,36,44,54,66,82,102,126,156,194,240,296,364,448,550,576}, -- /* MPEG-II */ -+ {0, 4, 8, 12, 16, 20, 24, 30, 36, 44, 54, 66, -+ 82, 102, 126, 156, 194, 240, 296, 364, 448, 550, 576}, -+ /* MPEG-II */ - /* Table B.2.b: 22.05 kHz */ -- {0,6,12,18,24,30,36,44,54,66,80,96,116,140,168,200,238,284,336,396,464,522,576}, -+ {0, 6, 12, 18, 24, 30, 36, 44, 54, 66, 80, 96, -+ 116, 140, 168, 200, 238, 284, 336, 396, 464, 522, 576}, - /* Table B.2.c: 24 kHz */ -- {0,6,12,18,24,30,36,44,54,66,80,96,114,136,162,194,232,278,330,394,464,540,576}, -+ {0, 6, 12, 18, 24, 30, 36, 44, 54, 66, 80, 96, -+ 114, 136, 162, 194, 232, 278, 330, 394, 464, 540, 576}, - /* Table B.2.a: 16 kHz */ -- {0,6,12,18,24,30,36,44,45,66,80,96,116,140,168,200,238,248,336,396,464,522,576}, -+ {0, 6, 12, 18, 24, 30, 36, 44, 45, 66, 80, 96, -+ 116, 140, 168, 200, 238, 248, 336, 396, 464, 522, 576}, - -- /* MPEG-2.5 */ -+ /* MPEG-2.5 */ - /* 11.025 kHz */ -- {0,6,12,18,24,30,36,44,54,66,80,96,116,140,168,200,238,284,336,396,464,522,576}, -+ {0, 6, 12, 18, 24, 30, 36, 44, 54, 66, 80, 96, -+ 116, 140, 168, 200, 238, 284, 336, 396, 464, 522, 576}, - /* 12 kHz */ -- {0,6,12,18,24,30,36,44,54,66,80,96,116,140,168,200,238,284,336,396,464,522,576}, -+ {0, 6, 12, 18, 24, 30, 36, 44, 54, 66, 80, 96, -+ 116, 140, 168, 200, 238, 284, 336, 396, 464, 522, 576}, - /* MPEG-2.5 8 kHz */ -- {0,12,24,36,48,60,72,88,108,132,160,192,232,280,336,400,476,566,568,570,572,574,576}, -+ {0, 12, 24, 36, 48, 60, 72, 88, 108, 132, 160, 192, -+ 232, 280, 336, 400, 476, 566, 568, 570, 572, 574, 576}, - }; - - /* note. 0.035781 is shine_enwindow maximum value */ - /* scale and convert to fixed point before storing */ --#define SHINE_EW(x) (int32_t)((double)(x) * 0x7fffffff) --#define SHINE_EW2(a,b) SHINE_EW(a), SHINE_EW(b) --#define SHINE_EW10(a,b,c,d,e,f,g,h,i,j) SHINE_EW2(a,b), SHINE_EW2(c,d), SHINE_EW2(e,f), SHINE_EW2(g,h), SHINE_EW2(i,j) -+#define SHINE_EW(x) (int32_t)((double)(x)*0x7fffffff) -+#define SHINE_EW2(a, b) SHINE_EW(a), SHINE_EW(b) -+#define SHINE_EW10(a, b, c, d, e, f, g, h, i, j) \ -+ SHINE_EW2(a, b), SHINE_EW2(c, d), SHINE_EW2(e, f), SHINE_EW2(g, h), \ -+ SHINE_EW2(i, j) - - const int32_t shine_enwindow[] = { --SHINE_EW10( 0.000000, -0.000000, -0.000000, -0.000000, -0.000000, -0.000000, -0.000000, -0.000001, -0.000001, -0.000001), --SHINE_EW10( -0.000001, -0.000001, -0.000001, -0.000002, -0.000002, -0.000002, -0.000002, -0.000003, -0.000003, -0.000003), --SHINE_EW10( -0.000004, -0.000004, -0.000005, -0.000005, -0.000006, -0.000007, -0.000008, -0.000008, -0.000009, -0.000010), --SHINE_EW10( -0.000011, -0.000012, -0.000014, -0.000015, -0.000017, -0.000018, -0.000020, -0.000021, -0.000023, -0.000025), --SHINE_EW10( -0.000028, -0.000030, -0.000032, -0.000035, -0.000038, -0.000041, -0.000043, -0.000046, -0.000050, -0.000053), --SHINE_EW10( -0.000056, -0.000060, -0.000063, -0.000066, -0.000070, -0.000073, -0.000077, -0.000081, -0.000084, -0.000087), --SHINE_EW10( -0.000091, -0.000093, -0.000096, -0.000099, 0.000102, 0.000104, 0.000106, 0.000107, 0.000108, 0.000109), --SHINE_EW10( 0.000109, 0.000108, 0.000107, 0.000105, 0.000103, 0.000099, 0.000095, 0.000090, 0.000084, 0.000078), --SHINE_EW10( 0.000070, 0.000061, 0.000051, 0.000040, 0.000027, 0.000014, -0.000001, -0.000017, -0.000034, -0.000053), --SHINE_EW10( -0.000073, -0.000094, -0.000116, -0.000140, -0.000165, -0.000191, -0.000219, -0.000247, -0.000277, -0.000308), --SHINE_EW10( -0.000339, -0.000371, -0.000404, -0.000438, -0.000473, -0.000507, -0.000542, -0.000577, -0.000612, -0.000647), --SHINE_EW10( -0.000681, -0.000714, -0.000747, -0.000779, -0.000810, -0.000839, -0.000866, -0.000892, -0.000915, -0.000936), --SHINE_EW10( -0.000954, -0.000969, -0.000981, -0.000989, -0.000994, -0.000995, -0.000992, -0.000984, 0.000971, 0.000954), --SHINE_EW10( 0.000931, 0.000903, 0.000869, 0.000829, 0.000784, 0.000732, 0.000674, 0.000610, 0.000539, 0.000463), --SHINE_EW10( 0.000379, 0.000288, 0.000192, 0.000088, -0.000021, -0.000137, -0.000260, -0.000388, -0.000522, -0.000662), --SHINE_EW10( -0.000807, -0.000957, -0.001111, -0.001270, -0.001432, -0.001598, -0.001767, -0.001937, -0.002110, -0.002283), --SHINE_EW10( -0.002457, -0.002631, -0.002803, -0.002974, -0.003142, -0.003307, -0.003467, -0.003623, -0.003772, -0.003914), --SHINE_EW10( -0.004049, -0.004175, -0.004291, -0.004396, -0.004490, -0.004570, -0.004638, -0.004691, -0.004728, -0.004749), --SHINE_EW10( -0.004752, -0.004737, -0.004703, -0.004649, -0.004574, -0.004477, -0.004358, -0.004215, -0.004049, -0.003859), --SHINE_EW10( -0.003643, -0.003402, 0.003135, 0.002841, 0.002522, 0.002175, 0.001801, 0.001400, 0.000971, 0.000516), --SHINE_EW10( 0.000033, -0.000476, -0.001012, -0.001574, -0.002162, -0.002774, -0.003411, -0.004072, -0.004756, -0.005462), --SHINE_EW10( -0.006189, -0.006937, -0.007703, -0.008487, -0.009288, -0.010104, -0.010933, -0.011775, -0.012628, -0.013489), --SHINE_EW10( -0.014359, -0.015234, -0.016113, -0.016994, -0.017876, -0.018757, -0.019634, -0.020507, -0.021372, -0.022229), --SHINE_EW10( -0.023074, -0.023907, -0.024725, -0.025527, -0.026311, -0.027074, -0.027815, -0.028533, -0.029225, -0.029890), --SHINE_EW10( -0.030527, -0.031133, -0.031707, -0.032248, -0.032755, -0.033226, -0.033660, -0.034056, -0.034413, -0.034730), --SHINE_EW10( -0.035007, -0.035242, -0.035435, -0.035586, -0.035694, -0.035759, 0.035781, 0.035759, 0.035694, 0.035586), --SHINE_EW10( 0.035435, 0.035242, 0.035007, 0.034730, 0.034413, 0.034056, 0.033660, 0.033226, 0.032755, 0.032248), --SHINE_EW10( 0.031707, 0.031133, 0.030527, 0.029890, 0.029225, 0.028533, 0.027815, 0.027074, 0.026311, 0.025527), --SHINE_EW10( 0.024725, 0.023907, 0.023074, 0.022229, 0.021372, 0.020507, 0.019634, 0.018757, 0.017876, 0.016994), --SHINE_EW10( 0.016113, 0.015234, 0.014359, 0.013489, 0.012628, 0.011775, 0.010933, 0.010104, 0.009288, 0.008487), --SHINE_EW10( 0.007703, 0.006937, 0.006189, 0.005462, 0.004756, 0.004072, 0.003411, 0.002774, 0.002162, 0.001574), --SHINE_EW10( 0.001012, 0.000476, -0.000033, -0.000516, -0.000971, -0.001400, -0.001801, -0.002175, -0.002522, -0.002841), --SHINE_EW10( 0.003135, 0.003402, 0.003643, 0.003859, 0.004049, 0.004215, 0.004358, 0.004477, 0.004574, 0.004649), --SHINE_EW10( 0.004703, 0.004737, 0.004752, 0.004749, 0.004728, 0.004691, 0.004638, 0.004570, 0.004490, 0.004396), --SHINE_EW10( 0.004291, 0.004175, 0.004049, 0.003914, 0.003772, 0.003623, 0.003467, 0.003307, 0.003142, 0.002974), --SHINE_EW10( 0.002803, 0.002631, 0.002457, 0.002283, 0.002110, 0.001937, 0.001767, 0.001598, 0.001432, 0.001270), --SHINE_EW10( 0.001111, 0.000957, 0.000807, 0.000662, 0.000522, 0.000388, 0.000260, 0.000137, 0.000021, -0.000088), --SHINE_EW10( -0.000192, -0.000288, -0.000379, -0.000463, -0.000539, -0.000610, -0.000674, -0.000732, -0.000784, -0.000829), --SHINE_EW10( -0.000869, -0.000903, -0.000931, -0.000954, 0.000971, 0.000984, 0.000992, 0.000995, 0.000994, 0.000989), --SHINE_EW10( 0.000981, 0.000969, 0.000954, 0.000936, 0.000915, 0.000892, 0.000866, 0.000839, 0.000810, 0.000779), --SHINE_EW10( 0.000747, 0.000714, 0.000681, 0.000647, 0.000612, 0.000577, 0.000542, 0.000507, 0.000473, 0.000438), --SHINE_EW10( 0.000404, 0.000371, 0.000339, 0.000308, 0.000277, 0.000247, 0.000219, 0.000191, 0.000165, 0.000140), --SHINE_EW10( 0.000116, 0.000094, 0.000073, 0.000053, 0.000034, 0.000017, 0.000001, -0.000014, -0.000027, -0.000040), --SHINE_EW10( -0.000051, -0.000061, -0.000070, -0.000078, -0.000084, -0.000090, -0.000095, -0.000099, -0.000103, -0.000105), --SHINE_EW10( -0.000107, -0.000108, -0.000109, -0.000109, -0.000108, -0.000107, -0.000106, -0.000104, 0.000102, 0.000099), --SHINE_EW10( 0.000096, 0.000093, 0.000091, 0.000087, 0.000084, 0.000081, 0.000077, 0.000073, 0.000070, 0.000066), --SHINE_EW10( 0.000063, 0.000060, 0.000056, 0.000053, 0.000050, 0.000046, 0.000043, 0.000041, 0.000038, 0.000035), --SHINE_EW10( 0.000032, 0.000030, 0.000028, 0.000025, 0.000023, 0.000021, 0.000020, 0.000018, 0.000017, 0.000015), --SHINE_EW10( 0.000014, 0.000012, 0.000011, 0.000010, 0.000009, 0.000008, 0.000008, 0.000007, 0.000006, 0.000005), --SHINE_EW10( 0.000005, 0.000004, 0.000004, 0.000003, 0.000003, 0.000003, 0.000002, 0.000002, 0.000002, 0.000002), --SHINE_EW10( 0.000001, 0.000001, 0.000001, 0.000001, 0.000001, 0.000001, 0.000000, 0.000000, 0.000000, 0.000000), --SHINE_EW2 ( 0.000000, 0.000000) --}; -+ SHINE_EW10(0.000000, -0.000000, -0.000000, -0.000000, -0.000000, -0.000000, -+ -0.000000, -0.000001, -0.000001, -0.000001), -+ SHINE_EW10(-0.000001, -0.000001, -0.000001, -0.000002, -0.000002, -0.000002, -+ -0.000002, -0.000003, -0.000003, -0.000003), -+ SHINE_EW10(-0.000004, -0.000004, -0.000005, -0.000005, -0.000006, -0.000007, -+ -0.000008, -0.000008, -0.000009, -0.000010), -+ SHINE_EW10(-0.000011, -0.000012, -0.000014, -0.000015, -0.000017, -0.000018, -+ -0.000020, -0.000021, -0.000023, -0.000025), -+ SHINE_EW10(-0.000028, -0.000030, -0.000032, -0.000035, -0.000038, -0.000041, -+ -0.000043, -0.000046, -0.000050, -0.000053), -+ SHINE_EW10(-0.000056, -0.000060, -0.000063, -0.000066, -0.000070, -0.000073, -+ -0.000077, -0.000081, -0.000084, -0.000087), -+ SHINE_EW10(-0.000091, -0.000093, -0.000096, -0.000099, 0.000102, 0.000104, -+ 0.000106, 0.000107, 0.000108, 0.000109), -+ SHINE_EW10(0.000109, 0.000108, 0.000107, 0.000105, 0.000103, 0.000099, -+ 0.000095, 0.000090, 0.000084, 0.000078), -+ SHINE_EW10(0.000070, 0.000061, 0.000051, 0.000040, 0.000027, 0.000014, -+ -0.000001, -0.000017, -0.000034, -0.000053), -+ SHINE_EW10(-0.000073, -0.000094, -0.000116, -0.000140, -0.000165, -0.000191, -+ -0.000219, -0.000247, -0.000277, -0.000308), -+ SHINE_EW10(-0.000339, -0.000371, -0.000404, -0.000438, -0.000473, -0.000507, -+ -0.000542, -0.000577, -0.000612, -0.000647), -+ SHINE_EW10(-0.000681, -0.000714, -0.000747, -0.000779, -0.000810, -0.000839, -+ -0.000866, -0.000892, -0.000915, -0.000936), -+ SHINE_EW10(-0.000954, -0.000969, -0.000981, -0.000989, -0.000994, -0.000995, -+ -0.000992, -0.000984, 0.000971, 0.000954), -+ SHINE_EW10(0.000931, 0.000903, 0.000869, 0.000829, 0.000784, 0.000732, -+ 0.000674, 0.000610, 0.000539, 0.000463), -+ SHINE_EW10(0.000379, 0.000288, 0.000192, 0.000088, -0.000021, -0.000137, -+ -0.000260, -0.000388, -0.000522, -0.000662), -+ SHINE_EW10(-0.000807, -0.000957, -0.001111, -0.001270, -0.001432, -0.001598, -+ -0.001767, -0.001937, -0.002110, -0.002283), -+ SHINE_EW10(-0.002457, -0.002631, -0.002803, -0.002974, -0.003142, -0.003307, -+ -0.003467, -0.003623, -0.003772, -0.003914), -+ SHINE_EW10(-0.004049, -0.004175, -0.004291, -0.004396, -0.004490, -0.004570, -+ -0.004638, -0.004691, -0.004728, -0.004749), -+ SHINE_EW10(-0.004752, -0.004737, -0.004703, -0.004649, -0.004574, -0.004477, -+ -0.004358, -0.004215, -0.004049, -0.003859), -+ SHINE_EW10(-0.003643, -0.003402, 0.003135, 0.002841, 0.002522, 0.002175, -+ 0.001801, 0.001400, 0.000971, 0.000516), -+ SHINE_EW10(0.000033, -0.000476, -0.001012, -0.001574, -0.002162, -0.002774, -+ -0.003411, -0.004072, -0.004756, -0.005462), -+ SHINE_EW10(-0.006189, -0.006937, -0.007703, -0.008487, -0.009288, -0.010104, -+ -0.010933, -0.011775, -0.012628, -0.013489), -+ SHINE_EW10(-0.014359, -0.015234, -0.016113, -0.016994, -0.017876, -0.018757, -+ -0.019634, -0.020507, -0.021372, -0.022229), -+ SHINE_EW10(-0.023074, -0.023907, -0.024725, -0.025527, -0.026311, -0.027074, -+ -0.027815, -0.028533, -0.029225, -0.029890), -+ SHINE_EW10(-0.030527, -0.031133, -0.031707, -0.032248, -0.032755, -0.033226, -+ -0.033660, -0.034056, -0.034413, -0.034730), -+ SHINE_EW10(-0.035007, -0.035242, -0.035435, -0.035586, -0.035694, -0.035759, -+ 0.035781, 0.035759, 0.035694, 0.035586), -+ SHINE_EW10(0.035435, 0.035242, 0.035007, 0.034730, 0.034413, 0.034056, -+ 0.033660, 0.033226, 0.032755, 0.032248), -+ SHINE_EW10(0.031707, 0.031133, 0.030527, 0.029890, 0.029225, 0.028533, -+ 0.027815, 0.027074, 0.026311, 0.025527), -+ SHINE_EW10(0.024725, 0.023907, 0.023074, 0.022229, 0.021372, 0.020507, -+ 0.019634, 0.018757, 0.017876, 0.016994), -+ SHINE_EW10(0.016113, 0.015234, 0.014359, 0.013489, 0.012628, 0.011775, -+ 0.010933, 0.010104, 0.009288, 0.008487), -+ SHINE_EW10(0.007703, 0.006937, 0.006189, 0.005462, 0.004756, 0.004072, -+ 0.003411, 0.002774, 0.002162, 0.001574), -+ SHINE_EW10(0.001012, 0.000476, -0.000033, -0.000516, -0.000971, -0.001400, -+ -0.001801, -0.002175, -0.002522, -0.002841), -+ SHINE_EW10(0.003135, 0.003402, 0.003643, 0.003859, 0.004049, 0.004215, -+ 0.004358, 0.004477, 0.004574, 0.004649), -+ SHINE_EW10(0.004703, 0.004737, 0.004752, 0.004749, 0.004728, 0.004691, -+ 0.004638, 0.004570, 0.004490, 0.004396), -+ SHINE_EW10(0.004291, 0.004175, 0.004049, 0.003914, 0.003772, 0.003623, -+ 0.003467, 0.003307, 0.003142, 0.002974), -+ SHINE_EW10(0.002803, 0.002631, 0.002457, 0.002283, 0.002110, 0.001937, -+ 0.001767, 0.001598, 0.001432, 0.001270), -+ SHINE_EW10(0.001111, 0.000957, 0.000807, 0.000662, 0.000522, 0.000388, -+ 0.000260, 0.000137, 0.000021, -0.000088), -+ SHINE_EW10(-0.000192, -0.000288, -0.000379, -0.000463, -0.000539, -0.000610, -+ -0.000674, -0.000732, -0.000784, -0.000829), -+ SHINE_EW10(-0.000869, -0.000903, -0.000931, -0.000954, 0.000971, 0.000984, -+ 0.000992, 0.000995, 0.000994, 0.000989), -+ SHINE_EW10(0.000981, 0.000969, 0.000954, 0.000936, 0.000915, 0.000892, -+ 0.000866, 0.000839, 0.000810, 0.000779), -+ SHINE_EW10(0.000747, 0.000714, 0.000681, 0.000647, 0.000612, 0.000577, -+ 0.000542, 0.000507, 0.000473, 0.000438), -+ SHINE_EW10(0.000404, 0.000371, 0.000339, 0.000308, 0.000277, 0.000247, -+ 0.000219, 0.000191, 0.000165, 0.000140), -+ SHINE_EW10(0.000116, 0.000094, 0.000073, 0.000053, 0.000034, 0.000017, -+ 0.000001, -0.000014, -0.000027, -0.000040), -+ SHINE_EW10(-0.000051, -0.000061, -0.000070, -0.000078, -0.000084, -0.000090, -+ -0.000095, -0.000099, -0.000103, -0.000105), -+ SHINE_EW10(-0.000107, -0.000108, -0.000109, -0.000109, -0.000108, -0.000107, -+ -0.000106, -0.000104, 0.000102, 0.000099), -+ SHINE_EW10(0.000096, 0.000093, 0.000091, 0.000087, 0.000084, 0.000081, -+ 0.000077, 0.000073, 0.000070, 0.000066), -+ SHINE_EW10(0.000063, 0.000060, 0.000056, 0.000053, 0.000050, 0.000046, -+ 0.000043, 0.000041, 0.000038, 0.000035), -+ SHINE_EW10(0.000032, 0.000030, 0.000028, 0.000025, 0.000023, 0.000021, -+ 0.000020, 0.000018, 0.000017, 0.000015), -+ SHINE_EW10(0.000014, 0.000012, 0.000011, 0.000010, 0.000009, 0.000008, -+ 0.000008, 0.000007, 0.000006, 0.000005), -+ SHINE_EW10(0.000005, 0.000004, 0.000004, 0.000003, 0.000003, 0.000003, -+ 0.000002, 0.000002, 0.000002, 0.000002), -+ SHINE_EW10(0.000001, 0.000001, 0.000001, 0.000001, 0.000001, 0.000001, -+ 0.000000, 0.000000, 0.000000, 0.000000), -+ SHINE_EW2(0.000000, 0.000000)}; -diff --git a/src/lib/tables.h b/src/lib/tables.h -index 5c94228..fe06502 100644 ---- a/src/lib/tables.h -+++ b/src/lib/tables.h -@@ -9,8 +9,7 @@ extern const int shine_slen2_tab[16]; - extern const int samplerates[9]; - extern const int bitrates[16][4]; - --extern const int shine_scale_fact_band_index[9][23]; -+extern const int shine_scale_fact_band_index[9][23]; - extern const int32_t shine_enwindow[]; - - #endif -- -diff --git a/src/lib/types.h b/src/lib/types.h -index f3def1a..11a05fc 100644 ---- a/src/lib/types.h -+++ b/src/lib/types.h -@@ -2,18 +2,18 @@ - #define PRIV_TYPES_H - - #include <stdio.h> --#include <string.h> - #include <stdlib.h> -+#include <string.h> - - #include <math.h> - --#define GRANULE_SIZE 576 -+#define GRANULE_SIZE 576 - - #include "bitstream.h" - - /* Include arch-specific instructions, - * when defined. */ --#if defined(__mips__) && (__mips != 64) -+#if defined(__mips__) && (__mips == 32) - #include "mult_mips_gcc.h" - #elif defined(__arm__) && !defined(__thumb__) - #include "mult_sarm_gcc.h" -@@ -24,29 +24,32 @@ - #include "mult_noarch_gcc.h" - - #ifndef SWAB32 --#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) --#define SWAB32(x) __builtin_bswap32(x) -+#if defined(__GNUC__) && \ -+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) -+#define SWAB32(x) __builtin_bswap32(x) - #else --#define SWAB32(x) (((unsigned int)(x) >> 24) | (((unsigned int)(x) >> 8) & 0xff00) | (((unsigned int)(x) & 0xff00) << 8) | ((unsigned int)(x) << 24)) -+#define SWAB32(x) \ -+ (((unsigned int)(x) >> 24) | (((unsigned int)(x) >> 8) & 0xff00) | \ -+ (((unsigned int)(x)&0xff00) << 8) | ((unsigned int)(x) << 24)) - #endif - #endif - - /* #define DEBUG if you want the library to dump info to stdout */ - --#define PI 3.14159265358979 --#define PI4 0.78539816339745 --#define PI12 0.26179938779915 --#define PI36 0.087266462599717 --#define PI64 0.049087385212 --#define SQRT2 1.41421356237 --#define LN2 0.69314718 -+#define PI 3.14159265358979 -+#define PI4 0.78539816339745 -+#define PI12 0.26179938779915 -+#define PI36 0.087266462599717 -+#define PI64 0.049087385212 -+#define SQRT2 1.41421356237 -+#define LN2 0.69314718 - #define LN_TO_LOG10 0.2302585093 --#define BLKSIZE 1024 --#define HAN_SIZE 512 /* for loop unrolling, require that HAN_SIZE%8==0 */ -+#define BLKSIZE 1024 -+#define HAN_SIZE 512 /* for loop unrolling, require that HAN_SIZE%8==0 */ - #define SCALE_BLOCK 12 - #define SCALE_RANGE 64 --#define SCALE 32768 --#define SBLIMIT 32 -+#define SCALE 32768 -+#define SBLIMIT 32 - - #ifndef MAX_CHANNELS - #define MAX_CHANNELS 2 -@@ -57,44 +60,44 @@ - #endif - - typedef struct { -- int channels; -- int samplerate; -+ int channels; -+ int samplerate; - } priv_shine_wave_t; - - typedef struct { -- int version; -- int layer; -- int granules_per_frame; -- int mode; /* + */ /* Stereo mode */ -- int bitr; /* + */ /* Must conform to known bitrate - see Main.c */ -- int emph; /* + */ /* De-emphasis */ -- int padding; -- int bits_per_frame; -- int bits_per_slot; -- double frac_slots_per_frame; -- double slot_lag; -- int whole_slots_per_frame; -- int bitrate_index; /* + */ /* See Main.c and Layer3.c */ -- int samplerate_index; /* + */ /* See Main.c and Layer3.c */ -- int crc; -- int ext; -- int mode_ext; -- int copyright; /* + */ -- int original; /* + */ -+ int version; -+ int layer; -+ int granules_per_frame; -+ int mode; /* + */ /* Stereo mode */ -+ int bitr; /* + */ /* Must conform to known bitrate - see Main.c */ -+ int emph; /* + */ /* De-emphasis */ -+ int padding; -+ int bits_per_frame; -+ int bits_per_slot; -+ double frac_slots_per_frame; -+ double slot_lag; -+ int whole_slots_per_frame; -+ int bitrate_index; /* + */ /* See Main.c and Layer3.c */ -+ int samplerate_index; /* + */ /* See Main.c and Layer3.c */ -+ int crc; -+ int ext; -+ int mode_ext; -+ int copyright; /* + */ -+ int original; /* + */ - } priv_shine_mpeg_t; - - typedef struct { -- int32_t *xr; /* magnitudes of the spectral values */ -- int32_t xrsq[GRANULE_SIZE]; /* xr squared */ -- int32_t xrabs[GRANULE_SIZE]; /* xr absolute */ -- int32_t xrmax; /* maximum of xrabs array */ -- int32_t en_tot[MAX_GRANULES]; /* gr */ -+ int32_t *xr; /* magnitudes of the spectral values */ -+ int32_t xrsq[GRANULE_SIZE]; /* xr squared */ -+ int32_t xrabs[GRANULE_SIZE]; /* xr absolute */ -+ int32_t xrmax; /* maximum of xrabs array */ -+ int32_t en_tot[MAX_GRANULES]; /* gr */ - int32_t en[MAX_GRANULES][21]; - int32_t xm[MAX_GRANULES][21]; - int32_t xrmaxl[MAX_GRANULES]; -- double steptab[128]; /* 2**(-x/4) for x = -127..0 */ -- int32_t steptabi[128]; /* 2**(-x/4) for x = -127..0 */ -- int int2idx[10000]; /* x**(3/4) for x = 0..9999 */ -+ double steptab[128]; /* 2**(-x/4) for x = -127..0 */ -+ int32_t steptabi[128]; /* 2**(-x/4) for x = -127..0 */ -+ int int2idx[10000]; /* x**(3/4) for x = 0..9999 */ - } l3loop_t; - - typedef struct { -@@ -105,7 +108,7 @@ typedef struct { - int off[MAX_CHANNELS]; - int32_t fl[SBLIMIT][64]; - int32_t x[MAX_CHANNELS][HAN_SIZE]; --} subband_t; -+} subband_t; - - /* Side information */ - typedef struct { -@@ -130,49 +133,48 @@ typedef struct { - } gr_info; - - typedef struct { -- unsigned private_bits; -- int resvDrain; -- unsigned scfsi[MAX_CHANNELS][4]; -+ unsigned private_bits; -+ int resvDrain; -+ unsigned scfsi[MAX_CHANNELS][4]; -+ struct { - struct { -- struct { -- gr_info tt; -- } ch[MAX_CHANNELS]; -- } gr[MAX_GRANULES]; -+ gr_info tt; -+ } ch[MAX_CHANNELS]; -+ } gr[MAX_GRANULES]; - } shine_side_info_t; - - typedef struct { -- double l[MAX_GRANULES][MAX_CHANNELS][21]; -+ double l[MAX_GRANULES][MAX_CHANNELS][21]; - } shine_psy_ratio_t; - - typedef struct { -- double l[MAX_GRANULES][MAX_CHANNELS][21]; -+ double l[MAX_GRANULES][MAX_CHANNELS][21]; - } shine_psy_xmin_t; - - typedef struct { -- int32_t l[MAX_GRANULES][MAX_CHANNELS][22]; /* [cb] */ -- int32_t s[MAX_GRANULES][MAX_CHANNELS][13][3]; /* [window][cb] */ -+ int32_t l[MAX_GRANULES][MAX_CHANNELS][22]; /* [cb] */ -+ int32_t s[MAX_GRANULES][MAX_CHANNELS][13][3]; /* [window][cb] */ - } shine_scalefac_t; - -- --typedef struct shine_global_flags { -- priv_shine_wave_t wave; -- priv_shine_mpeg_t mpeg; -- bitstream_t bs; -+typedef struct shine_global_flags { -+ priv_shine_wave_t wave; -+ priv_shine_mpeg_t mpeg; -+ bitstream_t bs; - shine_side_info_t side_info; -- int sideinfo_len; -- int mean_bits; -+ int sideinfo_len; -+ int mean_bits; - shine_psy_ratio_t ratio; -- shine_scalefac_t scalefactor; -- int16_t *buffer[MAX_CHANNELS]; -- double pe[MAX_CHANNELS][MAX_GRANULES]; -- int l3_enc[MAX_CHANNELS][MAX_GRANULES][GRANULE_SIZE]; -- int32_t l3_sb_sample[MAX_CHANNELS][MAX_GRANULES+1][18][SBLIMIT]; -- int32_t mdct_freq[MAX_CHANNELS][MAX_GRANULES][GRANULE_SIZE]; -- int ResvSize; -- int ResvMax; -- l3loop_t l3loop; -- mdct_t mdct; -- subband_t subband; -+ shine_scalefac_t scalefactor; -+ int16_t *buffer[MAX_CHANNELS]; -+ double pe[MAX_CHANNELS][MAX_GRANULES]; -+ int l3_enc[MAX_CHANNELS][MAX_GRANULES][GRANULE_SIZE]; -+ int32_t l3_sb_sample[MAX_CHANNELS][MAX_GRANULES + 1][18][SBLIMIT]; -+ int32_t mdct_freq[MAX_CHANNELS][MAX_GRANULES][GRANULE_SIZE]; -+ int ResvSize; -+ int ResvMax; -+ l3loop_t l3loop; -+ mdct_t mdct; -+ subband_t subband; - } shine_global_config; - - #endif diff --git a/multimedia/shine/shine.SlackBuild b/multimedia/shine/shine.SlackBuild index 81d701d8f3..14cac1b0cb 100644 --- a/multimedia/shine/shine.SlackBuild +++ b/multimedia/shine/shine.SlackBuild @@ -25,10 +25,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=shine -VERSION=${VERSION:-3.1.1} +VERSION=${VERSION:-ab5e352_20230101} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +COMMIT=${COMMIT:-ab5e3526b64af1a2eaa43aa6f441a7312e013519} +COMMITDATE=${COMMITDATE:-20230101} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -67,9 +69,9 @@ trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ER rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$COMMIT +tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz +cd $PRGNAM-$COMMIT chown -R root:root . find -L . \ @@ -78,8 +80,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 --verbose --unified < $CWD/fix-bugs.patch - ./bootstrap CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -90,6 +90,8 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --enable-shared \ + --disable-static \ --build=$ARCH-slackware-linux make diff --git a/multimedia/shine/shine.info b/multimedia/shine/shine.info index 401505a283..32ae886033 100644 --- a/multimedia/shine/shine.info +++ b/multimedia/shine/shine.info @@ -1,8 +1,8 @@ PRGNAM="shine" -VERSION="3.1.1" +VERSION="ab5e352_20230101" HOMEPAGE="https://github.com/toots/shine" -DOWNLOAD="https://github.com/toots/shine/archive/3.1.1/shine-3.1.1.tar.gz" -MD5SUM="ff41cb139c25470f2d9c9acc9f97cc8d" +DOWNLOAD="https://github.com/toots/shine/archive/ab5e352/shine-ab5e3526b64af1a2eaa43aa6f441a7312e013519.tar.gz" +MD5SUM="1f8ac33d4819acf526b5de4a9a5c1bec" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/spot/spot.SlackBuild b/multimedia/spot/spot.SlackBuild index 5247d6c524..3149a1c5d8 100644 --- a/multimedia/spot/spot.SlackBuild +++ b/multimedia/spot/spot.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=spot -VERSION=${VERSION:-0.4.0} +VERSION=${VERSION:-0.3.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/spot/spot.info b/multimedia/spot/spot.info index 63c2125237..8cc72d3ca2 100644 --- a/multimedia/spot/spot.info +++ b/multimedia/spot/spot.info @@ -1,742 +1,700 @@ PRGNAM="spot" -VERSION="0.4.0" +VERSION="0.3.3" HOMEPAGE="https://github.com/xou816/spot" -DOWNLOAD="https://github.com/xou816/spot/archive/refs/tags/0.4.0/spot-0.4.0.tar.gz \ - https://static.crates.io/crates/addr2line/addr2line-0.19.0.crate \ - https://static.crates.io/crates/adler/adler-1.0.2.crate \ +DOWNLOAD="https://github.com/xou816/spot/archive/refs/tags/0.3.3/spot-0.3.3.tar.gz \ + https://static.crates.io/crates/kernel32-sys/kernel32-sys-0.2.2.crate \ https://static.crates.io/crates/aes/aes-0.6.0.crate \ - https://static.crates.io/crates/aes/aes-0.7.5.crate \ https://static.crates.io/crates/aes-ctr/aes-ctr-0.6.0.crate \ https://static.crates.io/crates/aes-soft/aes-soft-0.6.4.crate \ https://static.crates.io/crates/aesni/aesni-0.10.0.crate \ - https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.20.crate \ + https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.18.crate \ + https://static.crates.io/crates/alsa/alsa-0.5.0.crate \ https://static.crates.io/crates/alsa/alsa-0.6.0.crate \ https://static.crates.io/crates/alsa-sys/alsa-sys-0.3.1.crate \ - https://static.crates.io/crates/android_system_properties/android_system_properties-0.1.5.crate \ - https://static.crates.io/crates/anyhow/anyhow-1.0.69.crate \ - https://static.crates.io/crates/async-broadcast/async-broadcast-0.5.0.crate \ - https://static.crates.io/crates/async-channel/async-channel-1.8.0.crate \ - https://static.crates.io/crates/async-executor/async-executor-1.5.0.crate \ - https://static.crates.io/crates/async-global-executor/async-global-executor-2.3.1.crate \ - https://static.crates.io/crates/async-io/async-io-1.12.0.crate \ - https://static.crates.io/crates/async-lock/async-lock-2.6.0.crate \ - https://static.crates.io/crates/async-recursion/async-recursion-1.0.2.crate \ - https://static.crates.io/crates/async-std/async-std-1.12.0.crate \ - https://static.crates.io/crates/async-task/async-task-4.3.0.crate \ - https://static.crates.io/crates/async-trait/async-trait-0.1.64.crate \ - https://static.crates.io/crates/atomic-waker/atomic-waker-1.1.0.crate \ + https://static.crates.io/crates/anyhow/anyhow-1.0.53.crate \ + https://static.crates.io/crates/async-broadcast/async-broadcast-0.3.4.crate \ + https://static.crates.io/crates/async-channel/async-channel-1.6.1.crate \ + https://static.crates.io/crates/async-executor/async-executor-1.4.1.crate \ + https://static.crates.io/crates/async-global-executor/async-global-executor-2.0.2.crate \ + https://static.crates.io/crates/async-io/async-io-1.6.0.crate \ + https://static.crates.io/crates/async-lock/async-lock-2.4.0.crate \ + https://static.crates.io/crates/async-mutex/async-mutex-1.4.0.crate \ + https://static.crates.io/crates/async-recursion/async-recursion-0.3.2.crate \ + https://static.crates.io/crates/async-std/async-std-1.10.0.crate \ + https://static.crates.io/crates/async-task/async-task-4.1.0.crate \ + https://static.crates.io/crates/async-trait/async-trait-0.1.52.crate \ + https://static.crates.io/crates/atomic-waker/atomic-waker-1.0.0.crate \ https://static.crates.io/crates/atty/atty-0.2.14.crate \ https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \ - https://static.crates.io/crates/backtrace/backtrace-0.3.67.crate \ - https://static.crates.io/crates/base64/base64-0.13.1.crate \ - https://static.crates.io/crates/bindgen/bindgen-0.61.0.crate \ + https://static.crates.io/crates/base64/base64-0.13.0.crate \ + https://static.crates.io/crates/bindgen/bindgen-0.56.0.crate \ https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \ https://static.crates.io/crates/block/block-0.1.6.crate \ https://static.crates.io/crates/block-buffer/block-buffer-0.9.0.crate \ - https://static.crates.io/crates/block-buffer/block-buffer-0.10.3.crate \ - https://static.crates.io/crates/block-modes/block-modes-0.8.1.crate \ + https://static.crates.io/crates/block-modes/block-modes-0.7.0.crate \ https://static.crates.io/crates/block-padding/block-padding-0.2.1.crate \ - https://static.crates.io/crates/blocking/blocking-1.3.0.crate \ - https://static.crates.io/crates/bumpalo/bumpalo-3.12.0.crate \ + https://static.crates.io/crates/blocking/blocking-1.1.0.crate \ + https://static.crates.io/crates/bumpalo/bumpalo-3.9.1.crate \ https://static.crates.io/crates/byteorder/byteorder-1.4.3.crate \ - https://static.crates.io/crates/bytes/bytes-1.4.0.crate \ - https://static.crates.io/crates/cairo-rs/cairo-rs-0.17.0.crate \ - https://static.crates.io/crates/cairo-sys-rs/cairo-sys-rs-0.17.0.crate \ + https://static.crates.io/crates/bytes/bytes-1.1.0.crate \ + https://static.crates.io/crates/cache-padded/cache-padded-1.2.0.crate \ + https://static.crates.io/crates/cairo-rs/cairo-rs-0.15.1.crate \ + https://static.crates.io/crates/cairo-sys-rs/cairo-sys-rs-0.15.1.crate \ https://static.crates.io/crates/castaway/castaway-0.1.2.crate \ - https://static.crates.io/crates/cc/cc-1.0.79.crate \ + https://static.crates.io/crates/cc/cc-1.0.72.crate \ https://static.crates.io/crates/cesu8/cesu8-1.1.0.crate \ - https://static.crates.io/crates/cexpr/cexpr-0.6.0.crate \ - https://static.crates.io/crates/cfg-expr/cfg-expr-0.11.0.crate \ + https://static.crates.io/crates/cexpr/cexpr-0.4.0.crate \ + https://static.crates.io/crates/cfg-expr/cfg-expr-0.9.1.crate \ + https://static.crates.io/crates/cfg-if/cfg-if-0.1.10.crate \ https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \ - https://static.crates.io/crates/chrono/chrono-0.4.23.crate \ + https://static.crates.io/crates/chrono/chrono-0.4.19.crate \ https://static.crates.io/crates/cipher/cipher-0.2.5.crate \ - https://static.crates.io/crates/cipher/cipher-0.3.0.crate \ - https://static.crates.io/crates/clang-sys/clang-sys-1.4.0.crate \ - https://static.crates.io/crates/codespan-reporting/codespan-reporting-0.11.1.crate \ - https://static.crates.io/crates/combine/combine-4.6.6.crate \ - https://static.crates.io/crates/concurrent-queue/concurrent-queue-2.1.0.crate \ + https://static.crates.io/crates/clang-sys/clang-sys-1.3.1.crate \ + https://static.crates.io/crates/combine/combine-4.6.3.crate \ + https://static.crates.io/crates/concurrent-queue/concurrent-queue-1.2.2.crate \ https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.3.crate \ https://static.crates.io/crates/coreaudio-rs/coreaudio-rs-0.10.0.crate \ - https://static.crates.io/crates/coreaudio-sys/coreaudio-sys-0.2.11.crate \ + https://static.crates.io/crates/coreaudio-sys/coreaudio-sys-0.2.9.crate \ https://static.crates.io/crates/cpal/cpal-0.13.5.crate \ - https://static.crates.io/crates/cpufeatures/cpufeatures-0.2.5.crate \ - https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.14.crate \ - https://static.crates.io/crates/crypto-common/crypto-common-0.1.6.crate \ + https://static.crates.io/crates/cpufeatures/cpufeatures-0.2.1.crate \ + https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.7.crate \ + https://static.crates.io/crates/crypto-mac/crypto-mac-0.10.1.crate \ https://static.crates.io/crates/crypto-mac/crypto-mac-0.11.1.crate \ - https://static.crates.io/crates/ctor/ctor-0.1.26.crate \ + https://static.crates.io/crates/ctor/ctor-0.1.21.crate \ https://static.crates.io/crates/ctr/ctr-0.6.0.crate \ - https://static.crates.io/crates/curl/curl-0.4.44.crate \ - https://static.crates.io/crates/curl-sys/curl-sys-0.4.59+curl-7.86.0.crate \ - https://static.crates.io/crates/cxx/cxx-1.0.90.crate \ - https://static.crates.io/crates/cxx-build/cxx-build-1.0.90.crate \ - https://static.crates.io/crates/cxxbridge-flags/cxxbridge-flags-1.0.90.crate \ - https://static.crates.io/crates/cxxbridge-macro/cxxbridge-macro-1.0.90.crate \ - https://static.crates.io/crates/darling/darling-0.13.4.crate \ - https://static.crates.io/crates/darling_core/darling_core-0.13.4.crate \ - https://static.crates.io/crates/darling_macro/darling_macro-0.13.4.crate \ + https://static.crates.io/crates/curl/curl-0.4.42.crate \ + https://static.crates.io/crates/curl-sys/curl-sys-0.4.52+curl-7.81.0.crate \ + https://static.crates.io/crates/darling/darling-0.13.1.crate \ + https://static.crates.io/crates/darling_core/darling_core-0.13.1.crate \ + https://static.crates.io/crates/darling_macro/darling_macro-0.13.1.crate \ https://static.crates.io/crates/derivative/derivative-2.2.0.crate \ https://static.crates.io/crates/digest/digest-0.9.0.crate \ - https://static.crates.io/crates/digest/digest-0.10.6.crate \ - https://static.crates.io/crates/dirs/dirs-4.0.0.crate \ - https://static.crates.io/crates/dirs-sys/dirs-sys-0.3.7.crate \ - https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.32.crate \ - https://static.crates.io/crates/enumflags2/enumflags2-0.7.5.crate \ - https://static.crates.io/crates/enumflags2_derive/enumflags2_derive-0.7.4.crate \ - https://static.crates.io/crates/env_logger/env_logger-0.9.3.crate \ - https://static.crates.io/crates/event-listener/event-listener-2.5.3.crate \ - https://static.crates.io/crates/fastrand/fastrand-1.8.0.crate \ + https://static.crates.io/crates/easy-parallel/easy-parallel-3.2.0.crate \ + https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.30.crate \ + https://static.crates.io/crates/enumflags2/enumflags2-0.6.4.crate \ + https://static.crates.io/crates/enumflags2/enumflags2-0.7.3.crate \ + https://static.crates.io/crates/enumflags2_derive/enumflags2_derive-0.6.4.crate \ + https://static.crates.io/crates/enumflags2_derive/enumflags2_derive-0.7.3.crate \ + https://static.crates.io/crates/env_logger/env_logger-0.8.4.crate \ + https://static.crates.io/crates/env_logger/env_logger-0.9.0.crate \ + https://static.crates.io/crates/event-listener/event-listener-2.5.2.crate \ + https://static.crates.io/crates/fastrand/fastrand-1.7.0.crate \ https://static.crates.io/crates/field-offset/field-offset-0.3.4.crate \ - https://static.crates.io/crates/fixedbitset/fixedbitset-0.4.2.crate \ https://static.crates.io/crates/fnv/fnv-1.0.7.crate \ - https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.1.0.crate \ - https://static.crates.io/crates/futures/futures-0.3.26.crate \ - https://static.crates.io/crates/futures-channel/futures-channel-0.3.26.crate \ - https://static.crates.io/crates/futures-core/futures-core-0.3.26.crate \ - https://static.crates.io/crates/futures-executor/futures-executor-0.3.26.crate \ - https://static.crates.io/crates/futures-io/futures-io-0.3.26.crate \ + https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.0.1.crate \ + https://static.crates.io/crates/futures/futures-0.3.21.crate \ + https://static.crates.io/crates/futures-channel/futures-channel-0.3.21.crate \ + https://static.crates.io/crates/futures-core/futures-core-0.3.21.crate \ + https://static.crates.io/crates/futures-executor/futures-executor-0.3.21.crate \ + https://static.crates.io/crates/futures-io/futures-io-0.3.21.crate \ https://static.crates.io/crates/futures-lite/futures-lite-1.12.0.crate \ - https://static.crates.io/crates/futures-macro/futures-macro-0.3.26.crate \ - https://static.crates.io/crates/futures-sink/futures-sink-0.3.26.crate \ - https://static.crates.io/crates/futures-task/futures-task-0.3.26.crate \ - https://static.crates.io/crates/futures-util/futures-util-0.3.26.crate \ - https://static.crates.io/crates/gdk-pixbuf/gdk-pixbuf-0.17.0.crate \ - https://static.crates.io/crates/gdk-pixbuf-sys/gdk-pixbuf-sys-0.17.0.crate \ - https://static.crates.io/crates/gdk4/gdk4-0.6.0.crate \ - https://static.crates.io/crates/gdk4-sys/gdk4-sys-0.6.0.crate \ - https://static.crates.io/crates/generic-array/generic-array-0.14.6.crate \ + https://static.crates.io/crates/futures-macro/futures-macro-0.3.21.crate \ + https://static.crates.io/crates/futures-sink/futures-sink-0.3.21.crate \ + https://static.crates.io/crates/futures-task/futures-task-0.3.21.crate \ + https://static.crates.io/crates/futures-util/futures-util-0.3.21.crate \ + https://static.crates.io/crates/gdk-pixbuf/gdk-pixbuf-0.15.6.crate \ + https://static.crates.io/crates/gdk-pixbuf-sys/gdk-pixbuf-sys-0.15.1.crate \ + https://static.crates.io/crates/gdk4/gdk4-0.4.6.crate \ + https://static.crates.io/crates/gdk4-sys/gdk4-sys-0.4.2.crate \ + https://static.crates.io/crates/generic-array/generic-array-0.14.5.crate \ https://static.crates.io/crates/getopts/getopts-0.2.21.crate \ - https://static.crates.io/crates/getrandom/getrandom-0.2.8.crate \ + https://static.crates.io/crates/getrandom/getrandom-0.2.4.crate \ https://static.crates.io/crates/gettext-rs/gettext-rs-0.7.0.crate \ - https://static.crates.io/crates/gettext-sys/gettext-sys-0.21.3.crate \ - https://static.crates.io/crates/gimli/gimli-0.27.1.crate \ - https://static.crates.io/crates/gio/gio-0.17.0.crate \ - https://static.crates.io/crates/gio-sys/gio-sys-0.17.0.crate \ - https://static.crates.io/crates/glib/glib-0.17.1.crate \ - https://static.crates.io/crates/glib-macros/glib-macros-0.17.1.crate \ - https://static.crates.io/crates/glib-sys/glib-sys-0.17.0.crate \ - https://static.crates.io/crates/glob/glob-0.3.1.crate \ - https://static.crates.io/crates/gloo-timers/gloo-timers-0.2.6.crate \ - https://static.crates.io/crates/gobject-sys/gobject-sys-0.17.0.crate \ - https://static.crates.io/crates/graphene-rs/graphene-rs-0.17.1.crate \ - https://static.crates.io/crates/graphene-sys/graphene-sys-0.17.0.crate \ - https://static.crates.io/crates/gsk4/gsk4-0.6.0.crate \ - https://static.crates.io/crates/gsk4-sys/gsk4-sys-0.6.0.crate \ - https://static.crates.io/crates/gtk4/gtk4-0.6.1.crate \ - https://static.crates.io/crates/gtk4-macros/gtk4-macros-0.6.0.crate \ - https://static.crates.io/crates/gtk4-sys/gtk4-sys-0.6.0.crate \ - https://static.crates.io/crates/hashbrown/hashbrown-0.12.3.crate \ - https://static.crates.io/crates/headers/headers-0.3.8.crate \ + https://static.crates.io/crates/gettext-sys/gettext-sys-0.21.2.crate \ + https://static.crates.io/crates/gio/gio-0.15.7.crate \ + https://static.crates.io/crates/gio-sys/gio-sys-0.15.5.crate \ + https://static.crates.io/crates/glib/glib-0.15.9.crate \ + https://static.crates.io/crates/glib-macros/glib-macros-0.15.3.crate \ + https://static.crates.io/crates/glib-sys/glib-sys-0.15.5.crate \ + https://static.crates.io/crates/glob/glob-0.3.0.crate \ + https://static.crates.io/crates/gloo-timers/gloo-timers-0.2.3.crate \ + https://static.crates.io/crates/gobject-sys/gobject-sys-0.15.5.crate \ + https://static.crates.io/crates/graphene-rs/graphene-rs-0.15.1.crate \ + https://static.crates.io/crates/graphene-sys/graphene-sys-0.15.1.crate \ + https://static.crates.io/crates/gsk4/gsk4-0.4.6.crate \ + https://static.crates.io/crates/gsk4-sys/gsk4-sys-0.4.2.crate \ + https://static.crates.io/crates/gtk4/gtk4-0.4.6.crate \ + https://static.crates.io/crates/gtk4-macros/gtk4-macros-0.4.3.crate \ + https://static.crates.io/crates/gtk4-sys/gtk4-sys-0.4.5.crate \ + https://static.crates.io/crates/hashbrown/hashbrown-0.11.2.crate \ + https://static.crates.io/crates/headers/headers-0.3.6.crate \ https://static.crates.io/crates/headers-core/headers-core-0.2.0.crate \ - https://static.crates.io/crates/heck/heck-0.4.1.crate \ + https://static.crates.io/crates/heck/heck-0.4.0.crate \ https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.19.crate \ - https://static.crates.io/crates/hermit-abi/hermit-abi-0.2.6.crate \ https://static.crates.io/crates/hex/hex-0.4.3.crate \ - https://static.crates.io/crates/hkdf/hkdf-0.12.3.crate \ + https://static.crates.io/crates/hkdf/hkdf-0.10.0.crate \ + https://static.crates.io/crates/hmac/hmac-0.10.1.crate \ https://static.crates.io/crates/hmac/hmac-0.11.0.crate \ - https://static.crates.io/crates/hmac/hmac-0.12.1.crate \ https://static.crates.io/crates/hostname/hostname-0.3.1.crate \ - https://static.crates.io/crates/http/http-0.2.8.crate \ - https://static.crates.io/crates/http-body/http-body-0.4.5.crate \ - https://static.crates.io/crates/httparse/httparse-1.8.0.crate \ + https://static.crates.io/crates/http/http-0.2.6.crate \ + https://static.crates.io/crates/http-body/http-body-0.4.4.crate \ + https://static.crates.io/crates/httparse/httparse-1.5.1.crate \ https://static.crates.io/crates/httpdate/httpdate-1.0.2.crate \ https://static.crates.io/crates/humantime/humantime-2.1.0.crate \ - https://static.crates.io/crates/hyper/hyper-0.14.24.crate \ + https://static.crates.io/crates/hyper/hyper-0.14.16.crate \ https://static.crates.io/crates/hyper-proxy/hyper-proxy-0.9.1.crate \ - https://static.crates.io/crates/iana-time-zone/iana-time-zone-0.1.53.crate \ - https://static.crates.io/crates/iana-time-zone-haiku/iana-time-zone-haiku-0.1.1.crate \ https://static.crates.io/crates/ident_case/ident_case-1.0.1.crate \ - https://static.crates.io/crates/idna/idna-0.3.0.crate \ - https://static.crates.io/crates/if-addrs/if-addrs-0.7.0.crate \ - https://static.crates.io/crates/indexmap/indexmap-1.9.2.crate \ + https://static.crates.io/crates/idna/idna-0.2.3.crate \ + https://static.crates.io/crates/if-addrs/if-addrs-0.6.7.crate \ + https://static.crates.io/crates/if-addrs-sys/if-addrs-sys-0.3.2.crate \ + https://static.crates.io/crates/indexmap/indexmap-1.8.0.crate \ https://static.crates.io/crates/instant/instant-0.1.12.crate \ - https://static.crates.io/crates/isahc/isahc-1.7.2.crate \ - https://static.crates.io/crates/itoa/itoa-1.0.5.crate \ + https://static.crates.io/crates/isahc/isahc-1.7.0.crate \ + https://static.crates.io/crates/itoa/itoa-0.4.8.crate \ + https://static.crates.io/crates/itoa/itoa-1.0.1.crate \ https://static.crates.io/crates/jni/jni-0.19.0.crate \ https://static.crates.io/crates/jni-sys/jni-sys-0.3.0.crate \ - https://static.crates.io/crates/jobserver/jobserver-0.1.25.crate \ - https://static.crates.io/crates/js-sys/js-sys-0.3.61.crate \ + https://static.crates.io/crates/jobserver/jobserver-0.1.24.crate \ + https://static.crates.io/crates/js-sys/js-sys-0.3.56.crate \ https://static.crates.io/crates/kv-log-macro/kv-log-macro-1.0.7.crate \ https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \ https://static.crates.io/crates/lazycell/lazycell-1.3.0.crate \ https://static.crates.io/crates/lewton/lewton-0.10.2.crate \ - https://static.crates.io/crates/libadwaita/libadwaita-0.3.0.crate \ - https://static.crates.io/crates/libadwaita-sys/libadwaita-sys-0.3.0.crate \ - https://static.crates.io/crates/libc/libc-0.2.139.crate \ - https://static.crates.io/crates/libloading/libloading-0.7.4.crate \ - https://static.crates.io/crates/libm/libm-0.2.6.crate \ - https://static.crates.io/crates/libmdns/libmdns-0.7.4.crate \ + https://static.crates.io/crates/libadwaita/libadwaita-0.1.0.crate \ + https://static.crates.io/crates/libadwaita-sys/libadwaita-sys-0.1.0.crate \ + https://static.crates.io/crates/libc/libc-0.2.117.crate \ + https://static.crates.io/crates/libloading/libloading-0.7.3.crate \ + https://static.crates.io/crates/libm/libm-0.2.2.crate \ + https://static.crates.io/crates/libmdns/libmdns-0.6.2.crate \ https://static.crates.io/crates/libnghttp2-sys/libnghttp2-sys-0.1.7+1.45.0.crate \ - https://static.crates.io/crates/libpulse-binding/libpulse-binding-2.27.1.crate \ - https://static.crates.io/crates/libpulse-simple-binding/libpulse-simple-binding-2.27.1.crate \ - https://static.crates.io/crates/libpulse-simple-sys/libpulse-simple-sys-1.20.1.crate \ - https://static.crates.io/crates/libpulse-sys/libpulse-sys-1.20.1.crate \ - https://static.crates.io/crates/librespot/librespot-0.4.2.crate \ - https://static.crates.io/crates/librespot-audio/librespot-audio-0.4.2.crate \ - https://static.crates.io/crates/librespot-connect/librespot-connect-0.4.2.crate \ - https://static.crates.io/crates/librespot-core/librespot-core-0.4.2.crate \ - https://static.crates.io/crates/librespot-discovery/librespot-discovery-0.4.2.crate \ - https://static.crates.io/crates/librespot-metadata/librespot-metadata-0.4.2.crate \ - https://static.crates.io/crates/librespot-playback/librespot-playback-0.4.2.crate \ - https://static.crates.io/crates/librespot-protocol/librespot-protocol-0.4.2.crate \ - https://static.crates.io/crates/libz-sys/libz-sys-1.1.8.crate \ - https://static.crates.io/crates/link-cplusplus/link-cplusplus-1.0.8.crate \ + https://static.crates.io/crates/libpulse-binding/libpulse-binding-2.26.0.crate \ + https://static.crates.io/crates/libpulse-simple-binding/libpulse-simple-binding-2.25.0.crate \ + https://static.crates.io/crates/libpulse-simple-sys/libpulse-simple-sys-1.19.2.crate \ + https://static.crates.io/crates/libpulse-sys/libpulse-sys-1.19.3.crate \ + https://static.crates.io/crates/librespot/librespot-0.3.1.crate \ + https://static.crates.io/crates/librespot-audio/librespot-audio-0.3.1.crate \ + https://static.crates.io/crates/librespot-connect/librespot-connect-0.3.1.crate \ + https://static.crates.io/crates/librespot-core/librespot-core-0.3.1.crate \ + https://static.crates.io/crates/librespot-discovery/librespot-discovery-0.3.1.crate \ + https://static.crates.io/crates/librespot-metadata/librespot-metadata-0.3.1.crate \ + https://static.crates.io/crates/librespot-playback/librespot-playback-0.3.1.crate \ + https://static.crates.io/crates/librespot-protocol/librespot-protocol-0.3.1.crate \ + https://static.crates.io/crates/libz-sys/libz-sys-1.1.3.crate \ https://static.crates.io/crates/locale_config/locale_config-0.3.0.crate \ - https://static.crates.io/crates/lock_api/lock_api-0.4.9.crate \ - https://static.crates.io/crates/log/log-0.4.17.crate \ + https://static.crates.io/crates/lock_api/lock_api-0.4.6.crate \ + https://static.crates.io/crates/log/log-0.4.14.crate \ https://static.crates.io/crates/mach/mach-0.3.2.crate \ https://static.crates.io/crates/malloc_buf/malloc_buf-0.0.6.crate \ https://static.crates.io/crates/match_cfg/match_cfg-0.1.0.crate \ - https://static.crates.io/crates/memchr/memchr-2.5.0.crate \ + https://static.crates.io/crates/matches/matches-0.1.9.crate \ + https://static.crates.io/crates/memchr/memchr-2.4.1.crate \ https://static.crates.io/crates/memoffset/memoffset-0.6.5.crate \ https://static.crates.io/crates/mime/mime-0.3.16.crate \ - https://static.crates.io/crates/minimal-lexical/minimal-lexical-0.2.1.crate \ - https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.6.2.crate \ - https://static.crates.io/crates/mio/mio-0.8.5.crate \ + https://static.crates.io/crates/mio/mio-0.8.0.crate \ + https://static.crates.io/crates/miow/miow-0.3.7.crate \ https://static.crates.io/crates/multimap/multimap-0.8.3.crate \ + https://static.crates.io/crates/nb-connect/nb-connect-1.2.0.crate \ https://static.crates.io/crates/ndk/ndk-0.6.0.crate \ - https://static.crates.io/crates/ndk-context/ndk-context-0.1.1.crate \ - https://static.crates.io/crates/ndk-glue/ndk-glue-0.6.2.crate \ + https://static.crates.io/crates/ndk-glue/ndk-glue-0.6.0.crate \ https://static.crates.io/crates/ndk-macro/ndk-macro-0.3.0.crate \ https://static.crates.io/crates/ndk-sys/ndk-sys-0.3.0.crate \ - https://static.crates.io/crates/nix/nix-0.23.2.crate \ - https://static.crates.io/crates/nix/nix-0.25.1.crate \ - https://static.crates.io/crates/nom/nom-7.1.3.crate \ - https://static.crates.io/crates/nom8/nom8-0.2.0.crate \ - https://static.crates.io/crates/num/num-0.4.0.crate \ + https://static.crates.io/crates/nix/nix-0.17.0.crate \ + https://static.crates.io/crates/nix/nix-0.20.0.crate \ + https://static.crates.io/crates/nix/nix-0.23.1.crate \ + https://static.crates.io/crates/nom/nom-5.1.2.crate \ + https://static.crates.io/crates/ntapi/ntapi-0.3.6.crate \ + https://static.crates.io/crates/num/num-0.3.1.crate \ + https://static.crates.io/crates/num-bigint/num-bigint-0.3.3.crate \ https://static.crates.io/crates/num-bigint/num-bigint-0.4.3.crate \ - https://static.crates.io/crates/num-complex/num-complex-0.4.3.crate \ + https://static.crates.io/crates/num-complex/num-complex-0.3.1.crate \ https://static.crates.io/crates/num-derive/num-derive-0.3.3.crate \ - https://static.crates.io/crates/num-integer/num-integer-0.1.45.crate \ - https://static.crates.io/crates/num-iter/num-iter-0.1.43.crate \ - https://static.crates.io/crates/num-rational/num-rational-0.4.1.crate \ - https://static.crates.io/crates/num-traits/num-traits-0.2.15.crate \ - https://static.crates.io/crates/num_cpus/num_cpus-1.15.0.crate \ - https://static.crates.io/crates/num_enum/num_enum-0.5.9.crate \ - https://static.crates.io/crates/num_enum_derive/num_enum_derive-0.5.9.crate \ + https://static.crates.io/crates/num-integer/num-integer-0.1.44.crate \ + https://static.crates.io/crates/num-iter/num-iter-0.1.42.crate \ + https://static.crates.io/crates/num-rational/num-rational-0.3.2.crate \ + https://static.crates.io/crates/num-traits/num-traits-0.2.14.crate \ + https://static.crates.io/crates/num_cpus/num_cpus-1.13.1.crate \ + https://static.crates.io/crates/num_enum/num_enum-0.5.6.crate \ + https://static.crates.io/crates/num_enum_derive/num_enum_derive-0.5.6.crate \ https://static.crates.io/crates/objc/objc-0.2.7.crate \ https://static.crates.io/crates/objc-foundation/objc-foundation-0.1.1.crate \ https://static.crates.io/crates/objc_id/objc_id-0.1.1.crate \ - https://static.crates.io/crates/object/object-0.30.3.crate \ - https://static.crates.io/crates/oboe/oboe-0.4.6.crate \ + https://static.crates.io/crates/oboe/oboe-0.4.5.crate \ https://static.crates.io/crates/oboe-sys/oboe-sys-0.4.5.crate \ https://static.crates.io/crates/ogg/ogg-0.8.0.crate \ - https://static.crates.io/crates/once_cell/once_cell-1.17.0.crate \ + https://static.crates.io/crates/once_cell/once_cell-1.9.0.crate \ https://static.crates.io/crates/opaque-debug/opaque-debug-0.3.0.crate \ https://static.crates.io/crates/openssl-probe/openssl-probe-0.1.5.crate \ - https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.80.crate \ - https://static.crates.io/crates/ordered-stream/ordered-stream-0.2.0.crate \ - https://static.crates.io/crates/pango/pango-0.17.0.crate \ - https://static.crates.io/crates/pango-sys/pango-sys-0.17.0.crate \ + https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.72.crate \ + https://static.crates.io/crates/ordered-stream/ordered-stream-0.0.1.crate \ + https://static.crates.io/crates/pango/pango-0.15.2.crate \ + https://static.crates.io/crates/pango-sys/pango-sys-0.15.1.crate \ https://static.crates.io/crates/parking/parking-2.0.0.crate \ https://static.crates.io/crates/parking_lot/parking_lot-0.11.2.crate \ - https://static.crates.io/crates/parking_lot/parking_lot-0.12.1.crate \ - https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.8.6.crate \ - https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.7.crate \ + https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.8.5.crate \ https://static.crates.io/crates/pbkdf2/pbkdf2-0.8.0.crate \ https://static.crates.io/crates/peeking_take_while/peeking_take_while-0.1.2.crate \ - https://static.crates.io/crates/percent-encoding/percent-encoding-2.2.0.crate \ - https://static.crates.io/crates/pest/pest-2.5.5.crate \ - https://static.crates.io/crates/petgraph/petgraph-0.6.3.crate \ - https://static.crates.io/crates/pin-project/pin-project-1.0.12.crate \ - https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.0.12.crate \ - https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.9.crate \ + https://static.crates.io/crates/percent-encoding/percent-encoding-2.1.0.crate \ + https://static.crates.io/crates/pest/pest-2.1.3.crate \ + https://static.crates.io/crates/pin-project/pin-project-1.0.10.crate \ + https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.0.10.crate \ + https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.8.crate \ https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \ - https://static.crates.io/crates/pkg-config/pkg-config-0.3.26.crate \ - https://static.crates.io/crates/polling/polling-2.5.2.crate \ - https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.17.crate \ - https://static.crates.io/crates/priority-queue/priority-queue-1.3.1.crate \ - https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-1.3.0.crate \ + https://static.crates.io/crates/pkg-config/pkg-config-0.3.24.crate \ + https://static.crates.io/crates/polling/polling-2.2.0.crate \ + https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.16.crate \ + https://static.crates.io/crates/priority-queue/priority-queue-1.2.1.crate \ + https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-0.1.5.crate \ + https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-1.1.0.crate \ https://static.crates.io/crates/proc-macro-error/proc-macro-error-1.0.4.crate \ https://static.crates.io/crates/proc-macro-error-attr/proc-macro-error-attr-1.0.4.crate \ - https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.51.crate \ - https://static.crates.io/crates/protobuf/protobuf-2.28.0.crate \ - https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.28.0.crate \ - https://static.crates.io/crates/protobuf-codegen-pure/protobuf-codegen-pure-2.28.0.crate \ - https://static.crates.io/crates/quote/quote-1.0.23.crate \ + https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.36.crate \ + https://static.crates.io/crates/protobuf/protobuf-2.27.1.crate \ + https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.27.1.crate \ + https://static.crates.io/crates/protobuf-codegen-pure/protobuf-codegen-pure-2.27.1.crate \ + https://static.crates.io/crates/quote/quote-1.0.15.crate \ https://static.crates.io/crates/rand/rand-0.8.5.crate \ https://static.crates.io/crates/rand_chacha/rand_chacha-0.3.1.crate \ - https://static.crates.io/crates/rand_core/rand_core-0.6.4.crate \ + https://static.crates.io/crates/rand_core/rand_core-0.6.3.crate \ https://static.crates.io/crates/rand_distr/rand_distr-0.4.3.crate \ - https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.16.crate \ - https://static.crates.io/crates/redox_users/redox_users-0.4.3.crate \ + https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.10.crate \ https://static.crates.io/crates/ref_filter_map/ref_filter_map-1.0.1.crate \ - https://static.crates.io/crates/regex/regex-1.7.1.crate \ - https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.28.crate \ + https://static.crates.io/crates/regex/regex-1.5.5.crate \ + https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.25.crate \ https://static.crates.io/crates/remove_dir_all/remove_dir_all-0.5.3.crate \ - https://static.crates.io/crates/rodio/rodio-0.15.0.crate \ - https://static.crates.io/crates/rpassword/rpassword-6.0.1.crate \ - https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.21.crate \ + https://static.crates.io/crates/rodio/rodio-0.14.0.crate \ + https://static.crates.io/crates/rpassword/rpassword-5.0.1.crate \ https://static.crates.io/crates/rustc-hash/rustc-hash-1.1.0.crate \ https://static.crates.io/crates/rustc_version/rustc_version-0.3.3.crate \ https://static.crates.io/crates/rustc_version/rustc_version-0.4.0.crate \ - https://static.crates.io/crates/ryu/ryu-1.0.12.crate \ + https://static.crates.io/crates/ryu/ryu-1.0.9.crate \ https://static.crates.io/crates/same-file/same-file-1.0.6.crate \ - https://static.crates.io/crates/schannel/schannel-0.1.21.crate \ + https://static.crates.io/crates/schannel/schannel-0.1.19.crate \ + https://static.crates.io/crates/scoped-tls/scoped-tls-1.0.0.crate \ https://static.crates.io/crates/scopeguard/scopeguard-1.1.0.crate \ - https://static.crates.io/crates/scratch/scratch-1.0.3.crate \ - https://static.crates.io/crates/secret-service/secret-service-3.0.1.crate \ + https://static.crates.io/crates/secret-service/secret-service-2.0.1.crate \ https://static.crates.io/crates/semver/semver-0.11.0.crate \ - https://static.crates.io/crates/semver/semver-1.0.16.crate \ + https://static.crates.io/crates/semver/semver-1.0.5.crate \ https://static.crates.io/crates/semver-parser/semver-parser-0.10.2.crate \ - https://static.crates.io/crates/serde/serde-1.0.152.crate \ - https://static.crates.io/crates/serde_derive/serde_derive-1.0.152.crate \ - https://static.crates.io/crates/serde_json/serde_json-1.0.93.crate \ - https://static.crates.io/crates/serde_repr/serde_repr-0.1.10.crate \ + https://static.crates.io/crates/serde/serde-1.0.136.crate \ + https://static.crates.io/crates/serde_derive/serde_derive-1.0.136.crate \ + https://static.crates.io/crates/serde_json/serde_json-1.0.79.crate \ + https://static.crates.io/crates/serde_repr/serde_repr-0.1.7.crate \ https://static.crates.io/crates/sha-1/sha-1-0.9.8.crate \ - https://static.crates.io/crates/sha1/sha1-0.10.5.crate \ - https://static.crates.io/crates/sha2/sha2-0.10.6.crate \ + https://static.crates.io/crates/sha1/sha1-0.6.1.crate \ + https://static.crates.io/crates/sha1_smol/sha1_smol-1.0.0.crate \ + https://static.crates.io/crates/sha2/sha2-0.9.9.crate \ https://static.crates.io/crates/shannon/shannon-0.2.0.crate \ https://static.crates.io/crates/shell-words/shell-words-1.1.0.crate \ - https://static.crates.io/crates/shlex/shlex-1.1.0.crate \ - https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.1.crate \ - https://static.crates.io/crates/slab/slab-0.4.7.crate \ + https://static.crates.io/crates/shlex/shlex-0.1.1.crate \ + https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.0.crate \ + https://static.crates.io/crates/slab/slab-0.4.5.crate \ https://static.crates.io/crates/sluice/sluice-0.5.5.crate \ - https://static.crates.io/crates/smallvec/smallvec-1.10.0.crate \ - https://static.crates.io/crates/socket2/socket2-0.4.7.crate \ + https://static.crates.io/crates/smallvec/smallvec-1.8.0.crate \ + https://static.crates.io/crates/socket2/socket2-0.4.4.crate \ https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate \ https://static.crates.io/crates/stdweb/stdweb-0.1.3.crate \ https://static.crates.io/crates/strsim/strsim-0.10.0.crate \ https://static.crates.io/crates/subtle/subtle-2.4.1.crate \ - https://static.crates.io/crates/syn/syn-1.0.107.crate \ - https://static.crates.io/crates/system-deps/system-deps-6.0.3.crate \ + https://static.crates.io/crates/syn/syn-1.0.86.crate \ + https://static.crates.io/crates/synstructure/synstructure-0.12.6.crate \ + https://static.crates.io/crates/system-deps/system-deps-6.0.1.crate \ https://static.crates.io/crates/temp-dir/temp-dir-0.1.11.crate \ https://static.crates.io/crates/tempfile/tempfile-3.3.0.crate \ - https://static.crates.io/crates/termcolor/termcolor-1.2.0.crate \ - https://static.crates.io/crates/thiserror/thiserror-1.0.38.crate \ - https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.38.crate \ - https://static.crates.io/crates/thread-id/thread-id-4.0.0.crate \ - https://static.crates.io/crates/time/time-0.1.45.crate \ - https://static.crates.io/crates/tinyvec/tinyvec-1.6.0.crate \ - https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.1.crate \ - https://static.crates.io/crates/tokio/tokio-1.25.0.crate \ - https://static.crates.io/crates/tokio-macros/tokio-macros-1.8.2.crate \ - https://static.crates.io/crates/tokio-stream/tokio-stream-0.1.11.crate \ - https://static.crates.io/crates/tokio-util/tokio-util-0.7.7.crate \ - https://static.crates.io/crates/toml/toml-0.5.11.crate \ - https://static.crates.io/crates/toml_datetime/toml_datetime-0.5.1.crate \ - https://static.crates.io/crates/toml_edit/toml_edit-0.18.1.crate \ - https://static.crates.io/crates/tower-service/tower-service-0.3.2.crate \ - https://static.crates.io/crates/tracing/tracing-0.1.37.crate \ - https://static.crates.io/crates/tracing-attributes/tracing-attributes-0.1.23.crate \ - https://static.crates.io/crates/tracing-core/tracing-core-0.1.30.crate \ + https://static.crates.io/crates/termcolor/termcolor-1.1.2.crate \ + https://static.crates.io/crates/thiserror/thiserror-1.0.30.crate \ + https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.30.crate \ + https://static.crates.io/crates/time/time-0.1.43.crate \ + https://static.crates.io/crates/tinyvec/tinyvec-1.5.1.crate \ + https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.0.crate \ + https://static.crates.io/crates/tokio/tokio-1.17.0.crate \ + https://static.crates.io/crates/tokio-macros/tokio-macros-1.7.0.crate \ + https://static.crates.io/crates/tokio-stream/tokio-stream-0.1.8.crate \ + https://static.crates.io/crates/tokio-util/tokio-util-0.6.9.crate \ + https://static.crates.io/crates/toml/toml-0.5.8.crate \ + https://static.crates.io/crates/tower-service/tower-service-0.3.1.crate \ + https://static.crates.io/crates/tracing/tracing-0.1.30.crate \ + https://static.crates.io/crates/tracing-attributes/tracing-attributes-0.1.19.crate \ + https://static.crates.io/crates/tracing-core/tracing-core-0.1.22.crate \ https://static.crates.io/crates/tracing-futures/tracing-futures-0.2.5.crate \ - https://static.crates.io/crates/try-lock/try-lock-0.2.4.crate \ - https://static.crates.io/crates/typenum/typenum-1.16.0.crate \ - https://static.crates.io/crates/ucd-trie/ucd-trie-0.1.5.crate \ - https://static.crates.io/crates/uds_windows/uds_windows-1.0.2.crate \ - https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.10.crate \ - https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.6.crate \ - https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.22.crate \ - https://static.crates.io/crates/unicode-width/unicode-width-0.1.10.crate \ - https://static.crates.io/crates/url/url-2.3.1.crate \ - https://static.crates.io/crates/uuid/uuid-1.3.0.crate \ - https://static.crates.io/crates/value-bag/value-bag-1.0.0-alpha.9.crate \ + https://static.crates.io/crates/try-lock/try-lock-0.2.3.crate \ + https://static.crates.io/crates/typenum/typenum-1.15.0.crate \ + https://static.crates.io/crates/ucd-trie/ucd-trie-0.1.3.crate \ + https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.7.crate \ + https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.19.crate \ + https://static.crates.io/crates/unicode-width/unicode-width-0.1.9.crate \ + https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.2.crate \ + https://static.crates.io/crates/url/url-2.2.2.crate \ + https://static.crates.io/crates/uuid/uuid-0.8.2.crate \ + https://static.crates.io/crates/value-bag/value-bag-1.0.0-alpha.8.crate \ https://static.crates.io/crates/vcpkg/vcpkg-0.2.15.crate \ https://static.crates.io/crates/vergen/vergen-3.2.0.crate \ - https://static.crates.io/crates/version-compare/version-compare-0.1.1.crate \ + https://static.crates.io/crates/version-compare/version-compare-0.1.0.crate \ https://static.crates.io/crates/version_check/version_check-0.9.4.crate \ + https://static.crates.io/crates/void/void-1.0.2.crate \ https://static.crates.io/crates/waker-fn/waker-fn-1.1.0.crate \ https://static.crates.io/crates/walkdir/walkdir-2.3.2.crate \ https://static.crates.io/crates/want/want-0.3.0.crate \ - https://static.crates.io/crates/wasi/wasi-0.10.0+wasi-snapshot-preview1.crate \ - https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \ - https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.84.crate \ - https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.84.crate \ - https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.34.crate \ - https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.84.crate \ - https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.84.crate \ - https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.84.crate \ - https://static.crates.io/crates/web-sys/web-sys-0.3.61.crate \ + https://static.crates.io/crates/wasi/wasi-0.10.2+wasi-snapshot-preview1.crate \ + https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.79.crate \ + https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.79.crate \ + https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.29.crate \ + https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.79.crate \ + https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.79.crate \ + https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.79.crate \ + https://static.crates.io/crates/web-sys/web-sys-0.3.56.crate \ https://static.crates.io/crates/wepoll-ffi/wepoll-ffi-0.1.2.crate \ https://static.crates.io/crates/winapi/winapi-0.3.9.crate \ https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ https://static.crates.io/crates/winapi-util/winapi-util-0.1.5.crate \ https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ - https://static.crates.io/crates/windows-sys/windows-sys-0.42.0.crate \ - https://static.crates.io/crates/windows-sys/windows-sys-0.45.0.crate \ - https://static.crates.io/crates/windows-targets/windows-targets-0.42.1.crate \ - https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.42.1.crate \ - https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.42.1.crate \ - https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.42.1.crate \ - https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.42.1.crate \ - https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.42.1.crate \ - https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.42.1.crate \ - https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.42.1.crate \ - https://static.crates.io/crates/zbus/zbus-3.10.0.crate \ - https://static.crates.io/crates/zbus_macros/zbus_macros-3.10.0.crate \ - https://static.crates.io/crates/zbus_names/zbus_names-2.5.0.crate \ - https://static.crates.io/crates/zerocopy/zerocopy-0.6.1.crate \ - https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.3.2.crate \ - https://static.crates.io/crates/zvariant/zvariant-3.11.0.crate \ - https://static.crates.io/crates/zvariant_derive/zvariant_derive-3.11.0.crate" -MD5SUM="baecd514a5312ce09063632318d74b09 \ - b8e7ee27350aad1efd1cbe7a6a32c551 \ - 669215548c64019c08c92b2c1afd3deb \ + https://static.crates.io/crates/zbus/zbus-1.9.1.crate \ + https://static.crates.io/crates/zbus/zbus-2.1.1.crate \ + https://static.crates.io/crates/zbus_macros/zbus_macros-1.9.1.crate \ + https://static.crates.io/crates/zbus_macros/zbus_macros-2.1.1.crate \ + https://static.crates.io/crates/zbus_names/zbus_names-2.1.0.crate \ + https://static.crates.io/crates/zerocopy/zerocopy-0.3.0.crate \ + https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.2.0.crate \ + https://static.crates.io/crates/zvariant/zvariant-2.10.0.crate \ + https://static.crates.io/crates/zvariant/zvariant-3.1.2.crate \ + https://static.crates.io/crates/zvariant_derive/zvariant_derive-2.10.0.crate \ + https://static.crates.io/crates/zvariant_derive/zvariant_derive-3.1.2.crate" +MD5SUM="1ab5f9d3e76d2e99691c6337c2657d7e \ + 9d033cc2daa6924420a4a89e6705773f \ bd53a9f0ec43690f84e8c96bba8e538d \ - 815dfe34d3e7a3ab4fdd827fde9e3d04 \ db6f9a586bda62de931be1b2bce9cd34 \ b14b12cd0e866930de1993132c85705b \ 58a6326364dbe6f5168f3f3a341f360e \ - 96f06331c915195bce97c8542c0eb728 \ + 425b8fdf70df59998d9b7c89083e48d1 \ + fce951b34a5c1b8edb8c104987637fd3 \ bd278d96770173a5298bea9ebdba03f7 \ 730ff1a5c2f3becc07743810ad47e66e \ - bf23cd323c33a8c283c41bb9b79e4ce4 \ - ee4e2682a0fe87a36210b97aea8b9634 \ - 1b4533e03596b7ae7c7a3e6ab07a73ae \ - 3b66520f824a5a16dbb507acdcf897d3 \ - 8afc9ce101e88b32ebd62dedc5caf0fd \ - 791074db008026b2bae6850084353574 \ - e0430976e568e5dea0515b49f6e8bb56 \ - c50a8ba12ca56e1c583be8038950a0eb \ - f3e1ce5b1080bac150445a888b32a735 \ - 1aea297795331d5e82ad16b0fca71748 \ - 2fe91c987ca3f910aad12f4913e6e631 \ - 5d2d3892ddd169a55043e2aeb96a5359 \ - b1c7932139530dfc5c984fbba7d40b81 \ + 7814be2d45d822ba919dc9e6b70ac44e \ + b2733911430dec241671728239f8924e \ + 218d9b779b991e39e2e3fd2f299a9864 \ + 50806ccba0af9b3fdd3e37c6b651059c \ + 44dc698c2ff129b4592c402dd9a4501a \ + 8588bed0c242a7e964ac4cf236dbccd2 \ + ae1a5d749e1a8af706a5c9104bb0923b \ + 6a5fb43167d44652c51e3ceb9c2b8c23 \ + c33a5eb809e9f42be5388d47c80f6eeb \ + 8b03718de9cf7106f0b77b87e1bda5fb \ + f8e2c3f07b084e1aece1741f58ec28d1 \ + f3bf7f61aeafc26eea205f0e05f1beea \ + 6a2f7b82f00aaf8f9124cbae817980ac \ 142cb4b9a653e56e56311f0c883b8582 \ 05d77ef52e90ad161fdd41b252420467 \ - 58637599fb4e68ecbca68939709aca1a \ - 3d192a852cb456a965c5d64db624c915 \ - 53536a7f4250f679d3aaf112874e08a2 \ + 80a2c27647a6acb1890a3a7de8fded72 \ + bbc1b4852c4eb23effe97764def8d1ce \ a295edb6953237ebbdfa8e731229f9a3 \ ea2d23ceb9f98853a7dffc6c02884464 \ c7fbaf61245dc847237ab7c72b3ee9ea \ - 7caa371ca22e7a14288920a69c081d40 \ - 9d5be2ea9722444b02b39f3e70012325 \ + 25bcf8d84152a1c93f2767715c250779 \ 3518756a1af12a80e9c872091cdec5d5 \ - 1907c0d2a97e835ad0a442415e3d4bc1 \ - a931236e210885462e4b4b92ea47e246 \ + b56e5ae6b74252e4d9b89a06adf510c5 \ + 79173170388e20507a241b355ef521e3 \ 1e704be5ddde9d6b5383ef1035309f91 \ - 596cab766930d487256260ab9ca55b71 \ - 899ea6bce8f704ca9d5e90878179e3a8 \ - 20bceb66cef4cc995d004267009e6a49 \ + df3ac16302a9dd29508eda92aa402a9b \ + ca7e295f50617a33e02283d3ef93ff99 \ + 6d0a8ceae87853ef8947455469cefda9 \ + 4b84cfa4a4822e326a5dcd8d1bdfd030 \ 6473ba7813c7756738489dbc0b6203b9 \ - 7d83f411bb22318c65fec8bbee937ece \ + 00cc3eeabff68c61e5aacdb5ea9d16ac \ 267fc4a374516caa7ab495f0c607c1b4 \ - 10b68ba1e7093d889e9198dcd0ea2a3e \ - ea38f5bb1eaab6580d9ac0d41b230ed1 \ + dcb58f182347515cab229f836dd8e6d1 \ + 76d8f58004ba41bc3cd6bcfa48cb229b \ + 882dbbc613a93f64c3709b0a2bd0d6dc \ 74634128440dbc3766bda76fdf0aaa05 \ - 4a9390915b209721b7a1b87e2bb5c571 \ + 1581b390d17f6e73a43ffc8a7b009e57 \ 5184822d3fd9f30dfa4bc922ffa4143c \ - 5f2578209a4d7964623462e402375ac0 \ - 7c28deaed5c3327645cffe40430aecf0 \ - faa32da3be14130a4525bb7ba601c62e \ - 8b15d333a98fc02a34909961900246a4 \ - f6af8b98a829bb06cffbf425e5694e5e \ + ad93a9f51606d9d5eba5c8c057a14f14 \ + 457e008da6d6f7863eb8b037d61ec5c2 \ + f637bf20fac185ee2687bb2a08325e59 \ d05cbf26ed52299487a802688a1d22cb \ 092c01b71d220e9e742d1ce83040f9ba \ - 2d596b8162dae46a0c1aeb05020ae35d \ + adb22c60d90fc92bce0e9e0cad12eab8 \ 5c0b974591c88858125a1bb4e64d7bdc \ - ebdc1f779823eaad615501b1cd3822b1 \ - 9924872c20a6be30ea1120cd899d2c18 \ - 89e88633cab0e4b6f3d3878b84dffe8b \ + 70afc41079e42a402066ce556552a478 \ + 26a9ff1052f12176f2d168f1e41b339e \ + f77fc9fd7b24926d6cfc9881cc0efab8 \ ed0342f94ffebe96d5650f55c23b12a1 \ - 39cd2aade20a2eab4779f1a3db530209 \ + 10c9ec124683092e8fc0cb93ce0de640 \ cf52970ee52905ad114b93571dd9c6c6 \ - 2055aa2a8c9da89dadfd1e9012a26a20 \ - 6c14cc803de55e30a66331bb24e626d1 \ - d422955b622bd73be3e85d4e8fd2e2ca \ - 8dd01b9b3dadff7246c8afdc079f68ff \ - bd7e89cd9afc8d87dfa1f59eb403ea44 \ - aa1b8e906b7459f042f80b6574ee23e1 \ - f28e4363b28774af3f8127ed40bcdc9f \ - c1713950e7088b216d011fc5c2bdd661 \ - 6129e036328e2ec678c8d5d9be3c5e59 \ + 603aaa62874e458ebecb55bd8b249edb \ + 8a4686ec3b3d644f70e6780462a755b1 \ + 3391bb3a172bd8aab0c0dc61b31c459c \ + d39ccc2276d4c0b11ee46aa82d31acb5 \ + 4c5c5dd84fee3aa2dc530702bddc85e8 \ 59978ef7bcea7bc55e24d06a2d32a32c \ 493a2f042d86baa5c6bac75202c64554 \ - 732c54e5b65b869d7301eec81c97f6a1 \ - 889fdcd1499ef5939caaafab5c09729e \ - 4c21da37e71a52f26c8c5490f3ec4837 \ - 28925d0d3649d0577f07bc9ab288999c \ - 7718afd363b2ef45c28cbe9e06b562c5 \ - 1370f13d01572cc80e4a11bfbecd73c6 \ - c25e1a69f2d40b3f6f8dae4b4459413d \ - 65934957ea79137686ded549467e1329 \ - d59e1fe9834d52c50e2414a34945e479 \ + baac29564e83e3957b1976f3a1d92ba6 \ + a6242be0e2040974cb83dc7c4c67b761 \ + 8c1bba1510c915f915a9eca6fa95f476 \ + 19070d2b1f030565e3d994df2fd9cb6c \ + 3d2977b047e366303274ab03ebef1c2b \ + 9f40837910054385d663c557f735b03a \ + 3fa75bcd254d37247ec3e97bad1dd445 \ + 33ee4fa20d181488961006de02740b50 \ + 782fd3cac41045c0d89d69b90012d8b7 \ + e08921c68133df2e254fe723b368bae3 \ 52f1c0adc1d0fb68e8608b8c4faa3c71 \ - a1e1c92075e77d61acf61a094a68fa61 \ 8dab3b3ec00dc56cffde0b0c410d47b5 \ - 357f2bcdc622476ad883fe9d07f874c3 \ - 316fcebbe23696d8e2ec15617d4f5cb3 \ - 33c6a65a07354886102e917783ba4e13 \ - 5329468d3efc2b43dd628f8bdb4397e5 \ - 50217439ab76fc1ee930bf4df3804799 \ - af48680d31f067c33ef15f9a2a91c713 \ + 7ee8703970c3fa6a2e37893de742824b \ + bece18dd831ac2ce1e26e92271e6d832 \ + 5d404b52af03b999e7fb74fbe16d3bd0 \ + 8aa040d9c661f68ebb67d5b71813473b \ + 1e0ad6e5cdab371cabd218748fee9b6d \ + 74d9ab54981e8f02e7eb683ac0a8a6b9 \ 3763e6c936b1accbd2e9a7c8118793e0 \ - d641a02cecdf39645bef945598d49b35 \ - 1736d597947715518fb4928a67e37af3 \ - 53030efc4eb919791407c0b49790ffc3 \ - 49ccc67d2ee6e8506790f4bb551340bc \ - e567b304bfe4a274f7e974bd4c63ec3c \ - 0d0c5c91c20090babcfe008a5c59a490 \ - bd1291c8e5cb564d5418e874814c774e \ - 0cec39953242b532648f356dba65d0a0 \ - e3480971fb7f7462149056fd70df74e2 \ + 750ca4b374c5cd501a612a841f7362a9 \ + a46bd303e3155f7975b167af12435e5e \ + 1ab2952ce15d2f9cfe279821274133eb \ + 8071e8e030bee77619611dbb4e508864 \ + 32c8f5f8523fd26925e2a6495604bb93 \ + 53c91805e78e1ab2a34282be3aecbe94 \ + 324bb5f02dba12add6dc16c10bfbce6c \ + e62727696767b6ef195e3b50e42817c1 \ + 4824dbe307f1d20e74a4ebad2b7e4d6e \ c3ec5977ecc0f6244ef3be87f5325e72 \ - 7e3435db94bbfde52efb6e639cfff542 \ + d3f5e27649cc6184d1bca2d065d2a092 \ bb072f15d5e4067bea6933a4fbeb9c0a \ - 9486190bcfe1c4af6a50d265a113ac12 \ - eff6e29698ea257ad7fb7dd1e388e2e4 \ - 8290950f13be0f28845795158c343ce7 \ - 069aa7ed2552b2623af2a8e282baffb0 \ - 73f6c15be7000350ba8970c9c6545269 \ - 93bf413572d8ae35ce16f82b533e1b8a \ - 0c938328d6424744c46943938ed6a4ee \ - 2d6d28ec311884da69bcaf320ada8ad5 \ - 606e9b910c315b6197ba83fad7dd13a0 \ - 276a77a39cba360dfb2f45df2d71be9a \ - 509f1c8b700b622dd92656b3877f3f89 \ - e4abcad3267eb3d01687e21d46992235 \ - acf918834a1556abdbcda627816f3ff3 \ - dc1e00a2654c3b921658d01e1c617539 \ - ce8b343f8221ffb572b3a5b2b0702249 \ - b9f1f29a4012cc3c7bce83511f40c5b5 \ - f4e9294066cbc6503b6e0ef703a6b565 \ - 1b41b97d982520b7364a87a39e2a1ed8 \ - d7c035eba93308f73ce4f04ae2c9a674 \ + 92f23eb502ec2add616257ca9ea8823e \ + 27e0b5429881ec07a10c75803f572312 \ + 7bfceacb0504ab8f7cc961f0c81bb844 \ + 60134448c463c3e2645353f8de19f669 \ + fe5d62a5aa97e780833348f5d9a6ec9b \ + 3d41dae1c09c54f19d224f58e98e5a89 \ + e7c07242a95ee1df865efe9534e10a34 \ + 8d0a78969cbc0ceb1787bcd02430cefd \ + 6d39e92a8d9bac6e8613eae79b4ac637 \ + 97a0c8bef92ca2df111b6067deea1630 \ + 8dbc13bf4848e7a0f39572be8c9c319c \ + 5af6733a9e5107b2df46a32fa1e1ef7b \ + dd838e84196263901190504f44053a5f \ + 474ea5fc0ec36be109eba41e9ff92595 \ + 799f84552a7a943a492fb3f27f1d6b1e \ + 8488e9acd924b1baf4f97cbb3ca418f6 \ + 62b3edf8c2db7fccb1a6a41134b84e62 \ + d84097823667ed4c3f938da04a13992c \ 0372a8de508e57da4d4869f058bcb630 \ - b92fa50f56a1e06a7f1bf665442d4a73 \ + 4fd75413081a400a1c230f0700732611 \ 0b7994d1256215201bdfb810a357ffa2 \ - 4bb3ee6be8ce77402250dd0d0f26e131 \ 1d3e530a3410fc95a6987d70f84a6332 \ - 761cd5ae202c54efba117f5d68c57756 \ + ff7c38e023578064f54c98f7b0f7d2c2 \ + b57599fc2bb8cfd76567e656070d0d72 \ 656eb112c9634812796a81803b04a3e6 \ - 4e0c068ba38fa8e0aa6c46bce5e9d2ab \ d15066ccf2d33bbd8afdb9036ba47da5 \ - 5a454a33646271c81e6b2f70e8ca1b83 \ - c21c16e3bdc619cf65a31b23136d62ce \ - 92968aee56cb2f162a55008fedddbb78 \ + df09b038f991ff902161d83159d4871a \ + e685b43c1f198999c125bc7bbe084ab3 \ + e40d2efcee31e346fbc82277683422ea \ 4918da28fbc2f6888ad71c159996a9b5 \ c01022fe0357c10ca1d48b16187f81bd \ - 2dd38d9f88feab3e6067874e535dc758 \ + 8e87a3c1697ca04a19ebde7187f15156 \ 31667fab2083c342c85bb51c2cba6d58 \ - b6c59717dc5601672c3e73fa2258e64c \ - 1e49f16311d2a62e44c05750c0ec0dc7 \ fe77a3f609b6fd8d5b08f3b2ef14d2ad \ - c3425a02781d0bb3c4f8d5d025d12266 \ - 237b55fa488d3be0c5c6c0aba4dfa913 \ - 7e70355483fc2559770b4db2ff32bcde \ + f50aaf5171cbc0327f8d18a4ec7405fb \ + c3fe94727289a0f8f47b149810022900 \ + df401fb6d6fe40c02ecea514716ee96a \ + bd04a204662b00e7d773d0a753bd0928 \ 5f153f7135dceb02f88266121c836b4e \ - bab7df9c671c07b763e33245de65336b \ - f2ffcbe94a83f2437ffe47d7dbf4ad04 \ + 057d52b1e2b951597cc4a82876e7646b \ + 06e7dbde9932c6a9bac63d9288670678 \ + 5c98b89b530b563b6e5f6e1b631c4b35 \ b30ef1414dde99d96e89aeea2b3fc094 \ 73272fe4aadb91d550dca8fc7ead8bf7 \ - 75e2156746dcd795a4fcfeee4ce4953f \ - 0779350c00b03603f72eef7f737686ad \ + 3aefa31e8413112958290a6ca004b096 \ + 60bcdfbbaca59d4c147f4fa11c592c68 \ e155c3d45440413eec6db44f68a21b69 \ fba3b040a55c01be7376d3dd5c4d4920 \ 23cc9e52c52465f5b225e62ab7cc3457 \ d3d110551104b00b42c9920958939391 \ - 1286030c54134a42189f312a2671fa87 \ - 0f36c4a4835a1163b5c070ea94ababff \ - 2f4991ee29e75b732dbfbbe637506066 \ - 02e14c7718a87f6c90ba05b62fd5c706 \ - 5cef28504e265f32f3caec4684a5ead2 \ - 738cf4fc881596b1977847f0d393bfd2 \ + 03f9ff96b48b1a661e6804fe63d7d6a2 \ + c34dcfcdcf62d89900e94a6a7b1ed0d7 \ + 7077d380579b979cd864756ac90e3f9c \ + a087f8a5947ecf4e734ac9cfe695469c \ + 0764d84de2302fda8d1d72b95f31a0b8 \ + cc9ba5bc2cc1f60765c57f5d6cc10042 \ a63fa50b0954c349c74980347253f06e \ - 918e7eb38af0848dc112f929e73718a0 \ - 27688de4059dd10d56d79dc3db1e8786 \ - 06a6fac6e221a2496763bd255609c35e \ - 13ce2239c2c3873c6ea715c5d70a6021 \ - 7b9e2b22daa94d69a7e8515ae7ad3a1d \ - d5619cd692cdf95bddb994fa4351e4a5 \ - 1587213d8240da87a9593fa110654c7d \ - 2ba6cd31b6ef69fdcbec450eb07fb2ed \ - 66f2e78effb16e788e09b6b2c353c26e \ - 1a9824f887b3ef3150c93c087bbb10fb \ - 067ca67cf5dc5d2eb25c03e491ceb395 \ - bd13e165196e3470237b852d347cbb9b \ - 591b0243c421bf8e6df09e3209fce861 \ - 06356b72118cb4ea0f63177479b7575a \ + a2db9e4d802b919606c596d7d95ef251 \ + d07af7d3cab8ed749a8310a89be6b1ff \ + 4ba60e706b5e69a88192ff773b27a229 \ + 58d0064087bc800cf6ee10d667651491 \ + 84a3537d01f17e0e19f28000bb445c6b \ + 2721e88844fd0335095f7e99df1ebbb9 \ + 0bedbc5d1b29e4d6a7fbae0e6d1e146a \ + e85f829193ea1afa080dcff7f77cf945 \ + c6acde76d0fbb62b7eda3857d8a73436 \ + 9e3ea187f6e3f01e3c9590782c744b3e \ + c000dfa6a77a58ede02be41418056bf3 \ + 9e0bf233b47424b8449a928bd31a1470 \ + 9160664d20c024783323f5b90ca74d2d \ 6fa7c4b0da26b511570845e41527bc8f \ - 426eb9e22cbb36480e13fd265be87b4c \ - b31bf94ffe7e0f2ada93afae1076eaeb \ + 825ecc659b700477535aa5c7dea95a82 \ + 40e508baeee8cdccbc471489b0f449ff \ 7b3195612bc6090f0fa759e747a9e91c \ 7c81e7a61ec172a229d6fdbc553e883d \ ccc5ff9ff4a431e36c0b6dd9f640ab58 \ - 94b8bf179385ff071bdc33b58bf047c0 \ + 5ac809692422b722eaded90be3c4d9c2 \ + d75b1c734f85b007c55ca84217df4201 \ 76124c2327f642cddf19a4aa50cbcb7d \ a362e890dd0dfe51ecd95a4a1be6e28c \ - 8b708bc4b33c5e1683467444c9ed41b0 \ - bb21a8ff26ec16bc15758b1625bc0f46 \ - a8a1c536701e539cdce215fd7f55de9f \ + b0a7859b81eeead5a15800d489e07347 \ + 4604959975c2154a14f6b5e97444e2c8 \ 5a4f0e9922683867565531089e3c417f \ + 4917ff4eaed099a21ff16b96f0df49cb \ 1a6e77e2f6f916ef7a5a9481ed426b76 \ - 7e395ce2e673b7d9665751cbbe3cbcdc \ - 5f5168cd7b4aad8ae68f4d1e32a1e0e2 \ + e01c75ca9113d2af67ae903fa39e14be \ 97b832ecaac0eee2b644fd42f2931160 \ b235f97b3139681d61419166e7c00e3c \ - e3bd46e4620b19864b2dd3542bb14c1c \ - b97a98b82065343e45f160671f6ffe8e \ - f17aecb8887cf0ecd823623160aed7db \ - 8e44066df6dc8663faaab84eddabf721 \ - 1081c01b2d9b17a33c3d0156193be592 \ + c45800f4dfb888a928c772b081065214 \ + 2e504fc2b79dc46f983c960e30be1702 \ + 675fcfdbc94cd10b26b71965d3c3807b \ + bd9b057de16e5b299bcda0894cfd823e \ + 420f93a43fa603c1253213bdf28983df \ + ebe381c6ee4281c78701e79a2cf90bc8 \ + 0ce3cb22636a6b7992a2cd5b106f54ea \ 9c414752deabb69c93aa3911422a960c \ - c71701508a4b5fa358c3efc4f0469fa2 \ + 4b8c01a755ea55d3344d9ccb07c093ca \ 56c34619687723fa3fc23213471e8545 \ - 073b4c53e303ccf2a807dfce7f5e986a \ - 44ef8a2279dadf391881a69c60d29197 \ - 00ebf3254ed74711c1f6717de3012350 \ - a0de6eabdeb1320350abcbd7c02df6ac \ - 09adf9a15c5576d25da061a0e576d056 \ - bee49068dd525d22d350dcd0d7543183 \ - f1917a7199fd7217e71efa6bbcb715cb \ + a8ec1126ef06244ac1e3773981a005f1 \ + 4b9ee6818517941de3ad6d645b77af3a \ + d631c116041b5f68abc8680fa82feedf \ + c0e036fd990d0c9cae11b5876a5cb572 \ + c5e50e299295e662ad19c58428d6e085 \ + a8bd18783d4b87808a6dad6814f297b6 \ + 2493cc854d9a4fb0a1ed78595a5b667a \ b4dcac855af5df71f3383d86c4a96b78 \ aecd889de42c8168e1bc97a6f2720d8f \ fd9aa273ad560dedd00ddcf3dbe808ce \ - e1a629a86bfa03f5c17180a8b213c74c \ - 980c225025b646fa54a9450d22688ad0 \ + 0b06dd6bef5cc7724c3daf6c900d38d0 \ af692853d165edb9c5df23627b2f8e04 \ e460418ee4f5508bc53c97e809331882 \ - dc9b023a3d3833fa5a853d950b54d944 \ + 9e544fc057bf6032dd55b02f87b8dbf4 \ 653e04baa68a4484b3b839c19221e474 \ 907244c0d3791f3f981c7cc8e4cad0a3 \ - 99094dc9de392d7b233df089aaec5589 \ - 481cc7357cb8bfd6a728e7b47dee84b1 \ - 18d9fbe67f19564599ed55389e357232 \ - 6475ac2c917c96d375eb56f1761eea0a \ + 50bcf9c0d46f49e8fdbbe9ffa1a73c56 \ + 7e12f02e9742f49de13bbeacfe2906b8 \ + f1adbc335ff6dd6692959688dedd9484 \ + af00c723f5d3b3e4e6e388e98d6bf7f1 \ 205459def23510e8815562e73a65c898 \ 12e4ba5909e1f30b9142932571eaa4da \ - 1be45f99109d447849f4244b58c5a470 \ - b1713fb3ae03d434680cff5fb4c14144 \ - 1dd7189bccf7a3cfb69fd1dc213f660e \ + 233dee08f26c9cbe78f29b66c0c20ccd \ cf2f0435bd5b5111fea46e8d9dc6522d \ 7e264bc8f23a45ad680668cb5e57d9fd \ - c7ce684666ac9c76223b1a0a5034ce99 \ - 655de4844e5024d64d6c45296ec1ba42 \ - 445f5eb8b47aa8f2ff66b5f5bca00096 \ - ee800c5e7efc827cefe64af7d380cea5 \ - c775911c38f984e3cacad6c3d0691618 \ - ce6dde2ea2691fdd97632fb8c9b3e042 \ + f490982aceabdbd515348f63e638a782 \ + 37cf6acd1c3259eefeba636e4cc9b365 \ + 228eb40a277a6dda01626b6e9287ee66 \ + 8ff78776b6140283bd558ad74554cb16 \ + 5e9fce0f8489727426f9b155cd08d8e3 \ 07c75fec267864bcbb800ca7709ceae2 \ - 57a5575d623bcbc7ba5c033c9f87744f \ - 2c7870ed53f4e906876bd7901a10164f \ - 5c69337d37e58a380e00eac9ce0373bb \ - 61d3f525a24a154550d2d307121f89dd \ - 517af3607e2042ad806635bec4b1780e \ + 42b88767a9db3d9fe6e59b5dff52abf5 \ + 1d827ececfe381f71248b88ec399f359 \ + ae91c97885d67994a342820cf7d59fb2 \ + d6291d0e18f55b8364b36a7f5e1af699 \ + 5ecf56203dda9419751b532d99c3601d \ + 0baac9bed3d6065b6128aa8a888e5eb9 \ 6a32bab57772c3a1146d599b65ffb0cb \ 7d76a523677de261dda1b65d29a93c4e \ - cd9614d4d4afcfe5e26c118a42120d40 \ - 5770ccff26d6481010ab6c6006cda25a \ - c2a8746886f9f7bcc8fb9dd539183e44 \ - 4785f3ef9f313f11aae87120112c45b6 \ - 41defdffa40e7cbcc7e17a933c5660ab \ + 5af0856196b1bb934f25a66b082c4131 \ + 256e8677308aa17acc8c82b54d8a4fae \ + 1810d970f84683a419d7b9aa6740f8a6 \ + aca51d2a40262bfd8e69fbf6b2b01ed2 \ + 418d3ebc9610905ab514667dad302f56 \ ee7a5f842c39bc47c474196e83b0df5f \ e30085994bbeb4b7f4895d48216d5476 \ - a1626b8f4d165b1b60d960862eba4cf0 \ + ae5dab3db7dc317e16bb6f9e7eb15d14 \ a661e92ffd6cb9f0893126e3cde3fffc \ - 16111f31a29feae4ce4a324b83dc0189 \ - 2793ed3e6807d79ff72271baec586531 \ + 4a80ab58144fc731cd12abc6d5139d7f \ d1e5569ab3528bea44f2a7ebb1ec0a35 \ - 267efbd05da2900424b1fa6e841d1280 \ - 39cfd27d1728af99cbae763b4f81acd3 \ + 6b5c7401117316735435311bf551515b \ + 82401c70623ccc1bfc0bcb5c3b0ac8b7 \ 0538d1da369f3e3f0412aa4d735c1b61 \ - ee620998fafcd5665f24897e37c0d57e \ - 961872666d1de352fd4936d0b18581dd \ - 6eb014e73f66bc13226e0ef6d815d375 \ + 4ac453abdecd6346f92989b4f789ac84 \ + 1e585d25db7b5bb009b060befc74e9fe \ 7b1261ea730a9314bc9bcdf4a379bf98 \ 93aeba00993f0ed8c474864e455cf584 \ fdf3aa5e1f6c33e4f68b0f7b08e1e94e \ - 4ca29f2ce41fb9f282c527c1d8ae5cc4 \ + 7fe15f165a1812b23e5b1980aa364de2 \ 2d8d8b377d144f5e32b4f65a69eb0b24 \ - 0bf4ac47fef874d61250f4d4afe4866b \ + f505a218806e44b2369671089d65e839 \ + fc60e4ecd18db5e582b9e7dd19dd62e4 \ b4a0a98a54439a5a37952c8879187ee3 \ - a661bb863762e9f20761215a7650e6d5 \ - 4b09ca5c71f379ebcfa3c06222a082b2 \ + f916271c81cfe339d66df629e3828392 \ d2cc4e584ed64165fc56d2c9081eb3ee \ - 3828d2d048ce354388c0de6ba5649754 \ + 461fc1209ec16fb35a70adebd0f3c09f \ 42408be0352a76b14f1e77a6b8858a77 \ - 2d82330c9f218f42ccc9e44c2d18ff8f \ - 3338953ce1388e5ff5fef5aac76ab1f5 \ - de68d2e964ba3b051ca2107aa12ebe4f \ - 7ade79d246bedd718a9eac604282dab2 \ + c8ae0dd2469d51f273abdbfb24adceac \ + 7c532e05dc3b2bd295136a297260c4dc \ + c8f9eb4d5f0173b70647e559b03e85fb \ + e3932c56e06c7d1e780242ca5feba32f \ 82078b82ed1c52aac9552a39ead691a0 \ - 602d4f1e2fe53f870b70e83c8cee49db \ - e3e93a5606f450c13fcad764fa1c4bed \ + ff221db0109795b44f92352780cd1901 \ + 74d8afce717ff89fb2cb5141f121782b \ + 9420cc533b8572ae0d04750421127f80 \ 31bc883e6f9b36925f55460401197274 \ ce622fdb8d18cd1c13ed8fadc5400c10 \ - 0bfb08b9dd5df72ba5ed7d74dd5fe6eb \ - 22e95901b912671da26457ac33e36a23 \ - 9b7ebf6b588afaad70bf48a742973a30 \ + e4e7efe2ab7921499d5c247a349e9e1f \ + 21b43d5721b3a9c16059acb691f4314d \ + 2fcf5fe983975bbcea43129c9fb31923 \ 06ed54fefb2e737e18d586bfa7ad44fe \ - a8014a7c865aa54f305e8cda3ef02019 \ - 362eebacce3b2c9204fdef6d1c04d757 \ + 6249245cf12427da0a4f37bc3d294ff4 \ + f8839491f88f7a15ac8a5bdd787de442 \ c9defe80406280bcfce4ecf31c0200b3 \ 43661dc16a38eb42bd49a11b9f00d6f4 \ 82d98dc87dc8503400aa095f5aa70f13 \ 8e053c23f1d36fbf3f276fbf501e3e35 \ - 8efa8e23cddda0540efe4ba8ff60840b \ - f05de931658b166a05c5520720fdba07 \ + 67def8e3d7d4b26b803a2d0799ef31b9 \ + 8f6b6cc71be0473b79c65abfea592c07 \ + 10e133f0f33f0f41bc7fdad56e85a35b \ 73ff8cffc66d065488dcf50e3b8c0c1f \ f29a1bb1b5f3f29cedb36f40f720d765 \ - 36c7197f00034ff87f3b849dd6b98b6e \ - 3d2277774414ad0f59584e7021b9be06 \ - 44e45d4d9b0904fd06d6f46107eda592 \ - 66345b13fd97229fefe61ba6457dfe66 \ - dc9491aba5e393b587f4bbffab58ed52 \ - 5f0470696baaa4e5953bddbf196998f9 \ - c678a7da0ee4b850ebde0474144a0415 \ - 3516a8d8c8e682ac47b252c447fcea75 \ - d6f24a12196b2e717d4fd869f3410e7f \ - e2d8018fa3841938e750da57b706852c \ - b5670d9b6d6560440845d23ca563d44d \ - b21820f2664242498beba7783b32bef4 \ - 7a55379fb7eaef176e373798441e7836 \ - bc4ac3f5c142859e5dfeb45a31866eeb \ - 60d7c3a9f75ac64cffbb9ccda7c1c8e5 \ - 97e8197912c3d06f0b7486d07c31e182 \ - 45c1d005c5df9e62640b4bbb1f79090a \ - e3189db1511d7f2fe59fd1b15ebac8ff \ + ebdff467249aa3dca005a441dc824236 \ + cc180843b3b626ede01ebd9a0d9fbdaa \ + 3e61457993a6e3fdaaf2fbe82bd7dff3 \ + 9d66208e00715217a8c1f2e40efe4a0c \ + 90a6772f747261b181e3801bf51d9379 \ + 7bfcad253aff26bc26c5e3521f3ba891 \ + 4625feab41aceeb81e268cf272a8cb43 \ + 64c940cf10c49b34761e1a4dbf2b023f \ + 97aab350fb2614818580f00d1fb284ad \ + 3b23aa9eb619cbfd68d96719db904597 \ + db6fe956ec67f88412df3a627158a7ba \ + 519bfbdd19531f1d7b775bfa7ce4ee80 \ + 6a50f7029b3a8cc76f5f50ef9ee0b4aa \ + 610bf72284e8f22d831d2f4ab3b87809 \ + b7bf9803f61dcdcfc0bc07dfe5c6c249 \ f601f89fde92362c93611ef2358e1bc1 \ - a25ff12cdf468d4a5b4bf75b7fc6d743 \ - 63ce54e1fcbbdb45c15146fd082528bb \ - 11ad59bd731103e90d688afc5f35271b \ - 39ad78aa5442d71ddece93677f24d408 \ - 19f44a64888c1c2ff5ac943b066141f1 \ - e522898b2cb1fd23af2695324b3a5c78 \ - c12d182417999fc365f952e701f6071f \ - 7d6d4fc9fad200d6e295f6930e97e022 \ - 41a9cb1cc86d75f991241c9c3f725556 \ - 4518a0588a916a89400a31c2064a60ce \ - 6e71c4d256f4d02355b5b722e7d481be \ + e876964c7b83db85fb7897bee7ad0f45 \ + 7b38b145ae3f6d7d09a1a7a98396f1a2 \ + 6cae4969689ecc3b4b4c31a9fb9539a6 \ + dfbd8371187d9453f7461825972272bb \ + 10291d9a0022076bc0827250816d3476 \ + a42cc2834b2150027d7b427558a87803 \ + 087bfc476e9d73628cebd265590f11f7 \ + eb721c4d9e5dba8f93e9de0a80036ec3 \ + 43f743c17293ad2404a9a4967f4e570b \ + c9bde3bd6ba907b5319657c3b65e1191 \ e900a384ac7dbb320fe6a7279fbfef89 \ c4769705079e88d68739e6089e8769a3 \ - d4e6a3f2d7286408592d08defd7de156 \ + f15c7457b6f2e06ee2037472d2f9a0fd \ d18d362345c4fe512ef67b738b239fb8 \ + 689203efc084fc0f1d1f74f5d354ae75 \ 274f9bcda1e4afd4a290329eff9267ad \ 580dd7d12690c726da7d5075f3442a74 \ e334c03160b1e0989c2a71ca55f631fc \ - a312b55a428f827a91097d1d8497b02b \ - e972ea58ec203bfa6c79c1207852298b \ - 5ad255225437a92850eaea3cd7aa0051 \ - a277676f11a4b8df65f0bd10cf91c34d \ - 6dedf2077979fbca816469b7685d9e28 \ - 8c58a7b08dcaaf1e6bc55616ce88582e \ - edd96c9a12dc3e04aa4d9a345ee6dd0f \ - eff90729cd4a439c36ff89f3ee0904d0 \ - d04b3c91526662b97397fc1e04e007b1 \ + a061ad1db3e0d839725b037ff8be84e7 \ + 89f443c919328fcc7b985e262823f0ab \ + a4dca633705dd04abd9a35e0b794d3d4 \ + e5e5a1190e8e84eda279934d60ec4d48 \ + 5909d8a50e0749f6aa8cfea853f161f0 \ + 37869fac434114d80ef4af359f0a6a12 \ + 4b9f324ed896f7e327f561e2341ac9ea \ + 812034252008acfa704cbc65c505bdf2 \ 20cfa8aba7521c8767344b06c39479f7 \ 0498c4a11448bfc35dc7bb2caa64c753 \ db96b50050277bf05a3c68534bbb9586 \ b9e37d5fc4ad28b612b78ad37816684d \ 09de9d01e7331ff3da11f58be8bef0df \ - 110789f2dd21a2ea820ebed976b4b1c2 \ - b58284cb8ce52b8de07e09f4f8fb9653 \ - 25cf36fbb4f7adb02f3d9fa24ccaef4f \ - 5ac131337793334dce7adbf1116671b3 \ - 8f5702706600f24bf7332043c15aa566 \ - dd86cb477e0b0b1411a5c92cba244b42 \ - 0f6b457ea783c088dff026ce39ce72ca \ - 23d20707b55228cb9b4328a26ddca724 \ - 62e05b432403f316d86f7af8af0839e3 \ - 8893d419a205b225e4010d7d02a15c6a \ - 1da18746ec7044fab3be0166f21975fa \ - 98c6613744636d05e6cdd64d6a74bba8 \ - 1cb886a35a22cdc6b930f58e748ca172 \ - 2af5c75a55a2e46662c060100d5c3222 \ - b063b98a03b5b198c528b842e1530a95 \ - 19e6057d49c1b26f0cf24cd98d88553f \ - 5d6f4bdeea0e991c8b894331501a6c04" + 57b0fdc06f3330e9cafafe88af48c0cf \ + 1736946acda05e1e94b814f3e3c0145a \ + 803148006d757487c3767bcdfffd8eb1 \ + 0fa82df5a92ae7acde1f67130935c17b \ + 53fc83d016a4a5c3d69a099eb3d10e1d \ + 7a5233ce3372d0ac3adc2c85f616e3ad \ + 338a919a7f8b6a7b1eb23272a2b7a237 \ + 0137ff709b7fe58cc99d835bb01a84bf \ + 71835a55bbab1c98313163f2fe78138e \ + 9196c9f6e81d7775d63a9444b4fdfd3d \ + 9a3b018157fc6d55b895dd429e54bcc2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libadwaita" diff --git a/multimedia/svt-av1/changelog b/multimedia/svt-av1/changelog index bb5e72ef9c..7a9d90ac55 100644 --- a/multimedia/svt-av1/changelog +++ b/multimedia/svt-av1/changelog @@ -20,3 +20,7 @@ Updated to version 1.5.0 06/02/2024: Updated to version 1.8.0 + +23/04/2024: + +Updated to version 2.0.0 diff --git a/multimedia/svt-av1/svt-av1.SlackBuild b/multimedia/svt-av1/svt-av1.SlackBuild index d66709b419..7ed3a966e9 100644 --- a/multimedia/svt-av1/svt-av1.SlackBuild +++ b/multimedia/svt-av1/svt-av1.SlackBuild @@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=svt-av1 -VERSION=${VERSION:-1.8.0} +VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -DIR=${DIR:-SVT-AV1-v1.8.0} +DIR=${DIR:-SVT-AV1-v2.0.0} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/multimedia/svt-av1/svt-av1.info b/multimedia/svt-av1/svt-av1.info index 9db5e3318e..2ab059c95e 100644 --- a/multimedia/svt-av1/svt-av1.info +++ b/multimedia/svt-av1/svt-av1.info @@ -1,8 +1,8 @@ PRGNAM="svt-av1" -VERSION="1.8.0" +VERSION="2.0.0" HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1/" -DOWNLOAD="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v1.8.0/SVT-AV1-v1.8.0.tar.gz" -MD5SUM="9dbfc9b448cf50835b86b07803d4769b" +DOWNLOAD="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v2.0.0/SVT-AV1-v2.0.0.tar.gz" +MD5SUM="8ed7d1859108ef57985507a94c749172" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch deleted file mode 100644 index ea737c8b09..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.gentoo.org/401287 - ---- filter/filter_pp.c -+++ filter/filter_pp.c -@@ -38,8 +38,8 @@ - - /* FIXME: these use the filter ID as an index--the ID can grow - * arbitrarily large, so this needs to be fixed */ --static pp_mode_t *mode[100]; --static pp_context_t *context[100]; -+static pp_mode *mode[100]; -+static pp_context *context[100]; - static int width[100], height[100]; - static int pre[100]; - diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch deleted file mode 100644 index 871d073fea..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch +++ /dev/null @@ -1,303 +0,0 @@ -Fix build with ffmpeg 0.11. -https://bugs.gentoo.org/show_bug.cgi?id=419551 -Author: Brennan Shacklett - -diff -urN transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c ---- transcode-1.1.7-orig/encode/encode_lavc.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/encode/encode_lavc.c 2012-07-03 10:47:03.528009149 -0700 -@@ -114,6 +114,7 @@ - - AVFrame ff_venc_frame; - AVCodecContext ff_vcontext; -+ AVDictionary ** ff_opts; - - AVCodec *ff_vcodec; - -@@ -1036,14 +1037,10 @@ - SET_FLAG(pd, mv0); - SET_FLAG(pd, cbp); - SET_FLAG(pd, qpel); -- SET_FLAG(pd, alt); -- SET_FLAG(pd, vdpart); - SET_FLAG(pd, naq); - SET_FLAG(pd, ilme); - SET_FLAG(pd, ildct); - SET_FLAG(pd, aic); -- SET_FLAG(pd, aiv); -- SET_FLAG(pd, umv); - SET_FLAG(pd, psnr); - SET_FLAG(pd, trell); - SET_FLAG(pd, gray); -@@ -1064,6 +1061,18 @@ - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; - } -+ if (pd->confdata.flags.alt) { -+ av_dict_set(pd->ff_opts, "alternate_scan", "1", 0); -+ } -+ if (pd->confdata.flags.vdpart) { -+ av_dict_set(pd->ff_opts, "data_partitioning", "1", 0); -+ } -+ if (pd->confdata.flags.umv) { -+ av_dict_set(pd->ff_opts, "umv", "1", 0); -+ } -+ if (pd->confdata.flags.aiv) { -+ av_dict_set(pd->ff_opts, "aiv", "1", 0); -+ } - } - - #undef SET_FLAG -@@ -1184,18 +1193,18 @@ - { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, - { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, - { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, -- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, -+ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, - { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, - { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, -- { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART }, -+ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, - #else - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, - #endif -- { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV }, -- { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV }, -+ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, -+ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, -@@ -1387,7 +1396,7 @@ - pd->confdata.thread_count, - (pd->confdata.thread_count > 1) ?"s" :""); - } -- avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count); -+ pd->ff_vcontext.thread_count = pd->confdata.thread_count; - - pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd)); - if (pd->ff_vcodec == NULL) { -@@ -1397,11 +1406,11 @@ - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec); -+ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts); - TC_UNLOCK_LIBAVCODEC; - - if (ret < 0) { -- tc_log_error(MOD_NAME, "avcodec_open() failed"); -+ tc_log_error(MOD_NAME, "avcodec_open2() failed"); - goto failed; - } - /* finally, pass up the extradata, if any */ -diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c ---- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 13:15:23.918019415 -0700 -@@ -122,6 +122,7 @@ - static AVFrame *lavc_convert_frame = NULL; - - static AVCodec *lavc_venc_codec = NULL; -+static AVDictionary **lavc_venc_opts = NULL; - static AVFrame *lavc_venc_frame = NULL; - static AVCodecContext *lavc_venc_context; - static avi_t *avifile = NULL; -@@ -180,7 +181,7 @@ - - - /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ --#include <libavcodec/opt.h> -+#include <libavutil/opt.h> - #include <libavutil/avstring.h> - #include <libswscale/swscale.h> - -@@ -470,7 +471,6 @@ - } - - TC_LOCK_LIBAVCODEC; -- avcodec_init(); - avcodec_register_all(); - TC_UNLOCK_LIBAVCODEC; - -@@ -634,7 +634,7 @@ - lavc_param_rc_max_rate = 2516; - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; -+ lavc_param_scan_offset = 1; - - break; - -@@ -674,7 +674,7 @@ - - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; -+ lavc_param_scan_offset = 1; - - break; - -@@ -887,7 +887,7 @@ - lavc_venc_context->thread_count); - } - -- avcodec_thread_init(lavc_venc_context, lavc_param_threads); -+ lavc_venc_context->thread_count = lavc_param_threads; - - if (lavc_param_intra_matrix) { - char *tmp; -@@ -1065,15 +1065,10 @@ - lavc_venc_context->flags |= lavc_param_closedgop; - lavc_venc_context->flags |= lavc_param_trunc; - lavc_venc_context->flags |= lavc_param_aic; -- lavc_venc_context->flags |= lavc_param_umv; - lavc_venc_context->flags |= lavc_param_v4mv; -- lavc_venc_context->flags |= lavc_param_data_partitioning; - lavc_venc_context->flags |= lavc_param_cbp; - lavc_venc_context->flags |= lavc_param_mv0; - lavc_venc_context->flags |= lavc_param_qp_rd; -- lavc_venc_context->flags |= lavc_param_scan_offset; -- lavc_venc_context->flags |= lavc_param_ss; -- lavc_venc_context->flags |= lavc_param_alt; - lavc_venc_context->flags |= lavc_param_ilme; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_venc_context->flags |= lavc_param_trell; -@@ -1203,7 +1198,6 @@ - - lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; - -- - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ - if (lavc_param_video_preset) { - avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; -@@ -1241,20 +1235,39 @@ - } - } - -+ if (lavc_param_scan_offset) { -+ av_dict_set(lavc_venc_opts, "scan_offset", "1", 0); -+ } -+ -+ if (lavc_param_ss) { -+ av_dict_set(lavc_venc_opts, "structured_slices", "1", 0); -+ } -+ -+ if (lavc_param_alt) { -+ av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0); -+ } -+ -+ if (lavc_param_umv) { -+ av_dict_set(lavc_venc_opts, "umv", "1", 0); -+ } -+ -+ if (lavc_param_data_partitioning) { -+ av_dict_set(lavc_venc_opts, "vdpart", "1", 0); -+ } - - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(lavc_venc_context, lavc_venc_codec); -+ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); - return TC_EXPORT_ERROR; - } - -- if (lavc_venc_context->codec->encode == NULL) { -+ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec " -- "(lavc_venc_context->codec->encode == NULL)"); -+ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)"); - return TC_EXPORT_ERROR; - } - -diff -urN transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c ---- transcode-1.1.7-orig/export/ffmpeg_cfg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/export/ffmpeg_cfg.c 2012-07-03 10:09:25.011003254 -0700 -@@ -160,9 +160,9 @@ - {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, -- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, -+ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, -+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -@@ -211,7 +211,7 @@ - #else - {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, - #endif -- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, -+ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, -@@ -223,9 +223,9 @@ - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, -- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, -- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, -- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, -+ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, -diff -urN transcode-1.1.7-orig/import/decode_lavc.c transcode-1.1.7/import/decode_lavc.c ---- transcode-1.1.7-orig/import/decode_lavc.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/import/decode_lavc.c 2012-07-03 10:21:46.085005182 -0700 -@@ -181,7 +181,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -urN transcode-1.1.7-orig/import/import_ffmpeg.c transcode-1.1.7/import/import_ffmpeg.c ---- transcode-1.1.7-orig/import/import_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/import/import_ffmpeg.c 2012-07-03 10:19:36.936004841 -0700 -@@ -314,7 +314,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -urN transcode-1.1.7-orig/import/probe_ffmpeg.c transcode-1.1.7/import/probe_ffmpeg.c ---- transcode-1.1.7-orig/import/probe_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/import/probe_ffmpeg.c 2012-07-03 10:41:42.782008306 -0700 -@@ -99,8 +99,8 @@ - - TC_INIT_LIBAVCODEC; - -- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, -- NULL, 0, NULL); -+ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, -+ NULL, NULL); - if (ret != 0) { - tc_log_error(__FILE__, "unable to open '%s'" - " (libavformat failure)", -diff -urN transcode-1.1.7-orig/libtc/tcavcodec.h transcode-1.1.7/libtc/tcavcodec.h ---- transcode-1.1.7-orig/libtc/tcavcodec.h 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/libtc/tcavcodec.h 2012-07-03 10:34:43.648007213 -0700 -@@ -53,7 +53,6 @@ - - #define TC_INIT_LIBAVCODEC do { \ - TC_LOCK_LIBAVCODEC; \ -- avcodec_init(); \ - avcodec_register_all(); \ - TC_UNLOCK_LIBAVCODEC; \ - } while (0) diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg.patch deleted file mode 100644 index be7a6cbaeb..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- encode/encode_lavc.c -+++ encode/encode_lavc.c -@@ -955,8 +955,6 @@ - /* - * context *transcode* (not libavcodec) defaults - */ -- pd->ff_vcontext.mb_qmin = 2; -- pd->ff_vcontext.mb_qmax = 31; - pd->ff_vcontext.max_qdiff = 3; - pd->ff_vcontext.max_b_frames = 0; - pd->ff_vcontext.me_range = 0; -@@ -1116,8 +1114,6 @@ - // handled by transcode core - // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, - // handled by transcode core -- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, -- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, - { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, ---- export/ffmpeg_cfg.c -+++ export/ffmpeg_cfg.c -@@ -34,8 +34,6 @@ - //int lavc_param_vqscale = 0; - //int lavc_param_vqmin = 2; - //int lavc_param_vqmax = 31; --int lavc_param_mb_qmin = 2; --int lavc_param_mb_qmax = 31; - int lavc_param_lmin = 2; - int lavc_param_lmax = 31; - int lavc_param_vqdiff = 3; -@@ -143,8 +141,6 @@ - // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, - {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, - {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, ---- export/ffmpeg_cfg.h -+++ export/ffmpeg_cfg.h -@@ -13,8 +13,6 @@ - //extern int lavc_param_vqscale; - //extern int lavc_param_vqmin; - //extern int lavc_param_vqmax; --extern int lavc_param_mb_qmin; --extern int lavc_param_mb_qmax; - extern int lavc_param_lmin; - extern int lavc_param_lmax; - extern int lavc_param_vqdiff; diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch deleted file mode 100644 index 9a770a6a0d..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch +++ /dev/null @@ -1,557 +0,0 @@ -Fix build with ffmpeg-2.0. -Fix segfaults introduced by wrong usage of the av_dict API. -Fix forgotten parts in the libav9 patch. - -Index: transcode-1.1.7/encode/encode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/encode/encode_lavc.c -+++ transcode-1.1.7/encode/encode_lavc.c -@@ -74,6 +74,9 @@ struct tclavcconfigdata_ { - int lmin; - int lmax; - int me_method; -+ int luma_elim_threshold; -+ int chroma_elim_threshold; -+ int quantizer_noise_shaping; - - /* same as above for flags */ - struct { -@@ -114,7 +117,7 @@ struct tclavcprivatedata_ { - - AVFrame ff_venc_frame; - AVCodecContext ff_vcontext; -- AVDictionary ** ff_opts; -+ AVDictionary * ff_opts; - - AVCodec *ff_vcodec; - -@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou - TC_CODEC_ERROR - }; - -+#if LIBAVCODEC_VERSION_MAJOR < 55 - static const enum CodecID tc_lavc_internal_codecs[] = { - CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4, - CODEC_ID_H263I, CODEC_ID_H263P, -@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern - CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3, - CODEC_ID_NONE - }; -+#else -+static const enum AVCodecID tc_lavc_internal_codecs[] = { -+ AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4, -+ AV_CODEC_ID_H263I, AV_CODEC_ID_H263P, -+ AV_CODEC_ID_H264, -+ AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2, -+ AV_CODEC_ID_RV10, -+ AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1, -+ AV_CODEC_ID_DVVIDEO, -+ AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG, -+ AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3, -+ AV_CODEC_ID_NONE -+}; -+#endif - - static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR }; - -@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL - static void tc_lavc_config_defaults(TCLavcPrivateData *pd) - { - /* first of all reinitialize lavc data */ -+#if LIBAVCODEC_VERSION_MAJOR < 55 - avcodec_get_context_defaults(&pd->ff_vcontext); -+#else -+ avcodec_get_context_defaults3(&pd->ff_vcontext, NULL); -+#endif - - pd->confdata.thread_count = 1; - -@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.mpeg_quant = 0; - pd->ff_vcontext.rc_initial_cplx = 0.0; - pd->ff_vcontext.rc_qsquish = 1.0; -- pd->ff_vcontext.luma_elim_threshold = 0; -- pd->ff_vcontext.chroma_elim_threshold = 0; -+ pd->confdata.luma_elim_threshold = 0; -+ pd->confdata.chroma_elim_threshold = 0; - pd->ff_vcontext.strict_std_compliance = 0; - pd->ff_vcontext.dct_algo = FF_DCT_AUTO; - pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; -@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.noise_reduction = 0; -- pd->ff_vcontext.quantizer_noise_shaping = 0; -+ pd->confdata.quantizer_noise_shaping = 0; - pd->ff_vcontext.flags = 0; - } - -@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC - - pd->ff_vcontext.flags = 0; - SET_FLAG(pd, mv0); -- SET_FLAG(pd, cbp); - SET_FLAG(pd, qpel); - SET_FLAG(pd, naq); - SET_FLAG(pd, ilme); -@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; - } - if (pd->confdata.flags.alt) { -- av_dict_set(pd->ff_opts, "alternate_scan", "1", 0); -+ av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); - } - if (pd->confdata.flags.vdpart) { -- av_dict_set(pd->ff_opts, "data_partitioning", "1", 0); -+ av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0); - } - if (pd->confdata.flags.umv) { -- av_dict_set(pd->ff_opts, "umv", "1", 0); -+ av_dict_set(&(pd->ff_opts), "umv", "1", 0); - } - if (pd->confdata.flags.aiv) { -- av_dict_set(pd->ff_opts, "aiv", "1", 0); -+ av_dict_set(&(pd->ff_opts), "aiv", "1", 0); - } -+ if (pd->confdata.flags.cbp) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); -+ } -+ -+ char buf[1024]; -+#define set_dict_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ -+ av_dict_set(&(pd->ff_opts), opt, buf, 0) -+ -+ set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); -+ set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); -+ set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); - } - - #undef SET_FLAG -@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri - { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, - // { "vrc_init_occupancy", }, // not yet supported - { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, -- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -+ { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -+ { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, - { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, -@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri - { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, -- { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, -+ { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - - { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, -- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, -+ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, - { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, -@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns - - pd = self->userdata; - -+ pd->ff_opts = NULL; -+ - pd->flush_flag = vob->encoder_flush; - - /* FIXME: move into core? */ -@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts); -+ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts)); - TC_UNLOCK_LIBAVCODEC; - - if (ret < 0) { -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -122,7 +122,7 @@ static uint8_t *img_buffer = - static AVFrame *lavc_convert_frame = NULL; - - static AVCodec *lavc_venc_codec = NULL; --static AVDictionary **lavc_venc_opts = NULL; -+static AVDictionary *lavc_venc_opts = NULL; - static AVFrame *lavc_venc_frame = NULL; - static AVCodecContext *lavc_venc_context; - static avi_t *avifile = NULL; -@@ -486,7 +486,7 @@ MOD_init - codec->name, codec->fourCC, codec->comments); - } - -- lavc_venc_context = avcodec_alloc_context(); -+ lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); - lavc_venc_frame = avcodec_alloc_frame(); - - lavc_convert_frame= avcodec_alloc_frame(); -@@ -838,8 +838,13 @@ MOD_init - lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; - lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; - lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; -- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; -- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; -+ -+ char buf[1024]; -+#define set_dict_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%i", val); \ -+ av_dict_set(&lavc_venc_opts, opt, buf, 0) -+ set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); -+ set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); - lavc_venc_context->rtp_payload_size = lavc_param_packet_size; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - if (lavc_param_packet_size) -@@ -870,7 +875,7 @@ MOD_init - lavc_venc_context->context_model = lavc_param_context; - lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; - lavc_venc_context->noise_reduction = lavc_param_noise_reduction; -- lavc_venc_context->inter_threshold = lavc_param_inter_threshold; -+ set_dict_opt(lavc_param_inter_threshold, "inter_threshold"); - lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; - lavc_venc_context->skip_top = lavc_param_skip_top; - lavc_venc_context->skip_bottom = lavc_param_skip_bottom; -@@ -1066,9 +1071,11 @@ MOD_init - lavc_venc_context->flags |= lavc_param_trunc; - lavc_venc_context->flags |= lavc_param_aic; - lavc_venc_context->flags |= lavc_param_v4mv; -- lavc_venc_context->flags |= lavc_param_cbp; -+ if(lavc_param_cbp) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0); - lavc_venc_context->flags |= lavc_param_mv0; -- lavc_venc_context->flags |= lavc_param_qp_rd; -+ if(lavc_param_qp_rd) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); - lavc_venc_context->flags |= lavc_param_ilme; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_venc_context->flags |= lavc_param_trell; -@@ -1238,29 +1245,29 @@ MOD_init - } - - if (lavc_param_scan_offset) { -- av_dict_set(lavc_venc_opts, "scan_offset", "1", 0); -+ av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0); - } - - if (lavc_param_ss) { -- av_dict_set(lavc_venc_opts, "structured_slices", "1", 0); -+ av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0); - } - - if (lavc_param_alt) { -- av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0); -+ av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0); - } - - if (lavc_param_umv) { -- av_dict_set(lavc_venc_opts, "umv", "1", 0); -+ av_dict_set(&lavc_venc_opts, "umv", "1", 0); - } - - if (lavc_param_data_partitioning) { -- av_dict_set(lavc_venc_opts, "vdpart", "1", 0); -+ av_dict_set(&lavc_venc_opts, "vdpart", "1", 0); - } - - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts); -+ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); -Index: transcode-1.1.7/export/ffmpeg_cfg.c -=================================================================== ---- transcode-1.1.7.orig/export/ffmpeg_cfg.c -+++ transcode-1.1.7/export/ffmpeg_cfg.c -@@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={ - {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, - {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, - {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, -- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD}, -+ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, -- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, -+ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, - {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, -Index: transcode-1.1.7/export/aud_aux.c -=================================================================== ---- transcode-1.1.7.orig/export/aud_aux.c -+++ transcode-1.1.7/export/aud_aux.c -@@ -326,10 +326,18 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec) - - switch (o_codec) { - case 0x50: -+#if LIBAVCODEC_VERSION_MAJOR < 55 - codeid = CODEC_ID_MP2; -+#else -+ codeid = AV_CODEC_ID_MP2; -+#endif - break; - case 0x2000: -+#if LIBAVCODEC_VERSION_MAJOR < 55 - codeid = CODEC_ID_AC3; -+#else -+ codeid = AV_CODEC_ID_AC3; -+#endif - break; - default: - tc_warn("cannot init ffmpeg with %x", o_codec); -@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v - - //-- set parameters (bitrate, channels and sample-rate) -- - //-------------------------------------------------------- -- avcodec_get_context_defaults(&mpa_ctx); -+ avcodec_get_context_defaults3(&mpa_ctx, mpa_codec); - #if LIBAVCODEC_VERSION_MAJOR < 53 - mpa_ctx.codec_type = CODEC_TYPE_AUDIO; - #else -@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(&mpa_ctx, mpa_codec); -+ ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", -@@ -371,7 +371,12 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec) - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", -- (codeid == CODEC_ID_MP2) ?"mpa" :"ac3"); -+#if LIBAVCODEC_VERSION_MAJOR < 55 -+ (codeid == CODEC_ID_MP2) -+#else -+ (codeid == AV_CODEC_ID_MP2) -+#endif -+ ?"mpa" :"ac3"); - return(TC_EXPORT_ERROR); - } - -Index: transcode-1.1.7/import/import_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/import_ffmpeg.c -+++ transcode-1.1.7/import/import_ffmpeg.c -@@ -58,6 +58,7 @@ struct ffmpeg_codec { - }; - - // fourCC to ID mapping taken from MPlayer's codecs.conf -+#if LIBAVCODEC_VERSION_MAJOR < 55 - static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", - {"MP41", "DIV1", ""}}, -@@ -106,6 +107,56 @@ static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", - {"Y42B", ""}}, - {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#else -+static struct ffmpeg_codec ffmpeg_codecs[] = { -+ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", -+ {"MP41", "DIV1", ""}}, -+ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", -+ {"MP42", "DIV2", ""}}, -+ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", -+ {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, -+ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", -+ {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, -+ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", -+ {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, -+ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", -+ {"MPG1", ""}}, -+ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", -+ {"DVSD", ""}}, -+ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", -+ {"WMV1", ""}}, -+ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", -+ {"WMV2", ""}}, -+ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", -+ {"HFYU", ""}}, -+ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", -+ {"I263", ""}}, -+ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", -+ {"H263", "U263", "VIV1", ""}}, -+ {AV_CODEC_ID_H264, TC_CODEC_H264, "h264", -+ {"H264", "h264", "X264", "x264", "avc1", ""}}, -+ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", -+ {"RV10", "RV13", ""}}, -+ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", -+ {"SVQ1", ""}}, -+ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", -+ {"SVQ3", ""}}, -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", -+ {"MPG2", ""}}, -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", -+ {"MPG2", ""}}, -+ {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", -+ {"ASV1", ""}}, -+ {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", -+ {"ASV2", ""}}, -+ {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", -+ {"FFV1", ""}}, -+ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", -+ {"I420", "IYUV", ""}}, -+ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", -+ {"Y42B", ""}}, -+ {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#endif - - #define BUFFER_SIZE SIZE_RGB_FRAME - -@@ -302,7 +302,7 @@ do_avi: - - // Set these to the expected values so that ffmpeg's decoder can - // properly detect interlaced input. -- lavc_dec_context = avcodec_alloc_context(); -+ lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec); - if (lavc_dec_context == NULL) { - tc_log_error(MOD_NAME, "Could not allocate enough memory."); - return TC_IMPORT_ERROR; -@@ -324,6 +375,7 @@ do_avi: - // XXX: some codecs need extra data - switch (codec->id) - { -+#if LIBAVCODEC_VERSION_MAJOR < 55 - case CODEC_ID_MJPEG: extra_data_size = 28; break; - case CODEC_ID_LJPEG: extra_data_size = 28; break; - case CODEC_ID_HUFFYUV: extra_data_size = 1000; break; -@@ -331,6 +383,15 @@ do_avi: - case CODEC_ID_ASV2: extra_data_size = 8; break; - case CODEC_ID_WMV1: extra_data_size = 4; break; - case CODEC_ID_WMV2: extra_data_size = 4; break; -+#else -+ case AV_CODEC_ID_MJPEG: extra_data_size = 28; break; -+ case AV_CODEC_ID_LJPEG: extra_data_size = 28; break; -+ case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break; -+ case AV_CODEC_ID_ASV1: extra_data_size = 8; break; -+ case AV_CODEC_ID_ASV2: extra_data_size = 8; break; -+ case AV_CODEC_ID_WMV1: extra_data_size = 4; break; -+ case AV_CODEC_ID_WMV2: extra_data_size = 4; break; -+#endif - default: extra_data_size = 0; break; - } - -@@ -344,7 +344,7 @@ do_avi: - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(lavc_dec_context, lavc_dec_codec); -+ ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.", -@@ -360,7 +421,11 @@ do_avi: - frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim); - - // we adapt the color space -+#if LIBAVCODEC_VERSION_MAJOR < 55 - if(codec->id == CODEC_ID_MJPEG) { -+#else -+ if(codec->id == AV_CODEC_ID_MJPEG) { -+#endif - enable_levels_filter(); - } - break; -@@ -434,7 +499,11 @@ do_dv: - } - - // we adapt the color space -+#if LIBAVCODEC_VERSION_MAJOR < 55 - if(codec->id == CODEC_ID_MJPEG) { -+#else -+ if(codec->id == AV_CODEC_ID_MJPEG) { -+#endif - enable_levels_filter(); - } - -@@ -504,13 +573,25 @@ MOD_decode { - int bkey = 0; - - // check for keyframes -+#if LIBAVCODEC_VERSION_MAJOR < 55 - if (codec->id == CODEC_ID_MSMPEG4V3) { -+#else -+ if (codec->id == AV_CODEC_ID_MSMPEG4V3) { -+#endif - if (divx3_is_key(buffer)) bkey = 1; - } -+#if LIBAVCODEC_VERSION_MAJOR < 55 - else if (codec->id == CODEC_ID_MPEG4) { -+#else -+ else if (codec->id == AV_CODEC_ID_MPEG4) { -+#endif - if (mpeg4_is_key(buffer, bytes_read)) bkey = 1; - } -+#if LIBAVCODEC_VERSION_MAJOR < 55 - else if (codec->id == CODEC_ID_MJPEG) { -+#else -+ else if (codec->id == AV_CODEC_ID_MJPEG) { -+#endif - bkey = 1; - } - ---- a/import/decode_lavc.c -+++ b/import/decode_lavc.c -@@ -57,6 +57,7 @@ struct ffmpeg_codec { - }; - - // fourCC to ID mapping taken from MPlayer's codecs.conf -+#if LIBAVCODEC_VERSION_MAJOR < 55 - static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", - {"MP41", "DIV1", ""}}, -@@ -91,6 +92,42 @@ static struct ffmpeg_codec ffmpeg_codecs[] = { - {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", - {"MPG2", ""}}, - {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#else -+static struct ffmpeg_codec ffmpeg_codecs[] = { -+ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", -+ {"MP41", "DIV1", ""}}, -+ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", -+ {"MP42", "DIV2", ""}}, -+ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", -+ {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, -+ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", -+ {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, -+ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", -+ {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, -+ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", -+ {"MPG1", ""}}, -+ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", -+ {"DVSD", ""}}, -+ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", -+ {"WMV1", ""}}, -+ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", -+ {"WMV2", ""}}, -+ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", -+ {"HFYU", ""}}, -+ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", -+ {"I263", ""}}, -+ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", -+ {"H263", "U263", "VIV1", ""}}, -+ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", -+ {"RV10", "RV13", ""}}, -+ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", -+ {"SVQ1", ""}}, -+ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", -+ {"SVQ3", ""}}, -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", -+ {"MPG2", ""}}, -+ {0, TC_CODEC_UNKNOWN, NULL, {""}}}; -+#endif - - - static struct ffmpeg_codec *find_ffmpeg_codec_id(unsigned int transcode_id) diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch deleted file mode 100644 index 57a91774ab..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=520190 - -Index: transcode-1.1.7/import/probe_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/probe_ffmpeg.c -+++ transcode-1.1.7/import/probe_ffmpeg.c -@@ -120,7 +120,11 @@ void probe_ffmpeg(info_t *ipipe) - - translate_info(lavf_dmx_context, ipipe->probe_info); - -+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0) -+ avformat_close_input(&lavf_dmx_context); -+#else - av_close_input_file(lavf_dmx_context); -+#endif - return; - } - diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch deleted file mode 100644 index 7901fc3cc3..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch +++ /dev/null @@ -1,352 +0,0 @@ -Index: transcode-1.1.7/encode/encode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/encode/encode_lavc.c -+++ transcode-1.1.7/encode/encode_lavc.c -@@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL - vframe_list_t *vframe) - { - avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, -- PIX_FMT_YUV420P, -+ AV_PIX_FMT_YUV420P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - } - -@@ -247,7 +247,7 @@ static void pre_encode_video_yuv420p_huf - IMG_YUV_DEFAULT, - pd->ff_vcontext.width, pd->ff_vcontext.height); - avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, -- PIX_FMT_YUV422P, -+ AV_PIX_FMT_YUV422P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - ac_imgconvert(src, IMG_YUV_DEFAULT, - pd->ff_venc_frame.data, IMG_YUV422P, -@@ -263,7 +263,7 @@ static void pre_encode_video_yuv422p(TCL - IMG_YUV422P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, -- PIX_FMT_YUV420P, -+ AV_PIX_FMT_YUV420P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - ac_imgconvert(src, IMG_YUV422P, - pd->ff_venc_frame.data, IMG_YUV420P, -@@ -275,7 +275,7 @@ static void pre_encode_video_yuv422p_huf - vframe_list_t *vframe) - { - avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, -- PIX_FMT_YUV422P, -+ AV_PIX_FMT_YUV422P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - - } -@@ -285,7 +285,7 @@ static void pre_encode_video_rgb24(TCLav - vframe_list_t *vframe) - { - avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, -- PIX_FMT_YUV420P, -+ AV_PIX_FMT_YUV420P, - pd->ff_vcontext.width, pd->ff_vcontext.height); - ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT, - pd->ff_venc_frame.data, IMG_YUV420P, -@@ -610,21 +610,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri - case CODEC_YUV: - if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { - pd->tc_pix_fmt = TC_CODEC_YUV422P; -- pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P; -+ pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P; - pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv; - } else { - pd->tc_pix_fmt = TC_CODEC_YUV420P; - pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) -- ? PIX_FMT_YUVJ420P -- : PIX_FMT_YUV420P; -+ ? AV_PIX_FMT_YUVJ420P -+ : AV_PIX_FMT_YUV420P; - pd->pre_encode_video = pre_encode_video_yuv420p; - } - break; - case CODEC_YUV422: - pd->tc_pix_fmt = TC_CODEC_YUV422P; - pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) -- ? PIX_FMT_YUVJ422P -- : PIX_FMT_YUV422P; -+ ? AV_PIX_FMT_YUVJ422P -+ : AV_PIX_FMT_YUV422P; - if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { - pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv; - } else { -@@ -634,10 +634,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri - case CODEC_RGB: - pd->tc_pix_fmt = TC_CODEC_RGB; - pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) -- ? PIX_FMT_YUV422P -+ ? AV_PIX_FMT_YUV422P - : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) -- ? PIX_FMT_YUVJ420P -- : PIX_FMT_YUV420P; -+ ? AV_PIX_FMT_YUVJ420P -+ : AV_PIX_FMT_YUV420P; - pd->pre_encode_video = pre_encode_video_rgb24; - break; - default: -@@ -1390,7 +1390,7 @@ static int tc_lavc_configure(TCModuleIns - /* FIXME: move into core? */ - TC_INIT_LIBAVCODEC; - -- avcodec_get_frame_defaults(&pd->ff_venc_frame); -+ av_frame_unref(&pd->ff_venc_frame); - /* - * auxiliary config data needs to be blanked too - * before any other operation -@@ -1523,6 +1523,8 @@ static int tc_lavc_encode_video(TCModule - vframe_list_t *outframe) - { - TCLavcPrivateData *pd = NULL; -+ AVPacket pkt; -+ int ret, got_packet = 0; - - TC_MODULE_SELF_CHECK(self, "encode_video"); - -@@ -1537,12 +1539,15 @@ static int tc_lavc_encode_video(TCModule - - pd->pre_encode_video(pd, inframe); - -+ av_init_packet(&pkt); -+ pkt.data = outframe->video_buf; -+ pkt.size = inframe->video_size; -+ - TC_LOCK_LIBAVCODEC; -- outframe->video_len = avcodec_encode_video(&pd->ff_vcontext, -- outframe->video_buf, -- inframe->video_size, -- &pd->ff_venc_frame); -+ ret = avcodec_encode_video2(&pd->ff_vcontext, &pkt, -+ &pd->ff_venc_frame, &got_packet); - TC_UNLOCK_LIBAVCODEC; -+ outframe->video_len = ret ? ret : pkt.size; - - if (outframe->video_len < 0) { - tc_log_warn(MOD_NAME, "encoder error: size (%i)", -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -250,9 +250,9 @@ int opt_default(const char *opt, const c - for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){ - /* GLUE: +if */ - if (type == AVMEDIA_TYPE_VIDEO) { -- const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); -- if(o2) -- ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o); -+ o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); -+ if(o) -+ ret = av_opt_set(avcodec_opts[type], opt, arg, 0); - /* GLUE: +if */ - } - } -@@ -267,7 +267,10 @@ int opt_default(const char *opt, const c - if(opt[0] == 'a') - ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o); - else */ if(opt[0] == 'v') -- ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o); -+ { -+ o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0); -+ ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0); -+ } - /* GLUE: disabling - else if(opt[0] == 's') - ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o); -@@ -487,10 +490,10 @@ MOD_init - } - - lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); -- lavc_venc_frame = avcodec_alloc_frame(); -+ lavc_venc_frame = av_frame_alloc(); - -- lavc_convert_frame= avcodec_alloc_frame(); -- size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); -+ lavc_convert_frame= av_frame_alloc(); -+ size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); - enc_buffer = tc_malloc(size); - - if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) { -@@ -1114,7 +1117,7 @@ MOD_init - lavc_venc_context->prediction_method = lavc_param_prediction_method; - - if(is_huffyuv) -- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; - else - { - switch(pix_fmt) -@@ -1123,18 +1126,18 @@ MOD_init - case CODEC_RGB: - { - if(is_mjpeg) -- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P; - else -- lavc_venc_context->pix_fmt = PIX_FMT_YUV420P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P; - break; - } - - case CODEC_YUV422: - { - if(is_mjpeg) -- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P; - else -- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; -+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; - break; - } - -@@ -1596,6 +1599,8 @@ MOD_encode - - int out_size; - const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'}; -+ AVPacket pkt; -+ int ret, got_packet = 0; - - if (param->flag == TC_VIDEO) { - -@@ -1620,7 +1625,7 @@ MOD_encode - YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT, - lavc_venc_context->width, lavc_venc_context->height); - avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, -- PIX_FMT_YUV422P, lavc_venc_context->width, -+ AV_PIX_FMT_YUV422P, lavc_venc_context->width, - lavc_venc_context->height); - /* FIXME: can't use tcv_convert (see decode_lavc.c) */ - ac_imgconvert(src, IMG_YUV_DEFAULT, -@@ -1650,7 +1655,7 @@ MOD_encode - lavc_venc_context->width, - lavc_venc_context->height); - avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, -- PIX_FMT_YUV420P, lavc_venc_context->width, -+ AV_PIX_FMT_YUV420P, lavc_venc_context->width, - lavc_venc_context->height); - ac_imgconvert(src, IMG_YUV422P, - lavc_venc_frame->data, IMG_YUV420P, -@@ -1661,7 +1666,7 @@ MOD_encode - - case CODEC_RGB: - avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, -- PIX_FMT_YUV420P, lavc_venc_context->width, -+ AV_PIX_FMT_YUV420P, lavc_venc_context->width, - lavc_venc_context->height); - ac_imgconvert(¶m->buffer, IMG_RGB_DEFAULT, - lavc_venc_frame->data, IMG_YUV420P, -@@ -1674,13 +1679,17 @@ MOD_encode - return TC_EXPORT_ERROR; - } - -+ av_init_packet(&pkt); -+ pkt.data = enc_buffer; -+ pkt.size = size; - - TC_LOCK_LIBAVCODEC; -- out_size = avcodec_encode_video(lavc_venc_context, -- enc_buffer, size, -- lavc_venc_frame); -+ ret = avcodec_encode_video2(lavc_venc_context, &pkt, -+ lavc_venc_frame, &got_packet); - TC_UNLOCK_LIBAVCODEC; - -+ out_size = ret ? ret : pkt.size; -+ - if (out_size < 0) { - tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size); - return TC_EXPORT_ERROR; -Index: transcode-1.1.7/import/decode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/import/decode_lavc.c -+++ transcode-1.1.7/import/decode_lavc.c -@@ -327,8 +327,8 @@ void decode_lavc(decode_t *decode) - - // Convert avcodec image to the requested YUV or RGB format - switch (lavc_dec_context->pix_fmt) { -- case PIX_FMT_YUVJ420P: -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUVJ420P: -+ case AV_PIX_FMT_YUV420P: - // Remove "dead space" at right edge of planes, if any - if (picture.linesize[0] != lavc_dec_context->width) { - int y; -@@ -352,7 +352,7 @@ void decode_lavc(decode_t *decode) - pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, - lavc_dec_context->width, lavc_dec_context->height); - break; -- case PIX_FMT_YUV411P: -+ case AV_PIX_FMT_YUV411P: - if (picture.linesize[0] != lavc_dec_context->width) { - int y; - for (y = 0; y < lavc_dec_context->height; y++) { -@@ -371,8 +371,8 @@ void decode_lavc(decode_t *decode) - pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, - lavc_dec_context->width, lavc_dec_context->height); - break; -- case PIX_FMT_YUVJ422P: -- case PIX_FMT_YUV422P: -+ case AV_PIX_FMT_YUVJ422P: -+ case AV_PIX_FMT_YUV422P: - if (picture.linesize[0] != lavc_dec_context->width) { - int y; - for (y = 0; y < lavc_dec_context->height; y++) { -@@ -391,8 +391,8 @@ void decode_lavc(decode_t *decode) - pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, - lavc_dec_context->width, lavc_dec_context->height); - break; -- case PIX_FMT_YUVJ444P: -- case PIX_FMT_YUV444P: -+ case AV_PIX_FMT_YUVJ444P: -+ case AV_PIX_FMT_YUV444P: - if (picture.linesize[0] != lavc_dec_context->width) { - int y; - for (y = 0; y < lavc_dec_context->height; y++) { -Index: transcode-1.1.7/import/import_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/import_ffmpeg.c -+++ transcode-1.1.7/import/import_ffmpeg.c -@@ -661,8 +661,8 @@ retry: - - // Convert avcodec image to our internal YUV or RGB format - switch (lavc_dec_context->pix_fmt) { -- case PIX_FMT_YUVJ420P: -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUVJ420P: -+ case AV_PIX_FMT_YUV420P: - src_fmt = IMG_YUV420P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); -@@ -693,7 +693,7 @@ retry: - } - break; - -- case PIX_FMT_YUV411P: -+ case AV_PIX_FMT_YUV411P: - src_fmt = IMG_YUV411P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); -@@ -721,8 +721,8 @@ retry: - } - break; - -- case PIX_FMT_YUVJ422P: -- case PIX_FMT_YUV422P: -+ case AV_PIX_FMT_YUVJ422P: -+ case AV_PIX_FMT_YUV422P: - src_fmt = IMG_YUV422P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); -@@ -750,8 +750,8 @@ retry: - } - break; - -- case PIX_FMT_YUVJ444P: -- case PIX_FMT_YUV444P: -+ case AV_PIX_FMT_YUVJ444P: -+ case AV_PIX_FMT_YUV444P: - src_fmt = IMG_YUV444P; - YUV_INIT_PLANES(src_planes, frame, src_fmt, - lavc_dec_context->width, lavc_dec_context->height); diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch deleted file mode 100644 index 9ad765e1c3..0000000000 --- a/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch +++ /dev/null @@ -1,508 +0,0 @@ -Index: transcode-1.1.7/encode/encode_lavc.c -=================================================================== ---- transcode-1.1.7.orig/encode/encode_lavc.c -+++ transcode-1.1.7/encode/encode_lavc.c -@@ -77,6 +77,13 @@ struct tclavcconfigdata_ { - int luma_elim_threshold; - int chroma_elim_threshold; - int quantizer_noise_shaping; -+ int inter_quant_bias; -+ int intra_quant_bias; -+ int scenechange_factor; -+ int rc_strategy; -+ float rc_initial_cplx; -+ float rc_qsquish; -+ float border_masking; - - /* same as above for flags */ - struct { -@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc - switch (vob->divxmultipass) { - case 1: - CAN_DO_MULTIPASS(multipass_flag); -- pd->ff_vcontext.flags |= CODEC_FLAG_PASS1; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1; - pd->stats_file = fopen(vob->divxlogfile, "w"); - if (pd->stats_file == NULL) { - tc_log_error(MOD_NAME, "could not create 2pass log file" -@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc - break; - case 2: - CAN_DO_MULTIPASS(multipass_flag); -- pd->ff_vcontext.flags |= CODEC_FLAG_PASS2; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2; - pd->stats_file = fopen(vob->divxlogfile, "r"); - if (pd->stats_file == NULL){ - tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\"" -@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc - break; - case 3: - /* fixed qscale :p */ -- pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE; - pd->ff_venc_frame.quality = vob->divxbitrate; - break; - } -@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa - pd->confdata.rc_buffer_size = 0; - pd->confdata.lmin = 2; - pd->confdata.lmax = 31; -- pd->confdata.me_method = ME_EPZS; -+ pd->confdata.me_method = 0; - - memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags)); - pd->confdata.turbo_setup = 0; -@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.me_range = 0; - pd->ff_vcontext.mb_decision = 0; - pd->ff_vcontext.scenechange_threshold = 0; -- pd->ff_vcontext.scenechange_factor = 1; -+ pd->confdata.scenechange_factor = 1; - pd->ff_vcontext.b_frame_strategy = 0; - pd->ff_vcontext.b_sensitivity = 40; - pd->ff_vcontext.brd_scale = 0; - pd->ff_vcontext.bidir_refine = 0; -- pd->ff_vcontext.rc_strategy = 2; -+ pd->confdata.rc_strategy = 2; - pd->ff_vcontext.b_quant_factor = 1.25; - pd->ff_vcontext.i_quant_factor = 0.8; - pd->ff_vcontext.b_quant_offset = 1.25; -@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.qblur = 0.5; - pd->ff_vcontext.qcompress = 0.5; - pd->ff_vcontext.mpeg_quant = 0; -- pd->ff_vcontext.rc_initial_cplx = 0.0; -- pd->ff_vcontext.rc_qsquish = 1.0; -+ pd->confdata.rc_initial_cplx = 0.0; -+ pd->confdata.rc_qsquish = 1.0; - pd->confdata.luma_elim_threshold = 0; - pd->confdata.chroma_elim_threshold = 0; - pd->ff_vcontext.strict_std_compliance = 0; -@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.temporal_cplx_masking = 0.0; - pd->ff_vcontext.spatial_cplx_masking = 0.0; - pd->ff_vcontext.p_masking = 0.0; -- pd->ff_vcontext.border_masking = 0.0; -+ pd->confdata.border_masking = 0.0; - pd->ff_vcontext.me_pre_cmp = 0; - pd->ff_vcontext.me_cmp = 0; - pd->ff_vcontext.me_sub_cmp = 0; -@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa - pd->ff_vcontext.pre_me = 1; - pd->ff_vcontext.me_subpel_quality = 8; - pd->ff_vcontext.refs = 1; -- pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; -- pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; - pd->ff_vcontext.noise_reduction = 0; - pd->confdata.quantizer_noise_shaping = 0; - pd->ff_vcontext.flags = 0; -@@ -1044,19 +1049,19 @@ static void tc_lavc_config_defaults(TCLa - */ - static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd) - { -+ char buf[1024]; - /* some translation... */ - pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000; - pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000; - pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000; - pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024; -- pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5); -- pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5); -- pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method; -+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5)); -+ av_dict_set(&(pd->ff_opts), "lmin", buf, 0); -+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5)); -+ av_dict_set(&(pd->ff_opts), "lmax", buf, 0); - - pd->ff_vcontext.flags = 0; -- SET_FLAG(pd, mv0); - SET_FLAG(pd, qpel); -- SET_FLAG(pd, naq); - SET_FLAG(pd, ilme); - SET_FLAG(pd, ildct); - SET_FLAG(pd, aic); -@@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC - } - if (pd->interlacing.active) { - /* enforce interlacing */ -- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; -- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT; -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME; - } - if (pd->confdata.flags.alt) { - av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); -@@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC - if (pd->confdata.flags.cbp) { - av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); - } -+ if (pd->confdata.flags.mv0) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0); -+ } -+ if (pd->confdata.flags.naq) { -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0); -+ } - -- char buf[1024]; - #define set_dict_opt(val, opt) \ - snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ - av_dict_set(&(pd->ff_opts), opt, buf, 0) -+#define set_dict_float_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\ -+ av_dict_set(&(pd->ff_opts), opt, buf, 0) - - set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); - set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); - set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); -+ set_dict_opt(inter_quant_bias, "pbias"); -+ set_dict_opt(intra_quant_bias, "ibias"); -+ set_dict_opt(me_method, "me_method"); -+ set_dict_opt(scenechange_factor, "sc_factor"); -+ set_dict_opt(rc_strategy, "rc_strategy"); -+ set_dict_float_opt(rc_initial_cplx, "rc_init_cplx"); -+ set_dict_float_opt(rc_qsquish, "qsquish"); -+ set_dict_float_opt(border_masking, "border_mask"); - } - - #undef SET_FLAG -@@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri - { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, -- { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES }, -+ { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX }, - { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, }, - { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 }, - { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 }, -- { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 }, -+ { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 }, - { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, - { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 }, - { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, -@@ -1175,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri - { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 }, - { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 }, - { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 }, -- { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 }, -+ { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 }, - { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 }, - { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 }, - { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 }, -@@ -1185,9 +1206,9 @@ static int tc_lavc_read_config(TCLavcPri - { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 }, - // { "vrc_eq", }, // not yet supported - { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 }, -- { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, -+ { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, - // { "vrc_init_occupancy", }, // not yet supported -- { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, -+ { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, - { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -@@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri - { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, -- { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, -+ { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, - { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 }, - { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 }, - { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 }, -@@ -1212,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri - { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 }, - { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 }, -- { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -- { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -+ { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, -+ { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, - { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, - { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - -- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, -+ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, -+ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL }, - { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, -- { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, -- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, -+ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME }, -+ { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT }, -+ { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, - #else -- { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, -+ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED }, - #endif - { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, - { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, -- { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, -+ { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR }, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, - #else - { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 }, - #endif -- { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY }, -- { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV }, -- { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP }, -+ { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY }, -+ { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV }, -+ { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP }, - - // { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported - /* End of the config file */ -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -831,14 +831,11 @@ MOD_init - - lavc_venc_context->bit_rate = vob->divxbitrate * 1000; - lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000; -- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); -- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); - lavc_venc_context->max_qdiff = lavc_param_vqdiff; - lavc_venc_context->qcompress = lavc_param_vqcompress; - lavc_venc_context->qblur = lavc_param_vqblur; - lavc_venc_context->max_b_frames = lavc_param_vmax_b_frames; - lavc_venc_context->b_quant_factor = lavc_param_vb_qfactor; -- lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; - lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; - lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; - -@@ -846,8 +843,23 @@ MOD_init - #define set_dict_opt(val, opt) \ - snprintf(buf, sizeof(buf), "%i", val); \ - av_dict_set(&lavc_venc_opts, opt, buf, 0) -+#define set_dict_float_opt(val, opt) \ -+ snprintf(buf, sizeof(buf), "%f", val); \ -+ av_dict_set(&lavc_venc_opts, opt, buf, 0) - set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); - set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); -+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin"); -+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax"); -+ set_dict_opt(lavc_param_vrc_strategy, "rc_strategy"); -+ set_dict_float_opt(lavc_param_rc_qsquish, "qsquish"); -+ set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp"); -+ set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq"); -+ set_dict_opt(lavc_param_rc_eq, "rc_eq"); -+ set_dict_opt(lavc_param_vme, "me_method"); -+ set_dict_opt(lavc_param_ibias, "ibias"); -+ set_dict_opt(lavc_param_pbias, "pbias"); -+ set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity"); -+ set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx"); - lavc_venc_context->rtp_payload_size = lavc_param_packet_size; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - if (lavc_param_packet_size) -@@ -856,15 +868,9 @@ MOD_init - lavc_venc_context->strict_std_compliance= lavc_param_strict; - lavc_venc_context->i_quant_factor = lavc_param_vi_qfactor; - lavc_venc_context->i_quant_offset = lavc_param_vi_qoffset; -- lavc_venc_context->rc_qsquish = lavc_param_rc_qsquish; -- lavc_venc_context->rc_qmod_amp = lavc_param_rc_qmod_amp; -- lavc_venc_context->rc_qmod_freq = lavc_param_rc_qmod_freq; -- lavc_venc_context->rc_eq = lavc_param_rc_eq; - lavc_venc_context->rc_max_rate = lavc_param_rc_max_rate * 1000; - lavc_venc_context->rc_min_rate = lavc_param_rc_min_rate * 1000; - lavc_venc_context->rc_buffer_size = lavc_param_rc_buffer_size * 1024; -- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity; -- lavc_venc_context->rc_initial_cplx = lavc_param_rc_initial_cplx; - lavc_venc_context->debug = lavc_param_debug; - lavc_venc_context->last_predictor_count= lavc_param_last_pred; - lavc_venc_context->pre_me = lavc_param_pre_me; -@@ -872,8 +878,6 @@ MOD_init - lavc_venc_context->pre_dia_size = lavc_param_pre_dia_size; - lavc_venc_context->me_subpel_quality = lavc_param_me_subpel_quality; - lavc_venc_context->me_range = lavc_param_me_range; -- lavc_venc_context->intra_quant_bias = lavc_param_ibias; -- lavc_venc_context->inter_quant_bias = lavc_param_pbias; - lavc_venc_context->coder_type = lavc_param_coder; - lavc_venc_context->context_model = lavc_param_context; - lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; -@@ -1079,6 +1083,8 @@ MOD_init - lavc_venc_context->flags |= lavc_param_mv0; - if(lavc_param_qp_rd) - av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); -+ if (lavc_param_normalize_aqp) -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0); - lavc_venc_context->flags |= lavc_param_ilme; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_venc_context->flags |= lavc_param_trell; -@@ -1087,9 +1093,7 @@ MOD_init - #endif - - if (lavc_param_gray) -- lavc_venc_context->flags |= CODEC_FLAG_GRAY; -- if (lavc_param_normalize_aqp) -- lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY; - - switch(vob->encode_fields) { - case TC_ENCODE_FIELDS_TOP_FIRST: -@@ -1107,9 +1111,9 @@ MOD_init - } - - lavc_venc_context->flags |= interlacing_active ? -- CODEC_FLAG_INTERLACED_DCT : 0; -+ AV_CODEC_FLAG_INTERLACED_DCT : 0; - lavc_venc_context->flags |= interlacing_active ? -- CODEC_FLAG_INTERLACED_ME : 0; -+ AV_CODEC_FLAG_INTERLACED_ME : 0; - - lavc_venc_context->flags |= lavc_param_psnr; - do_psnr = lavc_param_psnr; -@@ -1156,7 +1160,7 @@ MOD_init - "encoding."); - return TC_EXPORT_ERROR; - } -- lavc_venc_context->flags |= CODEC_FLAG_PASS1; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1; - stats_file = fopen(vob->divxlogfile, "w"); - if (stats_file == NULL){ - tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".", -@@ -1170,7 +1174,7 @@ MOD_init - "encoding."); - return TC_EXPORT_ERROR; - } -- lavc_venc_context->flags |= CODEC_FLAG_PASS2; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2; - stats_file= fopen(vob->divxlogfile, "r"); - if (stats_file==NULL){ - tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for " -@@ -1201,12 +1205,11 @@ MOD_init - break; - case 3: - /* fixed qscale :p */ -- lavc_venc_context->flags |= CODEC_FLAG_QSCALE; -+ lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE; - lavc_venc_frame->quality = vob->divxbitrate; - break; - } - -- lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; - - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ - if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { -Index: transcode-1.1.7/export/ffmpeg_cfg.c -=================================================================== ---- transcode-1.1.7.orig/export/ffmpeg_cfg.c -+++ transcode-1.1.7/export/ffmpeg_cfg.c -@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0; - int lavc_param_pre_me= 1; - int lavc_param_me_subpel_quality= 8; - int lavc_param_me_range=0; --int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS; --int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS; -+int lavc_param_ibias=0; -+int lavc_param_pbias=0; - int lavc_param_coder=0; - int lavc_param_context=0; - char *lavc_param_intra_matrix = NULL; -@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={ - {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000}, - {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9}, -- {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV}, -+ {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV}, - {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5}, - // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -@@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={ - {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, - {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, - {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, -- {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES}, -+ {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX}, - // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, - {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, - {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, -@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={ - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, -+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY}, - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={ - {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20}, - {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0}, - {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, -- {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR}, -+ {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR}, - {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, -@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={ - {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, - {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000}, - {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000}, -- {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL}, -+ {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL}, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -- {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT}, -+ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT}, - #else - {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1}, - #endif -@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={ - {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8}, - {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000}, - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC}, -+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC}, - #else -- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, -+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED}, - #endif - {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, -@@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={ - {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, - {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, - {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, -- {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, -+ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, - {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, -- {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, -+ {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME}, - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, -- {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC}, -- {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED}, -- {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP}, -+ {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1}, -+ {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED}, -+ {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP}, - {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16}, - {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, - {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, -Index: transcode-1.1.7/import/import_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/import/import_ffmpeg.c -+++ transcode-1.1.7/import/import_ffmpeg.c -@@ -361,7 +361,7 @@ do_avi: - lavc_dec_context->width = x_dim; - lavc_dec_context->height = y_dim; - -- if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY; -+ if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else diff --git a/multimedia/transcode/transcode-1.1.7-libav-10.patch b/multimedia/transcode/transcode-1.1.7-libav-10.patch deleted file mode 100644 index 1f4a24039d..0000000000 --- a/multimedia/transcode/transcode-1.1.7-libav-10.patch +++ /dev/null @@ -1,36 +0,0 @@ -fix building w/libav-10 - -https://wiki.libav.org/Migration/10 - ---- a/filter/filter_resample.c -+++ b/filter/filter_resample.c -@@ -37,6 +37,7 @@ - #include "libtc/optstr.h" - #include "libtc/tcavcodec.h" - #include "libtc/tcmodule-plugin.h" -+#include <libavresample/avresample.h> - - - typedef struct { -@@ -45,7 +46,7 @@ typedef struct { - - int bytes_per_sample; - -- ReSampleContext *resample_ctx; -+ AVAudioResampleContext *resample_ctx; - } ResamplePrivateData; - - static const char resample_help[] = "" ---- a/import/probe_ffmpeg.c -+++ b/import/probe_ffmpeg.c -@@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info) - info->bitrate = st->codec->bit_rate / 1000; - info->width = st->codec->width; - info->height = st->codec->height; -- if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) { -- info->fps = av_q2d(st->r_frame_rate); -+ if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) { -+ info->fps = av_q2d(st->avg_frame_rate); - } else { - /* watch out here */ - info->fps = 1.0/av_q2d(st->codec->time_base); diff --git a/multimedia/transcode/transcode-1.1.7-libav-9.patch b/multimedia/transcode/transcode-1.1.7-libav-9.patch deleted file mode 100644 index 3989d3d83a..0000000000 --- a/multimedia/transcode/transcode-1.1.7-libav-9.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200 -+++ import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200 -@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe) - return; - } - -- ret = av_find_stream_info(lavf_dmx_context); -+ ret = avformat_find_stream_info(lavf_dmx_context, NULL); - if (ret < 0) { - tc_log_error(__FILE__, "unable to fetch informations from '%s'" - " (libavformat failure)", ---- import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200 -+++ import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200 -@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode) - - // Set these to the expected values so that ffmpeg's decoder can - // properly detect interlaced input. -- lavc_dec_context = avcodec_alloc_context(); -+ lavc_dec_context = avcodec_alloc_context3(NULL); - if (lavc_dec_context == NULL) { - tc_log_error(__FILE__, "Could not allocate enough memory."); - goto decoder_error; -@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode) - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; - -- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) { -+ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) { - tc_log_error(__FILE__, "Could not initialize the '%s' codec.", - codec->name); - goto decoder_error; diff --git a/multimedia/transcode/transcode-1.1.7-preset-force.patch b/multimedia/transcode/transcode-1.1.7-preset-force.patch deleted file mode 100644 index 0d1da8b4f6..0000000000 --- a/multimedia/transcode/transcode-1.1.7-preset-force.patch +++ /dev/null @@ -1,28 +0,0 @@ -Do not force using a preset. Do not try to open non-existant preset by default. - -Index: transcode-1.1.7/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.7.orig/export/export_ffmpeg.c -+++ transcode-1.1.7/export/export_ffmpeg.c -@@ -1206,7 +1206,7 @@ MOD_init - lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; - - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ -- if (lavc_param_video_preset) { -+ if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { - avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; - video_codec_name = av_strdup(ffmpeg_codec_name(codec->name)); - -Index: transcode-1.1.7/export/ffmpeg_cfg.c -=================================================================== ---- transcode-1.1.7.orig/export/ffmpeg_cfg.c -+++ transcode-1.1.7/export/ffmpeg_cfg.c -@@ -124,7 +124,7 @@ int lavc_param_gmc = 0; - //int lavc_param_atag = 0; - //int lavc_param_abitrate = 224; - --char *lavc_param_video_preset = "medium"; -+char *lavc_param_video_preset = "none"; - char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; - - TCConfigEntry lavcopts_conf[]={ diff --git a/multimedia/transcode/transcode-1.1.7-preset-free.patch b/multimedia/transcode/transcode-1.1.7-preset-free.patch deleted file mode 100644 index 00494b94ba..0000000000 --- a/multimedia/transcode/transcode-1.1.7-preset-free.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix invalid free when preset file not found -https://bugs.gentoo.org/show_bug.cgi?id=322945 -Author: Brennan Shacklett - -diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c ---- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 -+++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 20:07:05.669083945 -0700 -@@ -321,7 +321,7 @@ - } - - if(!f){ -- fprintf(stderr, "File for preset '%s' not found\n", arg); -+ tc_log_error(MOD_NAME, "File for preset '%s' not found", arg); - av_exit(1); - } - -@@ -1207,7 +1207,7 @@ - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ - if (lavc_param_video_preset) { - avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; -- video_codec_name = ffmpeg_codec_name(codec->name); -+ video_codec_name = av_strdup(ffmpeg_codec_name(codec->name)); - - const char *preset_start = lavc_param_video_preset; - while (preset_start) { -@@ -1225,6 +1225,8 @@ - if (opt_preset("vpre", preset_name) != 0) { - tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name); - } -+ av_free(video_codec_name); -+ video_codec_name = NULL; - if (verbose) { - int i; - tc_log_info(MOD_NAME, "After parsing preset '%s', %i options are overridden:", preset_name, opt_name_count); diff --git a/multimedia/transcode/transcode.SlackBuild b/multimedia/transcode/transcode.SlackBuild index d9a7341eb2..7c4eff3279 100644 --- a/multimedia/transcode/transcode.SlackBuild +++ b/multimedia/transcode/transcode.SlackBuild @@ -79,19 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix building with newer ffmpeg -patch -p0 -i $CWD/transcode-1.1.7-ffmpeg.patch -patch -p0 -i $CWD/transcode-1.1.7-ffmpeg-0.10.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg-0.11.patch -patch -p1 -i $CWD/transcode-1.1.7-preset-free.patch -patch -p0 -i $CWD/transcode-1.1.7-libav-9.patch -patch -p1 -i $CWD/transcode-1.1.7-libav-10.patch -patch -p1 -i $CWD/transcode-1.1.7-preset-force.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg2.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg24.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg29.patch -patch -p1 -i $CWD/transcode-1.1.7-ffmpeg4.patch # Fix building with imagemagick 7.x +# 2024: this is actually not true anymore and imagemagick support had to be disabled, sorry folks patch -p1 -i $CWD/transcode-1.1.7-imagemagick7.patch patch -p1 -i $CWD/transcode-1.1.7-gcc10.patch patch -p1 -i $CWD/transcode-1.1.7-glibc-2.32.patch @@ -100,7 +89,8 @@ autoreconf -vif export MAGICKCORE_QUANTUM_DEPTH=32 -CFLAGS="$SLKCFLAGS" \ +# unfortunately ffmpeg >= 5.x breaks compatibility and no patches are available... +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -109,6 +99,8 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --mandir=/usr/man \ + --disable-ffmpeg \ + --enable-alsa \ --enable-alsa \ --enable-v4l \ --enable-libv4lconvert \ @@ -131,7 +123,6 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-nuv \ --enable-lzo \ --enable-libpostproc \ - --enable-imagemagick \ --build=$ARCH-slackware-linux make diff --git a/multimedia/tvheadend/tvheadend.SlackBuild b/multimedia/tvheadend/tvheadend.SlackBuild index fd60f65751..23df71bf9d 100644 --- a/multimedia/tvheadend/tvheadend.SlackBuild +++ b/multimedia/tvheadend/tvheadend.SlackBuild @@ -108,6 +108,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-libtheora_static \ --disable-libvorbis_static \ --disable-libfdkaac_static \ + --disable-libav \ --python=python3 \ --disable-pcloud_cache \ --nowerror \ diff --git a/multimedia/uavs3d/changelog b/multimedia/uavs3d/changelog deleted file mode 100644 index 478e92d365..0000000000 --- a/multimedia/uavs3d/changelog +++ /dev/null @@ -1,21 +0,0 @@ -Changelog for uavs3d SlackBuild Script --------------------------------------------------------------------- - -27/08/2022: - -Added to SBo - -05/02/2023: - -Updated to Github commit 0133ee4 -Patched the cmakelist file to build in i586 and i686 platforms. -Also patched the file to set the correct lib dir in 64 bit -platforms. - -21/02/2024: - -Switched to a versioned one and -patched it to latest git commit. -From now on this will build only on x86 and x86_64. -upstream hasn't made a release yet but they have -upgraded the version to 1.2.0 internally. diff --git a/multimedia/uavs3d/fix-build-issue.patch b/multimedia/uavs3d/fix-build-issue.patch deleted file mode 100644 index 8aa66107a7..0000000000 --- a/multimedia/uavs3d/fix-build-issue.patch +++ /dev/null @@ -1,7618 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5118377..46458c7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,15 +1,20 @@ --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.1) - - project(uavs3d) - -+option(COMPILE_10BIT "Enable 10bit streams decoding support." OFF) -+ -+set(CMAKE_C_STANDARD 99) -+set(CMAKE_POSITION_INDEPENDENT_CODE ON) -+ - aux_source_directory(./test DIR_SRC_TEST) --set_source_files_properties(${DIR_SRC_TEST} PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -std=c99 -O3") - - add_subdirectory(./source) - - add_executable(uavs3dec ${DIR_SRC_TEST}) - --target_link_libraries(uavs3dec m) -+if (NOT MSVC) -+ target_link_libraries(uavs3dec m) -+endif() - target_link_libraries(uavs3dec uavs3d) - #target_link_libraries(uavs3dec dl) -- -diff --git a/COPYING b/COPYING -index 409d303..ce30f0f 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,4 +1,4 @@ --Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] -+Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - - All rights reserved. - -@@ -9,10 +9,7 @@ modification, are permitted provided that the following conditions are met: - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. --3. All advertising materials mentioning features or use of this software -- must display the following acknowledgement: -- This product includes the software uAVS3d developed by Peking University Shenzhen Graduate School, Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation. --4. Neither the name of the organizations (Peking University Shenzhen Graduate School, Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) -+3. Neither the name of the organizations (Peking University Shenzhen Graduate School, Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) - nor the names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -diff --git a/README.md b/README.md -index e46ada8..9ce6a2a 100644 ---- a/README.md -+++ b/README.md -@@ -5,15 +5,16 @@ - 2) supports to compile for Android/IOS/Windows/Linux/MacOS systems. - 3) optimized for ARMv7/ARMv8/SSE4/AVX2 chips. - 4) 10bit decoding on all supported platforms. -- -+ 5) The uavs3 codec has supported x86 and arm platforms, and has been tested and verified on the Kunpeng processor. -+ 6) The ARM platform recommends the Kunpeng processor. - # license - Copyright reserved by “Peking University Shenzhen Graduate School”, “Peng Cheng Laboratory”, and “Guangdong Bohua UHD Innovation Corporation” <br><br> -- This program is a free software. You can redistribute it and/or modify it under the terms of the BSD 4-clause license. <br> -+ This program is a free software. You can redistribute it and/or modify it under the terms of the BSD 3-clause license. <br> - For more details, please view the file "COPYING" in the project. - - # compile - The default configuration only support 8bit decoding. <br> -- To support 10bit streams decoding, edit source/decore/com_def.h : #define BIT_DEPTH 10 -+ To support 10bit streams decoding: cmake -DCOMPILE_10BIT=1 - - ## windows - Prerequisites: -@@ -22,17 +23,20 @@ Prerequisites: - build: - 1. ./version.bat (to generate version.h) - 2. solution file: build/x86_windows/uavs3d.sln -+ -+ To support 10bit streams decoding, edit source/decore/com_def.h : #define COMPILE_10BIT 1 - - ## linux/mac - Prerequisites: - 1. gawk (http://www.gnu.org/software/gawk/) -- 2. CMake (https://cmake.org) version 2.8 or higher -+ 2. CMake (https://cmake.org) version 3.1 or higher - - Build: - 1. mkdir build/linux -- 2. cd build/linux && cmake ../.. -+ 2. cd build/linux && cmake -DCOMPILE_10BIT=0 ../.. - 3. make && make install - -+ To support 10bit streams decoding: cmake -DCOMPILE_10BIT=1 - to build shared library, set BUILD_SHARED_LIBS=1 please. - - ## ios -@@ -40,8 +44,11 @@ Prerequisites: - XCode - - Build: --1. ./version.sh (generate the version.h) --2. xcode solution file: build/ios/uavs3d.xcodeproj -+ 1. ./version.sh (generate the version.h) -+ 2. xcode solution file: build/ios/uavs3d.xcodeproj -+ -+ To support 10bit streams decoding: -+ Find Xcode -> PROJECT -> Build Settings -> Preprocessor Macros, add COMPILE_10BIT=1 - - ## android - Prerequisites: -@@ -51,8 +58,10 @@ Build ndk library or executable file: - 1. ./version.sh (generate the version.h) - 2. cd build/android/ndk/jni - 3. $NDK_PATH/ndk-build -+ -+ To support 10bit streams decoding: edit build/android/ndk/jni/uavs3d_main.mk: - --The executable application for arm64-v8a is generated by default. <br>To generate static or shared library for other platforms, modify correlative options in Android.mk and Application.mk. -+ LOCAL_CFLAGS += -DCOMPILE_10BIT=1 - - # Run tests - ## window/linux/mac/android -diff --git a/build/android/ndk/jni/Android.mk b/build/android/ndk/jni/Android.mk -index fe79947..88d57f4 100644 ---- a/build/android/ndk/jni/Android.mk -+++ b/build/android/ndk/jni/Android.mk -@@ -5,53 +5,26 @@ SRC_PATH := ../../../../source - INCLUDE_PATH := ../../../../source/decore - - ### Name of the local module --include $(CLEAR_VARS) --LOCAL_MODULE := uavs3d -+include $(LOCAL_PATH)/uavs3d_clear_vars.mk -+LOCAL_MODULE := uavs3d-static -+LOCAL_MODULE_FILENAME := libuavs3d -+include $(LOCAL_PATH)/uavs3d_main.mk -+include $(BUILD_STATIC_LIBRARY) -+ -+include $(LOCAL_PATH)/uavs3d_clear_vars.mk -+LOCAL_MODULE := uavs3d-shared -+LOCAL_MODULE_FILENAME := libuavs3d - LOCAL_LDLIBS:=-L$(SYSROOT)/usr/lib -lm -llog -- --### for posix pthread --#LOCAL_SHARED_LIBRARIES := libcutil -- --### include search path when compiling all sources (C,C++,Assembly) --LOCAL_C_INCLUDES +=$(INCLUDE_PATH) \ -- $(LOCAL_PATH)/../app -- --### c source code --uavs3d_srcs_c += $(SRC_PATH)/decore/alf.c --uavs3d_srcs_c += $(SRC_PATH)/decore/deblock.c --uavs3d_srcs_c += $(SRC_PATH)/decore/inter_pred.c --uavs3d_srcs_c += $(SRC_PATH)/decore/intra_pred.c --uavs3d_srcs_c += $(SRC_PATH)/decore/inv_trans.c --uavs3d_srcs_c += $(SRC_PATH)/decore/pic_manager.c --uavs3d_srcs_c += $(SRC_PATH)/decore/recon.c --uavs3d_srcs_c += $(SRC_PATH)/decore/sao.c --uavs3d_srcs_c += $(SRC_PATH)/decore/com_table.c --uavs3d_srcs_c += $(SRC_PATH)/decore/threadpool.c --uavs3d_srcs_c += $(SRC_PATH)/decore/win32thread.c --uavs3d_srcs_c += $(SRC_PATH)/decore/com_util.c --uavs3d_srcs_c += $(SRC_PATH)/decoder/uavs3d.c --uavs3d_srcs_c += $(SRC_PATH)/decoder/bitstream.c --uavs3d_srcs_c += $(SRC_PATH)/decoder/parser.c --uavs3d_srcs_c += $(SRC_PATH)/decoder/dec_util.c -- --LOCAL_CFLAGS += -O3 -fPIC -std=gnu99 - LOCAL_LDFLAGS += -fPIC -+include $(LOCAL_PATH)/uavs3d_main.mk -+include $(BUILD_SHARED_LIBRARY) -+ - --#if build_executable -+include $(LOCAL_PATH)/uavs3d_clear_vars.mk -+LOCAL_MODULE := uavs3d -+LOCAL_LDLIBS:=-L$(SYSROOT)/usr/lib -lm -llog - LOCAL_CFLAGS += -pie -fPIE - LOCAL_LDFLAGS += -pie -fPIE --uavs3d_srcs_test+= $(SRC_PATH)/../test/utest.c --#endif -- --#if build armv7a --#LOCAL_CFLAGS += -mfpu=neon --#include $(LOCAL_PATH)/uavs3d_armv7a.mk --#elif build arm64 --include $(LOCAL_PATH)/uavs3d_arm64.mk --#endif -- --LOCAL_SRC_FILES := $(uavs3d_srcs_c) $(uavs3d_srcs_arm) $(uavs3d_srcs_test) -- --#include $(BUILD_SHARED_LIBRARY) --#include $(BUILD_STATIC_LIBRARY) -+uavs3d_srcs_test+= $(SRC_PATH)/../test/utest.c -+include $(LOCAL_PATH)/uavs3d_main.mk - include $(BUILD_EXECUTABLE) -diff --git a/build/android/ndk/jni/Application.mk b/build/android/ndk/jni/Application.mk -index 292946e..29e7e02 100644 ---- a/build/android/ndk/jni/Application.mk -+++ b/build/android/ndk/jni/Application.mk -@@ -1,8 +1,9 @@ - # APP_ABI := armeabi-v7a -- APP_ABI := arm64-v8a -+# APP_ABI := arm64-v8a - # APP_ABI := armeabi - # APP_ABI := x86 - # APP_ABI := x86_64 -+APP_ABI := all - APP_OPTIM := release - # TARGET_BUILD_TYPE=release - -diff --git a/build/android/ndk/jni/uavs3d_avx2.mk b/build/android/ndk/jni/uavs3d_avx2.mk -new file mode 100644 -index 0000000..d80401a ---- /dev/null -+++ b/build/android/ndk/jni/uavs3d_avx2.mk -@@ -0,0 +1,11 @@ -+ -+AVX_SRC_PATH:=../../../../source/decore/avx2 -+ -+uavs3d_srcs_avx += $(AVX_SRC_PATH)/alf_avx2.c -+uavs3d_srcs_avx += $(AVX_SRC_PATH)/avx2.c -+uavs3d_srcs_avx += $(AVX_SRC_PATH)/inter_pred_avx2.c -+uavs3d_srcs_avx += $(AVX_SRC_PATH)/intra_pred_avx2.c -+uavs3d_srcs_avx += $(AVX_SRC_PATH)/itrans_avx2.c -+uavs3d_srcs_avx += $(AVX_SRC_PATH)/pixel_avx2.c -+uavs3d_srcs_avx += $(AVX_SRC_PATH)/sao_avx2.c -+ -diff --git a/build/android/ndk/jni/uavs3d_clear_vars.mk b/build/android/ndk/jni/uavs3d_clear_vars.mk -new file mode 100644 -index 0000000..0c47cfc ---- /dev/null -+++ b/build/android/ndk/jni/uavs3d_clear_vars.mk -@@ -0,0 +1,6 @@ -+include $(CLEAR_VARS) -+uavs3d_srcs_c := -+uavs3d_srcs_test := -+uavs3d_srcs_arm := -+uavs3d_srcs_sse := -+uavs3d_srcs_avx := -diff --git a/build/android/ndk/jni/uavs3d_main.mk b/build/android/ndk/jni/uavs3d_main.mk -new file mode 100644 -index 0000000..6506e89 ---- /dev/null -+++ b/build/android/ndk/jni/uavs3d_main.mk -@@ -0,0 +1,61 @@ -+ -+### for posix pthread -+#LOCAL_SHARED_LIBRARIES := libcutil -+ -+### include search path when compiling all sources (C,C++,Assembly) -+LOCAL_C_INCLUDES +=$(INCLUDE_PATH) \ -+ $(LOCAL_PATH)/../app -+ -+### c source code -+uavs3d_srcs_c += $(SRC_PATH)/decore/alf.c -+uavs3d_srcs_c += $(SRC_PATH)/decore/deblock.c -+uavs3d_srcs_c += $(SRC_PATH)/decore/inter_pred.c -+uavs3d_srcs_c += $(SRC_PATH)/decore/intra_pred.c -+uavs3d_srcs_c += $(SRC_PATH)/decore/inv_trans.c -+uavs3d_srcs_c += $(SRC_PATH)/decore/pic_manager.c -+uavs3d_srcs_c += $(SRC_PATH)/decore/recon.c -+uavs3d_srcs_c += $(SRC_PATH)/decore/sao.c -+uavs3d_srcs_c += $(SRC_PATH)/decore/com_table.c -+uavs3d_srcs_c += $(SRC_PATH)/decore/threadpool.c -+uavs3d_srcs_c += $(SRC_PATH)/decore/win32thread.c -+uavs3d_srcs_c += $(SRC_PATH)/decore/com_util.c -+uavs3d_srcs_c += $(SRC_PATH)/decoder/uavs3d.c -+uavs3d_srcs_c += $(SRC_PATH)/decoder/bitstream.c -+uavs3d_srcs_c += $(SRC_PATH)/decoder/parser.c -+uavs3d_srcs_c += $(SRC_PATH)/decoder/dec_util.c -+ -+ -+LOCAL_CFLAGS += -O3 -fPIC -std=gnu99 -I../../../source/decore -+ -+### To support 10bit streams decoding: edit it to -DCOMPILE_10BIT=1 -+LOCAL_CFLAGS += -DCOMPILE_10BIT=0 -+ -+ifeq ($(TARGET_ARCH),arm) -+ ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) -+ # build armv7a -+ LOCAL_CFLAGS += -mfpu=neon -D_armv7a -+ include $(LOCAL_PATH)/uavs3d_armv7a.mk -+ endif -+endif -+ -+ifeq ($(TARGET_ARCH),arm64) -+ # build arm64 -+ LOCAL_CFLAGS += -D_arm64 -+ include $(LOCAL_PATH)/uavs3d_arm64.mk -+endif -+ -+ifeq ($(TARGET_ARCH),x86) -+ # build x86 -+ LOCAL_CFLAGS += -msse4.2 -mavx2 -+ include $(LOCAL_PATH)/uavs3d_sse2.mk -+ include $(LOCAL_PATH)/uavs3d_avx2.mk -+endif -+ -+ifeq ($(TARGET_ARCH),x86_64) -+ # build x86_64 -+ LOCAL_CFLAGS += -msse4.2 -mavx2 -+ include $(LOCAL_PATH)/uavs3d_sse2.mk -+ include $(LOCAL_PATH)/uavs3d_avx2.mk -+endif -+ -+LOCAL_SRC_FILES := $(uavs3d_srcs_c) $(uavs3d_srcs_arm) $(uavs3d_srcs_sse) $(uavs3d_srcs_avx) $(uavs3d_srcs_test) -diff --git a/build/android/ndk/jni/uavs3d_sse2.mk b/build/android/ndk/jni/uavs3d_sse2.mk -new file mode 100644 -index 0000000..1f8847a ---- /dev/null -+++ b/build/android/ndk/jni/uavs3d_sse2.mk -@@ -0,0 +1,11 @@ -+ -+SSE_SRC_PATH:=../../../../source/decore/sse -+ -+uavs3d_srcs_sse += $(SSE_SRC_PATH)/alf_sse.c -+uavs3d_srcs_sse += $(SSE_SRC_PATH)/deblock_sse.c -+uavs3d_srcs_sse += $(SSE_SRC_PATH)/inter_pred_sse.c -+uavs3d_srcs_sse += $(SSE_SRC_PATH)/intra_pred_sse.c -+uavs3d_srcs_sse += $(SSE_SRC_PATH)/itrans_sse.c -+uavs3d_srcs_sse += $(SSE_SRC_PATH)/pixel_sse.c -+uavs3d_srcs_sse += $(SSE_SRC_PATH)/sao_sse.c -+uavs3d_srcs_sse += $(SSE_SRC_PATH)/sse.c -diff --git a/build/x86_windows/common.vcxproj b/build/vs2017/common.vcxproj -similarity index 61% -rename from build/x86_windows/common.vcxproj -rename to build/vs2017/common.vcxproj -index c8cd533..95de5c4 100644 ---- a/build/x86_windows/common.vcxproj -+++ b/build/vs2017/common.vcxproj -@@ -1,157 +1,249 @@ --<?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -- <ItemGroup Label="ProjectConfigurations"> -- <ProjectConfiguration Include="Debug|x64"> -- <Configuration>Debug</Configuration> -- <Platform>x64</Platform> -- </ProjectConfiguration> -- <ProjectConfiguration Include="Release|x64"> -- <Configuration>Release</Configuration> -- <Platform>x64</Platform> -- </ProjectConfiguration> -- </ItemGroup> -- <ItemGroup> -- <ClCompile Include="..\..\source\decore\alf.c" /> -- <ClCompile Include="..\..\source\decore\avx2\alf_avx2.c" /> -- <ClCompile Include="..\..\source\decore\avx2\avx2.c" /> -- <ClCompile Include="..\..\source\decore\avx2\inter_pred_avx2.c" /> -- <ClCompile Include="..\..\source\decore\avx2\intra_pred_avx2.c" /> -- <ClCompile Include="..\..\source\decore\avx2\itrans_avx2.c" /> -- <ClCompile Include="..\..\source\decore\avx2\pixel_avx2.c" /> -- <ClCompile Include="..\..\source\decore\avx2\sao_avx2.c" /> -- <ClCompile Include="..\..\source\decore\com_table.c" /> -- <ClCompile Include="..\..\source\decore\com_util.c" /> -- <ClCompile Include="..\..\source\decore\deblock.c" /> -- <ClCompile Include="..\..\source\decore\inter_pred.c" /> -- <ClCompile Include="..\..\source\decore\intra_pred.c" /> -- <ClCompile Include="..\..\source\decore\inv_trans.c" /> -- <ClCompile Include="..\..\source\decore\pic_manager.c" /> -- <ClCompile Include="..\..\source\decore\recon.c" /> -- <ClCompile Include="..\..\source\decore\sao.c" /> -- <ClCompile Include="..\..\source\decore\sse\alf_sse.c" /> -- <ClCompile Include="..\..\source\decore\sse\deblock_sse.c" /> -- <ClCompile Include="..\..\source\decore\sse\inter_pred_sse.c" /> -- <ClCompile Include="..\..\source\decore\sse\intra_pred_sse.c" /> -- <ClCompile Include="..\..\source\decore\sse\itrans_sse.c" /> -- <ClCompile Include="..\..\source\decore\sse\pixel_sse.c" /> -- <ClCompile Include="..\..\source\decore\sse\sao_sse.c" /> -- <ClCompile Include="..\..\source\decore\sse\sse.c" /> -- <ClCompile Include="..\..\source\decore\threadpool.c" /> -- <ClCompile Include="..\..\source\decore\win32thread.c" /> -- </ItemGroup> -- <ItemGroup> -- <ClInclude Include="..\..\source\decore\avx2\avx2.h" /> -- <ClInclude Include="..\..\source\decore\com_def.h" /> -- <ClInclude Include="..\..\source\decore\com_sys.h" /> -- <ClInclude Include="..\..\source\decore\com_table.h" /> -- <ClInclude Include="..\..\source\decore\com_type.h" /> -- <ClInclude Include="..\..\source\decore\com_util.h" /> -- <ClInclude Include="..\..\source\decore\modules.h" /> -- <ClInclude Include="..\..\source\decore\sse\sse.h" /> -- <ClInclude Include="..\..\source\decore\threadpool.h" /> -- <ClInclude Include="..\..\source\decore\win32thread.h" /> -- </ItemGroup> -- <PropertyGroup Label="Globals"> -- <ProjectGuid>{3F9C7116-C287-40D7-865C-D8C89CF4FF31}</ProjectGuid> -- <Keyword>Win32Proj</Keyword> -- <RootNamespace>com_lib_vs17</RootNamespace> -- <ProjectName>common</ProjectName> -- <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> -- </PropertyGroup> -- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> -- <ConfigurationType>StaticLibrary</ConfigurationType> -- <UseDebugLibraries>true</UseDebugLibraries> -- <CharacterSet>MultiByte</CharacterSet> -- <PlatformToolset>v141</PlatformToolset> -- </PropertyGroup> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -- <ConfigurationType>StaticLibrary</ConfigurationType> -- <UseDebugLibraries>false</UseDebugLibraries> -- <WholeProgramOptimization>true</WholeProgramOptimization> -- <CharacterSet>MultiByte</CharacterSet> -- <PlatformToolset>v141</PlatformToolset> -- </PropertyGroup> -- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -- <ImportGroup Label="ExtensionSettings"> -- </ImportGroup> -- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> -- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -- </ImportGroup> -- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> -- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -- </ImportGroup> -- <PropertyGroup Label="UserMacros" /> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -- <OutDir>..\..\lib\</OutDir> -- </PropertyGroup> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -- <TargetName>$(ProjectName)</TargetName> -- <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -- </PropertyGroup> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -- <OutDir>..\..\lib\</OutDir> -- <TargetName>$(ProjectName)</TargetName> -- <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -- </PropertyGroup> -- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -- <ClCompile> -- <PrecompiledHeader>NotUsing</PrecompiledHeader> -- <WarningLevel>Level3</WarningLevel> -- <Optimization>Disabled</Optimization> -- <PreprocessorDefinitions>WIN64;X86F;_DEBUG;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions> -- <AdditionalIncludeDirectories>..\..\source\decore</AdditionalIncludeDirectories> -- <PrecompiledHeaderFile> -- </PrecompiledHeaderFile> -- <PrecompiledHeaderOutputFile> -- </PrecompiledHeaderOutputFile> -- <CompileAs>CompileAsC</CompileAs> -- <ErrorReporting>Prompt</ErrorReporting> -- <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> -- <TreatWarningAsError>true</TreatWarningAsError> -- <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -- </ClCompile> -- <Link> -- <SubSystem>Windows</SubSystem> -- <GenerateDebugInformation>true</GenerateDebugInformation> -- </Link> -- <Lib> -- <OutputFile>..\..\lib\$(ProjectName).lib</OutputFile> -- </Lib> -- </ItemDefinitionGroup> -- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -- <ClCompile> -- <WarningLevel>Level3</WarningLevel> -- <PrecompiledHeader>NotUsing</PrecompiledHeader> -- <Optimization>MaxSpeed</Optimization> -- <FunctionLevelLinking>true</FunctionLevelLinking> -- <IntrinsicFunctions>true</IntrinsicFunctions> -- <PreprocessorDefinitions>WIN64;X86F;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);</PreprocessorDefinitions> -- <AdditionalIncludeDirectories>..\..\source\decore</AdditionalIncludeDirectories> -- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -- <PrecompiledHeaderFile> -- </PrecompiledHeaderFile> -- <PrecompiledHeaderOutputFile> -- </PrecompiledHeaderOutputFile> -- <CompileAs>CompileAsC</CompileAs> -- <ErrorReporting>Prompt</ErrorReporting> -- <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -- <RuntimeLibrary>MultiThreaded</RuntimeLibrary> -- <TreatWarningAsError>true</TreatWarningAsError> -- <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -- </ClCompile> -- <Link> -- <SubSystem>Windows</SubSystem> -- <GenerateDebugInformation>true</GenerateDebugInformation> -- <EnableCOMDATFolding>true</EnableCOMDATFolding> -- <OptimizeReferences>true</OptimizeReferences> -- </Link> -- <Lib> -- <OutputFile>..\..\lib\$(ProjectName).lib</OutputFile> -- </Lib> -- </ItemDefinitionGroup> -- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -- <ImportGroup Label="ExtensionTargets"> -- </ImportGroup> -+<?xml version="1.0" encoding="utf-8"?> -+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+ <ItemGroup Label="ProjectConfigurations"> -+ <ProjectConfiguration Include="Debug|Win32"> -+ <Configuration>Debug</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Debug|x64"> -+ <Configuration>Debug</Configuration> -+ <Platform>x64</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|Win32"> -+ <Configuration>Release</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|x64"> -+ <Configuration>Release</Configuration> -+ <Platform>x64</Platform> -+ </ProjectConfiguration> -+ </ItemGroup> -+ <ItemGroup> -+ <ClCompile Include="..\..\source\decore\alf.c" /> -+ <ClCompile Include="..\..\source\decore\avx2\alf_avx2.c" /> -+ <ClCompile Include="..\..\source\decore\avx2\avx2.c" /> -+ <ClCompile Include="..\..\source\decore\avx2\inter_pred_avx2.c" /> -+ <ClCompile Include="..\..\source\decore\avx2\intra_pred_avx2.c" /> -+ <ClCompile Include="..\..\source\decore\avx2\itrans_avx2.c" /> -+ <ClCompile Include="..\..\source\decore\avx2\pixel_avx2.c" /> -+ <ClCompile Include="..\..\source\decore\avx2\sao_avx2.c" /> -+ <ClCompile Include="..\..\source\decore\com_table.c" /> -+ <ClCompile Include="..\..\source\decore\com_util.c" /> -+ <ClCompile Include="..\..\source\decore\deblock.c" /> -+ <ClCompile Include="..\..\source\decore\inter_pred.c" /> -+ <ClCompile Include="..\..\source\decore\intra_pred.c" /> -+ <ClCompile Include="..\..\source\decore\inv_trans.c" /> -+ <ClCompile Include="..\..\source\decore\pic_manager.c" /> -+ <ClCompile Include="..\..\source\decore\recon.c" /> -+ <ClCompile Include="..\..\source\decore\sao.c" /> -+ <ClCompile Include="..\..\source\decore\sse\alf_sse.c" /> -+ <ClCompile Include="..\..\source\decore\sse\deblock_sse.c" /> -+ <ClCompile Include="..\..\source\decore\sse\inter_pred_sse.c" /> -+ <ClCompile Include="..\..\source\decore\sse\intra_pred_sse.c" /> -+ <ClCompile Include="..\..\source\decore\sse\itrans_sse.c" /> -+ <ClCompile Include="..\..\source\decore\sse\pixel_sse.c" /> -+ <ClCompile Include="..\..\source\decore\sse\sao_sse.c" /> -+ <ClCompile Include="..\..\source\decore\sse\sse.c" /> -+ <ClCompile Include="..\..\source\decore\threadpool.c" /> -+ <ClCompile Include="..\..\source\decore\win32thread.c" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ClInclude Include="..\..\source\decore\avx2\avx2.h" /> -+ <ClInclude Include="..\..\source\decore\com_def.h" /> -+ <ClInclude Include="..\..\source\decore\com_sys.h" /> -+ <ClInclude Include="..\..\source\decore\com_table.h" /> -+ <ClInclude Include="..\..\source\decore\com_type.h" /> -+ <ClInclude Include="..\..\source\decore\com_util.h" /> -+ <ClInclude Include="..\..\source\decore\modules.h" /> -+ <ClInclude Include="..\..\source\decore\sse\sse.h" /> -+ <ClInclude Include="..\..\source\decore\threadpool.h" /> -+ <ClInclude Include="..\..\source\decore\win32thread.h" /> -+ </ItemGroup> -+ <PropertyGroup Label="Globals"> -+ <ProjectGuid>{3F9C7116-C287-40D7-865C-D8C89CF4FF31}</ProjectGuid> -+ <Keyword>Win32Proj</Keyword> -+ <RootNamespace>com_lib_vs17</RootNamespace> -+ <ProjectName>common</ProjectName> -+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> -+ <ConfigurationType>StaticLibrary</ConfigurationType> -+ <UseDebugLibraries>true</UseDebugLibraries> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v141</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> -+ <ConfigurationType>StaticLibrary</ConfigurationType> -+ <UseDebugLibraries>true</UseDebugLibraries> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v141</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -+ <ConfigurationType>StaticLibrary</ConfigurationType> -+ <UseDebugLibraries>false</UseDebugLibraries> -+ <WholeProgramOptimization>true</WholeProgramOptimization> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v141</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -+ <ConfigurationType>StaticLibrary</ConfigurationType> -+ <UseDebugLibraries>false</UseDebugLibraries> -+ <WholeProgramOptimization>true</WholeProgramOptimization> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v141</PlatformToolset> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -+ <ImportGroup Label="ExtensionSettings"> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <PropertyGroup Label="UserMacros" /> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <OutDir>..\..\lib\</OutDir> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <TargetName>$(ProjectName)</TargetName> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <TargetName>$(ProjectName)</TargetName> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <OutDir>..\..\lib\</OutDir> -+ <TargetName>$(ProjectName)</TargetName> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <TargetName>$(ProjectName)</TargetName> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ </PropertyGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <ClCompile> -+ <PrecompiledHeader>NotUsing</PrecompiledHeader> -+ <WarningLevel>Level3</WarningLevel> -+ <Optimization>Disabled</Optimization> -+ <PreprocessorDefinitions>WIN64;X86F;_DEBUG;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions> -+ <AdditionalIncludeDirectories>..\..\source\decore</AdditionalIncludeDirectories> -+ <PrecompiledHeaderFile> -+ </PrecompiledHeaderFile> -+ <PrecompiledHeaderOutputFile> -+ </PrecompiledHeaderOutputFile> -+ <CompileAs>CompileAsC</CompileAs> -+ <ErrorReporting>Prompt</ErrorReporting> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <SubSystem>Windows</SubSystem> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ </Link> -+ <Lib> -+ <OutputFile>..\..\lib\$(ProjectName).lib</OutputFile> -+ </Lib> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <ClCompile> -+ <PrecompiledHeader>NotUsing</PrecompiledHeader> -+ <WarningLevel>Level3</WarningLevel> -+ <Optimization>Disabled</Optimization> -+ <PreprocessorDefinitions>WIN64;X86F;_DEBUG;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions> -+ <AdditionalIncludeDirectories>..\..\source\decore</AdditionalIncludeDirectories> -+ <PrecompiledHeaderFile> -+ </PrecompiledHeaderFile> -+ <PrecompiledHeaderOutputFile> -+ </PrecompiledHeaderOutputFile> -+ <CompileAs>CompileAsC</CompileAs> -+ <ErrorReporting>Prompt</ErrorReporting> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <SubSystem>Windows</SubSystem> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ </Link> -+ <Lib> -+ <OutputFile>..\..\lib\$(ProjectName).lib</OutputFile> -+ </Lib> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <ClCompile> -+ <WarningLevel>Level3</WarningLevel> -+ <PrecompiledHeader>NotUsing</PrecompiledHeader> -+ <Optimization>MaxSpeed</Optimization> -+ <FunctionLevelLinking>true</FunctionLevelLinking> -+ <IntrinsicFunctions>true</IntrinsicFunctions> -+ <PreprocessorDefinitions>WIN64;X86F;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);</PreprocessorDefinitions> -+ <AdditionalIncludeDirectories>..\..\source\decore</AdditionalIncludeDirectories> -+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -+ <PrecompiledHeaderFile> -+ </PrecompiledHeaderFile> -+ <PrecompiledHeaderOutputFile> -+ </PrecompiledHeaderOutputFile> -+ <CompileAs>CompileAsC</CompileAs> -+ <ErrorReporting>Prompt</ErrorReporting> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <SubSystem>Windows</SubSystem> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <EnableCOMDATFolding>true</EnableCOMDATFolding> -+ <OptimizeReferences>true</OptimizeReferences> -+ </Link> -+ <Lib> -+ <OutputFile>..\..\lib\$(ProjectName).lib</OutputFile> -+ </Lib> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <ClCompile> -+ <WarningLevel>Level3</WarningLevel> -+ <PrecompiledHeader>NotUsing</PrecompiledHeader> -+ <Optimization>MaxSpeed</Optimization> -+ <FunctionLevelLinking>true</FunctionLevelLinking> -+ <IntrinsicFunctions>true</IntrinsicFunctions> -+ <PreprocessorDefinitions>WIN64;X86F;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);</PreprocessorDefinitions> -+ <AdditionalIncludeDirectories>..\..\source\decore</AdditionalIncludeDirectories> -+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -+ <PrecompiledHeaderFile> -+ </PrecompiledHeaderFile> -+ <PrecompiledHeaderOutputFile> -+ </PrecompiledHeaderOutputFile> -+ <CompileAs>CompileAsC</CompileAs> -+ <ErrorReporting>Prompt</ErrorReporting> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <SubSystem>Windows</SubSystem> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <EnableCOMDATFolding>true</EnableCOMDATFolding> -+ <OptimizeReferences>true</OptimizeReferences> -+ </Link> -+ <Lib> -+ <OutputFile>..\..\lib\$(ProjectName).lib</OutputFile> -+ </Lib> -+ </ItemDefinitionGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -+ <ImportGroup Label="ExtensionTargets"> -+ </ImportGroup> - </Project> -\ No newline at end of file -diff --git a/build/x86_windows/common.vcxproj.filters b/build/vs2017/common.vcxproj.filters -similarity index 100% -rename from build/x86_windows/common.vcxproj.filters -rename to build/vs2017/common.vcxproj.filters -diff --git a/build/x86_windows/libuavs3d.vcxproj b/build/vs2017/libuavs3d.vcxproj -similarity index 55% -rename from build/x86_windows/libuavs3d.vcxproj -rename to build/vs2017/libuavs3d.vcxproj -index d92a51f..bb42a6c 100644 ---- a/build/x86_windows/libuavs3d.vcxproj -+++ b/build/vs2017/libuavs3d.vcxproj -@@ -1,115 +1,193 @@ --<?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -- <ItemGroup Label="ProjectConfigurations"> -- <ProjectConfiguration Include="Debug|x64"> -- <Configuration>Debug</Configuration> -- <Platform>x64</Platform> -- </ProjectConfiguration> -- <ProjectConfiguration Include="Release|x64"> -- <Configuration>Release</Configuration> -- <Platform>x64</Platform> -- </ProjectConfiguration> -- </ItemGroup> -- <ItemGroup> -- <ClCompile Include="..\..\source\decoder\bitstream.c" /> -- <ClCompile Include="..\..\source\decoder\dec_util.c" /> -- <ClCompile Include="..\..\source\decoder\parser.c" /> -- <ClCompile Include="..\..\source\decoder\uavs3d.c" /> -- </ItemGroup> -- <ItemGroup> -- <ClInclude Include="..\..\contributor.h" /> -- <ClInclude Include="..\..\source\decoder\bitstream.h" /> -- <ClInclude Include="..\..\source\decoder\dec_type.h" /> -- <ClInclude Include="..\..\source\decoder\dec_util.h" /> -- <ClInclude Include="..\..\source\decoder\parser.h" /> -- <ClInclude Include="..\..\source\decoder\uavs3d.h" /> -- </ItemGroup> -- <PropertyGroup Label="Globals"> -- <ProjectGuid>{40B445E8-306A-4C77-9B19-FC76C2379F79}</ProjectGuid> -- <RootNamespace>dec_lib</RootNamespace> -- <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> -- <ProjectName>libuavs3d</ProjectName> -- </PropertyGroup> -- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> -- <ConfigurationType>DynamicLibrary</ConfigurationType> -- <UseDebugLibraries>true</UseDebugLibraries> -- <PlatformToolset>v141</PlatformToolset> -- <CharacterSet>MultiByte</CharacterSet> -- </PropertyGroup> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -- <ConfigurationType>DynamicLibrary</ConfigurationType> -- <UseDebugLibraries>false</UseDebugLibraries> -- <PlatformToolset>v141</PlatformToolset> -- <WholeProgramOptimization>true</WholeProgramOptimization> -- <CharacterSet>MultiByte</CharacterSet> -- </PropertyGroup> -- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -- <ImportGroup Label="ExtensionSettings"> -- </ImportGroup> -- <ImportGroup Label="Shared"> -- </ImportGroup> -- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -- </ImportGroup> -- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -- </ImportGroup> -- <PropertyGroup Label="UserMacros" /> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -- <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -- <OutDir>..\..\bin</OutDir> -- <LibraryPath>..\..\lib;$(LibraryPath)</LibraryPath> -- </PropertyGroup> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -- <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -- <OutDir>..\..\bin</OutDir> -- <LibraryPath>..\..\lib;$(LibraryPath)</LibraryPath> -- </PropertyGroup> -- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -- <ClCompile> -- <WarningLevel>Level3</WarningLevel> -- <Optimization>Disabled</Optimization> -- <SDLCheck>true</SDLCheck> -- <AdditionalIncludeDirectories>..\..\source\decore;..\..\source\decoder</AdditionalIncludeDirectories> -- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> -- <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -- <PreprocessorDefinitions>WIN64;;%(PreprocessorDefinitions);UAVS3D_EXPORTS;_DEBUG</PreprocessorDefinitions> -- <TreatWarningAsError>true</TreatWarningAsError> -- <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -- </ClCompile> -- <Link> -- <GenerateDebugInformation>true</GenerateDebugInformation> -- <AdditionalDependencies>common.lib;%(AdditionalDependencies)</AdditionalDependencies> -- <ShowProgress>NotSet</ShowProgress> -- <Version>1.0</Version> -- </Link> -- </ItemDefinitionGroup> -- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -- <ClCompile> -- <WarningLevel>Level3</WarningLevel> -- <Optimization>MaxSpeed</Optimization> -- <FunctionLevelLinking>true</FunctionLevelLinking> -- <IntrinsicFunctions>true</IntrinsicFunctions> -- <SDLCheck>true</SDLCheck> -- <AdditionalIncludeDirectories>..\..\source\decore;..\..\source\decoder</AdditionalIncludeDirectories> -- <RuntimeLibrary>MultiThreaded</RuntimeLibrary> -- <CompileAs>CompileAsC</CompileAs> -- <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -- <PreprocessorDefinitions>WIN64;;%(PreprocessorDefinitions);UAVS3D_EXPORTS;</PreprocessorDefinitions> -- <TreatWarningAsError>true</TreatWarningAsError> -- <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -- </ClCompile> -- <Link> -- <GenerateDebugInformation>true</GenerateDebugInformation> -- <EnableCOMDATFolding>true</EnableCOMDATFolding> -- <OptimizeReferences>true</OptimizeReferences> -- <AdditionalDependencies>common.lib;%(AdditionalDependencies)</AdditionalDependencies> -- <ShowProgress>NotSet</ShowProgress> -- <Version>1.0</Version> -- </Link> -- </ItemDefinitionGroup> -- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -- <ImportGroup Label="ExtensionTargets"> -- </ImportGroup> -+<?xml version="1.0" encoding="utf-8"?> -+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+ <ItemGroup Label="ProjectConfigurations"> -+ <ProjectConfiguration Include="Debug|Win32"> -+ <Configuration>Debug</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Debug|x64"> -+ <Configuration>Debug</Configuration> -+ <Platform>x64</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|Win32"> -+ <Configuration>Release</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|x64"> -+ <Configuration>Release</Configuration> -+ <Platform>x64</Platform> -+ </ProjectConfiguration> -+ </ItemGroup> -+ <ItemGroup> -+ <ClCompile Include="..\..\source\decoder\bitstream.c" /> -+ <ClCompile Include="..\..\source\decoder\dec_util.c" /> -+ <ClCompile Include="..\..\source\decoder\parser.c" /> -+ <ClCompile Include="..\..\source\decoder\uavs3d.c" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ClInclude Include="..\..\contributor.h" /> -+ <ClInclude Include="..\..\source\decoder\bitstream.h" /> -+ <ClInclude Include="..\..\source\decoder\dec_type.h" /> -+ <ClInclude Include="..\..\source\decoder\dec_util.h" /> -+ <ClInclude Include="..\..\source\decoder\parser.h" /> -+ <ClInclude Include="..\..\source\decoder\uavs3d.h" /> -+ </ItemGroup> -+ <PropertyGroup Label="Globals"> -+ <ProjectGuid>{40B445E8-306A-4C77-9B19-FC76C2379F79}</ProjectGuid> -+ <RootNamespace>dec_lib</RootNamespace> -+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> -+ <ProjectName>libuavs3d</ProjectName> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <UseDebugLibraries>true</UseDebugLibraries> -+ <PlatformToolset>v141</PlatformToolset> -+ <CharacterSet>MultiByte</CharacterSet> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <UseDebugLibraries>true</UseDebugLibraries> -+ <PlatformToolset>v141</PlatformToolset> -+ <CharacterSet>MultiByte</CharacterSet> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <UseDebugLibraries>false</UseDebugLibraries> -+ <PlatformToolset>v141</PlatformToolset> -+ <WholeProgramOptimization>true</WholeProgramOptimization> -+ <CharacterSet>MultiByte</CharacterSet> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -+ <ConfigurationType>DynamicLibrary</ConfigurationType> -+ <UseDebugLibraries>false</UseDebugLibraries> -+ <PlatformToolset>v141</PlatformToolset> -+ <WholeProgramOptimization>true</WholeProgramOptimization> -+ <CharacterSet>MultiByte</CharacterSet> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -+ <ImportGroup Label="ExtensionSettings"> -+ </ImportGroup> -+ <ImportGroup Label="Shared"> -+ </ImportGroup> -+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <PropertyGroup Label="UserMacros" /> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ <OutDir>..\..\bin</OutDir> -+ <LibraryPath>..\..\lib;$(LibraryPath)</LibraryPath> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <LibraryPath>..\..\lib;$(LibraryPath)</LibraryPath> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ <OutDir>..\..\bin</OutDir> -+ <LibraryPath>..\..\lib;$(LibraryPath)</LibraryPath> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <LibraryPath>..\..\lib;$(LibraryPath)</LibraryPath> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ </PropertyGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <ClCompile> -+ <WarningLevel>Level3</WarningLevel> -+ <Optimization>Disabled</Optimization> -+ <SDLCheck>true</SDLCheck> -+ <AdditionalIncludeDirectories>..\..\source\decore;..\..\source\decoder</AdditionalIncludeDirectories> -+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <PreprocessorDefinitions>WIN64;;%(PreprocessorDefinitions);UAVS3D_EXPORTS;_DEBUG</PreprocessorDefinitions> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <AdditionalDependencies>common.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <ShowProgress>NotSet</ShowProgress> -+ <Version>1.0</Version> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <ClCompile> -+ <WarningLevel>Level3</WarningLevel> -+ <Optimization>Disabled</Optimization> -+ <SDLCheck>true</SDLCheck> -+ <AdditionalIncludeDirectories>..\..\source\decore;..\..\source\decoder</AdditionalIncludeDirectories> -+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <PreprocessorDefinitions>WIN64;;%(PreprocessorDefinitions);UAVS3D_EXPORTS;_DEBUG</PreprocessorDefinitions> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <AdditionalDependencies>common.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <ShowProgress>NotSet</ShowProgress> -+ <Version>1.0</Version> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <ClCompile> -+ <WarningLevel>Level3</WarningLevel> -+ <Optimization>MaxSpeed</Optimization> -+ <FunctionLevelLinking>true</FunctionLevelLinking> -+ <IntrinsicFunctions>true</IntrinsicFunctions> -+ <SDLCheck>true</SDLCheck> -+ <AdditionalIncludeDirectories>..\..\source\decore;..\..\source\decoder</AdditionalIncludeDirectories> -+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> -+ <CompileAs>CompileAsC</CompileAs> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <PreprocessorDefinitions>WIN64;;%(PreprocessorDefinitions);UAVS3D_EXPORTS;</PreprocessorDefinitions> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <EnableCOMDATFolding>true</EnableCOMDATFolding> -+ <OptimizeReferences>true</OptimizeReferences> -+ <AdditionalDependencies>common.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <ShowProgress>NotSet</ShowProgress> -+ <Version>1.0</Version> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <ClCompile> -+ <WarningLevel>Level3</WarningLevel> -+ <Optimization>MaxSpeed</Optimization> -+ <FunctionLevelLinking>true</FunctionLevelLinking> -+ <IntrinsicFunctions>true</IntrinsicFunctions> -+ <SDLCheck>true</SDLCheck> -+ <AdditionalIncludeDirectories>..\..\source\decore;..\..\source\decoder</AdditionalIncludeDirectories> -+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> -+ <CompileAs>CompileAsC</CompileAs> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <PreprocessorDefinitions>WIN64;;%(PreprocessorDefinitions);UAVS3D_EXPORTS;</PreprocessorDefinitions> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <EnableCOMDATFolding>true</EnableCOMDATFolding> -+ <OptimizeReferences>true</OptimizeReferences> -+ <AdditionalDependencies>common.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <ShowProgress>NotSet</ShowProgress> -+ <Version>1.0</Version> -+ </Link> -+ </ItemDefinitionGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -+ <ImportGroup Label="ExtensionTargets"> -+ </ImportGroup> - </Project> -\ No newline at end of file -diff --git a/build/x86_windows/uavs3d.sln b/build/vs2017/uavs3d.sln -similarity index 68% -rename from build/x86_windows/uavs3d.sln -rename to build/vs2017/uavs3d.sln -index e6d34c4..d098d33 100644 ---- a/build/x86_windows/uavs3d.sln -+++ b/build/vs2017/uavs3d.sln -@@ -1,47 +1,61 @@ -- --Microsoft Visual Studio Solution File, Format Version 12.00 --# Visual Studio 15 --VisualStudioVersion = 15.0.27130.2026 --MinimumVisualStudioVersion = 10.0.40219.1 --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{3F9C7116-C287-40D7-865C-D8C89CF4FF31}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uavs3d", "uavs3d.vcxproj", "{798F7D68-C94D-41AF-86A4-98F7726D172C}" -- ProjectSection(ProjectDependencies) = postProject -- {3F9C7116-C287-40D7-865C-D8C89CF4FF31} = {3F9C7116-C287-40D7-865C-D8C89CF4FF31} -- {40B445E8-306A-4C77-9B19-FC76C2379F79} = {40B445E8-306A-4C77-9B19-FC76C2379F79} -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libuavs3d", "libuavs3d.vcxproj", "{40B445E8-306A-4C77-9B19-FC76C2379F79}" -- ProjectSection(ProjectDependencies) = postProject -- {3F9C7116-C287-40D7-865C-D8C89CF4FF31} = {3F9C7116-C287-40D7-865C-D8C89CF4FF31} -- EndProjectSection --EndProject --Global -- GlobalSection(SolutionConfigurationPlatforms) = preSolution -- Debug|x64 = Debug|x64 -- Release|x64 = Release|x64 -- EndGlobalSection -- GlobalSection(ProjectConfigurationPlatforms) = postSolution -- {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Debug|x64.ActiveCfg = Debug|x64 -- {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Debug|x64.Build.0 = Debug|x64 -- {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Release|x64.ActiveCfg = Release|x64 -- {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Release|x64.Build.0 = Release|x64 -- {798F7D68-C94D-41AF-86A4-98F7726D172C}.Debug|x64.ActiveCfg = Debug|x64 -- {798F7D68-C94D-41AF-86A4-98F7726D172C}.Debug|x64.Build.0 = Debug|x64 -- {798F7D68-C94D-41AF-86A4-98F7726D172C}.Release|x64.ActiveCfg = Release|x64 -- {798F7D68-C94D-41AF-86A4-98F7726D172C}.Release|x64.Build.0 = Release|x64 -- {40B445E8-306A-4C77-9B19-FC76C2379F79}.Debug|x64.ActiveCfg = Debug|x64 -- {40B445E8-306A-4C77-9B19-FC76C2379F79}.Debug|x64.Build.0 = Debug|x64 -- {40B445E8-306A-4C77-9B19-FC76C2379F79}.Release|x64.ActiveCfg = Release|x64 -- {40B445E8-306A-4C77-9B19-FC76C2379F79}.Release|x64.Build.0 = Release|x64 -- EndGlobalSection -- GlobalSection(SolutionProperties) = preSolution -- HideSolutionNode = FALSE -- EndGlobalSection -- GlobalSection(ExtensibilityGlobals) = postSolution -- SolutionGuid = {ED69324B-A55F-49DC-91D3-5F1D34DF875C} -- EndGlobalSection -- GlobalSection(Performance) = preSolution -- HasPerformanceSessions = true -- EndGlobalSection --EndGlobal -+ -+Microsoft Visual Studio Solution File, Format Version 12.00 -+# Visual Studio 15 -+VisualStudioVersion = 15.0.26228.4 -+MinimumVisualStudioVersion = 10.0.40219.1 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{3F9C7116-C287-40D7-865C-D8C89CF4FF31}" -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uavs3d", "uavs3d.vcxproj", "{798F7D68-C94D-41AF-86A4-98F7726D172C}" -+ ProjectSection(ProjectDependencies) = postProject -+ {3F9C7116-C287-40D7-865C-D8C89CF4FF31} = {3F9C7116-C287-40D7-865C-D8C89CF4FF31} -+ {40B445E8-306A-4C77-9B19-FC76C2379F79} = {40B445E8-306A-4C77-9B19-FC76C2379F79} -+ EndProjectSection -+EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libuavs3d", "libuavs3d.vcxproj", "{40B445E8-306A-4C77-9B19-FC76C2379F79}" -+ ProjectSection(ProjectDependencies) = postProject -+ {3F9C7116-C287-40D7-865C-D8C89CF4FF31} = {3F9C7116-C287-40D7-865C-D8C89CF4FF31} -+ EndProjectSection -+EndProject -+Global -+ GlobalSection(SolutionConfigurationPlatforms) = preSolution -+ Debug|x64 = Debug|x64 -+ Debug|x86 = Debug|x86 -+ Release|x64 = Release|x64 -+ Release|x86 = Release|x86 -+ EndGlobalSection -+ GlobalSection(ProjectConfigurationPlatforms) = postSolution -+ {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Debug|x64.ActiveCfg = Debug|x64 -+ {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Debug|x64.Build.0 = Debug|x64 -+ {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Debug|x86.ActiveCfg = Debug|Win32 -+ {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Debug|x86.Build.0 = Debug|Win32 -+ {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Release|x64.ActiveCfg = Release|x64 -+ {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Release|x64.Build.0 = Release|x64 -+ {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Release|x86.ActiveCfg = Release|Win32 -+ {3F9C7116-C287-40D7-865C-D8C89CF4FF31}.Release|x86.Build.0 = Release|Win32 -+ {798F7D68-C94D-41AF-86A4-98F7726D172C}.Debug|x64.ActiveCfg = Debug|x64 -+ {798F7D68-C94D-41AF-86A4-98F7726D172C}.Debug|x64.Build.0 = Debug|x64 -+ {798F7D68-C94D-41AF-86A4-98F7726D172C}.Debug|x86.ActiveCfg = Debug|Win32 -+ {798F7D68-C94D-41AF-86A4-98F7726D172C}.Debug|x86.Build.0 = Debug|Win32 -+ {798F7D68-C94D-41AF-86A4-98F7726D172C}.Release|x64.ActiveCfg = Release|x64 -+ {798F7D68-C94D-41AF-86A4-98F7726D172C}.Release|x64.Build.0 = Release|x64 -+ {798F7D68-C94D-41AF-86A4-98F7726D172C}.Release|x86.ActiveCfg = Release|Win32 -+ {798F7D68-C94D-41AF-86A4-98F7726D172C}.Release|x86.Build.0 = Release|Win32 -+ {40B445E8-306A-4C77-9B19-FC76C2379F79}.Debug|x64.ActiveCfg = Debug|x64 -+ {40B445E8-306A-4C77-9B19-FC76C2379F79}.Debug|x64.Build.0 = Debug|x64 -+ {40B445E8-306A-4C77-9B19-FC76C2379F79}.Debug|x86.ActiveCfg = Debug|Win32 -+ {40B445E8-306A-4C77-9B19-FC76C2379F79}.Debug|x86.Build.0 = Debug|Win32 -+ {40B445E8-306A-4C77-9B19-FC76C2379F79}.Release|x64.ActiveCfg = Release|x64 -+ {40B445E8-306A-4C77-9B19-FC76C2379F79}.Release|x64.Build.0 = Release|x64 -+ {40B445E8-306A-4C77-9B19-FC76C2379F79}.Release|x86.ActiveCfg = Release|Win32 -+ {40B445E8-306A-4C77-9B19-FC76C2379F79}.Release|x86.Build.0 = Release|Win32 -+ EndGlobalSection -+ GlobalSection(SolutionProperties) = preSolution -+ HideSolutionNode = FALSE -+ EndGlobalSection -+ GlobalSection(ExtensibilityGlobals) = postSolution -+ SolutionGuid = {ED69324B-A55F-49DC-91D3-5F1D34DF875C} -+ EndGlobalSection -+ GlobalSection(Performance) = preSolution -+ HasPerformanceSessions = true -+ EndGlobalSection -+EndGlobal -diff --git a/build/x86_windows/uavs3d.vcxproj b/build/vs2017/uavs3d.vcxproj -similarity index 55% -rename from build/x86_windows/uavs3d.vcxproj -rename to build/vs2017/uavs3d.vcxproj -index 9557243..25603ec 100644 ---- a/build/x86_windows/uavs3d.vcxproj -+++ b/build/vs2017/uavs3d.vcxproj -@@ -1,118 +1,200 @@ --<?xml version="1.0" encoding="utf-8"?> --<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -- <ItemGroup Label="ProjectConfigurations"> -- <ProjectConfiguration Include="Debug|x64"> -- <Configuration>Debug</Configuration> -- <Platform>x64</Platform> -- </ProjectConfiguration> -- <ProjectConfiguration Include="Release|x64"> -- <Configuration>Release</Configuration> -- <Platform>x64</Platform> -- </ProjectConfiguration> -- </ItemGroup> -- <PropertyGroup Label="Globals"> -- <ProjectGuid>{798F7D68-C94D-41AF-86A4-98F7726D172C}</ProjectGuid> -- <Keyword>Win32Proj</Keyword> -- <RootNamespace>dec_test_vs17</RootNamespace> -- <ProjectName>uavs3d</ProjectName> -- <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> -- </PropertyGroup> -- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> -- <ConfigurationType>Application</ConfigurationType> -- <UseDebugLibraries>true</UseDebugLibraries> -- <CharacterSet>MultiByte</CharacterSet> -- <PlatformToolset>v141</PlatformToolset> -- </PropertyGroup> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -- <ConfigurationType>Application</ConfigurationType> -- <UseDebugLibraries>false</UseDebugLibraries> -- <WholeProgramOptimization>true</WholeProgramOptimization> -- <CharacterSet>MultiByte</CharacterSet> -- <PlatformToolset>v141</PlatformToolset> -- </PropertyGroup> -- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -- <ImportGroup Label="ExtensionSettings"> -- </ImportGroup> -- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> -- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -- </ImportGroup> -- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> -- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -- </ImportGroup> -- <PropertyGroup Label="UserMacros" /> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -- <LinkIncremental>false</LinkIncremental> -- <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -- <OutDir>$(SolutionDir)\..\..\bin</OutDir> -- </PropertyGroup> -- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -- <LinkIncremental>false</LinkIncremental> -- <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -- <OutDir>$(SolutionDir)\..\..\bin</OutDir> -- </PropertyGroup> -- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -- <ClCompile> -- <PrecompiledHeader> -- </PrecompiledHeader> -- <WarningLevel>Level3</WarningLevel> -- <Optimization>Disabled</Optimization> -- <PreprocessorDefinitions>WIN64;_CONSOLE;%(PreprocessorDefinitions);_DEBUG</PreprocessorDefinitions> -- <AdditionalIncludeDirectories>..\..\inc;..\..\src</AdditionalIncludeDirectories> -- <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> -- <TreatWarningAsError>true</TreatWarningAsError> -- <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -- </ClCompile> -- <Link> -- <SubSystem>Console</SubSystem> -- <GenerateDebugInformation>true</GenerateDebugInformation> -- <AdditionalDependencies> -- </AdditionalDependencies> -- <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories> -- </Link> -- </ItemDefinitionGroup> -- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -- <ClCompile> -- <WarningLevel>Level3</WarningLevel> -- <PrecompiledHeader> -- </PrecompiledHeader> -- <Optimization>MaxSpeed</Optimization> -- <FunctionLevelLinking>true</FunctionLevelLinking> -- <IntrinsicFunctions>true</IntrinsicFunctions> -- <PreprocessorDefinitions>WIN64;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> -- <AdditionalIncludeDirectories>..\..\inc;..\..\src</AdditionalIncludeDirectories> -- <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -- <RuntimeLibrary>MultiThreaded</RuntimeLibrary> -- <TreatWarningAsError>true</TreatWarningAsError> -- <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -- </ClCompile> -- <Link> -- <SubSystem>Console</SubSystem> -- <GenerateDebugInformation>true</GenerateDebugInformation> -- <EnableCOMDATFolding>true</EnableCOMDATFolding> -- <OptimizeReferences>true</OptimizeReferences> -- <AdditionalDependencies> -- </AdditionalDependencies> -- <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories> -- </Link> -- </ItemDefinitionGroup> -- <ItemGroup> -- <ClInclude Include="..\..\test\utest.h" /> -- </ItemGroup> -- <ItemGroup> -- <ClCompile Include="..\..\test\utest.c" /> -- </ItemGroup> -- <ItemGroup> -- <ProjectReference Include="common.vcxproj"> -- <Project>{3f9c7116-c287-40d7-865c-d8c89cf4ff31}</Project> -- </ProjectReference> -- <ProjectReference Include="libuavs3d.vcxproj"> -- <Project>{40b445e8-306a-4c77-9b19-fc76c2379f79}</Project> -- </ProjectReference> -- </ItemGroup> -- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -- <ImportGroup Label="ExtensionTargets"> -- </ImportGroup> -+<?xml version="1.0" encoding="utf-8"?> -+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -+ <ItemGroup Label="ProjectConfigurations"> -+ <ProjectConfiguration Include="Debug|Win32"> -+ <Configuration>Debug</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Debug|x64"> -+ <Configuration>Debug</Configuration> -+ <Platform>x64</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|Win32"> -+ <Configuration>Release</Configuration> -+ <Platform>Win32</Platform> -+ </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|x64"> -+ <Configuration>Release</Configuration> -+ <Platform>x64</Platform> -+ </ProjectConfiguration> -+ </ItemGroup> -+ <PropertyGroup Label="Globals"> -+ <ProjectGuid>{798F7D68-C94D-41AF-86A4-98F7726D172C}</ProjectGuid> -+ <Keyword>Win32Proj</Keyword> -+ <RootNamespace>dec_test_vs17</RootNamespace> -+ <ProjectName>uavs3d</ProjectName> -+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> -+ <ConfigurationType>Application</ConfigurationType> -+ <UseDebugLibraries>true</UseDebugLibraries> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v141</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> -+ <ConfigurationType>Application</ConfigurationType> -+ <UseDebugLibraries>true</UseDebugLibraries> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v141</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -+ <ConfigurationType>Application</ConfigurationType> -+ <UseDebugLibraries>false</UseDebugLibraries> -+ <WholeProgramOptimization>true</WholeProgramOptimization> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v141</PlatformToolset> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -+ <ConfigurationType>Application</ConfigurationType> -+ <UseDebugLibraries>false</UseDebugLibraries> -+ <WholeProgramOptimization>true</WholeProgramOptimization> -+ <CharacterSet>MultiByte</CharacterSet> -+ <PlatformToolset>v141</PlatformToolset> -+ </PropertyGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -+ <ImportGroup Label="ExtensionSettings"> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ </ImportGroup> -+ <PropertyGroup Label="UserMacros" /> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <LinkIncremental>false</LinkIncremental> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ <OutDir>$(SolutionDir)\..\..\bin</OutDir> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <LinkIncremental>false</LinkIncremental> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <LinkIncremental>false</LinkIncremental> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ <OutDir>$(SolutionDir)\..\..\bin</OutDir> -+ </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <LinkIncremental>false</LinkIncremental> -+ <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> -+ </PropertyGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -+ <ClCompile> -+ <PrecompiledHeader> -+ </PrecompiledHeader> -+ <WarningLevel>Level3</WarningLevel> -+ <Optimization>Disabled</Optimization> -+ <PreprocessorDefinitions>WIN64;_CONSOLE;%(PreprocessorDefinitions);_DEBUG</PreprocessorDefinitions> -+ <AdditionalIncludeDirectories>..\..\inc;..\..\src</AdditionalIncludeDirectories> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <SubSystem>Console</SubSystem> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <AdditionalDependencies> -+ </AdditionalDependencies> -+ <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -+ <ClCompile> -+ <PrecompiledHeader> -+ </PrecompiledHeader> -+ <WarningLevel>Level3</WarningLevel> -+ <Optimization>Disabled</Optimization> -+ <PreprocessorDefinitions>WIN64;_CONSOLE;%(PreprocessorDefinitions);_DEBUG</PreprocessorDefinitions> -+ <AdditionalIncludeDirectories>..\..\inc;..\..\src</AdditionalIncludeDirectories> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <SubSystem>Console</SubSystem> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <AdditionalDependencies> -+ </AdditionalDependencies> -+ <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <ClCompile> -+ <WarningLevel>Level3</WarningLevel> -+ <PrecompiledHeader> -+ </PrecompiledHeader> -+ <Optimization>MaxSpeed</Optimization> -+ <FunctionLevelLinking>true</FunctionLevelLinking> -+ <IntrinsicFunctions>true</IntrinsicFunctions> -+ <PreprocessorDefinitions>WIN64;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <AdditionalIncludeDirectories>..\..\inc;..\..\src</AdditionalIncludeDirectories> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <SubSystem>Console</SubSystem> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <EnableCOMDATFolding>true</EnableCOMDATFolding> -+ <OptimizeReferences>true</OptimizeReferences> -+ <AdditionalDependencies> -+ </AdditionalDependencies> -+ <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -+ <ClCompile> -+ <WarningLevel>Level3</WarningLevel> -+ <PrecompiledHeader> -+ </PrecompiledHeader> -+ <Optimization>MaxSpeed</Optimization> -+ <FunctionLevelLinking>true</FunctionLevelLinking> -+ <IntrinsicFunctions>true</IntrinsicFunctions> -+ <PreprocessorDefinitions>WIN64;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <AdditionalIncludeDirectories>..\..\inc;..\..\src</AdditionalIncludeDirectories> -+ <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> -+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> -+ <TreatWarningAsError>true</TreatWarningAsError> -+ <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions> -+ </ClCompile> -+ <Link> -+ <SubSystem>Console</SubSystem> -+ <GenerateDebugInformation>true</GenerateDebugInformation> -+ <EnableCOMDATFolding>true</EnableCOMDATFolding> -+ <OptimizeReferences>true</OptimizeReferences> -+ <AdditionalDependencies> -+ </AdditionalDependencies> -+ <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemGroup> -+ <ClInclude Include="..\..\test\utest.h" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ClCompile Include="..\..\test\utest.c" /> -+ </ItemGroup> -+ <ItemGroup> -+ <ProjectReference Include="common.vcxproj"> -+ <Project>{3f9c7116-c287-40d7-865c-d8c89cf4ff31}</Project> -+ </ProjectReference> -+ <ProjectReference Include="libuavs3d.vcxproj"> -+ <Project>{40b445e8-306a-4c77-9b19-fc76c2379f79}</Project> -+ </ProjectReference> -+ </ItemGroup> -+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -+ <ImportGroup Label="ExtensionTargets"> -+ </ImportGroup> - </Project> -\ No newline at end of file -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 4530a63..b52363e 100644 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -1,19 +1,93 @@ - - set(LIBNAME uavs3d) - -+# check cpu -+if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" OR -+ "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") -+ if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) -+ set(UAVS3D_TARGET_CPU "x86") -+ elseif(${CMAKE_SIZEOF_VOID_P} EQUAL 8) -+ set(UAVS3D_TARGET_CPU "x86_64") -+ else() -+ message(FATAL_ERROR -+ " Unexpected pointer size ${CMAKE_SIZEOF_VOID_P} for ${CMAKE_SYSTEM_PROCESSOR}\n") -+ endif() -+elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386" OR -+ "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86") -+ set(UAVS3D_TARGET_CPU "x86") -+elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64" OR -+ "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm64") -+ set(UAVS3D_TARGET_CPU "arm64") -+elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^arm") -+ set(UAVS3D_TARGET_CPU "armv7") -+elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "loongarch64") -+ set(UAVS3D_TARGET_CPU "loongarch64") -+else() -+ message(WARNING "unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}\n") -+ set(UAVS3D_TARGET_CPU "generic") -+endif() -+ - # add source - aux_source_directory(./decoder DIR_UAVS3D_SRC) - aux_source_directory(./decore DIR_UAVS3D_CORE) --aux_source_directory(./decore/sse DIR_X86_SRC) --aux_source_directory(./decore/avx2 DIR_X86_256_SRC) - - list(APPEND DIR_UAVS3D_SRC ${DIR_UAVS3D_CORE}) - - include_directories("decore") -+set(UAVS3D_ASM_FILES "") -+ -+if("${UAVS3D_TARGET_CPU}" MATCHES "x86" OR -+ "${UAVS3D_TARGET_CPU}" MATCHES "x86_64") -+ aux_source_directory(./decore/sse DIR_X86_SRC) -+ aux_source_directory(./decore/avx2 DIR_X86_256_SRC) -+ set_source_files_properties(${DIR_X86_SRC} PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -msse4.2") -+ set_source_files_properties(${DIR_X86_256_SRC} PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -mavx2") -+ -+ list(APPEND UAVS3D_ASM_FILES ${DIR_X86_SRC}) -+ list(APPEND UAVS3D_ASM_FILES ${DIR_X86_256_SRC}) -+elseif("${UAVS3D_TARGET_CPU}" MATCHES "armv7") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/armv7.c") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/alf_armv7.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/deblock_armv7.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/def_armv7.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/inter_pred_armv7.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/intra_pred_armv7.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/dct2_armv7.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/itrans_dct8_dst7_armv7.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/pixel_armv7.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/sao_armv7.c") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/sao_kernel_armv7.S") -+ -+ add_definitions(-D _armv7a) -+ enable_language(ASM) -+elseif("${UAVS3D_TARGET_CPU}" MATCHES "arm64") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/arm64.c") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/alf_arm64.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/deblock_arm64.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/def_arm64.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/inter_pred_arm64.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/intra_pred_arm64.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/intra_pred_chroma_arm64.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/itrans_arm64.c") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/itrans_dct2_arm64.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/itrans_dct8_dst7_arm64.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/pixel_arm64.S") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/sao_arm64.c") -+ list(APPEND UAVS3D_ASM_FILES "./decore/arm64/sao_kernel_arm64.S") - --set_source_files_properties(${DIR_UAVS3D_SRC} PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c99 -O3") --set_source_files_properties(${DIR_X86_SRC} PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c99 -O3 -msse4.2") --set_source_files_properties(${DIR_X86_256_SRC} PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c99 -O3 -mavx2") -+ add_definitions(-D _arm64) -+ enable_language(ASM) -+elseif("${UAVS3D_TARGET_CPU}" MATCHES "loongarch64") -+ # loongarch64 -+endif() -+ -+if(COMPILE_10BIT) -+ add_definitions(-DCOMPILE_10BIT=1) -+ message("-- compile 10bit") -+else() -+ add_definitions(-DCOMPILE_10BIT=0) -+ message("-- compile 8bit") -+endif() - - # get version - set (CONFIG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) -@@ -30,6 +104,7 @@ endfunction() - extract_version_string("${CONFIG_DIR}/version.h" uavs3d_version) - MESSAGE(STATUS "uavs3d version \t\t: ${uavs3d_version}") - -+MESSAGE(STATUS "Target CPU\t\t\t: ${UAVS3D_TARGET_CPU}") - # pkg-config - find_package(Threads REQUIRED) - set(prefix "${CMAKE_INSTALL_PREFIX}") -@@ -65,9 +140,11 @@ MESSAGE(STATUS "BUILD_SHARED_LIBS \t\t: true") - else() - MESSAGE(STATUS "BUILD_SHARED_LIBS \t\t: false") - endif() --add_library(${LIBNAME} ${DIR_UAVS3D_SRC} ${DIR_X86_256_SRC} ${DIR_X86_SRC}) -+add_library(${LIBNAME} ${DIR_UAVS3D_SRC} ${UAVS3D_ASM_FILES}) - --target_link_libraries(${LIBNAME} m) -+if (NOT MSVC) -+ target_link_libraries(${LIBNAME} m) -+endif() - if(CMAKE_USE_PTHREADS_INIT) - target_link_libraries(${LIBNAME} pthread) - endif() -@@ -76,4 +153,3 @@ endif() - install(TARGETS uavs3d LIBRARY DESTINATION ${CMAKE_INSTALL_LIB_DIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIB_DIR}) - install(FILES decoder/uavs3d.h DESTINATION ${CMAKE_INSTALL_INCLUDE_DIR}) - install(FILES ${CONFIG_DIR}/${LIBNAME}.pc DESTINATION ${CMAKE_INSTALL_PKGCONFIG_DIR}) -- -diff --git a/source/decoder/bitstream.c b/source/decoder/bitstream.c -index 9c433ad..1c3aaac 100644 ---- a/source/decoder/bitstream.c -+++ b/source/decoder/bitstream.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decoder/bitstream.h b/source/decoder/bitstream.h -index 60052b4..f1b1043 100644 ---- a/source/decoder/bitstream.h -+++ b/source/decoder/bitstream.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decoder/dec_type.h b/source/decoder/dec_type.h -index 1761605..cfb0442 100644 ---- a/source/decoder/dec_type.h -+++ b/source/decoder/dec_type.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decoder/dec_util.c b/source/decoder/dec_util.c -index e9374d9..e30e323 100644 ---- a/source/decoder/dec_util.c -+++ b/source/decoder/dec_util.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -250,7 +245,7 @@ static void uavs3d_always_inline com_mv_rounding_affine(s32 hor, s32 ver, s32 * - } - } - --static void uavs3d_always_inline check_umve_motion_availability(int scup, int cu_width, int cu_height, int i_scu, int neighbor[NUM_SPATIAL_MV], int valid[NUM_SPATIAL_MV], com_scu_t * map_scu, s16(*map_mv)[REFP_NUM][MV_D], s8(*map_refi)[REFP_NUM]) -+static void uavs3d_always_inline check_umve_motion_availability(int scup, int cu_width, int cu_height, int i_scu, int neighbor[5], int valid[5], com_scu_t * map_scu, s16(*map_mv)[REFP_NUM][MV_D], s8(*map_refi)[REFP_NUM]) - { - int cu_width_in_scu = cu_width >> MIN_CU_LOG2; - int cu_height_in_scu = cu_height >> MIN_CU_LOG2; -@@ -985,7 +980,6 @@ static int get_affine_merge_candidate(com_core_t *core, s8 mrg_list_refi[REFP_NU - int scup = core->cu_scup; - com_map_t *map = &core->map; - com_seqh_t *seqhdr = core->seqhdr; -- com_ref_pic_t(*refp)[REFP_NUM] = core->refp; - int i_scu = seqhdr->i_scu; - int lidx, i, k; - int cu_width = core->cu_width; -@@ -1112,6 +1106,7 @@ static int get_affine_merge_candidate(com_core_t *core, s8 mrg_list_refi[REFP_NU - int neb_addr_rb = scup + i_scu * (cu_height_in_scu - 1) + (cu_width_in_scu - 1); - int scu_y; - int scup_co = get_colocal_scup(neb_addr_rb, i_scu, seqhdr->pic_width_in_scu, seqhdr->pic_height_in_scu, &scu_y); -+ com_ref_pic_t(*refp)[REFP_NUM] = core->refp; - - if (core->pichdr->slice_type == SLICE_B) { - uavs3d_check_ref_avaliable(refp[0][REFP_1].pic, scu_y << MIN_CU_LOG2); -diff --git a/source/decoder/dec_util.h b/source/decoder/dec_util.h -index 77c00a6..9d46217 100644 ---- a/source/decoder/dec_util.h -+++ b/source/decoder/dec_util.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decoder/parser.c b/source/decoder/parser.c -index 45bb26a..9405daa 100644 ---- a/source/decoder/parser.c -+++ b/source/decoder/parser.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -88,6 +83,9 @@ int dec_parse_sqh(com_bs_t * bs, com_seqh_t * seqhdr) - dec_bs_read1(bs, 1); //marker_bit - seqhdr->vertical_size = dec_bs_read(bs, 14, 0, COM_UINT32_MAX); - -+ seqhdr->display_horizontal_size = seqhdr->horizontal_size; -+ seqhdr->display_vertical_size = seqhdr->vertical_size; -+ - seqhdr->chroma_format = (u8)dec_bs_read(bs, 2, 1, 1); - seqhdr->sample_precision = (u8)dec_bs_read(bs, 3, 1, 2); - -@@ -262,19 +260,21 @@ static int user_data(com_pic_header_t *pichdr, com_bs_t * bs) - return RET_OK; - } - --static int sequence_display_extension(com_bs_t * bs) -+static int sequence_display_extension(com_bs_t * bs, com_seqh_t *seqhdr) - { - dec_bs_read(bs, 3, 0, COM_UINT32_MAX); // video_format u(3) - dec_bs_read1(bs, -1); // sample_range u(1) -- int colour_description = dec_bs_read1(bs, -1); // colour_description u(1) -- if (colour_description) { -- dec_bs_read(bs, 8, 0, COM_UINT32_MAX); // colour_primaries u(8) -- dec_bs_read(bs, 8, 0, COM_UINT32_MAX); // transfer_characteristics u(8) -- dec_bs_read(bs, 8, 0, COM_UINT32_MAX); // matrix_coefficients u(8) -+ -+ seqhdr->colour_description = dec_bs_read1(bs, -1); // colour_description u(1) -+ -+ if (seqhdr->colour_description) { -+ seqhdr->colour_primaries = dec_bs_read(bs, 8, 0, COM_UINT32_MAX); // colour_primaries u(8) -+ seqhdr->transfer_characteristics = dec_bs_read(bs, 8, 0, COM_UINT32_MAX); // transfer_characteristics u(8) -+ seqhdr->matrix_coefficients = dec_bs_read(bs, 8, 0, COM_UINT32_MAX); // matrix_coefficients u(8) - } -- dec_bs_read(bs, 14, 0, COM_UINT32_MAX); // display_horizontal_size u(14) -+ seqhdr->display_horizontal_size = dec_bs_read(bs, 14, 0, COM_UINT32_MAX); // display_horizontal_size u(14) - dec_bs_read1(bs, 1); //marker_bit -- dec_bs_read(bs, 14, 0, COM_UINT32_MAX); // display_vertical_size u(14) -+ seqhdr->display_vertical_size = dec_bs_read(bs, 14, 0, COM_UINT32_MAX); // display_vertical_size u(14) - char td_mode_flag = dec_bs_read1(bs, -1); // td_mode_flag u(1) - - if (td_mode_flag == 1) { -@@ -460,7 +460,7 @@ static int extension_data(com_bs_t * bs, com_seqh_t *seqhdr, com_pic_header_t *p - if (i == 0) { - int ret = dec_bs_read(bs, 4, 0, COM_UINT32_MAX); - if (ret == 2) { -- sequence_display_extension(bs); -+ sequence_display_extension(bs, seqhdr); - } else if (ret == 3) { - temporal_scalability_extension(bs); - } else if (ret == 4) { -@@ -1647,7 +1647,7 @@ static uavs3d_always_inline u32 lbac_read_unary_sym_ep(com_lbac_t * lbac) - low = lbac_refill2(lbac, low); - } - val += bin; -- } while (bin); -+ } while (bin && lbac->cur < lbac->end); - - lbac->range = range; - lbac->low = low; -@@ -2834,8 +2834,7 @@ int dec_parse_lcu_delta_qp(com_lbac_t * lbac, int last_dqp) - bin = lbac_dec_bin(lbac, ctx->lcu_qp_delta + act_ctx); - act_ctx = min(3, act_ctx + 1); - act_sym += !bin; -- } -- while (!bin); -+ } while (!bin && lbac->cur < lbac->end); - } - - dquant = (act_sym + 1) >> 1; -diff --git a/source/decoder/parser.h b/source/decoder/parser.h -index 20cd103..93fbb1a 100644 ---- a/source/decoder/parser.h -+++ b/source/decoder/parser.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decoder/uavs3d.c b/source/decoder/uavs3d.c -index 9ac7dc2..7b0491d 100644 ---- a/source/decoder/uavs3d.c -+++ b/source/decoder/uavs3d.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -1060,7 +1055,7 @@ int __cdecl uavs3d_flush(void *h, uavs3d_io_frm_t* frm_out) - - void* __cdecl uavs3d_create(uavs3d_cfg_t * dec_cfg, uavs3d_lib_output_callback_t callback, int * err) - { -- uavs3d_dec_t *ctx = NULL; -+ uavs3d_dec_t *ctx; - - printf("libuavs3d(%2d): %s_%s, %s\n", BIT_DEPTH, VERSION_STR, VERSION_TYPE, VERSION_SHA1); - -diff --git a/source/decoder/uavs3d.h b/source/decoder/uavs3d.h -index f5ea2b0..1931917 100644 ---- a/source/decoder/uavs3d.h -+++ b/source/decoder/uavs3d.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -137,6 +132,9 @@ typedef struct uavs3d_com_seqh_t { - unsigned int bbv_buffer_size; /* 18 bits */ - int horizontal_size; /* 14 bits */ - int vertical_size; /* 14 bits */ -+ int display_horizontal_size; /* 14 bits */ -+ int display_vertical_size; /* 14 bits */ -+ - unsigned char log2_max_cu_width_height; /* 3 bits */ - unsigned char min_cu_size; - unsigned char max_part_ratio_log2; -@@ -211,6 +209,13 @@ typedef struct uavs3d_com_seqh_t { - - /* alf map */ - unsigned char *alf_idx_map; -+ -+ /* hdr info */ -+ unsigned char colour_description; -+ unsigned char colour_primaries; -+ unsigned char transfer_characteristics; -+ unsigned char matrix_coefficients; -+ - } com_seqh_t; - - #define FRAME_MAX_PLANES 3 -diff --git a/source/decore/alf.c b/source/decore/alf.c -index 89a2411..111d99f 100644 ---- a/source/decore/alf.c -+++ b/source/decore/alf.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/arm64/alf_arm64.S b/source/decore/arm64/alf_arm64.S -index 49a620f..9998073 100644 ---- a/source/decore/arm64/alf_arm64.S -+++ b/source/decore/arm64/alf_arm64.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/arm64/arm64.c b/source/decore/arm64/arm64.c -index 0850349..74c2f81 100644 ---- a/source/decore/arm64/arm64.c -+++ b/source/decore/arm64/arm64.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -102,7 +97,7 @@ static void uavs3d_padding_rows_chroma_arm64(pel *src, int i_src, int width, int - - void uavs3d_funs_init_arm64() - { --#if (BIT_DEPTH == 8) -+#if !COMPILE_10BIT - uavs3d_funs_handle.sao[ Y_C] = uavs3d_sao_on_lcu_arm64; - uavs3d_funs_handle.sao[UV_C] = uavs3d_sao_on_lcu_chroma_arm64; - uavs3d_funs_handle.alf[ Y_C] = uavs3d_alf_one_lcu_arm64; -@@ -311,7 +306,7 @@ void uavs3d_funs_init_arm64() - uavs3d_funs_handle.itrans_dst7[1] = uavs3d_itrans_dct8_pb8_arm64; - uavs3d_funs_handle.itrans_dst7[2] = uavs3d_itrans_dct8_pb16_arm64; - -- uavs3d_funs_handle.conv_fmt_16bit = uavs3d_conv_fmt_16bit_arm64; -+ //uavs3d_funs_handle.conv_fmt_16bit = uavs3d_conv_fmt_16bit_arm64; - uavs3d_funs_handle.padding_rows_luma = uavs3d_padding_rows_luma_arm64; - uavs3d_funs_handle.padding_rows_chroma = uavs3d_padding_rows_chroma_arm64; - -diff --git a/source/decore/arm64/arm64.h b/source/decore/arm64/arm64.h -index 6ba0566..b2410ef 100644 ---- a/source/decore/arm64/arm64.h -+++ b/source/decore/arm64/arm64.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/arm64/deblock_arm64.S b/source/decore/arm64/deblock_arm64.S -index ff47274..b152147 100644 ---- a/source/decore/arm64/deblock_arm64.S -+++ b/source/decore/arm64/deblock_arm64.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -1540,12 +1535,12 @@ deblock_ver_filtered: - bif v17.16b, v1.16b, v25.16b - bif v18.16b, v6.16b, v25.16b - -- mov v1.2d, v17.2d -- mov v2.2d, v28.2d -- mov v3.2d, v30.2d -- mov v4.2d, v31.2d -- mov v5.2d, v29.2d -- mov v6.2d, v18.2d -+ mov v1.16b, v17.16b -+ mov v2.16b, v28.16b -+ mov v3.16b, v30.16b -+ mov v4.16b, v31.16b -+ mov v5.16b, v29.16b -+ mov v6.16b, v18.16b - - st4 {v0.H, v1.H, v2.H, v3.H}[0], [x2], #8 - st4 {v4.H, v5.H, v6.H, v7.H}[0], [x2], x5 -diff --git a/source/decore/arm64/def_arm64.S b/source/decore/arm64/def_arm64.S -index c6a219d..82e267d 100644 ---- a/source/decore/arm64/def_arm64.S -+++ b/source/decore/arm64/def_arm64.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -35,25 +30,23 @@ - * For more information, contact us at rgwang@pkusz.edu.cn. - **************************************************************************************/ - --#if defined(__ANDROID__) --.macro function name -- .text -- .align 4 -- .global \name -- .type \name, %function -- \name: --.endm -- - #if defined(__aarch64__) && !defined(__arm64__) - #define __arm64__ 1 - #endif --#elif defined(__APPLE__) -+ -+#if defined(__APPLE__) - .macro function name - .text - .align 4 - .global _\name - _\name: - .endm -+#else -+.macro function name -+ .text -+ .align 4 -+ .global \name -+ .type \name, %function -+ \name: -+.endm - #endif -- --#define COMPILE_10BIT 0 -diff --git a/source/decore/arm64/inter_pred_arm64.S b/source/decore/arm64/inter_pred_arm64.S -index e86addd..375f041 100644 ---- a/source/decore/arm64/inter_pred_arm64.S -+++ b/source/decore/arm64/inter_pred_arm64.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -1809,9 +1804,9 @@ if_hor_ver_chroma_w8_loop_y: - smlal v30.4s, v22.4h, v7.h[3] - smlal2 v31.4s, v22.8h, v7.h[3] - -- mov v16.2d, v20.2d -- mov v17.2d, v21.2d -- mov v18.2d, v22.2d -+ mov v16.16b, v20.16b -+ mov v17.16b, v21.16b -+ mov v18.16b, v22.16b - - rshrn v24.4h, v24.4s, #12 - rshrn2 v24.8h, v25.4s, #12 -@@ -2553,10 +2548,10 @@ if_hor_ver_luma_w4_loop_y: - smlal v29.4s, v21.4h, v8.h[7] - smlal2 v30.4s, v21.8h, v8.h[7] - -- mov v16.2d, v18.2d -- mov v17.2d, v19.2d -- mov v18.2d, v20.2d -- mov v19.2d, v21.2d -+ mov v16.16b, v18.16b -+ mov v17.16b, v19.16b -+ mov v18.16b, v20.16b -+ mov v19.16b, v21.16b - - rshrn v27.4h, v27.4s, #12 - rshrn v28.4h, v28.4s, #12 -@@ -5268,7 +5263,7 @@ function uavs3d_if_hor_ver_luma_w8_arm64 - ldr w8, [sp] // w8 = max_val - - sub sp, sp, #80 -- sub x9, sp, #16 -+ add x9, sp, #64 - st1 {v12.2d, v13.2d, v14.2d, v15.2d}, [sp] - st1 {v11.2d}, [x9] - -diff --git a/source/decore/arm64/intra_pred_arm64.S b/source/decore/arm64/intra_pred_arm64.S -index e2c4629..5689bd4 100644 ---- a/source/decore/arm64/intra_pred_arm64.S -+++ b/source/decore/arm64/intra_pred_arm64.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -2996,12 +2991,12 @@ intra_pred_bi_ipf_end: - // const s8 *flt_coef_hor, const s8 *flt_coef_ver, int w, int h, int bit_depth) - //src->x0, dst->x1, i_dst->x2, flt_range_hor->x3, flt_range_ver->x4, flt_coef_hor->x5, flt_coef_ver->x6, w->x7 - function uavs3d_intra_pred_ipf_arm64 --#if defined(__ANDROID__) -- ldr w8, [sp] // w8 = h -- ldr w9, [sp, #8] // w9 = bit_depth --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldr w8, [sp] - ldr w9, [sp, #4] -+#else -+ ldr w8, [sp] // w8 = h -+ ldr w9, [sp, #8] // w9 = bit_depth - #endif - add x0, x0, #1 // p_top = src + 1 - -diff --git a/source/decore/arm64/intra_pred_chroma_arm64.S b/source/decore/arm64/intra_pred_chroma_arm64.S -index 2c142f3..b12d02a 100644 ---- a/source/decore/arm64/intra_pred_chroma_arm64.S -+++ b/source/decore/arm64/intra_pred_chroma_arm64.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -555,7 +550,7 @@ intra_pred_dc_uv_fillblock_w8: - b intra_pred_dc_uv_end - - intra_pred_dc_uv_fillblock_w16: -- mov v1.8h, v0.8h -+ mov v1.16b, v0.16b - intra_pred_dc_uv_fillblock_w16_y: - st1 {v0.8h, v1.8h}, [x1], x2 // store dst[x] - st1 {v0.8h, v1.8h}, [x1], x2 -@@ -570,9 +565,9 @@ intra_pred_dc_uv_fillblock_w32x: - cmp w3, #64 - beq intra_pred_dc_uv_fillblock_w64 - -- mov v1.8h, v0.8h -- mov v2.8h, v0.8h -- mov v3.8h, v0.8h -+ mov v1.16b, v0.16b -+ mov v2.16b, v0.16b -+ mov v3.16b, v0.16b - intra_pred_dc_uv_fillblock_w32_y: - st1 {v0.8h, v1.8h, v2.8h, v3.8h}, [x1], x2 // store dst[x] - st1 {v0.8h, v1.8h, v2.8h, v3.8h}, [x1], x2 -@@ -585,9 +580,9 @@ intra_pred_dc_uv_fillblock_w32_y: - intra_pred_dc_uv_fillblock_w64: - - sub x2, x2, #64 -- mov v1.8h, v0.8h -- mov v2.8h, v0.8h -- mov v3.8h, v0.8h -+ mov v1.16b, v0.16b -+ mov v2.16b, v0.16b -+ mov v3.16b, v0.16b - intra_pred_dc_uv_fillblock_w64_y: - st1 {v0.8h, v1.8h, v2.8h, v3.8h}, [x1], #64 - st1 {v0.8h, v1.8h, v2.8h, v3.8h}, [x1], x2 -diff --git a/source/decore/arm64/itrans_arm64.c b/source/decore/arm64/itrans_arm64.c -index d26ec5f..9b2362e 100644 ---- a/source/decore/arm64/itrans_arm64.c -+++ b/source/decore/arm64/itrans_arm64.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/arm64/itrans_arm64.h b/source/decore/arm64/itrans_arm64.h -index c4977d0..15d9a4b 100644 ---- a/source/decore/arm64/itrans_arm64.h -+++ b/source/decore/arm64/itrans_arm64.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/arm64/itrans_dct2_arm64.S b/source/decore/arm64/itrans_dct2_arm64.S -index 00b99e1..0f37c7e 100644 ---- a/source/decore/arm64/itrans_dct2_arm64.S -+++ b/source/decore/arm64/itrans_dct2_arm64.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -758,9 +753,9 @@ dct2_h16_1st_loopx: - dct2_h16_2nd_transform: - - sub sp, sp, #48 -- sub x7, sp, #16 -- st1 {v10.8h, v11.8h}, [sp] -- st1 {v12.8h}, [x7] -+ add x7, sp, #16 -+ st1 {v10.8h, v11.8h}, [x7] -+ st1 {v12.8h}, [sp] - - mov w8, #1 - lsl w8, w8, w5 -@@ -1059,8 +1054,8 @@ dct2_h16_2nd_loopx: - cmp x8, x3 - blt dct2_h16_2nd_loopx - -- ld1 {v10.8h, v11.8h}, [sp], #32 - ld1 {v12.8h}, [sp], #16 -+ ld1 {v10.8h, v11.8h}, [sp], #32 - ld1 {v8.8h, v9.8h}, [sp], #32 - - dct2_h16_end: -diff --git a/source/decore/arm64/itrans_dct8_dst7_arm64.S b/source/decore/arm64/itrans_dct8_dst7_arm64.S -index 340865c..5ba39e5 100644 ---- a/source/decore/arm64/itrans_dct8_dst7_arm64.S -+++ b/source/decore/arm64/itrans_dct8_dst7_arm64.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/arm64/pixel_arm64.S b/source/decore/arm64/pixel_arm64.S -index bc79826..81fa81c 100644 ---- a/source/decore/arm64/pixel_arm64.S -+++ b/source/decore/arm64/pixel_arm64.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -285,8 +280,8 @@ padding_rows_lr_y: - - ld1r {v0.8h}, [x0] - ld1r {v2.8h}, [x5] // right reference pointer -- mov v1.8h, v0.8h -- mov v3.8h, v2.8h -+ mov v1.16b, v0.16b -+ mov v3.16b, v2.16b - - sub x5, x0, x4 - add x6, x0, x2 -@@ -332,8 +327,8 @@ padding_rows_chroma_lr_y: - ld1r {v0.4s}, [x0] // src[0] src[1] - ld1r {v2.4s}, [x5] // right reference pointer - -- mov v1.4s, v0.4s -- mov v3.4s, v2.4s -+ mov v1.16b, v0.16b -+ mov v3.16b, v2.16b - - sub x5, x0, x4 - add x6, x0, x2 -diff --git a/source/decore/arm64/sao_arm64.c b/source/decore/arm64/sao_arm64.c -index dc1a5b0..37cf9e0 100644 ---- a/source/decore/arm64/sao_arm64.c -+++ b/source/decore/arm64/sao_arm64.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/arm64/sao_kernel_arm64.S b/source/decore/arm64/sao_kernel_arm64.S -index 1546b17..b0d0bb8 100644 ---- a/source/decore/arm64/sao_kernel_arm64.S -+++ b/source/decore/arm64/sao_kernel_arm64.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -451,10 +446,10 @@ loop_x_eo_90_chroma_end: - ************************************************************************************************************************************/ - function uavs3d_sao_eo_135_arm64 - // get start_x_r0 and end_x_r0 --#if defined(__ANDROID__) -- ldp x8, x9, [sp] --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w8, w9, [sp] -+#else -+ ldp x8, x9, [sp] - #endif - sxtw x8, w8 // start_x_r0 - sxtw x9, w9 // end_x_r0 -@@ -537,10 +532,10 @@ test_loop_x_eo_135_end_r0: - - // ------- middle rows ------- - // get param --#if defined(__ANDROID__) -- ldp x7, x8, [sp, #16] --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w7, w8, [sp, #8] -+#else -+ ldp x7, x8, [sp, #16] - #endif - sxtw x7, w7 // start_x_r - sxtw x8, w8 // end_x_r -@@ -613,10 +608,10 @@ test_loop_x_eo_135_end_r: - bgt test_loop_y_eo_135_r - - // ------- last row ------- --#if defined(__ANDROID__) -- ldp x6, x7, [sp, #32] --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w6, w7, [sp, #16] -+#else -+ ldp x6, x7, [sp, #32] - #endif - sxtw x6, w6 // start_x_rn - sxtw x7, w7 // end_x_rn -@@ -691,10 +686,10 @@ test_loop_x_eo_135_end_rn: - ************************************************************************************************************************************/ - function uavs3d_sao_eo_135_chroma_arm64 - --#if defined(__ANDROID__) -- ldp x8, x9, [sp] --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w8, w9, [sp] -+#else -+ ldp x8, x9, [sp] - #endif - sxtw x8, w8 // start_x_r0 - sxtw x9, w9 // end_x_r0 -@@ -793,10 +788,10 @@ loop_x_eo_135_chroma_end_r0: - add x1, x1, x3 //-- dst+=dst_stride - - //--------------------------------middle rows-------------------------------- --#if defined(__ANDROID__) -- ldp x7 , x8, [sp, #16] //-- x7=start_x_r; x8=end_x_r --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w7 , w8, [sp, #8] //-- x7=start_x_r; x8=end_x_r -+#else -+ ldp x7 , x8, [sp, #16] //-- x7=start_x_r; x8=end_x_r - #endif - sxtw x7 , w7 - sxtw x8 , w8 -@@ -886,10 +881,10 @@ loop_x_eo_135_chroma_end_r: - bgt loop_y_eo_135_chroma_r - - //---------------------------------last row-------------------------------- --#if defined(__ANDROID__) -- ldp x6, x7, [sp, #32] //-- x6=start_x_rn; x7=end_x_rn --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w6, w7, [sp, #16] //-- x6=start_x_rn; x7=end_x_rn -+#else -+ ldp x6, x7, [sp, #32] //-- x6=start_x_rn; x7=end_x_rn - #endif - sxtw x7, w7 - sxtw x6, w6 -@@ -979,10 +974,10 @@ loop_x_eo_135_chroma_end_rn: - * end_x_r0->x8, start_x_r->x9, end_x_r->x10, start_x_rn->x11, end_x_rn->x12 - ************************************************************************************************************************************/ - function uavs3d_sao_eo_45_arm64 --#if defined(__ANDROID__) -- ldp x8, x9, [sp] --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w8, w9, [sp] -+#else -+ ldp x8, x9, [sp] - #endif - sxtw x8, w8 // start_x_r0 - sxtw x9, w9 // end_x_r0 -@@ -1064,10 +1059,10 @@ test_loop_x_eo_45_end_r0: - - // ------- middle rows ------- - // get param --#if defined(__ANDROID__) -- ldp x7, x8, [sp, #16] // x7 start_x_r; x8 end_x_r --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w7, w8, [sp, #8] // x7 start_x_r; x8 end_x_r -+#else -+ ldp x7, x8, [sp, #16] // x7 start_x_r; x8 end_x_r - #endif - sxtw x7, w7 - sxtw x8, w8 -@@ -1141,10 +1136,10 @@ test_loop_x_eo_45_end_r: - bgt test_loop_y_eo_45_r - - // ------- last row ------- --#if defined(__ANDROID__) -- ldp x6, x7, [sp, #32] // $x6 start_x_rn; $x7 end_x_rn --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w6, w7, [sp, #16] // $x6 start_x_rn; $x7 end_x_rn -+#else -+ ldp x6, x7, [sp, #32] // $x6 start_x_rn; $x7 end_x_rn - #endif - sxtw x6, w6 - sxtw x7, w7 -@@ -1217,10 +1212,10 @@ ret - * end_x_r0->x8, start_x_r->x9, end_x_r->x10, start_x_rn->x11, end_x_rn->x12 - ************************************************************************************************************************************/ - function uavs3d_sao_eo_45_chroma_arm64 --#if defined(__ANDROID__) -- ldp x8, x9, [sp] --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w8, w9, [sp] -+#else -+ ldp x8, x9, [sp] - #endif - sxtw x8, w8 // start_x_r0 - sxtw x9, w9 // end_x_r0 -@@ -1315,10 +1310,10 @@ loop_x_eo_45_chroma_end_r0: - add x1, x1, x3 //-- dst+=dst_stride - - //--------------------------------middle rows-------------------------------- --#if defined(__ANDROID__) -- ldp x7 , x8, [sp, #16] //-- x7=start_x_r; x8=end_x_r --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w7 , w8, [sp, #8] //-- x7=start_x_r; x8=end_x_r -+#else -+ ldp x7 , x8, [sp, #16] //-- x7=start_x_r; x8=end_x_r - #endif - sxtw x7 , w7 - sxtw x8 , w8 -@@ -1405,10 +1400,10 @@ loop_x_eo_45_chroma_end_r: - bgt loop_y_eo_45_chroma_r - - //---------------------------------last row-------------------------------- --#if defined(__ANDROID__) -- ldp x6 , x7, [sp, #32] //-- x6=start_x_rn; x7=end_x_rn --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w6 , w7, [sp, #16] //-- x6=start_x_rn; x7=end_x_rn -+#else -+ ldp x6 , x7, [sp, #32] //-- x6=start_x_rn; x7=end_x_rn - #endif - sxtw x7 , w7 - sxtw x6 , w6 -@@ -2221,10 +2216,10 @@ loop_x_eo_90_chroma_end: - * src->x0, dst->x1, src_stride->x2, dst_stride->x3, offset->x4, mask->x5, mb_height->x6, bit_depth->x7 - ************************************************************************************************************************************/ - function uavs3d_sao_eo_135_arm64 --#if defined(__ANDROID__) -- ldp x8, x9, [sp] // start_x_r0 and end_x_r0 --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w8, w9, [sp] -+#else -+ ldp x8, x9, [sp] // start_x_r0 and end_x_r0 - #endif - - sxtw x8, w8 // start_x_r0 -@@ -2336,10 +2331,10 @@ test_loop_x_eo_135_end_r0: - - // ------- middle rows ------- - // get param --#if defined(__ANDROID__) -- ldp x7, x8, [sp, #16] --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w7, w8, [sp, #8] -+#else -+ ldp x7, x8, [sp, #16] - #endif - sxtw x7, w7 // x7 start_x_r - sxtw x8, w8 // x8 end_x_r -@@ -2431,10 +2426,10 @@ test_loop_x_eo_135_end_r: - bgt test_loop_y_eo_135_r - - // ------- last row ------- --#if defined(__ANDROID__) -- ldp x6, x7, [sp, #32] --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w6, w7, [sp, #16] -+#else -+ ldp x6, x7, [sp, #32] - #endif - sxtw x6, w6 // start_x_rn - sxtw x7, w7 // end_x_rn -@@ -2527,10 +2522,10 @@ test_loop_x_eo_135_end_rn: - * src->x0, dst->x1, src_stride->x2, dst_stride->x3, offset->x4, mask->x5, mb_height->x6, bit_depth->x7 - ************************************************************************************************************************************/ - function uavs3d_sao_eo_135_chroma_arm64 --#if defined(__ANDROID__) -- ldp x8, x9, [sp] // start_x_r0 and end_x_r0 --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w8, w9, [sp] -+#else -+ ldp x8, x9, [sp] // start_x_r0 and end_x_r0 - #endif - - mov w13, #1 -@@ -2636,10 +2631,10 @@ loop_x_eo_135_chroma_end_r0: - add x1, x1, x3 //-- dst+=dst_stride - - //--------------------------------middle rows-------------------------------- --#if defined(__ANDROID__) -- ldp x7 , x8, [sp, #16] //-- x7=start_x_r; x8=end_x_r --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w7 , w8, [sp, #8] //-- x7=start_x_r; x8=end_x_r -+#else -+ ldp x7 , x8, [sp, #16] //-- x7=start_x_r; x8=end_x_r - #endif - sxtw x7 , w7 - sxtw x8 , w8 -@@ -2730,10 +2725,10 @@ loop_x_eo_135_chroma_end_r: - bgt loop_y_eo_135_chroma_r - - //---------------------------------last row-------------------------------- --#if defined(__ANDROID__) -- ldp x6, x7, [sp, #32] //-- x6=start_x_rn; x7=end_x_rn --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w6, w7, [sp, #16] //-- x6=start_x_rn; x7=end_x_rn -+#else -+ ldp x6, x7, [sp, #32] //-- x6=start_x_rn; x7=end_x_rn - #endif - sxtw x7, w7 - sxtw x6, w6 -@@ -2822,10 +2817,10 @@ loop_x_eo_135_chroma_end_rn: - * src->x0, dst->x1, src_stride->x2, dst_stride->x3, offset->x4, mask->x5, mb_height->x6, bit_depth->x7 - ************************************************************************************************************************************/ - function uavs3d_sao_eo_45_arm64 --#if defined(__ANDROID__) -- ldp x8, x9, [sp] // start_x_r0 and end_x_r0 --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w8, w9, [sp] -+#else -+ ldp x8, x9, [sp] // start_x_r0 and end_x_r0 - #endif - - mov w12, #1 -@@ -2936,10 +2931,10 @@ test_loop_x_eo_45_end_r0: - - // ------- middle rows ------- - // get param --#if defined(__ANDROID__) -- ldp x7, x8, [sp, #16] // x7 start_x_r; x8 end_x_r --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w7, w8, [sp, #8] // x7 start_x_r; x8 end_x_r -+#else -+ ldp x7, x8, [sp, #16] // x7 start_x_r; x8 end_x_r - #endif - sxtw x7, w7 - sxtw x8, w8 -@@ -3031,10 +3026,10 @@ test_loop_x_eo_45_end_r: - bgt test_loop_y_eo_45_r - - // ------- last row ------- --#if defined(__ANDROID__) -- ldp x6, x7, [sp, #32] --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w6, w7, [sp, #16] -+#else -+ ldp x6, x7, [sp, #32] - #endif - sxtw x6, w6 // start_x_rn - sxtw x7, w7 // end_x_rn -@@ -3126,10 +3121,10 @@ test_loop_x_eo_45_end_rn: - * src->x0, dst->x1, src_stride->x2, dst_stride->x3, offset->x4, mask->x5, mb_height->x6, bit_depth->x7 - ************************************************************************************************************************************/ - function uavs3d_sao_eo_45_chroma_arm64 --#if defined(__ANDROID__) -- ldp x8, x9, [sp] // start_x_r0 and end_x_r0 --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w8, w9, [sp] -+#else -+ ldp x8, x9, [sp] // start_x_r0 and end_x_r0 - #endif - - mov w12, #1 -@@ -3236,10 +3231,10 @@ loop_x_eo_45_chroma_end_r0: - add x1, x1, x3 //-- dst+=dst_stride - - //--------------------------------middle rows-------------------------------- --#if defined(__ANDROID__) -- ldp x7 , x8, [sp, #16] //-- x7=start_x_r; x8=end_x_r --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w7 , w8, [sp, #8] //-- x7=start_x_r; x8=end_x_r -+#else -+ ldp x7 , x8, [sp, #16] //-- x7=start_x_r; x8=end_x_r - #endif - sxtw x7 , w7 - sxtw x8 , w8 -@@ -3328,10 +3323,10 @@ loop_x_eo_45_chroma_end_r: - bgt loop_y_eo_45_chroma_r - - //---------------------------------last row-------------------------------- --#if defined(__ANDROID__) -- ldp x6 , x7, [sp, #32] //-- x6=start_x_rn; x7=end_x_rn --#elif defined(__APPLE__) -+#if defined(__APPLE__) - ldp w6 , w7, [sp, #16] //-- x6=start_x_rn; x7=end_x_rn -+#else -+ ldp x6 , x7, [sp, #32] //-- x6=start_x_rn; x7=end_x_rn - #endif - sxtw x7 , w7 - sxtw x6 , w6 -diff --git a/source/decore/arm64/sao_kernel_arm64.h b/source/decore/arm64/sao_kernel_arm64.h -index 03373ce..b9c448e 100644 ---- a/source/decore/arm64/sao_kernel_arm64.h -+++ b/source/decore/arm64/sao_kernel_arm64.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/armv7/alf_armv7.S b/source/decore/armv7/alf_armv7.S -index 5b0e3e0..c87f29b 100644 ---- a/source/decore/armv7/alf_armv7.S -+++ b/source/decore/armv7/alf_armv7.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/armv7/armv7.c b/source/decore/armv7/armv7.c -index 0be03a4..6ad9086 100644 ---- a/source/decore/armv7/armv7.c -+++ b/source/decore/armv7/armv7.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -242,7 +237,7 @@ void uavs3d_itrans_dct2_h64_w64_armv7(s16 *src, s16 *dst, int bit_depth) - - void uavs3d_funs_init_armv7() - { --#if BIT_DEPTH == 8 -+#if !COMPILE_10BIT - uavs3d_funs_handle.sao[ Y_C] = uavs3d_sao_on_lcu_armv7; - uavs3d_funs_handle.sao[UV_C] = uavs3d_sao_on_lcu_chroma_armv7; - uavs3d_funs_handle.alf[ Y_C] = uavs3d_alf_one_lcu_armv7; -diff --git a/source/decore/armv7/armv7.h b/source/decore/armv7/armv7.h -index 60efd7e..0114927 100644 ---- a/source/decore/armv7/armv7.h -+++ b/source/decore/armv7/armv7.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/armv7/dct2_armv7.S b/source/decore/armv7/dct2_armv7.S -index 82c2f82..05e965f 100644 ---- a/source/decore/armv7/dct2_armv7.S -+++ b/source/decore/armv7/dct2_armv7.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/armv7/deblock_armv7.S b/source/decore/armv7/deblock_armv7.S -index 202d121..dcdeabf 100644 ---- a/source/decore/armv7/deblock_armv7.S -+++ b/source/decore/armv7/deblock_armv7.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/armv7/def_armv7.S b/source/decore/armv7/def_armv7.S -index fdc3d27..861f016 100644 ---- a/source/decore/armv7/def_armv7.S -+++ b/source/decore/armv7/def_armv7.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -35,23 +30,18 @@ - * For more information, contact us at rgwang@pkusz.edu.cn. - **************************************************************************************/ - --#if defined(__ANDROID__) --.macro function name -- .global \name -- .hidden \name -- .type \name, %function --\name: --.endm --#elif defined(__APPLE__) -+#if defined(__APPLE__) - .macro function name - .text - .align 4 - .global _\name - _\name: - .endm -- -+#else -+.macro function name -+ .global \name -+ .hidden \name -+ .type \name, %function -+\name: -+.endm - #endif -- --#define COMPILE_10BIT 0 -- -- -diff --git a/source/decore/armv7/inter_pred_armv7.S b/source/decore/armv7/inter_pred_armv7.S -index edbcc62..fd78ae4 100644 ---- a/source/decore/armv7/inter_pred_armv7.S -+++ b/source/decore/armv7/inter_pred_armv7.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/armv7/intra_pred_armv7.S b/source/decore/armv7/intra_pred_armv7.S -index cbce583..807f6a5 100644 ---- a/source/decore/armv7/intra_pred_armv7.S -+++ b/source/decore/armv7/intra_pred_armv7.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/armv7/itrans_dct8_dst7_armv7.S b/source/decore/armv7/itrans_dct8_dst7_armv7.S -index 129bbc3..d8d1ab1 100755 ---- a/source/decore/armv7/itrans_dct8_dst7_armv7.S -+++ b/source/decore/armv7/itrans_dct8_dst7_armv7.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/armv7/pixel_armv7.S b/source/decore/armv7/pixel_armv7.S -index 83124a4..f88f474 100644 ---- a/source/decore/armv7/pixel_armv7.S -+++ b/source/decore/armv7/pixel_armv7.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/armv7/sao_armv7.c b/source/decore/armv7/sao_armv7.c -index cec6880..8b3070e 100644 ---- a/source/decore/armv7/sao_armv7.c -+++ b/source/decore/armv7/sao_armv7.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/armv7/sao_kernel_armv7.S b/source/decore/armv7/sao_kernel_armv7.S -index 0449ecc..1652c99 100644 ---- a/source/decore/armv7/sao_kernel_armv7.S -+++ b/source/decore/armv7/sao_kernel_armv7.S -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/armv7/sao_kernel_armv7.h b/source/decore/armv7/sao_kernel_armv7.h -index d30c690..49b020b 100644 ---- a/source/decore/armv7/sao_kernel_armv7.h -+++ b/source/decore/armv7/sao_kernel_armv7.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/avx2/alf_avx2.c b/source/decore/avx2/alf_avx2.c -index 74226b6..cc2cf5f 100644 ---- a/source/decore/avx2/alf_avx2.c -+++ b/source/decore/avx2/alf_avx2.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -489,7 +484,7 @@ void uavs3d_alf_one_lcu_one_chroma_avx2(pel *dst, int i_dst, pel *src, int i_src - __m256i T000, T001, T010, T011, T100, T101, T110, T111, T200, T201, T210, T211, T310, T311, T300, T301, T400, T401, T410, T411, T500, T501, T510, T511, T600, T601, T610, T611, T700, T701, T710, T711; - __m256i E00, E01, E10, E11; - __m256i C0, C1, C2, C3, C4, C5, C6, C7, C8; -- __m256i S0, S00, S01, S1, S10, S11, S2, S20, S21, S3, S30, S31, S4, S40, S41, S5, S50, S51, S6, S7, S8, S60, S61, S70, S71, S80, S81, S82, S83, SS1, SS2, SS3, SS4; -+ __m256i S0, S00, S01, S1, S10, S11, S2, S20, S21, S3, S30, S31, S4, S40, S41, S5, S50, S51, S6, S7, S60, S61, S70, S71, S80, S81, S82, S83, SS1, SS2, SS3, SS4; - __m256i mAddOffset; - __m256i mZero = _mm256_set1_epi16(0); - __m256i mMax = _mm256_set1_epi16((short)((1 << sample_bit_depth) - 1)); -@@ -629,7 +624,7 @@ void uavs3d_alf_one_lcu_one_chroma_avx2(pel *dst, int i_dst, pel *src, int i_src - S5 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S50, 1)); - S6 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S60, 1)); - S7 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S70, 1)); -- S8 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S80, 1)); -+ //S8 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S80, 1)); - S0 = _mm256_add_epi32(S0, S1); - S2 = _mm256_add_epi32(S2, S3); - S4 = _mm256_add_epi32(S4, S5); -@@ -803,7 +798,7 @@ void uavs3d_alf_one_lcu_one_chroma_avx2(pel *dst, int i_dst, pel *src, int i_src - S5 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S50, 1)); - S6 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S60, 1)); - S7 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S70, 1)); -- S8 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S80, 1)); -+ //S8 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S80, 1)); - S0 = _mm256_add_epi32(S0, S1); - S2 = _mm256_add_epi32(S2, S3); - S4 = _mm256_add_epi32(S4, S5); -@@ -821,7 +816,7 @@ void uavs3d_alf_one_lcu_one_chroma_avx2(pel *dst, int i_dst, pel *src, int i_src - S5 = _mm256_cvtepi16_epi32(_mm256_castsi256_si128(S51)); - S6 = _mm256_cvtepi16_epi32(_mm256_castsi256_si128(S61)); - S7 = _mm256_cvtepi16_epi32(_mm256_castsi256_si128(S71)); -- S8 = _mm256_cvtepi16_epi32(_mm256_castsi256_si128(S81)); -+ //S8 = _mm256_cvtepi16_epi32(_mm256_castsi256_si128(S81)); - S0 = _mm256_add_epi32(S0, S1); - S2 = _mm256_add_epi32(S2, S3); - S4 = _mm256_add_epi32(S4, S5); -@@ -839,7 +834,7 @@ void uavs3d_alf_one_lcu_one_chroma_avx2(pel *dst, int i_dst, pel *src, int i_src - S5 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S51, 1)); - S6 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S61, 1)); - S7 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S71, 1)); -- S8 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S81, 1)); -+ //S8 = _mm256_cvtepi16_epi32(_mm256_extracti128_si256(S81, 1)); - S0 = _mm256_add_epi32(S0, S1); - S2 = _mm256_add_epi32(S2, S3); - S4 = _mm256_add_epi32(S4, S5); -@@ -1055,7 +1050,6 @@ void uavs3d_alf_one_lcu_chroma_avx2(pel *dst, int i_dst, pel *src, int i_src, in - int startPos = 0; - int endPos = lcu_height; - int xPosEnd = lcu_width << 1; -- long long tmp[8]; - - src += (startPos*i_src); - dst += (startPos*i_dst); -@@ -1066,22 +1060,14 @@ void uavs3d_alf_one_lcu_chroma_avx2(pel *dst, int i_dst, pel *src, int i_src, in - T00 = _mm256_unpacklo_epi16(C8, C8); - T01 = _mm256_unpackhi_epi16(C8, C8); - -- tmp[0] = _mm256_extract_epi64(T00, 0); // win32 compile error if C0 = _mm256_set1_epi64x(_mm256_extract_epi64(T00, 0)); -- tmp[1] = _mm256_extract_epi64(T00, 1); -- tmp[2] = _mm256_extract_epi64(T00, 2); -- tmp[3] = _mm256_extract_epi64(T00, 3); -- tmp[4] = _mm256_extract_epi64(T01, 0); -- tmp[5] = _mm256_extract_epi64(T01, 1); -- tmp[6] = _mm256_extract_epi64(T01, 2); -- tmp[7] = _mm256_extract_epi64(T01, 3); -- C0 = _mm256_set1_epi64x(tmp[0]); -- C1 = _mm256_set1_epi64x(tmp[1]); -- C2 = _mm256_set1_epi64x(tmp[2]); -- C3 = _mm256_set1_epi64x(tmp[3]); -- C4 = _mm256_set1_epi64x(tmp[4]); -- C5 = _mm256_set1_epi64x(tmp[5]); -- C6 = _mm256_set1_epi64x(tmp[6]); -- C7 = _mm256_set1_epi64x(tmp[7]); -+ C0 = _mm256_permute4x64_epi64(T00, 0x00); -+ C1 = _mm256_permute4x64_epi64(T00, 0x55); -+ C2 = _mm256_permute4x64_epi64(T00, 0xaa); -+ C3 = _mm256_permute4x64_epi64(T00, 0xff); -+ C4 = _mm256_permute4x64_epi64(T01, 0x00); -+ C5 = _mm256_permute4x64_epi64(T01, 0x55); -+ C6 = _mm256_permute4x64_epi64(T01, 0xaa); -+ C7 = _mm256_permute4x64_epi64(T01, 0xff); - C8 = _mm256_set1_epi32((unsigned short)coef[16] + (((unsigned short)coef[17]) << 16)); - C8 = _mm256_unpacklo_epi16(C8, C8); - -diff --git a/source/decore/avx2/avx2.c b/source/decore/avx2/avx2.c -index a17dac5..d4b3ebf 100644 ---- a/source/decore/avx2/avx2.c -+++ b/source/decore/avx2/avx2.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -183,11 +178,13 @@ void uavs3d_funs_init_avx2() - uavs3d_funs_handle.ipcpy[4] = uavs3d_if_cpy_w64_avx2; - uavs3d_funs_handle.ipcpy[5] = uavs3d_if_cpy_w128_avx2; - -+ uavs3d_funs_handle.ipflt[IPFILTER_H_4][1] = uavs3d_if_hor_chroma_w8_avx2; - uavs3d_funs_handle.ipflt[IPFILTER_H_4][2] = uavs3d_if_hor_chroma_w16_avx2; - uavs3d_funs_handle.ipflt[IPFILTER_H_4][3] = uavs3d_if_hor_chroma_w16x_avx2; - uavs3d_funs_handle.ipflt[IPFILTER_H_4][4] = uavs3d_if_hor_chroma_w16x_avx2; - uavs3d_funs_handle.ipflt[IPFILTER_H_4][5] = uavs3d_if_hor_chroma_w16x_avx2; - -+ uavs3d_funs_handle.ipflt[IPFILTER_H_8][1] = uavs3d_if_hor_luma_w8_avx2; - uavs3d_funs_handle.ipflt[IPFILTER_H_8][2] = uavs3d_if_hor_luma_w16_avx2; - uavs3d_funs_handle.ipflt[IPFILTER_H_8][3] = uavs3d_if_hor_luma_w16x_avx2; - uavs3d_funs_handle.ipflt[IPFILTER_H_8][4] = uavs3d_if_hor_luma_w16x_avx2; -@@ -198,6 +195,7 @@ void uavs3d_funs_init_avx2() - uavs3d_funs_handle.ipflt[IPFILTER_V_4][4] = uavs3d_if_ver_chroma_w32x_avx2; - uavs3d_funs_handle.ipflt[IPFILTER_V_4][5] = uavs3d_if_ver_chroma_w32x_avx2; - -+ uavs3d_funs_handle.ipflt[IPFILTER_V_8][1] = uavs3d_if_ver_luma_w8_avx2; - uavs3d_funs_handle.ipflt[IPFILTER_V_8][2] = uavs3d_if_ver_luma_w16_avx2; - uavs3d_funs_handle.ipflt[IPFILTER_V_8][3] = uavs3d_if_ver_luma_w16x_avx2; - uavs3d_funs_handle.ipflt[IPFILTER_V_8][4] = uavs3d_if_ver_luma_w16x_avx2; -@@ -209,6 +207,8 @@ void uavs3d_funs_init_avx2() - uavs3d_funs_handle.ipflt_ext[IPFILTER_EXT_4][4] = uavs3d_if_hor_ver_chroma_w16x_avx2; - uavs3d_funs_handle.ipflt_ext[IPFILTER_EXT_4][5] = uavs3d_if_hor_ver_chroma_w16x_avx2; - -+ uavs3d_funs_handle.ipflt_ext[IPFILTER_EXT_8][0] = uavs3d_if_hor_ver_luma_w4_avx2; -+ uavs3d_funs_handle.ipflt_ext[IPFILTER_EXT_8][1] = uavs3d_if_hor_ver_luma_w8_avx2; - uavs3d_funs_handle.ipflt_ext[IPFILTER_EXT_8][2] = uavs3d_if_hor_ver_luma_w16x_avx2; - uavs3d_funs_handle.ipflt_ext[IPFILTER_EXT_8][3] = uavs3d_if_hor_ver_luma_w16x_avx2; - uavs3d_funs_handle.ipflt_ext[IPFILTER_EXT_8][4] = uavs3d_if_hor_ver_luma_w16x_avx2; -diff --git a/source/decore/avx2/avx2.h b/source/decore/avx2/avx2.h -index 43d0ad3..a29cfe8 100644 ---- a/source/decore/avx2/avx2.h -+++ b/source/decore/avx2/avx2.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/avx2/inter_pred_avx2.c b/source/decore/avx2/inter_pred_avx2.c -index c7287d3..cbaa2fc 100644 ---- a/source/decore/avx2/inter_pred_avx2.c -+++ b/source/decore/avx2/inter_pred_avx2.c -@@ -1,5 +1,5 @@ - /************************************************************************************** --* Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+* Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. --* 3. All advertising materials mentioning features or use of this software --* must display the following acknowledgement: --* This product includes the software uAVS3d developed by --* Peking University Shenzhen Graduate School, Peng Cheng Laboratory --* and Guangdong Bohua UHD Innovation Corporation. --* 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+* 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -33,7 +28,7 @@ - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * For more information, contact us at rgwang@pkusz.edu.cn. --**************************************************************************************/ -+**************************************************************************************/ - - #include "avx2.h" - -@@ -134,9 +129,11 @@ void uavs3d_if_hor_chroma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst - - __m256i mCoefy1_hor = _mm256_set1_epi16(*(s16*)coeff); - __m256i mCoefy2_hor = _mm256_set1_epi16(*(s16*)(coeff + 2)); -- __m256i mSwitch = _mm256_setr_epi8(0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 6, 8, 7, 9, 0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 6, 8, 7, 9); -+ __m256i mSwitch0 = _mm256_setr_epi8(0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 6, 8, 7, 9, 0, 2, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 6, 8, 7, 9); -+ __m256i mSwitch1 = _mm256_setr_epi8(0+4, 2+4, 1+4, 3+4, 2+4, 4+4, 3+4, 5+4, 4+4, 6+4, 5+4, 7+4, 6+4, 8+4, 7+4, 9+4, -+ 0+4, 2+4, 1+4, 3+4, 2+4, 4+4, 3+4, 5+4, 4+4, 6+4, 5+4, 7+4, 6+4, 8+4, 7+4, 9+4); - __m256i mAddOffset = _mm256_set1_epi16(offset); -- __m256i T0, T1, S0, S1, R0, R1, sum; -+ __m256i T0, T1, S0, R0, R1, sum; - __m128i s0, s1; - - src -= 2; -@@ -144,27 +141,27 @@ void uavs3d_if_hor_chroma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst - while (height > 0) { - s0 = _mm_loadu_si128((__m128i*)(src)); - s1 = _mm_loadu_si128((__m128i*)(src + i_src)); -+ src += i_src << 1; -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - - S0 = _mm256_set_m128i(s1, s0); -- S1 = _mm256_srli_si256(S0, 4); - -- R0 = _mm256_shuffle_epi8(S0, mSwitch); // 4 rows s0 and s1 -- R1 = _mm256_shuffle_epi8(S1, mSwitch); -+ R0 = _mm256_shuffle_epi8(S0, mSwitch0); // 4 rows s0 and s1 -+ R1 = _mm256_shuffle_epi8(S0, mSwitch1); - - T0 = _mm256_maddubs_epi16(R0, mCoefy1_hor); // 4x4: s0*c0 + s1*c1 - T1 = _mm256_maddubs_epi16(R1, mCoefy2_hor); - sum = _mm256_add_epi16(T0, T1); - -- sum = _mm256_add_epi16(sum, mAddOffset); -+ sum = _mm256_add_epi16(sum, mAddOffset); - sum = _mm256_srai_epi16(sum, shift); - - s0 = _mm_packus_epi16(_mm256_castsi256_si128(sum), _mm256_extracti128_si256(sum, 1)); -- s1 = _mm_srli_si128(s0, 8); - _mm_storel_epi64((__m128i*)(dst), s0); -- _mm_storel_epi64((__m128i*)(dst + i_dst), s1); -+ _mm_storeh_pi((__m64*)(dst + i_dst), _mm_castsi128_ps(s0)); - - height -= 2; -- src += i_src << 1; - dst += i_dst << 1; - } - } -@@ -184,9 +181,11 @@ void uavs3d_if_hor_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ds - src -= 2; - - while (height) { -- uavs3d_prefetch(src + i_src*2, _MM_HINT_NTA); - S0 = _mm256_loadu_si256((__m256i*)(src)); - S1 = _mm256_loadu_si256((__m256i*)(src + i_src)); -+ src += i_src << 1; -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - S2 = _mm256_permute4x64_epi64(S0, 0x94); - S3 = _mm256_permute4x64_epi64(S1, 0x94); - R0 = _mm256_shuffle_epi8(S2, mSwitch1); -@@ -200,6 +199,8 @@ void uavs3d_if_hor_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ds - sum0 = _mm256_add_epi16(T0, T1); - sum1 = _mm256_add_epi16(T2, T3); - -+ height -= 2; -+ - sum0 = _mm256_add_epi16(sum0, mAddOffset); - sum1 = _mm256_add_epi16(sum1, mAddOffset); - sum0 = _mm256_srai_epi16(sum0, shift); -@@ -207,8 +208,6 @@ void uavs3d_if_hor_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ds - _mm_storeu_si128((__m128i*)(dst), _mm_packus_epi16(_mm256_castsi256_si128(sum0), _mm256_extracti128_si256(sum0, 1))); - _mm_storeu_si128((__m128i*)(dst + i_dst), _mm_packus_epi16(_mm256_castsi256_si128(sum1), _mm256_extracti128_si256(sum1, 1))); - -- height -= 2; -- src += i_src << 1; - dst += i_dst << 1; - } - } -@@ -228,10 +227,10 @@ void uavs3d_if_hor_chroma_w32_avx2(const pel *src, int i_src, pel *dst, int i_ds - src -= 2; - - while (height--) { -- uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -- - S0 = _mm256_loadu_si256((__m256i*)(src)); - S1 = _mm256_loadu_si256((__m256i*)(src + 16)); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -+ - S2 = _mm256_permute4x64_epi64(S0, 0x94); - S3 = _mm256_permute4x64_epi64(S1, 0x94); - R0 = _mm256_shuffle_epi8(S2, mSwitch1); -@@ -308,59 +307,52 @@ void uavs3d_if_hor_luma_w4_avx2(const pel *src, int i_src, pel *dst, int i_dst, - const int offset = 32; - const int shift = 6; - __m256i mAddOffset = _mm256_set1_epi16(offset); -- __m256i mSwitch1 = _mm256_setr_epi8(0, 1, 1, 2, 2, 3, 3, 4, 8, 9, 9, 10, 10, 11, 11, 12, 0, 1, 1, 2, 2, 3, 3, 4, 8, 9, 9, 10, 10, 11, 11, 12); -- __m256i mSwitch2 = _mm256_setr_epi8(2, 3, 3, 4, 4, 5, 5, 6, 10, 11, 11, 12, 12, 13, 13, 14, 2, 3, 3, 4, 4, 5, 5, 6, 10, 11, 11, 12, 12, 13, 13, 14); -- __m256i T0, T1, T2, T3, S0, S1, S2, S3, sum; -+ __m256i mSwitch1 = _mm256_setr_epi8(0, 1, 2, 3, 1, 2, 3, 4, 2, 3, 4, 5, 3, 4, 5, 6, 0, 1, 2, 3, 1, 2, 3, 4, 2, 3, 4, 5, 3, 4, 5, 6); -+ __m256i mSwitch2 = _mm256_setr_epi8(4, 5, 6, 7, 5, 6, 7, 8, 6, 7, 8, 9, 7, 8, 9, 10, 4, 5, 6, 7, 5, 6, 7, 8, 6, 7, 8, 9, 7, 8, 9, 10); -+ __m256i T0, T1, T2, T3, S0, S1, sum; - __m256i r0, r1, r2, r3; - __m128i s0, s1, s2, s3; -- __m256i mCoefy1_hor = _mm256_set1_epi16(*(s16*)coeff); -- __m256i mCoefy2_hor = _mm256_set1_epi16(*(s16*)(coeff + 2)); -- __m256i mCoefy3_hor = _mm256_set1_epi16(*(s16*)(coeff + 4)); -- __m256i mCoefy4_hor = _mm256_set1_epi16(*(s16*)(coeff + 6)); -+ __m256i mCoefy1_hor = _mm256_set1_epi32(*(s32*)coeff); -+ __m256i mCoefy2_hor = _mm256_set1_epi32(*(s32*)(coeff + 4)); - src -= 3; - - while (height > 0) { -- uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - s0 = _mm_loadu_si128((__m128i*)(src)); - s1 = _mm_loadu_si128((__m128i*)(src + i_src)); - s2 = _mm_loadu_si128((__m128i*)(src + i_src * 2)); - s3 = _mm_loadu_si128((__m128i*)(src + i_src * 3)); -+ src += i_src << 2; -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - - S0 = _mm256_set_m128i(s2, s0); - S1 = _mm256_set_m128i(s3, s1); - -- S2 = _mm256_srli_si256(S0, 4); -- S3 = _mm256_srli_si256(S1, 4); -- -- T0 = _mm256_unpacklo_epi64(S0, S1); -- T1 = _mm256_unpacklo_epi64(S2, S3); -- -- r0 = _mm256_shuffle_epi8(T0, mSwitch1); -- r1 = _mm256_shuffle_epi8(T0, mSwitch2); -- r2 = _mm256_shuffle_epi8(T1, mSwitch1); -- r3 = _mm256_shuffle_epi8(T1, mSwitch2); -+ r0 = _mm256_shuffle_epi8(S0, mSwitch1); -+ r1 = _mm256_shuffle_epi8(S0, mSwitch2); -+ r2 = _mm256_shuffle_epi8(S1, mSwitch1); -+ r3 = _mm256_shuffle_epi8(S1, mSwitch2); - - T0 = _mm256_maddubs_epi16(r0, mCoefy1_hor); - T1 = _mm256_maddubs_epi16(r1, mCoefy2_hor); -- T2 = _mm256_maddubs_epi16(r2, mCoefy3_hor); -- T3 = _mm256_maddubs_epi16(r3, mCoefy4_hor); -+ T2 = _mm256_maddubs_epi16(r2, mCoefy1_hor); -+ T3 = _mm256_maddubs_epi16(r3, mCoefy2_hor); - - T0 = _mm256_add_epi16(T0, T1); - T1 = _mm256_add_epi16(T2, T3); -- sum = _mm256_add_epi16(T0, T1); -+ sum = _mm256_hadd_epi16(T0, T1); - - sum = _mm256_add_epi16(sum, mAddOffset); - sum = _mm256_srai_epi16(sum, shift); - - s0 = _mm_packus_epi16(_mm256_castsi256_si128(sum), _mm256_extracti128_si256(sum, 1)); - -+ height -= 4; - M32(dst) = _mm_extract_epi32(s0, 0); - M32(dst + i_dst) = _mm_extract_epi32(s0, 1); - M32(dst + i_dst * 2) = _mm_extract_epi32(s0, 2); - M32(dst + i_dst * 3) = _mm_extract_epi32(s0, 3); - -- height -= 4; -- src += i_src << 2; - dst += i_dst << 2; - } - } -@@ -385,9 +377,11 @@ void uavs3d_if_hor_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst, - src -= 3; - - while (height) { -- uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - s0 = _mm_loadu_si128((__m128i*)(src)); - s1 = _mm_loadu_si128((__m128i*)(src + i_src)); -+ src += i_src << 1; -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - S = _mm256_set_m128i(s1, s0); - - r0 = _mm256_shuffle_epi8(S, mSwitch1); -@@ -407,13 +401,11 @@ void uavs3d_if_hor_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst, - sum = _mm256_add_epi16(sum, mAddOffset); - sum = _mm256_srai_epi16(sum, shift); - -+ height -= 2; - s0 = _mm_packus_epi16(_mm256_castsi256_si128(sum), _mm256_extracti128_si256(sum, 1)); -- s1 = _mm_srli_si128(s0, 8); - _mm_storel_epi64((__m128i*)(dst), s0); -- _mm_storel_epi64((__m128i*)(dst + i_dst), s1); -+ _mm_storeh_pi((__m64*)(dst + i_dst), _mm_castsi128_ps(s0)); - -- height -= 2; -- src += i_src << 1; - dst += i_dst << 1; - } - } -@@ -437,11 +429,13 @@ void uavs3d_if_hor_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, - src -= 3; - - while (height) { -- uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - S0 = _mm256_loadu_si256((__m256i*)(src)); - S1 = _mm256_loadu_si256((__m256i*)(src + i_src)); - S2 = _mm256_permute4x64_epi64(S0, 0x94); - S3 = _mm256_permute4x64_epi64(S1, 0x94); -+ src += i_src << 1; -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - - r0 = _mm256_shuffle_epi8(S2, mSwitch1); - r1 = _mm256_shuffle_epi8(S2, mSwitch2); -@@ -475,11 +469,10 @@ void uavs3d_if_hor_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, - sum0 = _mm256_srai_epi16(sum0, shift); - sum1 = _mm256_srai_epi16(sum1, shift); - -+ height -= 2; - _mm_storeu_si128((__m128i*)(dst), _mm_packus_epi16(_mm256_castsi256_si128(sum0), _mm256_extracti128_si256(sum0, 1))); - _mm_storeu_si128((__m128i*)(dst + i_dst), _mm_packus_epi16(_mm256_castsi256_si128(sum1), _mm256_extracti128_si256(sum1, 1))); - -- height -= 2; -- src += i_src << 1; - dst += i_dst << 1; - } - } -@@ -503,13 +496,14 @@ void uavs3d_if_hor_luma_w32_avx2(const pel *src, int i_src, pel *dst, int i_dst, - src -= 3; - - while (height--) { -- uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -- - S0 = _mm256_loadu_si256((__m256i*)(src)); - S1 = _mm256_loadu_si256((__m256i*)(src + 16)); - S2 = _mm256_permute4x64_epi64(S0, 0x94); - S3 = _mm256_permute4x64_epi64(S1, 0x94); - -+ src += i_src; -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ - r0 = _mm256_shuffle_epi8(S2, mSwitch1); - r1 = _mm256_shuffle_epi8(S2, mSwitch2); - r2 = _mm256_shuffle_epi8(S2, mSwitch3); -@@ -545,7 +539,6 @@ void uavs3d_if_hor_luma_w32_avx2(const pel *src, int i_src, pel *dst, int i_dst, - _mm_storeu_si128((__m128i*)(dst), _mm_packus_epi16(_mm256_castsi256_si128(sum0), _mm256_extracti128_si256(sum0, 1))); - _mm_storeu_si128((__m128i*)(dst + 16), _mm_packus_epi16(_mm256_castsi256_si128(sum1), _mm256_extracti128_si256(sum1, 1))); - -- src += i_src; - dst += i_dst; - } - } -@@ -635,15 +628,17 @@ void uavs3d_if_ver_chroma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst - src -= i_src; - - while (height) { -- uavs3d_prefetch(src + 5 * i_src, _MM_HINT_NTA); -- uavs3d_prefetch(src + 6 * i_src, _MM_HINT_NTA); -- height -= 2; - s0 = _mm_loadl_epi64((__m128i*)(src)); - s1 = _mm_loadl_epi64((__m128i*)(src + i_src)); - s2 = _mm_loadl_epi64((__m128i*)(src + i_src2)); - s3 = _mm_loadl_epi64((__m128i*)(src + i_src3)); - s4 = _mm_loadl_epi64((__m128i*)(src + i_src4)); - -+ src += 2 * i_src; -+ height -= 2; -+ uavs3d_prefetch(src + i_src3, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src4, _MM_HINT_NTA); -+ - S0 = _mm256_set_m128i(s1, s0); - S1 = _mm256_set_m128i(s2, s1); - S2 = _mm256_set_m128i(s3, s2); -@@ -660,12 +655,10 @@ void uavs3d_if_ver_chroma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst - mVal = _mm256_add_epi16(mVal, mAddOffset); - mVal = _mm256_srai_epi16(mVal, shift); - s0 = _mm_packus_epi16(_mm256_castsi256_si128(mVal), _mm256_extracti128_si256(mVal, 1)); -- s1 = _mm_srli_si128(s0, 8); - - _mm_storel_epi64((__m128i*)(dst), s0); -- _mm_storel_epi64((__m128i*)(dst + i_dst), s1); -+ _mm_storeh_pi((__m64*)(dst + i_dst), _mm_castsi128_ps(s0)); - -- src += 2 * i_src; - dst += 2 * i_dst; - } - } -@@ -687,15 +680,17 @@ void uavs3d_if_ver_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ds - src -= i_src; - - while (height) { -- uavs3d_prefetch(src + 5 * i_src, _MM_HINT_NTA); -- uavs3d_prefetch(src + 6 * i_src, _MM_HINT_NTA); -- height -= 2; - s0 = _mm_loadu_si128((__m128i*)(src)); - s1 = _mm_loadu_si128((__m128i*)(src + i_src)); - s2 = _mm_loadu_si128((__m128i*)(src + i_src2)); - s3 = _mm_loadu_si128((__m128i*)(src + i_src3)); - s4 = _mm_loadu_si128((__m128i*)(src + i_src4)); - -+ src += 2 * i_src; -+ uavs3d_prefetch(src + i_src3, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src4, _MM_HINT_NTA); -+ height -= 2; -+ - S0 = _mm256_set_m128i(s1, s0); - S1 = _mm256_set_m128i(s2, s1); - S2 = _mm256_set_m128i(s3, s2); -@@ -723,7 +718,6 @@ void uavs3d_if_ver_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ds - _mm_storeu_si128((__m128i*)dst, _mm256_castsi256_si128(mVal0)); - _mm_storeu_si128((__m128i*)(dst + i_dst), _mm256_extracti128_si256(mVal0, 1)); - -- src += 2 * i_src; - dst += 2 * i_dst; - } - } -@@ -744,15 +738,17 @@ void uavs3d_if_ver_chroma_w32_avx2(const pel *src, int i_src, pel *dst, int i_ds - src -= i_src; - - while (height) { -- uavs3d_prefetch(src + 5 * i_src, _MM_HINT_NTA); -- uavs3d_prefetch(src + 6 * i_src, _MM_HINT_NTA); -- height -= 2; - S0 = _mm256_loadu_si256((__m256i*)(src)); - S1 = _mm256_loadu_si256((__m256i*)(src + i_src)); - S2 = _mm256_loadu_si256((__m256i*)(src + i_src2)); - S3 = _mm256_loadu_si256((__m256i*)(src + i_src3)); - S4 = _mm256_loadu_si256((__m256i*)(src + i_src4)); - -+ src += 2 * i_src; -+ height -= 2; -+ uavs3d_prefetch(src + i_src3, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src4, _MM_HINT_NTA); -+ - T0 = _mm256_unpacklo_epi8(S0, S1); - T1 = _mm256_unpackhi_epi8(S0, S1); - T2 = _mm256_unpacklo_epi8(S2, S3); -@@ -790,7 +786,6 @@ void uavs3d_if_ver_chroma_w32_avx2(const pel *src, int i_src, pel *dst, int i_ds - _mm256_storeu_si256((__m256i*)dst, mVal0); - _mm256_storeu_si256((__m256i*)(dst + i_dst), mVal2); - -- src += 2 * i_src; - dst += 2 * i_dst; - - } -@@ -811,7 +806,6 @@ void uavs3d_if_ver_chroma_w64_avx2(const pel *src, int i_src, pel *dst, int i_ds - src -= i_src; - - while (height--){ -- uavs3d_prefetch(src + 4 * i_src, _MM_HINT_NTA); - S0 = _mm256_loadu_si256((__m256i*)(src)); - S4 = _mm256_loadu_si256((__m256i*)(src + 32)); - S1 = _mm256_loadu_si256((__m256i*)(src + i_src)); -@@ -821,6 +815,7 @@ void uavs3d_if_ver_chroma_w64_avx2(const pel *src, int i_src, pel *dst, int i_ds - S3 = _mm256_loadu_si256((__m256i*)(src + i_src3)); - S7 = _mm256_loadu_si256((__m256i*)(src + i_src3 + 32)); - -+ src += i_src; - T0 = _mm256_unpacklo_epi8(S0, S1); - T1 = _mm256_unpacklo_epi8(S2, S3); - T2 = _mm256_unpackhi_epi8(S0, S1); -@@ -830,6 +825,8 @@ void uavs3d_if_ver_chroma_w64_avx2(const pel *src, int i_src, pel *dst, int i_ds - T6 = _mm256_unpackhi_epi8(S4, S5); - T7 = _mm256_unpackhi_epi8(S6, S7); - -+ uavs3d_prefetch(src + i_src3, _MM_HINT_NTA); -+ - T0 = _mm256_maddubs_epi16(T0, coeff0); - T1 = _mm256_maddubs_epi16(T1, coeff1); - T2 = _mm256_maddubs_epi16(T2, coeff0); -@@ -858,7 +855,6 @@ void uavs3d_if_ver_chroma_w64_avx2(const pel *src, int i_src, pel *dst, int i_ds - _mm256_storeu_si256((__m256i*)(dst), mVal0); - _mm256_storeu_si256((__m256i*)(dst + 32), mVal1); - -- src += i_src; - dst += i_dst; - } - } -@@ -878,7 +874,6 @@ void uavs3d_if_ver_chroma_w128_avx2(const pel *src, int i_src, pel *dst, int i_d - src -= i_src; - - while (height--) { -- uavs3d_prefetch(src + 4 * i_src, _MM_HINT_NTA); - S0 = _mm256_loadu_si256((__m256i*)(src)); - S4 = _mm256_loadu_si256((__m256i*)(src + 32)); - S1 = _mm256_loadu_si256((__m256i*)(src + i_src)); -@@ -934,6 +929,9 @@ void uavs3d_if_ver_chroma_w128_avx2(const pel *src, int i_src, pel *dst, int i_d - S3 = _mm256_loadu_si256((__m256i*)(src + i_src3 + 64)); - S7 = _mm256_loadu_si256((__m256i*)(src + i_src3 + 96)); - -+ src += i_src; -+ uavs3d_prefetch(src + i_src3, _MM_HINT_NTA); -+ - T0 = _mm256_unpacklo_epi8(S0, S1); - T1 = _mm256_unpacklo_epi8(S2, S3); - T2 = _mm256_unpackhi_epi8(S0, S1); -@@ -971,7 +969,6 @@ void uavs3d_if_ver_chroma_w128_avx2(const pel *src, int i_src, pel *dst, int i_d - _mm256_storeu_si256((__m256i*)(dst + 64), mVal0); - _mm256_storeu_si256((__m256i*)(dst + 96), mVal1); - -- src += i_src; - dst += i_dst; - } - } -@@ -1078,7 +1075,6 @@ void uavs3d_if_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst, - while (height) { - __m128i S0, S1, S2, S3, S4, S5, S6, S7, S8; - -- height -= 2; - S0 = _mm_loadl_epi64((__m128i*)(src)); - S1 = _mm_loadl_epi64((__m128i*)(src + i_src)); - S2 = _mm_loadl_epi64((__m128i*)(src + i_src2)); -@@ -1098,6 +1094,11 @@ void uavs3d_if_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst, - R6 = _mm256_set_m128i(S7, S6); - R7 = _mm256_set_m128i(S8, S7); - -+ src += 2 * i_src; -+ height -= 2; -+ uavs3d_prefetch(src + i_src7, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src8, _MM_HINT_NTA); -+ - T0 = _mm256_unpacklo_epi8(R0, R1); - T1 = _mm256_unpacklo_epi8(R2, R3); - T2 = _mm256_unpacklo_epi8(R4, R5); -@@ -1115,11 +1116,9 @@ void uavs3d_if_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst, - mVal = _mm256_add_epi16(mVal, mAddOffset); - mVal = _mm256_srai_epi16(mVal, shift); - S0 = _mm_packus_epi16(_mm256_castsi256_si128(mVal), _mm256_extracti128_si256(mVal, 1)); -- S1 = _mm_srli_si128(S0, 8); - - _mm_storel_epi64((__m128i*)(dst), S0); -- _mm_storel_epi64((__m128i*)(dst + i_dst), S1); -- src += 2 * i_src; -+ _mm_storeh_pi((__m64*)(dst + i_dst), _mm_castsi128_ps(S0)); - dst += 2 * i_dst; - } - } -@@ -1147,10 +1146,6 @@ void uavs3d_if_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, - - while(height) { - __m128i S0, S1, S2, S3, S4, S5, S6, S7, S8; -- uavs3d_prefetch(src + 9 * i_src, _MM_HINT_NTA); -- uavs3d_prefetch(src + 10 * i_src, _MM_HINT_NTA); -- -- height -= 2; - S0 = _mm_loadu_si128((__m128i*)(src)); - S1 = _mm_loadu_si128((__m128i*)(src + i_src)); - S2 = _mm_loadu_si128((__m128i*)(src + i_src2)); -@@ -1170,6 +1165,12 @@ void uavs3d_if_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, - R6 = _mm256_set_m128i(S6, S7); - R7 = _mm256_set_m128i(S7, S8); - -+ src += 2 * i_src; -+ height -= 2; -+ -+ uavs3d_prefetch(src + i_src7, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src8, _MM_HINT_NTA); -+ - T0 = _mm256_unpacklo_epi8(R0, R1); - T1 = _mm256_unpackhi_epi8(R0, R1); - T2 = _mm256_unpacklo_epi8(R2, R3); -@@ -1203,7 +1204,6 @@ void uavs3d_if_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, - - _mm_storeu_si128((__m128i*)dst, _mm256_extractf128_si256(mVal1, 1)); - _mm_storeu_si128((__m128i*)(dst + i_dst), _mm256_castsi256_si128(mVal1)); -- src += 2 * i_src; - dst += 2 * i_dst; - } - } -@@ -1230,7 +1230,6 @@ void uavs3d_if_ver_luma_w32_avx2(const pel *src, int i_src, pel *dst, int i_dst, - src -= 3 * i_src; - while (height--) { - __m256i S0, S1, S2, S3, S4, S5, S6, S7; -- uavs3d_prefetch(src + 8 * i_src, _MM_HINT_NTA); - S0 = _mm256_loadu_si256((__m256i*)(src)); - S1 = _mm256_loadu_si256((__m256i*)(src + i_src)); - S2 = _mm256_loadu_si256((__m256i*)(src + i_src2)); -@@ -1240,6 +1239,7 @@ void uavs3d_if_ver_luma_w32_avx2(const pel *src, int i_src, pel *dst, int i_dst, - S6 = _mm256_loadu_si256((__m256i*)(src + i_src6)); - S7 = _mm256_loadu_si256((__m256i*)(src + i_src7)); - -+ src += i_src; - T0 = _mm256_unpacklo_epi8(S0, S1); - T1 = _mm256_unpacklo_epi8(S2, S3); - T2 = _mm256_unpacklo_epi8(S4, S5); -@@ -1249,6 +1249,8 @@ void uavs3d_if_ver_luma_w32_avx2(const pel *src, int i_src, pel *dst, int i_dst, - T6 = _mm256_unpackhi_epi8(S4, S5); - T7 = _mm256_unpackhi_epi8(S6, S7); - -+ uavs3d_prefetch(src + i_src7, _MM_HINT_NTA); -+ - T0 = _mm256_maddubs_epi16(T0, coeff0); - T1 = _mm256_maddubs_epi16(T1, coeff1); - T2 = _mm256_maddubs_epi16(T2, coeff2); -@@ -1273,7 +1275,6 @@ void uavs3d_if_ver_luma_w32_avx2(const pel *src, int i_src, pel *dst, int i_dst, - - _mm256_storeu_si256((__m256i*)(dst), mVal1); - -- src += i_src; - dst += i_dst; - } - } -@@ -1295,12 +1296,11 @@ void uavs3d_if_ver_luma_w64_avx2(const pel *src, int i_src, pel *dst, int i_dst, - __m256i coeff3 = _mm256_set1_epi16(*(s16*)(coeff + 6)); - __m256i T0, T1, T2, T3, T4, T5, T6, T7, mVal1, mVal2; - -- src -= 3 * i_src; -+ src -= i_src3; - - while (height--) { - const pel *p = src + 32; - __m256i S0, S1, S2, S3, S4, S5, S6, S7; -- uavs3d_prefetch(src + 8 * i_src, _MM_HINT_NTA); - S0 = _mm256_loadu_si256((__m256i*)(src)); - S1 = _mm256_loadu_si256((__m256i*)(src + i_src)); - S2 = _mm256_loadu_si256((__m256i*)(src + i_src2)); -@@ -1352,6 +1352,7 @@ void uavs3d_if_ver_luma_w64_avx2(const pel *src, int i_src, pel *dst, int i_dst, - S6 = _mm256_loadu_si256((__m256i*)(p + i_src6)); - S7 = _mm256_loadu_si256((__m256i*)(p + i_src7)); - -+ src += i_src; - T0 = _mm256_unpacklo_epi8(S0, S1); - T1 = _mm256_unpacklo_epi8(S2, S3); - T2 = _mm256_unpacklo_epi8(S4, S5); -@@ -1361,6 +1362,8 @@ void uavs3d_if_ver_luma_w64_avx2(const pel *src, int i_src, pel *dst, int i_dst, - T6 = _mm256_unpackhi_epi8(S4, S5); - T7 = _mm256_unpackhi_epi8(S6, S7); - -+ uavs3d_prefetch(src + i_src7, _MM_HINT_NTA); -+ - T0 = _mm256_maddubs_epi16(T0, coeff0); - T1 = _mm256_maddubs_epi16(T1, coeff1); - T2 = _mm256_maddubs_epi16(T2, coeff2); -@@ -1385,7 +1388,6 @@ void uavs3d_if_ver_luma_w64_avx2(const pel *src, int i_src, pel *dst, int i_dst, - - _mm256_storeu_si256((__m256i*)(dst + 32), mVal1); - -- src += i_src; - dst += i_dst; - } - } -@@ -1412,7 +1414,6 @@ void uavs3d_if_ver_luma_w128_avx2(const pel *src, int i_src, pel *dst, int i_dst - while (height--) { - const pel *p = src + 32; - __m256i S0, S1, S2, S3, S4, S5, S6, S7; -- uavs3d_prefetch(src + 8 * i_src, _MM_HINT_NTA); - S0 = _mm256_loadu_si256((__m256i*)(src)); - S1 = _mm256_loadu_si256((__m256i*)(src + i_src)); - S2 = _mm256_loadu_si256((__m256i*)(src + i_src2)); -@@ -1552,6 +1553,8 @@ void uavs3d_if_ver_luma_w128_avx2(const pel *src, int i_src, pel *dst, int i_dst - S6 = _mm256_loadu_si256((__m256i*)(p + i_src6)); - S7 = _mm256_loadu_si256((__m256i*)(p + i_src7)); - -+ src += i_src; -+ uavs3d_prefetch(src + i_src7, _MM_HINT_NTA); - T0 = _mm256_unpacklo_epi8(S0, S1); - T1 = _mm256_unpacklo_epi8(S2, S3); - T2 = _mm256_unpacklo_epi8(S4, S5); -@@ -1585,7 +1588,6 @@ void uavs3d_if_ver_luma_w128_avx2(const pel *src, int i_src, pel *dst, int i_dst - - _mm256_storeu_si256((__m256i*)(dst + 96), mVal1); - -- src += i_src; - dst += i_dst; - } - } -@@ -1668,6 +1670,8 @@ void uavs3d_if_hor_ver_chroma_w8_avx2(const pel *src, int i_src, pel *dst, int i - S2 = _mm256_permute2x128_si256(mVal[1], mVal[2], 0x21); - S3 = mVal[2]; - -+ uavs3d_prefetch(src + i_src3, _MM_HINT_NTA); -+ - T0 = _mm256_unpacklo_epi16(S0, S1); - T1 = _mm256_unpacklo_epi16(S2, S3); - T2 = _mm256_unpackhi_epi16(S0, S1); -@@ -1709,17 +1713,15 @@ void uavs3d_if_hor_ver_chroma_w8_avx2(const pel *src, int i_src, pel *dst, int i - T0 = _mm256_srai_epi32(T0, shift); - T2 = _mm256_srai_epi32(T2, shift); - -- s0 = _mm_packus_epi16(_mm256_castsi256_si128(R0), _mm256_extracti128_si256(R0, 1)); -- s1 = _mm_srli_si128(s0, 8); -+ s2 = _mm_packus_epi16(_mm256_castsi256_si128(R0), _mm256_extracti128_si256(R0, 1)); - - T0 = _mm256_packs_epi32(T0, T2); -- s2 = _mm_packus_epi16(_mm256_castsi256_si128(T0), _mm256_extracti128_si256(T0, 1)); -- s3 = _mm_srli_si128(s2, 8); -+ s3 = _mm_packus_epi16(_mm256_castsi256_si128(T0), _mm256_extracti128_si256(T0, 1)); - -- _mm_storel_epi64((__m128i*)(dst), s0); -- _mm_storel_epi64((__m128i*)(dst + i_dst), s1); -- _mm_storel_epi64((__m128i*)(dst + i_dst*2), s2); -- _mm_storel_epi64((__m128i*)(dst + i_dst*3), s3); -+ _mm_storel_epi64((__m128i*)(dst), s2); -+ _mm_storeh_pi((__m64*)(dst + i_dst), _mm_castsi128_ps(s2)); -+ _mm_storel_epi64((__m128i*)(dst + i_dst*2), s3); -+ _mm_storeh_pi((__m64*)(dst + i_dst*3), _mm_castsi128_ps(s3)); - - dst += i_dst << 2; - height -= 4; -@@ -1756,17 +1758,17 @@ void uavs3d_if_hor_ver_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int - row = height + 3; - - while (row--) { -- uavs3d_prefetch(src + i_src*2, _MM_HINT_NTA); - S0 = _mm256_loadu_si256((__m256i*)(src)); -+ src += i_src; - S1 = _mm256_permute4x64_epi64(S0, 0x94); -+ uavs3d_prefetch(src, _MM_HINT_NTA); - R0 = _mm256_shuffle_epi8(S1, mSwitch1); - R1 = _mm256_shuffle_epi8(S1, mSwitch2); - T0 = _mm256_maddubs_epi16(R0, mCoefy1_hor); - T1 = _mm256_maddubs_epi16(R1, mCoefy2_hor); - sum = _mm256_add_epi16(T0, T1); - -- _mm256_storeu_si256((__m256i*)(tmp), sum); -- src += i_src; -+ _mm256_store_si256((__m256i*)(tmp), sum); - tmp += i_tmp; - } - -@@ -1878,8 +1880,8 @@ void uavs3d_if_hor_ver_chroma_w32x_avx2(const pel *src, int i_src, pel *dst, int - sum0 = _mm256_add_epi16(T0, T1); - sum1 = _mm256_add_epi16(T2, T3); - -- _mm256_storeu_si256((__m256i*)(tmp + col), sum0); -- _mm256_storeu_si256((__m256i*)(tmp + col + 16), sum1); -+ _mm256_store_si256((__m256i*)(tmp + col), sum0); -+ _mm256_store_si256((__m256i*)(tmp + col + 16), sum1); - } - src += i_src; - tmp += i_tmp; -@@ -2055,8 +2057,8 @@ void uavs3d_if_hor_ver_luma_w4_avx2(const pel *src, int i_src, pel *dst, int i_d - - s0 = _mm_loadu_si128((__m128i*)(src)); - s1 = _mm_loadu_si128((__m128i*)(src + i_src)); -- s2 = _mm_loadu_si128((__m128i*)(src + i_src * 2)); -- s3 = _mm_loadu_si128((__m128i*)(src + i_src * 3)); -+ s2 = _mm_loadu_si128((__m128i*)(src + i_src2)); -+ s3 = _mm_loadu_si128((__m128i*)(src + i_src3)); - - S0 = _mm256_set_m128i(s2, s0); - S1 = _mm256_set_m128i(s3, s1); -@@ -2090,8 +2092,8 @@ void uavs3d_if_hor_ver_luma_w4_avx2(const pel *src, int i_src, pel *dst, int i_d - // hor - s0 = _mm_loadu_si128((__m128i*)(src)); - s1 = _mm_loadu_si128((__m128i*)(src + i_src)); -- s2 = _mm_loadu_si128((__m128i*)(src + i_src * 2)); -- s3 = _mm_loadu_si128((__m128i*)(src + i_src * 3)); -+ s2 = _mm_loadu_si128((__m128i*)(src + i_src2)); -+ s3 = _mm_loadu_si128((__m128i*)(src + i_src3)); - - S0 = _mm256_set_m128i(s2, s0); - S1 = _mm256_set_m128i(s3, s1); -@@ -2173,19 +2175,7 @@ void uavs3d_if_hor_ver_luma_w4_avx2(const pel *src, int i_src, pel *dst, int i_d - - void uavs3d_if_hor_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coef_x, const s8 *coef_y, int max_val) - { -- const int i_tmp = 8; -- const int i_tmp2 = 16; -- const int i_tmp3 = 24; -- const int i_tmp4 = 32; -- const int i_tmp5 = 40; -- const int i_tmp6 = 48; -- const int i_tmp7 = 56;; -- const int i_tmp8 = 64; -- const int i_tmp9 = 72;; -- const int i_tmp10 = 80; - const int i_src2 = i_src << 1; -- int row; -- int shift = 12; - - __m256i T0, T1, T2, T3, T4, T5, T6, T7, T8, T9; - __m256i r0, r1, r2, r3, r4, r5, r6, r7, r8, r9; -@@ -2201,12 +2191,16 @@ void uavs3d_if_hor_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_d - - //HOR - { -+ int row; - src = src - 3 * i_src - 3; - - // first row - { - __m128i mSrc0 = _mm_loadu_si128((__m128i*)(src)); - T0 = _mm256_set_m128i(mSrc0, mSrc0); -+ src += i_src; -+ -+ uavs3d_prefetch(src, _MM_HINT_NTA); - - r0 = _mm256_shuffle_epi8(T0, mSwitch1); - r1 = _mm256_shuffle_epi8(T0, mSwitch2); -@@ -2224,13 +2218,16 @@ void uavs3d_if_hor_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_d - - mVal[0] = _mm256_permute4x64_epi64(mVal[0], 0x44); - -- src += i_src; - } - - for (row = 1; row < 4; row++) { -- __m128i mSrc0 = _mm_loadu_si128((__m128i*)(src)); -+ __m128i mSrc0 = _mm_loadu_si128((__m128i*)(src)); - __m128i mSrc1 = _mm_loadu_si128((__m128i*)(src + i_src)); - T0 = _mm256_set_m128i(mSrc1, mSrc0); -+ src += i_src2; -+ -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - - r0 = _mm256_shuffle_epi8(T0, mSwitch1); - r1 = _mm256_shuffle_epi8(T0, mSwitch2); -@@ -2245,8 +2242,6 @@ void uavs3d_if_hor_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_d - T0 = _mm256_add_epi16(T0, T1); - T1 = _mm256_add_epi16(T2, T3); - mVal[row] = _mm256_add_epi16(T0, T1); -- -- src += i_src2; - } - } - -@@ -2260,35 +2255,44 @@ void uavs3d_if_hor_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_d - __m256i mCoefy2 = _mm256_cvtepi8_epi16(mCoefy22); - __m256i mCoefy3 = _mm256_cvtepi8_epi16(mCoefy33); - __m256i mCoefy4 = _mm256_cvtepi8_epi16(mCoefy44); -+ const int shift = 12; - - while (height > 0) { - __m128i s0, s1; - //hor -- s0 = _mm_loadu_si128((__m128i*)(src)); -+ s0 = _mm_loadu_si128((__m128i*)(src)); - s1 = _mm_loadu_si128((__m128i*)(src + i_src)); - T0 = _mm256_set_m128i(s1, s0); - -+ src += i_src2; -+ -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -+ - r0 = _mm256_shuffle_epi8(T0, mSwitch1); - r1 = _mm256_shuffle_epi8(T0, mSwitch2); - r2 = _mm256_shuffle_epi8(T0, mSwitch3); - r3 = _mm256_shuffle_epi8(T0, mSwitch4); - -- src += i_src2; -- - T0 = _mm256_maddubs_epi16(r0, mCoefy1_hor); - T1 = _mm256_maddubs_epi16(r1, mCoefy2_hor); - T2 = _mm256_maddubs_epi16(r2, mCoefy3_hor); - T3 = _mm256_maddubs_epi16(r3, mCoefy4_hor); - -- s0 = _mm_loadu_si128((__m128i*)(src)); -+ s0 = _mm_loadu_si128((__m128i*)(src)); - s1 = _mm_loadu_si128((__m128i*)(src + i_src)); - - T0 = _mm256_add_epi16(T0, T1); - T1 = _mm256_add_epi16(T2, T3); - mVal[4] = _mm256_add_epi16(T0, T1); - -+ src += i_src2; -+ - T0 = _mm256_set_m128i(s1, s0); - -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -+ - r0 = _mm256_shuffle_epi8(T0, mSwitch1); - r1 = _mm256_shuffle_epi8(T0, mSwitch2); - r2 = _mm256_shuffle_epi8(T0, mSwitch3); -@@ -2303,8 +2307,6 @@ void uavs3d_if_hor_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_d - T1 = _mm256_add_epi16(T2, T3); - mVal[5] = _mm256_add_epi16(T0, T1); - -- src += i_src2; -- - T0 = _mm256_permute2x128_si256(mVal[0], mVal[1], 0x21); - T1 = mVal[1]; - T2 = _mm256_permute2x128_si256(mVal[1], mVal[2], 0x21); -@@ -2352,10 +2354,9 @@ void uavs3d_if_hor_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_d - - T0 = _mm256_packs_epi32(T0, T4); - s0 = _mm_packus_epi16(_mm256_castsi256_si128(T0), _mm256_extracti128_si256(T0, 1)); -- s1 = _mm_srli_si128(s0, 8); - - _mm_storel_epi64((__m128i*)(dst), s0); -- _mm_storel_epi64((__m128i*)(dst + i_dst), s1); -+ _mm_storeh_pi((__m64*)(dst + i_dst), _mm_castsi128_ps(s0)); - - r4 = _mm256_unpacklo_epi16(T8, T9); - r9 = _mm256_unpackhi_epi16(T8, T9); -@@ -2382,13 +2383,12 @@ void uavs3d_if_hor_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_d - - T0 = _mm256_packs_epi32(T0, T4); - s0 = _mm_packus_epi16(_mm256_castsi256_si128(T0), _mm256_extracti128_si256(T0, 1)); -- s1 = _mm_srli_si128(s0, 8); - -+ height -= 4; - _mm_storel_epi64((__m128i*)(dst + i_dst * 2), s0); -- _mm_storel_epi64((__m128i*)(dst + i_dst * 3), s1); -+ _mm_storeh_pi((__m64*)(dst + i_dst * 3), _mm_castsi128_ps(s0)); - - dst += i_dst << 2; -- height -= 4; - } - } - } -@@ -2397,7 +2397,6 @@ void uavs3d_if_hor_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ - { - ALIGNED_32(s16 tmp_res[(128 + 7) * 16]); - s16 *tmp = tmp_res; -- int row; - __m256i mVal1, mVal2, mVal; - __m256i T0, T1, T2, T3, T4, T5, T6, T7, T8, T9; - __m256i S0, S1, S2, S3, S4, S5, S6, S7, S8, S9, S10; -@@ -2406,6 +2405,7 @@ void uavs3d_if_hor_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ - - //HOR - { -+ int row; - __m256i mSwitch1 = _mm256_setr_epi8(0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8); - __m256i mSwitch2 = _mm256_setr_epi8(2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10); - __m256i mSwitch3 = _mm256_setr_epi8(4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12); -@@ -2421,8 +2421,9 @@ void uavs3d_if_hor_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ - row = height + 7; - while (row--) { - S = _mm256_loadu_si256((__m256i*)(src)); -- uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -+ src += i_src; - S0 = _mm256_permute4x64_epi64(S, 0x94); -+ uavs3d_prefetch(src, _MM_HINT_NTA); - - r0 = _mm256_shuffle_epi8(S0, mSwitch1); - r1 = _mm256_shuffle_epi8(S0, mSwitch2); -@@ -2438,9 +2439,8 @@ void uavs3d_if_hor_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ - T1 = _mm256_add_epi16(T2, T3); - sum = _mm256_add_epi16(T0, T1); - -- _mm256_storeu_si256((__m256i*)(tmp), sum); -+ _mm256_store_si256((__m256i*)(tmp), sum); - -- src += i_src; - tmp += 16; - } - } -@@ -2603,9 +2603,9 @@ void uavs3d_if_hor_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ - mVal = _mm256_packs_epi32(mVal1, mVal2); - _mm_storeu_si128((__m128i*)(dst + 3 * i_dst), _mm_packus_epi16(_mm256_castsi256_si128(mVal), _mm256_extracti128_si256(mVal, 1))); - -+ height -= 4; - tmp += 4 * i_tmp; - dst += 4 * i_dst; -- height -= 4; - } - } - } -@@ -2614,10 +2614,10 @@ void uavs3d_if_hor_ver_luma_w32_avx2(const pel *src, int i_src, pel *dst, int i_ - { - ALIGNED_32(s16 tmp_res[(128 + 7) * 32]); - s16 *tmp = tmp_res; -- int row, col; - const int i_tmp = 32; - //HOR - { -+ int row; - __m256i mSwitch1 = _mm256_setr_epi8(0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8); - __m256i mSwitch2 = _mm256_setr_epi8(2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10); - __m256i mSwitch3 = _mm256_setr_epi8(4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12); -@@ -2629,26 +2629,25 @@ void uavs3d_if_hor_ver_luma_w32_avx2(const pel *src, int i_src, pel *dst, int i_ - __m256i mCoefy4_hor = _mm256_set1_epi16(*(s16*)(coef_x + 6)); - - __m256i T0, T1, T2, T3, T4, T5, T6, T7; -- __m256i S0, S1, S2, S3; -+ __m256i S0, S1; - - src = src - 3 * i_src - 3; - - row = height + 7; - while (row--) { -- uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - S0 = _mm256_loadu_si256((__m256i*)(src)); - S1 = _mm256_loadu_si256((__m256i*)(src + 8)); -- S2 = _mm256_insertf128_si256(S0, _mm256_castsi256_si128(S1), 0x1); -- S3 = _mm256_insertf128_si256(S1, _mm256_extracti128_si256(S0, 1), 0x0); -- -- T0 = _mm256_shuffle_epi8(S2, mSwitch1); -- T1 = _mm256_shuffle_epi8(S2, mSwitch2); -- T2 = _mm256_shuffle_epi8(S2, mSwitch3); -- T3 = _mm256_shuffle_epi8(S2, mSwitch4); -- T4 = _mm256_shuffle_epi8(S3, mSwitch1); -- T5 = _mm256_shuffle_epi8(S3, mSwitch2); -- T6 = _mm256_shuffle_epi8(S3, mSwitch3); -- T7 = _mm256_shuffle_epi8(S3, mSwitch4); -+ src += i_src; -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ -+ T0 = _mm256_shuffle_epi8(S0, mSwitch1); -+ T1 = _mm256_shuffle_epi8(S0, mSwitch2); -+ T2 = _mm256_shuffle_epi8(S0, mSwitch3); -+ T3 = _mm256_shuffle_epi8(S0, mSwitch4); -+ T4 = _mm256_shuffle_epi8(S1, mSwitch1); -+ T5 = _mm256_shuffle_epi8(S1, mSwitch2); -+ T6 = _mm256_shuffle_epi8(S1, mSwitch3); -+ T7 = _mm256_shuffle_epi8(S1, mSwitch4); - - T0 = _mm256_maddubs_epi16(T0, mCoefy1_hor); - T1 = _mm256_maddubs_epi16(T1, mCoefy2_hor); -@@ -2666,10 +2665,11 @@ void uavs3d_if_hor_ver_luma_w32_avx2(const pel *src, int i_src, pel *dst, int i_ - T0 = _mm256_add_epi16(T0, T2); - T4 = _mm256_add_epi16(T4, T6); - -- _mm256_storeu_si256((__m256i*)(tmp), T0); -- _mm256_storeu_si256((__m256i*)(tmp + 16), T4); -+ T1 = _mm256_permute2x128_si256(T0, T4, 0x20); -+ T3 = _mm256_permute2x128_si256(T0, T4, 0x31); -+ _mm256_store_si256((__m256i*)(tmp), T1); -+ _mm256_store_si256((__m256i*)(tmp + 16), T3); - -- src += i_src; - tmp += i_tmp; - } - } -@@ -2685,8 +2685,8 @@ void uavs3d_if_hor_ver_luma_w32_avx2(const pel *src, int i_src, pel *dst, int i_ - const int i_tmp8 = 32 * 8; - const int i_tmp9 = 32 * 9; - const int i_tmp10 = 32 * 10; -- -- int shift = 12; -+ int col; -+ const int shift = 12; - __m256i mAddOffset = _mm256_set1_epi32(1 << 11); - __m128i mCoefy11 = _mm_set1_epi16(*(s16*)coef_y); - __m128i mCoefy22 = _mm_set1_epi16(*(s16*)(coef_y + 2)); -@@ -2850,7 +2850,6 @@ void uavs3d_if_hor_ver_luma_w32x_avx2(const pel *src, int i_src, pel *dst, int i - { - ALIGNED_32(s16 tmp_res[(128 + 7) * 128]); - s16 *tmp = tmp_res; -- int row, col; - const int i_tmp = width; - __m256i mVal1, mVal2, mVal; - __m256i T0, T1, T2, T3, T4, T5, T6, T7, T8, T9; -@@ -2859,6 +2858,7 @@ void uavs3d_if_hor_ver_luma_w32x_avx2(const pel *src, int i_src, pel *dst, int i - - //HOR - { -+ int row, col; - __m256i mSwitch1 = _mm256_setr_epi8(0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8); - __m256i mSwitch2 = _mm256_setr_epi8(2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10); - __m256i mSwitch3 = _mm256_setr_epi8(4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12); -@@ -2878,17 +2878,15 @@ void uavs3d_if_hor_ver_luma_w32x_avx2(const pel *src, int i_src, pel *dst, int i - { - S0 = _mm256_loadu_si256((__m256i*)(src + col)); - S1 = _mm256_loadu_si256((__m256i*)(src + col + 8)); -- S2 = _mm256_insertf128_si256(S0, _mm256_castsi256_si128(S1), 0x1); -- S3 = _mm256_insertf128_si256(S1, _mm256_extracti128_si256(S0, 1), 0x0); -- -- T0 = _mm256_shuffle_epi8(S2, mSwitch1); -- T1 = _mm256_shuffle_epi8(S2, mSwitch2); -- T2 = _mm256_shuffle_epi8(S2, mSwitch3); -- T3 = _mm256_shuffle_epi8(S2, mSwitch4); -- T4 = _mm256_shuffle_epi8(S3, mSwitch1); -- T5 = _mm256_shuffle_epi8(S3, mSwitch2); -- T6 = _mm256_shuffle_epi8(S3, mSwitch3); -- T7 = _mm256_shuffle_epi8(S3, mSwitch4); -+ -+ T0 = _mm256_shuffle_epi8(S0, mSwitch1); -+ T1 = _mm256_shuffle_epi8(S0, mSwitch2); -+ T2 = _mm256_shuffle_epi8(S0, mSwitch3); -+ T3 = _mm256_shuffle_epi8(S0, mSwitch4); -+ T4 = _mm256_shuffle_epi8(S1, mSwitch1); -+ T5 = _mm256_shuffle_epi8(S1, mSwitch2); -+ T6 = _mm256_shuffle_epi8(S1, mSwitch3); -+ T7 = _mm256_shuffle_epi8(S1, mSwitch4); - - T0 = _mm256_maddubs_epi16(T0, mCoefy1_hor); - T1 = _mm256_maddubs_epi16(T1, mCoefy2_hor); -@@ -2906,8 +2904,10 @@ void uavs3d_if_hor_ver_luma_w32x_avx2(const pel *src, int i_src, pel *dst, int i - T0 = _mm256_add_epi16(T0, T2); - T4 = _mm256_add_epi16(T4, T6); - -- _mm256_storeu_si256((__m256i*)(tmp + col), T0); -- _mm256_storeu_si256((__m256i*)(tmp + col + 16), T4); -+ T1 = _mm256_permute2x128_si256(T0, T4, 0x20); -+ T3 = _mm256_permute2x128_si256(T0, T4, 0x31); -+ _mm256_store_si256((__m256i*)(tmp + col), T1); -+ _mm256_store_si256((__m256i*)(tmp + col + 16), T3); - } - src += i_src; - tmp += i_tmp; -@@ -2927,6 +2927,7 @@ void uavs3d_if_hor_ver_luma_w32x_avx2(const pel *src, int i_src, pel *dst, int i - const int i_tmp10 = i_tmp5 << 1; - - int shift = 12; -+ int col; - __m256i mAddOffset = _mm256_set1_epi32(1 << 11); - __m128i mCoefy11 = _mm_set1_epi16(*(s16*)coef_y); - __m128i mCoefy22 = _mm_set1_epi16(*(s16*)(coef_y + 2)); -@@ -3186,45 +3187,121 @@ void uavs3d_if_cpy_w128_avx2(const pel *src, int i_src, pel *dst, int i_dst, int - } - } - -+void uavs3d_if_hor_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coeff, int max_val) -+{ -+ __m256i max_pel = _mm256_set1_epi16((pel)max_val); -+ __m256i T0, T1, T2, T3, T4, T5; -+ __m256i M0, M1, M2, M3, M4, M5, M6, M7; -+ __m256i S0, S1, S2; -+ __m256i offset = _mm256_set1_epi32(32); -+ __m256i mShuffle0 = _mm256_setr_epi8(0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9, 0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9); -+ __m256i mShuffle1 = _mm256_setr_epi8(4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13, 4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13); -+ __m256i mCoef0 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[0])); -+ __m256i mCoef1 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[1])); -+ __m256i mCoef2 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[2])); -+ __m256i mCoef3 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[3])); -+ __m128i s0, s1; -+ -+ src -= 3; -+ -+ while (height) { -+ T0 = _mm256_loadu_si256((__m256i*)(src)); -+ s0 = _mm_loadu_si128((__m128i*)(src + 4)); -+ T1 = _mm256_loadu_si256((__m256i*)(src + i_src)); -+ s1 = _mm_loadu_si128((__m128i*)(src + i_src + 4)); -+ height -= 2; -+ src += i_src << 1; -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -+ -+ S0 = _mm256_permute2x128_si256(T0, T1, 0x20); -+ S2 = _mm256_permute2x128_si256(T0, T1, 0x31); -+ S1 = _mm256_set_m128i(s1, s0); -+ -+ T0 = _mm256_shuffle_epi8(S0, mShuffle0); -+ T1 = _mm256_shuffle_epi8(S0, mShuffle1); -+ T2 = _mm256_shuffle_epi8(S1, mShuffle0); -+ T3 = _mm256_shuffle_epi8(S1, mShuffle1); -+ T4 = _mm256_shuffle_epi8(S2, mShuffle0); -+ T5 = _mm256_shuffle_epi8(S2, mShuffle1); -+ -+ M0 = _mm256_madd_epi16(T0, mCoef0); -+ M1 = _mm256_madd_epi16(T1, mCoef1); -+ M2 = _mm256_madd_epi16(T2, mCoef2); -+ M3 = _mm256_madd_epi16(T3, mCoef3); -+ M4 = _mm256_madd_epi16(T2, mCoef0); -+ M5 = _mm256_madd_epi16(T3, mCoef1); -+ M6 = _mm256_madd_epi16(T4, mCoef2); -+ M7 = _mm256_madd_epi16(T5, mCoef3); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); -+ M2 = _mm256_add_epi32(M4, M5); -+ M3 = _mm256_add_epi32(M6, M7); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); -+ -+ M2 = _mm256_add_epi32(M0, offset); -+ M3 = _mm256_add_epi32(M1, offset); -+ M2 = _mm256_srai_epi32(M2, 6); -+ M3 = _mm256_srai_epi32(M3, 6); -+ M2 = _mm256_packus_epi32(M2, M3); -+ M2 = _mm256_min_epu16(M2, max_pel); -+ -+ _mm_storeu_si128((__m128i*)(dst), _mm256_castsi256_si128(M2)); -+ _mm_storeu_si128((__m128i*)(dst + i_dst), _mm256_extracti128_si256(M2, 1)); -+ -+ dst += i_dst << 1; -+ } -+} -+ - void uavs3d_if_hor_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coeff, int max_val) - { - __m256i max_pel = _mm256_set1_epi16((pel)max_val); -- __m256i T0, T1, T2, T3, T4, T5, T6, T7; -+ __m256i T0, T1, T2, T3, T4, T5; - __m256i M0, M1, M2, M3, M4, M5, M6, M7; -+ __m256i S0, S1, S2; - __m256i offset = _mm256_set1_epi32(32); -- s32* coef = (s32*)coeff; -- __m128i mCoef0 = _mm_setr_epi32(coef[0], coef[1], coef[0], coef[1]); -- __m256i mCoef = _mm256_cvtepi8_epi16(mCoef0); -+ __m256i mShuffle0 = _mm256_setr_epi8(0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9, 0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9); -+ __m256i mShuffle1 = _mm256_setr_epi8(4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13, 4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13); -+ __m256i mCoef0 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[0])); -+ __m256i mCoef1 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[1])); -+ __m256i mCoef2 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[2])); -+ __m256i mCoef3 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[3])); - - src -= 3; - - while (height--) { -- uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -- T0 = _mm256_loadu_si256((__m256i*)(src + 0)); -- T1 = _mm256_loadu_si256((__m256i*)(src + 1)); -- T2 = _mm256_loadu_si256((__m256i*)(src + 2)); -- T3 = _mm256_loadu_si256((__m256i*)(src + 3)); -- T4 = _mm256_loadu_si256((__m256i*)(src + 4)); -- T5 = _mm256_loadu_si256((__m256i*)(src + 5)); -- T6 = _mm256_loadu_si256((__m256i*)(src + 6)); -- T7 = _mm256_loadu_si256((__m256i*)(src + 7)); -- -- M0 = _mm256_madd_epi16(T0, mCoef); -- M1 = _mm256_madd_epi16(T1, mCoef); -- M2 = _mm256_madd_epi16(T2, mCoef); -- M3 = _mm256_madd_epi16(T3, mCoef); -- M4 = _mm256_madd_epi16(T4, mCoef); -- M5 = _mm256_madd_epi16(T5, mCoef); -- M6 = _mm256_madd_epi16(T6, mCoef); -- M7 = _mm256_madd_epi16(T7, mCoef); -- -- M0 = _mm256_hadd_epi32(M0, M1); -- M1 = _mm256_hadd_epi32(M2, M3); -- M2 = _mm256_hadd_epi32(M4, M5); -- M3 = _mm256_hadd_epi32(M6, M7); -- -- M0 = _mm256_hadd_epi32(M0, M1); -- M1 = _mm256_hadd_epi32(M2, M3); -+ S0 = _mm256_lddqu_si256((__m256i*)(src)); -+ S1 = _mm256_loadu_si256((__m256i*)(src + 4)); -+ S2 = _mm256_loadu_si256((__m256i*)(src + 8)); -+ -+ src += i_src; -+ T0 = _mm256_shuffle_epi8(S0, mShuffle0); -+ T1 = _mm256_shuffle_epi8(S0, mShuffle1); -+ T2 = _mm256_shuffle_epi8(S1, mShuffle0); -+ T3 = _mm256_shuffle_epi8(S1, mShuffle1); -+ T4 = _mm256_shuffle_epi8(S2, mShuffle0); -+ T5 = _mm256_shuffle_epi8(S2, mShuffle1); -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ -+ M0 = _mm256_madd_epi16(T0, mCoef0); -+ M1 = _mm256_madd_epi16(T1, mCoef1); -+ M2 = _mm256_madd_epi16(T2, mCoef2); -+ M3 = _mm256_madd_epi16(T3, mCoef3); -+ M4 = _mm256_madd_epi16(T2, mCoef0); -+ M5 = _mm256_madd_epi16(T3, mCoef1); -+ M6 = _mm256_madd_epi16(T4, mCoef2); -+ M7 = _mm256_madd_epi16(T5, mCoef3); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); -+ M2 = _mm256_add_epi32(M4, M5); -+ M3 = _mm256_add_epi32(M6, M7); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); - - M2 = _mm256_add_epi32(M0, offset); - M3 = _mm256_add_epi32(M1, offset); -@@ -3235,7 +3312,6 @@ void uavs3d_if_hor_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, - - _mm256_storeu_si256((__m256i*)(dst), M2); - -- src += i_src; - dst += i_dst; - } - } -@@ -3244,12 +3320,16 @@ void uavs3d_if_hor_luma_w16x_avx2(const pel *src, int i_src, pel *dst, int i_dst - { - int col; - __m256i max_pel = _mm256_set1_epi16((pel)max_val); -- __m256i T0, T1, T2, T3, T4, T5, T6, T7; -+ __m256i T0, T1, T2, T3, T4, T5; - __m256i M0, M1, M2, M3, M4, M5, M6, M7; -+ __m256i S0, S1, S2; - __m256i offset = _mm256_set1_epi32(32); -- s32 *coef = (s32*)coeff; -- __m128i mCoef0 = _mm_setr_epi32(coef[0], coef[1], coef[0], coef[1]); -- __m256i mCoef = _mm256_cvtepi8_epi16(mCoef0); -+ __m256i mShuffle0 = _mm256_setr_epi8(0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9, 0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9); -+ __m256i mShuffle1 = _mm256_setr_epi8(4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13, 4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13); -+ __m256i mCoef0 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[0])); -+ __m256i mCoef1 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[1])); -+ __m256i mCoef2 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[2])); -+ __m256i mCoef3 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coeff)[3])); - - src -= 3; - -@@ -3258,31 +3338,33 @@ void uavs3d_if_hor_luma_w16x_avx2(const pel *src, int i_src, pel *dst, int i_dst - uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - for (col = 0; col < width; col += 16) - { -- T0 = _mm256_loadu_si256((__m256i*)(p_src + 0)); -- T1 = _mm256_loadu_si256((__m256i*)(p_src + 1)); -- T2 = _mm256_loadu_si256((__m256i*)(p_src + 2)); -- T3 = _mm256_loadu_si256((__m256i*)(p_src + 3)); -- T4 = _mm256_loadu_si256((__m256i*)(p_src + 4)); -- T5 = _mm256_loadu_si256((__m256i*)(p_src + 5)); -- T6 = _mm256_loadu_si256((__m256i*)(p_src + 6)); -- T7 = _mm256_loadu_si256((__m256i*)(p_src + 7)); -- -- M0 = _mm256_madd_epi16(T0, mCoef); -- M1 = _mm256_madd_epi16(T1, mCoef); -- M2 = _mm256_madd_epi16(T2, mCoef); -- M3 = _mm256_madd_epi16(T3, mCoef); -- M4 = _mm256_madd_epi16(T4, mCoef); -- M5 = _mm256_madd_epi16(T5, mCoef); -- M6 = _mm256_madd_epi16(T6, mCoef); -- M7 = _mm256_madd_epi16(T7, mCoef); -- -- M0 = _mm256_hadd_epi32(M0, M1); -- M1 = _mm256_hadd_epi32(M2, M3); -- M2 = _mm256_hadd_epi32(M4, M5); -- M3 = _mm256_hadd_epi32(M6, M7); -- -- M0 = _mm256_hadd_epi32(M0, M1); -- M1 = _mm256_hadd_epi32(M2, M3); -+ S0 = _mm256_loadu_si256((__m256i*)(p_src)); -+ S1 = _mm256_loadu_si256((__m256i*)(p_src + 4)); -+ S2 = _mm256_loadu_si256((__m256i*)(p_src + 8)); -+ -+ T0 = _mm256_shuffle_epi8(S0, mShuffle0); -+ T1 = _mm256_shuffle_epi8(S0, mShuffle1); -+ T2 = _mm256_shuffle_epi8(S1, mShuffle0); -+ T3 = _mm256_shuffle_epi8(S1, mShuffle1); -+ T4 = _mm256_shuffle_epi8(S2, mShuffle0); -+ T5 = _mm256_shuffle_epi8(S2, mShuffle1); -+ -+ M0 = _mm256_madd_epi16(T0, mCoef0); -+ M1 = _mm256_madd_epi16(T1, mCoef1); -+ M2 = _mm256_madd_epi16(T2, mCoef2); -+ M3 = _mm256_madd_epi16(T3, mCoef3); -+ M4 = _mm256_madd_epi16(T2, mCoef0); -+ M5 = _mm256_madd_epi16(T3, mCoef1); -+ M6 = _mm256_madd_epi16(T4, mCoef2); -+ M7 = _mm256_madd_epi16(T5, mCoef3); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); -+ M2 = _mm256_add_epi32(M4, M5); -+ M3 = _mm256_add_epi32(M6, M7); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); - - M2 = _mm256_add_epi32(M0, offset); - M3 = _mm256_add_epi32(M1, offset); -@@ -3299,6 +3381,47 @@ void uavs3d_if_hor_luma_w16x_avx2(const pel *src, int i_src, pel *dst, int i_dst - } - } - -+void uavs3d_if_hor_chroma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coeff, int max_val) -+{ -+ const int offset = 32; -+ const int shift = 6; -+ -+ __m128i coef0 = _mm_cvtepi8_epi16(_mm_set1_epi16(((s16*)coeff)[0])); -+ __m128i coef1 = _mm_cvtepi8_epi16(_mm_set1_epi16(((s16*)coeff)[1])); -+ __m256i mCoef0 = _mm256_set_m128i(coef1, coef0); -+ __m256i mCoef1 = _mm256_set_m128i(coef0, coef1); -+ __m256i mSwitch = _mm256_setr_epi8(0, 1, 4, 5, 2, 3, 6, 7, 4, 5, 8, 9, 6, 7, 10, 11, 0, 1, 4, 5, 2, 3, 6, 7, 4, 5, 8, 9, 6, 7, 10, 11); -+ __m256i mAddOffset = _mm256_set1_epi32((s16)offset); -+ __m256i T0, T1, S0, S1; -+ __m256i max_pel = _mm256_set1_epi16((pel)max_val); -+ __m128i s0; -+ -+ src -= 2; -+ -+ while (height--) { -+ uavs3d_prefetch(src + i_src * 2, _MM_HINT_NTA); -+ S0 = _mm256_loadu_si256((__m256i*)(src)); -+ s0 = _mm_loadu_si128((__m128i*)(src + 4)); -+ src += i_src; -+ S1 = _mm256_set_m128i(s0, s0); -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ T0 = _mm256_shuffle_epi8(S0, mSwitch); -+ T1 = _mm256_shuffle_epi8(S1, mSwitch); -+ T0 = _mm256_madd_epi16(T0, mCoef0); -+ T1 = _mm256_madd_epi16(T1, mCoef1); -+ T0 = _mm256_add_epi32(T0, T1); -+ -+ T0 = _mm256_add_epi32(T0, mAddOffset); -+ T0 = _mm256_srai_epi32(T0, shift); -+ T0 = _mm256_min_epu16(T0, max_pel); -+ s0 = _mm_packus_epi32(_mm256_castsi256_si128(T0), _mm256_extracti128_si256(T0, 1)); -+ -+ _mm_storeu_si128((__m128i*)(dst), s0); -+ -+ dst += i_dst; -+ } -+} -+ - void uavs3d_if_hor_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coeff, int max_val) - { - const int offset = 32; -@@ -3310,7 +3433,7 @@ void uavs3d_if_hor_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ds - __m256i mCoef1 = _mm256_cvtepi8_epi16(coef1); - __m256i mSwitch = _mm256_setr_epi8(0, 1, 4, 5, 2, 3, 6, 7, 4, 5, 8, 9, 6, 7, 10, 11, 0, 1, 4, 5, 2, 3, 6, 7, 4, 5, 8, 9, 6, 7, 10, 11); - __m256i mAddOffset = _mm256_set1_epi32((s16)offset); -- __m256i T0, T1, T2, T3, S0, S1, S2, S3; -+ __m256i T0, T1, T2, T3, S0, S1, S2; - __m256i max_pel = _mm256_set1_epi16((pel)max_val); - - src -= 2; -@@ -3320,15 +3443,14 @@ void uavs3d_if_hor_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ds - S0 = _mm256_loadu_si256((__m256i*)(src)); - S1 = _mm256_loadu_si256((__m256i*)(src + 4)); - S2 = _mm256_loadu_si256((__m256i*)(src + 8)); -- S3 = _mm256_loadu_si256((__m256i*)(src + 12)); -- S0 = _mm256_permute4x64_epi64(S0, 0x94); -- S1 = _mm256_permute4x64_epi64(S1, 0x94); -- S2 = _mm256_permute4x64_epi64(S2, 0x94); -- S3 = _mm256_permute4x64_epi64(S3, 0x94); -- T0 = _mm256_madd_epi16(_mm256_shuffle_epi8(S0, mSwitch), mCoef0); -- T1 = _mm256_madd_epi16(_mm256_shuffle_epi8(S1, mSwitch), mCoef1); -- T2 = _mm256_madd_epi16(_mm256_shuffle_epi8(S2, mSwitch), mCoef0); -- T3 = _mm256_madd_epi16(_mm256_shuffle_epi8(S3, mSwitch), mCoef1); -+ T0 = _mm256_shuffle_epi8(S0, mSwitch); -+ T1 = _mm256_shuffle_epi8(S1, mSwitch); -+ T2 = _mm256_shuffle_epi8(S1, mSwitch); -+ T3 = _mm256_shuffle_epi8(S2, mSwitch); -+ T0 = _mm256_madd_epi16(T0, mCoef0); -+ T1 = _mm256_madd_epi16(T1, mCoef1); -+ T2 = _mm256_madd_epi16(T2, mCoef0); -+ T3 = _mm256_madd_epi16(T3, mCoef1); - T0 = _mm256_add_epi32(T0, T1); - T2 = _mm256_add_epi32(T2, T3); - -@@ -3337,7 +3459,6 @@ void uavs3d_if_hor_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ds - T0 = _mm256_srai_epi32(T0, shift); - T2 = _mm256_srai_epi32(T2, shift); - T0 = _mm256_packus_epi32(T0, T2); -- T0 = _mm256_permute4x64_epi64(T0, 0xd8); - - T0 = _mm256_min_epu16(T0, max_pel); - _mm256_storeu_si256((__m256i*)(dst), T0); -@@ -3359,7 +3480,7 @@ void uavs3d_if_hor_chroma_w16x_avx2(const pel *src, int i_src, pel *dst, int i_d - __m256i mCoef1 = _mm256_cvtepi8_epi16(coef1); - __m256i mSwitch = _mm256_setr_epi8(0, 1, 4, 5, 2, 3, 6, 7, 4, 5, 8, 9, 6, 7, 10, 11, 0, 1, 4, 5, 2, 3, 6, 7, 4, 5, 8, 9, 6, 7, 10, 11); - __m256i mAddOffset = _mm256_set1_epi32((s16)offset); -- __m256i T0, T1, T2, T3, S0, S1, S2, S3; -+ __m256i T0, T1, T2, T3, S0, S1, S2; - __m256i max_pel = _mm256_set1_epi16((pel)max_val); - - src -= 2; -@@ -3370,15 +3491,14 @@ void uavs3d_if_hor_chroma_w16x_avx2(const pel *src, int i_src, pel *dst, int i_d - S0 = _mm256_loadu_si256((__m256i*)(src + col)); - S1 = _mm256_loadu_si256((__m256i*)(src + col + 4)); - S2 = _mm256_loadu_si256((__m256i*)(src + col + 8)); -- S3 = _mm256_loadu_si256((__m256i*)(src + col + 12)); -- S0 = _mm256_permute4x64_epi64(S0, 0x94); -- S1 = _mm256_permute4x64_epi64(S1, 0x94); -- S2 = _mm256_permute4x64_epi64(S2, 0x94); -- S3 = _mm256_permute4x64_epi64(S3, 0x94); -- T0 = _mm256_madd_epi16(_mm256_shuffle_epi8(S0, mSwitch), mCoef0); -- T1 = _mm256_madd_epi16(_mm256_shuffle_epi8(S1, mSwitch), mCoef1); -- T2 = _mm256_madd_epi16(_mm256_shuffle_epi8(S2, mSwitch), mCoef0); -- T3 = _mm256_madd_epi16(_mm256_shuffle_epi8(S3, mSwitch), mCoef1); -+ T0 = _mm256_shuffle_epi8(S0, mSwitch); -+ T1 = _mm256_shuffle_epi8(S1, mSwitch); -+ T2 = _mm256_shuffle_epi8(S1, mSwitch); -+ T3 = _mm256_shuffle_epi8(S2, mSwitch); -+ T0 = _mm256_madd_epi16(T0, mCoef0); -+ T1 = _mm256_madd_epi16(T1, mCoef1); -+ T2 = _mm256_madd_epi16(T2, mCoef0); -+ T3 = _mm256_madd_epi16(T3, mCoef1); - T0 = _mm256_add_epi32(T0, T1); - T2 = _mm256_add_epi32(T2, T3); - -@@ -3387,9 +3507,8 @@ void uavs3d_if_hor_chroma_w16x_avx2(const pel *src, int i_src, pel *dst, int i_d - T0 = _mm256_srai_epi32(T0, shift); - T2 = _mm256_srai_epi32(T2, shift); - T0 = _mm256_packus_epi32(T0, T2); -- T0 = _mm256_permute4x64_epi64(T0, 0xd8); -- - T0 = _mm256_min_epu16(T0, max_pel); -+ - _mm256_storeu_si256((__m256i*)(dst + col), T0); - } - src += i_src; -@@ -3397,6 +3516,93 @@ void uavs3d_if_hor_chroma_w16x_avx2(const pel *src, int i_src, pel *dst, int i_d - } - } - -+void uavs3d_if_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coeff, int max_val) -+{ -+ const int i_src2 = i_src * 2; -+ const int i_src3 = i_src * 3; -+ const int i_src4 = i_src * 4; -+ const int i_src5 = i_src * 5; -+ const int i_src6 = i_src * 6; -+ const int i_src7 = i_src * 7; -+ __m128i coeff0 = _mm_set1_epi16(*(s16*)coeff); -+ __m128i coeff1 = _mm_set1_epi16(*(s16*)(coeff + 2)); -+ __m128i coeff2 = _mm_set1_epi16(*(s16*)(coeff + 4)); -+ __m128i coeff3 = _mm_set1_epi16(*(s16*)(coeff + 6)); -+ __m256i max_pel = _mm256_set1_epi16((pel)max_val); -+ __m256i mAddOffset = _mm256_set1_epi32(32); -+ __m128i s0, s1, s2, s3, s4, s5, s6, s7, s8; -+ __m256i T0, T1, T2, T3, T4, T5, T6, T7; -+ __m256i N0, N1, N2, N3, N4, N5, N6, N7; -+ __m256i coeff00 = _mm256_cvtepi8_epi16(coeff0); -+ __m256i coeff01 = _mm256_cvtepi8_epi16(coeff1); -+ __m256i coeff02 = _mm256_cvtepi8_epi16(coeff2); -+ __m256i coeff03 = _mm256_cvtepi8_epi16(coeff3); -+ -+ src -= i_src3; -+ -+ while (height > 0) { -+ s0 = _mm_loadu_si128((__m128i*)(src)); -+ s1 = _mm_loadu_si128((__m128i*)(src + i_src)); -+ s2 = _mm_loadu_si128((__m128i*)(src + i_src2)); -+ s3 = _mm_loadu_si128((__m128i*)(src + i_src3)); -+ s4 = _mm_loadu_si128((__m128i*)(src + i_src4)); -+ s5 = _mm_loadu_si128((__m128i*)(src + i_src5)); -+ s6 = _mm_loadu_si128((__m128i*)(src + i_src6)); -+ s7 = _mm_loadu_si128((__m128i*)(src + i_src7)); -+ s8 = _mm_loadu_si128((__m128i*)(src + (i_src << 3))); -+ -+ height -= 2; -+ src += i_src2; -+ uavs3d_prefetch(src + i_src7, _MM_HINT_NTA); -+ -+ T0 = _mm256_set_m128i(s1, s0); -+ T1 = _mm256_set_m128i(s2, s1); -+ T2 = _mm256_set_m128i(s3, s2); -+ T3 = _mm256_set_m128i(s4, s3); -+ T4 = _mm256_set_m128i(s5, s4); -+ T5 = _mm256_set_m128i(s6, s5); -+ T6 = _mm256_set_m128i(s7, s6); -+ T7 = _mm256_set_m128i(s8, s7); -+ -+ N0 = _mm256_unpacklo_epi16(T0, T1); -+ N1 = _mm256_unpacklo_epi16(T2, T3); -+ N2 = _mm256_unpacklo_epi16(T4, T5); -+ N3 = _mm256_unpacklo_epi16(T6, T7); -+ N4 = _mm256_unpackhi_epi16(T0, T1); -+ N5 = _mm256_unpackhi_epi16(T2, T3); -+ N6 = _mm256_unpackhi_epi16(T4, T5); -+ N7 = _mm256_unpackhi_epi16(T6, T7); -+ -+ N0 = _mm256_madd_epi16(N0, coeff00); -+ N1 = _mm256_madd_epi16(N1, coeff01); -+ N2 = _mm256_madd_epi16(N2, coeff02); -+ N3 = _mm256_madd_epi16(N3, coeff03); -+ N4 = _mm256_madd_epi16(N4, coeff00); -+ N5 = _mm256_madd_epi16(N5, coeff01); -+ N6 = _mm256_madd_epi16(N6, coeff02); -+ N7 = _mm256_madd_epi16(N7, coeff03); -+ -+ N0 = _mm256_add_epi32(N0, N1); -+ N1 = _mm256_add_epi32(N2, N3); -+ N2 = _mm256_add_epi32(N4, N5); -+ N3 = _mm256_add_epi32(N6, N7); -+ -+ N0 = _mm256_add_epi32(N0, N1); -+ N1 = _mm256_add_epi32(N2, N3); -+ -+ N0 = _mm256_add_epi32(N0, mAddOffset); -+ N1 = _mm256_add_epi32(N1, mAddOffset); -+ N0 = _mm256_srai_epi32(N0, 6); -+ N1 = _mm256_srai_epi32(N1, 6); -+ N0 = _mm256_packus_epi32(N0, N1); -+ N0 = _mm256_min_epu16(N0, max_pel); -+ _mm_storeu_si128((__m128i*)(dst), _mm256_castsi256_si128(N0)); -+ _mm_storeu_si128((__m128i*)(dst + i_dst), _mm256_extracti128_si256(N0, 1)); -+ -+ dst += i_dst << 1; -+ } -+} -+ - void uavs3d_if_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coeff, int max_val) - { - const int i_src2 = i_src * 2; -@@ -3412,7 +3618,6 @@ void uavs3d_if_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, - __m256i max_pel = _mm256_set1_epi16((pel)max_val); - __m256i mAddOffset = _mm256_set1_epi32(32); - __m256i T0, T1, T2, T3, T4, T5, T6, T7; -- __m256i M0, M1, M2, M3, M4, M5, M6, M7; - __m256i N0, N1, N2, N3, N4, N5, N6, N7; - __m256i coeff00 = _mm256_cvtepi8_epi16(coeff0); - __m256i coeff01 = _mm256_cvtepi8_epi16(coeff1); -@@ -3422,7 +3627,6 @@ void uavs3d_if_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, - src -= 3 * i_src; - - while (height--) { -- uavs3d_prefetch(src + 8 * i_src, _MM_HINT_NTA); - T0 = _mm256_loadu_si256((__m256i*)(src)); - T1 = _mm256_loadu_si256((__m256i*)(src + i_src)); - T2 = _mm256_loadu_si256((__m256i*)(src + i_src2)); -@@ -3431,24 +3635,25 @@ void uavs3d_if_ver_luma_w16_avx2(const pel *src, int i_src, pel *dst, int i_dst, - T5 = _mm256_loadu_si256((__m256i*)(src + i_src5)); - T6 = _mm256_loadu_si256((__m256i*)(src + i_src6)); - T7 = _mm256_loadu_si256((__m256i*)(src + i_src7)); -+ uavs3d_prefetch(src + 8 * i_src, _MM_HINT_NTA); - -- M0 = _mm256_unpacklo_epi16(T0, T1); -- M1 = _mm256_unpacklo_epi16(T2, T3); -- M2 = _mm256_unpacklo_epi16(T4, T5); -- M3 = _mm256_unpacklo_epi16(T6, T7); -- M4 = _mm256_unpackhi_epi16(T0, T1); -- M5 = _mm256_unpackhi_epi16(T2, T3); -- M6 = _mm256_unpackhi_epi16(T4, T5); -- M7 = _mm256_unpackhi_epi16(T6, T7); -- -- N0 = _mm256_madd_epi16(M0, coeff00); -- N1 = _mm256_madd_epi16(M1, coeff01); -- N2 = _mm256_madd_epi16(M2, coeff02); -- N3 = _mm256_madd_epi16(M3, coeff03); -- N4 = _mm256_madd_epi16(M4, coeff00); -- N5 = _mm256_madd_epi16(M5, coeff01); -- N6 = _mm256_madd_epi16(M6, coeff02); -- N7 = _mm256_madd_epi16(M7, coeff03); -+ N0 = _mm256_unpacklo_epi16(T0, T1); -+ N1 = _mm256_unpacklo_epi16(T2, T3); -+ N2 = _mm256_unpacklo_epi16(T4, T5); -+ N3 = _mm256_unpacklo_epi16(T6, T7); -+ N4 = _mm256_unpackhi_epi16(T0, T1); -+ N5 = _mm256_unpackhi_epi16(T2, T3); -+ N6 = _mm256_unpackhi_epi16(T4, T5); -+ N7 = _mm256_unpackhi_epi16(T6, T7); -+ -+ N0 = _mm256_madd_epi16(N0, coeff00); -+ N1 = _mm256_madd_epi16(N1, coeff01); -+ N2 = _mm256_madd_epi16(N2, coeff02); -+ N3 = _mm256_madd_epi16(N3, coeff03); -+ N4 = _mm256_madd_epi16(N4, coeff00); -+ N5 = _mm256_madd_epi16(N5, coeff01); -+ N6 = _mm256_madd_epi16(N6, coeff02); -+ N7 = _mm256_madd_epi16(N7, coeff03); - - N0 = _mm256_add_epi32(N0, N1); - N1 = _mm256_add_epi32(N2, N3); -@@ -3568,20 +3773,23 @@ void uavs3d_if_ver_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ds - - while (height) { - __m256i S0, S1, S2, S3, S4; -- uavs3d_prefetch(src + 5 * i_src, _MM_HINT_NTA); -- uavs3d_prefetch(src + 6 * i_src, _MM_HINT_NTA); -- height -= 2; - S0 = _mm256_loadu_si256((__m256i*)(src)); - S1 = _mm256_loadu_si256((__m256i*)(src + i_src)); - S2 = _mm256_loadu_si256((__m256i*)(src + i_src2)); - S3 = _mm256_loadu_si256((__m256i*)(src + i_src3)); - S4 = _mm256_loadu_si256((__m256i*)(src + i_src4)); - -+ height -= 2; -+ src += i_src2; -+ - T0 = _mm256_unpacklo_epi16(S0, S1); - T1 = _mm256_unpackhi_epi16(S0, S1); - T2 = _mm256_unpacklo_epi16(S2, S3); - T3 = _mm256_unpackhi_epi16(S2, S3); - -+ uavs3d_prefetch(src + i_src3, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src4, _MM_HINT_NTA); -+ - T0 = _mm256_madd_epi16(T0, coeff0); - T1 = _mm256_madd_epi16(T1, coeff0); - T2 = _mm256_madd_epi16(T2, coeff1); -@@ -3621,7 +3829,6 @@ void uavs3d_if_ver_chroma_w16_avx2(const pel *src, int i_src, pel *dst, int i_ds - mVal1 = _mm256_min_epu16(mVal1, max_pel); - _mm256_storeu_si256((__m256i*)(dst + i_dst), mVal1); - -- src += 2 * i_src; - dst += 2 * i_dst; - } - } -@@ -3645,9 +3852,6 @@ void uavs3d_if_ver_chroma_w32_avx2(const pel *src, int i_src, pel *dst, int i_ds - src -= i_src; - - while (height) { -- uavs3d_prefetch(src + 5 * i_src, _MM_HINT_NTA); -- uavs3d_prefetch(src + 6 * i_src, _MM_HINT_NTA); -- height -= 2; - S0 = _mm256_loadu_si256((__m256i*)(src)); - S5 = _mm256_loadu_si256((__m256i*)(src + 16)); - S1 = _mm256_loadu_si256((__m256i*)(src + i_src)); -@@ -3659,6 +3863,9 @@ void uavs3d_if_ver_chroma_w32_avx2(const pel *src, int i_src, pel *dst, int i_ds - S4 = _mm256_loadu_si256((__m256i*)(src + i_src4)); - S9 = _mm256_loadu_si256((__m256i*)(src + i_src4 + 16)); - -+ height -= 2; -+ src += i_src2; -+ - T0 = _mm256_unpacklo_epi16(S0, S1); - T1 = _mm256_unpackhi_epi16(S0, S1); - T2 = _mm256_unpacklo_epi16(S2, S3); -@@ -3668,6 +3875,9 @@ void uavs3d_if_ver_chroma_w32_avx2(const pel *src, int i_src, pel *dst, int i_ds - T6 = _mm256_unpacklo_epi16(S7, S8); - T7 = _mm256_unpackhi_epi16(S7, S8); - -+ uavs3d_prefetch(src + i_src3, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src4, _MM_HINT_NTA); -+ - T0 = _mm256_madd_epi16(T0, coeff0); - T1 = _mm256_madd_epi16(T1, coeff0); - T2 = _mm256_madd_epi16(T2, coeff1); -@@ -3738,7 +3948,6 @@ void uavs3d_if_ver_chroma_w32_avx2(const pel *src, int i_src, pel *dst, int i_ds - _mm256_storeu_si256((__m256i*)(dst + i_dst), T0); - _mm256_storeu_si256((__m256i*)(dst + i_dst + 16), T2); - -- src += 2 * i_src; - dst += 2 * i_dst; - } - } -@@ -3820,22 +4029,18 @@ void uavs3d_if_ver_chroma_w32x_avx2(const pel *src, int i_src, pel *dst, int i_d - } - } - --void uavs3d_if_hor_ver_luma_w16x_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coef_x, const s8 *coef_y, int max_val) -+void uavs3d_if_hor_ver_luma_w4_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coef_x, const s8 *coef_y, int max_val) - { -- ALIGNED_32(s16 tmp_res[(128 + 7) * 128]); -+ ALIGNED_32(s16 tmp_res[(32 + 7) * 4]); - s16 *tmp = tmp_res; -- int row, i;; -+ int row; - int add1, shift1; - int add2, shift2; -- __m128i mCoef0; -- __m256i mCoef, offset; -- __m256i T0, T1, T2, T3, T4, T5, T6, T7; -- __m256i M0, M1, M2, M3, M4, M5, M6, M7; -- __m256i N0, N1, N2, N3, N4, N5, N6, N7; -- int i_tmp = width; -- s32 * coef; -- __m128i coeff0, coeff1, coeff2, coeff3; -- __m256i coeff00, coeff01, coeff02, coeff03; -+ __m256i offset; -+ __m256i T0, T1, T2, T3; -+ __m256i M0, M1, M2, M3; -+ const int i_tmp = 4; -+ __m256i mCoef0, mCoef1, mCoef2, mCoef3; - __m256i max_pel = _mm256_set1_epi16((pel)max_val); - - if (max_val == 255) { // 8 bit_depth -@@ -3851,80 +4056,311 @@ void uavs3d_if_hor_ver_luma_w16x_avx2(const pel *src, int i_src, pel *dst, int i - add2 = 1 << (shift2 - 1); - - src += -3 * i_src - 3; -- coef = (s32*)coef_x; -- mCoef0 = _mm_setr_epi32(coef[0], coef[1], coef[0], coef[1]); -- mCoef = _mm256_cvtepi8_epi16(mCoef0); -- offset = _mm256_set1_epi32(add1); - -- row = height + 7; -+ { -+ __m128i s0, s1, s2, s3; -+ __m256i S0, S1; -+ __m256i mShuffle0 = _mm256_setr_epi8(0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9, 0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9); -+ __m256i mShuffle1 = _mm256_setr_epi8(4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13, 4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13); -+ -+ mCoef0 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[0])); -+ mCoef1 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[1])); -+ mCoef2 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[2])); -+ mCoef3 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[3])); -+ offset = _mm256_set1_epi32(add1); -+ -+ row = height + 6; -+ -+ while (row > 0) { -+ s0 = _mm_loadu_si128((__m128i*)(src)); -+ s1 = _mm_loadu_si128((__m128i*)(src + 4)); -+ s2 = _mm_loadu_si128((__m128i*)(src + i_src)); -+ s3 = _mm_loadu_si128((__m128i*)(src + i_src + 4)); -+ row -= 2; -+ src += i_src << 1; -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - -- while (row--) { -- const pel *p = src; -- uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -- for (i = 0; i < width; i += 16) { -+ S0 = _mm256_set_m128i(s2, s0); -+ S1 = _mm256_set_m128i(s3, s1); -+ -+ T0 = _mm256_shuffle_epi8(S0, mShuffle0); -+ T1 = _mm256_shuffle_epi8(S0, mShuffle1); -+ T2 = _mm256_shuffle_epi8(S1, mShuffle0); -+ T3 = _mm256_shuffle_epi8(S1, mShuffle1); - -- T0 = _mm256_loadu_si256((__m256i*)p++); -- T1 = _mm256_loadu_si256((__m256i*)p++); -- T2 = _mm256_loadu_si256((__m256i*)p++); -- T3 = _mm256_loadu_si256((__m256i*)p++); -- T4 = _mm256_loadu_si256((__m256i*)p++); -- T5 = _mm256_loadu_si256((__m256i*)p++); -- T6 = _mm256_loadu_si256((__m256i*)p++); -- T7 = _mm256_loadu_si256((__m256i*)p++); -- -- M0 = _mm256_madd_epi16(T0, mCoef); -- M1 = _mm256_madd_epi16(T1, mCoef); -- M2 = _mm256_madd_epi16(T2, mCoef); -- M3 = _mm256_madd_epi16(T3, mCoef); -- M4 = _mm256_madd_epi16(T4, mCoef); -- M5 = _mm256_madd_epi16(T5, mCoef); -- M6 = _mm256_madd_epi16(T6, mCoef); -- M7 = _mm256_madd_epi16(T7, mCoef); -- -- M0 = _mm256_hadd_epi32(M0, M1); -- M1 = _mm256_hadd_epi32(M2, M3); -- M2 = _mm256_hadd_epi32(M4, M5); -- M3 = _mm256_hadd_epi32(M6, M7); -- -- M0 = _mm256_hadd_epi32(M0, M1); -- M1 = _mm256_hadd_epi32(M2, M3); -+ M0 = _mm256_madd_epi16(T0, mCoef0); -+ M1 = _mm256_madd_epi16(T1, mCoef1); -+ M2 = _mm256_madd_epi16(T2, mCoef2); -+ M3 = _mm256_madd_epi16(T3, mCoef3); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ -+ M2 = _mm256_add_epi32(M0, offset); -+ M2 = _mm256_srai_epi32(M2, shift1); -+ -+ s0 = _mm_packs_epi32(_mm256_castsi256_si128(M2), _mm256_extracti128_si256(M2, 1)); -+ _mm_store_si128((__m128i*)(tmp), s0); -+ -+ tmp += i_tmp * 2; -+ } -+ { -+ // the last row -+ __m128i t0, t1, t2, t3; -+ __m128i m0, m1, m2, m3; -+ s0 = _mm_loadu_si128((__m128i*)(src)); -+ s1 = _mm_loadu_si128((__m128i*)(src + 4)); -+ src += i_src; -+ -+ t0 = _mm_shuffle_epi8(s0, _mm256_castsi256_si128(mShuffle0)); -+ t1 = _mm_shuffle_epi8(s0, _mm256_castsi256_si128(mShuffle1)); -+ t2 = _mm_shuffle_epi8(s1, _mm256_castsi256_si128(mShuffle0)); -+ t3 = _mm_shuffle_epi8(s1, _mm256_castsi256_si128(mShuffle1)); -+ -+ m0 = _mm_madd_epi16(t0, _mm256_castsi256_si128(mCoef0)); -+ m1 = _mm_madd_epi16(t1, _mm256_castsi256_si128(mCoef1)); -+ m2 = _mm_madd_epi16(t2, _mm256_castsi256_si128(mCoef2)); -+ m3 = _mm_madd_epi16(t3, _mm256_castsi256_si128(mCoef3)); -+ -+ m0 = _mm_add_epi32(m0, m1); -+ m1 = _mm_add_epi32(m2, m3); -+ -+ m0 = _mm_add_epi32(m0, m1); -+ -+ m0 = _mm_add_epi32(m0, _mm256_castsi256_si128(offset)); -+ m0 = _mm_srai_epi32(m0, shift1); -+ m0 = _mm_packs_epi32(m0, m0); -+ _mm_storel_epi64((__m128i*)tmp, m0); -+ } -+ } -+ -+ { -+ __m256i T4, T5, T6, T7, M4, M5, M6, M7; -+ __m128i d0, d1; -+ -+ offset = _mm256_set1_epi32(add2); -+ tmp = tmp_res; -+ -+ mCoef0 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[0])); -+ mCoef1 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[1])); -+ mCoef2 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[2])); -+ mCoef3 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[3])); -+ -+ while (height > 0) { -+ T0 = _mm256_load_si256((__m256i*)(tmp)); -+ T1 = _mm256_loadu_si256((__m256i*)(tmp + i_tmp)); -+ T2 = _mm256_loadu_si256((__m256i*)(tmp + 2 * i_tmp)); -+ T3 = _mm256_loadu_si256((__m256i*)(tmp + 3 * i_tmp)); -+ T4 = _mm256_load_si256((__m256i*)(tmp + 4 * i_tmp)); -+ T5 = _mm256_loadu_si256((__m256i*)(tmp + 5 * i_tmp)); -+ T6 = _mm256_loadu_si256((__m256i*)(tmp + 6 * i_tmp)); -+ T7 = _mm256_loadu_si256((__m256i*)(tmp + 7 * i_tmp)); -+ height -= 4; -+ tmp += i_tmp * 4; -+ -+ M0 = _mm256_unpacklo_epi16(T0, T1); -+ M1 = _mm256_unpacklo_epi16(T2, T3); -+ M2 = _mm256_unpacklo_epi16(T4, T5); -+ M3 = _mm256_unpacklo_epi16(T6, T7); -+ M4 = _mm256_unpackhi_epi16(T0, T1); -+ M5 = _mm256_unpackhi_epi16(T2, T3); -+ M6 = _mm256_unpackhi_epi16(T4, T5); -+ M7 = _mm256_unpackhi_epi16(T6, T7); -+ -+ M0 = _mm256_madd_epi16(M0, mCoef0); -+ M1 = _mm256_madd_epi16(M1, mCoef1); -+ M2 = _mm256_madd_epi16(M2, mCoef2); -+ M3 = _mm256_madd_epi16(M3, mCoef3); -+ M4 = _mm256_madd_epi16(M4, mCoef0); -+ M5 = _mm256_madd_epi16(M5, mCoef1); -+ M6 = _mm256_madd_epi16(M6, mCoef2); -+ M7 = _mm256_madd_epi16(M7, mCoef3); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); -+ M2 = _mm256_add_epi32(M4, M5); -+ M3 = _mm256_add_epi32(M6, M7); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); -+ -+ M0 = _mm256_add_epi32(M0, offset); -+ M1 = _mm256_add_epi32(M1, offset); -+ M0 = _mm256_srai_epi32(M0, shift2); -+ M1 = _mm256_srai_epi32(M1, shift2); -+ M0 = _mm256_packus_epi32(M0, M1); -+ M0 = _mm256_min_epu16(M0, max_pel); -+ -+ d0 = _mm256_castsi256_si128(M0); -+ d1 = _mm256_extracti128_si256(M0, 1); -+ _mm_storel_epi64((__m128i*)(dst), d0); -+ _mm_storeh_pi((__m64*)(dst + i_dst), _mm_castsi128_ps(d0)); -+ _mm_storel_epi64((__m128i*)(dst + (i_dst << 1)), d1); -+ _mm_storeh_pi((__m64*)(dst + i_dst * 3), _mm_castsi128_ps(d1)); -+ -+ dst += i_dst << 2; -+ } -+ } -+} -+ -+void uavs3d_if_hor_ver_luma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coef_x, const s8 *coef_y, int max_val) -+{ -+ ALIGNED_32(s16 tmp_res[(64 + 7) * 8]); -+ s16 *tmp = tmp_res; -+ int row; -+ int add1, shift1; -+ int add2, shift2; -+ __m256i offset; -+ __m256i T0, T1, T2, T3, T4, T5; -+ __m256i M0, M1, M2, M3, M4, M5, M6, M7; -+ const int i_tmp = 8; -+ __m256i mCoef0, mCoef1, mCoef2, mCoef3; -+ __m256i max_pel = _mm256_set1_epi16((pel)max_val); -+ -+ if (max_val == 255) { // 8 bit_depth -+ shift1 = 0; -+ shift2 = 12; -+ } -+ else { // 10 bit_depth -+ shift1 = 2; -+ shift2 = 10; -+ } -+ -+ add1 = (1 << (shift1)) >> 1; -+ add2 = 1 << (shift2 - 1); -+ -+ src += -3 * i_src - 3; -+ -+ { -+ __m128i s0, s1; -+ __m256i S0, S1, S2; -+ __m256i mShuffle0 = _mm256_setr_epi8(0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9, 0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9); -+ __m256i mShuffle1 = _mm256_setr_epi8(4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13, 4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13); -+ -+ mCoef0 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[0])); -+ mCoef1 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[1])); -+ mCoef2 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[2])); -+ mCoef3 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[3])); -+ offset = _mm256_set1_epi32(add1); -+ -+ row = height + 6; -+ -+ while (row > 0) { -+ T0 = _mm256_loadu_si256((__m256i*)(src)); -+ s0 = _mm_loadu_si128((__m128i*)(src + 4)); -+ T1 = _mm256_loadu_si256((__m256i*)(src + i_src)); -+ s1 = _mm_loadu_si128((__m128i*)(src + i_src + 4)); -+ row -= 2; -+ src += i_src << 1; -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -+ -+ S0 = _mm256_permute2x128_si256(T0, T1, 0x20); -+ S2 = _mm256_permute2x128_si256(T0, T1, 0x31); -+ S1 = _mm256_set_m128i(s1, s0); -+ -+ T0 = _mm256_shuffle_epi8(S0, mShuffle0); -+ T1 = _mm256_shuffle_epi8(S0, mShuffle1); -+ T2 = _mm256_shuffle_epi8(S1, mShuffle0); -+ T3 = _mm256_shuffle_epi8(S1, mShuffle1); -+ T4 = _mm256_shuffle_epi8(S2, mShuffle0); -+ T5 = _mm256_shuffle_epi8(S2, mShuffle1); -+ -+ M0 = _mm256_madd_epi16(T0, mCoef0); -+ M1 = _mm256_madd_epi16(T1, mCoef1); -+ M2 = _mm256_madd_epi16(T2, mCoef2); -+ M3 = _mm256_madd_epi16(T3, mCoef3); -+ M4 = _mm256_madd_epi16(T2, mCoef0); -+ M5 = _mm256_madd_epi16(T3, mCoef1); -+ M6 = _mm256_madd_epi16(T4, mCoef2); -+ M7 = _mm256_madd_epi16(T5, mCoef3); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); -+ M2 = _mm256_add_epi32(M4, M5); -+ M3 = _mm256_add_epi32(M6, M7); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); - - M2 = _mm256_add_epi32(M0, offset); - M3 = _mm256_add_epi32(M1, offset); - M2 = _mm256_srai_epi32(M2, shift1); - M3 = _mm256_srai_epi32(M3, shift1); - M2 = _mm256_packs_epi32(M2, M3); -- _mm256_storeu_si256((__m256i*)(tmp + i), M2); - -- p += 8; -+ _mm256_store_si256((__m256i*)(tmp), M2); -+ -+ tmp += i_tmp * 2; -+ } -+ { -+ // the last row -+ __m128i t0, t1, t2, t3, t4, t5; -+ __m128i m0, m1, m2, m3, m4, m5, m6, m7; -+ __m128i s2; -+ s0 = _mm_loadu_si128((__m128i*)(src)); -+ s1 = _mm_loadu_si128((__m128i*)(src + 4)); -+ s2 = _mm_loadu_si128((__m128i*)(src + 8)); -+ src += i_src; -+ -+ t0 = _mm_shuffle_epi8(s0, _mm256_castsi256_si128(mShuffle0)); -+ t1 = _mm_shuffle_epi8(s0, _mm256_castsi256_si128(mShuffle1)); -+ t2 = _mm_shuffle_epi8(s1, _mm256_castsi256_si128(mShuffle0)); -+ t3 = _mm_shuffle_epi8(s1, _mm256_castsi256_si128(mShuffle1)); -+ t4 = _mm_shuffle_epi8(s2, _mm256_castsi256_si128(mShuffle0)); -+ t5 = _mm_shuffle_epi8(s2, _mm256_castsi256_si128(mShuffle1)); -+ -+ m0 = _mm_madd_epi16(t0, _mm256_castsi256_si128(mCoef0)); -+ m1 = _mm_madd_epi16(t1, _mm256_castsi256_si128(mCoef1)); -+ m2 = _mm_madd_epi16(t2, _mm256_castsi256_si128(mCoef2)); -+ m3 = _mm_madd_epi16(t3, _mm256_castsi256_si128(mCoef3)); -+ m4 = _mm_madd_epi16(t2, _mm256_castsi256_si128(mCoef0)); -+ m5 = _mm_madd_epi16(t3, _mm256_castsi256_si128(mCoef1)); -+ m6 = _mm_madd_epi16(t4, _mm256_castsi256_si128(mCoef2)); -+ m7 = _mm_madd_epi16(t5, _mm256_castsi256_si128(mCoef3)); -+ -+ m0 = _mm_add_epi32(m0, m1); -+ m1 = _mm_add_epi32(m2, m3); -+ m2 = _mm_add_epi32(m4, m5); -+ m3 = _mm_add_epi32(m6, m7); -+ -+ m0 = _mm_add_epi32(m0, m1); -+ m1 = _mm_add_epi32(m2, m3); -+ -+ m2 = _mm_add_epi32(m0, _mm256_castsi256_si128(offset)); -+ m3 = _mm_add_epi32(m1, _mm256_castsi256_si128(offset)); -+ m2 = _mm_srai_epi32(m2, shift1); -+ m3 = _mm_srai_epi32(m3, shift1); -+ m2 = _mm_packs_epi32(m2, m3); -+ _mm_store_si128((__m128i*)tmp, m2); - } -- tmp += i_tmp; -- src += i_src; - } - -- offset = _mm256_set1_epi32(add2); -- tmp = tmp_res; -+ { -+ __m256i N0, N1, N2, N3, N4, N5, N6, N7; -+ __m256i T6, T7; -+ offset = _mm256_set1_epi32(add2); -+ tmp = tmp_res; - -- coeff0 = _mm_set1_epi16(*(s16*)(coef_y)); -- coeff1 = _mm_set1_epi16(*(s16*)(coef_y + 2)); -- coeff2 = _mm_set1_epi16(*(s16*)(coef_y + 4)); -- coeff3 = _mm_set1_epi16(*(s16*)(coef_y + 6)); -- coeff00 = _mm256_cvtepi8_epi16(coeff0); -- coeff01 = _mm256_cvtepi8_epi16(coeff1); -- coeff02 = _mm256_cvtepi8_epi16(coeff2); -- coeff03 = _mm256_cvtepi8_epi16(coeff3); -+ mCoef0 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[0])); -+ mCoef1 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[1])); -+ mCoef2 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[2])); -+ mCoef3 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[3])); - -- while (height--) { -- const pel *p = (pel*)tmp; -- for (i = 0; i < width; i += 16) { -- T0 = _mm256_load_si256((__m256i*)(p)); -- T1 = _mm256_load_si256((__m256i*)(p + i_tmp)); -- T2 = _mm256_load_si256((__m256i*)(p + 2 * i_tmp)); -- T3 = _mm256_load_si256((__m256i*)(p + 3 * i_tmp)); -- T4 = _mm256_load_si256((__m256i*)(p + 4 * i_tmp)); -- T5 = _mm256_load_si256((__m256i*)(p + 5 * i_tmp)); -- T6 = _mm256_load_si256((__m256i*)(p + 6 * i_tmp)); -- T7 = _mm256_load_si256((__m256i*)(p + 7 * i_tmp)); -+ while (height > 0) { -+ T0 = _mm256_load_si256((__m256i*)(tmp)); -+ T1 = _mm256_loadu_si256((__m256i*)(tmp + i_tmp)); -+ T2 = _mm256_load_si256((__m256i*)(tmp + 2 * i_tmp)); -+ T3 = _mm256_loadu_si256((__m256i*)(tmp + 3 * i_tmp)); -+ T4 = _mm256_load_si256((__m256i*)(tmp + 4 * i_tmp)); -+ T5 = _mm256_loadu_si256((__m256i*)(tmp + 5 * i_tmp)); -+ T6 = _mm256_load_si256((__m256i*)(tmp + 6 * i_tmp)); -+ T7 = _mm256_loadu_si256((__m256i*)(tmp + 7 * i_tmp)); -+ height -= 2; -+ tmp += i_tmp * 2; - - M0 = _mm256_unpacklo_epi16(T0, T1); - M1 = _mm256_unpacklo_epi16(T2, T3); -@@ -3935,14 +4371,14 @@ void uavs3d_if_hor_ver_luma_w16x_avx2(const pel *src, int i_src, pel *dst, int i - M6 = _mm256_unpackhi_epi16(T4, T5); - M7 = _mm256_unpackhi_epi16(T6, T7); - -- N0 = _mm256_madd_epi16(M0, coeff00); -- N1 = _mm256_madd_epi16(M1, coeff01); -- N2 = _mm256_madd_epi16(M2, coeff02); -- N3 = _mm256_madd_epi16(M3, coeff03); -- N4 = _mm256_madd_epi16(M4, coeff00); -- N5 = _mm256_madd_epi16(M5, coeff01); -- N6 = _mm256_madd_epi16(M6, coeff02); -- N7 = _mm256_madd_epi16(M7, coeff03); -+ N0 = _mm256_madd_epi16(M0, mCoef0); -+ N1 = _mm256_madd_epi16(M1, mCoef1); -+ N2 = _mm256_madd_epi16(M2, mCoef2); -+ N3 = _mm256_madd_epi16(M3, mCoef3); -+ N4 = _mm256_madd_epi16(M4, mCoef0); -+ N5 = _mm256_madd_epi16(M5, mCoef1); -+ N6 = _mm256_madd_epi16(M6, mCoef2); -+ N7 = _mm256_madd_epi16(M7, mCoef3); - - N0 = _mm256_add_epi32(N0, N1); - N1 = _mm256_add_epi32(N2, N3); -@@ -3958,14 +4394,164 @@ void uavs3d_if_hor_ver_luma_w16x_avx2(const pel *src, int i_src, pel *dst, int i - N1 = _mm256_srai_epi32(N1, shift2); - N0 = _mm256_packus_epi32(N0, N1); - N0 = _mm256_min_epu16(N0, max_pel); -- _mm256_storeu_si256((__m256i*)(dst + i), N0); - -- p += 16; -+ _mm_storeu_si128((__m128i*)(dst), _mm256_castsi256_si128(N0)); -+ _mm_storeu_si128((__m128i*)(dst + i_dst), _mm256_extracti128_si256(N0, 1)); -+ -+ dst += i_dst << 1; - } -- dst += i_dst; -- tmp += i_tmp; -+ } -+} -+ -+void uavs3d_if_hor_ver_luma_w16x_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coef_x, const s8 *coef_y, int max_val) -+{ -+ ALIGNED_32(s16 tmp_res[(128 + 7) * 128]); -+ s16 *tmp = tmp_res; -+ int row, i;; -+ int add1, shift1; -+ int add2, shift2; -+ __m256i offset; -+ __m256i T0, T1, T2, T3, T4, T5; -+ __m256i M0, M1, M2, M3, M4, M5, M6, M7; -+ int i_tmp = width; -+ __m256i mCoef0, mCoef1, mCoef2, mCoef3; -+ __m256i max_pel = _mm256_set1_epi16((pel)max_val); -+ -+ if (max_val == 255) { // 8 bit_depth -+ shift1 = 0; -+ shift2 = 12; -+ } -+ else { // 10 bit_depth -+ shift1 = 2; -+ shift2 = 10; - } - -+ add1 = (1 << (shift1)) >> 1; -+ add2 = 1 << (shift2 - 1); -+ -+ src += -3 * i_src - 3; -+ -+ { -+ __m256i S0, S1, S2; -+ __m256i mShuffle0 = _mm256_setr_epi8(0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9, 0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9); -+ __m256i mShuffle1 = _mm256_setr_epi8(4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13, 4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13); -+ -+ mCoef0 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[0])); -+ mCoef1 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[1])); -+ mCoef2 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[2])); -+ mCoef3 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_x)[3])); -+ offset = _mm256_set1_epi32(add1); -+ -+ row = height + 7; -+ -+ while (row--) { -+ const pel *p = src; -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -+ for (i = 0; i < width; i += 16) { -+ S0 = _mm256_loadu_si256((__m256i*)(p)); -+ S1 = _mm256_loadu_si256((__m256i*)(p + 4)); -+ S2 = _mm256_loadu_si256((__m256i*)(p + 8)); -+ -+ T0 = _mm256_shuffle_epi8(S0, mShuffle0); -+ T1 = _mm256_shuffle_epi8(S0, mShuffle1); -+ T2 = _mm256_shuffle_epi8(S1, mShuffle0); -+ T3 = _mm256_shuffle_epi8(S1, mShuffle1); -+ T4 = _mm256_shuffle_epi8(S2, mShuffle0); -+ T5 = _mm256_shuffle_epi8(S2, mShuffle1); -+ -+ M0 = _mm256_madd_epi16(T0, mCoef0); -+ M1 = _mm256_madd_epi16(T1, mCoef1); -+ M2 = _mm256_madd_epi16(T2, mCoef2); -+ M3 = _mm256_madd_epi16(T3, mCoef3); -+ M4 = _mm256_madd_epi16(T2, mCoef0); -+ M5 = _mm256_madd_epi16(T3, mCoef1); -+ M6 = _mm256_madd_epi16(T4, mCoef2); -+ M7 = _mm256_madd_epi16(T5, mCoef3); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); -+ M2 = _mm256_add_epi32(M4, M5); -+ M3 = _mm256_add_epi32(M6, M7); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M1 = _mm256_add_epi32(M2, M3); -+ -+ p += 16; -+ M2 = _mm256_add_epi32(M0, offset); -+ M3 = _mm256_add_epi32(M1, offset); -+ M2 = _mm256_srai_epi32(M2, shift1); -+ M3 = _mm256_srai_epi32(M3, shift1); -+ M2 = _mm256_packs_epi32(M2, M3); -+ _mm256_storeu_si256((__m256i*)(tmp + i), M2); -+ } -+ tmp += i_tmp; -+ src += i_src; -+ } -+ } -+ -+ { -+ __m256i N0, N1, N2, N3, N4, N5, N6, N7; -+ __m256i T6, T7; -+ offset = _mm256_set1_epi32(add2); -+ tmp = tmp_res; -+ -+ mCoef0 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[0])); -+ mCoef1 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[1])); -+ mCoef2 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[2])); -+ mCoef3 = _mm256_cvtepi8_epi16(_mm_set1_epi16(((short*)coef_y)[3])); -+ -+ while (height--) { -+ const pel *p = (pel*)tmp; -+ for (i = 0; i < width; i += 16) { -+ T0 = _mm256_load_si256((__m256i*)(p)); -+ T1 = _mm256_load_si256((__m256i*)(p + i_tmp)); -+ T2 = _mm256_load_si256((__m256i*)(p + 2 * i_tmp)); -+ T3 = _mm256_load_si256((__m256i*)(p + 3 * i_tmp)); -+ T4 = _mm256_load_si256((__m256i*)(p + 4 * i_tmp)); -+ T5 = _mm256_load_si256((__m256i*)(p + 5 * i_tmp)); -+ T6 = _mm256_load_si256((__m256i*)(p + 6 * i_tmp)); -+ T7 = _mm256_load_si256((__m256i*)(p + 7 * i_tmp)); -+ -+ M0 = _mm256_unpacklo_epi16(T0, T1); -+ M1 = _mm256_unpacklo_epi16(T2, T3); -+ M2 = _mm256_unpacklo_epi16(T4, T5); -+ M3 = _mm256_unpacklo_epi16(T6, T7); -+ M4 = _mm256_unpackhi_epi16(T0, T1); -+ M5 = _mm256_unpackhi_epi16(T2, T3); -+ M6 = _mm256_unpackhi_epi16(T4, T5); -+ M7 = _mm256_unpackhi_epi16(T6, T7); -+ -+ N0 = _mm256_madd_epi16(M0, mCoef0); -+ N1 = _mm256_madd_epi16(M1, mCoef1); -+ N2 = _mm256_madd_epi16(M2, mCoef2); -+ N3 = _mm256_madd_epi16(M3, mCoef3); -+ N4 = _mm256_madd_epi16(M4, mCoef0); -+ N5 = _mm256_madd_epi16(M5, mCoef1); -+ N6 = _mm256_madd_epi16(M6, mCoef2); -+ N7 = _mm256_madd_epi16(M7, mCoef3); -+ -+ N0 = _mm256_add_epi32(N0, N1); -+ N1 = _mm256_add_epi32(N2, N3); -+ N2 = _mm256_add_epi32(N4, N5); -+ N3 = _mm256_add_epi32(N6, N7); -+ -+ N0 = _mm256_add_epi32(N0, N1); -+ N1 = _mm256_add_epi32(N2, N3); -+ -+ N0 = _mm256_add_epi32(N0, offset); -+ N1 = _mm256_add_epi32(N1, offset); -+ N0 = _mm256_srai_epi32(N0, shift2); -+ N1 = _mm256_srai_epi32(N1, shift2); -+ N0 = _mm256_packus_epi32(N0, N1); -+ N0 = _mm256_min_epu16(N0, max_pel); -+ _mm256_storeu_si256((__m256i*)(dst + i), N0); -+ -+ p += 16; -+ } -+ dst += i_dst; -+ tmp += i_tmp; -+ } -+ } - } - - void uavs3d_if_hor_ver_chroma_w8_avx2(const pel *src, int i_src, pel *dst, int i_dst, int width, int height, const s8 *coef_x, const s8 *coef_y, int max_val) -@@ -3979,14 +4565,6 @@ void uavs3d_if_hor_ver_chroma_w8_avx2(const pel *src, int i_src, pel *dst, int i - int shift1, shift2; - int add1, add2; - -- __m128i coef0 = _mm_set1_epi16(*(s16*)coef_x); -- __m128i coef1 = _mm_set1_epi16(*(s16*)(coef_x + 2)); -- __m256i mCoef0 = _mm256_cvtepi8_epi16(coef0); -- __m256i mCoef1 = _mm256_cvtepi8_epi16(coef1); -- __m256i mSwitch = _mm256_setr_epi8(0, 1, 4, 5, 2, 3, 6, 7, 4, 5, 8, 9, 6, 7, 10, 11, 0, 1, 4, 5, 2, 3, 6, 7, 4, 5, 8, 9, 6, 7, 10, 11); -- __m256i T0, T1, S0, S1, sum; -- __m256i mAddOffset; -- - if (max_val == 255) { // 8 bit_depth - shift1 = 0; - shift2 = 12; -@@ -3999,25 +4577,34 @@ void uavs3d_if_hor_ver_chroma_w8_avx2(const pel *src, int i_src, pel *dst, int i - add1 = (1 << (shift1)) >> 1; - add2 = 1 << (shift2 - 1); - -- mAddOffset = _mm256_set1_epi32(add1); - //HOR -+ __m128i coef0 = _mm_cvtepi8_epi16(_mm_set1_epi16(((s16*)coef_x)[0])); -+ __m128i coef1 = _mm_cvtepi8_epi16(_mm_set1_epi16(((s16*)coef_x)[1])); -+ __m256i mCoef0 = _mm256_set_m128i(coef1, coef0); -+ __m256i mCoef1 = _mm256_set_m128i(coef0, coef1); -+ __m256i mSwitch = _mm256_setr_epi8(0, 1, 4, 5, 2, 3, 6, 7, 4, 5, 8, 9, 6, 7, 10, 11, 0, 1, 4, 5, 2, 3, 6, 7, 4, 5, 8, 9, 6, 7, 10, 11); -+ __m256i T0, T1, S0, S1, sum; -+ __m256i mAddOffset = _mm256_set1_epi32(add1); -+ __m128i mDst; -+ __m128i s0; -+ - src = src - i_src - 2; - row = height + 3; - while (row--) { -- uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - S0 = _mm256_loadu_si256((__m256i*)(src)); -- S1 = _mm256_loadu_si256((__m256i*)(src + 4)); -- S0 = _mm256_permute4x64_epi64(S0, 0x94); -- S1 = _mm256_permute4x64_epi64(S1, 0x94); -- T0 = _mm256_madd_epi16(_mm256_shuffle_epi8(S0, mSwitch), mCoef0); -- T1 = _mm256_madd_epi16(_mm256_shuffle_epi8(S1, mSwitch), mCoef1); -+ s0 = _mm_loadu_si128((__m128i*)(src + 4)); -+ uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -+ S1 = _mm256_set_m128i(s0, s0); -+ T0 = _mm256_shuffle_epi8(S0, mSwitch); -+ T1 = _mm256_shuffle_epi8(S1, mSwitch); -+ T0 = _mm256_madd_epi16(T0, mCoef0); -+ T1 = _mm256_madd_epi16(T1, mCoef1); - sum = _mm256_add_epi32(T0, T1); - - sum = _mm256_add_epi32(sum, mAddOffset); - sum = _mm256_srai_epi32(sum, shift1); -- sum = _mm256_packs_epi32(sum, sum); -- sum = _mm256_permute4x64_epi64(sum, 0xd8); -- _mm_storeu_si128((__m128i*)(tmp), _mm256_castsi256_si128(sum)); -+ mDst = _mm_packs_epi32(_mm256_castsi256_si128(sum), _mm256_extracti128_si256(sum, 1)); -+ _mm_store_si128((__m128i*)(tmp), mDst); - - src += i_src; - tmp += i_tmp; -@@ -4027,46 +4614,49 @@ void uavs3d_if_hor_ver_chroma_w8_avx2(const pel *src, int i_src, pel *dst, int i - tmp = tmp_res; - - { -- __m128i max_val1 = _mm_set1_epi16((pel)max_val); -- __m128i coeff0, coeff1, mVal, mAddOffset2; -- __m128i M0, M1, M2, M3; -+ __m128i coeff0, coeff1; -+ __m256i MaxVal = _mm256_set1_epi16((pel)max_val); -+ __m256i C0, C1, mVal, mAddOffset2; -+ __m256i M0, M1, M2, M3; - - coeff0 = _mm_set1_epi16(*(s16*)coef_y); - coeff1 = _mm_set1_epi16(*(s16*)(coef_y + 2)); -- mAddOffset2 = _mm_set1_epi32(add2); -- -- coeff0 = _mm_cvtepi8_epi16(coeff0); -- coeff1 = _mm_cvtepi8_epi16(coeff1); -- while (height--) { -- __m128i T00 = _mm_load_si128((__m128i*)(tmp)); -- __m128i T10 = _mm_load_si128((__m128i*)(tmp + i_tmp)); -- __m128i T20 = _mm_load_si128((__m128i*)(tmp + i_tmp2)); -- __m128i T30 = _mm_load_si128((__m128i*)(tmp + i_tmp3)); -+ mAddOffset2 = _mm256_set1_epi32(add2); - -- M0 = _mm_unpacklo_epi16(T00, T10); -- M1 = _mm_unpacklo_epi16(T20, T30); -- M2 = _mm_unpackhi_epi16(T00, T10); -- M3 = _mm_unpackhi_epi16(T20, T30); -- -- M0 = _mm_madd_epi16(M0, coeff0); -- M1 = _mm_madd_epi16(M1, coeff1); -- M2 = _mm_madd_epi16(M2, coeff0); -- M3 = _mm_madd_epi16(M3, coeff1); -- -- M0 = _mm_add_epi32(M0, M1); -- M2 = _mm_add_epi32(M2, M3); -- -- M0 = _mm_add_epi32(M0, mAddOffset2); -- M2 = _mm_add_epi32(M2, mAddOffset2); -- M0 = _mm_srai_epi32(M0, shift2); -- M2 = _mm_srai_epi32(M2, shift2); -- -- mVal = _mm_packus_epi32(M0, M2); -- mVal = _mm_min_epu16(mVal, max_val1); -- _mm_storeu_si128((__m128i*)dst, mVal); -- -- tmp += i_tmp; -- dst += i_dst; -+ C0 = _mm256_cvtepi8_epi16(coeff0); -+ C1 = _mm256_cvtepi8_epi16(coeff1); -+ while (height) { -+ __m256i T00 = _mm256_load_si256((__m256i*)(tmp)); -+ __m256i T10 = _mm256_loadu_si256((__m256i*)(tmp + i_tmp)); -+ __m256i T20 = _mm256_load_si256((__m256i*)(tmp + i_tmp2)); -+ __m256i T30 = _mm256_loadu_si256((__m256i*)(tmp + i_tmp3)); -+ -+ M0 = _mm256_unpacklo_epi16(T00, T10); -+ M1 = _mm256_unpacklo_epi16(T20, T30); -+ M2 = _mm256_unpackhi_epi16(T00, T10); -+ M3 = _mm256_unpackhi_epi16(T20, T30); -+ -+ M0 = _mm256_madd_epi16(M0, C0); -+ M1 = _mm256_madd_epi16(M1, C1); -+ M2 = _mm256_madd_epi16(M2, C0); -+ M3 = _mm256_madd_epi16(M3, C1); -+ -+ M0 = _mm256_add_epi32(M0, M1); -+ M2 = _mm256_add_epi32(M2, M3); -+ -+ M0 = _mm256_add_epi32(M0, mAddOffset2); -+ M2 = _mm256_add_epi32(M2, mAddOffset2); -+ M0 = _mm256_srai_epi32(M0, shift2); -+ M2 = _mm256_srai_epi32(M2, shift2); -+ -+ mVal = _mm256_packus_epi32(M0, M2); -+ mVal = _mm256_min_epu16(mVal, MaxVal); -+ _mm_storeu_si128((__m128i*)dst, _mm256_castsi256_si128(mVal)); -+ _mm_storeu_si128((__m128i*)(dst + i_dst), _mm256_extracti128_si256(mVal, 1)); -+ -+ height -= 2; -+ tmp += i_tmp2; -+ dst += i_dst << 1; - } - } - } -@@ -4113,28 +4703,26 @@ void uavs3d_if_hor_ver_chroma_w16x_avx2(const pel *src, int i_src, pel *dst, int - while (row--) { - uavs3d_prefetch(src + i_src, _MM_HINT_NTA); - for (col = 0; col < width; col += 16) { -- S0 = _mm256_loadu_si256((__m256i*)(src + col)); -- S1 = _mm256_loadu_si256((__m256i*)(src + col + 4)); -+ S0 = _mm256_loadu_si256((__m256i*)(src + col)); -+ S1 = _mm256_loadu_si256((__m256i*)(src + col + 4)); - S2 = _mm256_loadu_si256((__m256i*)(src + col + 8)); -- S3 = _mm256_loadu_si256((__m256i*)(src + col + 12)); -- S0 = _mm256_permute4x64_epi64(S0, 0x94); -- S1 = _mm256_permute4x64_epi64(S1, 0x94); -- S2 = _mm256_permute4x64_epi64(S2, 0x94); -- S3 = _mm256_permute4x64_epi64(S3, 0x94); -- T0 = _mm256_madd_epi16(_mm256_shuffle_epi8(S0, mSwitch), mCoef0); -- T1 = _mm256_madd_epi16(_mm256_shuffle_epi8(S1, mSwitch), mCoef1); -- T2 = _mm256_madd_epi16(_mm256_shuffle_epi8(S2, mSwitch), mCoef0); -- T3 = _mm256_madd_epi16(_mm256_shuffle_epi8(S3, mSwitch), mCoef1); -- T0 = _mm256_add_epi32(T0, T1); -- T2 = _mm256_add_epi32(T2, T3); -+ T0 = _mm256_shuffle_epi8(S0, mSwitch); -+ T1 = _mm256_shuffle_epi8(S1, mSwitch); -+ T2 = _mm256_shuffle_epi8(S1, mSwitch); -+ T3 = _mm256_shuffle_epi8(S2, mSwitch); -+ S0 = _mm256_madd_epi16(T0, mCoef0); -+ S1 = _mm256_madd_epi16(T1, mCoef1); -+ S2 = _mm256_madd_epi16(T2, mCoef0); -+ S3 = _mm256_madd_epi16(T3, mCoef1); -+ T0 = _mm256_add_epi32(S0, S1); -+ T2 = _mm256_add_epi32(S2, S3); - - T0 = _mm256_add_epi32(T0, mAddOffset); - T2 = _mm256_add_epi32(T2, mAddOffset); - T0 = _mm256_srai_epi32(T0, shift1); - T2 = _mm256_srai_epi32(T2, shift1); - T0 = _mm256_packs_epi32(T0, T2); -- T0 = _mm256_permute4x64_epi64(T0, 0xd8); -- _mm256_storeu_si256((__m256i*)(tmp + col), T0); -+ _mm256_store_si256((__m256i*)(tmp + col), T0); - } - src += i_src; - tmp += i_tmp; -diff --git a/source/decore/avx2/intra_pred_avx2.c b/source/decore/avx2/intra_pred_avx2.c -index 07e19b2..18961f6 100644 ---- a/source/decore/avx2/intra_pred_avx2.c -+++ b/source/decore/avx2/intra_pred_avx2.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -204,7 +199,7 @@ void uavs3d_ipred_hor_avx2(pel *src, pel *dst, int i_dst, int width, int height) - - void uavs3d_ipred_dc_avx2(pel *src, pel *dst, int i_dst, int width, int height, u16 avail_cu, int bit_depth) - { -- int i, x, y; -+ int x, y; - int dc; - pel *p_src = src - 1; - int left_avail = IS_AVAIL(avail_cu, AVAIL_LE); -@@ -212,6 +207,7 @@ void uavs3d_ipred_dc_avx2(pel *src, pel *dst, int i_dst, int width, int height, - - if (left_avail && above_avail) { - int length = width + height + 1; -+ int i; - __m128i sum = _mm_setzero_si128(); - __m128i val; - -@@ -2738,7 +2734,6 @@ void uavs3d_ipred_ang_xy_18_avx2(pel *src, pel *dst, int i_dst, int mode, int wi - dst += i_dst; - } - break; -- break; - } - - } -@@ -3452,10 +3447,10 @@ void uavs3d_ipred_ver_avx2(pel *src, pel *dst, int i_dst, int width, int height) - T0 = _mm256_loadu_si256((__m256i *)(src)); - T1 = _mm256_loadu_si256((__m256i *)(src + 16)); - for (y = 0; y < height; y += 2) { -- _mm256_store_si256((__m256i *)(dst), T0); -- _mm256_store_si256((__m256i *)(dst + 16), T1); -- _mm256_store_si256((__m256i *)(dst + i_dst), T0); -- _mm256_store_si256((__m256i *)(dst + i_dst + 16), T1); -+ _mm256_storeu_si256((__m256i *)(dst), T0); -+ _mm256_storeu_si256((__m256i *)(dst + 16), T1); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst), T0); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst + 16), T1); - dst += i_dst2; - } - break; -@@ -3468,14 +3463,14 @@ void uavs3d_ipred_ver_avx2(pel *src, pel *dst, int i_dst, int width, int height) - T2 = _mm256_loadu_si256((__m256i *)(src + 32)); - T3 = _mm256_loadu_si256((__m256i *)(src + 48)); - for (y = 0; y < height; y += 2) { -- _mm256_store_si256((__m256i *)(dst), T0); -- _mm256_store_si256((__m256i *)(dst + 16), T1); -- _mm256_store_si256((__m256i *)(dst + 32), T2); -- _mm256_store_si256((__m256i *)(dst + 48), T3); -- _mm256_store_si256((__m256i *)(dst + i_dst), T0); -- _mm256_store_si256((__m256i *)(dst + i_dst + 16), T1); -- _mm256_store_si256((__m256i *)(dst + i_dst + 32), T2); -- _mm256_store_si256((__m256i *)(dst + i_dst + 48), T3); -+ _mm256_storeu_si256((__m256i *)(dst), T0); -+ _mm256_storeu_si256((__m256i *)(dst + 16), T1); -+ _mm256_storeu_si256((__m256i *)(dst + 32), T2); -+ _mm256_storeu_si256((__m256i *)(dst + 48), T3); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst), T0); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst + 16), T1); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst + 32), T2); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst + 48), T3); - dst += i_dst2; - } - break; -@@ -3539,10 +3534,10 @@ void uavs3d_ipred_hor_avx2(pel *src, pel *dst, int i_dst, int width, int height) - for (y = 0; y < height; y += 2) { - T0 = _mm256_set1_epi16(src[-y]); - T1 = _mm256_set1_epi16(src[-y - 1]); -- _mm256_store_si256((__m256i *)(dst), T0); -- _mm256_store_si256((__m256i *)(dst + 16), T0); -- _mm256_store_si256((__m256i *)(dst + i_dst), T1); -- _mm256_store_si256((__m256i *)(dst + i_dst + 16), T1); -+ _mm256_storeu_si256((__m256i *)(dst), T0); -+ _mm256_storeu_si256((__m256i *)(dst + 16), T0); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst), T1); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst + 16), T1); - dst += i_dst2; - } - break; -@@ -3553,14 +3548,14 @@ void uavs3d_ipred_hor_avx2(pel *src, pel *dst, int i_dst, int width, int height) - for (y = 0; y < height; y += 2) { - T0 = _mm256_set1_epi16(src[-y]); - T1 = _mm256_set1_epi16(src[-y - 1]); -- _mm256_store_si256((__m256i *)(dst), T0); -- _mm256_store_si256((__m256i *)(dst + 16), T0); -- _mm256_store_si256((__m256i *)(dst + 32), T0); -- _mm256_store_si256((__m256i *)(dst + 48), T0); -- _mm256_store_si256((__m256i *)(dst + i_dst), T1); -- _mm256_store_si256((__m256i *)(dst + i_dst + 16), T1); -- _mm256_store_si256((__m256i *)(dst + i_dst + 32), T1); -- _mm256_store_si256((__m256i *)(dst + i_dst + 48), T1); -+ _mm256_storeu_si256((__m256i *)(dst), T0); -+ _mm256_storeu_si256((__m256i *)(dst + 16), T0); -+ _mm256_storeu_si256((__m256i *)(dst + 32), T0); -+ _mm256_storeu_si256((__m256i *)(dst + 48), T0); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst), T1); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst + 16), T1); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst + 32), T1); -+ _mm256_storeu_si256((__m256i *)(dst + i_dst + 48), T1); - dst += i_dst2; - } - break; -diff --git a/source/decore/avx2/itrans_avx2.c b/source/decore/avx2/itrans_avx2.c -index 9b1df21..d8766b6 100644 ---- a/source/decore/avx2/itrans_avx2.c -+++ b/source/decore/avx2/itrans_avx2.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -79,14 +74,14 @@ - #define TRANSPOSE_16x8_32BIT_16BIT(I00, I01, I02, I03, I04, I05, I06, I07, I08, I09, I10, I11, I12, I13, I14, I15, O0, O1, O2, O3, O4, O5, O6, O7)\ - TRANSPOSE_8x8_32BIT_16BIT(I00, I01, I02, I03, I04, I05, I06, I07, I04, I05, I06, I07); \ - TRANSPOSE_8x8_32BIT_16BIT(I08, I09, I10, I11, I12, I13, I14, I15, I12, I13, I14, I15); \ -- O0 = _mm256_insertf128_si256(I04, _mm256_castsi256_si128(I12), 1); \ -- O1 = _mm256_insertf128_si256(I05, _mm256_castsi256_si128(I13), 1); \ -- O2 = _mm256_insertf128_si256(I06, _mm256_castsi256_si128(I14), 1); \ -- O3 = _mm256_insertf128_si256(I07, _mm256_castsi256_si128(I15), 1); \ -- O4 = _mm256_insertf128_si256(I12, _mm256_extracti128_si256(I04, 1), 0); \ -- O5 = _mm256_insertf128_si256(I13, _mm256_extracti128_si256(I05, 1), 0); \ -- O6 = _mm256_insertf128_si256(I14, _mm256_extracti128_si256(I06, 1), 0); \ -- O7 = _mm256_insertf128_si256(I15, _mm256_extracti128_si256(I07, 1), 0) -+ O0 = _mm256_permute2x128_si256(I04, I12, 0x20); \ -+ O1 = _mm256_permute2x128_si256(I05, I13, 0x20); \ -+ O2 = _mm256_permute2x128_si256(I06, I14, 0x20); \ -+ O3 = _mm256_permute2x128_si256(I07, I15, 0x20); \ -+ O4 = _mm256_permute2x128_si256(I04, I12, 0x31); \ -+ O5 = _mm256_permute2x128_si256(I05, I13, 0x31); \ -+ O6 = _mm256_permute2x128_si256(I06, I14, 0x31); \ -+ O7 = _mm256_permute2x128_si256(I07, I15, 0x31) - - - static void uavs3d_always_inline dct2_butterfly_h4_avx2(s16* src, s16* dst, int line, int shift, int bit_depth) -@@ -272,10 +267,10 @@ static void uavs3d_always_inline dct2_butterfly_h8_avx2(s16* src, int i_src, s16 - - // transpose 8x8 : 8 x 8(32bit) --> 4 x 16(16bit) - TRANSPOSE_8x8_32BIT_16BIT(d0, d1, d2, d3, d4, d5, d6, d7, d4, d5, d6, d7); -- d0 = _mm256_insertf128_si256(d4, _mm256_castsi256_si128(d5), 1); -- d1 = _mm256_insertf128_si256(d6, _mm256_castsi256_si128(d7), 1); -- d2 = _mm256_insertf128_si256(d5, _mm256_extracti128_si256(d4, 1), 0); -- d3 = _mm256_insertf128_si256(d7, _mm256_extracti128_si256(d6, 1), 0); -+ d0 = _mm256_permute2x128_si256(d4, d5, 0x20); -+ d2 = _mm256_permute2x128_si256(d4, d5, 0x31); -+ d1 = _mm256_permute2x128_si256(d6, d7, 0x20); -+ d3 = _mm256_permute2x128_si256(d6, d7, 0x31); - - if (bit_depth != MAX_TX_DYNAMIC_RANGE) { - __m256i max_val = _mm256_set1_epi16((1 << bit_depth) - 1); -diff --git a/source/decore/avx2/pixel_avx2.c b/source/decore/avx2/pixel_avx2.c -index 8031fe7..10d48f9 100644 ---- a/source/decore/avx2/pixel_avx2.c -+++ b/source/decore/avx2/pixel_avx2.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -986,8 +981,8 @@ void uavs3d_recon_chroma_w16_avx2(s16 *resi_u, s16 *resi_v, pel *pred, int width - r1 = _mm256_loadu_si256((const __m256i*)(resi_v)); - r2 = _mm256_unpacklo_epi16(r0, r1); // UV interlaced: uv0-uv4 uv8-uv12 - r3 = _mm256_unpackhi_epi16(r0, r1); -- r0 = _mm256_insertf128_si256(r2, _mm256_castsi256_si128(r3), 0x1); // uv0-uv8 -- r1 = _mm256_insertf128_si256(r3, _mm256_extracti128_si256(r2, 1), 0x0); -+ r0 = _mm256_permute2x128_si256(r2, r3, 0x20); // uv0-uv8 -+ r1 = _mm256_permute2x128_si256(r2, r3, 0x31); - p0 = _mm256_adds_epi16(p0, r0); - p1 = _mm256_adds_epi16(p1, r1); - -@@ -1035,8 +1030,8 @@ void uavs3d_recon_chroma_w16_avx2(s16 *resi_u, s16 *resi_v, pel *pred, int width - r1 = _mm256_loadu_si256((const __m256i*)(resi_v)); - r2 = _mm256_unpacklo_epi16(zero, r1); // UV interlaced: uv0-uv4 uv8-uv12 - r3 = _mm256_unpackhi_epi16(zero, r1); -- r0 = _mm256_insertf128_si256(r2, _mm256_castsi256_si128(r3), 0x1); // uv0-uv8 -- r1 = _mm256_insertf128_si256(r3, _mm256_extracti128_si256(r2, 1), 0x0); -+ r0 = _mm256_permute2x128_si256(r2, r3, 0x20); // uv0-uv8 -+ r1 = _mm256_permute2x128_si256(r2, r3, 0x31); - p0 = _mm256_adds_epi16(p0, r0); - p1 = _mm256_adds_epi16(p1, r1); - -@@ -1073,8 +1068,8 @@ void uavs3d_recon_chroma_w16x_avx2(s16 *resi_u, s16 *resi_v, pel *pred, int widt - r1 = _mm256_loadu_si256((const __m256i*)(resi_v + j)); - r2 = _mm256_unpacklo_epi16(r0, r1); // UV interlaced: uv0-uv4 uv8-uv12 - r3 = _mm256_unpackhi_epi16(r0, r1); -- r0 = _mm256_insertf128_si256(r2, _mm256_castsi256_si128(r3), 0x1); // uv0-uv8 -- r1 = _mm256_insertf128_si256(r3, _mm256_extracti128_si256(r2, 1), 0x0); -+ r0 = _mm256_permute2x128_si256(r2, r3, 0x20); // uv0-uv8 -+ r1 = _mm256_permute2x128_si256(r2, r3, 0x31); - p0 = _mm256_adds_epi16(p0, r0); - p1 = _mm256_adds_epi16(p1, r1); - -@@ -1126,8 +1121,8 @@ void uavs3d_recon_chroma_w16x_avx2(s16 *resi_u, s16 *resi_v, pel *pred, int widt - r1 = _mm256_loadu_si256((const __m256i*)(resi_v + j)); - r2 = _mm256_unpacklo_epi16(zero, r1); // UV interlaced: uv0-uv4 uv8-uv12 - r3 = _mm256_unpackhi_epi16(zero, r1); -- r0 = _mm256_insertf128_si256(r2, _mm256_castsi256_si128(r3), 0x1); // uv0-uv8 -- r1 = _mm256_insertf128_si256(r3, _mm256_extracti128_si256(r2, 1), 0x0); -+ r0 = _mm256_permute2x128_si256(r2, r3, 0x20); // uv0-uv8 -+ r1 = _mm256_permute2x128_si256(r2, r3, 0x31); - p0 = _mm256_adds_epi16(p0, r0); - p1 = _mm256_adds_epi16(p1, r1); - -diff --git a/source/decore/avx2/sao_avx2.c b/source/decore/avx2/sao_avx2.c -index 73c01b4..7d2d527 100644 ---- a/source/decore/avx2/sao_avx2.c -+++ b/source/decore/avx2/sao_avx2.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/com_def.h b/source/decore/com_def.h -index a8e9446..8b7ad27 100644 ---- a/source/decore/com_def.h -+++ b/source/decore/com_def.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -40,14 +35,18 @@ - - #include "com_sys.h" - --#define BIT_DEPTH 8 -- - #define CHECK_RAND_STRM 0 - --#if (BIT_DEPTH == 8) --typedef u8 pel; /* pixel type */ -+#ifndef COMPILE_10BIT -+#define COMPILE_10BIT 0 -+#endif -+ -+#if COMPILE_10BIT -+typedef unsigned short pel; /* pixel type */ -+#define BIT_DEPTH 10 - #else --typedef s16 pel; /* pixel type */ -+typedef unsigned char pel; /* pixel type */ -+#define BIT_DEPTH 8 - #endif - - /************************* profile & level **********************************************/ -diff --git a/source/decore/com_sys.h b/source/decore/com_sys.h -index 0cb4359..2ea3237 100644 ---- a/source/decore/com_sys.h -+++ b/source/decore/com_sys.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/com_table.c b/source/decore/com_table.c -index bbc40d9..2042e6d 100644 ---- a/source/decore/com_table.c -+++ b/source/decore/com_table.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/com_table.h b/source/decore/com_table.h -index 2c2bb3d..c419405 100644 ---- a/source/decore/com_table.h -+++ b/source/decore/com_table.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/com_type.h b/source/decore/com_type.h -index 5bb8337..0a7db50 100644 ---- a/source/decore/com_type.h -+++ b/source/decore/com_type.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/com_util.c b/source/decore/com_util.c -index 7e374c9..353804b 100644 ---- a/source/decore/com_util.c -+++ b/source/decore/com_util.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/com_util.h b/source/decore/com_util.h -index b6887bb..721a0c1 100644 ---- a/source/decore/com_util.h -+++ b/source/decore/com_util.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -41,10 +36,10 @@ - #include "com_type.h" - - /* function selection define based on platforms */ --#if (defined(__ANDROID__) && defined(__aarch64__)) || (defined(__APPLE__) && defined(__arm64__)) -+#if defined(_arm64) || (defined(__APPLE__) && defined(__arm64__)) - #define ENABLE_FUNCTION_C 1 - #define ENABLE_FUNCTION_ARM64 1 --#elif (defined(__ANDROID__) && defined(__arm__)) || (defined(__APPLE__) && defined(__ARM_NEON__)) -+#elif defined(_armv7a) || (defined(__APPLE__) && defined(__ARM_NEON__)) - #define ENABLE_FUNCTION_C 1 - #define ENABLE_FUNCTION_ARM32 1 - #elif (defined(__WIN32__) || defined(_WIN32)) || (defined(__MACOSX__) || defined(macintosh) || defined(__linux__) || defined(__unix__)) && (defined(__i386__) || defined(__x86_64__) || defined(__AMD64__)) -diff --git a/source/decore/deblock.c b/source/decore/deblock.c -index 0996c57..f9764d6 100644 ---- a/source/decore/deblock.c -+++ b/source/decore/deblock.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -65,7 +60,7 @@ static int uavs3d_always_inline skip_filter(com_map_t *map, com_ref_pic_t refp[M - { - com_scu_t MbQ = map->map_scu[scup + offset]; - com_pic_t *q_pic0, *q_pic1; -- const com_scu_t mask = {0, 0, 0, 0, 1, 0, 0}; -+ const com_scu_t mask = {0, 1, 0, 0, 1, 0, 0}; - - if ((*(u8*)&MbQ) & (*(u8*)&mask)) { - return 0; -@@ -210,7 +205,7 @@ void com_deblock_set_edge(com_core_t *core) - int scu_x = core->cu_pix_x >> MIN_CU_LOG2; - int scu_y = core->cu_pix_y >> MIN_CU_LOG2; - const int grad_mask = (LOOPFILTER_GRID >> 2) - 1; -- const com_scu_t mask = { 0, 0, 0, 0, 1, 0, 0 }; -+ const com_scu_t mask = { 0, 1, 0, 0, 1, 0, 0 }; - com_scu_t scu = map->map_scu[scup]; - - if ((*(u8*)&scu) & (*(u8*)&mask)) { -diff --git a/source/decore/inter_pred.c b/source/decore/inter_pred.c -index c53d399..470c84c 100644 ---- a/source/decore/inter_pred.c -+++ b/source/decore/inter_pred.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -486,10 +481,10 @@ void uavs3d_always_inline com_affine_mc_chroma(com_core_t *core, pel *dstc, int - int max_posx = (seqhdr->pic_width + 4) >> 1; - int max_posy = (seqhdr->pic_height + 4) >> 1; - int i_asb_mv = cu_width >> 2; -- s32(*asb_mv1)[MV_D] = asb_mv0 + i_asb_mv; - int i_src = ref_pic->stride_chroma; - - if (sub_blk_size == 4) { -+ s32(*asb_mv1)[MV_D] = asb_mv0 + i_asb_mv; - for (h = 0; h < cu_height; h += 8) { - int base_y = (y + h) << 4; - for (w = 0; w < cu_width; w += 8, asb_mv0 += 2, asb_mv1 += 2) { -diff --git a/source/decore/intra_pred.c b/source/decore/intra_pred.c -index de1eef6..c767be0 100644 ---- a/source/decore/intra_pred.c -+++ b/source/decore/intra_pred.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -320,7 +315,7 @@ void ipred_plane(pel *src, pel *dst, int i_dst, int w, int h, int bit_depth) - int ib_shift[5] = { 7, 10, 11, 15, 19 }; - int idx_w = g_tbl_log2[w] - 2; - int idx_h = g_tbl_log2[h] - 2; -- int im_h, is_h, im_v, is_v, temp, temp2; -+ int im_h, is_h, im_v, is_v, temp; - int max_pel = (1 << bit_depth) - 1; - int val; - -@@ -343,7 +338,7 @@ void ipred_plane(pel *src, pel *dst, int i_dst, int w, int h, int bit_depth) - temp = a - (h2 - 1) * c - (w2 - 1) * b + 16; - - for (y = 0; y < h; y++) { -- temp2 = temp; -+ int temp2 = temp; - for (x = 0; x < w; x++) { - val = temp2 >> 5; - dst[x] = (pel)COM_CLIP3(0, max_pel, val); -@@ -368,7 +363,7 @@ void ipred_plane_ipf(pel *src, s16 *dst, int w, int h) - int ib_shift[5] = { 7, 10, 11, 15, 19 }; - int idx_w = g_tbl_log2[w] - 2; - int idx_h = g_tbl_log2[h] - 2; -- int im_h, is_h, im_v, is_v, temp, temp2; -+ int im_h, is_h, im_v, is_v, temp; - im_h = ib_mult[idx_w]; - is_h = ib_shift[idx_w]; - im_v = ib_mult[idx_h]; -@@ -388,7 +383,7 @@ void ipred_plane_ipf(pel *src, s16 *dst, int w, int h) - temp = a - (h2 - 1) * c - (w2 - 1) * b + 16; - - for (y = 0; y < h; y++) { -- temp2 = temp; -+ int temp2 = temp; - for (x = 0; x < w; x++) { - dst[x] = (s16)(temp2 >> 5); - temp2 += b; -@@ -416,7 +411,7 @@ void ipred_plane_uv(pel *src, pel *dst, int i_dst, int w, int h, int bit_depth) - int idx_w = g_tbl_log2[w] - 2; - int idx_h = g_tbl_log2[h] - 2; - int im_h, is_h, im_v, is_v; -- int temp_u, temp_v, temp2_u, temp2_v; -+ int temp_u, temp_v; - int max_pel = (1 << bit_depth) - 1; - int val_u, val_v; - -@@ -448,8 +443,8 @@ void ipred_plane_uv(pel *src, pel *dst, int i_dst, int w, int h, int bit_depth) - temp_v = a_v - (h2 - 1) * c_v - (w2 - 1) * b_v + 16; - - for (y = 0; y < h; y++) { -- temp2_u = temp_u; -- temp2_v = temp_v; -+ int temp2_u = temp_u; -+ int temp2_v = temp_v; - for (x = 0; x < width2; x += 2) { - val_u = temp2_u >> 5; - val_v = temp2_v >> 5; -@@ -475,8 +470,7 @@ void ipred_bi(pel *src, pel *dst, int i_dst, int w, int h, int bit_depth) - int ishift = COM_MIN(ishift_x, ishift_y); - int ishift_xy = ishift_x + ishift_y + 1; - int offset = 1 << (ishift_x + ishift_y); -- int a, b, c, wt, wxy, tmp; -- int predx; -+ int a, b, c, wt, tmp; - int ref_up[MAX_CU_SIZE], ref_le[MAX_CU_SIZE], up[MAX_CU_SIZE], le[MAX_CU_SIZE], wy[MAX_CU_SIZE]; - int wc, tbl_wc[6] = {-1, 21, 13, 7, 4, 2}; - int max_pel = (1 << bit_depth) - 1; -@@ -510,8 +504,8 @@ void ipred_bi(pel *src, pel *dst, int i_dst, int w, int h, int bit_depth) - tmp += wt; - } - for( y = 0; y < h; y++ ) { -- predx = ref_le[y]; -- wxy = 0; -+ int predx = ref_le[y]; -+ int wxy = 0; - for( x = 0; x < w; x++ ) { - predx += le[y]; - ref_up[x] += up[x]; -@@ -534,8 +528,7 @@ void ipred_bi_ipf(pel *src, s16 *dst, int w, int h) - int ishift = COM_MIN(ishift_x, ishift_y); - int ishift_xy = ishift_x + ishift_y + 1; - int offset = 1 << (ishift_x + ishift_y); -- int a, b, c, wt, wxy, tmp; -- int predx; -+ int a, b, c, wt, tmp; - int ref_up[MAX_CU_SIZE], ref_le[MAX_CU_SIZE], up[MAX_CU_SIZE], le[MAX_CU_SIZE], wy[MAX_CU_SIZE]; - int wc, tbl_wc[6] = { -1, 21, 13, 7, 4, 2 }; - wc = ishift_x > ishift_y ? ishift_x - ishift_y : ishift_y - ishift_x; -@@ -566,8 +559,8 @@ void ipred_bi_ipf(pel *src, s16 *dst, int w, int h) - tmp += wt; - } - for (y = 0; y < h; y++) { -- predx = ref_le[y]; -- wxy = 0; -+ int predx = ref_le[y]; -+ int wxy = 0; - for (x = 0; x < w; x++) { - predx += le[y]; - ref_up[x] += up[x]; -@@ -589,9 +582,8 @@ void ipred_bi_uv(pel *src, pel *dst, int i_dst, int w, int h, int bit_depth) - int ishift = COM_MIN(ishift_x, ishift_y); - int ishift_xy = ishift_x + ishift_y + 1; - int offset = 1 << (ishift_x + ishift_y); -- int a_u, b_u, c_u, wt_u, wxy_u, tmp_u; -- int a_v, b_v, c_v, wt_v, wxy_v, tmp_v; -- int predx_u, predx_v; -+ int a_u, b_u, c_u, wt_u, tmp_u; -+ int a_v, b_v, c_v, wt_v, tmp_v; - int ref_up[MAX_CU_SIZE], ref_le[MAX_CU_SIZE], up[MAX_CU_SIZE], le[MAX_CU_SIZE], wy[MAX_CU_SIZE]; - int wc, tbl_wc[6] = { -1, 21, 13, 7, 4, 2 }; - int w2 = w << 1; -@@ -640,9 +632,10 @@ void ipred_bi_uv(pel *src, pel *dst, int i_dst, int w, int h, int bit_depth) - } - for (y = 0; y < h; y++) { - int y2 = y << 1; -- predx_u = ref_le[y2 ]; -- predx_v = ref_le[y2 + 1]; -- wxy_u = wxy_v = 0; -+ int predx_u = ref_le[y2 ]; -+ int predx_v = ref_le[y2 + 1]; -+ int wxy_u = 0; -+ int wxy_v = 0; - for (x = 0; x < w2; x += 2) { - predx_u += le[y2]; - predx_v += le[y2 + 1]; -@@ -1034,7 +1027,6 @@ static void uavs3d_always_inline ipf_core_s16(pel *src, pel *dst, int i_dst, s16 - s32 filter_idx_ver = (s32)g_tbl_log2[h] - 2; //Block Size - s32 ver_filter_range = COM_MIN(h, 10); - s32 hor_filter_range = COM_MIN(w, 10); -- int max_val = (1 << bit_depth) - 1; - - // TODO: g_ipf_pred_param doesn't support 128 - if (filter_idx_hor > 4) { -@@ -1300,7 +1292,6 @@ static void xPredIntraAngAdi_X_8(pel *pSrc, pel *dst, int i_dst, int uiDirMode, - int line_size = iWidth + iHeight / 2 - 1; - int real_size = min(line_size, iWidth * 2 + 1); - int i; -- int pad1, pad2; - int aligned_line_size = ((line_size + 15) >> 4) << 4; - pel *pfirst[2] = { first_line, first_line + aligned_line_size }; - -@@ -1311,6 +1302,8 @@ static void xPredIntraAngAdi_X_8(pel *pSrc, pel *dst, int i_dst, int uiDirMode, - - // padding - if (real_size < line_size) { -+ int pad1, pad2; -+ - pfirst[1][real_size - 1] = pfirst[1][real_size - 2]; - - pad1 = pfirst[0][real_size - 1]; -@@ -1466,7 +1459,6 @@ static void xPredIntraAngAdi_Y_28(pel *pSrc, pel *dst, int i_dst, int uiDirMode, - int real_size = min(line_size, iHeight * 4 + 1); - int i; - int iHeight2 = iHeight << 1; -- int pad1, pad2; - - for (i = 0; i < real_size; i += 2, pSrc--) { - first_line[i] = (pSrc[0] + (pSrc[-1] + pSrc[-2]) * 3 + pSrc[-3] + 4) >> 3; -@@ -1475,6 +1467,7 @@ static void xPredIntraAngAdi_Y_28(pel *pSrc, pel *dst, int i_dst, int uiDirMode, - - // padding - if (real_size < line_size) { -+ int pad1, pad2; - first_line[i - 1] = first_line[i - 3]; - - pad1 = first_line[i - 2]; -diff --git a/source/decore/inv_trans.c b/source/decore/inv_trans.c -index 2be533a..2d60b20 100644 ---- a/source/decore/inv_trans.c -+++ b/source/decore/inv_trans.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/modules.h b/source/decore/modules.h -index 026d237..00d65b1 100644 ---- a/source/decore/modules.h -+++ b/source/decore/modules.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/pic_manager.c b/source/decore/pic_manager.c -index 1c9be09..1a09a38 100644 ---- a/source/decore/pic_manager.c -+++ b/source/decore/pic_manager.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/recon.c b/source/decore/recon.c -index c6466ba..951957a 100644 ---- a/source/decore/recon.c -+++ b/source/decore/recon.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/sao.c b/source/decore/sao.c -index b39466d..9004046 100644 ---- a/source/decore/sao.c -+++ b/source/decore/sao.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/sse/alf_sse.c b/source/decore/sse/alf_sse.c -index 2880605..24e203e 100644 ---- a/source/decore/sse/alf_sse.c -+++ b/source/decore/sse/alf_sse.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/sse/deblock_sse.c b/source/decore/sse/deblock_sse.c -index 271c2fc..ab88636 100644 ---- a/source/decore/sse/deblock_sse.c -+++ b/source/decore/sse/deblock_sse.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/sse/inter_pred_sse.c b/source/decore/sse/inter_pred_sse.c -index 170d079..7faf0d7 100644 ---- a/source/decore/sse/inter_pred_sse.c -+++ b/source/decore/sse/inter_pred_sse.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -55,25 +50,59 @@ void uavs3d_if_cpy_sse(const pel *src, int i_src, pel *dst, int i_dst, int width - - void uavs3d_if_cpy_w4_sse(const pel *src, int i_src, pel *dst, int i_dst, int width, int height) - { -- while (height) { -+ if (height < 4) { - CP32(dst, src); - CP32(dst + i_dst, src + i_src); -- height -= 2; -- src += i_src << 1; -- dst += i_dst << 1; -+ } -+ else { -+ int i_src2 = i_src << 1; -+ int i_dst2 = i_dst << 1; -+ int i_src3 = i_src + i_src2; -+ int i_dst3 = i_dst + i_dst2; -+ int i_src4 = i_src << 2; -+ int i_dst4 = i_dst << 2; -+ while (height > 0) { -+ CP32(dst, src); -+ CP32(dst + i_dst, src + i_src); -+ CP32(dst + i_dst2, src + i_src2); -+ CP32(dst + i_dst3, src + i_src3); -+ height -= 4; -+ src += i_src4; -+ dst += i_dst4; -+ } - } - } - - void uavs3d_if_cpy_w8_sse(const pel *src, int i_src, pel *dst, int i_dst, int width, int height) - { -- int i_src2 = i_src << 1; -- int i_dst2 = i_dst << 1; -- while (height) { -- CP64(dst, src); -- CP64(dst + i_dst, src + i_src); -- src += i_src2; -- dst += i_dst2; -- height -= 2; -+ if (height < 4) { -+ __m128i m0, m1; -+ m0 = _mm_loadl_epi64((const __m128i*)src); -+ m1 = _mm_loadl_epi64((const __m128i*)(src + i_src)); -+ _mm_storel_epi64((__m128i*)dst, m0); -+ _mm_storel_epi64((__m128i*)(dst + i_dst), m1); -+ } else { -+ __m128i m0, m1, m2, m3; -+ int i_src2 = i_src << 1; -+ int i_dst2 = i_dst << 1; -+ int i_src3 = i_src + i_src2; -+ int i_dst3 = i_dst + i_dst2; -+ int i_src4 = i_src << 2; -+ int i_dst4 = i_dst << 2; -+ while (height) { -+ m0 = _mm_loadl_epi64((const __m128i*)src); -+ m1 = _mm_loadl_epi64((const __m128i*)(src + i_src)); -+ m2 = _mm_loadl_epi64((const __m128i*)(src + i_src2)); -+ m3 = _mm_loadl_epi64((const __m128i*)(src + i_src3)); -+ height -= 4; -+ src += i_src4; -+ -+ _mm_storel_epi64((__m128i*)dst, m0); -+ _mm_storel_epi64((__m128i*)(dst + i_dst), m1); -+ _mm_storel_epi64((__m128i*)(dst + i_dst2), m2); -+ _mm_storel_epi64((__m128i*)(dst + i_dst3), m3); -+ dst += i_dst4; -+ } - } - } - -@@ -371,7 +400,7 @@ void uavs3d_if_hor_luma_w8_sse(const pel *src, int i_src, pel *dst, int i_dst, i - height -= 2; - - _mm_storel_epi64((__m128i*)dst, T0); -- M64(dst + i_dst) = _mm_extract_epi64(T0, 1); -+ _mm_storeh_pi((__m64*)(dst + i_dst), _mm_castsi128_ps(T0)); - - src += i_src << 1; - dst += i_dst << 1; -@@ -512,7 +541,6 @@ void uavs3d_if_ver_chroma_w16x_sse(const pel *src, int i_src, pel *dst, int i_ds - const int offset = 32; - const int shift = 6; - __m128i mAddOffset = _mm_set1_epi16(offset); -- pel const *p; - __m128i coeff0 = _mm_set1_epi16(*(s16*)coeff); - __m128i coeff1 = _mm_set1_epi16(*(s16*)(coeff + 2)); - __m128i mVal1, mVal2; -@@ -520,7 +548,7 @@ void uavs3d_if_ver_chroma_w16x_sse(const pel *src, int i_src, pel *dst, int i_ds - src -= i_src; - - while (height--) { -- p = src; -+ pel const *p = src; - uavs3d_prefetch(src + 4 * i_src, _MM_HINT_NTA); - for (col = 0; col < width; col += 16) { - __m128i T01 = _mm_loadu_si128((__m128i*)(p)); -@@ -739,7 +767,6 @@ void uavs3d_if_ver_luma_w16x_sse(const pel *src, int i_src, pel *dst, int i_dst, - int col; - const int offset = 32; - const int shift = 6; -- pel const *p; - __m128i mAddOffset = _mm_set1_epi16(offset); - __m128i coeff0 = _mm_set1_epi16(*(s16*)coeff); - __m128i coeff1 = _mm_set1_epi16(*(s16*)(coeff + 2)); -@@ -750,7 +777,7 @@ void uavs3d_if_ver_luma_w16x_sse(const pel *src, int i_src, pel *dst, int i_dst, - src -= 3 * i_src; - - while (height--) { -- p = src; -+ pel const *p = src; - uavs3d_prefetch(src + 8 * i_src, _MM_HINT_NTA); - for (col = 0; col < width; col += 16) { - __m128i T01 = _mm_loadu_si128((__m128i*)(p)); -@@ -811,7 +838,6 @@ void uavs3d_if_hor_ver_chroma_w8x_sse(const pel *src, int i_src, pel *dst, int i - { - int row, col; - int shift; -- s16 const *p; - ALIGNED_16(s16 tmp_res[(64 + 3) * 64*2]); - s16 *tmp = tmp_res; - const int i_tmp = width; -@@ -856,7 +882,7 @@ void uavs3d_if_hor_ver_chroma_w8x_sse(const pel *src, int i_src, pel *dst, int i - coeff1_ver = _mm_cvtepi8_epi16(coeff1_ver); - - while (height--) { -- p = tmp; -+ s16 const *p = tmp; - for (col = 0; col < width; col += 8) { - __m128i T00 = _mm_load_si128((__m128i*)(p)); - __m128i T10 = _mm_load_si128((__m128i*)(p + i_tmp)); -@@ -1411,7 +1437,6 @@ void uavs3d_if_hor_ver_luma_w8x_sse(const pel *src, int i_src, pel *dst, int i_d - { - int row, col; - int shift; -- s16 const *p; - - ALIGNED_16(s16 tmp_res[(128 + 7) * 128]); - s16 *tmp = tmp_res; -@@ -1473,7 +1498,7 @@ void uavs3d_if_hor_ver_luma_w8x_sse(const pel *src, int i_src, pel *dst, int i_d - mCoefy4_ver = _mm_cvtepi8_epi16(mCoefy4_ver); - - while (height--) { -- p = tmp; -+ s16 const *p = tmp; - for (col = 0; col < width; col += 8) { - __m128i T00 = _mm_load_si128((__m128i*)(p)); - __m128i T10 = _mm_load_si128((__m128i*)(p + i_tmp)); -@@ -2315,14 +2340,13 @@ void uavs3d_if_hor_ver_luma_w8_sse(const pel *src, int i_src, pel *dst, int i_ds - int rows; - int add1, shift1; - int add2, shift2; -- __m128i T0, T1, T2, T3, T4, T5, T6, T7; -+ __m128i T0, T1, T2, T3, T4, T5; - __m128i M0, M1, M2, M3, M4, M5, M6, M7; -- __m128i N0, N1, N2, N3, N4, N5, N6, N7; -- __m128i mCoef, offset, max_pel; -+ __m128i offset, max_pel; - ALIGNED_16(s16 tmp_res[(64 + 7) * 8]); - s16 *tmp = tmp_res; - const int i_tmp = 8; -- __m128i coeff00, coeff01, coeff02, coeff03; -+ __m128i mCoef0, mCoef1, mCoef2, mCoef3; - - if (max_val == 255) { // 8 bit_depth - shift1 = 0; -@@ -2338,110 +2362,129 @@ void uavs3d_if_hor_ver_luma_w8_sse(const pel *src, int i_src, pel *dst, int i_ds - - src += -3 * i_src - 3; - -- mCoef = _mm_loadl_epi64((__m128i*)coef_x); -- offset = _mm_set1_epi32(add1); -- mCoef = _mm_cvtepi8_epi16(mCoef); -- -- // HOR -- rows = height + 7; -- while (rows--) { -- uavs3d_prefetch(src + i_src, _MM_HINT_NTA); -- T0 = _mm_loadu_si128((__m128i*)(src + 0)); -- T1 = _mm_loadu_si128((__m128i*)(src + 1)); -- T2 = _mm_loadu_si128((__m128i*)(src + 2)); -- T3 = _mm_loadu_si128((__m128i*)(src + 3)); -- T4 = _mm_loadu_si128((__m128i*)(src + 4)); -- T5 = _mm_loadu_si128((__m128i*)(src + 5)); -- T6 = _mm_loadu_si128((__m128i*)(src + 6)); -- T7 = _mm_loadu_si128((__m128i*)(src + 7)); -- -- M0 = _mm_madd_epi16(T0, mCoef); -- M1 = _mm_madd_epi16(T1, mCoef); -- M2 = _mm_madd_epi16(T2, mCoef); -- M3 = _mm_madd_epi16(T3, mCoef); -- M4 = _mm_madd_epi16(T4, mCoef); -- M5 = _mm_madd_epi16(T5, mCoef); -- M6 = _mm_madd_epi16(T6, mCoef); -- M7 = _mm_madd_epi16(T7, mCoef); -+ { -+ __m128i mShuffle0 = _mm_setr_epi8(0, 1, 2, 3, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8, 9); -+ __m128i mShuffle1 = _mm_setr_epi8(4, 5, 6, 7, 6, 7, 8, 9, 8, 9, 10, 11, 10, 11, 12, 13); -+ __m128i S0, S1, S2; -+ -+ mCoef0 = _mm_set1_epi16(((s16*)coef_x)[0]); -+ mCoef1 = _mm_set1_epi16(((s16*)coef_x)[1]); -+ mCoef2 = _mm_set1_epi16(((s16*)coef_x)[2]); -+ mCoef3 = _mm_set1_epi16(((s16*)coef_x)[3]); -+ mCoef0 = _mm_cvtepi8_epi16(mCoef0); -+ mCoef1 = _mm_cvtepi8_epi16(mCoef1); -+ mCoef2 = _mm_cvtepi8_epi16(mCoef2); -+ mCoef3 = _mm_cvtepi8_epi16(mCoef3); -+ offset = _mm_set1_epi32(add1); -+ -+ // HOR -+ rows = height + 7; -+ while (rows--) { -+ S0 = _mm_loadu_si128((__m128i*)(src)); -+ S1 = _mm_loadu_si128((__m128i*)(src + 4)); -+ S2 = _mm_loadu_si128((__m128i*)(src + 8)); -+ src += i_src; -+ uavs3d_prefetch(src, _MM_HINT_NTA); -+ -+ T0 = _mm_shuffle_epi8(S0, mShuffle0); -+ T1 = _mm_shuffle_epi8(S0, mShuffle1); -+ T2 = _mm_shuffle_epi8(S1, mShuffle0); -+ T3 = _mm_shuffle_epi8(S1, mShuffle1); -+ T4 = _mm_shuffle_epi8(S2, mShuffle0); -+ T5 = _mm_shuffle_epi8(S2, mShuffle1); -+ -+ M0 = _mm_madd_epi16(T0, mCoef0); -+ M1 = _mm_madd_epi16(T1, mCoef1); -+ M2 = _mm_madd_epi16(T2, mCoef2); -+ M3 = _mm_madd_epi16(T3, mCoef3); -+ M4 = _mm_madd_epi16(T2, mCoef0); -+ M5 = _mm_madd_epi16(T3, mCoef1); -+ M6 = _mm_madd_epi16(T4, mCoef2); -+ M7 = _mm_madd_epi16(T5, mCoef3); - -- M0 = _mm_hadd_epi32(M0, M1); -- M1 = _mm_hadd_epi32(M2, M3); -- M2 = _mm_hadd_epi32(M4, M5); -- M3 = _mm_hadd_epi32(M6, M7); -+ M0 = _mm_add_epi32(M0, M1); -+ M1 = _mm_add_epi32(M2, M3); -+ M2 = _mm_add_epi32(M4, M5); -+ M3 = _mm_add_epi32(M6, M7); - -- M0 = _mm_hadd_epi32(M0, M1); -- M1 = _mm_hadd_epi32(M2, M3); -+ M0 = _mm_add_epi32(M0, M1); -+ M1 = _mm_add_epi32(M2, M3); - -- M2 = _mm_add_epi32(M0, offset); -- M3 = _mm_add_epi32(M1, offset); -- M2 = _mm_srai_epi32(M2, shift1); -- M3 = _mm_srai_epi32(M3, shift1); -- M2 = _mm_packs_epi32(M2, M3); -- _mm_storeu_si128((__m128i*)tmp, M2); -+ M2 = _mm_add_epi32(M0, offset); -+ M3 = _mm_add_epi32(M1, offset); -+ M2 = _mm_srai_epi32(M2, shift1); -+ M3 = _mm_srai_epi32(M3, shift1); -+ M2 = _mm_packs_epi32(M2, M3); -+ _mm_store_si128((__m128i*)tmp, M2); - -- tmp += i_tmp; -- src += i_src; -+ tmp += i_tmp; -+ } - } - -- offset = _mm_set1_epi32(add2); -- max_pel = _mm_set1_epi16((pel)max_val); -- tmp = tmp_res; -- -- coeff00 = _mm_set1_epi16(*(s16*)coef_y); -- coeff01 = _mm_set1_epi16(*(s16*)(coef_y + 2)); -- coeff02 = _mm_set1_epi16(*(s16*)(coef_y + 4)); -- coeff03 = _mm_set1_epi16(*(s16*)(coef_y + 6)); -- coeff00 = _mm_cvtepi8_epi16(coeff00); -- coeff01 = _mm_cvtepi8_epi16(coeff01); -- coeff02 = _mm_cvtepi8_epi16(coeff02); -- coeff03 = _mm_cvtepi8_epi16(coeff03); -- -- while (height--) { -- T0 = _mm_load_si128((__m128i*)(tmp)); -- T1 = _mm_load_si128((__m128i*)(tmp + i_tmp)); -- T2 = _mm_load_si128((__m128i*)(tmp + 2 * i_tmp)); -- T3 = _mm_load_si128((__m128i*)(tmp + 3 * i_tmp)); -- T4 = _mm_load_si128((__m128i*)(tmp + 4 * i_tmp)); -- T5 = _mm_load_si128((__m128i*)(tmp + 5 * i_tmp)); -- T6 = _mm_load_si128((__m128i*)(tmp + 6 * i_tmp)); -- T7 = _mm_load_si128((__m128i*)(tmp + 7 * i_tmp)); -+ { -+ __m128i N0, N1, N2, N3, N4, N5, N6, N7; -+ __m128i T6, T7; -+ -+ offset = _mm_set1_epi32(add2); -+ max_pel = _mm_set1_epi16((pel)max_val); -+ tmp = tmp_res; -+ -+ mCoef0 = _mm_set1_epi16(((s16*)coef_y)[0]); -+ mCoef1 = _mm_set1_epi16(((s16*)coef_y)[1]); -+ mCoef2 = _mm_set1_epi16(((s16*)coef_y)[2]); -+ mCoef3 = _mm_set1_epi16(((s16*)coef_y)[3]); -+ mCoef0 = _mm_cvtepi8_epi16(mCoef0); -+ mCoef1 = _mm_cvtepi8_epi16(mCoef1); -+ mCoef2 = _mm_cvtepi8_epi16(mCoef2); -+ mCoef3 = _mm_cvtepi8_epi16(mCoef3); -+ -+ while (height--) { -+ T0 = _mm_load_si128((__m128i*)(tmp)); -+ T1 = _mm_load_si128((__m128i*)(tmp + i_tmp)); -+ T2 = _mm_load_si128((__m128i*)(tmp + 2 * i_tmp)); -+ T3 = _mm_load_si128((__m128i*)(tmp + 3 * i_tmp)); -+ T4 = _mm_load_si128((__m128i*)(tmp + 4 * i_tmp)); -+ T5 = _mm_load_si128((__m128i*)(tmp + 5 * i_tmp)); -+ T6 = _mm_load_si128((__m128i*)(tmp + 6 * i_tmp)); -+ T7 = _mm_load_si128((__m128i*)(tmp + 7 * i_tmp)); - -- M0 = _mm_unpacklo_epi16(T0, T1); -- M1 = _mm_unpacklo_epi16(T2, T3); -- M2 = _mm_unpacklo_epi16(T4, T5); -- M3 = _mm_unpacklo_epi16(T6, T7); -- M4 = _mm_unpackhi_epi16(T0, T1); -- M5 = _mm_unpackhi_epi16(T2, T3); -- M6 = _mm_unpackhi_epi16(T4, T5); -- M7 = _mm_unpackhi_epi16(T6, T7); -+ M0 = _mm_unpacklo_epi16(T0, T1); -+ M1 = _mm_unpacklo_epi16(T2, T3); -+ M2 = _mm_unpacklo_epi16(T4, T5); -+ M3 = _mm_unpacklo_epi16(T6, T7); -+ M4 = _mm_unpackhi_epi16(T0, T1); -+ M5 = _mm_unpackhi_epi16(T2, T3); -+ M6 = _mm_unpackhi_epi16(T4, T5); -+ M7 = _mm_unpackhi_epi16(T6, T7); - -- N0 = _mm_madd_epi16(M0, coeff00); -- N1 = _mm_madd_epi16(M1, coeff01); -- N2 = _mm_madd_epi16(M2, coeff02); -- N3 = _mm_madd_epi16(M3, coeff03); -- N4 = _mm_madd_epi16(M4, coeff00); -- N5 = _mm_madd_epi16(M5, coeff01); -- N6 = _mm_madd_epi16(M6, coeff02); -- N7 = _mm_madd_epi16(M7, coeff03); -+ N0 = _mm_madd_epi16(M0, mCoef0); -+ N1 = _mm_madd_epi16(M1, mCoef1); -+ N2 = _mm_madd_epi16(M2, mCoef2); -+ N3 = _mm_madd_epi16(M3, mCoef3); -+ N4 = _mm_madd_epi16(M4, mCoef0); -+ N5 = _mm_madd_epi16(M5, mCoef1); -+ N6 = _mm_madd_epi16(M6, mCoef2); -+ N7 = _mm_madd_epi16(M7, mCoef3); - -- N0 = _mm_add_epi32(N0, N1); -- N1 = _mm_add_epi32(N2, N3); -- N2 = _mm_add_epi32(N4, N5); -- N3 = _mm_add_epi32(N6, N7); -+ N0 = _mm_add_epi32(N0, N1); -+ N1 = _mm_add_epi32(N2, N3); -+ N2 = _mm_add_epi32(N4, N5); -+ N3 = _mm_add_epi32(N6, N7); - -- N0 = _mm_add_epi32(N0, N1); -- N1 = _mm_add_epi32(N2, N3); -+ N0 = _mm_add_epi32(N0, N1); -+ N1 = _mm_add_epi32(N2, N3); - -- N0 = _mm_add_epi32(N0, offset); -- N1 = _mm_add_epi32(N1, offset); -- N0 = _mm_srai_epi32(N0, shift2); -- N1 = _mm_srai_epi32(N1, shift2); -- N0 = _mm_packus_epi32(N0, N1); -- N0 = _mm_min_epu16(N0, max_pel); -- _mm_storeu_si128((__m128i*)(dst), N0); -+ N0 = _mm_add_epi32(N0, offset); -+ N1 = _mm_add_epi32(N1, offset); -+ N0 = _mm_srai_epi32(N0, shift2); -+ N1 = _mm_srai_epi32(N1, shift2); -+ N0 = _mm_packus_epi32(N0, N1); -+ N0 = _mm_min_epu16(N0, max_pel); -+ _mm_storeu_si128((__m128i*)(dst), N0); - -- dst += i_dst; -- tmp += i_tmp; -+ dst += i_dst; -+ tmp += i_tmp; -+ } - } - } - -diff --git a/source/decore/sse/intra_pred_sse.c b/source/decore/sse/intra_pred_sse.c -index b877834..d77b556 100644 ---- a/source/decore/sse/intra_pred_sse.c -+++ b/source/decore/sse/intra_pred_sse.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -713,13 +708,14 @@ void uavs3d_ipred_chroma_hor_sse(pel *src, pel *dst, int i_dst, int width, int h - - void uavs3d_ipred_dc_sse(pel *src, pel *dst, int i_dst, int width, int height, u16 avail_cu, int bit_depth) - { -- int i, x, y; -+ int x, y; - int dc; - pel *p_src = src - 1; - int left_avail = IS_AVAIL(avail_cu, AVAIL_LE); - int above_avail = IS_AVAIL(avail_cu, AVAIL_UP); - - if (left_avail && above_avail) { -+ int i; - int length = width + height + 1; - __m128i sum = _mm_setzero_si128(); - __m128i val; -@@ -828,7 +824,7 @@ void uavs3d_ipred_dc_sse(pel *src, pel *dst, int i_dst, int width, int height, u - void uavs3d_ipred_chroma_dc_sse(pel *src, pel *dst, int i_dst, int width, int height, u16 avail_cu, int bit_depth) - { - __m128i T; -- int i, x, y; -+ int x, y; - int dcU, dcV; - pel *p_src = src - 2; - int left_avail = IS_AVAIL(avail_cu, AVAIL_LE); -@@ -838,6 +834,7 @@ void uavs3d_ipred_chroma_dc_sse(pel *src, pel *dst, int i_dst, int width, int he - int height2 = height << 1; - int wh = width + height; - int length = (wh << 1) + 2; // 2*(width + height + 1) -+ int i; - __m128i sum = _mm_setzero_si128(); - __m128i val; - -@@ -1787,7 +1784,6 @@ void uavs3d_ipred_ipf_s16_sse(pel *src, pel *dst, int i_dst, s16* pred, int flt_ - { - pel *p_top = src + 1; - int row; -- int max_val = (1 << bit_depth) - 1; - __m128i c_32 = _mm_set1_epi16(32); - __m128i zero = _mm_setzero_si128(); - if (w == 4) { -diff --git a/source/decore/sse/itrans_sse.c b/source/decore/sse/itrans_sse.c -index f7a5051..217e88e 100644 ---- a/source/decore/sse/itrans_sse.c -+++ b/source/decore/sse/itrans_sse.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/sse/pixel_sse.c b/source/decore/sse/pixel_sse.c -index 46ce33f..804b71d 100644 ---- a/source/decore/sse/pixel_sse.c -+++ b/source/decore/sse/pixel_sse.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/sse/sao_sse.c b/source/decore/sse/sao_sse.c -index 3459b3e..5f4723b 100644 ---- a/source/decore/sse/sao_sse.c -+++ b/source/decore/sse/sao_sse.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/sse/sse.c b/source/decore/sse/sse.c -index cb8c119..570edf5 100644 ---- a/source/decore/sse/sse.c -+++ b/source/decore/sse/sse.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/source/decore/sse/sse.h b/source/decore/sse/sse.h -index 967808a..4e10ab7 100644 ---- a/source/decore/sse/sse.h -+++ b/source/decore/sse/sse.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -45,12 +40,18 @@ - - #include "modules.h" - --#ifdef _WIN32 -- --#ifndef _WIN64 --#define _mm_extract_epi64(a, i) (a.m128i_i64[i]) --#endif -- -+#if __x86_64__ -+#elif __i386__ && !defined(_mm_extract_epi64) -+#define _mm_extract_epi64 _mm_extract_epi64 -+#include <stdint.h> -+static inline int64_t _mm_extract_epi64(__m128i a, const int imm8) { -+ return imm8 ? ((int64_t)_mm_extract_epi16(a, 7) << 48) | -+ ((int64_t)_mm_extract_epi16(a, 6) << 32) | -+ (_mm_extract_epi16(a, 5) << 16) | _mm_extract_epi16(a, 4) -+ : ((int64_t)_mm_extract_epi16(a, 3) << 48) | -+ ((int64_t)_mm_extract_epi16(a, 2) << 32) | -+ (_mm_extract_epi16(a, 1) << 16) | _mm_extract_epi16(a, 0); -+} - #endif - - ALIGNED_32(extern pel uavs3d_simd_mask[15][16]); -diff --git a/source/decore/threadpool.h b/source/decore/threadpool.h -index 3370beb..6a74bac 100644 ---- a/source/decore/threadpool.h -+++ b/source/decore/threadpool.h -@@ -11,9 +11,6 @@ typedef volatile long atom_t; // 32 bits, signed - #if defined(_WIN32) - #include "win32thread.h" - #else -- --#pragma comment(lib, "pthreadVC2.lib") -- - #include <pthread.h> - #define uavs3d_pthread_t pthread_t - #define uavs3d_pthread_create pthread_create -diff --git a/test/utest.c b/test/utest.c -index 724c7d8..e4df366 100644 ---- a/test/utest.c -+++ b/test/utest.c -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -@@ -202,8 +197,8 @@ static int app_img_write(char * fname, uavs3d_io_frm_t * img, com_seqh_t *seqhdr - return -1; - } - for (i = 0; i < 3; i++) { -- int hor_size = seqhdr->horizontal_size >> (i ? 1 : 0); -- int ver_size = seqhdr->vertical_size >> (i ? 1 : 0); -+ int hor_size = seqhdr->display_horizontal_size >> (i ? 1 : 0); -+ int ver_size = seqhdr->display_vertical_size >> (i ? 1 : 0); - unsigned char * p8 = (unsigned char *)img->buffer[i]; - - for (j = 0; j < ver_size; j++) { -@@ -412,10 +407,13 @@ void output_callback(uavs3d_io_frm_t *frm) { - } - - #if defined(__APPLE__) && (defined(__arm64__) || defined(__ARM_NEON__)) --int uavs3d_decode_sample(int argc, const char **argv) --#else --int main(int argc, const char **argv) -+#include <TargetConditionals.h> -+#if !TARGET_OS_OSX -+#define main uavs3d_decode_sample -+#endif - #endif -+ -+int main(int argc, const char **argv) - { - int decoding = 1; - unsigned char * bs_buf = NULL; -@@ -465,7 +463,7 @@ int main(int argc, const char **argv) - dec_cfg.log_level = 1; - dec_cfg.frm_threads = 1; - -- if (argc < 2) { -+ if ((argc < 2) || !(argc % 2)) { - log_level_0("Error config, please check arguments: \n"); - print_help(); - return -1; -@@ -588,8 +586,8 @@ finished: - if (frame_num) { - width = dec_frame.width[0]; - height = dec_frame.height[0]; -- hor_size = dec_frame.seqhdr->horizontal_size; -- ver_size = dec_frame.seqhdr->vertical_size; -+ hor_size = dec_frame.seqhdr->display_horizontal_size; -+ ver_size = dec_frame.seqhdr->display_vertical_size; - - log_level_1("=========================================================================================\n"); - log_level_1(" Resolution = %d x %d (Coding: %d x %d)\n", hor_size, ver_size, width, height); -diff --git a/test/utest.h b/test/utest.h -index aceb8a4..1dbd239 100644 ---- a/test/utest.h -+++ b/test/utest.h -@@ -1,5 +1,5 @@ - /************************************************************************************** -- * Copyright (c) 2018-2020 ["Peking University Shenzhen Graduate School", -+ * Copyright (c) 2018-2022 ["Peking University Shenzhen Graduate School", - * "Peng Cheng Laboratory", and "Guangdong Bohua UHD Innovation Corporation"] - * - * All rights reserved. -@@ -11,12 +11,7 @@ - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes the software uAVS3d developed by -- * Peking University Shenzhen Graduate School, Peng Cheng Laboratory -- * and Guangdong Bohua UHD Innovation Corporation. -- * 4. Neither the name of the organizations (Peking University Shenzhen Graduate School, -+ * 3. Neither the name of the organizations (Peking University Shenzhen Graduate School, - * Peng Cheng Laboratory and Guangdong Bohua UHD Innovation Corporation) nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. -diff --git a/version.sh b/version.sh -index 65e2df7..034d454 100755 ---- a/version.sh -+++ b/version.sh -@@ -15,12 +15,12 @@ else - shell_dir=$1 - fi - --VER_R=`git rev-list origin/master | sort | wc -l | gawk '{print $1}'` --VER_L=`git rev-list HEAD | sort | wc -l | gawk '{print $1}'` -+VER_R=`git rev-list origin/master | sort | wc -l | awk '{print $1}'` -+VER_L=`git rev-list HEAD | sort | wc -l | awk '{print $1}'` - VER_SHA1=`git log -n 1 | head -n 1 | cut -d ' ' -f 2` - - major_version="1" --minor_version="1" -+minor_version="2" - type_version="release" - - # generate the file version.h diff --git a/multimedia/uavs3d/fix-libdir-in-cmakelists.patch b/multimedia/uavs3d/fix-libdir.patch index 375a1e87e2..1a8dc3ed44 100644 --- a/multimedia/uavs3d/fix-libdir-in-cmakelists.patch +++ b/multimedia/uavs3d/fix-libdir.patch @@ -1,11 +1,11 @@ ---- /home/ben/sbo/ff/uavs3d/source/CMakeLists.txt 2024-02-21 15:38:58.265755999 +0530 -+++ /home/ben/sbo/ff/uavs3d/source/CMakeListsn.txt 2024-02-21 16:03:45.133751729 +0530 +--- CMakeLists.txt 2023-02-23 08:04:14.000000000 +0530 ++++ CMakeListsn.txt 2024-04-29 23:03:55.252641340 +0530 @@ -13,6 +13,8 @@ " Unexpected pointer size ${CMAKE_SIZEOF_VOID_P} for ${CMAKE_SYSTEM_PROCESSOR}\n") endif() elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386" OR + "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i586" OR -+ "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686" OR ++ "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86") set(UAVS3D_TARGET_CPU "x86") elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64" OR diff --git a/multimedia/uavs3d/uavs3d.SlackBuild b/multimedia/uavs3d/uavs3d.SlackBuild index 141e072f29..f49506bf41 100644 --- a/multimedia/uavs3d/uavs3d.SlackBuild +++ b/multimedia/uavs3d/uavs3d.SlackBuild @@ -25,17 +25,19 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=uavs3d -VERSION=${VERSION:-1.1} +VERSION=${VERSION:-1fd0491_20230223} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} sys_arch=${sys_arch:-$(uname -m)} +COMMIT=${COMMIT:-1fd04917cff50fac72ae23e45f82ca6fd9130bd8} +COMMITDATE=${COMMITDATE:-20230223} case "$sys_arch" in i586) export ARCH=i586 ;; i686) export ARCH=i686 ;; x86_64) export ARCH=x86_64 ;; - *) echo "This program will not build on $sys_arch platform" && exit 1 ;; + *) echo "This SlackBuild will not build on $sys_arch platform" && exit 1 ;; esac TMP=${TMP:-/tmp/SBo} @@ -52,7 +54,7 @@ elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fPIC" LIBDIRSUFFIX="64" else - echo "This program will not build on $sys_arch platform" && exit 1 + echo "This SlackBuild will not build on $sys_arch platform" && exit 1 fi if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then @@ -66,9 +68,9 @@ trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ER rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$COMMIT +tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz +cd $PRGNAM-$COMMIT chown -R root:root . find -L . \ @@ -77,14 +79,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 --verbose --unified < $CWD/fix-build-issue.patch cd source -patch --verbose --unified < $CWD/fix-libdir-in-cmakelists.patch +patch --verbose --unified < $CWD/fix-libdir.patch cd .. mkdir -pv build/linux -cmake -B build/linux -S $TMP/$PRGNAM-$VERSION \ +cmake -B build/linux -S $TMP/$PRGNAM-$COMMIT \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE:STRING=Release \ @@ -95,9 +96,9 @@ cmake -B build/linux -S $TMP/$PRGNAM-$VERSION \ cmake --build build/linux -make -C $TMP/$PRGNAM-$VERSION/build/linux DESTDIR="$PKG" install +make -C $TMP/$PRGNAM-$COMMIT/build/linux DESTDIR="$PKG" install -install -D -m755 $TMP/$PRGNAM-$VERSION/build/linux/uavs3dec -t "$PKG/usr/bin" +install -D -m755 $TMP/$PRGNAM-$COMMIT/build/linux/uavs3dec -t "$PKG/usr/bin" find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true diff --git a/multimedia/uavs3d/uavs3d.info b/multimedia/uavs3d/uavs3d.info index ee0adc5d16..940e617735 100644 --- a/multimedia/uavs3d/uavs3d.info +++ b/multimedia/uavs3d/uavs3d.info @@ -1,8 +1,8 @@ PRGNAM="uavs3d" -VERSION="1.1" +VERSION="1fd0491_20230223" HOMEPAGE="https://github.com/uavs3/uavs3d" -DOWNLOAD="https://github.com/uavs3/uavs3d/archive/v1.1/uavs3d-1.1.tar.gz" -MD5SUM="a22d9d4f1da4d1e2d0b19a25754505c3" +DOWNLOAD="https://github.com/uavs3/uavs3d/archive/1fd0491/uavs3d-1fd04917cff50fac72ae23e45f82ca6fd9130bd8.tar.gz" +MD5SUM="347425aec780f5dfee3baa768bca02aa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/vgmplay/slack-desc b/multimedia/vgmplay/slack-desc index ca06884d2e..a98490474a 100644 --- a/multimedia/vgmplay/slack-desc +++ b/multimedia/vgmplay/slack-desc @@ -10,7 +10,7 @@ vgmplay: vgmplay (the official player for VGM files) vgmplay: vgmplay: vgmplay is a player of the VGM chiptune format. vgmplay: -vgmplay: Homepage: https://github.com/vgmrips/vgmplay +vgmplay: Homepage: https://github.com/vgmrips/vgmplay-legacy vgmplay: vgmplay: vgmplay: diff --git a/multimedia/vgmplay/vgmplay.SlackBuild b/multimedia/vgmplay/vgmplay.SlackBuild index 00df60594f..bb711c82a5 100644 --- a/multimedia/vgmplay/vgmplay.SlackBuild +++ b/multimedia/vgmplay/vgmplay.SlackBuild @@ -38,9 +38,6 @@ case "$( uname -m )" in esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -69,9 +66,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION/VGMPlay +rm -rf $PRGNAM-legacy-$VERSION +tar xvf $CWD/$PRGNAM-legacy-$VERSION.tar.gz +cd $PRGNAM-legacy-$VERSION/VGMPlay chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/multimedia/vgmplay/vgmplay.info b/multimedia/vgmplay/vgmplay.info index 2d26e2fb13..cac830b2da 100644 --- a/multimedia/vgmplay/vgmplay.info +++ b/multimedia/vgmplay/vgmplay.info @@ -1,8 +1,8 @@ PRGNAM="vgmplay" VERSION="0.40.9" -HOMEPAGE="https://github.com/vgmrips/vgmplay" -DOWNLOAD="https://github.com/vgmrips/vgmplay/archive/0.40.9/vgmplay-0.40.9.tar.gz" -MD5SUM="a2217e465c5e3bdebc47dbb15a6cb436" +HOMEPAGE="https://github.com/vgmrips/vgmplay-legacy" +DOWNLOAD="https://github.com/vgmrips/vgmplay-legacy/archive/0.40.9/vgmplay-legacy-0.40.9.tar.gz" +MD5SUM="89097227705321156c0b319f5e0d529d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/videomass/videomass.SlackBuild b/multimedia/videomass/videomass.SlackBuild index c7a39d82ce..918852c087 100644 --- a/multimedia/videomass/videomass.SlackBuild +++ b/multimedia/videomass/videomass.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=videomass -VERSION=${VERSION:-5.0.11} +VERSION=${VERSION:-5.0.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/videomass/videomass.info b/multimedia/videomass/videomass.info index 55d41f4021..9cb9fec1bb 100644 --- a/multimedia/videomass/videomass.info +++ b/multimedia/videomass/videomass.info @@ -1,8 +1,8 @@ PRGNAM="videomass" -VERSION="5.0.11" +VERSION="5.0.13" HOMEPAGE="http://jeanslack.github.io/Videomass/" -DOWNLOAD="https://github.com/jeanslack/Videomass/archive/v5.0.11/Videomass-5.0.11.tar.gz" -MD5SUM="abc76d66e7731f031c3a6bc98406d58f" +DOWNLOAD="https://github.com/jeanslack/Videomass/archive/v5.0.13/Videomass-5.0.13.tar.gz" +MD5SUM="476e33dfac4bfeb5fcac895b4202dad2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxPython4 python3-pubsub" diff --git a/multimedia/vlc/4645.patch b/multimedia/vlc/4645.patch new file mode 100644 index 0000000000..bd26976fbc --- /dev/null +++ b/multimedia/vlc/4645.patch @@ -0,0 +1,177 @@ +From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001 +From: Thomas Guillem <thomas@gllm.fr> +Date: Tue, 5 Dec 2023 09:23:35 +0100 +Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment + +Fixes #28441 +--- + src/input/input_internal.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/input/input_internal.h b/src/input/input_internal.h +index d29731edca1b..ea02f39f5add 100644 +--- a/src/input/input_internal.h ++++ b/src/input/input_internal.h +@@ -117,7 +117,7 @@ typedef struct input_thread_private_t + + /* Title infos FIXME multi-input (not easy) ? */ + int i_title; +- const input_title_t **title; ++ input_title_t * const *title; + + int i_title_offset; + int i_seekpoint_offset; +-- +GitLab + + +From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001 +From: Zhao Zhili <quinkblack@foxmail.com> +Date: Thu, 1 Mar 2018 14:25:59 +0800 +Subject: [PATCH 2/5] yadif: fix variable type + +Signed-off-by: Thomas Guillem <thomas@gllm.fr> +(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60) +Signed-off-by: Thomas Guillem <thomas@gllm.fr> +--- + modules/video_filter/deinterlace/yadif.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h +index 4bc592ba9307..af16443d0804 100644 +--- a/modules/video_filter/deinterlace/yadif.h ++++ b/modules/video_filter/deinterlace/yadif.h +@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8 + } + + static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) { +- uint8_t *dst = (uint8_t *)dst8; +- uint8_t *prev = (uint8_t *)prev8; +- uint8_t *cur = (uint8_t *)cur8; +- uint8_t *next = (uint8_t *)next8; ++ uint16_t *dst = (uint16_t *)dst8; ++ uint16_t *prev = (uint16_t *)prev8; ++ uint16_t *cur = (uint16_t *)cur8; ++ uint16_t *next = (uint16_t *)next8; + int x; + uint16_t *prev2= parity ? prev : cur ; + uint16_t *next2= parity ? cur : next; +-- +GitLab + + +From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Sun, 3 Mar 2019 09:59:10 +0200 +Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion + +(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058) +Signed-off-by: Thomas Guillem <thomas@gllm.fr> +--- + modules/video_chroma/swscale.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c +index 8993d11ec5dd..11897527355c 100644 +--- a/modules/video_chroma/swscale.c ++++ b/modules/video_chroma/swscale.c +@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, + { + filter_sys_t *p_sys = p_filter->p_sys; + uint8_t palette[AVPALETTE_SIZE]; +- uint8_t *src[4]; int src_stride[4]; +- uint8_t *dst[4]; int dst_stride[4]; ++ uint8_t *src[4], *dst[4]; ++ const uint8_t *csrc[4]; ++ int src_stride[4], dst_stride[4]; + + GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video, + p_src, i_plane_count, b_swap_uvi ); +@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, + GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video, + p_dst, i_plane_count, b_swap_uvo ); + ++ for (size_t i = 0; i < ARRAY_SIZE(src); i++) ++ csrc[i] = src[i]; ++ + #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) +- sws_scale( ctx, src, src_stride, 0, i_height, ++ sws_scale( ctx, csrc, src_stride, 0, i_height, + dst, dst_stride ); + #else +- sws_scale_ordered( ctx, src, src_stride, 0, i_height, ++ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height, + dst, dst_stride ); + #endif + } +-- +GitLab + + +From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Sun, 3 Mar 2019 17:20:04 +0200 +Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing + +(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35) +Signed-off-by: Thomas Guillem <thomas@gllm.fr> +--- + modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +index a93462925e8a..a85f9aafb0b9 100644 +--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c ++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] = + void RegisterCommand( filter_t *p_filter ) + { + filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; +- size_t i_index = 0; + + p_sys->i_commands = ARRAY_SIZE(p_commands); + p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) ); + if( !p_sys->pp_commands ) return; +- for( i_index = 0; i_index < p_sys->i_commands; i_index ++ ) ++ for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ ) + { + p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) ); + if( !p_sys->pp_commands[i_index] ) return; +-- +GitLab + + +From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Mon, 26 Feb 2018 20:43:03 +0200 +Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption + +Font alpha is 8-bits, not 32-bits. + +(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0) +Signed-off-by: Thomas Guillem <thomas@gllm.fr> +--- + modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +index a85f9aafb0b9..7a71c6f2373a 100644 +--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c ++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end, + skip_space( &psz_command ); + if( isdigit( (unsigned char)*psz_command ) ) + { +- if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC ) ++ int32_t value; ++ ++ if( parse_digit( &psz_command, &value ) == VLC_EGENERIC ) + return VLC_EGENERIC; ++ ++ p_params->fontstyle.i_font_alpha = value; + } + return VLC_SUCCESS; + } +-- +GitLab + diff --git a/multimedia/vlc/4665.patch b/multimedia/vlc/4665.patch new file mode 100644 index 0000000000..47e5847d05 --- /dev/null +++ b/multimedia/vlc/4665.patch @@ -0,0 +1,375 @@ +From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Mon, 26 Feb 2018 20:36:29 +0200 +Subject: [PATCH 1/9] chromaprint: missing cast + +(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547) +Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> +--- + modules/stream_out/chromaprint.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c +index 80ec31ba2590..c76cbda3c2bb 100644 +--- a/modules/stream_out/chromaprint.c ++++ b/modules/stream_out/chromaprint.c +@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, + if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer ) + { + if(! chromaprint_feed( p_sys->p_chromaprint_ctx, +- p_buf->p_buffer, ++ (int16_t *)p_buf->p_buffer, + p_buf->i_buffer / BYTESPERSAMPLE ) ) + msg_Warn( p_stream, "feed error" ); + id->i_samples -= i_samples; +-- +GitLab + + +From 6179d6b843f2a93af6a3d51c4244766e3eba9e77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Sun, 14 Apr 2019 09:41:38 +0300 +Subject: [PATCH 2/9] win32: wrap {g,s}etsockopt() + +char * can alias anything, and Winsock relies on that. Unfortunately, +the compiler still issues warnings. This works around that. + +(cherry picked from commit 36715d9b79f34824e126c2bc3aee2f1c1c16af46) +Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> +--- + include/vlc_network.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/include/vlc_network.h b/include/vlc_network.h +index 010454a01c09..e39ffd0bacaa 100644 +--- a/include/vlc_network.h ++++ b/include/vlc_network.h +@@ -183,6 +183,22 @@ VLC_API int vlc_close(int); + + /** @} */ + ++#ifdef _WIN32 ++static inline int vlc_getsockopt(int s, int level, int name, ++ void *val, socklen_t *len) ++{ ++ return getsockopt(s, level, name, (char *)val, len); ++} ++#define getsockopt vlc_getsockopt ++ ++static inline int vlc_setsockopt(int s, int level, int name, ++ const void *val, socklen_t len) ++{ ++ return setsockopt(s, level, name, (const char *)val, len); ++} ++#define setsockopt vlc_setsockopt ++#endif ++ + /* Portable network names/addresses resolution layer */ + + #define NI_MAXNUMERICHOST 64 +-- +GitLab + + +From 3391108f9709f0d77d9297c94371cf9cd30f2cbe Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Thu, 7 Dec 2023 15:43:04 +0100 +Subject: [PATCH 3/9] netsync: use char for temporary local buffer + +On Windows recvfrom/revc/sendto expects a char*. +--- + modules/control/netsync.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/modules/control/netsync.c b/modules/control/netsync.c +index 2a6a1a6a2bf8..8c91034d7cf2 100644 +--- a/modules/control/netsync.c ++++ b/modules/control/netsync.c +@@ -181,7 +181,7 @@ static void *Master(void *handle) + intf_sys_t *sys = intf->p_sys; + for (;;) { + struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; +- uint64_t data[2]; ++ char data[16]; + + if (poll(&ufd, 1, -1) < 0) + continue; +@@ -198,8 +198,8 @@ static void *Master(void *handle) + if (master_system < 0) + continue; + +- data[0] = hton64(mdate()); +- data[1] = hton64(master_system); ++ SetQWBE(&data[0], mdate()); ++ SetQWBE(&data[8], master_system); + + /* Reply to the sender */ + sendto(sys->fd, data, 16, 0, +@@ -224,7 +224,7 @@ static void *Slave(void *handle) + + for (;;) { + struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; +- uint64_t data[2]; ++ char data[16]; + + vlc_tick_t system = GetPcrSystem(sys->input); + if (system < 0) +@@ -233,7 +233,7 @@ static void *Slave(void *handle) + /* Send clock request to the master */ + const vlc_tick_t send_date = mdate(); + +- data[0] = hton64(system); ++ SetQWBE(&data[0], system); + send(sys->fd, data, 8, 0); + + /* Don't block */ +@@ -244,8 +244,8 @@ static void *Slave(void *handle) + if (recv(sys->fd, data, 16, 0) < 16) + goto wait; + +- const vlc_tick_t master_date = ntoh64(data[0]); +- const vlc_tick_t master_system = ntoh64(data[1]); ++ const vlc_tick_t master_date = GetQWBE(&data[0]); ++ const vlc_tick_t master_system = GetQWBE(&data[8]); + const vlc_tick_t diff_date = receive_date - + ((receive_date - send_date) / 2 + master_date); + +-- +GitLab + + +From 27e584d7b9add8dbbb82b7227228e1ec1e25a089 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Tue, 3 Jan 2023 13:23:00 +0100 +Subject: [PATCH 4/9] access/dtv: move the lfind() Windows hack in the module + +So that we don't have to include search.h each time vlc_fixups.h is used. + +The Win32 prototype of lfind() expects an unsigned* for 'nelp', not a size_t*. + +(cherry picked from commit 7c43bcba27b6fe256456d93a9d32e10648f08da8) +Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> +--- + include/vlc_fixups.h | 3 +++ + modules/access/dtv/access.c | 5 +++++ + 2 files changed, 8 insertions(+) + +diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h +index 37f788933779..861cb4cc5063 100644 +--- a/include/vlc_fixups.h ++++ b/include/vlc_fixups.h +@@ -501,8 +501,11 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void + void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) ); + void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); + void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) ); ++#ifndef _WIN32 ++/* the Win32 prototype of lfind() expects an unsigned* for 'nmemb' */ + void *lfind( const void *key, const void *base, size_t *nmemb, + size_t size, int(*cmp)(const void *, const void *) ); ++#endif + #endif /* HAVE_SEARCH_H */ + #ifndef HAVE_TDESTROY + void tdestroy( void *root, void (*free_node)(void *nodep) ); +diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c +index d9756c7b4885..c6ca5005883c 100644 +--- a/modules/access/dtv/access.c ++++ b/modules/access/dtv/access.c +@@ -32,6 +32,11 @@ + #ifdef HAVE_SEARCH_H + #include <search.h> + #endif ++#if defined(_WIN32) ++/* the Win32 prototype of lfind() expects an unsigned* for 'nelp' */ ++# define lfind(a,b,c,d,e) \ ++ lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e)) ++#endif + + #include "dtv/dtv.h" + +-- +GitLab + + +From 5a9ca37a95b6e85e6beaaefba9aa4a886a45411c Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Mon, 15 Jul 2019 12:41:29 +0200 +Subject: [PATCH 5/9] vlc_common: fix swab() calls on win32 that don't use + const on source pointer + +(cherry picked from commit a9e0b1124e19225b903a2926951781e84002c410) +Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> +--- + include/vlc_common.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/include/vlc_common.h b/include/vlc_common.h +index 8090b277150d..089878581763 100644 +--- a/include/vlc_common.h ++++ b/include/vlc_common.h +@@ -947,6 +947,11 @@ static inline void SetQWLE (void *p, uint64_t qw) + # define O_NONBLOCK 0 + # endif + ++/* the mingw32 swab() and win32 _swab() prototypes expect a char* instead of a ++ const void* */ ++# define swab(a,b,c) swab((char*) (a), (char*) (b), (c)) ++ ++ + # include <tchar.h> + #endif /* _WIN32 */ + +-- +GitLab + + +From b758e19479a80604e3feb470b197e4a13a203a85 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Wed, 10 Jul 2019 08:23:45 +0200 +Subject: [PATCH 6/9] avcodec: encoder: fix MPEG4 matrix passed as const + +lavc expects a pointer that it will free in avcodec_free_context(). + +(cherry picked from commit d86c4c87aa78130a4fd00294e25df865d0e2b327) +Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> +--- + modules/codec/avcodec/encoder.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c +index 2b1c3604713d..4919ccf0e0e4 100644 +--- a/modules/codec/avcodec/encoder.c ++++ b/modules/codec/avcodec/encoder.c +@@ -588,8 +588,14 @@ int InitVideoEnc( vlc_object_t *p_this ) + + if ( p_sys->b_mpeg4_matrix ) + { +- p_context->intra_matrix = mpeg4_default_intra_matrix; +- p_context->inter_matrix = mpeg4_default_non_intra_matrix; ++ p_context->intra_matrix = av_malloc( sizeof(mpeg4_default_intra_matrix) ); ++ if ( p_context->intra_matrix ) ++ memcpy( p_context->intra_matrix, mpeg4_default_intra_matrix, ++ sizeof(mpeg4_default_intra_matrix)); ++ p_context->inter_matrix = av_malloc( sizeof(mpeg4_default_non_intra_matrix) ); ++ if ( p_context->inter_matrix ) ++ memcpy( p_context->inter_matrix, mpeg4_default_non_intra_matrix, ++ sizeof(mpeg4_default_non_intra_matrix)); + } + + if ( p_sys->b_pre_me ) +-- +GitLab + + +From 55be3ce60795a09d13861c5637c1fe7aebc5ce8b Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Thu, 7 Dec 2023 14:18:22 +0100 +Subject: [PATCH 7/9] smb: fix potential string to wide string copy + +The type of net_resource depends on the UNICODE define. +--- + modules/access/smb.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/access/smb.c b/modules/access/smb.c +index 5fe56f0c9dfe..6add2a3e6278 100644 +--- a/modules/access/smb.c ++++ b/modules/access/smb.c +@@ -524,7 +524,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, + const char *psz_pwd, const char *psz_domain ) + { + char psz_remote[MAX_PATH]; +- NETRESOURCE net_resource; ++ NETRESOURCEA net_resource; + DWORD i_result; + VLC_UNUSED( psz_domain ); + +@@ -544,7 +544,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, + + net_resource.lpRemoteName = psz_remote; + +- i_result = WNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 ); ++ i_result = WNetAddConnection2A( &net_resource, psz_pwd, psz_user, 0 ); + + if( i_result != NO_ERROR ) + { +-- +GitLab + + +From 5ae924bf212dce64a6424561d92426dbcc2cf3a0 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Wed, 6 Dec 2023 14:45:46 +0100 +Subject: [PATCH 8/9] dxva2: add missing mask initializers + +--- + modules/codec/avcodec/dxva2.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c +index 18b872fe0fe3..2e6809a05410 100644 +--- a/modules/codec/avcodec/dxva2.c ++++ b/modules/codec/avcodec/dxva2.c +@@ -84,12 +84,12 @@ DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, + + /* XXX Preferred format must come first */ + static const d3d9_format_t d3d_formats[] = { +- { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12 }, +- { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12 }, +- //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12 }, +- { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010 }, ++ { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12, 0,0,0 }, ++ { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12, 0,0,0 }, ++ //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12, 0,0,0 }, ++ { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010, 0,0,0 }, + +- { NULL, 0, 0 } ++ { NULL, 0, 0, 0,0,0 } + }; + + static const d3d9_format_t *D3dFindFormat(D3DFORMAT format) +-- +GitLab + + +From 08c7a66780740679ba1b0abe9e30e73afc6bc271 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Wed, 6 Dec 2023 07:48:29 +0100 +Subject: [PATCH 9/9] win32/modules: use cast with GetProcAddress function + pointers + +--- + src/text/url.c | 3 ++- + src/win32/plugin.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/text/url.c b/src/text/url.c +index b962eb31f849..2eb4b8d10817 100644 +--- a/src/text/url.c ++++ b/src/text/url.c +@@ -892,7 +892,8 @@ static int IdnToAscii(DWORD flags, LPCWSTR str, int len, LPWSTR buf, int size) + int (WINAPI *IdnToAsciiReal)(DWORD, LPCWSTR, int, LPWSTR, int); + int ret = 0; + +- IdnToAsciiReal = GetProcAddress(h, "IdnToAscii"); ++ IdnToAsciiReal = (int (WINAPI *)(DWORD, LPCWSTR, int, LPWSTR, int)) ++ GetProcAddress(h, "IdnToAscii"); + if (IdnToAsciiReal != NULL) + ret = IdnToAsciiReal(flags, str, len, buf, size); + else +diff --git a/src/win32/plugin.c b/src/win32/plugin.c +index 1a65521fca75..b5c336eb99ca 100644 +--- a/src/win32/plugin.c ++++ b/src/win32/plugin.c +@@ -45,7 +45,8 @@ static BOOL WINAPI SetThreadErrorModeFallback(DWORD mode, DWORD *oldmode) + + BOOL (WINAPI *SetThreadErrorModeReal)(DWORD, DWORD *); + +- SetThreadErrorModeReal = GetProcAddress(h, "SetThreadErrorMode"); ++ SetThreadErrorModeReal = (BOOL (WINAPI *)(DWORD, DWORD *)) ++ GetProcAddress(h, "SetThreadErrorMode"); + if (SetThreadErrorModeReal != NULL) + return SetThreadErrorModeReal(mode, oldmode); + +-- +GitLab + diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild index 15f5b8c261..5066701648 100644 --- a/multimedia/vlc/vlc.SlackBuild +++ b/multimedia/vlc/vlc.SlackBuild @@ -116,6 +116,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +patch -p1 < $CWD/4645.patch +patch -p1 < $CWD/4665.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ @@ -135,6 +138,7 @@ LDFLAGS="$SLKLDFLAGS" \ $runasroot \ $aom \ $lua +sed -i -e '/^#define _FORTIFY_SOURCE/d' config.h make make DESTDIR=$PKG install diff --git a/multimedia/vokoscreenNG/vokoscreenNG.SlackBuild b/multimedia/vokoscreenNG/vokoscreenNG.SlackBuild index 82876bc2fa..c157ca9020 100644 --- a/multimedia/vokoscreenNG/vokoscreenNG.SlackBuild +++ b/multimedia/vokoscreenNG/vokoscreenNG.SlackBuild @@ -78,7 +78,7 @@ find -L . \ patch -Np1 -i $CWD/0001-Add-better-integration-for-Linux.patch -qmake PREFIX=/usr QMAKE_CXXFLAGS="$SLKCFLAGS" src/vokoscreenNG.pro +qmake6 PREFIX=/usr QMAKE_CXXFLAGS="$SLKCFLAGS" src/vokoscreenNG.pro make make INSTALL_ROOT=$PKG install diff --git a/multimedia/vvenc/README b/multimedia/vvenc/README index e730b8c6df..4cc2bb4e6d 100644 --- a/multimedia/vvenc/README +++ b/multimedia/vvenc/README @@ -5,15 +5,6 @@ by running the following: vvencapp --help vvencFFapp --help -Two issues with the 32bit build currently exist: - - 1. VVenC does not currently build on 32bit Linux - although a fix for this is in progress upstream; - see Issue 242 on the VVenC github site. - 2. When failure to build is addressed it is unlikely - that the memory limits of 32bit processors will allow - effective encoding. - -Note that playback of H.266/VVC files is also currently a -little challenging under Linux, although 3rd party patches -for FFmpeg exist. +Note that playback of H.266/VVC files is currently a little +challenging under Linux, although 3rd party patches for FFmpeg +exist. diff --git a/multimedia/vvenc/vvenc.SlackBuild b/multimedia/vvenc/vvenc.SlackBuild index c2fbedcf44..c1f179f699 100644 --- a/multimedia/vvenc/vvenc.SlackBuild +++ b/multimedia/vvenc/vvenc.SlackBuild @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # Slackware build script for vvenc # -# Copyright (c) 2023 Andrew Strong, Blue Mountains, Australia. +# Copyright (c) 2023-2024 Andrew Strong, Blue Mountains, Australia. # # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vvenc -VERSION=${VERSION:-1.7.0} +VERSION=${VERSION:-1.11.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -86,6 +86,7 @@ cd build -DCMAKE_INSTALL_LIBDIR:PATH=lib${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_INCLUDEDIR:PATH=include \ -DBUILD_SHARED_LIBS=1 \ + -DVVENC_INSTALL_FULLFEATURE_APP=on \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/multimedia/vvenc/vvenc.info b/multimedia/vvenc/vvenc.info index af0bda914c..6751c31e78 100644 --- a/multimedia/vvenc/vvenc.info +++ b/multimedia/vvenc/vvenc.info @@ -1,10 +1,10 @@ PRGNAM="vvenc" -VERSION="1.7.0" +VERSION="1.11.1" HOMEPAGE="https://github.com/fraunhoferhhi/vvenc" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://github.com/fraunhoferhhi/vvenc/archive/v1.7.0/vvenc-1.7.0.tar.gz" -MD5SUM_x86_64="bd14534787f4180cd5bebb248b27285f" +DOWNLOAD="https://github.com/fraunhoferhhi/vvenc/archive/v1.11.1/vvenc-1.11.1.tar.gz" +MD5SUM="c3267221f7d0f74fe58d751188c2efbb" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Andrew Strong" EMAIL="andrew.david.strong@gmail.com" diff --git a/multimedia/w_scan_cpp/w_scan_cpp.SlackBuild b/multimedia/w_scan_cpp/w_scan_cpp.SlackBuild index d12732059e..8851345c45 100644 --- a/multimedia/w_scan_cpp/w_scan_cpp.SlackBuild +++ b/multimedia/w_scan_cpp/w_scan_cpp.SlackBuild @@ -26,10 +26,10 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=w_scan_cpp VERSION=${VERSION:-20231015} -VERSION_vdr=${VERSION_vdr:-2.6.5} +VERSION_vdr=${VERSION_vdr:-2.6.7} VERSION_satip=${VERSION_satip:-2.4.1} VERSION_wirbelscan=${VERSION_wirbelscan:-2023.10.15} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} NUMJOBS=${NUMJOBS:-" -j$(nproc) "} diff --git a/multimedia/w_scan_cpp/w_scan_cpp.info b/multimedia/w_scan_cpp/w_scan_cpp.info index fc22ea9bb1..2749833793 100644 --- a/multimedia/w_scan_cpp/w_scan_cpp.info +++ b/multimedia/w_scan_cpp/w_scan_cpp.info @@ -4,11 +4,11 @@ HOMEPAGE="https://www.gen2vdr.de/wirbel/w_scan_cpp/index2.html" DOWNLOAD="https://www.gen2vdr.de/wirbel/w_scan_cpp/w_scan_cpp-20231015.tar.bz2 \ https://www.gen2vdr.de/wirbel/wirbelscan/vdr-wirbelscan-2023.10.15.tgz \ https://github.com/rofafor/vdr-plugin-satip/archive/v2.4.1/vdr-plugin-satip-2.4.1.tar.gz \ - https://github.com/vdr-projects/vdr/archive/2.6.5/vdr-2.6.5.tar.gz" + https://github.com/vdr-projects/vdr/archive/2.6.7/vdr-2.6.7.tar.gz" MD5SUM="ac6bca5260c571f81648bf735c0731b8 \ 8a012699c1dd1e6ef9b8dd2ddc60d6af \ cd9ff5d2b47c3e55d64dbc375f84a5a7 \ - ded2dd49fd81368d5789393ed087c382" + 8da42e7f522f0a5c53ec28256275688e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pugixml librepfunc" diff --git a/multimedia/winff/changelog b/multimedia/winff/changelog index a67e2f90bc..e464b2ee64 100644 --- a/multimedia/winff/changelog +++ b/multimedia/winff/changelog @@ -121,3 +121,8 @@ Resubmit to SBo Modify the SlackBuild to avoid creating object code files to /usr/share/lazarus when compiling winff and remove unused function in doinst.sh Thanks to Andrew Clemons for pointing it out. + +27/04/2024: + +Updated to version 1.6.4 +Fixed dead links. Fix documentation to properly open the pdf. diff --git a/multimedia/winff/patches/unit1-pas.patch b/multimedia/winff/patches/unit1-pas.patch index 402e4634a9..cb6ddd2217 100644 --- a/multimedia/winff/patches/unit1-pas.patch +++ b/multimedia/winff/patches/unit1-pas.patch @@ -1,5 +1,5 @@ ---- unit1.pas 2023-10-03 19:20:47.000000000 +0530 -+++ unit1n.pas 2024-01-10 22:26:54.221464261 +0530 +--- unit1.pas 2024-04-17 01:41:03.000000000 +0530 ++++ unit1n.pas 2024-04-25 19:19:53.307142871 +0530 @@ -1,8 +1,8 @@ unit Unit1; @@ -9,35 +9,39 @@ -// http://winff.org +// https://github.com/WinFF/winff // Licensed under the GPL v3 or any later version - // + // This program is free software: you can redistribute it and/or modify -@@ -1988,16 +1988,16 @@ - language:=leftstr(lang,2); - {$ifdef unix} - s :=''; -- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf.gz'; -- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf'; -+ if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/doc/winff-20231003_31b79e3/WinFF.' + language + '.pdf.gz'; -+ if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf') then s:='/usr/doc/winff-20231003_31b79e3/WinFF.' + language + '.pdf'; - if fileexists('/usr/share/winff/WinFF.' + language + '.pdf') then s:='/usr/share/winff/WinFF.' + language + '.pdf'; - if fileexists('/usr/share/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/winff/WinFF.' + language + '.pdf.gz'; - if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz'; - if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf'; - if s='' then - begin -- s := '/usr/share/doc/winff/WinFF.en.pdf.gz'; -- if fileexists('/usr/share/doc/winff/WinFF.en.pdf') then s:='/usr/share/doc/winff/WinFF.en.pdf'; -+ s := '/usr/doc/winff-20231003_31b79e3/WinFF.en.pdf.gz'; -+ if fileexists('/usr/doc/winff-20231003_31b79e3/WinFF.en.pdf') then s:='/usr/doc/winff-20231003_31b79e3/WinFF.en.pdf'; - if fileexists('/usr/share/winff/WinFF.en.pdf') then s:='/usr/share/winff/WinFF.en.pdf'; - if fileexists('/usr/share/winff/WinFF.en.pdf.gz') then s:='/usr/share/winff/WinFF.en.pdf.gz'; - if fileexists('/usr/share/doc/packages/winff/WinFF.en.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.en.pdf.gz'; -@@ -2015,7 +2015,7 @@ +@@ -1795,20 +1795,12 @@ + language:=leftstr(lang,2); + {$ifdef unix} + s :=''; +- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf.gz'; +- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf'; +- if fileexists('/usr/share/winff/WinFF.' + language + '.pdf') then s:='/usr/share/winff/WinFF.' + language + '.pdf'; +- if fileexists('/usr/share/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/winff/WinFF.' + language + '.pdf.gz'; +- if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz'; +- if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf'; ++ if fileexists('/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf.gz') then s:='/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf.gz'; ++ if fileexists('/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf') then s:='/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf'; + if s='' then + begin +- s := '/usr/share/doc/winff/WinFF.en.pdf.gz'; +- if fileexists('/usr/share/doc/winff/WinFF.en.pdf') then s:='/usr/share/doc/winff/WinFF.en.pdf'; +- if fileexists('/usr/share/winff/WinFF.en.pdf') then s:='/usr/share/winff/WinFF.en.pdf'; +- if fileexists('/usr/share/winff/WinFF.en.pdf.gz') then s:='/usr/share/winff/WinFF.en.pdf.gz'; +- if fileexists('/usr/share/doc/packages/winff/WinFF.en.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.en.pdf.gz'; +- if fileexists('/usr/share/doc/packages/winff/WinFF.en.pdf') then s:='/usr/share/doc/packages/winff/WinFF.en.pdf'; ++ s := '/usr/doc/winff-1.6.4/WinFF.en.pdf.gz'; ++ if fileexists('/usr/doc/winff-1.6.4/WinFF.en.pdf') then s:='/usr/doc/winff-1.6.4/WinFF.en.pdf'; + end; + {$endif} + {$IFDEF WINDOWS} +@@ -1821,7 +1813,7 @@ + //menu: Help Forums procedure TfrmMain.mitForumsClick(Sender: TObject); - begin -- launchbrowser('https://groups.google.com/g/winff'); -+ launchbrowser('https://github.com/WinFF/winff/issues'); +- launchbrowser('https://groups.google.com/g/winff'); ++ launchbrowser('http://github.com/WinFF/winff/issues'); end; procedure TfrmMain.mitRestoreDefaultsClick(Sender: TObject); diff --git a/multimedia/winff/patches/unit3-pas.patch b/multimedia/winff/patches/unit3-pas.patch index 1d99d96642..5f8dd7c238 100644 --- a/multimedia/winff/patches/unit3-pas.patch +++ b/multimedia/winff/patches/unit3-pas.patch @@ -1,7 +1,8 @@ ---- unit3.pas 2024-02-19 19:19:13.000000000 +0530 -+++ unit3n.pas 2024-02-27 18:15:24.377843083 +0530 -@@ -1,8 +1,8 @@ - unit Unit3; +--- unit3.pas 2024-04-17 01:41:03.000000000 +0530 ++++ unit3n.pas 2024-04-25 17:30:56.674161644 +0530 +@@ -2,9 +2,9 @@ + + // About form -// WInFF 1.0 Copyright 2006-2013 Matthew Weatherford +// WInFF 1.0 Copyright 2006-2024 Matthew Weatherford @@ -9,69 +10,69 @@ -// http://winff.org +// https://github.com/WinFF/winff // Licensed under the GPL v3 or any later version - // + // This program is free software: you can redistribute it and/or modify -@@ -62,7 +62,6 @@ - procedure lblBellardClick(Sender: TObject); - procedure lblGeversClick(Sender: TObject); - procedure lblStoffbergClick(Sender: TObject); -- procedure lblGmaqClick(Sender: TObject); - procedure lblURLZeranoClick(Sender: TObject); - procedure lblWeatherfordClick(Sender: TObject); - procedure lblURLWinffOrgClick(Sender: TObject); -@@ -132,27 +131,22 @@ +@@ -60,7 +60,6 @@ + procedure lblBellardClick(Sender: TObject); + procedure lblGeversClick(Sender: TObject); + procedure lblStoffbergClick(Sender: TObject); +- procedure lblGmaqClick(Sender: TObject); + procedure lblURLZeranoClick(Sender: TObject); + procedure lblWeatherfordClick(Sender: TObject); + procedure lblURLWinffOrgClick(Sender: TObject); +@@ -128,27 +127,22 @@ procedure TfrmAbout.lblBellardClick(Sender: TObject); begin - -+ frmMain.LaunchBrowser('https://bellard.org/'); ++ frmMain.LaunchBrowser('https://bellard.org/'); end; procedure TfrmAbout.lblGeversClick(Sender: TObject); begin -- frmMain.LaunchBrowser('https://launchpad.net/~paul-climbing/+archive/ppa/'); -+ frmMain.LaunchBrowser('https://tracker.debian.org/pkg/winff'); +- frmMain.LaunchBrowser('https://launchpad.net/~paul-climbing/+archive/ppa/'); ++ frmMain.LaunchBrowser('https://tracker.debian.org/pkg/winff'); end; procedure TfrmAbout.lblStoffbergClick(Sender: TObject); begin --frmMain.LaunchBrowser('http://istoff.blogspot.com'); +- frmMain.LaunchBrowser('http://istoff.blogspot.com'); -end; - -procedure TfrmAbout.lblGmaqClick(Sender: TObject); -begin -- frmMain.LaunchBrowser('http://www.bandshed.net/'); -+frmMain.LaunchBrowser('https://istoff.blogspot.com'); +- frmMain.LaunchBrowser('http://www.bandshed.net/'); ++ frmMain.LaunchBrowser('https://istoff.blogspot.com'); end; procedure TfrmAbout.lblURLZeranoClick(Sender: TObject); begin -- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com'); -+ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds'); +- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com'); ++ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds'); end; procedure TfrmAbout.btnOkClick(Sender: TObject); -@@ -162,7 +156,7 @@ +@@ -158,7 +152,7 @@ procedure TfrmAbout.lblWeatherfordClick(Sender: TObject); begin -- frmMain.LaunchBrowser('http://www.biggmatt.com'); -+ frmMain.LaunchBrowser('https://www.biggmatt.com/p/winff.html'); +- frmMain.LaunchBrowser('http://www.biggmatt.com'); ++ frmMain.LaunchBrowser('https://github.com/WinFF/winff'); end; procedure TfrmAbout.lblURLWinffOrgClick(Sender: TObject); -@@ -172,12 +166,12 @@ +@@ -168,12 +162,12 @@ procedure TfrmAbout.lblURLffmpegClick(Sender: TObject); begin -- frmMain.LaunchBrowser('http://ffmpeg.org/'); -+ frmMain.LaunchBrowser('https://ffmpeg.org/'); +- frmMain.LaunchBrowser('http://ffmpeg.org/'); ++ frmMain.LaunchBrowser('https://ffmpeg.org/'); end; procedure TfrmAbout.lblwinbuildsClick(Sender: TObject); begin -- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com/builds/'); -+ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds'); +- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com/builds/'); ++ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds'); end; procedure TfrmAbout.lblWindowsBuildsClick(Sender: TObject); diff --git a/multimedia/winff/patches/winff-lpi.patch b/multimedia/winff/patches/winff-lpi.patch index 663bce1c32..5c606b7ec4 100644 --- a/multimedia/winff/patches/winff-lpi.patch +++ b/multimedia/winff/patches/winff-lpi.patch @@ -1,5 +1,5 @@ ---- winff.lpi 2023-10-03 19:20:47.000000000 +0530 -+++ winffn.lpi 2024-01-10 22:47:30.406244263 +0530 +--- winff.lpi 2024-04-17 01:41:03.000000000 +0530 ++++ winffn.lpi 2024-04-25 17:33:23.998161221 +0530 @@ -20,7 +20,7 @@ <MajorVersionNr Value="1"/> <MinorVersionNr Value="6"/> @@ -9,23 +9,11 @@ </VersionInfo> <BuildModes Count="1"> <Item1 Name="default" Default="True"/> -@@ -117,6 +117,11 @@ - <UseAnsiStrings Value="False"/> - </SyntaxOptions> - </Parsing> -+ <CodeGeneration> -+ <Optimizations> -+ <OptimizationLevel Value="2"/> -+ </Optimizations> -+ </CodeGeneration> - <Linking> - <Debugging> - <DebugInfoType Value="dsStabs"/> -@@ -124,7 +129,7 @@ - <LinkSmart Value="True"/> +@@ -129,7 +129,7 @@ + </Debugging> <Options> <PassLinkerOptions Value="True"/> -- <LinkerOptions Value="--as-needed"/> +- <LinkerOptions Value="--as-needed -zrelro -znow"/> + <LinkerOptions Value="--as-needed -zrelro -znow -zdefs -pie"/> <Win32> <GraphicApplication Value="True"/> diff --git a/multimedia/winff/winff.SlackBuild b/multimedia/winff/winff.SlackBuild index 70d2b7209e..52eb1ccfc3 100644 --- a/multimedia/winff/winff.SlackBuild +++ b/multimedia/winff/winff.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=winff -VERSION=${VERSION:-1.6.3} +VERSION=${VERSION:-1.6.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/winff/winff.info b/multimedia/winff/winff.info index 5ac2f04f02..52aaafeaf7 100644 --- a/multimedia/winff/winff.info +++ b/multimedia/winff/winff.info @@ -1,8 +1,8 @@ PRGNAM="winff" -VERSION="1.6.3" +VERSION="1.6.4" HOMEPAGE="https://github.com/WinFF/winff" -DOWNLOAD="https://github.com/WinFF/winff/archive/winff-1.6.3/winff-winff-1.6.3.tar.gz" -MD5SUM="7a85f02bd23acef5b916166f83586e82" +DOWNLOAD="https://github.com/WinFF/winff/archive/winff-1.6.4/winff-winff-1.6.4.tar.gz" +MD5SUM="23138be15b60bf3fcb1c11c634d44d16" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libqtpas lazarus" diff --git a/multimedia/xavs2/xavs2.SlackBuild b/multimedia/xavs2/xavs2.SlackBuild index 64ac967293..d140ef2ae7 100644 --- a/multimedia/xavs2/xavs2.SlackBuild +++ b/multimedia/xavs2/xavs2.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xavs2 -# Copyright 2022, Vijay Marcel +# Copyright 2022-2024, Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,37 +29,31 @@ VERSION=${VERSION:-1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +sys_arch=${sys_arch:-$(uname -m)} -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - *) export ARCH=$( uname -m ) ;; - esac -fi +case "$sys_arch" in + x86_64) export ARCH=x86_64 ;; + *) echo "This program will not build on $sys_arch platform" && exit 1 ;; +esac TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -74,7 +68,6 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -cd build/linux/ chown -R root:root . find -L . \ @@ -83,6 +76,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +cd build/linux/ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -90,11 +84,10 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --bindir=/usr/bin \ --enable-shared \ - --bit-depth='8' \ - --chroma-format='all' \ - --enable-lto \ - --system-libxavs2 \ - --enable-strip + --bit-depth=8 \ + --chroma-format=all \ + --enable-strip \ + --disable-asm make make install DESTDIR=$PKG @@ -105,7 +98,7 @@ cd ../.. rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/multimedia/xavs2/xavs2.info b/multimedia/xavs2/xavs2.info index 8ac339e43d..68dda4eedc 100644 --- a/multimedia/xavs2/xavs2.info +++ b/multimedia/xavs2/xavs2.info @@ -1,10 +1,10 @@ PRGNAM="xavs2" VERSION="1.4" HOMEPAGE="https://github.com/pkuvcl/xavs2" -DOWNLOAD="https://github.com/pkuvcl/xavs2/archive/1.4/xavs2-1.4.tar.gz" -MD5SUM="b776941aad474fed23da1d1eb0c0b720" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/pkuvcl/xavs2/archive/1.4/xavs2-1.4.tar.gz" +MD5SUM_x86_64="b776941aad474fed23da1d1eb0c0b720" REQUIRES="" MAINTAINER="Vijay Marcel" EMAIL="vijaymarcel@outlook.com" diff --git a/network/MEGAsync/MEGAsync.SlackBuild b/network/MEGAsync/MEGAsync.SlackBuild index 4d804db29e..f16c80962e 100644 --- a/network/MEGAsync/MEGAsync.SlackBuild +++ b/network/MEGAsync/MEGAsync.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=MEGAsync -VERSION=${VERSION:-4.5.3.0} -SDK=${SDK:-3.8.2c} +VERSION=${VERSION:-4.9.1.0} +SDK=${SDK:-4.16.0c} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -83,7 +83,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/megasync-4.5.0.0_ffmpeg.patch +patch -p1 < $CWD/megasync-4.9.1.0_ffmpeg6.patch cd src/MEGASync/mega patch -p1 < $CWD/megasync-4.5.0.0_pdfium.patch diff --git a/network/MEGAsync/MEGAsync.info b/network/MEGAsync/MEGAsync.info index db02860be9..c01bb2800b 100644 --- a/network/MEGAsync/MEGAsync.info +++ b/network/MEGAsync/MEGAsync.info @@ -1,10 +1,10 @@ PRGNAM="MEGAsync" -VERSION="4.5.3.0" +VERSION="4.9.1.0" HOMEPAGE="https://github.com/meganz/MEGAsync/" -DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.5.3.0_Linux/MEGAsync-4.5.3.0_Linux.tar.gz \ - https://github.com/meganz/sdk/archive/v3.8.2c/sdk-3.8.2c.tar.gz" -MD5SUM="be0f1e070b6990c19d766990758ef997 \ - ded79c86d1ddbe2572f0562fa1dc15fc" +DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.9.1.0_Linux/MEGAsync-4.9.1.0_Linux.tar.gz \ + https://github.com/meganz/sdk/archive/v4.16.0c/sdk-4.16.0c.tar.gz" +MD5SUM="be9fca6eee9bad9de2f8999bec51ccbb \ + b8c50f486602b2a8af4866d098cae303" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="FreeImage libmediainfo" diff --git a/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch b/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch deleted file mode 100644 index a30d4a1eff..0000000000 --- a/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur a/src/MEGASync/mega/src/gfx/freeimage.cpp b/src/MEGASync/mega/src/gfx/freeimage.cpp ---- a/src/MEGASync/mega/src/gfx/freeimage.cpp 2021-05-23 02:28:08.694081111 +0100 -+++ b/src/MEGASync/mega/src/gfx/freeimage.cpp 2021-05-23 02:29:56.189964969 +0100 -@@ -188,7 +188,7 @@ - - // Force seeking to key frames - formatContext->seek2any = false; -- videoStream->skip_to_keyframe = true; -+ //videoStream->skip_to_keyframe = true; - if (decoder->capabilities & CAP_TRUNCATED) - { - codecContext.flags |= CAP_TRUNCATED; -diff -Naur a/src/MEGASync/mega/src/gfx/qt.cpp b/src/MEGASync/mega/src/gfx/qt.cpp ---- a/src/MEGASync/mega/src/gfx/qt.cpp 2021-05-23 02:28:08.694081111 +0100 -+++ b/src/MEGASync/mega/src/gfx/qt.cpp 2021-05-23 02:29:36.172545153 +0100 -@@ -1209,7 +1209,7 @@ - - // Force seeking to key frames - formatContext->seek2any = false; -- videoStream->skip_to_keyframe = true; -+ //videoStream->skip_to_keyframe = true; - if (decoder->capabilities & CAP_TRUNCATED) - { - codecContext.flags |= CAP_TRUNCATED; diff --git a/network/MEGAsync/megasync-4.9.1.0_ffmpeg6.patch b/network/MEGAsync/megasync-4.9.1.0_ffmpeg6.patch new file mode 100644 index 0000000000..f42c30d922 --- /dev/null +++ b/network/MEGAsync/megasync-4.9.1.0_ffmpeg6.patch @@ -0,0 +1,40 @@ +--- a/src/MEGASync/mega/src/gfx/freeimage.cpp 2024-02-05 12:31:08.907475460 +0900 ++++ b/src/MEGASync/mega/src/gfx/freeimage.cpp 2024-02-05 13:38:52.356174823 +0900 +@@ -209,11 +209,13 @@ + + #ifdef HAVE_FFMPEG + ++#if LIBAVCODEC_VERSION_MAJOR < 60 + #ifdef AV_CODEC_CAP_TRUNCATED + #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED + #else + #define CAP_TRUNCATED CODEC_CAP_TRUNCATED + #endif ++#endif + + const char *GfxProviderFreeImage::supportedformatsFfmpeg() + { +@@ -313,7 +315,7 @@ + + // Find decoder for video stream + AVCodecID codecId = codecParm->codec_id; +- AVCodec* decoder = avcodec_find_decoder(codecId); ++ auto decoder = avcodec_find_decoder(codecId); + if (!decoder) + { + LOG_warn << "Codec not found: " << codecId; +@@ -330,11 +332,13 @@ + + // Force seeking to key frames + formatContext->seek2any = false; +- videoStream->skip_to_keyframe = true; ++ //videoStream->skip_to_keyframe = true; ++ #if LIBAVCODEC_VERSION_MAJOR < 60 + if (decoder->capabilities & CAP_TRUNCATED) + { + codecContext->flags |= CAP_TRUNCATED; + } ++ #endif + + AVPixelFormat sourcePixelFormat = static_cast<AVPixelFormat>(codecParm->format); + AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format diff --git a/network/QuiteRSS/QuiteRSS.info b/network/QuiteRSS/QuiteRSS.info index f37df41ce7..31bc5425d5 100644 --- a/network/QuiteRSS/QuiteRSS.info +++ b/network/QuiteRSS/QuiteRSS.info @@ -1,7 +1,7 @@ PRGNAM="QuiteRSS" VERSION="0.19.4" HOMEPAGE="http://quiterss.org/en/node" -DOWNLOAD="https://quiterss.org/files/0.19.4_/QuiteRSS-0.19.4-src.tar.gz" +DOWNLOAD="https://web.archive.org/web/20240314094710/https://quiterss.org/files/0.19.4_/QuiteRSS-0.19.4-src.tar.gz" MD5SUM="96a25a33904dadba2daa3ea5c92d4388" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/argus-clients/argus-clients.SlackBuild b/network/argus-clients/argus-clients.SlackBuild index c9c7a09f28..5021d2ce9d 100644 --- a/network/argus-clients/argus-clients.SlackBuild +++ b/network/argus-clients/argus-clients.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Slackware build script for argus-clients # Written by R. Bailey <GooseYArd@gmail.com> -# Emmanuel N. Millan <emmanueln@gmail.com> - 2018 +# Emmanuel N. Millan <emmanueln@gmail.com> - 2018-2024 # 20220410 bkw: Modified by SlackBuilds.org, BUILD=2: # - do not install headers in /usr/include with execute permission! @@ -10,8 +10,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=argus-clients -VERSION=${VERSION:-3.0.8.3} -BUILD=${BUILD:-2} +SRCNAM=clients +VERSION=${VERSION:-3.0.8.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -32,6 +33,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -52,7 +54,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +mv clients-$VERSION $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -82,6 +85,9 @@ gzip -9 $PKG/usr/man/man*/* # 20220410 bkw: wtf, upstream? find $PKG/usr/include/argus/ -type f -exec chmod 0644 {} \+ +find $PKG/usr/lib${LIBDIRSUFFIX} -type f -exec chmod 0644 {} \+ + + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -90,7 +96,9 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ ChangeLog COPYING CREDITS MANIFEST README VERSION \ $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/argus/* $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -rf $PKG/usr/argus mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/argus-clients/argus-clients.info b/network/argus-clients/argus-clients.info index 5637f19aba..f57e9a3fd4 100644 --- a/network/argus-clients/argus-clients.info +++ b/network/argus-clients/argus-clients.info @@ -1,8 +1,8 @@ PRGNAM="argus-clients" -VERSION="3.0.8.3" +VERSION="3.0.8.4" HOMEPAGE="https://www.qosient.com/argus/index.shtml" -DOWNLOAD="https://qosient.com/argus/src/argus-clients-3.0.8.3.tar.gz" -MD5SUM="fc3ad12cea5154d3123aa96765e7aee7" +DOWNLOAD="https://github.com/openargus/clients/archive/v3.0.8.4/clients-3.0.8.4.tar.gz" +MD5SUM="67768854b128be2c477b3c0ea9eaca50" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/avahi/README b/network/avahi/README deleted file mode 100644 index 3057f78a16..0000000000 --- a/network/avahi/README +++ /dev/null @@ -1,14 +0,0 @@ -Avahi is an implementation of the DNS Service Discovery and Multicast -DNS specifications for Zeroconf Computing. It uses D-BUS for -communication between user applications and a system daemon. The -daemon is used to coordinate application efforts in caching replies, -necessary to minimize the traffic imposed on networks. This kind -of technology is already found in Apple MacOS X (branded Rendezvous -Bonjour and sometimes Zeroconf) and is very convenient. - -You will need to have an "avahi" user and group on the target -system prior to installing the avahi package. See README.SBo in this -directory (it is also installed to the package docmentation directory) -for more information and for setup notes. - -mono support is not working ATM so it's forcibly disabled. diff --git a/network/avahi/README.SBo b/network/avahi/README.SBo deleted file mode 100644 index d05e6bb6b9..0000000000 --- a/network/avahi/README.SBo +++ /dev/null @@ -1,43 +0,0 @@ -README.SBo (avahi) - -First, be sure you have an "avahi" user and group. Do this *before* -you install the avahi package. We recommend uid/gid of 214, but -adjust as needed for your system. Something like this should suffice: - - # groupadd -g 214 avahi - # useradd -u 214 -g 214 -c "Avahi User" -d /dev/null -s /bin/false avahi - - -Now start the Avahi daemon: - - # /etc/rc.d/rc.avahidaemon start - -Optionally start the unicast DNS configuration daemon: - - # /etc/rc.d/rc.avahidnsconfd start - - -You will need to start avahi at boot by adding the following -to your /etc/rc.d/rc.local and make them executable: - - # Start avahidaemon - if [ -x /etc/rc.d/rc.avahidaemon ]; then - /etc/rc.d/rc.avahidaemon start - fi - # Start avahidnsconfd - if [ -x /etc/rc.d/rc.avahidnsconfd ]; then - /etc/rc.d/rc.avahidnsconfd start - fi - -You will also want to put the following into /etc/rc.d/rc.local_shutdown -(if that file does not exist, create it and make it executable): - - # Stop avahidnsconfd - if [ -x /etc/rc.d/rc.avahidnsconfd ]; then - /etc/rc.d/rc.avahidnsconfd stop - fi - # Stop avahidaemon - if [ -x /etc/rc.d/rc.avahidaemon ]; then - /etc/rc.d/rc.avahidaemon stop - fi - diff --git a/network/avahi/avahi-discover.1 b/network/avahi/avahi-discover.1 deleted file mode 100644 index 085ff1354e..0000000000 --- a/network/avahi/avahi-discover.1 +++ /dev/null @@ -1,16 +0,0 @@ -.TH avahi-discover 1 User Manuals -.SH NAME -avahi-discover \- Browse for mDNS/DNS-SD services using the Avahi daemon -.SH SYNOPSIS -\fBavahi-discover -\f1 -.SH DESCRIPTION -Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon. -.SH OPTIONS -avahi-discover takes no command line arguments at the moment. -.SH AUTHORS -The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-daemon(8)\f1, \fBavahi-browse(1)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild deleted file mode 100644 index e81a77cc29..0000000000 --- a/network/avahi/avahi.SlackBuild +++ /dev/null @@ -1,201 +0,0 @@ -#!/bin/bash - -# Slackware build script for avahi - -# Copyright 2008-2012 David Somero (dsomero@hotmail.com) Athens, TN, USA -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20220301 bkw: Modified by SlackBuilds.org, BUILD=7: -# - don't include empty /run dir in package. -# - remove useless INSTALL from doc dir. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=avahi -VERSION=${VERSION:-0.8} -BUILD=${BUILD:-7} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -# Support for mono -if [ "${MONO:-no}" = "no" ]; then - MONO="--disable-mono" -else - MONO="--enable-mono" -fi -MONO="--disable-mono" # mono support not working ATM - -warn_accounts() { - echo " You must have an avahi user and group to run this script. " - echo " Something like this should suffice for most systems: " - echo " # groupadd -g 214 avahi" - echo " # useradd -u 214 -g 214 -c "Avahi" -d /dev/null -s /bin/false avahi" - exit 1 -} - -# Bail if user and/or group isn't valid on your system -if ! getent passwd avahi &>/dev/null; then - warn_accounts -fi -if ! getent group avahi &>/dev/null; then - warn_accounts -fi - -if [ "${ARCH}" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -# This patch is mine --rworkman -patch -p1 --verbose < $CWD/patches/fixup_avahi-dnsconfd.action.patch - -# Thanks to LFS for this patch -patch -p1 --verbose < $CWD/patches/ipv6_race_condition_fix.patch - -# Thanks to Debian for these patches -patch -p1 --verbose < $CWD/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch -patch -p1 --verbose < $CWD/patches/man-add-missing-bshell.1-symlink.patch -patch -p1 --verbose < $CWD/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch -patch -p1 --verbose < $CWD/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch -patch -p1 --verbose < $CWD/patches/fix-bytestring-decoding-for-proper-display.patch -patch -p1 --verbose < $CWD/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch -patch -p1 --verbose < $CWD/patches/Fetch-build-db-from-upstream-git.patch -patch -p1 --verbose < $CWD/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch -patch -p1 --verbose < $CWD/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch -patch -p1 --verbose < $CWD/patches/avahi-client-fix-resource-leak.patch -patch -p1 --verbose < $CWD/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch -patch -p1 --verbose < $CWD/patches/CVE-2021-3502.patch - -# Okay, I had to cheat a bit on the manual pages; there's a commit -# in git that will fix this, so I just built a git checkout, grabbed -# the built manual pages, and we'll drop them into place so the build -# will work for this released version... -cat $CWD/bssh.1 > man/bssh.1 -cat $CWD/avahi-discover.1 > man/avahi-discover.1 - -autoreconf -vif - -export PYTHON=python3 -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-systemdsystemunitdir=no \ - --enable-tests \ - --disable-static \ - --disable-monodoc \ - --disable-autoipd \ - --enable-compat-libdns_sd \ - --enable-python-dbus \ - --enable-glib \ - --enable-dbus \ - --enable-python \ - --enable-gtk \ - --enable-gtk3 \ - --enable-qt5 \ - --disable-qt4 \ - --disable-qt3 \ - --enable-core-docs \ - --with-dbus-sys=/usr/share/dbus-1/system.d \ - --with-avahi-user=avahi \ - --with-avahi-group=avahi \ - --with-avahi-priv-access-group=netdev \ - --with-distro=slackware \ - --program-prefix= \ - --program-suffix= \ - --build=$ARCH-slackware-linux \ - $MONO - -make -make install-strip DESTDIR=$PKG - -# 20220414 bkw: if this dir is empty, it doesn't need to be included -# in the package. -rmdir $PKG/run &> /dev/null || true - -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done - -mv $PKG/etc/rc.d/rc.avahidaemon $PKG/etc/rc.d/rc.avahidaemon.new -mv $PKG/etc/rc.d/rc.avahidnsconfd $PKG/etc/rc.d/rc.avahidnsconfd.new -mv $PKG/etc/avahi/avahi-daemon.conf $PKG/etc/avahi/avahi-daemon.conf.new - -sed -i "s|#!python3|#!/usr/bin/python3|g" $PKG/usr/bin/avahi-{discover,bookmarks} - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -rm -f docs/INSTALL -cp -a LICENSE docs/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info deleted file mode 100644 index ced5e61121..0000000000 --- a/network/avahi/avahi.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="avahi" -VERSION="0.8" -HOMEPAGE="http://avahi.org/" -DOWNLOAD="https://github.com/lathiat/avahi/releases/download/v0.8/avahi-0.8.tar.gz" -MD5SUM="229c6aa30674fc43c202b22c5f8c2be7" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libdaemon" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" diff --git a/network/avahi/bssh.1 b/network/avahi/bssh.1 deleted file mode 100644 index 913554eb30..0000000000 --- a/network/avahi/bssh.1 +++ /dev/null @@ -1,36 +0,0 @@ -.TH bssh/bvnc/bshell 1 User Manuals -.SH NAME -bssh/bvnc/bshell \- Browse for SSH/VNC servers on the local network -.SH SYNOPSIS -\fBbssh - -bvnc - -bshell -\f1 -.SH DESCRIPTION -bssh/bvnc/bshell browses for SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/vncviewer after a selection was made. - -If the binary is called as bssh only ssh servers will be shown. If the binary is called as bvnc only VNC servers will be shown. If the binary is called as bshell both VNC and SSH servers are shown. -.SH OPTIONS -.TP -\fB-s | --ssh\f1 -Browse for SSH servers (and only SSH servers) regardless under which name the binary is called. -.TP -\fB-v | --vnc\f1 -Browse for VNC servers (and only VNC servers) regardless under which name the binary is called. -.TP -\fB-S | --shell\f1 -Browse for both VNC and SSH servers regardless under which name the binary is called. -.TP -\fB-d | --domain=\f1 \fIDOMAIN\f1 -Browse in the specified domain. If omitted bssh/bvnc/bshell will browse in the default browsing domain (usually .local) -.TP -\fB-h | --help\f1 -Show help. -.SH AUTHORS -The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBvncviewer(1)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/patches/CVE-2021-3502.patch b/network/avahi/patches/CVE-2021-3502.patch deleted file mode 100644 index 7b0449a2e4..0000000000 --- a/network/avahi/patches/CVE-2021-3502.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 9d31939e55280a733d930b15ac9e4dda4497680c Mon Sep 17 00:00:00 2001 -From: Tommi Rantala <tommi.t.rantala@nokia.com> -Date: Mon, 8 Feb 2021 11:04:43 +0200 -Subject: [PATCH] Fix NULL pointer crashes from #175 - -avahi-daemon is crashing when running "ping .local". -The crash is due to failing assertion from NULL pointer. -Add missing NULL pointer checks to fix it. - -Introduced in #175 - merge commit 8f75a045709a780c8cf92a6a21e9d35b593bdecd ---- - avahi-core/browse-dns-server.c | 5 ++++- - avahi-core/browse-domain.c | 5 ++++- - avahi-core/browse-service-type.c | 3 +++ - avahi-core/browse-service.c | 3 +++ - avahi-core/browse.c | 3 +++ - avahi-core/resolve-address.c | 5 ++++- - avahi-core/resolve-host-name.c | 5 ++++- - avahi-core/resolve-service.c | 5 ++++- - 8 files changed, 29 insertions(+), 5 deletions(-) - -diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c -index 049752e9..c2d914fa 100644 ---- a/avahi-core/browse-dns-server.c -+++ b/avahi-core/browse-dns-server.c -@@ -343,7 +343,10 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new( - AvahiSDNSServerBrowser* b; - - b = avahi_s_dns_server_browser_prepare(server, interface, protocol, domain, type, aprotocol, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_dns_server_browser_start(b); - - return b; --} -\ No newline at end of file -+} -diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c -index f145d56a..06fa70c0 100644 ---- a/avahi-core/browse-domain.c -+++ b/avahi-core/browse-domain.c -@@ -253,7 +253,10 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new( - AvahiSDomainBrowser *b; - - b = avahi_s_domain_browser_prepare(server, interface, protocol, domain, type, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_domain_browser_start(b); - - return b; --} -\ No newline at end of file -+} -diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c -index fdd22dcd..b1fc7af8 100644 ---- a/avahi-core/browse-service-type.c -+++ b/avahi-core/browse-service-type.c -@@ -171,6 +171,9 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new( - AvahiSServiceTypeBrowser *b; - - b = avahi_s_service_type_browser_prepare(server, interface, protocol, domain, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_service_type_browser_start(b); - - return b; -diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c -index 5531360c..63e0275a 100644 ---- a/avahi-core/browse-service.c -+++ b/avahi-core/browse-service.c -@@ -184,6 +184,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_new( - AvahiSServiceBrowser *b; - - b = avahi_s_service_browser_prepare(server, interface, protocol, service_type, domain, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_service_browser_start(b); - - return b; -diff --git a/avahi-core/browse.c b/avahi-core/browse.c -index 2941e579..e8a915e9 100644 ---- a/avahi-core/browse.c -+++ b/avahi-core/browse.c -@@ -634,6 +634,9 @@ AvahiSRecordBrowser *avahi_s_record_browser_new( - AvahiSRecordBrowser *b; - - b = avahi_s_record_browser_prepare(server, interface, protocol, key, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_record_browser_start_query(b); - - return b; -diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c -index ac0b29b1..e61dd242 100644 ---- a/avahi-core/resolve-address.c -+++ b/avahi-core/resolve-address.c -@@ -286,7 +286,10 @@ AvahiSAddressResolver *avahi_s_address_resolver_new( - AvahiSAddressResolver *b; - - b = avahi_s_address_resolver_prepare(server, interface, protocol, address, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_address_resolver_start(b); - - return b; --} -\ No newline at end of file -+} -diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c -index 808b0e72..4e8e5973 100644 ---- a/avahi-core/resolve-host-name.c -+++ b/avahi-core/resolve-host-name.c -@@ -318,7 +318,10 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new( - AvahiSHostNameResolver *b; - - b = avahi_s_host_name_resolver_prepare(server, interface, protocol, host_name, aprotocol, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_host_name_resolver_start(b); - - return b; --} -\ No newline at end of file -+} -diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c -index 66bf3cae..43771763 100644 ---- a/avahi-core/resolve-service.c -+++ b/avahi-core/resolve-service.c -@@ -519,7 +519,10 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( - AvahiSServiceResolver *b; - - b = avahi_s_service_resolver_prepare(server, interface, protocol, name, type, domain, aprotocol, flags, callback, userdata); -+ if (!b) -+ return NULL; -+ - avahi_s_service_resolver_start(b); - - return b; --} -\ No newline at end of file -+} diff --git a/network/avahi/patches/Fetch-build-db-from-upstream-git.patch b/network/avahi/patches/Fetch-build-db-from-upstream-git.patch deleted file mode 100644 index eacb6dab5a..0000000000 --- a/network/avahi/patches/Fetch-build-db-from-upstream-git.patch +++ /dev/null @@ -1,71 +0,0 @@ -From: Andreas Henriksson <andreas@fatal.se> -Date: Sat, 26 Oct 2019 15:49:35 +0200 -Subject: Fetch build-db from upstream git - -Fetch the build-db file from: -https://raw.githubusercontent.com/lathiat/avahi/master/service-type-database/build-db - -This file is missing dist tarball, likely caused by changes in: -https://github.com/lathiat/avahi/pull/134 - -Carry it as a patch for now. ---- - service-type-database/build-db | 49 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 49 insertions(+) - create mode 100755 service-type-database/build-db - -diff --git a/service-type-database/build-db b/service-type-database/build-db -new file mode 100755 -index 0000000..78ee892 ---- /dev/null -+++ b/service-type-database/build-db -@@ -0,0 +1,49 @@ -+#!/usr/bin/env python -+# -*-python-*- -+# This file is part of avahi. -+# -+# avahi is free software; you can redistribute it and/or modify it -+# under the terms of the GNU Lesser General Public License as -+# published by the Free Software Foundation; either version 2 of the -+# License, or (at your option) any later version. -+# -+# avahi is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -+# License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with avahi; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -+# USA. -+ -+try: -+ import anydbm as dbm -+except ImportError: -+ import dbm -+ -+import sys -+ -+if len(sys.argv) > 1: -+ infn = sys.argv[1] -+else: -+ infn = "service-types" -+ -+if len(sys.argv) > 2: -+ outfn = sys.argv[2] -+else: -+ outfn = infn + ".db" -+ -+db = dbm.open(outfn, "n") -+ -+for ln in open(infn, "r"): -+ ln = ln.strip(" \r\n\t") -+ -+ if ln == "" or ln.startswith("#"): -+ continue -+ -+ t, n = ln.split(":", 1) -+ -+ db[t.strip()] = n.strip() -+ -+db.close() diff --git a/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch b/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch deleted file mode 100644 index 076442706a..0000000000 --- a/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Andreas Henriksson <andreas@fatal.se> -Date: Thu, 24 Aug 2017 17:52:19 +0200 -Subject: Ship avahi-discover(1), bssh(1) and bvnc(1) also for GTK3 - -These manpages went missing when you disabled gtk2 builds.... - -Forwarded: https://github.com/lathiat/avahi/pull/142 -Applied-upstream: 0.9, commit:751be804e891aec5701a059144e2f5cbfc981b36 ---- - man/Makefile.am | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 77a27bd..289b942 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -56,7 +56,7 @@ man_MANS += \ - avahi-publish.1 \ - avahi-set-host-name.1 - --if HAVE_GTK -+if HAVE_GTK2OR3 - man_MANS += \ - bssh.1 - endif -@@ -64,12 +64,13 @@ endif - if HAVE_PYTHON - man_MANS += \ - avahi-bookmarks.1 --if HAVE_GTK -+endif -+ -+if HAVE_PYGOBJECT - man_MANS += \ - avahi-discover.1 - endif - endif --endif - - if ENABLE_AUTOIPD - if HAVE_LIBDAEMON -@@ -134,7 +135,7 @@ EXTRA_DIST = \ - if HAVE_DBUS - - BSSH_LN = --if HAVE_GTK -+if HAVE_GTK2OR3 - if HAVE_GLIB - BSSH_LN += $(LN_S) bssh.1 bvnc.1 && - BSSH_LN += $(LN_S) bssh.1 bshell.1 && diff --git a/network/avahi/patches/avahi-client-fix-resource-leak.patch b/network/avahi/patches/avahi-client-fix-resource-leak.patch deleted file mode 100644 index 141828a259..0000000000 --- a/network/avahi/patches/avahi-client-fix-resource-leak.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 374245ec1418e7e1e57120fcaf0a12ec695f5f6d Mon Sep 17 00:00:00 2001 -From: Michal Sekletar <msekleta@redhat.com> -Date: Wed, 24 Oct 2018 15:22:19 +0000 -Subject: [PATCH] avahi-client: fix resource leak - ---- - avahi-client/browser.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/avahi-client/browser.c b/avahi-client/browser.c -index c978d942..fa4a9a80 100644 ---- a/avahi-client/browser.c -+++ b/avahi-client/browser.c -@@ -72,6 +72,8 @@ static void parse_domain_file(AvahiDomainBrowser *b) { - if (avahi_normalize_name(buf, domain, sizeof(domain))) - b->static_browse_domains = avahi_string_list_add(b->static_browse_domains, domain); - } -+ -+ fclose(f); - } - - static void domain_browser_ref(AvahiDomainBrowser *db) { diff --git a/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch b/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch deleted file mode 100644 index 9984722893..0000000000 --- a/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4b48927e8e2c721d103018b4ce39a164b6c2898f Mon Sep 17 00:00:00 2001 -From: Michal Sekletar <msekleta@redhat.com> -Date: Wed, 24 Oct 2018 15:38:48 +0000 -Subject: [PATCH] chroot: fix bogus assignments in assertions - ---- - avahi-daemon/chroot.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/avahi-daemon/chroot.c b/avahi-daemon/chroot.c -index ccd56be0..871b3b34 100644 ---- a/avahi-daemon/chroot.c -+++ b/avahi-daemon/chroot.c -@@ -188,8 +188,8 @@ static int recv_fd(int fd) { - return -1; - } - -- assert(h->cmsg_len = CMSG_LEN(sizeof(int))); -- assert(h->cmsg_level = SOL_SOCKET); -+ assert(h->cmsg_len == CMSG_LEN(sizeof(int))); -+ assert(h->cmsg_level == SOL_SOCKET); - assert(h->cmsg_type == SCM_RIGHTS); - - return *((int*)CMSG_DATA(h)); diff --git a/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch b/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch deleted file mode 100644 index 56a92addfc..0000000000 --- a/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Simon McVittie <smcv@debian.org> -Date: Fri, 24 Apr 2020 11:25:41 +0100 -Subject: avahi-discover: Don't decode unicode strings, only bytestrings - -Unicode strings (unicode in Python 2, str or unicode in Python 3) don't -have a decode method; only bytestrings (str or bytes in Python 2, -bytes in Python 3) have that. Decode exactly the strings that need -decoding. - -Resolves: https://github.com/lathiat/avahi/issues/275 -Signed-off-by: Simon McVittie <smcv@debian.org> -Forwarded: https://github.com/lathiat/avahi/pull/282 ---- - avahi-python/avahi-discover/avahi-discover.py | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py -index 4a2b575..fddf4a5 100755 ---- a/avahi-python/avahi-discover/avahi-discover.py -+++ b/avahi-python/avahi-discover/avahi-discover.py -@@ -238,15 +238,17 @@ class Main_window: - txts+="<b>" + _("TXT") + " <i>%s</i></b> = %s\n" % (k,v) - else: - txts = "<b>" + _("TXT Data:") + "</b> <i>" + _("empty") + "</i>" -- -- txts = txts.decode("utf-8") -+ -+ if isinstance(txts, bytes): # Python 2 -+ txts = txts.decode("utf-8") - - infos = "<b>" + _("Service Type:") + "</b> %s\n" - infos += "<b>" + _("Service Name:") + "</b> %s\n" - infos += "<b>" + _("Domain Name:") + "</b> %s\n" - infos += "<b>" + _("Interface:") + "</b> %s %s\n" - infos += "<b>" + _("Address:") + "</b> %s/%s:%i\n%s" -- infos = infos.decode("utf-8") -+ if isinstance(infos, bytes): # Python 2 -+ infos = infos.decode("utf-8") - infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip()) - self.info_label.set_markup(infos) - diff --git a/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch b/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch deleted file mode 100644 index d9ba99f4d8..0000000000 --- a/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: traffic-millions <60914101+traffic-millions@users.noreply.github.com> -Date: Tue, 3 Mar 2020 11:15:48 +0800 -Subject: avahi_dns_packet_consume_uint32: fix potential undefined behavior - -avahi_dns_packet_consume_uint32 left shifts uint8_t values by 8, 16 and 24 bits to combine them into a 32-bit value. This produces an undefined behavior warning with gcc -fsanitize when fed input values of 128 or 255 however in testing no actual unexpected behavior occurs in practice and the 32-bit uint32_t is always correctly produced as the final value is immediately stored into a uint32_t and the compiler appears to handle this "correctly". - -Cast the intermediate values to uint32_t to prevent this warning and ensure the intended result is explicit. - -Closes: #267 -Closes: #268 -Reference: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19304 -Origin: upstream, 0.9, commit:b897ca43ac100d326d118e5877da710eb7f836f9 ---- - avahi-core/dns.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/avahi-core/dns.c b/avahi-core/dns.c -index 7c38f42..d793b76 100644 ---- a/avahi-core/dns.c -+++ b/avahi-core/dns.c -@@ -455,7 +455,7 @@ int avahi_dns_packet_consume_uint32(AvahiDnsPacket *p, uint32_t *ret_v) { - return -1; - - d = (uint8_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex); -- *ret_v = (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | d[3]; -+ *ret_v = ((uint32_t)d[0] << 24) | ((uint32_t)d[1] << 16) | ((uint32_t)d[2] << 8) | (uint32_t)d[3]; - p->rindex += sizeof(uint32_t); - - return 0; diff --git a/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch b/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch deleted file mode 100644 index 3e0725a602..0000000000 --- a/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 447affe29991ee99c6b9732fc5f2c1048a611d3b Mon Sep 17 00:00:00 2001 -From: Riccardo Schirone <sirmy15@gmail.com> -Date: Fri, 26 Mar 2021 11:50:24 +0100 -Subject: [PATCH] Avoid infinite-loop in avahi-daemon by handling HUP event in - client_work - -If a client fills the input buffer, client_work() disables the -AVAHI_WATCH_IN event, thus preventing the function from executing the -`read` syscall the next times it is called. However, if the client then -terminates the connection, the socket file descriptor receives a HUP -event, which is not handled, thus the kernel keeps marking the HUP event -as occurring. While iterating over the file descriptors that triggered -an event, the client file descriptor will keep having the HUP event and -the client_work() function is always called with AVAHI_WATCH_HUP but -without nothing being done, thus entering an infinite loop. - -See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984938 ---- - avahi-daemon/simple-protocol.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c -index 3e0ebb11..6c0274d6 100644 ---- a/avahi-daemon/simple-protocol.c -+++ b/avahi-daemon/simple-protocol.c -@@ -424,6 +424,11 @@ static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AvahiWatchEv - } - } - -+ if (events & AVAHI_WATCH_HUP) { -+ client_free(c); -+ return; -+ } -+ - c->server->poll_api->watch_update( - watch, - (c->outbuf_length > 0 ? AVAHI_WATCH_OUT : 0) | diff --git a/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch b/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch deleted file mode 100644 index 3017043d47..0000000000 --- a/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch +++ /dev/null @@ -1,106 +0,0 @@ -From: Simon McVittie <smcv@debian.org> -Date: Thu, 7 May 2020 12:13:56 +0100 -Subject: build-db: Use the same database format that the C code expects - -Otherwise, Python 2 anydbm will preferentially choose Berkeley DB format -(dbhash/bsddb), which is neither GNU gdbm nor traditional Unix (n)dbm. - -Signed-off-by: Simon McVittie <smcv@debian.org> -Fixes: https://github.com/lathiat/avahi/issues/260 ---- - configure.ac | 11 ++++++++--- - service-type-database/Makefile.am | 4 ++-- - service-type-database/build-db | 27 +++++++++++++++++++++------ - 3 files changed, 31 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 58db8c7..5aea4e7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -871,9 +871,14 @@ if test "x$HAVE_PYTHON" = "xyes" ; then - fi - - AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)]) -- if test "x$HAVE_GDBM" = "xyes" || test "x$HAVE_DBM" = "xyes"; then -- AM_CHECK_PYMOD(anydbm,,,[ -- AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)]) -+ if test "x$HAVE_GDBM" = "xyes"; then -+ AM_CHECK_PYMOD([dbm.gnu], [], [], [ -+ AM_CHECK_PYMOD([gdbm], [], [], [AC_MSG_ERROR(Could not find Python module dbm.gnu or gdbm)]) -+ ]) -+ fi -+ if test "x$HAVE_DBM" = "xyes"; then -+ AM_CHECK_PYMOD([dbm.ndbm], [], [], [ -+ AM_CHECK_PYMOD([dbm], [], [], [AC_MSG_ERROR(Could not find Python module dbm.ndbm or dbm)]) - ]) - fi - fi -diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am -index f9fa082..0ead0f6 100644 ---- a/service-type-database/Makefile.am -+++ b/service-type-database/Makefile.am -@@ -28,7 +28,7 @@ noinst_SCRIPTS=build-db - pkglibdata_DATA+=service-types.db - - service-types.db: service-types -- $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ -+ $(AM_V_GEN)$(PYTHON) build-db --gnu $< $@.coming && \ - mv $@.coming $@ - - CLEANFILES = service-types.db -@@ -44,7 +44,7 @@ service-types.db.pag: service-types.db - service-types.db.dir: service-types.db - $(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir - service-types.db: service-types build-db -- $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ -+ $(AM_V_GEN)$(PYTHON) build-db --ndbm $< $@.coming && \ - if test -f "$@.coming"; then mv $@.coming $@; fi - - CLEANFILES = service-types.db* -diff --git a/service-type-database/build-db b/service-type-database/build-db -index 78ee892..6415d27 100755 ---- a/service-type-database/build-db -+++ b/service-type-database/build-db -@@ -17,13 +17,28 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - # USA. - --try: -- import anydbm as dbm --except ImportError: -- import dbm -- - import sys - -+if sys.argv[1] == '--gnu': -+ if sys.version_info >= (3,): -+ import dbm.gnu as chosen_dbm -+ else: -+ import gdbm as chosen_dbm -+ -+ sys.argv[1:] = sys.argv[2:] -+elif sys.argv[1] == '--ndbm': -+ if sys.version_info >= (3,): -+ import dbm.ndbm as chosen_dbm -+ else: -+ import dbm as chosen_dbm -+ -+ sys.argv[1:] = sys.argv[2:] -+else: -+ if sys.version_info >= (3,): -+ import dbm as chosen_dbm -+ else: -+ import anydbm as chosen_dbm -+ - if len(sys.argv) > 1: - infn = sys.argv[1] - else: -@@ -34,7 +49,7 @@ if len(sys.argv) > 2: - else: - outfn = infn + ".db" - --db = dbm.open(outfn, "n") -+db = chosen_dbm.open(outfn, "n") - - for ln in open(infn, "r"): - ln = ln.strip(" \r\n\t") diff --git a/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch b/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch deleted file mode 100644 index bfb826db93..0000000000 --- a/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: =?utf-8?q?=C3=89ric_Araujo?= <merwok@netwok.org> -Date: Sat, 29 Feb 2020 19:14:04 -0500 -Subject: fix bytestring decoding for proper display - ---- - avahi-python/avahi-discover/avahi-discover.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py -index 0db705d..4a2b575 100755 ---- a/avahi-python/avahi-discover/avahi-discover.py -+++ b/avahi-python/avahi-discover/avahi-discover.py -@@ -238,12 +238,15 @@ class Main_window: - txts+="<b>" + _("TXT") + " <i>%s</i></b> = %s\n" % (k,v) - else: - txts = "<b>" + _("TXT Data:") + "</b> <i>" + _("empty") + "</i>" -+ -+ txts = txts.decode("utf-8") - - infos = "<b>" + _("Service Type:") + "</b> %s\n" - infos += "<b>" + _("Service Name:") + "</b> %s\n" - infos += "<b>" + _("Domain Name:") + "</b> %s\n" - infos += "<b>" + _("Interface:") + "</b> %s %s\n" - infos += "<b>" + _("Address:") + "</b> %s/%s:%i\n%s" -+ infos = infos.decode("utf-8") - infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip()) - self.info_label.set_markup(infos) - diff --git a/network/avahi/patches/fixup_avahi-dnsconfd.action.patch b/network/avahi/patches/fixup_avahi-dnsconfd.action.patch deleted file mode 100644 index 88f9b5f807..0000000000 --- a/network/avahi/patches/fixup_avahi-dnsconfd.action.patch +++ /dev/null @@ -1,69 +0,0 @@ -avahi-dnsconfd.action looks for /sbin/netconfig, and if found, attempts to -use it to modify /etc/resolv.conf. While *our* netconfig and SuSE's -netconfig started out the same, they're quite different these days, and -thus the result is /etc/HOSTNAME getting set to some nonsense such as: - INTERFACE='eth0'.DNSSERVERS='192.168.13.1' -This was quite some fun tracking down, by the way... :-) --rworkman - - -diff -Nur avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action ---- avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action 2010-06-28 22:30:34.000000000 -0500 -+++ avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action 2012-01-21 16:18:24.337986754 -0600 -@@ -33,48 +33,16 @@ - # $AVAHI_INTERFACE_DNS_SERVERS A whitespace seperated list of DNS servers on $AVAHI_INTERFACE - # $AVAHI_DNS_SERVERS The complete list of all DNS servers found on all interfaces - --if [ -x /sbin/netconfig ]; then -- # SUSE method on 11.1+ -- if [ -n "$AVAHI_INTERFACE_DNS_SERVERS" ]; then -- /sbin/netconfig modify -s avahi -i "$AVAHI_INTERFACE" <<-EOF -- INTERFACE='$AVAHI_INTERFACE' -- DNSSERVERS='$AVAHI_INTERFACE_DNS_SERVERS' -- EOF -- else -- /sbin/netconfig remove -s avahi -i "$AVAHI_INTERFACE" -- fi --elif [ -x /sbin/modify_resolvconf ] ; then -- # method for SUSE <= 11.0 -- if [ -n "$AVAHI_DNS_SERVERS" ]; then -- /sbin/modify_resolvconf modify -s avahi -t - -p avahi-dnsconfd -n "$AVAHI_DNS_SERVERS" <<-EOF -- if you don't like avahi to update your Nameservers -- disable the avahi-dnsconfd init script -- EOF -- else -- /sbin/modify_resolvconf restore -s avahi -- fi --elif [ -x /sbin/resolvconf ] ; then - -- # We have Debian's resolvconf tool -- -- if [ "x$AVAHI_INTERFACE_DNS_SERVERS" = "x" ] ; then -- /sbin/resolvconf -d "$AVAHI_INTERFACE.avahi" -- else -- for n in $AVAHI_INTERFACE_DNS_SERVERS ; do -- echo "nameserver $n" -- done | /sbin/resolvconf -a "$AVAHI_INTERFACE.avahi" -- fi --else -- -- # No resolvconf tool available -- -- if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then -+if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then - test -f /etc/resolv.conf.avahi && mv /etc/resolv.conf.avahi /etc/resolv.conf -- else -+else - test -f /etc/resolv.conf.avahi || mv /etc/resolv.conf /etc/resolv.conf.avahi - -- for n in $AVAHI_DNS_SERVERS ; do -- echo "nameserver $n" -- done > /etc/resolv.conf -- fi -+ grep -v ^nameserver /etc/resolv.conf.avahi > /etc/resolv.conf -+ -+ for n in $AVAHI_DNS_SERVERS ; do -+ echo "nameserver $n" -+ done >> /etc/resolv.conf - fi -+ - diff --git a/network/avahi/patches/ipv6_race_condition_fix.patch b/network/avahi/patches/ipv6_race_condition_fix.patch deleted file mode 100644 index 3418b1a11c..0000000000 --- a/network/avahi/patches/ipv6_race_condition_fix.patch +++ /dev/null @@ -1,51 +0,0 @@ -Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org> -Date: 2020-10-19 -Initial Package Version: 0.8 -Upstream Status: PR, not applied -Origin: Upstream PR (github.com/lathiat/avahi/pull/309) -Description: Fixes a race condition when multiple NICs are in use - when IPv6 is enabled. This will exhibit behavior where - messages about withdrawing address records, registering - access records, and new hostname announcements are - spammed to the log every second. - -diff -Naurp avahi-0.8.orig/avahi-core/server.c avahi-0.8/avahi-core/server.c ---- avahi-0.8.orig/avahi-core/server.c 2020-02-16 21:41:24.939967558 -0600 -+++ avahi-0.8/avahi-core/server.c 2020-10-19 11:07:22.054861721 -0500 -@@ -193,7 +193,7 @@ static void withdraw_rrset(AvahiServer * - withdraw_entry(s, e); - } - --static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i) { -+static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i, int from_local_iface) { - AvahiEntry *e, *n; - int ours = 0, won = 0, lost = 0; - -@@ -210,7 +210,7 @@ static void incoming_probe(AvahiServer * - if (e->dead) - continue; - -- if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0) { -+ if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0 || from_local_iface) { - ours = 1; - break; - } else { -@@ -639,7 +639,7 @@ static void handle_query_packet(AvahiSer - if (!avahi_key_is_pattern(record->key)) { - if (!from_local_iface) - reflect_probe(s, i, record); -- incoming_probe(s, record, i); -+ incoming_probe(s, record, i, from_local_iface); - } - - avahi_record_unref(record); -@@ -961,8 +961,7 @@ static void dispatch_packet(AvahiServer - return; - - /* We don't want to reflect local traffic, so we check if this packet is generated locally. */ -- if (s->config.enable_reflector) -- from_local_iface = originates_from_local_iface(s, iface, src_address, port); -+ from_local_iface = originates_from_local_iface(s, iface, src_address, port); - - if (avahi_dns_packet_check_valid_multicast(p) < 0) { - avahi_log_debug("Received invalid packet."); diff --git a/network/avahi/patches/man-add-missing-bshell.1-symlink.patch b/network/avahi/patches/man-add-missing-bshell.1-symlink.patch deleted file mode 100644 index 1bcbbb13e2..0000000000 --- a/network/avahi/patches/man-add-missing-bshell.1-symlink.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Sun, 17 Sep 2017 12:52:39 +0200 -Subject: man: add missing bshell.1 symlink - -The bshell binary is missing a symlink to its manual page. It should be -symlinked to the man page for bssh, just like how the bvnc man page is. - -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655190 -Forwarded: https://github.com/lathiat/avahi/pull/148 -Applied-upstream: 0.9, commit:f983df44870b602179b493f9c3d113753b378e27 ---- - man/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index d38267c..77a27bd 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -137,12 +137,13 @@ BSSH_LN = - if HAVE_GTK - if HAVE_GLIB - BSSH_LN += $(LN_S) bssh.1 bvnc.1 && -+BSSH_LN += $(LN_S) bssh.1 bshell.1 && - endif - endif - install-exec-local: - mkdir -p $(DESTDIR)/$(mandir)/man1 && \ - cd $(DESTDIR)/$(mandir)/man1 && \ -- rm -f avahi-resolve-host-name.1 avahi-resolve-address.1 avahi-browse-domains.1 avahi-publish-address.1 avahi-publish-service.1 bvnc.1 && \ -+ rm -f avahi-resolve-host-name.1 avahi-resolve-address.1 avahi-browse-domains.1 avahi-publish-address.1 avahi-publish-service.1 bvnc.1 bshell.1 && \ - $(BSSH_LN) \ - $(LN_S) avahi-resolve.1 avahi-resolve-host-name.1 && \ - $(LN_S) avahi-resolve.1 avahi-resolve-address.1 && \ diff --git a/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch b/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch deleted file mode 100644 index 94d8d9517a..0000000000 --- a/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Sun, 17 Sep 2017 10:57:47 +0200 -Subject: man: fix reference to avahi-autoipd.action(8) in avahi-autoipd(8) - -Forwarded: https://github.com/lathiat/avahi/pull/147 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=840833 -Applied-upstream: 0.9, commit:1905a6b878064c6cc9bb96a1fc17ef77c75787c6 ---- - man/avahi-autoipd.8.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/man/avahi-autoipd.8.xml.in b/man/avahi-autoipd.8.xml.in -index 7137c30..23764a5 100644 ---- a/man/avahi-autoipd.8.xml.in -+++ b/man/avahi-autoipd.8.xml.in -@@ -150,7 +150,7 @@ - - <section name="See also"> - <p> -- <manref name="autoipd.action" section="8"/>, <manref name="dhclient" section="8"/> -+ <manref name="avahi-autoipd.action" section="8"/>, <manref name="dhclient" section="8"/> - </p> - - <p>http://avahi.org/wiki/AvahiAutoipd documents how avahi-autoipd is best packaged and integrated into distributions.</p> diff --git a/network/avahi/patches/series b/network/avahi/patches/series deleted file mode 100644 index 1246744108..0000000000 --- a/network/avahi/patches/series +++ /dev/null @@ -1,13 +0,0 @@ -avahi-dnsconfd.service-Drop-Also-avahi-daemon.socket.patch -man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch -man-add-missing-bshell.1-symlink.patch -Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch -avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch -fix-bytestring-decoding-for-proper-display.patch -avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch -Fetch-build-db-from-upstream-git.patch -build-db-Use-the-same-database-format-that-the-C-code-exp.patch -avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch -avahi-client-fix-resource-leak.patch -avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch -CVE-2021-3502.patch diff --git a/network/avahi/slack-desc b/network/avahi/slack-desc deleted file mode 100644 index 8fb66245a4..0000000000 --- a/network/avahi/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -avahi: avahi (service discovery aka zeroconf) -avahi: -avahi: Avahi is an Implementation the DNS Service Discovery and Multicast -avahi: DNS specifications for Zeroconf Computing. It uses D-BUS for -avahi: communication between user applications and a system daemon. The -avahi: daemon is used to coordinate application efforts in caching replies, -avahi: necessary to minimize the traffic imposed on networks. This kind of -avahi: technology is already found in Apple MacOS X (branded Rendezvous -avahi: Bonjour and sometimes Zeroconf) and is very convenient. -avahi: -avahi: diff --git a/network/awscli/awscli.SlackBuild b/network/awscli/awscli.SlackBuild index 218f536270..dec5e76cd8 100644 --- a/network/awscli/awscli.SlackBuild +++ b/network/awscli/awscli.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=awscli SRCNAM=aws-cli -VERSION=${VERSION:-1.32.14} +VERSION=${VERSION:-1.32.99} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/awscli/awscli.info b/network/awscli/awscli.info index ab324364bb..fc0b7877f2 100644 --- a/network/awscli/awscli.info +++ b/network/awscli/awscli.info @@ -1,8 +1,8 @@ PRGNAM="awscli" -VERSION="1.32.14" +VERSION="1.32.99" HOMEPAGE="https://aws.amazon.com/cli/" -DOWNLOAD="https://github.com/aws/aws-cli/archive/1.32.14/aws-cli-1.32.14.tar.gz" -MD5SUM="41a09b4643026ce8f80043a1dd5b9844" +DOWNLOAD="https://github.com/aws/aws-cli/archive/1.32.99/aws-cli-1.32.99.tar.gz" +MD5SUM="9374c39da76ec641464d3a8f59d2cd92" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="s3transfer colorama python3-rsa" diff --git a/network/bpfmon/bpfmon.SlackBuild b/network/bpfmon/bpfmon.SlackBuild index 5331c3663c..e67a13693b 100644 --- a/network/bpfmon/bpfmon.SlackBuild +++ b/network/bpfmon/bpfmon.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for bpfmon -# Copyright 2022-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2022-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bpfmon -VERSION=${VERSION:-2.51} +VERSION=${VERSION:-2.52} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/bpfmon/bpfmon.info b/network/bpfmon/bpfmon.info index f7db79bf56..a6eaba6a29 100644 --- a/network/bpfmon/bpfmon.info +++ b/network/bpfmon/bpfmon.info @@ -1,8 +1,8 @@ PRGNAM="bpfmon" -VERSION="2.51" +VERSION="2.52" HOMEPAGE="https://github.com/bbonev/bpfmon" -DOWNLOAD="https://github.com/bbonev/bpfmon/releases/download/v2.51/bpfmon-2.51.tar.xz" -MD5SUM="54c105b49808ac8b8ad7af0dba6f73b9" +DOWNLOAD="https://github.com/bbonev/bpfmon/releases/download/v2.52/bpfmon-2.52.tar.xz" +MD5SUM="421beb09d0c503f1dbee1a2198985a7f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yascreen" diff --git a/network/brave-browser/brave-browser.SlackBuild b/network/brave-browser/brave-browser.SlackBuild index 8c757756b4..10cbbc0fcb 100644 --- a/network/brave-browser/brave-browser.SlackBuild +++ b/network/brave-browser/brave-browser.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=brave-browser -VERSION=${VERSION:-1.65.114} +VERSION=${VERSION:-1.66.110} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/brave-browser/brave-browser.info b/network/brave-browser/brave-browser.info index 77dafefff7..06b6563750 100644 --- a/network/brave-browser/brave-browser.info +++ b/network/brave-browser/brave-browser.info @@ -1,10 +1,10 @@ PRGNAM="brave-browser" -VERSION="1.65.114" +VERSION="1.66.110" HOMEPAGE="https://brave.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v1.65.114/brave-browser-1.65.114-1.x86_64.rpm" -MD5SUM_x86_64="bdd1be24d71588c20f93a29ec15bd791" +DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v1.66.110/brave-browser-1.66.110-1.x86_64.rpm" +MD5SUM_x86_64="cb87366588ea65748f7abdac45ead68f" REQUIRES="" MAINTAINER="Andrew Payne" EMAIL="phalange@komputermatrix.com" diff --git a/network/cacti/cacti.SlackBuild b/network/cacti/cacti.SlackBuild index ad194b09c5..51c674525a 100644 --- a/network/cacti/cacti.SlackBuild +++ b/network/cacti/cacti.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cacti -VERSION=${VERSION:-1.1.38} +VERSION=${VERSION:-1.2.26} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -36,9 +36,6 @@ DOCROOT=${DOCROOT:-/var/www/htdocs} PHPUSER=${PHPUSER:-root} PHPGROUP=${PHPGROUP:-apache} -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/network/cacti/cacti.info b/network/cacti/cacti.info index bdfc98b130..04b86b39a0 100644 --- a/network/cacti/cacti.info +++ b/network/cacti/cacti.info @@ -1,8 +1,8 @@ PRGNAM="cacti" -VERSION="1.1.38" +VERSION="1.2.26" HOMEPAGE="https://www.cacti.net/" -DOWNLOAD="https://www.cacti.net/downloads/cacti-1.1.38.tar.gz" -MD5SUM="9bf4b63fd661e1cb91ba13e538f38288" +DOWNLOAD="https://www.cacti.net/downloads/cacti-1.2.26.tar.gz" +MD5SUM="53043d8279640a074cc054c7b156375d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="rrdtool" diff --git a/network/davmail/davmail.SlackBuild b/network/davmail/davmail.SlackBuild index ae6c441bea..c714cfd4f2 100644 --- a/network/davmail/davmail.SlackBuild +++ b/network/davmail/davmail.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for DavMail -# Copyright (c) 2015-2022 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com> +# Copyright (c) 2015-2024 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=davmail -VERSION=${VERSION:-5.5.1} +VERSION=${VERSION:-6.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/davmail/davmail.info b/network/davmail/davmail.info index f24a018308..6a7d9442a9 100644 --- a/network/davmail/davmail.info +++ b/network/davmail/davmail.info @@ -1,8 +1,8 @@ PRGNAM="davmail" -VERSION="5.5.1" +VERSION="6.2.2" HOMEPAGE="http://davmail.sourceforge.net" -DOWNLOAD="https://sourceforge.net/projects/davmail/files/davmail/5.5.1/davmail-5.5.1-3299.zip" -MD5SUM="ae194c3571e107081164913a001d6f27" +DOWNLOAD="https://sourceforge.net/projects/davmail/files/davmail/6.2.2/davmail-6.2.2-3546.zip" +MD5SUM="9c017f41e43ff7d2df7c33a1e068d0da" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="zulu-openjdk8" diff --git a/network/dillo/README b/network/dillo/README index 90dd6b4156..e90e142ddb 100644 --- a/network/dillo/README +++ b/network/dillo/README @@ -1,6 +1,13 @@ -Dillo is a multi-platform graphical web browser known for its speed -and small footprint. It is written in C and C++ and is based on FLTK. - -HTTPS and SSL support is built into this but is only at *alpha* -stage. It can be commented out in the dillo.SlackBuild file if you -wish. +Dillo is a fast and small graphical web browser with the following +features: +Multi-platform, running on Linux, BSD, MacOS, Windows (via Cygwin), +and even Atari. +Written in C and C++ with few dependencies. +Implements its own real-time rendering engine. +Low memory usage and fast rendering, even with large pages. +Uses the fast and bloat-free FLTK GUI library. +Support for HTTP, HTTPS, FTP and local files. +Extensible with plugins written in any language (see the list of +plugins). +Is free software licensed with the GPLv3. +Does *NOT* support JavaScript. diff --git a/network/dillo/dillo-3.0.5-fno-common.patch b/network/dillo/dillo-3.0.5-fno-common.patch deleted file mode 100644 index df80f55afa..0000000000 --- a/network/dillo/dillo-3.0.5-fno-common.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- a/dpid/dpid.c -+++ b/dpid/dpid.c -@@ -41,6 +41,26 @@ - volatile sig_atomic_t caught_sigchld = 0; - char *SharedKey = NULL; - -+char *srs_name; -+ -+/*! dpid's service request socket file descriptor */ -+int srs_fd; -+ -+/*! Number of available plugins */ -+int numdpis; -+ -+/*! Number of sockets being watched */ -+int numsocks; -+ -+/*! State information for each plugin. */ -+struct dp *dpi_attr_list; -+ -+/*! service served for each plugin */ -+Dlist *services_list; -+ -+/*! Set of sockets watched for connections */ -+fd_set sock_set; -+ - /*! Remove dpid_comm_keys file. - * This avoids that dillo instances connect to a stale port after dpid - * has exited (e.g. after a reboot). ---- a/dpid/dpid.h -+++ b/dpid/dpid.h -@@ -25,10 +25,10 @@ - - /*! \TODO: Should read this from dillorc */ - #define SRS_NAME "dpid.srs" --char *srs_name; -+extern char *srs_name; - - /*! dpid's service request socket file descriptor */ --int srs_fd; -+extern int srs_fd; - - /*! plugin state information - */ -@@ -49,19 +49,19 @@ - }; - - /*! Number of available plugins */ --int numdpis; -+extern int numdpis; - - /*! Number of sockets being watched */ --int numsocks; -+extern int numsocks; - - /*! State information for each plugin. */ --struct dp *dpi_attr_list; -+extern struct dp *dpi_attr_list; - - /*! service served for each plugin */ --Dlist *services_list; -+extern Dlist *services_list; - - /*! Set of sockets watched for connections */ --fd_set sock_set; -+extern fd_set sock_set; - - /*! Set to 1 by the SIGCHLD handler dpi_sigchld */ - extern volatile sig_atomic_t caught_sigchld; ---- a/dpid/dpid_common.c -+++ b/dpid/dpid_common.c -@@ -14,6 +14,9 @@ - #include <unistd.h> - #include "dpid_common.h" - -+/*! Error codes for dpid */ -+dpi_errno_t dpi_errno; -+ - /* - * Send a verbose error message. - */ ---- a/dpid/dpid_common.h -+++ b/dpid/dpid_common.h -@@ -35,12 +35,13 @@ - #define CKD_WRITE(fd, msg) ckd_write(fd, msg, __FILE__, __LINE__) - #define CKD_CLOSE(fd) ckd_close(fd, __FILE__, __LINE__) - -- - /*! Error codes for dpid */ --enum { -+typedef enum { - no_errors, - dpid_srs_addrinuse /* dpid service request socket address already in use */ --} dpi_errno; -+} dpi_errno_t; -+ -+extern dpi_errno_t dpi_errno; - - /*! Intended for identifying dillo plugins - * and related files diff --git a/network/dillo/dillo-3.0.5-openssl-1.1.patch b/network/dillo/dillo-3.0.5-openssl-1.1.patch deleted file mode 100644 index f21694113c..0000000000 --- a/network/dillo/dillo-3.0.5-openssl-1.1.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -286,7 +286,7 @@ - - if test "x$ssl_ok" = "xyes"; then - old_libs="$LIBS" -- AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto) -+ AC_CHECK_LIB(ssl, OPENSSL_config, ssl_ok=yes, ssl_ok=no, -lcrypto) - LIBS="$old_libs" - fi - ---- a/dpi/https.c -+++ b/dpi/https.c -@@ -476,7 +476,11 @@ - case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: - /*Either self signed and untrusted*/ - /*Extract CN from certificate name information*/ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) { -+#else -+ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) { -+#endif - strcpy(buf, "(no CN given)"); - } else { - char *cn_end; - diff --git a/network/dillo/dillo.SlackBuild b/network/dillo/dillo.SlackBuild index 5094bd6ec7..2e1589f596 100644 --- a/network/dillo/dillo.SlackBuild +++ b/network/dillo/dillo.SlackBuild @@ -1,10 +1,12 @@ #!/bin/bash -# Slackware build script for dillo. It has NOT been tested on x86_64. +# Slackware build script for dillo web browser. # Copyright 2012 John B TN, USA # This was only successful with the help of ErikHanson@slackbuilds.org and # B Watson who e-mailed me his patch/idea for the fltk and fltk-13 problem +# I was having during the 3.0.5 build. +# # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dillo -VERSION=${VERSION:-3.0.5} +VERSION=${VERSION:-3.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,14 +42,13 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 fi +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -81,19 +82,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Thanks gentoo! -patch -p1 < $CWD/dillo-3.0.5-openssl-1.1.patch -patch -p1 < $CWD/dillo-3.0.5-fno-common.patch - autoreconf -fi -#https and ssl are in the alpha stage, but if you don't want to try and use it -#just delete or comment out --enable-ssl - +# Dillo looks for openssl first, then tls. Both are still in alpha +# stage but work to a degree and are better than nothing. CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --enable-ssl \ + --enable-openssl \ + --enable-tls \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -113,7 +110,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README AUTHORS INSTALL COPYING $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README AUTHORS COPYING $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/dillo/dillo.info b/network/dillo/dillo.info index f1ab0ad06c..ab11e672ad 100644 --- a/network/dillo/dillo.info +++ b/network/dillo/dillo.info @@ -1,8 +1,8 @@ PRGNAM="dillo" -VERSION="3.0.5" -HOMEPAGE="https://www.dillo.org/" -DOWNLOAD="https://www.dillo.org/download/dillo-3.0.5.tar.bz2" -MD5SUM="554aad93b6107bba696f4da022c41561" +VERSION="3.1.0" +HOMEPAGE="https://dillo-browser.github.io/" +DOWNLOAD="https://github.com/dillo-browser/dillo/releases/download/v3.1.0/dillo-3.1.0.tar.bz2" +MD5SUM="54e09a5282edc4fa59ff99720461fc57" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fltk" diff --git a/network/dillo/doinst.sh b/network/dillo/doinst.sh index 0d18ec2ded..a189943dd8 100644 --- a/network/dillo/doinst.sh +++ b/network/dillo/doinst.sh @@ -19,3 +19,9 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/network/dillo/slack-desc b/network/dillo/slack-desc index 74d7f3befc..443a5c371d 100644 --- a/network/dillo/slack-desc +++ b/network/dillo/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| dillo: dillo (dillo web browser) dillo: -dillo: Dillo is a multi-platform graphical web browser known -dillo: for its speed and small footprint. It is written in C and -dillo: C++ and is based on FLTK. Dillo is free software made -dillo: available under the terms of the GNU GPLv3. +dillo: Dillo is a multi-platform graphical web browser, known for its +dillo: its speed and small footprint, that is developed with a focus +dillo: on personal security and privacy. It is built with the FLTK 1.3 +dillo: GUI toolkit. Dillo is free GPL-3.0 licensed software. dillo: -dillo: Homepage: http://www.dillo.org +dillo: Homepage: https://dillo-browser.github.io/ dillo: dillo: dillo: diff --git a/network/discord/discord.SlackBuild b/network/discord/discord.SlackBuild index 51712eae42..c420c18f07 100644 --- a/network/discord/discord.SlackBuild +++ b/network/discord/discord.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=discord -VERSION=${VERSION:-0.0.50} +VERSION=${VERSION:-0.0.54} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/discord/discord.info b/network/discord/discord.info index e667e9d346..3967dc21bb 100644 --- a/network/discord/discord.info +++ b/network/discord/discord.info @@ -1,10 +1,10 @@ PRGNAM="discord" -VERSION="0.0.50" +VERSION="0.0.54" HOMEPAGE="https://discordapp.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://dl.discordapp.net/apps/linux/0.0.50/discord-0.0.50.deb" -MD5SUM_x86_64="d8833eed04524519f0dc716252fc751a" +DOWNLOAD_x86_64="https://dl.discordapp.net/apps/linux/0.0.54/discord-0.0.54.deb" +MD5SUM_x86_64="dc56f1c1a788848d31893e2a273c424e" REQUIRES="" MAINTAINER="Jeremy Hansen" EMAIL="jebrhansen+SBo@gmail.com" diff --git a/network/dnsproxy-bin/dnsproxy-bin.SlackBuild b/network/dnsproxy-bin/dnsproxy-bin.SlackBuild index 754f02619a..3700915963 100644 --- a/network/dnsproxy-bin/dnsproxy-bin.SlackBuild +++ b/network/dnsproxy-bin/dnsproxy-bin.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dnsproxy-bin -VERSION=${VERSION:-0.70.0} +VERSION=${VERSION:-0.71.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/dnsproxy-bin/dnsproxy-bin.info b/network/dnsproxy-bin/dnsproxy-bin.info index a92b474217..2142d4f910 100644 --- a/network/dnsproxy-bin/dnsproxy-bin.info +++ b/network/dnsproxy-bin/dnsproxy-bin.info @@ -1,13 +1,13 @@ PRGNAM="dnsproxy-bin" -VERSION="0.70.0" +VERSION="0.71.1" HOMEPAGE="https://github.com/AdguardTeam/dnsproxy" -DOWNLOAD="https://github.com/AdguardTeam/dnsproxy/releases/download/v0.70.0/dnsproxy-linux-386-v0.70.0.tar.gz \ - https://raw.githubusercontent.com/AdguardTeam/dnsproxy/v0.70.0/config.yaml.dist" -MD5SUM="2477cd961231ea37dacd5f66306e3a27 \ +DOWNLOAD="https://github.com/AdguardTeam/dnsproxy/releases/download/v0.71.1/dnsproxy-linux-386-v0.71.1.tar.gz \ + https://raw.githubusercontent.com/AdguardTeam/dnsproxy/v0.71.1/config.yaml.dist" +MD5SUM="1536d50297c7fdaa1754f15be45785ab \ 5a8aaaacbc3aeb1af4aac34233f2d14b" -DOWNLOAD_x86_64="https://github.com/AdguardTeam/dnsproxy/releases/download/v0.70.0/dnsproxy-linux-amd64-v0.70.0.tar.gz \ - https://raw.githubusercontent.com/AdguardTeam/dnsproxy/v0.70.0/config.yaml.dist" -MD5SUM_x86_64="3866f2ffc11a96222e6d2986ee1d743e \ +DOWNLOAD_x86_64="https://github.com/AdguardTeam/dnsproxy/releases/download/v0.71.1/dnsproxy-linux-amd64-v0.71.1.tar.gz \ + https://raw.githubusercontent.com/AdguardTeam/dnsproxy/v0.71.1/config.yaml.dist" +MD5SUM_x86_64="1dd834f8afa0eb721977a1ede6cf8a5f \ 5a8aaaacbc3aeb1af4aac34233f2d14b" REQUIRES="" MAINTAINER="Alexander Verbovetsky" diff --git a/network/drawterm/drawterm.info b/network/drawterm/drawterm.info index 0fec204c43..3711f8fd53 100644 --- a/network/drawterm/drawterm.info +++ b/network/drawterm/drawterm.info @@ -2,7 +2,7 @@ PRGNAM="drawterm" VERSION="dc703b3438f9" HOMEPAGE="http://drawterm.9front.org" DOWNLOAD="https://code.9front.org/hg/drawterm/archive/dc703b3438f9.tar.gz" -MD5SUM="d5625ed2b9f830e94e7ddce1872da6f4" +MD5SUM="49f2fea5fefe6c184f01c7f4249f19b4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/dropbear/dropbear.SlackBuild b/network/dropbear/dropbear.SlackBuild index 490b671695..870bb7ec01 100644 --- a/network/dropbear/dropbear.SlackBuild +++ b/network/dropbear/dropbear.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2007-2008, Piter Punk, São Paulo, Brazil # Copyright 2017-2020,2022 Andrew Clemons, Wellington New Zealand -# Copyright 2022 Andrew Clemons, Tokyo Japan +# Copyright 2022,2024 Andrew Clemons, Tokyo Japan # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dropbear -VERSION=${VERSION:-2022.83} +VERSION=${VERSION:-2024.85} SRCVERSION="DROPBEAR_$VERSION" BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,8 +77,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -autoreconf -if - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -132,7 +130,7 @@ mkdir -p $PKG/etc/rc.d cat $CWD/rc.dropbear.new > $PKG/etc/rc.d/rc.dropbear.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES LICENSE MULTI README SMALL $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES DEVELOPING.md FUZZER-NOTES.md LICENSE MULTI.md README.md SMALL.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/dropbear/dropbear.info b/network/dropbear/dropbear.info index b4635fc56b..8fe661d388 100644 --- a/network/dropbear/dropbear.info +++ b/network/dropbear/dropbear.info @@ -1,8 +1,8 @@ PRGNAM="dropbear" -VERSION="2022.83" +VERSION="2024.85" HOMEPAGE="https://github.com/mkj/dropbear" -DOWNLOAD="https://github.com/mkj/dropbear/archive/DROPBEAR_2022.83/dropbear-DROPBEAR_2022.83.tar.gz" -MD5SUM="f166e27ec24752ffa892910fc89a51b1" +DOWNLOAD="https://github.com/mkj/dropbear/archive/DROPBEAR_2024.85/dropbear-DROPBEAR_2024.85.tar.gz" +MD5SUM="d4b107f6fd103bc2c6ed7226bbae69b2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/dropbox/dropbox.SlackBuild b/network/dropbox/dropbox.SlackBuild index f84854721d..5528d18dbe 100644 --- a/network/dropbox/dropbox.SlackBuild +++ b/network/dropbox/dropbox.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dropbox -VERSION=${VERSION:-196.4.6900} +VERSION=${VERSION:-199.4.6287} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/dropbox/dropbox.info b/network/dropbox/dropbox.info index 9df24e3a6b..1e9efa2df5 100644 --- a/network/dropbox/dropbox.info +++ b/network/dropbox/dropbox.info @@ -1,10 +1,10 @@ PRGNAM="dropbox" -VERSION="196.4.6900" +VERSION="199.4.6287" HOMEPAGE="https://www.dropbox.com" -DOWNLOAD="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-196.4.6900.tar.gz" -MD5SUM="691c757e0689c38df18d5d3a0e54b66c" -DOWNLOAD_x86_64="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-196.4.6900.tar.gz" -MD5SUM_x86_64="7ceac7a9546e337c78d13106fb923880" +DOWNLOAD="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-199.4.6287.tar.gz" +MD5SUM="ecd81fd4056cb4581d1624287ec35513" +DOWNLOAD_x86_64="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-199.4.6287.tar.gz" +MD5SUM_x86_64="d511d250b12d4dad3ea457fc30481071" REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/network/enet/enet.SlackBuild b/network/enet/enet.SlackBuild index c31af6a1a2..84e201aa40 100644 --- a/network/enet/enet.SlackBuild +++ b/network/enet/enet.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for enet -# Copyright 2021 S. S. Bolokanar, Bulgaria <bolokanar@bulgars.org> +# Copyright 2021 S. S. Bolokanar, Bulgaria <bolokanar@bulgarsociety.org> # С. С. Болоканаръ, България # All rights reserved. # @@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=enet -VERSION=${VERSION:-1.3.17} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.3.18} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/enet/enet.info b/network/enet/enet.info index 2d5be7c542..4c3c9de948 100644 --- a/network/enet/enet.info +++ b/network/enet/enet.info @@ -1,10 +1,10 @@ PRGNAM="enet" -VERSION="1.3.17" +VERSION="1.3.18" HOMEPAGE="http://enet.bespin.org" -DOWNLOAD="http://enet.bespin.org/download/enet-1.3.17.tar.gz" -MD5SUM="c8e96051c5a60afa9f3052d02b2cbe19" +DOWNLOAD="http://enet.bespin.org/download/enet-1.3.18.tar.gz" +MD5SUM="0b52430b05f42ff867a44a8ce5df2012" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="S. S. Bolokanar" -EMAIL="bolokanar@bulgars.org" +EMAIL="bolokanar@bulgarsociety.org" diff --git a/network/fail2ban/doinst.sh b/network/fail2ban/doinst.sh index 1239d0323e..7c5f64edbf 100644 --- a/network/fail2ban/doinst.sh +++ b/network/fail2ban/doinst.sh @@ -24,4 +24,3 @@ preserve_perms() { preserve_perms etc/rc.d/rc.fail2ban.new config etc/logrotate.d/fail2ban.new -config etc/bash_completion.d/fail2ban.new diff --git a/network/fail2ban/fail2ban.SlackBuild b/network/fail2ban/fail2ban.SlackBuild index a08000e8f7..db6e648408 100644 --- a/network/fail2ban/fail2ban.SlackBuild +++ b/network/fail2ban/fail2ban.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="fail2ban" VERSION=${VERSION:-1.0.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,7 +72,7 @@ sed -i 's|self.install_dir|"/usr/bin"|' setup.py sed -i 's/^before = paths-debian.conf/before = paths-slackware.conf/' config/jail.conf ./fail2ban-2to3 -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG # installing man pages mkdir -p $PKG/usr/man/{man1,man5} @@ -87,14 +87,18 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r install -D -m 0644 $CWD/rc.fail2ban $PKG/etc/rc.d/rc.fail2ban.new # install slackware specific config file -install -D -m 0644 $CWD/config/paths-slackware.conf $PKG/etc/fail2ban/paths-slackware.conf.new +install -D -m 0644 $CWD/config/paths-slackware.conf $PKG/etc/fail2ban/paths-slackware.conf # remove non-slackware specific config files -rm -f $PKG/etc/fail2ban/paths-{arch,debian,fedora,freebsd,osx,opensuse}.conf.new +rm -f $PKG/etc/fail2ban/paths-{arch,debian,fedora,freebsd,osx,opensuse}.conf # install bash completion script if requested if [ "$BASH_COMPLETION" = "yes" ]; then install -D -m 0644 files/bash-completion $PKG/usr/share/bash-completion/completions/fail2ban + ( cd $PKG/usr/share/bash-completion/completions ; ln -sf fail2ban fail2ban-client ) + ( cd $PKG/usr/share/bash-completion/completions ; ln -sf fail2ban fail2ban-python ) + ( cd $PKG/usr/share/bash-completion/completions ; ln -sf fail2ban fail2ban-regex ) + ( cd $PKG/usr/share/bash-completion/completions ; ln -sf fail2ban fail2ban-server ) fi # install logrotate script diff --git a/network/freedownloadmanager/freedownloadmanager.SlackBuild b/network/freedownloadmanager/freedownloadmanager.SlackBuild index aebf680763..478a103c6e 100644 --- a/network/freedownloadmanager/freedownloadmanager.SlackBuild +++ b/network/freedownloadmanager/freedownloadmanager.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=freedownloadmanager -VERSION=${VERSION:-6.16.0.4468} +VERSION=${VERSION:-6.20.0.5510} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/network/freedownloadmanager/freedownloadmanager.info b/network/freedownloadmanager/freedownloadmanager.info index 9469b5fffd..032ec1f397 100644 --- a/network/freedownloadmanager/freedownloadmanager.info +++ b/network/freedownloadmanager/freedownloadmanager.info @@ -1,8 +1,8 @@ PRGNAM="freedownloadmanager" -VERSION="6.16.0.4468" +VERSION="6.20.0.5510" HOMEPAGE="https://www.freedownloadmanager.org" DOWNLOAD="https://dn3.freedownloadmanager.org/6/latest/freedownloadmanager.deb" -MD5SUM="d5c4888ca4ebf7473af898c98e943bf5" +MD5SUM="5be30821ccb115819d54c8d0642b6c70" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/gallery-dl/gallery-dl.SlackBuild b/network/gallery-dl/gallery-dl.SlackBuild index 570bb808ed..a9ce38f4fe 100644 --- a/network/gallery-dl/gallery-dl.SlackBuild +++ b/network/gallery-dl/gallery-dl.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gallery-dl -VERSION=${VERSION:-1.26.8} +VERSION=${VERSION:-1.26.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/gallery-dl/gallery-dl.info b/network/gallery-dl/gallery-dl.info index f5b7bf9139..f5fc86ed96 100644 --- a/network/gallery-dl/gallery-dl.info +++ b/network/gallery-dl/gallery-dl.info @@ -1,8 +1,8 @@ PRGNAM="gallery-dl" -VERSION="1.26.8" +VERSION="1.26.9" HOMEPAGE="https://github.com/mikf/gallery-dl" -DOWNLOAD="https://github.com/mikf/gallery-dl/archive/v1.26.8/gallery-dl-1.26.8.tar.gz" -MD5SUM="1922ddc39c6f79dc7389ab8964bbf6a7" +DOWNLOAD="https://github.com/mikf/gallery-dl/archive/v1.26.9/gallery-dl-1.26.9.tar.gz" +MD5SUM="642412495c891fcc291abcf7ee234adf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/gnome-bluetooth/gnome-bluetooth.info b/network/gnome-bluetooth/gnome-bluetooth.info index f3381ab043..ce085642d8 100644 --- a/network/gnome-bluetooth/gnome-bluetooth.info +++ b/network/gnome-bluetooth/gnome-bluetooth.info @@ -6,5 +6,5 @@ MD5SUM="d83faa54abaf64bb40b5313bc233e74e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Juan M. Lasca" -EMAIL="juanmlasca@gmail.com" +MAINTAINER="Bob Funk" +EMAIL="bobfunk11@gmail.com" diff --git a/network/goimapnotify/go.mod b/network/goimapnotify/go.mod index 7dd7616515..0769ccfa39 100644 --- a/network/goimapnotify/go.mod +++ b/network/goimapnotify/go.mod @@ -1,6 +1,6 @@ module gitlab.com/shackra/goimapnotify -go 1.21.6 +go 1.22.1 require ( github.com/emersion/go-imap v1.2.1 @@ -10,6 +10,6 @@ require ( ) require ( - golang.org/x/sys v0.18.0 // indirect + golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect ) diff --git a/network/goimapnotify/go.sum b/network/goimapnotify/go.sum index b58b347ff4..910b3e0e89 100644 --- a/network/goimapnotify/go.sum +++ b/network/goimapnotify/go.sum @@ -26,8 +26,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= diff --git a/network/goimapnotify/goimapnotify.SlackBuild b/network/goimapnotify/goimapnotify.SlackBuild index 4f84f8f0b9..314febaac3 100644 --- a/network/goimapnotify/goimapnotify.SlackBuild +++ b/network/goimapnotify/goimapnotify.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=goimapnotify -VERSION=${VERSION:-2.3.12} +VERSION=${VERSION:-2.3.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -98,7 +98,7 @@ go build install -sDm 755 goimapnotify -t $PKG/usr/bin mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG.rst README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG* README* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/goimapnotify/goimapnotify.info b/network/goimapnotify/goimapnotify.info index d28f3389f0..b51ff5a449 100644 --- a/network/goimapnotify/goimapnotify.info +++ b/network/goimapnotify/goimapnotify.info @@ -1,19 +1,19 @@ PRGNAM="goimapnotify" -VERSION="2.3.12" +VERSION="2.3.15" HOMEPAGE="https://gitlab.com/shackra/goimapnotify" -DOWNLOAD="https://gitlab.com/shackra/goimapnotify/-/archive/2.3.12/goimapnotify-2.3.12.tar.gz \ +DOWNLOAD="https://gitlab.com/shackra/goimapnotify/-/archive/2.3.15/goimapnotify-2.3.15.tar.gz \ https://github.com/emersion/go-imap/archive/v1.2.1/go-imap-v1.2.1.tar.gz \ https://github.com/emersion/go-imap-idle/archive/db25684/go-imap-idle-db2568431445.tar.gz \ https://github.com/emersion/go-sasl/archive/e73c9f7/go-sasl-e73c9f7bad43.tar.gz \ https://github.com/sirupsen/logrus/archive/v1.9.3/logrus-v1.9.3.tar.gz \ - https://github.com/golang/sys/archive/v0.18.0/sys-v0.18.0.tar.gz \ + https://github.com/golang/sys/archive/v0.19.0/sys-v0.19.0.tar.gz \ https://github.com/golang/text/archive/v0.14.0/text-v0.14.0.tar.gz" -MD5SUM="ace5c852d7c851e4cb9da3f4c576bba9 \ +MD5SUM="cdd63ac1f0465b365a0d49f48494bd63 \ 337ec4e15b3b9435bec02d0b4c634797 \ 0c60834c277747653bf1d883ac7660b2 \ efc2190ae65129b3e2531a9258181e98 \ 29e75bd7c106e1853d2a9de8bd17dbb0 \ - e00453d8847cde61907bcbee219c44bb \ + 884f364735b00bb72fcea01a6de28c46 \ 9f64144d4b1647ce4597abf657028a8d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/goimapnotify/modules.txt b/network/goimapnotify/modules.txt index 0429696a1f..1711fb33fa 100644 --- a/network/goimapnotify/modules.txt +++ b/network/goimapnotify/modules.txt @@ -16,7 +16,7 @@ github.com/emersion/go-sasl # github.com/sirupsen/logrus v1.9.3 ## explicit; go 1.13 github.com/sirupsen/logrus -# golang.org/x/sys v0.18.0 +# golang.org/x/sys v0.19.0 ## explicit; go 1.18 golang.org/x/sys/unix golang.org/x/sys/windows diff --git a/network/hylafax+/hylafax+.SlackBuild b/network/hylafax+/hylafax+.SlackBuild index 18465f759a..32abfd11e8 100644 --- a/network/hylafax+/hylafax+.SlackBuild +++ b/network/hylafax+/hylafax+.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=hylafax+ SRCNAM=hylafax -VERSION=${VERSION:-7.0.5} +VERSION=${VERSION:-7.0.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/hylafax+/hylafax+.info b/network/hylafax+/hylafax+.info index fd7edd7862..57f3555f7c 100644 --- a/network/hylafax+/hylafax+.info +++ b/network/hylafax+/hylafax+.info @@ -1,8 +1,8 @@ PRGNAM="hylafax+" -VERSION="7.0.5" +VERSION="7.0.8" HOMEPAGE="http://hylafax.sourceforge.net" -DOWNLOAD="http://prdownloads.sourceforge.net/hylafax/hylafax-7.0.5.tar.gz" -MD5SUM="ac8450d7aa8e5d6dd726e4d601702d69" +DOWNLOAD="http://prdownloads.sourceforge.net/hylafax/hylafax-7.0.8.tar.gz" +MD5SUM="3b04ab1eef3ea44706c461168cab1f24" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/ipcalc-ng/README b/network/ipcalc-ng/README new file mode 100644 index 0000000000..7d9294f3fc --- /dev/null +++ b/network/ipcalc-ng/README @@ -0,0 +1,14 @@ +This is a modern tool to assist in network address calculations for +IPv4 and IPv6. It acts both as a tool to output human readable +information about a network or address, as well as a tool suitable to +be used by scripts or other programs. + +It supports printing a summary about the provided network address, +multiple command line options per information to be printed, +transparent IPv6 support, and in addition it will use libGeoIP if +available to provide geographic information. + +The project started as a fork of the ipcalc tool in the Fedora +distribution but it has since then replaced the original tool. + +ipcalc-ng cannot be installed at the same time as ipcalc. diff --git a/python/python2-swiftclient/python2-swiftclient.SlackBuild b/network/ipcalc-ng/ipcalc-ng.SlackBuild index 29ce4da93b..47ad1befb5 100644 --- a/python/python2-swiftclient/python2-swiftclient.SlackBuild +++ b/network/ipcalc-ng/ipcalc-ng.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for python-swiftclient +# Slackware build script for ipcalc-ng -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2024, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,9 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=python2-swiftclient -SRCNAM=python-swiftclient -VERSION=${VERSION:-3.2.0} +PRGNAM=ipcalc-ng +VERSION=${VERSION:-1.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -60,6 +56,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -70,9 +69,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION +rm -rf ipcalc-$VERSION +tar xvf $CWD/ipcalc-$VERSION.tar.gz +cd ipcalc-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -80,18 +79,34 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG +mkdir build +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc \ + -Duse_maxminddb=enabled \ + -Dstrip=true + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mv $PKG/usr/share/man $PKG/usr -rm -rf $PKG/usr/share find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/ipcalc-ng/ipcalc-ng.info b/network/ipcalc-ng/ipcalc-ng.info new file mode 100644 index 0000000000..adb1c31102 --- /dev/null +++ b/network/ipcalc-ng/ipcalc-ng.info @@ -0,0 +1,10 @@ +PRGNAM="ipcalc-ng" +VERSION="1.0.3" +HOMEPAGE="https://gitlab.com/ipcalc/ipcalc" +DOWNLOAD="https://gitlab.com/ipcalc/ipcalc/-/archive/1.0.3/ipcalc-1.0.3.tar.gz" +MD5SUM="a7b49f0eeda7a5f390427e5533ddf5da" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="libmaxminddb rubygem-ronn" +MAINTAINER="Alexander Verbovetsky" +EMAIL="alik@ejik.org" diff --git a/development/tstoolbox/slack-desc b/network/ipcalc-ng/slack-desc index 52b7b67cf3..4ef1ebeb5e 100644 --- a/development/tstoolbox/slack-desc +++ b/network/ipcalc-ng/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -tstoolbox: tstoolbox (manipulate time series files) -tstoolbox: -tstoolbox: The tstoolbox is a Python script to manipulate time-series on the -tstoolbox: command line or by function calls within Python. -tstoolbox: -tstoolbox: Homepage: https://pypi.python.org/pypi/tstoolbox -tstoolbox: -tstoolbox: -tstoolbox: -tstoolbox: -tstoolbox: +ipcalc-ng: ipcalc-ng (An IP Netmask/broadcast/etc calculator) +ipcalc-ng: +ipcalc-ng: This is a modern tool to assist in network address calculations for +ipcalc-ng: IPv4 and IPv6. It acts both as a tool to output human readable +ipcalc-ng: information about a network or address, as well as a tool suitable +ipcalc-ng: to be used by scripts or other programs. +ipcalc-ng: +ipcalc-ng: +ipcalc-ng: Homepage: https://gitlab.com/ipcalc/ipcalc +ipcalc-ng: +ipcalc-ng: diff --git a/network/ircd-hybrid/ircd-hybrid.SlackBuild b/network/ircd-hybrid/ircd-hybrid.SlackBuild index 33bf9bf445..db8cc00180 100644 --- a/network/ircd-hybrid/ircd-hybrid.SlackBuild +++ b/network/ircd-hybrid/ircd-hybrid.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ircd-hybrid -# Copyright 2018-2022 Ebben Aries <slackbuilds@dscp.org> +# Copyright 2018-2024 Ebben Aries <slackbuilds@dscp.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ircd-hybrid BINNAM=ircd -VERSION=${VERSION:-8.2.43} +VERSION=${VERSION:-20240506_e813b4f} +GITHASH=${GITHASH:-e813b4f4352586db6b42bafb6e10e4bb113e62d4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,9 +82,10 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$GITHASH +mkdir $PRGNAM-$GITHASH +tar xvf $CWD/$PRGNAM-$GITHASH.tar.gz +cd $PRGNAM-$GITHASH chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/network/ircd-hybrid/ircd-hybrid.info b/network/ircd-hybrid/ircd-hybrid.info index aecb5942fc..9f031cc15b 100644 --- a/network/ircd-hybrid/ircd-hybrid.info +++ b/network/ircd-hybrid/ircd-hybrid.info @@ -1,8 +1,8 @@ PRGNAM="ircd-hybrid" -VERSION="8.2.43" +VERSION="20240506_e813b4f" HOMEPAGE="http://www.ircd-hybrid.org/" -DOWNLOAD="https://github.com/ircd-hybrid/ircd-hybrid/archive/8.2.43/ircd-hybrid-8.2.43.tar.gz" -MD5SUM="00bb3ec521f59b8ec44aba09d05f04c8" +DOWNLOAD="https://github.com/ircd-hybrid/ircd-hybrid/archive/e813b4f/ircd-hybrid-e813b4f4352586db6b42bafb6e10e4bb113e62d4.tar.gz" +MD5SUM="84a21e3351c1b88352492f463e96f740" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/jitsi-meet-desktop/jitsi-meet-desktop.SlackBuild b/network/jitsi-meet-desktop/jitsi-meet-desktop.SlackBuild index 2c5424a40d..261bd872a5 100644 --- a/network/jitsi-meet-desktop/jitsi-meet-desktop.SlackBuild +++ b/network/jitsi-meet-desktop/jitsi-meet-desktop.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jitsi-meet-desktop -VERSION=${VERSION:-2024.3.0} +VERSION=${VERSION:-2024.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/jitsi-meet-desktop/jitsi-meet-desktop.info b/network/jitsi-meet-desktop/jitsi-meet-desktop.info index 690983e6aa..cdb3d9d8cf 100644 --- a/network/jitsi-meet-desktop/jitsi-meet-desktop.info +++ b/network/jitsi-meet-desktop/jitsi-meet-desktop.info @@ -1,10 +1,10 @@ PRGNAM="jitsi-meet-desktop" -VERSION="2024.3.0" +VERSION="2024.5.0" HOMEPAGE="https://jitsi.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/jitsi/jitsi-meet-electron/releases/download/v2024.3.0/jitsi-meet-x86_64.AppImage" -MD5SUM_x86_64="bd3a9721e63982c85ce524dbb15e412c" +DOWNLOAD_x86_64="https://github.com/jitsi/jitsi-meet-electron/releases/download/v2024.5.0/jitsi-meet-x86_64.AppImage" +MD5SUM_x86_64="83d3b1bf8692234a2f490aa2e7ebfe89" REQUIRES="" MAINTAINER="Eugene Wissner" EMAIL="belka@caraus.de" diff --git a/network/kismet/kismet.SlackBuild b/network/kismet/kismet.SlackBuild index 31c32c7fa4..0a4f245297 100644 --- a/network/kismet/kismet.SlackBuild +++ b/network/kismet/kismet.SlackBuild @@ -28,8 +28,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kismet -VERSION=${VERSION:-2023.07.R1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20240430} +COMMITVER="c28bca11baa23888510fac59a34bbe0b5d68dc37" +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +42,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -82,10 +80,10 @@ set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-${VERSION//./-} +rm -rf $PRGNAM-$COMMITVER -tar xvf $CWD/$PRGNAM-${VERSION//./-}.tar.xz -cd $PRGNAM-${VERSION//./-} +tar xvf $CWD/$PRGNAM-$COMMITVER.tar.gz +cd $PRGNAM-$COMMITVER chown -R root:root . find -L . \ diff --git a/network/kismet/kismet.info b/network/kismet/kismet.info index 93aae74af6..56afd59c8c 100644 --- a/network/kismet/kismet.info +++ b/network/kismet/kismet.info @@ -1,10 +1,10 @@ PRGNAM="kismet" -VERSION="2023.07.R1" +VERSION="20240430" HOMEPAGE="https://kismetwireless.net/" -DOWNLOAD="https://www.kismetwireless.net/code/kismet-2023-07-R1.tar.xz" -MD5SUM="d6c82b241de1be72d2dcb5e0102d8c99" +DOWNLOAD="https://github.com/kismetwireless/kismet/archive/c28bca11baa23888510fac59a34bbe0b5d68dc37/kismet-c28bca11baa23888510fac59a34bbe0b5d68dc37.tar.gz" +MD5SUM="8ebc66d758162eb4bf5324a17c7b46ad" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libwebsockets protobuf-c" +REQUIRES="libwebsockets protobuf-c mosquitto" MAINTAINER="pyllyukko" EMAIL="pyllyukko@maimed.org" diff --git a/network/libvma/README b/network/libvma/README new file mode 100644 index 0000000000..a8b0aa41fc --- /dev/null +++ b/network/libvma/README @@ -0,0 +1,5 @@ +Mellanox's Messaging Accelerator (VMA) is a library that can be +preloaded with LD_PRELOAD when running message-based and +streaming applications, overriding networking APIs in order to +bypass the kernel's network stack to userspace, +reducing latency and improving thoughput. diff --git a/libraries/libass/libass.SlackBuild b/network/libvma/libvma.SlackBuild index 10f64bd7da..7f4ace4e27 100644 --- a/libraries/libass/libass.SlackBuild +++ b/network/libvma/libvma.SlackBuild @@ -1,9 +1,8 @@ #!/bin/bash -# Slackware build script for libass +# Slackware build script for libvma -# Written by Larry Hajali <larryhaja[at]gmail[dot]com> -# Copyright 2011-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2024 GUAN Xin <guanx.bac@gmail.com> from Beijing # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=libass -VERSION=${VERSION:-0.17.1} +PRGNAM=libvma +VERSION=${VERSION:-9.8.60} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -60,6 +56,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -71,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -80,25 +79,32 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-static=no \ - --disable-silent-rules \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --enable-doc \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Changelog COPYING $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + CHANGES COPYING LICENSE README* \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/libvma/libvma.info b/network/libvma/libvma.info new file mode 100644 index 0000000000..876c91c5cc --- /dev/null +++ b/network/libvma/libvma.info @@ -0,0 +1,10 @@ +PRGNAM="libvma" +VERSION="9.8.60" +HOMEPAGE="https://github.com/Mellanox/libvma/wiki" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/Mellanox/libvma/archive/9.8.60/libvma-9.8.60.tar.gz" +MD5SUM_x86_64="ba5fbc75507337e6b5400807a208aaaf" +REQUIRES="rdma-core" +MAINTAINER="GUAN Xin" +EMAIL="guanx.bac@gmail.com" diff --git a/development/Sphinx/slack-desc b/network/libvma/slack-desc index 403648f0ae..8155ed1263 100644 --- a/development/Sphinx/slack-desc +++ b/network/libvma/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -Sphinx: Sphinx (Documentation generator) -Sphinx: -Sphinx: Sphinx is a tool that translates a set of reStructuredText source -Sphinx: files into various output formats, including HTML, ePub, LaTeX and -Sphinx: plain text. Sphinx was originally created for the Python -Sphinx: documentation, but it has excellent facilities for the documentation -Sphinx: of software projects in a range of languages. -Sphinx: -Sphinx: -Sphinx: -Sphinx: +libvma: libvma (Mellanox's Messaging Accelerator library) +libvma: +libvma: Mellanox's Messaging Accelerator (VMA) is a library that can be +libvma: preloaded with LD_PRELOAD when running message-based and +libvma: streaming applications, overriding networking APIs in order to +libvma: bypass the kernel's network stack to userspace, +libvma: reducing latency and improving thoughput. +libvma: +libvma: Homepage: https://github.com/Mellanox/libvma/wiki +libvma: +libvma: diff --git a/network/lldpd/lldpd.SlackBuild b/network/lldpd/lldpd.SlackBuild index c9a6433acf..5daa10c247 100644 --- a/network/lldpd/lldpd.SlackBuild +++ b/network/lldpd/lldpd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for lldpd -# Copyright 2017-2023 Thibaut Notteboom, Paris, FRANCE +# Copyright 2017-2024 Thibaut Notteboom, Paris, FRANCE # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lldpd -VERSION=${VERSION:-1.0.17} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.0.18} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/lldpd/lldpd.info b/network/lldpd/lldpd.info index 7cab963fa6..de5c52c545 100644 --- a/network/lldpd/lldpd.info +++ b/network/lldpd/lldpd.info @@ -1,8 +1,8 @@ PRGNAM="lldpd" -VERSION="1.0.17" +VERSION="1.0.18" HOMEPAGE="https://vincentbernat.github.io/lldpd/" -DOWNLOAD="https://media.luffy.cx/files/lldpd/lldpd-1.0.17.tar.gz" -MD5SUM="047ab026dbc4b22b7ef37991e7e2afaa" +DOWNLOAD="https://media.luffy.cx/files/lldpd/lldpd-1.0.18.tar.gz" +MD5SUM="1ee8a5059044632b4306bd2eee9b54bc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/memcached/memcached.SlackBuild b/network/memcached/memcached.SlackBuild index 95bdb8ed75..533afa9bb4 100644 --- a/network/memcached/memcached.SlackBuild +++ b/network/memcached/memcached.SlackBuild @@ -92,7 +92,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=array-bounds" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/monkey/monkey.info b/network/monkey/monkey.info index 079b2763c6..bf97a19323 100644 --- a/network/monkey/monkey.info +++ b/network/monkey/monkey.info @@ -1,7 +1,7 @@ PRGNAM="monkey" VERSION="1.6.9" HOMEPAGE="http://monkey-project.com/" -DOWNLOAD="http://monkey-project.com/releases/1.6/monkey-1.6.9.tar.gz" +DOWNLOAD="https://dev.alpinelinux.org/archive/monkey/monkey-1.6.9.tar.gz" MD5SUM="c401734985a936ee07dbff5eca7d176a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/mosh/1282.patch b/network/mosh/1282.patch deleted file mode 100644 index c8376a2c12..0000000000 --- a/network/mosh/1282.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8012ca9c8d16f99679c171b36ad02655549ab7ff Mon Sep 17 00:00:00 2001 -From: Alex Chernyakhovsky <alex@achernya.com> -Date: Sun, 30 Jul 2023 16:19:46 -0400 -Subject: [PATCH] Bump C++ version to C++17 - -Protobuf versions since 3.6.0 have long had a C++11 dependency; even -more recent versions have picked up an Abseil dependency bumping that -to C++14. Since it is now 2023, defaulting to C++17 is reasonable, so -remove the conditional C++ standards version check that mosh -previously had and replace it with an unconditional C++17 check. - -This means that all future commits can use C++17 features. According -to https://en.cppreference.com/w/cpp/compiler_support/17 this means -that minimum effective compiler versions for mosh become: - -gcc 7 (May 2017) -clang 5 (September 2017) - -This, in turn, implies that future versions of mosh will no longer be -available for RHEL/CentOS 7 (June 2014). - -Closes: #1267 ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ee70c7b86..7f7dc3bc2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,9 +22,9 @@ AS_IF([test x"$PROTOC" = x], - # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - --# Protobuf 3.6+ requires C++11. --AS_IF([pkg-config --atleast-version 3.6.0 protobuf], -- [AX_CXX_COMPILE_STDCXX([11])]) -+# Protobuf transitively requires at least C++14, get ahead of the -+# curve and require at least C++17. -+AX_CXX_COMPILE_STDCXX([17]) - - WARNING_CXXFLAGS="" - PICKY_CXXFLAGS="" diff --git a/network/mosh/README b/network/mosh/README deleted file mode 100644 index 8b1944f8d5..0000000000 --- a/network/mosh/README +++ /dev/null @@ -1,18 +0,0 @@ -mosh (MObile SHell server and client) - -Mosh is a remote terminal application that allows roaming, supports -intermittent connectivity, and provides intelligent local echo and -line editing of user keystrokes. - -Mosh attempts to improve on SSH by being more robust and responsive, -especially over Wi-Fi, cellular, and long-distance links. - -The mosh client must be run with a UTF-8 locale. Locales -can be configured system-wide in /etc/profile.d/lang.sh or -/etc/profile.d/lang.csh - -Alternatively set LANG to a UTF-8 locale (e.g. LANG=en_GB.UTF-8) -somewhere else you consider suitable. - -Additionally the server that you are connecting to must have the same -locale installed (though it need not be set as the default). diff --git a/network/mosh/mosh.SlackBuild b/network/mosh/mosh.SlackBuild deleted file mode 100644 index 8127e0ff4d..0000000000 --- a/network/mosh/mosh.SlackBuild +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -# Slackware build script for mosh - -# Written by ruario -# Formerly maintained by Donald Cooley, South Haven, Indiana, USA -# Now maintained by B. Watson <urchlay@slackware.uk>. -# Original script had no license; modified version licensed under -# the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. - -# 20230225 bkw: homepage/download changed. - -# 20220425 bkw: BUILD=2 -# - take over maintenance. -# - relicense script as WTFPL. -# - include a couple more doc files (THANKS and ocb-license.html). -# - add bash completion to package. -# - add ufw integration to package (untested; I don't run ufw). - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=mosh -VERSION=${VERSION:-1.4.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -# patch to work with newer protobuf3 -patch -p1 < $CWD/1282.patch - -autoreconf -vif -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -fpermissive" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG -gzip -9 $PKG/usr/man/man*/* - -install -D -m0644 \ - conf/bash-completion/completions/$PRGNAM \ - $PKG/usr/share/bash-completion/completions/$PRGNAM - -install -D -m0644 \ - conf/ufw/applications.d/$PRGNAM \ - $PKG/etc/ufw/applications.d/$PRGNAM - -PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKGDOC -cp -a AUTHORS COPYING ChangeLog NEWS *.md *.html THANKS $PKGDOC -cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/mosh/mosh.info b/network/mosh/mosh.info deleted file mode 100644 index 9578dd57f8..0000000000 --- a/network/mosh/mosh.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mosh" -VERSION="1.4.0" -HOMEPAGE="https://mosh.org" -DOWNLOAD="https://mosh.org/mosh-1.4.0.tar.gz" -MD5SUM="c34a647f8545565d79188acacaea7559" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="perl-IO-Tty protobuf3" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/network/mosh/slack-desc b/network/mosh/slack-desc deleted file mode 100644 index 077b45efd6..0000000000 --- a/network/mosh/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -mosh: mosh (MObile SHell server and client) -mosh: -mosh: Remote terminal application that allows roaming, supports intermittent -mosh: connectivity, and provides intelligent local echo and line editing of -mosh: user keystrokes. -mosh: -mosh: Mosh attempts to improve on SSH by being more robust and responsive, -mosh: especially over Wi-Fi, cellular, and long-distance links. -mosh: -mosh: http://mosh.mit.edu/ -mosh: diff --git a/network/movgrab/movgrab.SlackBuild b/network/movgrab/movgrab.SlackBuild index fc151c4a1d..1597dd3544 100644 --- a/network/movgrab/movgrab.SlackBuild +++ b/network/movgrab/movgrab.SlackBuild @@ -6,7 +6,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=movgrab -VERSION=${VERSION:-1.2.1} +SRCNAM=Movgrab +VERSION=${VERSION:-3.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -19,9 +20,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -50,9 +48,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -62,7 +60,6 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" -autoreconf # otherwise fails with libUseful ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -80,13 +77,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/libUseful-2.0 cp -a \ Docs/* README LICENCE CHANGES \ $PKG/usr/doc/$PRGNAM-$VERSION - cp -a \ - libUseful-2.0/Docs/* \ - $PKG/usr/doc/$PRGNAM-$VERSION/libUseful-2.0 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/movgrab/movgrab.info b/network/movgrab/movgrab.info index 636f393e21..def597f952 100644 --- a/network/movgrab/movgrab.info +++ b/network/movgrab/movgrab.info @@ -1,8 +1,8 @@ PRGNAM="movgrab" -VERSION="1.2.1" -HOMEPAGE="http://sites.google.com/site/columscode/home/movgrab" -DOWNLOAD="https://sites.google.com/site/columscode/files/movgrab-1.2.1.tar.gz" -MD5SUM="db162d6963b9753d6235f23419d08a5a" +VERSION="3.1.2" +HOMEPAGE="https://github.com/ColumPaget/Movgrab" +DOWNLOAD="https://github.com/ColumPaget/Movgrab/archive/3.1.2/Movgrab-3.1.2.tar.gz" +MD5SUM="567faf36bf7f75b30e6098050688fbd3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/movgrab/slack-desc b/network/movgrab/slack-desc index ed316e1576..80a6e4b96a 100644 --- a/network/movgrab/slack-desc +++ b/network/movgrab/slack-desc @@ -12,7 +12,7 @@ movgrab: movgrab is a downloader for all those pesky sites that insist you use movgrab: a big fat browser that runs flash in order to see their content. movgrab: It's a command-line app written in straight C. movgrab: -movgrab: homepage: http://sites.google.com/site/columscode/home/movgrab +movgrab: homepage: https://github.com/ColumPaget/Movgrab movgrab: movgrab: movgrab: diff --git a/network/mptcpd/README b/network/mptcpd/README new file mode 100644 index 0000000000..432f248bf4 --- /dev/null +++ b/network/mptcpd/README @@ -0,0 +1,6 @@ +The Multipath TCP Daemon is a daemon for Linux based operating systems +that performs multipath TCP path management related operations in the +user space. It interacts with the Linux kernel through a generic +netlink connection to track per-connection information (e.g. available +remote addresses), available network interfaces, request new MPTCP +subflows, handle requests for subflows, etc. diff --git a/libraries/gtkspell3/gtkspell3.SlackBuild b/network/mptcpd/mptcpd.SlackBuild index 229919db89..2abb0f06d6 100644 --- a/libraries/gtkspell3/gtkspell3.SlackBuild +++ b/network/mptcpd/mptcpd.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for gtkspell3 +# Slackware build script for mptcpd -# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2024 Thibaut Notteboom, Paris, FRANCE # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=gtkspell3 -VERSION=${VERSION:-3.0.10} +PRGNAM=mptcpd +VERSION=${VERSION:-0.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -59,6 +56,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -70,14 +70,14 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -88,19 +88,22 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-static=no \ + --disable-static \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*/*.la -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL README docs/html $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING LICENSES/ NEWS README* \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/mptcpd/mptcpd.info b/network/mptcpd/mptcpd.info new file mode 100644 index 0000000000..62f67cf5a9 --- /dev/null +++ b/network/mptcpd/mptcpd.info @@ -0,0 +1,10 @@ +PRGNAM="mptcpd" +VERSION="0.12" +HOMEPAGE="https://github.com/multipath-tcp/mptcpd" +DOWNLOAD="https://github.com/multipath-tcp/mptcpd/releases/download/v0.12/mptcpd-0.12.tar.gz" +MD5SUM="db55d55ab4591452582101d2343a8958" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="ell" +MAINTAINER="Thibaut Notteboom" +EMAIL="thibaut.notteboom@gmail.com" diff --git a/network/mptcpd/slack-desc b/network/mptcpd/slack-desc new file mode 100644 index 0000000000..6248c115aa --- /dev/null +++ b/network/mptcpd/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +mptcpd: mptcpd (Multipath TCP daemon) +mptcpd: +mptcpd: The Multipath TCP Daemon is a daemon for Linux based operating systems +mptcpd: that performs multipath TCP path management related operations in the +mptcpd: user space. It interacts with the Linux kernel through a generic +mptcpd: netlink connection to track per-connection information (e.g. available +mptcpd: remote addresses), available network interfaces, request new MPTCP +mptcpd: subflows, handle requests for subflows, etc. +mptcpd: +mptcpd: +mptcpd: diff --git a/network/mullvadvpn-app/mullvadvpn-app.SlackBuild b/network/mullvadvpn-app/mullvadvpn-app.SlackBuild index 164a12feba..766711169e 100644 --- a/network/mullvadvpn-app/mullvadvpn-app.SlackBuild +++ b/network/mullvadvpn-app/mullvadvpn-app.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mullvadvpn-app # -# Copyright 2023 Jay Lanagan (j@lngn.net), Detroit, MI, USA. +# Copyright 2023-2024 Jay Lanagan (j@lngn.net), Detroit, MI, USA. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mullvadvpn-app SRCNAM=MullvadVPN -VERSION=${VERSION:-2024.1} +VERSION=${VERSION:-2024.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/mullvadvpn-app/mullvadvpn-app.info b/network/mullvadvpn-app/mullvadvpn-app.info index 12c12a9a7e..970e0d7ce0 100644 --- a/network/mullvadvpn-app/mullvadvpn-app.info +++ b/network/mullvadvpn-app/mullvadvpn-app.info @@ -1,12 +1,12 @@ PRGNAM="mullvadvpn-app" -VERSION="2024.1" +VERSION="2024.2" HOMEPAGE="https://mullvad.net/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/mullvad/mullvadvpn-app/releases/download/2024.1/MullvadVPN-2024.1_amd64.deb \ - https://github.com/mullvad/mullvadvpn-app/releases/download/2024.1/MullvadVPN-2024.1_arm64.deb" -MD5SUM_x86_64="80a62dba93bdbce63f6468ccb2b41d46 \ - 39b9868dbd2a48088c3143c82771b5aa" +DOWNLOAD_x86_64="https://github.com/mullvad/mullvadvpn-app/releases/download/2024.2/MullvadVPN-2024.2_amd64.deb \ + https://github.com/mullvad/mullvadvpn-app/releases/download/2024.2/MullvadVPN-2024.2_arm64.deb" +MD5SUM_x86_64="3b9f7014b7256d1edb2485eaecd1b495 \ + ffde31ffe09e4039c501f05f177c16a5" REQUIRES="" MAINTAINER="Jay Lanagan" EMAIL="j@lngn.net" diff --git a/network/mumble-server/mumble-server.SlackBuild b/network/mumble-server/mumble-server.SlackBuild index 5d4e1ad82a..85d131fe16 100644 --- a/network/mumble-server/mumble-server.SlackBuild +++ b/network/mumble-server/mumble-server.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mumble-server SRCNAM=mumble -VERSION=${VERSION:-1.4.287} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.5.613} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} ICE=${ICE:-no} @@ -93,10 +93,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -mv $SRCNAM-$VERSION.src $PRGNAM-$VERSION -cd $PRGNAM-$VERSION +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -136,7 +135,7 @@ sed \ -e "s,;logfile=.*,logfile=/var/log/$PRGNAM/$PRGNAM.log," \ -e "s,;pidfile=.*,pidfile=/var/run/$PRGNAM/$PRGNAM.pid," \ -e "s,uname=.*,uname=$MURMUR_USER," \ - $TMP/$PRGNAM-$VERSION/scripts/murmur.ini > $PKG/etc/$PRGNAM.ini.new + $TMP/$SRCNAM-$VERSION/auxiliary_files/$PRGNAM.ini > $PKG/etc/$PRGNAM.ini.new # Slackware style logrotate sed \ @@ -164,8 +163,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION ( -cd $TMP/$PRGNAM-$VERSION -cp -a AUTHORS CHANGES CODE_OF_CONDUCT.md COMMIT_GUIDELINES.md LICENSE README.md SECURITY.md $PKG/usr/doc/$PRGNAM-$VERSION +cd $TMP/$SRCNAM-$VERSION +cp -a CODE_OF_CONDUCT.md COMMIT_GUIDELINES.md LICENSE README.md SECURITY.md $PKG/usr/doc/$PRGNAM-$VERSION ) cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/mumble-server/mumble-server.info b/network/mumble-server/mumble-server.info index e00b5956a1..5e01b6ed13 100644 --- a/network/mumble-server/mumble-server.info +++ b/network/mumble-server/mumble-server.info @@ -1,8 +1,8 @@ PRGNAM="mumble-server" -VERSION="1.4.287" +VERSION="1.5.613" HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page" -DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.4.287/mumble-1.4.287.tar.gz" -MD5SUM="c9a2eb6413d165da606fb8d4657a1697" +DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.5.613/mumble-1.5.613.tar.gz" +MD5SUM="f700a8a388ebc5522ec791a6bbdf0ef1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="protobuf3" diff --git a/network/mumble/README b/network/mumble/README index bb85a2cbe5..c064458c96 100644 --- a/network/mumble/README +++ b/network/mumble/README @@ -17,12 +17,6 @@ library. Please note, you *must* have a multilibbed system for this to work. See the mumble documentation on how to use the mumble overlay. -Celt is no longer maintained, and dropped in is favor of opus. -The bundled Celt is used for optional backware compatibility. To use -your own try: - - CELT=no ./mumble.SlackBuild - Text-to-speech is the default (speechd and espeak). Disable with SPEECHD=no ./mumble.SlackBuild diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild index f9d372c349..b00cd8abcc 100644 --- a/network/mumble/mumble.SlackBuild +++ b/network/mumble/mumble.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mumble -VERSION=${VERSION:-1.4.287} -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.5.613} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -93,15 +93,6 @@ else BUILD_SPEECHD="-Dspeechd=ON" fi -# Celt is no longer maintained, and dropped in -# favor of opus. Celt is bundled for optional -# backware compatibility. -if [ "CELT" = "no" ]; then - BUILD_CELT="-Dbundled-celt=OFF" -else - BUILD_CELT="-Dbundled-celt=ON" -fi - set -e rm -rf $PKG @@ -109,7 +100,6 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -mv $PRGNAM-$VERSION.src $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -118,10 +108,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Apply missing GTAV plugin patch for 32-bit alignment -# https://github.com/mumble-voip/mumble/issues/5849 -patch -p1 < $CWD/positional-audio-plugin-gtav-32-bit-fix.patch - sed -e "s|CMAKE_CXX_STANDARD 14|CMAKE_CXX_STANDARD 17|" -i CMakeLists.txt mkdir -p build cd build @@ -134,13 +120,11 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -Dclient=ON \ -Dserver=OFF \ - -Dbundled-opus=OFF \ -Dbundled-speex=OFF \ -Dupdate=OFF \ -Dbundle-qt-translations=OFF \ -Dwarnings-as-errors=OFF \ -Dzeroconf=OFF \ - $BUILD_CELT \ $BUILD_SPEECHD \ $BUILD_G15 \ $BUILD_OVERLAY \ @@ -158,7 +142,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION ( cd $TMP/$PRGNAM-$VERSION -cp -a AUTHORS CHANGES CODE_OF_CONDUCT.md COMMIT_GUIDELINES.md LICENSE README.md SECURITY.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CODE_OF_CONDUCT.md COMMIT_GUIDELINES.md LICENSE README.md SECURITY.md $PKG/usr/doc/$PRGNAM-$VERSION ) cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info index 553d27e33f..711ec36518 100644 --- a/network/mumble/mumble.info +++ b/network/mumble/mumble.info @@ -1,8 +1,8 @@ PRGNAM="mumble" -VERSION="1.4.287" +VERSION="1.5.613" HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page" -DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.4.287/mumble-1.4.287.tar.gz" -MD5SUM="c9a2eb6413d165da606fb8d4657a1697" +DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.5.613/mumble-1.5.613.tar.gz" +MD5SUM="f700a8a388ebc5522ec791a6bbdf0ef1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="protobuf3 poco" diff --git a/network/mumble/positional-audio-plugin-gtav-32-bit-fix.patch b/network/mumble/positional-audio-plugin-gtav-32-bit-fix.patch deleted file mode 100644 index 59cf2120b3..0000000000 --- a/network/mumble/positional-audio-plugin-gtav-32-bit-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 13c051b36b387356815cff5d685bc628b74ba136 Mon Sep 17 00:00:00 2001 -From: Davide Beatrici <git@davidebeatrici.dev> -Date: Thu, 1 Sep 2022 23:32:57 +0200 -Subject: [PATCH] FIX(positional-audio): Force 8 bytes alignment for - CCameraAngles in GTAV plugin - -https://en.cppreference.com/w/cpp/language/alignas - -This fixes compilation when the implicit alignment is not 8 bytes. - -It can be the case with 32 bit targets. ---- - plugins/gtav/structs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/gtav/structs.h b/plugins/gtav/structs.h -index 2829dc11e1..0e4f76edab 100644 ---- a/plugins/gtav/structs.h -+++ b/plugins/gtav/structs.h -@@ -118,7 +118,7 @@ struct CCameraManagerAngles { - ptr_t cameraAngles; // CCameraAngles * - }; - --struct CCameraAngles { -+struct alignas(8) CCameraAngles { - uint8_t pad1[960]; - ptr_t playerAngles; // CPlayerAngles * - uint8_t pad2[60]; - - diff --git a/network/neomutt/neomutt.SlackBuild b/network/neomutt/neomutt.SlackBuild index 51d1f52858..53bc4ec66b 100644 --- a/network/neomutt/neomutt.SlackBuild +++ b/network/neomutt/neomutt.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=neomutt -VERSION=${VERSION:-20240329} +VERSION=${VERSION:-20240425} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/neomutt/neomutt.info b/network/neomutt/neomutt.info index fab43ad595..b8d67e12fb 100644 --- a/network/neomutt/neomutt.info +++ b/network/neomutt/neomutt.info @@ -1,8 +1,8 @@ PRGNAM="neomutt" -VERSION="20240329" +VERSION="20240425" HOMEPAGE="https://github.com/neomutt/neomutt" -DOWNLOAD="https://github.com/neomutt/neomutt/archive/20240329/neomutt-20240329.tar.gz" -MD5SUM="3ea5e0b732ecff28a2105041602e6222" +DOWNLOAD="https://github.com/neomutt/neomutt/archive/20240425/neomutt-20240425.tar.gz" +MD5SUM="136fa78c0ded07adb227446bdd5842c1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/nessus/README b/network/nessus/README index 6833489890..2ca8ce9a48 100644 --- a/network/nessus/README +++ b/network/nessus/README @@ -1,6 +1,6 @@ Nessus Vulnerability Scanner -Nessus Professional, the industry's most widely deployed vulnerability +Nessus Professional, the industry's most widely deployed vulnerability assessment solution helps you reduce your organization's attack surface and ensure compliance. Nessus features high-speed asset discovery, configuration auditing, target profiling, malware detection, sensitive diff --git a/network/nessus/nessus.SlackBuild b/network/nessus/nessus.SlackBuild index 780603c7f3..22cdab661d 100644 --- a/network/nessus/nessus.SlackBuild +++ b/network/nessus/nessus.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nessus -VERSION=${VERSION:-10.7.0} +VERSION=${VERSION:-10.7.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/nessus/nessus.info b/network/nessus/nessus.info index aabe4b852c..3661a91f7f 100644 --- a/network/nessus/nessus.info +++ b/network/nessus/nessus.info @@ -1,10 +1,10 @@ PRGNAM="nessus" -VERSION="10.7.0" +VERSION="10.7.2" HOMEPAGE="https://www.tenable.com/products/nessus" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://www.tenable.com/downloads/api/v2/pages/nessus/files/Nessus-10.7.0-el7.x86_64.rpm" -MD5SUM_x86_64="618234819d2fc39c49890abb595c87e8" +DOWNLOAD_x86_64="https://www.tenable.com/downloads/api/v2/pages/nessus/files/Nessus-10.7.2-el7.x86_64.rpm" +MD5SUM_x86_64="7d3da436fd0759df20b6b20e56ff397e" REQUIRES="" MAINTAINER="Giuseppe Di Terlizzi" EMAIL="giuseppe.diterlizzi@gmail.com" diff --git a/network/newsboat/newsboat.SlackBuild b/network/newsboat/newsboat.SlackBuild index 5a66aba35e..d800d0b3ba 100644 --- a/network/newsboat/newsboat.SlackBuild +++ b/network/newsboat/newsboat.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # Copyright 2019-2022 Andrew Clemons, Wellington New Zealand -# Copyright 2022-2023 Andrew Clemons, Tokyo Japan +# Copyright 2022-2024 Andrew Clemons, Tokyo Japan # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=newsboat -VERSION=${VERSION:-2.34} +VERSION=${VERSION:-2.35} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -63,7 +63,11 @@ elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" CARGOTARGET="--target $ARCH-unknown-linux-gnu" -elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ]; then +elif [ "$ARCH" = "x86_64" ] ; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + CARGOTARGET="--target $ARCH-unknown-linux-gnu" +elif [ "$ARCH" = "aarch64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" CARGOTARGET="--target $ARCH-unknown-linux-gnu" diff --git a/network/newsboat/newsboat.info b/network/newsboat/newsboat.info index 57a50f27b5..22d20b2845 100644 --- a/network/newsboat/newsboat.info +++ b/network/newsboat/newsboat.info @@ -1,95 +1,90 @@ PRGNAM="newsboat" -VERSION="2.34" +VERSION="2.35" HOMEPAGE="https://www.newsboat.org/" -DOWNLOAD="https://newsboat.org/releases/2.34/newsboat-2.34.tar.xz \ +DOWNLOAD="https://newsboat.org/releases/2.35/newsboat-2.35.tar.xz \ https://static.crates.io/crates/addr2line/addr2line-0.21.0.crate \ https://static.crates.io/crates/adler/adler-1.0.2.crate \ - https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.1.crate \ + https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.2.crate \ https://static.crates.io/crates/android-tzdata/android-tzdata-0.1.1.crate \ https://static.crates.io/crates/android_system_properties/android_system_properties-0.1.5.crate \ https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \ https://static.crates.io/crates/backtrace/backtrace-0.3.69.crate \ https://static.crates.io/crates/bit-set/bit-set-0.5.3.crate \ https://static.crates.io/crates/bit-vec/bit-vec-0.6.3.crate \ - https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \ - https://static.crates.io/crates/bitflags/bitflags-2.4.1.crate \ + https://static.crates.io/crates/bitflags/bitflags-2.5.0.crate \ https://static.crates.io/crates/block/block-0.1.6.crate \ https://static.crates.io/crates/bumpalo/bumpalo-3.14.0.crate \ - https://static.crates.io/crates/byteorder/byteorder-1.4.3.crate \ https://static.crates.io/crates/cc/cc-1.0.83.crate \ https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \ - https://static.crates.io/crates/chrono/chrono-0.4.31.crate \ + https://static.crates.io/crates/chrono/chrono-0.4.35.crate \ https://static.crates.io/crates/codespan-reporting/codespan-reporting-0.11.1.crate \ - https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.4.crate \ - https://static.crates.io/crates/curl-sys/curl-sys-0.4.70%2Bcurl-8.5.0.crate \ - https://static.crates.io/crates/cxx-build/cxx-build-1.0.111.crate \ - https://static.crates.io/crates/cxx/cxx-1.0.111.crate \ - https://static.crates.io/crates/cxxbridge-flags/cxxbridge-flags-1.0.111.crate \ - https://static.crates.io/crates/cxxbridge-macro/cxxbridge-macro-1.0.111.crate \ - https://static.crates.io/crates/errno-dragonfly/errno-dragonfly-0.1.2.crate \ - https://static.crates.io/crates/errno/errno-0.3.3.crate \ + https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.6.crate \ + https://static.crates.io/crates/curl-sys/curl-sys-0.4.72%2Bcurl-8.6.0.crate \ + https://static.crates.io/crates/cxx-build/cxx-build-1.0.119.crate \ + https://static.crates.io/crates/cxx/cxx-1.0.119.crate \ + https://static.crates.io/crates/cxxbridge-flags/cxxbridge-flags-1.0.119.crate \ + https://static.crates.io/crates/cxxbridge-macro/cxxbridge-macro-1.0.119.crate \ + https://static.crates.io/crates/errno/errno-0.3.8.crate \ https://static.crates.io/crates/fastrand/fastrand-2.0.1.crate \ https://static.crates.io/crates/fnv/fnv-1.0.7.crate \ https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.2.1.crate \ - https://static.crates.io/crates/getrandom/getrandom-0.2.10.crate \ + https://static.crates.io/crates/getrandom/getrandom-0.2.11.crate \ https://static.crates.io/crates/gettext-rs/gettext-rs-0.7.0.crate \ https://static.crates.io/crates/gettext-sys/gettext-sys-0.21.3.crate \ - https://static.crates.io/crates/gimli/gimli-0.28.0.crate \ + https://static.crates.io/crates/gimli/gimli-0.28.1.crate \ https://static.crates.io/crates/iana-time-zone-haiku/iana-time-zone-haiku-0.1.2.crate \ - https://static.crates.io/crates/iana-time-zone/iana-time-zone-0.1.57.crate \ + https://static.crates.io/crates/iana-time-zone/iana-time-zone-0.1.58.crate \ https://static.crates.io/crates/idna/idna-0.5.0.crate \ - https://static.crates.io/crates/js-sys/js-sys-0.3.64.crate \ + https://static.crates.io/crates/js-sys/js-sys-0.3.66.crate \ https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \ https://static.crates.io/crates/lexopt/lexopt-0.3.0.crate \ - https://static.crates.io/crates/libc/libc-0.2.151.crate \ - https://static.crates.io/crates/libm/libm-0.2.7.crate \ + https://static.crates.io/crates/libc/libc-0.2.153.crate \ + https://static.crates.io/crates/libm/libm-0.2.8.crate \ https://static.crates.io/crates/libz-sys/libz-sys-1.1.12.crate \ https://static.crates.io/crates/link-cplusplus/link-cplusplus-1.0.9.crate \ - https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.10.crate \ + https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.12.crate \ https://static.crates.io/crates/locale_config/locale_config-0.3.0.crate \ https://static.crates.io/crates/log/log-0.4.20.crate \ https://static.crates.io/crates/malloc_buf/malloc_buf-0.0.6.crate \ https://static.crates.io/crates/md5/md5-0.7.0.crate \ - https://static.crates.io/crates/memchr/memchr-2.6.3.crate \ + https://static.crates.io/crates/memchr/memchr-2.6.4.crate \ https://static.crates.io/crates/minimal-lexical/minimal-lexical-0.2.1.crate \ https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.1.crate \ https://static.crates.io/crates/natord/natord-1.0.9.crate \ https://static.crates.io/crates/nom/nom-7.1.3.crate \ - https://static.crates.io/crates/num-traits/num-traits-0.2.16.crate \ + https://static.crates.io/crates/num-traits/num-traits-0.2.17.crate \ https://static.crates.io/crates/objc-foundation/objc-foundation-0.1.1.crate \ https://static.crates.io/crates/objc/objc-0.2.7.crate \ https://static.crates.io/crates/objc_id/objc_id-0.1.1.crate \ - https://static.crates.io/crates/object/object-0.32.1.crate \ - https://static.crates.io/crates/once_cell/once_cell-1.18.0.crate \ + https://static.crates.io/crates/object/object-0.32.2.crate \ + https://static.crates.io/crates/once_cell/once_cell-1.19.0.crate \ https://static.crates.io/crates/percent-encoding/percent-encoding-2.3.1.crate \ - https://static.crates.io/crates/pkg-config/pkg-config-0.3.27.crate \ + https://static.crates.io/crates/pkg-config/pkg-config-0.3.28.crate \ https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.17.crate \ - https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.67.crate \ - https://static.crates.io/crates/proptest/proptest-1.2.0.crate \ + https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.76.crate \ + https://static.crates.io/crates/proptest/proptest-1.4.0.crate \ https://static.crates.io/crates/quick-error/quick-error-1.2.3.crate \ - https://static.crates.io/crates/quote/quote-1.0.33.crate \ + https://static.crates.io/crates/quote/quote-1.0.35.crate \ https://static.crates.io/crates/rand/rand-0.8.5.crate \ https://static.crates.io/crates/rand_chacha/rand_chacha-0.3.1.crate \ https://static.crates.io/crates/rand_core/rand_core-0.6.4.crate \ https://static.crates.io/crates/rand_xorshift/rand_xorshift-0.3.0.crate \ - https://static.crates.io/crates/redox_syscall/redox_syscall-0.4.1.crate \ - https://static.crates.io/crates/regex-automata/regex-automata-0.3.8.crate \ - https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.29.crate \ - https://static.crates.io/crates/regex-syntax/regex-syntax-0.7.5.crate \ - https://static.crates.io/crates/regex/regex-1.9.5.crate \ + https://static.crates.io/crates/regex-automata/regex-automata-0.4.3.crate \ + https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \ + https://static.crates.io/crates/regex/regex-1.10.2.crate \ https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.23.crate \ - https://static.crates.io/crates/rustix/rustix-0.38.21.crate \ + https://static.crates.io/crates/rustix/rustix-0.38.31.crate \ https://static.crates.io/crates/rusty-fork/rusty-fork-0.3.0.crate \ https://static.crates.io/crates/scratch/scratch-1.0.7.crate \ https://static.crates.io/crates/section_testing/section_testing-0.0.5.crate \ - https://static.crates.io/crates/syn/syn-2.0.37.crate \ - https://static.crates.io/crates/temp-dir/temp-dir-0.1.11.crate \ - https://static.crates.io/crates/tempfile/tempfile-3.8.1.crate \ - https://static.crates.io/crates/termcolor/termcolor-1.3.0.crate \ + https://static.crates.io/crates/syn/syn-2.0.48.crate \ + https://static.crates.io/crates/temp-dir/temp-dir-0.1.12.crate \ + https://static.crates.io/crates/tempfile/tempfile-3.10.1.crate \ + https://static.crates.io/crates/termcolor/termcolor-1.4.0.crate \ https://static.crates.io/crates/tinyvec/tinyvec-1.6.0.crate \ https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.1.crate \ https://static.crates.io/crates/unarray/unarray-0.1.4.crate \ - https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.13.crate \ + https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.14.crate \ https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \ https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.22.crate \ https://static.crates.io/crates/unicode-width/unicode-width-0.1.11.crate \ @@ -97,115 +92,118 @@ DOWNLOAD="https://newsboat.org/releases/2.34/newsboat-2.34.tar.xz \ https://static.crates.io/crates/vcpkg/vcpkg-0.2.15.crate \ https://static.crates.io/crates/wait-timeout/wait-timeout-0.2.0.crate \ https://static.crates.io/crates/wasi/wasi-0.11.0%2Bwasi-snapshot-preview1.crate \ - https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.87.crate \ - https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.87.crate \ - https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.87.crate \ - https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.87.crate \ - https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.87.crate \ + https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.89.crate \ + https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.89.crate \ + https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.89.crate \ + https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.89.crate \ + https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.89.crate \ https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ https://static.crates.io/crates/winapi-util/winapi-util-0.1.6.crate \ https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ https://static.crates.io/crates/winapi/winapi-0.3.9.crate \ - https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \ + https://static.crates.io/crates/windows-core/windows-core-0.51.1.crate \ + https://static.crates.io/crates/windows-sys/windows-sys-0.52.0.crate \ https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \ - https://static.crates.io/crates/windows/windows-0.48.0.crate \ + https://static.crates.io/crates/windows-targets/windows-targets-0.52.0.crate \ https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \ + https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.52.0.crate \ https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \ + https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.52.0.crate \ https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \ + https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.52.0.crate \ https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \ + https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.52.0.crate \ https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \ + https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.52.0.crate \ https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \ + https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.0.crate \ https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \ + https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.0.crate \ https://static.crates.io/crates/xdg/xdg-2.5.2.crate" -MD5SUM="e2dedca7d28e53fbc2f117bad343ec27 \ +MD5SUM="d9deb0b7c9995b8880642699af387ae8 \ 55e15000c4c210f0bb2aca6f38fbe424 \ 669215548c64019c08c92b2c1afd3deb \ - 245579618dd635377c5987690a7e2153 \ + 95e5f8d0b7ab37171b8d3118542ba06a \ e0a03581a6aea080315323651f272d65 \ bf23cd323c33a8c283c41bb9b79e4ce4 \ 05d77ef52e90ad161fdd41b252420467 \ 66c5beb5a77eccb0d86ce626651f393b \ b174984f0ec889f5c32e90bddb80f674 \ 45a867175c81501378699f80724393c0 \ - a295edb6953237ebbdfa8e731229f9a3 \ - ebcf604c44976809506192718f439dc1 \ + f3406374808b01be3a263666aa9aa2f5 \ ea2d23ceb9f98853a7dffc6c02884464 \ d8cacbb844fca8c0ca102c7576946131 \ - 1e704be5ddde9d6b5383ef1035309f91 \ 9241fa90ea8b17c00010be46c9aa1ac5 \ 74634128440dbc3766bda76fdf0aaa05 \ - ddca5e4cff2fcc78d99a9efe991c5cf2 \ + afd4d637788bfc7d32463a95ce275705 \ faa32da3be14130a4525bb7ba601c62e \ - b477cc1c7b45e2187b3cad0377b504d8 \ - b4b1c9ce4db1569f17f64239adcdbeae \ - e198b52b3219b6be4a3f6bea2158f03e \ - 7608f1c36c68ce36c1428a5183b9c419 \ - 89d343b23ff81dc1af48a1043f7a7202 \ - 52dc52f9c2adfdba6f0d90ca7b92042f \ - fc65414dcac661c46f2cfad7722304f9 \ - 33479bc3e6a76008f4d1654925cd3a94 \ + d7624e4ff046ae83eda8e82d90887bdb \ + 4a54687d3f58bbea098a3ea2b4b57983 \ + 1b7f98bf72b5deb2b7e8e9da854d8a4c \ + f3448175b2ef6967e600908363455bc7 \ + b7449e55ea1e8018717f5c73e625ead0 \ + 8e7b18f8c3696b4328dc55341bd92408 \ + 349e0ae5420f0b7e6ff835cd03cc7428 \ 80e1c1b89d858c93fc5946b4a8266504 \ 8dab3b3ec00dc56cffde0b0c410d47b5 \ c3e51926c9853b714191ef1bec90e2ce \ - f204ba6fc9394724826f177433fe9a98 \ + 3b00daaa372df161c5c8eeaf16a741d1 \ bb072f15d5e4067bea6933a4fbeb9c0a \ 9486190bcfe1c4af6a50d265a113ac12 \ - 6646a563c6f7e9b24d9db2271b720a2b \ + fbc6f6d82084b19c006198508b1ac489 \ 87b1b7cb12ef4dfe842c212b98263048 \ - 7ff000f771e742396faed3c83c82fab4 \ + ddb0ec63d657e9d1f95a314fdff0b260 \ b5305bde14813da51d536a9df564db69 \ - d580c0380408c62e04e018eaaf4258af \ + 6b33b0539f6c25c66268868b6b61e240 \ fba3b040a55c01be7376d3dd5c4d4920 \ d71093319a2c1efa90475bd45d34fab3 \ - 181cb83a57d327b26ebc21db41b28480 \ - 71bf1bf53c8321f7f1cbc13575353d6b \ + 49d77531898b3d7846b149c0fb4788c4 \ + 23fb13a7f6fb7b25a42d71c3bcaa5d7c \ 779addfdf18a31c1d8d3f53b7a8395e0 \ d6c6a27e29d9270a2ac318eacdf8e436 \ - 70bd18c57397442e0abc67dfa1c99e0f \ + 1d1b2033b4272a22654e55447ae7f404 \ 6fa7c4b0da26b511570845e41527bc8f \ 8ee79b4fe4c43d9ab09f16344612a656 \ 7c81e7a61ec172a229d6fdbc553e883d \ 65470cdfd1fa2a2de9fdf873a58d72aa \ - 0f6cf3b35ff80cee7da9243e76c94532 \ + ab9a5f02cef3b8794d810332ebf26a03 \ 8b708bc4b33c5e1683467444c9ed41b0 \ eb7e04508518ed8f29935ec874e1740a \ 5a9b94ba54ea1f52f2a496ba982e3282 \ f17aecb8887cf0ecd823623160aed7db \ - 256ede6773f2f67e26e92f36c04eb4f7 \ + 512bcd4470f351b2049adeb39cfcdec4 \ aecd889de42c8168e1bc97a6f2720d8f \ b4dcac855af5df71f3383d86c4a96b78 \ fd9aa273ad560dedd00ddcf3dbe808ce \ - ecddc695e4dba2383b326dc361e9e07d \ - 2dc8aacabbc090f8025a4789d4d6d8f0 \ + 0d98aaf27d3cace75f9959c04b910891 \ + 8390247ae7126c00e162732b249be9d7 \ 0ba30a94d7b8865c23e86d4d64e5b91e \ - 73d4dff694f3acab34c217b4f4943a37 \ + 76c281577ef136b9484166302e37c9bd \ 5c69337d37e58a380e00eac9ce0373bb \ - 80235d435deb3e8c2f28a8e666cae1a2 \ - 61b3316c1f5c6059bef9022fe8a08685 \ + 43e3e8b01023835d05b82befc379769d \ + 480d2d6c416df04f9eb728728932e9a2 \ 3181dca31efe33cbed29a45d0ec67848 \ - 0ddb8bccd3198892d0dd0ec7151f7cd3 \ + 0358b31bf59c7915bb03f9e66f2d1ea3 \ ee7a5f842c39bc47c474196e83b0df5f \ e30085994bbeb4b7f4895d48216d5476 \ a1626b8f4d165b1b60d960862eba4cf0 \ f9e79ef04a0f168cd981aaf93eb25272 \ - ff1d093069cfc9eb161907e17a51208b \ - 9e3731fbbac07e3f5363d5527765fb41 \ - f2303650593b13e30a85e39d8c79c961 \ - 5ad40eb548ec91179c2e5bafd26f1d30 \ - 32f2a2626ae2f18e34cbb7d814ca8d37 \ + 4f496143a21775fa7bd22bf329c37f37 \ + 91b60a71d44302a8b05bd398eca56c37 \ + e90f2809a34e2bea0bd5c1120475fb36 \ 24fcbc2986fad09b25c9a4f9aef0a9e4 \ - 3bd91868192fbb6c457c856a1a430a3d \ + 223719dc10025228707d8d5aa14e401b \ 13268e6ab4023043e6dd8e993ce8b88a \ bb56e53d09b09eb11536cb69734564de \ b13390ad50aa277e39e4d46f7ed3eb14 \ - 344753a95db4f193f068b3cf4b75d83b \ - 73ff8cffc66d065488dcf50e3b8c0c1f \ - f80faded72df19d43134e2b44137376a \ - be0724e892719d0813323cbb4bfb5372 \ + 5651bc86f3df47d241d2ae58dc4b89a5 \ + 3ada2d211cc8a993e62d0e15ac9682a5 \ + 449c7bb37fc298d2026fbf2855eb8db0 \ + ef18ac44cda944777e03597466ec4b82 \ 5f0470696baaa4e5953bddbf196998f9 \ c678a7da0ee4b850ebde0474144a0415 \ 00dda16f17b456d99fb1cafa9125ed22 \ - 04c5de5f2fcb441ced909a45cff020bd \ + e74b10f7b4d0c167434d02bcc02ab18f \ ca65153603a1a7240bbd9d2ce19f2d67 \ c12d182417999fc365f952e701f6071f \ 908ec8a89821b72f3a35726bab24461f \ @@ -213,25 +211,33 @@ MD5SUM="e2dedca7d28e53fbc2f117bad343ec27 \ e900a384ac7dbb320fe6a7279fbfef89 \ 6708629acf3d2ecb7404e43255d2df85 \ e972ea58ec203bfa6c79c1207852298b \ - e1aaf0d487ef02def77307a74ee35606 \ - b3139f7d066250bfaf96b99e913ee75d \ - e41541041285d9f05d372cdac02a4bf7 \ - 4185de0682e5e5f3a9f13285218e59aa \ - 64f9f5c520b25087ba70e4194d6aea9c \ + 27e1a4ac927346509cf010b024c79e87 \ + 90f2e8c0ca989290eff37cd9b3ec2a87 \ + 9202e1b9c6367013631774f38fdff707 \ + f00d62969f597349b1d460c96b57136c \ + 7f115ec6580072e95e26ab41f3fabb84 \ db96b50050277bf05a3c68534bbb9586 \ 306c0281447d1876e8220007b7a7e053 \ 09de9d01e7331ff3da11f58be8bef0df \ 0498c4a11448bfc35dc7bb2caa64c753 \ - f2797ade0e36f1e5d6be9d11b5076582 \ + d343f3cc25259c518e594b7bcd4f144b \ + 2376de634160158ece40c4bc2ab3eb41 \ 24c64817e85ef77765ed0f26c31c9b4c \ - f4620d6217497ee2c54090cd353ceec4 \ + 7ff44db201b805c60b7894e6e51a5580 \ dae6d89034a6988042fd8be4cf5e037d \ + cd2efc4af413b9d1380761255c7a22ff \ de2839e16d9d7a9fd1c397da62f62b4a \ + 5b2c6ccb94c770d0ed85f7a844bf001e \ e0c35ffb8cfdb74a39bf799811f79304 \ + 467f51d4cfb646d0c8fecfa008dbf52d \ d990172b607020701f9e84ca8e1c043c \ + 9afb70c460db38399bf95ec015f07435 \ 0a68848588e847ceccf504891584d00b \ + f34ea4d81690ec402b6f0d9e54e8baa4 \ 45b469ad607b912256b7c80141fa2d17 \ + 591c68ecc1dded36344429f427bbfabc \ 7799baff9a5664205d9110a2624e8989 \ + 29bbf3d9160d2545d528d0b2d7492333 \ 1613d0f9e24d4b05e81748ea1f355f6c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/nextcloud-desktop/nextcloud-desktop.SlackBuild b/network/nextcloud-desktop/nextcloud-desktop.SlackBuild index 7bd204277b..5c40ac499f 100644 --- a/network/nextcloud-desktop/nextcloud-desktop.SlackBuild +++ b/network/nextcloud-desktop/nextcloud-desktop.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nextcloud-desktop SRCNAM=desktop -VERSION=${VERSION:-3.12.3} +VERSION=${VERSION:-3.13.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/nextcloud-desktop/nextcloud-desktop.info b/network/nextcloud-desktop/nextcloud-desktop.info index a6a8559331..ffb9b736b7 100644 --- a/network/nextcloud-desktop/nextcloud-desktop.info +++ b/network/nextcloud-desktop/nextcloud-desktop.info @@ -1,10 +1,10 @@ PRGNAM="nextcloud-desktop" -VERSION="3.12.3" +VERSION="3.13.0" HOMEPAGE="https://nextcloud.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/nextcloud/desktop/archive/refs/tags/v3.12.3/desktop-3.12.3.tar.gz" -MD5SUM_x86_64="e018bec41afc23060ea6afea6108e94f" +DOWNLOAD_x86_64="https://github.com/nextcloud/desktop/archive/refs/tags/v3.13.0/desktop-3.13.0.tar.gz" +MD5SUM_x86_64="11eea2f5c2909114ddb4b74ff21b67b7" REQUIRES="" MAINTAINER="Andrew Payne" EMAIL="phalange@komputermatrix.com" diff --git a/network/ngrok/ngrok.SlackBuild b/network/ngrok/ngrok.SlackBuild index 17a21d9468..b9646a6679 100644 --- a/network/ngrok/ngrok.SlackBuild +++ b/network/ngrok/ngrok.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ngrok -VERSION=${VERSION:-3.5.0} +VERSION=${VERSION:-3.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/ngrok/ngrok.info b/network/ngrok/ngrok.info index 99ae27e927..94f5f20803 100644 --- a/network/ngrok/ngrok.info +++ b/network/ngrok/ngrok.info @@ -1,10 +1,10 @@ PRGNAM="ngrok" -VERSION="3.5.0" +VERSION="3.8.0" HOMEPAGE="https://ngrok.com" -DOWNLOAD="https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-3.5.0-linux-386.tar.gz" -MD5SUM="a6049195365e77c3cc30abc53d57fc5a" -DOWNLOAD_x86_64="https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-3.5.0-linux-amd64.tar.gz" -MD5SUM_x86_64="0fff0e38125e1b90663b1a7a9c90c701" +DOWNLOAD="https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-3.8.0-linux-386.tar.gz" +MD5SUM="a9c770d5d0d4f893b12d9067d0c8b8bc" +DOWNLOAD_x86_64="https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-3.8.0-linux-amd64.tar.gz" +MD5SUM_x86_64="4674abecd13591051680bf0268bf48fc" REQUIRES="" MAINTAINER="Ebben Aries" EMAIL="slackbuilds@dscp.org" diff --git a/network/noip-duc/README b/network/noip-duc/README new file mode 100644 index 0000000000..af93171fe0 --- /dev/null +++ b/network/noip-duc/README @@ -0,0 +1,15 @@ +Dynamic DNS Update Client for Linux + +Keep your current IP address in sync with your No-IP host or domain +Default behavior is to check every 5 minutes. + +NOTE: This script requires network access + +Usage: +noip-duc -g myhostname.ddns.net -u username -p password + +If you’re using DDNS Keys use all.ddnskey.com +and DDNS Key Username/Password. + +noip-duc -g all.ddnskey.com --username <DDNS Key Username> +--password <DDNS Key Password> diff --git a/games/term2048/term2048.SlackBuild b/network/noip-duc/noip-duc.SlackBuild index cceb3d64dc..228b1145e0 100644 --- a/games/term2048/term2048.SlackBuild +++ b/network/noip-duc/noip-duc.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for term2048 +# Slackware build script for noip-duc -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=term2048 -VERSION=${VERSION:-0.2.5} +PRGNAM=noip-duc +VERSION=${VERSION:-3.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -50,6 +47,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -69,10 +67,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz - -cd $PRGNAM-$VERSION +rm -rf ${PRGNAM}_$VERSION +tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz +cd ${PRGNAM}_$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -80,18 +77,28 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG +export PATH="/opt/rust16/bin:$PATH" +if [ -z "$LD_LIBRARY_PATH" ]; then + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" +else + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" +fi + +cargo build --release + +mkdir -p $PKG/usr/bin + +cp target/release/noip-duc $PKG/usr/bin find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES.txt LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/noip-duc/noip-duc.info b/network/noip-duc/noip-duc.info new file mode 100644 index 0000000000..bf5211f4d7 --- /dev/null +++ b/network/noip-duc/noip-duc.info @@ -0,0 +1,10 @@ +PRGNAM="noip-duc" +VERSION="3.0.0" +HOMEPAGE="https://www.noip.com" +DOWNLOAD="https://dmej8g5cpdyqd.cloudfront.net/downloads/noip-duc_3.0.0.tar.gz" +MD5SUM="8cf9a6f8b94d48f1897d9ef860727cf6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="rust16" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" diff --git a/libraries/libhandy/slack-desc b/network/noip-duc/slack-desc index 303f0b2f7d..61be775e9a 100644 --- a/libraries/libhandy/slack-desc +++ b/network/noip-duc/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -libhandy: libhandy (additional UI components for gtk+3) -libhandy: -libhandy: The aim of the Handy library is to help with developing UI for mobile -libhandy: devices using GTK/GNOME. -libhandy: -libhandy: -libhandy: -libhandy: -libhandy: -libhandy: -libhandy: +noip-duc: noip-duc (Dynamic DNS Update Client) +noip-duc: +noip-duc: Keep your current IP address in sync with your No-IP host or domain +noip-duc: +noip-duc: +noip-duc: Project: https://www.noip.com +noip-duc: +noip-duc: +noip-duc: +noip-duc: +noip-duc: diff --git a/network/ocserv/ocserv.SlackBuild b/network/ocserv/ocserv.SlackBuild index 0636d788d7..013780d006 100644 --- a/network/ocserv/ocserv.SlackBuild +++ b/network/ocserv/ocserv.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ocserv -VERSION=${VERSION:-1.2.4} +VERSION=${VERSION:-1.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/ocserv/ocserv.info b/network/ocserv/ocserv.info index da8951388a..95f306585f 100644 --- a/network/ocserv/ocserv.info +++ b/network/ocserv/ocserv.info @@ -1,10 +1,10 @@ PRGNAM="ocserv" -VERSION="1.2.4" +VERSION="1.3.0" HOMEPAGE="https://ocserv.openconnect-vpn.net" -DOWNLOAD="https://www.infradead.org/ocserv/download/ocserv-1.2.4.tar.xz" -MD5SUM="6f82a924f998a646512714c4544aaee2" +DOWNLOAD="https://www.infradead.org/ocserv/download/ocserv-1.3.0.tar.xz" +MD5SUM="2b6cfd509e3a18491e8c79ce613faa90" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="http-parser libev protobuf-c rubygem-ronn" +REQUIRES="llhttp ipcalc-ng libev protobuf-c rubygem-ronn" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org" diff --git a/network/opera/opera.SlackBuild b/network/opera/opera.SlackBuild index 23ef5941f3..48c6357a69 100644 --- a/network/opera/opera.SlackBuild +++ b/network/opera/opera.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=opera -VERSION=${VERSION:-109.0.5097.45} +VERSION=${VERSION:-110.0.5130.23} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/opera/opera.info b/network/opera/opera.info index 302d6b2447..55a8a335bb 100644 --- a/network/opera/opera.info +++ b/network/opera/opera.info @@ -1,10 +1,10 @@ PRGNAM="opera" -VERSION="109.0.5097.45" +VERSION="110.0.5130.23" HOMEPAGE="https://www.opera.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://get.geo.opera.com/pub/opera/desktop/109.0.5097.45/linux/opera-stable_109.0.5097.45_amd64.deb" -MD5SUM_x86_64="8f42e3889190c6ef7de87101dff70028" +DOWNLOAD_x86_64="https://get.geo.opera.com/pub/opera/desktop/109.0.5097.80/linux/opera-stable_110.0.5130.23_amd64.deb" +MD5SUM_x86_64="84b46c3bdc5f3fe1ea1d9353f0e1c4b4" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" EMAIL="dslackw@gmail.com" diff --git a/network/owncloud-server/owncloud-server.info b/network/owncloud-server/owncloud-server.info index ecd6605907..da1e51b1ff 100644 --- a/network/owncloud-server/owncloud-server.info +++ b/network/owncloud-server/owncloud-server.info @@ -1,7 +1,7 @@ PRGNAM="owncloud-server" VERSION="8.2.11" HOMEPAGE="https://owncloud.org/" -DOWNLOAD="https://download.owncloud.org/community/owncloud-8.2.11.tar.bz2" +DOWNLOAD="https://attic.owncloud.com/server/stable/owncloud-8.2.11.tar.bz2" MD5SUM="43e3b4c53d4e819f612296c032cd2d37" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/phppgadmin/phppgadmin.SlackBuild b/network/phppgadmin/phppgadmin.SlackBuild index 86bd57a71b..ef63e95e2c 100644 --- a/network/phppgadmin/phppgadmin.SlackBuild +++ b/network/phppgadmin/phppgadmin.SlackBuild @@ -24,12 +24,13 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM='phppgadmin' -VERSION=${VERSION:-7.13.0} +PRGNAM="phppgadmin" +VERSION=${VERSION:-7.14.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} SRCNAM=phpPgAdmin +SUFF=${SUFF:--mod} DOCROOT=${DOCROOT:-/usr/share} PHPUSER=${PHPUSER:-root} @@ -58,8 +59,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION$SUFF.tar.gz +cd $SRCNAM-$VERSION$SUFF chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -68,8 +69,8 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; mkdir -p $PKG$DOCROOT -cp -a $TMP/$SRCNAM-$VERSION $PKG$DOCROOT -( cd $PKG$DOCROOT; ln -s ./$SRCNAM-$VERSION ./$PRGNAM ) +cp -a $TMP/$SRCNAM-$VERSION$SUFF $PKG$DOCROOT +( cd $PKG$DOCROOT; ln -s ./$SRCNAM-$VERSION$SUFF ./$PRGNAM ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ @@ -80,8 +81,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/etc/httpd/conf.d cp -a $CWD/http-pgadmin.conf $PKG/etc/httpd/conf.d/phppgadmin.conf.new -chown -R $PHPUSER:$PHPGROUP $PKG$DOCROOT/$SRCNAM-$VERSION -chmod -R o-rwx $PKG$DOCROOT/$SRCNAM-$VERSION +chown -R $PHPUSER:$PHPGROUP $PKG$DOCROOT/$SRCNAM-$VERSION$SUFF +chmod -R o-rwx $PKG$DOCROOT/$SRCNAM-$VERSION$SUFF mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/phppgadmin/phppgadmin.info b/network/phppgadmin/phppgadmin.info index 73bfd5f275..25d5f5a8da 100644 --- a/network/phppgadmin/phppgadmin.info +++ b/network/phppgadmin/phppgadmin.info @@ -1,8 +1,8 @@ PRGNAM="phppgadmin" -VERSION="7.13.0" -HOMEPAGE="https://github.com/phppgadmin/phppgadmin" -DOWNLOAD="https://github.com/phppgadmin/phppgadmin/releases/download/REL_7-13-0/phpPgAdmin-7.13.0.tar.gz" -MD5SUM="8a38dca6bd0bcdc9481c88f1ac0c0f80" +VERSION="7.14.7" +HOMEPAGE="https://github.com/ReimuHakurei/phpPgAdmin" +DOWNLOAD="https://github.com/ReimuHakurei/phpPgAdmin/archive/v7.14.7-mod/phpPgAdmin-7.14.7-mod.tar.gz" +MD5SUM="ede785d9f3d7c85342f2bb858fd96b34" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="php-pgsql" diff --git a/network/purple-hangouts/LICENSE b/network/purple-hangouts/LICENSE deleted file mode 100644 index bab24037e7..0000000000 --- a/network/purple-hangouts/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- purple-hangouts SlackBuild script
- Copyright (C) 2019 Marian Marinov
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- purple-hangouts Copyright (C) 2019 Marian Marinov
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/network/purple-hangouts/README b/network/purple-hangouts/README deleted file mode 100644 index 2648b4d1ac..0000000000 --- a/network/purple-hangouts/README +++ /dev/null @@ -1,10 +0,0 @@ -Hangouts plugin for libpurple - -A replacement prpl for Hangouts in Pidgin/libpurple to support the -proprietary protocol that Google uses for its Hangouts service. -So far it supports all the fun things that aren't part of the XMPP -interface, such as Group Chats, synchronised history between devices -and SMS support via Google Voice. - -Homepage: https://bitbucket.org/EionRobb/purple-hangouts - diff --git a/network/purple-hangouts/purple-hangouts.SlackBuild b/network/purple-hangouts/purple-hangouts.SlackBuild deleted file mode 100644 index edeb75dac1..0000000000 --- a/network/purple-hangouts/purple-hangouts.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash - -# Slackware build script for python-certifi - -# Copyright 2019 Marian Marinov, Sofia, Bulgaria -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=purple-hangouts -SRCNAM=EionRobb-$PRGNAM -VERSION=${VERSION:-effc9b41df8c} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -unzip $CWD/$VERSION.zip -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -make -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a gpl3.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/purple-hangouts/purple-hangouts.info b/network/purple-hangouts/purple-hangouts.info deleted file mode 100644 index def421fa90..0000000000 --- a/network/purple-hangouts/purple-hangouts.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="purple-hangouts" -VERSION="effc9b41df8c" -HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts" -DOWNLOAD="https://slackware.uk/~urchlay/src/effc9b41df8c.zip" -MD5SUM="35cc2a7bf8ae191c04d630783b0f6e55" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="protobuf-c" -MAINTAINER="Marian Marinov" -EMAIL="mm@yuhu.biz" diff --git a/network/purple-hangouts/slack-desc b/network/purple-hangouts/slack-desc deleted file mode 100644 index 83c5176e74..0000000000 --- a/network/purple-hangouts/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -purple-hangouts: purple-hangouts (Hangouts plugin for libpurple) -purple-hangouts: -purple-hangouts: A replacement prpl for Hangouts in Pidgin/libpurple to support the -purple-hangouts: proprietary protocol that Google uses for its Hangouts service. -purple-hangouts: So far it supports all the fun things that aren't part of the XMPP -purple-hangouts: interface, such as Group Chats, synchronised history between devices -purple-hangouts: and SMS support via Google Voice. -purple-hangouts: -purple-hangouts: Homepage: https://bitbucket.org/EionRobb/purple-hangouts -purple-hangouts: -purple-hangouts: diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild index 7100e30948..434e0669a5 100644 --- a/network/remmina/remmina.SlackBuild +++ b/network/remmina/remmina.SlackBuild @@ -28,12 +28,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=remmina -VERSION=${VERSION:-1.4.33} +VERSION=${VERSION:-1.4.35} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -DIRNAME=Remmina-v.$VERSION +DIRNAME=Remmina-v$VERSION AVAHI=${AVAHI:-OFF} KWALLET=${KWALLET:-ON} diff --git a/network/remmina/remmina.info b/network/remmina/remmina.info index 8fa24fb064..b6d1d69545 100644 --- a/network/remmina/remmina.info +++ b/network/remmina/remmina.info @@ -1,8 +1,8 @@ PRGNAM="remmina" -VERSION="1.4.33" +VERSION="1.4.35" HOMEPAGE="https://www.remmina.org" -DOWNLOAD="https://gitlab.com/Remmina/Remmina/-/archive/v.1.4.33/Remmina-v.1.4.33.tar.bz2" -MD5SUM="e3f0be9198e826938223c0e0ef402837" +DOWNLOAD="https://gitlab.com/Remmina/Remmina/-/archive/v1.4.35/Remmina-v1.4.35.tar.bz2" +MD5SUM="f655881007cc55db30518b9bfcae5ec4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="spice-gtk" diff --git a/network/signal-desktop/signal-desktop.SlackBuild b/network/signal-desktop/signal-desktop.SlackBuild index 935ba82bf3..acef3408b0 100644 --- a/network/signal-desktop/signal-desktop.SlackBuild +++ b/network/signal-desktop/signal-desktop.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=signal-desktop -VERSION=${VERSION:-7.4.0} +VERSION=${VERSION:-7.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/signal-desktop/signal-desktop.info b/network/signal-desktop/signal-desktop.info index c828a99176..e235394b7f 100644 --- a/network/signal-desktop/signal-desktop.info +++ b/network/signal-desktop/signal-desktop.info @@ -1,10 +1,10 @@ PRGNAM="signal-desktop" -VERSION="7.4.0" +VERSION="7.9.0" HOMEPAGE="https://signal.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_7.4.0_amd64.deb" -MD5SUM_x86_64="6bf4be996883f361d25bdff81ffc3120" +DOWNLOAD_x86_64="https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_7.9.0_amd64.deb" +MD5SUM_x86_64="713f9df84fb69d4d3b12daa20a4336ab" REQUIRES="" MAINTAINER="ArTourter" EMAIL="artourter@gmail.com" diff --git a/network/slack/slack.SlackBuild b/network/slack/slack.SlackBuild index 90c0e97523..43c71a5700 100644 --- a/network/slack/slack.SlackBuild +++ b/network/slack/slack.SlackBuild @@ -31,11 +31,11 @@ cd $(dirname $0) ; CWD=$(pwd) # A trick to find the latest slack package details, using snap meta data # curl -sH Snap-Device-Series:\ 16 https://api.snapcraft.io/v2/snaps/info/slack | json_pp PRGNAM=slack -VERSION=${VERSION:-4.37.101} +VERSION=${VERSION:-4.38.121} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -SNAPREVISION=${SNAPREVISION:-142} +SNAPREVISION=${SNAPREVISION:-147} SNAPPKG=JUJH91Ved74jd4ZgJCpzMBtYbPOzTlsD_$SNAPREVISION.snap if [ -z "$ARCH" ]; then diff --git a/network/slack/slack.info b/network/slack/slack.info index 5fa332568b..7fc44241fd 100644 --- a/network/slack/slack.info +++ b/network/slack/slack.info @@ -1,10 +1,10 @@ PRGNAM="slack" -VERSION="4.37.101" +VERSION="4.38.121" HOMEPAGE="https://slack.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://api.snapcraft.io/api/v1/snaps/download/JUJH91Ved74jd4ZgJCpzMBtYbPOzTlsD_142.snap" -MD5SUM_x86_64="14567aa40b8d3db83cae4e2af4e89a96" +DOWNLOAD_x86_64="https://api.snapcraft.io/api/v1/snaps/download/JUJH91Ved74jd4ZgJCpzMBtYbPOzTlsD_147.snap" +MD5SUM_x86_64="bc81aee5395988f7692d49dc3b9eeb53" REQUIRES="" MAINTAINER="Ruari Oedegaard" EMAIL="sbo@ruari.com" diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild index d819c88077..d59cbd5cd7 100644 --- a/network/squid/squid.SlackBuild +++ b/network/squid/squid.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=squid -VERSION=${VERSION:-6.6} +VERSION=${VERSION:-6.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/squid/squid.info b/network/squid/squid.info index e925b15dca..3e3b86fd47 100644 --- a/network/squid/squid.info +++ b/network/squid/squid.info @@ -1,8 +1,8 @@ PRGNAM="squid" -VERSION="6.6" +VERSION="6.9" HOMEPAGE="http://www.squid-cache.org/" -DOWNLOAD="http://www.squid-cache.org/Versions/v6/squid-6.6.tar.xz" -MD5SUM="5a41134ee1b7e75f62088acdec92d2ca" +DOWNLOAD="http://www.squid-cache.org/Versions/v6/squid-6.9.tar.xz" +MD5SUM="4888e9dc75c0daa0ed526b34c055cb67" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/sylpheed/sylpheed-3.7.0-types.patch b/network/sylpheed/sylpheed-3.7.0-types.patch new file mode 100644 index 0000000000..4270793b34 --- /dev/null +++ b/network/sylpheed/sylpheed-3.7.0-types.patch @@ -0,0 +1,201 @@ +From 1bff4a0727c3e9e33418965205b127b956e7717e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz> +Date: Sat, 27 Jan 2024 13:30:59 +0100 +Subject: [PATCH 1/4] fix incompatible pointer warnings + +--- + libsylph/utils.c | 8 ++++---- + libsylph/utils.h | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libsylph/utils.c b/libsylph/utils.c +index aabce066..7a9d1b61 100644 +--- a/libsylph/utils.c ++++ b/libsylph/utils.c +@@ -4047,7 +4047,7 @@ static gchar **argv_utf8_to_locale(gchar **argv) + } + #endif + +-gint execute_async(gchar *const argv[]) ++gint execute_async(gchar * argv[]) + { + #if defined(G_OS_WIN32) && !GLIB_CHECK_VERSION(2, 8, 2) + gchar **cp_argv; +@@ -4077,7 +4077,7 @@ gint execute_async(gchar *const argv[]) + return 0; + } + +-gint execute_sync(gchar *const argv[]) ++gint execute_sync(gchar * argv[]) + { + gint status; + #if defined(G_OS_WIN32) && !GLIB_CHECK_VERSION(2, 8, 2) +@@ -4247,7 +4247,7 @@ gint execute_open_file(const gchar *file, const gchar *content_type) + return 0; + } + #elif defined(__APPLE__) +- const gchar *argv[3] = {"open", NULL, NULL}; ++ gchar *argv[3] = {"open", NULL, NULL}; + + g_return_val_if_fail(file != NULL, -1); + +@@ -4256,7 +4256,7 @@ gint execute_open_file(const gchar *file, const gchar *content_type) + argv[1] = file; + execute_async(argv); + #else +- const gchar *argv[3] = {"xdg-open", NULL, NULL}; ++ gchar *argv[3] = {"xdg-open", NULL, NULL}; + + g_return_val_if_fail(file != NULL, -1); + +diff --git a/libsylph/utils.h b/libsylph/utils.h +index 9ac65cf4..97496049 100644 +--- a/libsylph/utils.h ++++ b/libsylph/utils.h +@@ -513,8 +513,8 @@ gchar *file_read_to_str (const gchar *file); + gchar *file_read_stream_to_str (FILE *fp); + + /* process execution */ +-gint execute_async (gchar *const argv[]); +-gint execute_sync (gchar *const argv[]); ++gint execute_async (gchar * argv[]); ++gint execute_sync (gchar * argv[]); + gint execute_command_line (const gchar *cmdline, + gboolean async); + gint execute_command_line_async_wait +-- +2.43.0 + + +From 1ae0b7e973e5da02190cfd5aeb145e6604af1e37 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz> +Date: Sat, 27 Jan 2024 13:31:38 +0100 +Subject: [PATCH 2/4] fix pointer to int cast + +--- + libsylph/account.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsylph/account.c b/libsylph/account.c +index 2431bf3d..7067af3d 100644 +--- a/libsylph/account.c ++++ b/libsylph/account.c +@@ -276,7 +276,7 @@ gboolean account_address_exist(const gchar *address) + } + } + +- return (gboolean)g_hash_table_lookup(address_table, address); ++ return g_hash_table_lookup(address_table, address) != NULL; + } + + void account_foreach(AccountFunc func, gpointer user_data) +-- +2.43.0 + + +From 5427f4108a08c32869af0a3b56f13cb8a545fc7f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz> +Date: Sat, 27 Jan 2024 13:32:13 +0100 +Subject: [PATCH 3/4] fix format for size_t argument + +--- + libsylph/codeconv.c | 2 +- + libsylph/procmime.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libsylph/codeconv.c b/libsylph/codeconv.c +index 49d1b3d3..6cad90d5 100644 +--- a/libsylph/codeconv.c ++++ b/libsylph/codeconv.c +@@ -2722,7 +2722,7 @@ CharSet conv_check_file_encoding(const gchar *file) + if ((size = fread(buf, 2, BUFFSIZE / 2, fp)) > 0) { + CharSet guess_enc = C_AUTO; + +- debug_print("conv_check_file_encoding: check first %d bytes of file %s\n", size * 2, file); ++ debug_print("conv_check_file_encoding: check first %zd bytes of file %s\n", size * 2, file); + + /* BOM check */ + if ((buf[0] & 0xff) == 0xfe && (buf[1] & 0xff) == 0xff) { +diff --git a/libsylph/procmime.c b/libsylph/procmime.c +index 4c3a90c6..0c101920 100644 +--- a/libsylph/procmime.c ++++ b/libsylph/procmime.c +@@ -1890,7 +1890,7 @@ EncodingType procmime_get_encoding_for_text_file(const gchar *file) + octet_percentage = 0.0; + + debug_print("procmime_get_encoding_for_text_file(): " +- "8bit chars: %d / %d (%f%%)\n", octet_chars, total_len, ++ "8bit chars: %zd / %zd (%f%%)\n", octet_chars, total_len, + 100.0 * octet_percentage); + + if (octet_percentage > 0.20) { +@@ -1926,7 +1926,7 @@ EncodingType procmime_get_encoding_for_str(const gchar *str) + octet_percentage = 0.0; + + debug_print("procmime_get_encoding_for_str(): " +- "8bit chars: %d / %d (%f%%)\n", octet_chars, total_len, ++ "8bit chars: %zd / %zd (%f%%)\n", octet_chars, total_len, + 100.0 * octet_percentage); + + if (octet_percentage > 0.20) { +-- +2.43.0 + + +From 7aba8dcfe69ed08b3484464d8424ef16220d792c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz> +Date: Sat, 27 Jan 2024 14:26:33 +0100 +Subject: [PATCH 4/4] fix format for glib types + +--- + libsylph/filter.c | 4 ++-- + libsylph/folder.c | 2 +- + libsylph/pop.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libsylph/filter.c b/libsylph/filter.c +index c58f8fc9..9607ccfb 100644 +--- a/libsylph/filter.c ++++ b/libsylph/filter.c +@@ -566,10 +566,10 @@ static gboolean filter_match_cond(FilterCond *cond, MsgInfo *msginfo, + debug_print("filter-log: %s: CMD_TEST, str_value: [%s]%s\n", G_STRFUNC, sv, nm); + break; + case FLT_COND_SIZE_GREATER: +- debug_print("filter-log: %s: SIZE_GREATER: %u %s %d (KB)%s\n", G_STRFUNC, msginfo->size, not_match ? "<=" : ">", cond->int_value, nm); ++ debug_print("filter-log: %s: SIZE_GREATER: %" G_GSIZE_FORMAT " %s %d (KB)%s\n", G_STRFUNC, msginfo->size, not_match ? "<=" : ">", cond->int_value, nm); + break; + case FLT_COND_AGE_GREATER: +- debug_print("filter-log: %s: AGE_GREATER: %lld (sec) %s %d (day)%s\n", G_STRFUNC, timediff, not_match ? "<=" : ">", cond->int_value, nm); ++ debug_print("filter-log: %s: AGE_GREATER: %" G_GINT64_FORMAT " (sec) %s %d (day)%s\n", G_STRFUNC, timediff, not_match ? "<=" : ">", cond->int_value, nm); + break; + case FLT_COND_UNREAD: + debug_print("filter-log: %s: UNREAD%s\n", G_STRFUNC, nm); +diff --git a/libsylph/folder.c b/libsylph/folder.c +index 6fffe2dc..c1487e11 100644 +--- a/libsylph/folder.c ++++ b/libsylph/folder.c +@@ -1945,7 +1945,7 @@ static void folder_write_list_recursive(GNode *node, gpointer data) + } + + fprintf(fp, +- " mtime=\"%lld\" new=\"%d\" unread=\"%d\" total=\"%d\"", ++ " mtime=\"%" G_GINT64_FORMAT "\" new=\"%d\" unread=\"%d\" total=\"%d\"", + (gint64)item->mtime, item->new, item->unread, item->total); + + if (item->account) +diff --git a/libsylph/pop.c b/libsylph/pop.c +index 8cb7f5cb..7108b7a6 100644 +--- a/libsylph/pop.c ++++ b/libsylph/pop.c +@@ -195,7 +195,7 @@ gint pop3_getrange_stat_send(Pop3Session *session) + + gint pop3_getrange_stat_recv(Pop3Session *session, const gchar *msg) + { +- if (sscanf(msg, "%d %lld", &session->count, &session->total_bytes) != 2) { ++ if (sscanf(msg, "%d %" G_GINT64_FORMAT "", &session->count, &session->total_bytes) != 2) { + log_warning(_("POP3 protocol error\n")); + session->error_val = PS_PROTOCOL; + return PS_PROTOCOL; +-- +2.43.0 + diff --git a/network/sylpheed/sylpheed.SlackBuild b/network/sylpheed/sylpheed.SlackBuild index eb0b55c8cd..14b4e41f72 100644 --- a/network/sylpheed/sylpheed.SlackBuild +++ b/network/sylpheed/sylpheed.SlackBuild @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -84,6 +81,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/sylpheed-3.7.0-types.patch + # Thanks to archlinux! sed -i 's|enchant/|enchant-2/|g' src/compose.c sed -i 's| enchant| enchant-2|g' configure diff --git a/network/tailscale/tailscale.SlackBuild b/network/tailscale/tailscale.SlackBuild index 638c7df5c1..898e2ee92f 100644 --- a/network/tailscale/tailscale.SlackBuild +++ b/network/tailscale/tailscale.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tailscale DAEMON=tailscaled -VERSION=${VERSION:-1.62.1} +VERSION=${VERSION:-1.66.3} ARCHSTR=amd64 BINDIR=$PRGNAM"_"$VERSION"_"$ARCHSTR BUILD=${BUILD:-1} diff --git a/network/tailscale/tailscale.info b/network/tailscale/tailscale.info index ad384e2488..b004c00b2f 100644 --- a/network/tailscale/tailscale.info +++ b/network/tailscale/tailscale.info @@ -1,12 +1,12 @@ PRGNAM="tailscale" -VERSION="1.62.1" +VERSION="1.66.3" HOMEPAGE="https://tailscale.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://pkgs.tailscale.com/stable/tailscale_1.62.1_amd64.tgz \ - https://github.com/tailscale/tailscale/archive/refs/tags/v1.62.1/tailscale-1.62.1.tar.gz" -MD5SUM_x86_64="5e8a3b17eddd4954d165c005a9c09967 \ - 7c8acd55eb0b85c05b6b80568a39b9d2" +DOWNLOAD_x86_64="https://pkgs.tailscale.com/stable/tailscale_1.66.3_amd64.tgz \ + https://github.com/tailscale/tailscale/archive/refs/tags/v1.66.3/tailscale-1.66.3.tar.gz" +MD5SUM_x86_64="73b786c984b6c2f87dd1eac902101620 \ + 7f42b917be044bdfcf91f9f332386db3" REQUIRES="" MAINTAINER="Andrew Payne" EMAIL="phalange@komputermatrix.com" diff --git a/network/teamviewer/teamviewer.SlackBuild b/network/teamviewer/teamviewer.SlackBuild index b1819a9c35..adde76fee7 100644 --- a/network/teamviewer/teamviewer.SlackBuild +++ b/network/teamviewer/teamviewer.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=teamviewer -VERSION=${VERSION:-15.52.3} +VERSION=${VERSION:-15.53.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/teamviewer/teamviewer.info b/network/teamviewer/teamviewer.info index 4718349a69..694cb14dc0 100644 --- a/network/teamviewer/teamviewer.info +++ b/network/teamviewer/teamviewer.info @@ -1,10 +1,10 @@ PRGNAM="teamviewer" -VERSION="15.52.3" +VERSION="15.53.6" HOMEPAGE="https://www.teamviewer.com/" -DOWNLOAD="https://dl.teamviewer.com/download/linux/version_15x/teamviewer_15.52.3_i386.deb" -MD5SUM="2a7e6d6b4928c594ba91735d643f8fad" -DOWNLOAD_x86_64="https://dl.teamviewer.com/download/linux/version_15x/teamviewer_15.52.3_amd64.deb" -MD5SUM_x86_64="31556dcdf43ce4e0aed3dd091d2bda41" +DOWNLOAD="https://dl.teamviewer.com/download/linux/version_15x/teamviewer_15.53.6_i386.deb" +MD5SUM="20191185cd9f41ad2bb8d1f5eb4bbcbc" +DOWNLOAD_x86_64="https://dl.teamviewer.com/download/linux/version_15x/teamviewer_15.53.6_amd64.deb" +MD5SUM_x86_64="208ede881c2c8d54aaf78aee3fc72fe8" REQUIRES="libminizip" MAINTAINER="ArTourter" EMAIL="artourter@gmail.com" diff --git a/network/telegram/telegram.SlackBuild b/network/telegram/telegram.SlackBuild index a11760559c..6eb0a76244 100644 --- a/network/telegram/telegram.SlackBuild +++ b/network/telegram/telegram.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=telegram SRCNAM=tsetup SRCDIR=Telegram -VERSION=${VERSION:-4.16.8} +VERSION=${VERSION:-5.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/telegram/telegram.info b/network/telegram/telegram.info index e50a9dc192..2f05cf32e1 100644 --- a/network/telegram/telegram.info +++ b/network/telegram/telegram.info @@ -1,10 +1,10 @@ PRGNAM="telegram" -VERSION="4.16.8" +VERSION="5.0.1" HOMEPAGE="https://telegram.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://updates.tdesktop.com/tlinux/tsetup.4.16.8.tar.xz" -MD5SUM_x86_64="ee1a670cc7e8da43aba7a78d38b20eaf" +DOWNLOAD_x86_64="https://updates.tdesktop.com/tlinux/tsetup.5.0.1.tar.xz" +MD5SUM_x86_64="0f439c23192ec8324a363361e683ff9b" REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/network/tor-browser/tor-browser.SlackBuild b/network/tor-browser/tor-browser.SlackBuild index 66004f1b3c..0455b6ab21 100644 --- a/network/tor-browser/tor-browser.SlackBuild +++ b/network/tor-browser/tor-browser.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tor-browser -# Copyright 2014-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tor-browser -VERSION=${VERSION:-13.0.14} +VERSION=${VERSION:-13.0.15} PRGLANG=${PRGLANG:-ALL} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -44,6 +44,10 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +if [ $ARCH == "i586" ]; then + ARCH="i686" +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/network/tor-browser/tor-browser.info b/network/tor-browser/tor-browser.info index ff2a8b2cc8..82d5701241 100644 --- a/network/tor-browser/tor-browser.info +++ b/network/tor-browser/tor-browser.info @@ -1,10 +1,10 @@ PRGNAM="tor-browser" -VERSION="13.0.14" +VERSION="13.0.15" HOMEPAGE="https://www.torproject.org" -DOWNLOAD="https://dist.torproject.org/torbrowser/13.0.14/tor-browser-linux-i686-13.0.14.tar.xz" -MD5SUM="71433c289914ae1b155751a63a29a1d5" -DOWNLOAD_x86_64="https://www.torproject.org/dist/torbrowser/13.0.14/tor-browser-linux-x86_64-13.0.14.tar.xz" -MD5SUM_x86_64="8d42e9e03a4684b3dd7aef39bb22a20c" +DOWNLOAD="https://dist.torproject.org/torbrowser/13.0.15/tor-browser-linux-i686-13.0.15.tar.xz" +MD5SUM="5373b81705ffdfade9619d40685b8327" +DOWNLOAD_x86_64="https://www.torproject.org/dist/torbrowser/13.0.15/tor-browser-linux-x86_64-13.0.15.tar.xz" +MD5SUM_x86_64="9e520bb3a4ad0daa53144a310bdb8142" REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/network/translate/translate.info b/network/translate/translate.info index a4e09be129..349b9cd302 100644 --- a/network/translate/translate.info +++ b/network/translate/translate.info @@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/d1/9d/692066b9e26176a93ce627bf MD5SUM="3ebcafb25c270e785c5f18580c4ad0c4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-libretranslatepy python3-lxml click" +REQUIRES="python3-libretranslatepy python3-lxml click python3-pytest-runner" MAINTAINER="Dimitris Zlatanidis" EMAIL="dslackw@gmail.com" diff --git a/network/turbolift/README b/network/turbolift/README deleted file mode 100644 index 8482ae887f..0000000000 --- a/network/turbolift/README +++ /dev/null @@ -1,8 +0,0 @@ -OpenStack Swift -Cloud Files- Uploader. - -If you have found yourself in a situation where you needed or wanted -to upload a whole bunch of files to Cloud Files quickly, this is what -you are looking for. - -Turbolift is an assistant for uploading files to the the Rackspace -Cloud Files Repository with a bunch of options. diff --git a/network/turbolift/doinst.sh b/network/turbolift/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/network/turbolift/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/network/turbolift/slack-desc b/network/turbolift/slack-desc deleted file mode 100644 index 06da0a7ea9..0000000000 --- a/network/turbolift/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -turbolift: turbolift (OpenStack Swift -Cloud Files- Uploader) -turbolift: -turbolift: If you have found yourself in a situation where you needed or -turbolift: wanted to upload a whole bunch of files to Cloud Files quickly, -turbolift: this is what you are looking for. -turbolift: -turbolift: Homepage: https://github.com/cloudnull/turbolift -turbolift: -turbolift: -turbolift: -turbolift: diff --git a/network/turbolift/turbolift.SlackBuild b/network/turbolift/turbolift.SlackBuild deleted file mode 100644 index 3d2803a9d3..0000000000 --- a/network/turbolift/turbolift.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for turbolift - -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=turbolift -VERSION=${VERSION:-2.1.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/turbolift/turbolift.info b/network/turbolift/turbolift.info deleted file mode 100644 index f847d95c26..0000000000 --- a/network/turbolift/turbolift.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="turbolift" -VERSION="2.1.3" -HOMEPAGE="https://github.com/cloudnull/turbolift" -DOWNLOAD="https://pypi.python.org/packages/source/t/turbolift/turbolift-2.1.3.tar.gz" -MD5SUM="3ce022b9719e76b2b8b15546369ad7b9" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="PrettyTable" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/network/unbound/root.hints b/network/unbound/root.hints index 280ab06683..f0a0934051 100644 --- a/network/unbound/root.hints +++ b/network/unbound/root.hints @@ -9,8 +9,8 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: March 25, 2024 -; related version of root zone: 2024032501 +; last update: April 18, 2024 +; related version of root zone: 2024041801 ; ; FORMERLY NS.INTERNIC.NET ; diff --git a/network/unbound/unbound.SlackBuild b/network/unbound/unbound.SlackBuild index 9a2dc3ce59..b4e61ec7e1 100644 --- a/network/unbound/unbound.SlackBuild +++ b/network/unbound/unbound.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=unbound -VERSION=${VERSION:-1.19.3} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.20.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/unbound/unbound.info b/network/unbound/unbound.info index d17666a509..130f8f8934 100644 --- a/network/unbound/unbound.info +++ b/network/unbound/unbound.info @@ -1,8 +1,8 @@ PRGNAM="unbound" -VERSION="1.19.3" +VERSION="1.20.0" HOMEPAGE="https://nlnetlabs.nl/projects/unbound/about/" -DOWNLOAD="https://www.nlnetlabs.nl/downloads/unbound/unbound-1.19.3.tar.gz" -MD5SUM="00bf61460c87c2542bcb68d52a2e5195" +DOWNLOAD="https://www.nlnetlabs.nl/downloads/unbound/unbound-1.20.0.tar.gz" +MD5SUM="970d8a8800e6993d4453d50979b0c657" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/viber/viber.SlackBuild b/network/viber/viber.SlackBuild index 81a497720a..b54fcd1295 100644 --- a/network/viber/viber.SlackBuild +++ b/network/viber/viber.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=viber -VERSION=${VERSION:-21.0.0.1} +VERSION=${VERSION:-21.8.0.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/viber/viber.info b/network/viber/viber.info index efc5945b88..7dee10b22a 100644 --- a/network/viber/viber.info +++ b/network/viber/viber.info @@ -1,10 +1,10 @@ PRGNAM="viber" -VERSION="21.0.0.1" +VERSION="21.8.0.11" HOMEPAGE="https://www.viber.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" DOWNLOAD_x86_64="http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb" -MD5SUM_x86_64="7e93a64efebd9112df3ac7f8dc0c4580" +MD5SUM_x86_64="376ebe7c7b798dc722e8dc2c71d3bcee" REQUIRES="snappy tslib" MAINTAINER="Petar Petrov" EMAIL="slackalaxy@gmail.com" diff --git a/network/vimb/vimb.SlackBuild b/network/vimb/vimb.SlackBuild index e62c7acc5b..f2dbe3c8b2 100644 --- a/network/vimb/vimb.SlackBuild +++ b/network/vimb/vimb.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vimb VERSION=${VERSION:-3.7.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/vimb/vimb.info b/network/vimb/vimb.info index d5c1cb95aa..34dc7ac89b 100644 --- a/network/vimb/vimb.info +++ b/network/vimb/vimb.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/fanglingsu/vimb/archive/3.7.0/vimb-3.7.0.tar.gz" MD5SUM="4052a71111eb31e5b5a39a75c460d441" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="webkit2gtk" +REQUIRES="webkit2gtk4.1" MAINTAINER="Leonard Schmidt" EMAIL="lems@gmx.net" diff --git a/network/vivaldi/vivaldi.SlackBuild b/network/vivaldi/vivaldi.SlackBuild index 0b8ba3e053..691545a3ef 100644 --- a/network/vivaldi/vivaldi.SlackBuild +++ b/network/vivaldi/vivaldi.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vivaldi -VERSION=${VERSION:-6.6.3271.61} +VERSION=${VERSION:-6.7.3329.31} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/vivaldi/vivaldi.info b/network/vivaldi/vivaldi.info index 2dddcfae85..a5bb15d36c 100644 --- a/network/vivaldi/vivaldi.info +++ b/network/vivaldi/vivaldi.info @@ -1,12 +1,12 @@ PRGNAM="vivaldi" -VERSION="6.6.3271.61" +VERSION="6.7.3329.31" HOMEPAGE="https://vivaldi.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_6.6.3271.61-1_amd64.deb \ - https://update.vivaldi.com/update/1.0/relnotes/6.6.3271.61.html" -MD5SUM_x86_64="8f5399008b3ce407841768b2e88d84cf \ - 5dcbd276bf780eb1106b8ac254e2a223" +DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_6.7.3329.31-1_amd64.deb \ + https://update.vivaldi.com/update/1.0/relnotes/6.7.3329.31.html" +MD5SUM_x86_64="945be3e20dd6408da98f62a0e5a41f70 \ + b171294275eaa32a36e3f1648bc50458" REQUIRES="" MAINTAINER="Ruari Oedegaard" EMAIL="sbo@ruari.com" diff --git a/network/vmware-horizon-client/README b/network/vmware-horizon-client/README index 5548d422ea..abbfbef819 100644 --- a/network/vmware-horizon-client/README +++ b/network/vmware-horizon-client/README @@ -1,31 +1,6 @@ -The VMware Horizon Client for Linux, allowing you to use your +The VMware Horizon Client for Linux allows you to use your Slackware box as a thin client and lets you connect to your company's -Virtual Desktop Infrastructure using the proprietary VMware View 6 -PCoIP protocol. +Virtual Desktop Infrastructure using the proprietary VMware View +protocol. -*ATTENTION*: This build script installs binary, proprietary -software. Only use it if you need the proprietary parts and you are -OK with installing and using proprietary software. By installing -this SlackBuild you agree to the EULA you'll find installed in -/usr/doc/vmware-horizon-client-4.3.0/. If you do not agree, uninstall -the package. - -This SlackBuild installs multiple components. At the moment only the -PCoIP and the Smart Card component seem to work. USB redirection and -Virtual Printing won't work. - -To deactivate one of the working components, use the installation -options - -PCOIP="NO" - -and - -SMARTCRD="NO" - -You could try to activate USB support by setting USB="YES". But there -will be a problem with libcrypto. If you find a fix, please email me. - -This application is a 32bit application. It won't work on a -Slackware64 system without multilib capability. But it has been tested -and works with a multilib setup. +This build script installs the Debian binary package. diff --git a/network/vmware-horizon-client/doinst.sh b/network/vmware-horizon-client/doinst.sh new file mode 100644 index 0000000000..4e7bf288e1 --- /dev/null +++ b/network/vmware-horizon-client/doinst.sh @@ -0,0 +1,26 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if ! /etc/init.d/ftscanhv start > /dev/null 2>&1; then + echo "Warning: The daemon for Scanner redirection fails to start!" +fi +if ! /etc/init.d/ftsprhv start > /dev/null 2>&1; then + echo "Warning: The daemon for SerialPort redirection fails to start!" +fi + +if [ -x /usr/lib64/vmware/view/integratedPrinting/integrated-printing-setup.sh ]; then + /usr/lib64/vmware/view/integratedPrinting/integrated-printing-setup.sh -i || true +fi + +if ! /etc/init.d/vmware-USBArbitrator start; then + echo "Warning: The daemon for USB redirection fails to start!" +fi + +python3 /usr/lib64/vmware/view/urlRedirection/install-url-redirection.py -i || true + +sed -i '1i127.0.0.1 view-localhost' /etc/hosts + +if ! udevadm control --reload-rules || ! udevadm trigger; then + echo "Warning: Error reloading udev HID rules, failed to configure HID devices!" +fi diff --git a/network/vmware-horizon-client/douninst.sh b/network/vmware-horizon-client/douninst.sh new file mode 100644 index 0000000000..fea504ccb8 --- /dev/null +++ b/network/vmware-horizon-client/douninst.sh @@ -0,0 +1,3 @@ +rm /usr/bin/prlinuxcupsppd +rm /usr/lib64/cupsPPD/prlinuxcupsppd +rmdir --ignore-fail-on-non-empty /usr/lib64/cupsPPD diff --git a/network/vmware-horizon-client/slack-desc b/network/vmware-horizon-client/slack-desc index 9d4818d909..e663a105f6 100644 --- a/network/vmware-horizon-client/slack-desc +++ b/network/vmware-horizon-client/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -vmware-horizon-client: vmware-horizon-client (VMWare Horizon Client with PCoIP support) +vmware-horizon-client: vmware-horizon-client (VMWare Horizon Client) vmware-horizon-client: -vmware-horizon-client: The VMware Horizon Client for Linux, optimised for VMware horizon 6, -vmware-horizon-client: allowing you to use your Slackware box as a thin client and connects -vmware-horizon-client: you to your company's Virtual Desktop Infrastructure, even if they -vmware-horizon-client: use the proprietary VMware Horizon 6 PCoIP protocol. -vmware-horizon-client: Only use this package if you need the proprietary parts. +vmware-horizon-client: The VMware Horizon Client for Linux allows you to use your Slackware +vmware-horizon-client: box as a thin client and connects you to your company's Virtual +vmware-horizon-client: Desktop Infrastructure, even if they use the proprietary VMware +vmware-horizon-client: Horizon protocol. vmware-horizon-client: +vmware-horizon-client: Homepage: https:/www.vmware.com vmware-horizon-client: vmware-horizon-client: vmware-horizon-client: diff --git a/network/vmware-horizon-client/vmware-bundle.eclass b/network/vmware-horizon-client/vmware-bundle.eclass deleted file mode 100644 index 261b6e1cae..0000000000 --- a/network/vmware-horizon-client/vmware-bundle.eclass +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vmware-bundle.eclass,v 1.2 2011/08/22 04:46:32 vapier Exp $ - -# @ECLASS: vmware-bundle.eclass -# @MAINTAINER: -# vmware@gentoo.org -# @AUTHOR: -# Matt Whitlock <matt@whitlock.name> -# @BLURB: Provides extract functionality for vmware products bundles - -# This version of the file has been modified to work as part of the vmware SlackBuild. Since the -# modifications are limited to renaming functions, we'll keep the original header - -extract_bundle_component() { - local bundle=${1:?} component=${2:?} dest=${3:-${2}} - cat > "${CWD}"/list-bundle-components.xsl <<-EOF - <?xml version="1.0" encoding="ISO-8859-1"?> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - <xsl:output omit-xml-declaration="yes"/> - <xsl:template match="text()"/> - <xsl:template match="/bundle/components/component"> - <xsl:value-of select="@offset"/> - <xsl:text> </xsl:text> - <xsl:value-of select="@size"/> - <xsl:text> </xsl:text> - <xsl:value-of select="@name"/> - <xsl:text> </xsl:text> - </xsl:template> - </xsl:stylesheet> - EOF - local -i bundle_size=$(stat -L -c'%s' "${bundle}") - local -i bundle_manifestOffset=$(od -An -j$((bundle_size-36)) -N4 -tu4 "${bundle}") - local -i bundle_manifestSize=$(od -An -j$((bundle_size-40)) -N4 -tu4 "${bundle}") - local -i bundle_dataOffset=$(od -An -j$((bundle_size-44)) -N4 -tu4 "${bundle}") - local -i bundle_dataSize=$(od -An -j$((bundle_size-52)) -N8 -tu8 "${bundle}") - tail -c+$((bundle_manifestOffset+1)) "${bundle}" 2> /dev/null | head -c$((bundle_manifestSize)) | - xsltproc "${CWD}"/list-bundle-components.xsl - | - while read -r component_offset component_size component_name ; do - if [[ ${component_name} == ${component} ]] ; then - echo "Extracting '${component_name}' component from '$(basename "${bundle}")'" - extract_component "${bundle}" "${dest}" $((bundle_dataOffset+component_offset)) - echo "Done." - fi - done -} - -extract_component() { - local component=${1:?} dest=${2:-.} - local -i offset=${3} - cat > "${CWD}"/list-component-files.xsl <<-EOF - <?xml version="1.0" encoding="ISO-8859-1"?> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - <xsl:output omit-xml-declaration="yes"/> - <xsl:template match="text()"/> - <xsl:template match="/component/fileset/file"> - <xsl:value-of select="@offset"/> - <xsl:text> </xsl:text> - <xsl:value-of select="@compressedSize"/> - <xsl:text> </xsl:text> - <xsl:value-of select="@uncompressedSize"/> - <xsl:text> </xsl:text> - <xsl:value-of select="@path"/> - <xsl:text> </xsl:text> - </xsl:template> - </xsl:stylesheet> - EOF - local -i component_manifestOffset=$(od -An -j$((offset+9)) -N4 -tu4 "${component}") - local -i component_manifestSize=$(od -An -j$((offset+13)) -N4 -tu4 "${component}") - local -i component_dataOffset=$(od -An -j$((offset+17)) -N4 -tu4 "${component}") - local -i component_dataSize=$(od -An -j$((offset+21)) -N8 -tu8 "${component}") - tail -c+$((offset+component_manifestOffset+1)) "${component}" 2> /dev/null | - head -c$((component_manifestSize)) | xsltproc "${CWD}"/list-component-files.xsl - | - while read -r file_offset file_compressedSize file_uncompressedSize file_path ; do - if [[ ${file_path} ]] ; then - echo -n '.' - file_path="${dest}/${file_path}" - mkdir -p "$(dirname "${file_path}")" || die - tail -c+$((offset+component_dataOffset+file_offset+1)) "${component}" 2> /dev/null | - head -c$((file_compressedSize)) | gzip -cd > "${file_path}" || die - fi - done - echo -} diff --git a/network/vmware-horizon-client/vmware-horizon-client.SlackBuild b/network/vmware-horizon-client/vmware-horizon-client.SlackBuild index d8c70d3605..4216cc2f62 100644 --- a/network/vmware-horizon-client/vmware-horizon-client.SlackBuild +++ b/network/vmware-horizon-client/vmware-horizon-client.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for vmware-horizon-client # Copyright 2015 Beni Keller, Schwyz, Switzerland +# Copyright 2024 Erich Ritz, Jenks, Oklahoma, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,76 +26,44 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vmware-horizon-client -VERSION=${VERSION:-3.4.0} +SRCNAM=VMware-Horizon-Client +VERSION=${VERSION:-2312.1_8.12.1_23543969} +DEBVERSION=${VERSION//_/-} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -ARCH=i586 -_BUILD=2769709 - -# Install PCOIP component -PCOIP=${PCOIP:-YES} -# Install USB-redirection component -# This is deactivated by default because -# It's not working with the current version of libcrypto. -USB=${USB:-NO} -# Install Smartcard component -SMARTCRD=${SMARTCRD:-YES} -# Install Real Time Audio and Video component -RTAV=${RTAV:-YES} - -echo $PCOIP -break - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -BUNDLE=$CWD/VMware-Horizon-Client-$VERSION-$_BUILD.x86.bundle -# All the components we support with this SlackBuild. The -# 'virtual-printing' support is excluded because I have no -# way to test whether it's working. -COMPONENTS="client pcoip usb smartcard rtav" - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION - -# We use the Gentoo eclass to extract components from the bundle. -# These are the settings needed for these functions. - - - - -export T="$CWD" - -ebegin() { - echo -n "Begin ${1}: " -} -eend() { - echo 'done' -} +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi -source "$CWD/vmware-bundle.eclass" +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi -# Extracting the components from the bundle -for COMPONENT in $COMPONENTS; do - extract_bundle_component $BUNDLE "vmware-horizon-$COMPONENT" "$CWD/extract/vmware-horizon-$COMPONENT" -done +# Upstream only has binary support for x86_64 at present. +if [ "$ARCH" = "x86_64" ]; then + DEBARCH="x64" +else + echo "Sorry, the VMware Horizon Client binary is currently available for x86_64 only." + exit 1 +fi -cd $CWD/extract +set -e +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $PKG +ar p $CWD/${SRCNAM}-${DEBVERSION}.$DEBARCH.deb data.tar.gz | tar xzv chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -102,69 +71,52 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Dirty hack copied from Arch PKGBUILD -# https://aur.archlinux.org/packages/vm/vmware-horizon-client -# Helps linking to the correct version of the OpenSSL libs -for FILE in $(find "$CWD/extract/" -type f); do - # executables and libraries only - file --mime "${FILE}" | egrep -q "(application/x-(executable|sharedlib)|text/x-shellscript)" || continue - - # make executable - chmod +x "${FILE}" - - # link against libudev.so.1 - #sed -i -e 's/libudev.so.0/libudev.so.1/' "${FILE}" - - # even openssl 1.0.1.x has library file names ending in .so.1.0.0 - sed -i -e 's/libssl.so.1.0.1/libssl.so.1.0.0/' \ - -e 's/libcrypto.so.1.0.1/libcrypto.so.1.0.0/' \ - "${FILE}" -done -# Delete these libraries. We'll recreate these files later as links -rm "$CWD"/extract/vmware-horizon-pcoip/pcoip/lib/vmware/lib{crypto,ssl}.so.1.0.1 - -# We install the client without the other components -# Since it's a binary distribution we just copy the files -cd $CWD/extract/vmware-horizon-client - -mkdir -p "$PKG/usr/" -mkdir -p "$PKG/usr/doc/" - -cp -a bin/ "$PKG/usr/" -cp -a lib/ "$PKG/usr/" -cp -a share/ "$PKG/usr/" -cp -a doc/ "$PKG/usr/doc/$PRGNAM-$VERSION/" -cp -a debug/ "$PKG/usr/doc/$PRGNAM-$VERSION/" +# Move lib to lib64 +mv $PKG/usr/lib $PKG/usr/lib64 +sed -i 's-/usr/lib-/usr/lib64-g' $PKG/usr/bin/vmware-appstub +sed -i 's-/usr/lib-/usr/lib64-g' $PKG/usr/bin/vmware-url-filter +sed -i 's-/usr/lib-/usr/lib64-g' $PKG/usr/bin/vmware-view +sed -i 's-/usr/lib-/usr/lib64-g' $PKG/usr/bin/vmware-view-lib-scan +sed -i 's-/usr/lib-/usr/lib64-g' $PKG/usr/bin/vmware-view-log-collector +sed -i 's-/usr/lib-/usr/lib64-g' $PKG/usr/lib64/vmware/view/integratedPrinting/integrated-printing-setup.sh + +#find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ +# | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +#find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ +# | cut -f 1 -d : | xargs chmod 755 2> /dev/null || true + +# Handle Debian's postinst: +ln -s /lib64/libudev.so.1 $PKG/usr/lib64/vmware/libudev.so.0 +ln -s /usr/lib64/libsecret-1.so $PKG/usr/lib64/vmware/libsecret.so +mkdir -p $PKG/etc/rc0.d +mkdir -p $PKG/etc/rc3.d +mkdir -p $PKG/etc/rc4.d +mkdir -p $PKG/etc/rc6.d +ln -s /etc/init.d/ftsprhv $PKG/etc/rc0.d/K08ftsprhv +ln -s /etc/init.d/ftsprhv $PKG/etc/rc6.d/K08ftsprhv +ln -s /etc/init.d/ftsprhv $PKG/etc/rc3.d/S50ftsprhv +ln -s /etc/init.d/ftsprhv $PKG/etc/rc4.d/S50ftsprhv +ln -s /etc/init.d/ftscanhv $PKG/etc/rc0.d/K08ftscanhv +ln -s /etc/init.d/ftscanhv $PKG/etc/rc6.d/K08ftscanhv +ln -s /etc/init.d/ftscanhv $PKG/etc/rc3.d/S50ftscanhv +ln -s /etc/init.d/ftscanhv $PKG/etc/rc4.d/S50ftscanhv +ln -s /etc/init.d/vmware-USBArbitrator $PKG/etc/rc0.d/K01vmware-USBArbitrator +ln -s /etc/init.d/vmware-USBArbitrator $PKG/etc/rc6.d/K01vmware-USBArbitrator +ln -s /etc/init.d/vmware-USBArbitrator $PKG/etc/rc3.d/S01vmware-USBArbitrator +ln -s /etc/init.d/vmware-USBArbitrator $PKG/etc/rc4.d/S01vmware-USBArbitrator +ln -sf /usr/lib64/vmware/view/usb/vmware-usbarbitrator $PKG/usr/bin/vmware-usbarbitrator +chmod +755 $PKG/usr/lib64/vmware/view/html5mmr/*.so* +chmod +755 $PKG/usr/lib64/vmware/view/vdpService/webrtcRedir/libwebrtc_sharedlib.so + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/vmware-horizon-client/* $PKG/usr/doc/$PRGNAM-$VERSION/ +rm -rf $PKG/usr/share/doc cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# We install the components -if [ "$PCOIP" == "YES" ]; then - cd ../vmware-horizon-pcoip - cp -a pcoip/lib/* "$PKG/usr/lib/" - cp -a pcoip/bin/* "$PKG/usr/bin/" - # We create the symbolic links for the libraries - ln -sf ../../lib/libcrypto.so.1.0.0 "$PKG/usr/lib/vmware/libcrypto.so.1.0.0" - ln -sf ../../lib/libssl.so.1.0.0 "$PKG/usr/lib/vmware/libssl.so.1.0.0" -fi - -if [ "$USB" == "YES" ]; then - cd ../vmware-horizon-usb - cp -a bin/* "$PKG/usr/bin/" -fi - -if [ "$SMARTCRD" == "YES" ]; then - cd ../vmware-horizon-smartcard - cp -a lib/* "$PKG/usr/lib/" -fi - -if [ "$RTAV" == "YES" ]; then - cd ../vmware-horizon-rtav - cp -a lib/* "$PKG/usr/lib/" -fi - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh +cat $CWD/douninst.sh > $PKG/install/douninst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/vmware-horizon-client/vmware-horizon-client.info b/network/vmware-horizon-client/vmware-horizon-client.info index f5b507edfe..a8583ee4f6 100644 --- a/network/vmware-horizon-client/vmware-horizon-client.info +++ b/network/vmware-horizon-client/vmware-horizon-client.info @@ -1,10 +1,10 @@ PRGNAM="vmware-horizon-client" -VERSION="3.4.0" -HOMEPAGE="https://my.vmware.com/web/vmware/info/slug/desktop_end_user_computing/vmware_horizon_clients/3_0" -DOWNLOAD="https://download3.vmware.com/software/view/viewclients/CART15Q1/VMware-Horizon-Client-3.4.0-2769709.x86.bundle" -MD5SUM="8f963a6b4eea7b2625e1e9aecd130234" -DOWNLOAD_x86_64="UNTESTED" -MD5SUM_x86_64="" +VERSION="2312.1_8.12.1_23543969" +HOMEPAGE="https://customerconnect.vmware.com/downloads/info/slug/desktop_end_user_computing/vmware_horizon_clients/horizon_8" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://download3.vmware.com/software/CART25FQ1_LIN64_DebPkg_2312.1/VMware-Horizon-Client-2312.1-8.12.1-23543969.x64.deb" +MD5SUM_x86_64="25cf7acbe05f250297f3697f4b21a636" REQUIRES="" -MAINTAINER="Navigium" -EMAIL="beni.nospam@sdf.org" +MAINTAINER="Erich Ritz" +EMAIL="erich.public@protonmail.com" diff --git a/network/weathercli/README b/network/weathercli/README deleted file mode 100644 index 149945d250..0000000000 --- a/network/weathercli/README +++ /dev/null @@ -1,7 +0,0 @@ -weathercli is a command line weather tool. - -Pass the script your API Key: -API_KEY=my_api_key_here ./weathercli.SlackBuild - -Get your API Key on this page: -https://openweathermap.org/ diff --git a/network/weathercli/slack-desc b/network/weathercli/slack-desc deleted file mode 100644 index 66c96bdf0c..0000000000 --- a/network/weathercli/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -weathercli: weathercli (a command line weather tool) -weathercli: -weathercli: You've spent hours, days, months, maybe years customizing your -weathercli: terminal. And yet so many things draw your attention away from it. -weathercli: -weathercli: Homepage: https://github.com/brianriley/weather-cli -weathercli: -weathercli: -weathercli: -weathercli: -weathercli: diff --git a/network/weathercli/weathercli.SlackBuild b/network/weathercli/weathercli.SlackBuild deleted file mode 100644 index 12cd688468..0000000000 --- a/network/weathercli/weathercli.SlackBuild +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/bash - -# Slackware build script for weathercli - -# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=weathercli -VERSION=${VERSION:-2.3.1} -BUILD=${BUILD:-3} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -if [ "$API_KEY" = "" ]; then - echo "" - echo "API_KEY not found !!! Please pass the script your API Key" - echo "API_KEY=my_api_key_here ./weathercli.SlackBuild" - echo "Get your API Key on this page : https://openweathermap.org/" - echo "" - exit 1 -fi - -# Patch API Key -API_KEY=${API_KEY} -echo $API_KEY -echo $API_KEY | sed -i "s/&units={1}/\&units={1}\&appid=$API_KEY/" weathercli.py - -# rename executable -sed -i "s/bin\/weather/bin\/weathercli/" setup.py -mv bin/weather bin/weathercli - -python setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE PKG-INFO README.mkd $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/weathercli/weathercli.info b/network/weathercli/weathercli.info deleted file mode 100644 index 20aa1a84ea..0000000000 --- a/network/weathercli/weathercli.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="weathercli" -VERSION="2.3.1" -HOMEPAGE="https://github.com/brianriley/weather-cli" -DOWNLOAD="https://files.pythonhosted.org/packages/a5/ff/53c22b373493083dcfcea6e2e669016339fc16dbfeb465053b3a854c0fe2/weathercli-2.3.1.tar.gz" -MD5SUM="09a930ca81da6d79e8ea241ce9bc6567" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="clint" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/network/weechat/weechat.SlackBuild b/network/weechat/weechat.SlackBuild index d0fa7ad59c..9e512c979e 100644 --- a/network/weechat/weechat.SlackBuild +++ b/network/weechat/weechat.SlackBuild @@ -95,6 +95,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + +sed -i "s|ruby-3.2|ruby-3.3 ruby-3.2|" cmake/FindRuby.cmake + # 20211019 bkw: patch from Debian: Build html documentation without # requiring data (javascript, fonts) on external websites (potential # privacy breach). Patch was slightly modified for Slackware. diff --git a/network/wireshark/wireshark.SlackBuild b/network/wireshark/wireshark.SlackBuild index dee353ae35..26868941a4 100644 --- a/network/wireshark/wireshark.SlackBuild +++ b/network/wireshark/wireshark.SlackBuild @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wireshark -VERSION=${VERSION:-4.2.4} +VERSION=${VERSION:-4.2.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/wireshark/wireshark.info b/network/wireshark/wireshark.info index c3f620160f..03987d6abe 100644 --- a/network/wireshark/wireshark.info +++ b/network/wireshark/wireshark.info @@ -1,8 +1,8 @@ PRGNAM="wireshark" -VERSION="4.2.4" +VERSION="4.2.5" HOMEPAGE="https://www.wireshark.org/" -DOWNLOAD="https://2.na.dl.wireshark.org/src/wireshark-4.2.4.tar.xz" -MD5SUM="cebb012489563a8eb9c3829cdcb0579c" +DOWNLOAD="https://2.na.dl.wireshark.org/src/wireshark-4.2.5.tar.xz" +MD5SUM="7d04bb70a64726cdefe8da6e3aa58c26" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lua" diff --git a/network/x2goclient/x2goclient.SlackBuild b/network/x2goclient/x2goclient.SlackBuild index 8fb5f09e1a..36a8377b56 100644 --- a/network/x2goclient/x2goclient.SlackBuild +++ b/network/x2goclient/x2goclient.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=x2goclient -VERSION=${VERSION:-4.1.2.2} +VERSION=${VERSION:-4.1.2.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,7 +71,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -80,12 +80,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# The newer libssh doesn't ship this library anymore -[[ "$(pkg-config --modversion libssh)" > "0.8" ]] && \ - sed -i "s| -lssh_threads||" x2goclient.pro +sed -i '/^MAKEOVERRIDES\s*=/ s/=.*$/=/' Makefile +sed -i '/^\.MAKEOVERRIDES\s*=/ s/=.*$/=/' Makefile +sed -i '/^\.MAKEFLAGS\s*=/ s/=.*$/=/' Makefile -sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@qmake@' Makefile -sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@lrelease@' Makefile +export QT_VERSION=5 make diff --git a/network/x2goclient/x2goclient.info b/network/x2goclient/x2goclient.info index c360e03d0d..67272c1ad6 100644 --- a/network/x2goclient/x2goclient.info +++ b/network/x2goclient/x2goclient.info @@ -1,8 +1,8 @@ PRGNAM="x2goclient" -VERSION="4.1.2.2" +VERSION="4.1.2.3" HOMEPAGE="http://www.x2go.org" -DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.2.tar.gz" -MD5SUM="1390b794b0a10f0a885dd7cf00f2acef" +DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.3.tar.gz" +MD5SUM="7af1dd74d2f36fc292944addcfebb3cc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="nx-libs" diff --git a/network/x2goserver/x2goserver.SlackBuild b/network/x2goserver/x2goserver.SlackBuild index caa42c4eaa..10766d59a9 100644 --- a/network/x2goserver/x2goserver.SlackBuild +++ b/network/x2goserver/x2goserver.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=x2goserver -VERSION=${VERSION:-20201227_08aa5e6} +VERSION=${VERSION:-4.1.0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,7 +71,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/network/x2goserver/x2goserver.info b/network/x2goserver/x2goserver.info index 7dfbf73d3a..01a0704bb1 100644 --- a/network/x2goserver/x2goserver.info +++ b/network/x2goserver/x2goserver.info @@ -1,8 +1,8 @@ PRGNAM="x2goserver" -VERSION="20201227_08aa5e6" +VERSION="4.1.0.5" HOMEPAGE="http://www.x2go.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20201227_08aa5e6.tar.xz" -MD5SUM="46aad829313b85218841e1f818244a06" +DOWNLOAD="https://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.5.tar.gz" +MD5SUM="31d3031684d8fc782619270eb36ab58c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="nx-libs perl-Config-Simple perl-File-ReadBackwards perl-DBD-SQLite perl-Capture-Tiny perl-Try-Tiny perl-Unix-Syslog perl-file-basedir perl-Switch" diff --git a/network/xmrig/xmrig.SlackBuild b/network/xmrig/xmrig.SlackBuild index 6f182923cd..0b6ada30e7 100644 --- a/network/xmrig/xmrig.SlackBuild +++ b/network/xmrig/xmrig.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xmrig -VERSION=${VERSION:-6.21.1} +VERSION=${VERSION:-6.21.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/xmrig/xmrig.info b/network/xmrig/xmrig.info index e2ea65a269..6727e9c63c 100644 --- a/network/xmrig/xmrig.info +++ b/network/xmrig/xmrig.info @@ -1,8 +1,8 @@ PRGNAM="xmrig" -VERSION="6.21.1" +VERSION="6.21.3" HOMEPAGE="https://xmrig.com/" -DOWNLOAD="https://github.com/xmrig/xmrig/archive/v6.21.1/xmrig-6.21.1.tar.gz" -MD5SUM="072d9a86308243368a89c43c2e5d7ed4" +DOWNLOAD="https://github.com/xmrig/xmrig/archive/v6.21.3/xmrig-6.21.3.tar.gz" +MD5SUM="5067943a9c3d387d0833d1af2540dde6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README% hwloc" diff --git a/network/yle-dl/yle-dl.SlackBuild b/network/yle-dl/yle-dl.SlackBuild index 3fd8edb8af..43947709c6 100644 --- a/network/yle-dl/yle-dl.SlackBuild +++ b/network/yle-dl/yle-dl.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=yle-dl -VERSION=${VERSION:-20240130} +VERSION=${VERSION:-20240429} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/yle-dl/yle-dl.info b/network/yle-dl/yle-dl.info index a8a5fb60e2..ea1b992ba8 100644 --- a/network/yle-dl/yle-dl.info +++ b/network/yle-dl/yle-dl.info @@ -1,8 +1,8 @@ PRGNAM="yle-dl" -VERSION="20240130" +VERSION="20240429" HOMEPAGE="https://aajanki.github.io/yle-dl/" -DOWNLOAD="https://github.com/aajanki/yle-dl/archive/20240130/yle-dl-20240130.tar.gz" -MD5SUM="4ea36e5fab2dd1b255e39d7a7bff3dcd" +DOWNLOAD="https://github.com/aajanki/yle-dl/archive/20240429/yle-dl-20240429.tar.gz" +MD5SUM="2088d99f41f85960b744aba0700e4009" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-lxml python3-configargparse" diff --git a/network/zerotier-one/README b/network/zerotier-one/README new file mode 100644 index 0000000000..695b7df0e1 --- /dev/null +++ b/network/zerotier-one/README @@ -0,0 +1,25 @@ +ZeroTier One allows systems to join and participate in ZeroTier +virtual networks. + +ZeroTier One is a client application that enables devices to join +ZeroTier virtual networks (typically configured and managed by a +network controller). It provides an encrypted and secure network +connectivity solution that can be used for a variety of purposes, +including VPN alternatives, remote access, distributed +applications, and more. + +Since zerotier-one needs the tun module to be loaded in order to +work, that is done in the start function of rc.zerotier-one. +If you wish you can make the module load from rc.modules.local. + +The following can be used to start/stop NordVPN automatically: +/etc/rc.d/rc.local + + if [ -x /etc/rc.d/rc.zerotier-one ]; then + /etc/rc.d/rc.zerotier-one start + fi + +/etc/rc.d/rc.local_shutdown + if [ -x /etc/rc.d/rc.zerotier-one ]; then + /etc/rc.d/rc.zerotier-one stop + fi diff --git a/network/avahi/doinst.sh b/network/zerotier-one/doinst.sh index 9bf5bd8772..6840d728b4 100644 --- a/network/avahi/doinst.sh +++ b/network/zerotier-one/doinst.sh @@ -1,3 +1,5 @@ +#!/bin/sh -x + config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" @@ -22,17 +24,4 @@ preserve_perms() { config $NEW } - -preserve_perms etc/rc.d/rc.avahidaemon.new -preserve_perms etc/rc.d/rc.avahidnsconfd.new -preserve_perms etc/avahi/avahi-daemon.conf.new - -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -# Reload messagebus service -if [ -x etc/rc.d/rc.messagebus ]; then - chroot . /etc/rc.d/rc.messagebus reload -fi - +preserve_perms etc/rc.d/rc.zerotier-one.new diff --git a/network/zerotier-one/rc.zerotier-one.new b/network/zerotier-one/rc.zerotier-one.new new file mode 100644 index 0000000000..5c1d00295e --- /dev/null +++ b/network/zerotier-one/rc.zerotier-one.new @@ -0,0 +1,51 @@ +#!/bin/sh + +# Slackware init script for zerotier-one + +# To change the default options, edit /etc/default/zerotier-one +if [ -r /etc/default/zerotier-one ]; then + . /etc/default/zerotier-one +fi + +# Start zerotier-one +start_zerotier() { + if ! lsmod | grep -q "^tun " ; then + echo "Loading tun module..." + /sbin/modprobe tun + fi + + if ! /usr/bin/pgrep --ns $$ --euid root -f "^/usr/sbin/zerotier-one" 1> /dev/null 2> /dev/null ; then + echo "Starting zerotier-one: /usr/sbin/zerotier-one $ZEROTIER_OPTS" + /usr/sbin/zerotier-one $ZEROTIER_OPTS & + echo $! > /var/run/zerotier-one.pid + fi +} + +# Stop zerotier-one +stop_zerotier() { + echo "Stopping zerotier-one." + kill $(cat /var/run/zerotier-one.pid) + rm -f /var/run/zerotier-one.pid +} + +# Restart zerotier-one +restart_zerotier() { + stop_zerotier + sleep 1 + start_zerotier +} + +# Parse command line parameters +case "$1" in +'start') + start_zerotier + ;; +'stop') + stop_zerotier + ;; +'restart') + restart_zerotier + ;; +*) + echo "usage $0 start|stop|restart" +esac diff --git a/network/zerotier-one/slack-desc b/network/zerotier-one/slack-desc new file mode 100644 index 0000000000..af006e06b7 --- /dev/null +++ b/network/zerotier-one/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +zerotier-one: zerotier-one (vpn client application) +zerotier-one: +zerotier-one: ZeroTier One is a client application that enables devices to join +zerotier-one: ZeroTier virtual networks (typically configured and managed by a +zerotier-one: network controller). It provides an encrypted and secure network +zerotier-one: connectivity solution that can be used for a variety of purposes, +zerotier-one: including VPN alternatives, remote access, distributed +zerotier-one: applications, and more. +zerotier-one: +zerotier-one: +zerotier-one: Homepage: https://www.zerotier.com/ diff --git a/python/gi-docgen/gi-docgen.SlackBuild b/network/zerotier-one/zerotier-one.SlackBuild index a6fc4d340a..72a0bcc7a7 100644 --- a/python/gi-docgen/gi-docgen.SlackBuild +++ b/network/zerotier-one/zerotier-one.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for gi-docgen +# Slackware build script for zerotier-one -# Copyright 2022-2023 Steven Voges <Oregon, USA> +# Copyright 2024 Georgi Kolev, Bulgaria # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=gi-docgen -VERSION=${VERSION:-2023.1} +PRGNAM=zerotier-one +GH_NAME=ZeroTierOne +VERSION=${VERSION:-1.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -48,16 +50,12 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi @@ -66,9 +64,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $GH_NAME-$VERSION +tar xvf $CWD/$GH_NAME-$VERSION.tar.gz +cd $GH_NAME-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -76,23 +74,34 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --root=$PKG -mv $PKG/usr/share/man $PKG/usr/man +make +make selftest + +make DESTDIR=$PKG install +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +find $PKG -name perllocal.pod \ + -o -name ".packlist" \ + -o -name "*.bs" \ + | xargs rm -f + +mv $PKG/usr/share/man $PKG/usr/ +rm -r $PKG/usr/share find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.md LICENSES/*.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mkdir -p $PKG/etc/rc.d +install -m 0644 $CWD/rc.$PRGNAM.new $PKG/etc/rc.d/rc.$PRGNAM.new + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/zerotier-one/zerotier-one.info b/network/zerotier-one/zerotier-one.info new file mode 100644 index 0000000000..684db72c4a --- /dev/null +++ b/network/zerotier-one/zerotier-one.info @@ -0,0 +1,10 @@ +PRGNAM="zerotier-one" +VERSION="1.6.2" +HOMEPAGE="https://zerotier.com" +DOWNLOAD="https://github.com/zerotier/ZeroTierOne/archive/1.6.2/ZeroTierOne-1.6.2.tar.gz" +MD5SUM="179ff408997e8aacaf37343d5b4b2473" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Georgi kolev" +EMAIL="georgi.kolev (at) gmail.com" diff --git a/network/zoom-linux/zoom-linux.SlackBuild b/network/zoom-linux/zoom-linux.SlackBuild index 4263ee5520..ed7813e375 100644 --- a/network/zoom-linux/zoom-linux.SlackBuild +++ b/network/zoom-linux/zoom-linux.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=zoom-linux -VERSION=${VERSION:-6.0.0.4563} # may be overridden by source! +VERSION=${VERSION:-6.0.2.4680} # may be overridden by source! SRCNAM=zoom BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/zoom-linux/zoom-linux.info b/network/zoom-linux/zoom-linux.info index f1b77a4e27..5bdc183dd8 100644 --- a/network/zoom-linux/zoom-linux.info +++ b/network/zoom-linux/zoom-linux.info @@ -1,10 +1,10 @@ PRGNAM="zoom-linux" -VERSION="6.0.0.4563" +VERSION="6.0.2.4680" HOMEPAGE="https://www.zoom.us/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://cdn.zoom.us/prod/6.0.0.4563/zoom_x86_64.pkg.tar.xz" -MD5SUM_x86_64="0c53fed4b3eb7ad942708e02a468021a" +DOWNLOAD_x86_64="https://cdn.zoom.us/prod/6.0.2.4680/zoom_x86_64.pkg.tar.xz" +MD5SUM_x86_64="0e46a93bc0f450ec551489d8a639ea46" REQUIRES="" MAINTAINER="Ebben Aries" EMAIL="slackbuilds@dscp.org" diff --git a/office/1password/1password.info b/office/1password/1password.info index ffe5ec8164..db8cf11513 100644 --- a/office/1password/1password.info +++ b/office/1password/1password.info @@ -4,7 +4,7 @@ HOMEPAGE="https://1password.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" DOWNLOAD_x86_64="https://downloads.1password.com/linux/rpm/beta/x86_64/1password-latest.rpm" -MD5SUM_x86_64="c7cb43ff2b8b46b899b00942cd122126" +MD5SUM_x86_64="4d0b0ceb2ed3c46a9b6d2f1ddfd18c9f" REQUIRES="" MAINTAINER="Akileo" EMAIL="theakileo@hotmail.com" diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index b3b349606f..8994813b6f 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=LibreOffice SRCNAM=libreoffice -VERSION=${VERSION:-24.2.2.2} +VERSION=${VERSION:-24.2.3.2} SHORT_VERSION=${VERSION%.*.*} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info index eb06942f03..726660b5b7 100644 --- a/office/LibreOffice/LibreOffice.info +++ b/office/LibreOffice/LibreOffice.info @@ -1,10 +1,10 @@ PRGNAM="LibreOffice" -VERSION="24.2.2.2" +VERSION="24.2.3.2" HOMEPAGE="https://www.libreoffice.org" -DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/24.2.2/libreoffice-24.2.2.2.tar.xz \ - https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-24.2.2.2-srcs.tar.xz" -MD5SUM="72d05d00734c6921a47c369b8d7ef8cf \ - 87a2d12d9b00c2662c1fee4303d54c48" +DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/24.2.3/libreoffice-24.2.3.2.tar.xz \ + https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-24.2.3.2-srcs.tar.xz" +MD5SUM="df019f1cfa41c3dd80f06f865c752817 \ + 8791428dd6764e1f653db63a19e4ea1f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="zulu-openjdk17 apache-ant perl-Archive-Zip libcdr libfreehand liblangtag libmspub libzmf" diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild index 11707f4c3a..114ab7799c 100644 --- a/office/abiword/abiword.SlackBuild +++ b/office/abiword/abiword.SlackBuild @@ -92,6 +92,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# https://www.linuxfromscratch.org/blfs/view/svn/xsoft/AbiWord.html +sed -e '/libxml/a #include <libxml/xmlmemory.h>' \ + -i src/af/util/xp/ut_stringbuf.cpp + patch -p1 < $CWD/enchant-2.1.patch # 20200622 bkw: don't let abiword create /root/.config/abiword/profile @@ -101,7 +105,7 @@ export CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache} export HOME=$( pwd )/tmphome CPPFLAGS="-I$TMP/$PRGNAM-$VERSION" \ -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ diff --git a/office/asymptote/asymptote.SlackBuild b/office/asymptote/asymptote.SlackBuild index 3c9d7da655..3a7ecea72e 100644 --- a/office/asymptote/asymptote.SlackBuild +++ b/office/asymptote/asymptote.SlackBuild @@ -89,7 +89,7 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-gc=system \ - --enable-offscreen \ + --disable-offscreen \ --disable-lsp \ --disable-gc-debug \ --disable-gc-full-debug \ diff --git a/office/bibtex2html/README b/office/bibtex2html/README deleted file mode 100644 index 3a9c8d97fe..0000000000 --- a/office/bibtex2html/README +++ /dev/null @@ -1,26 +0,0 @@ -bibtex2html (A translator of BibTeX bibliographies into HTML) - -BibTeX2HTML is a collection of tools for automatically producing HTML -documents from bibliographies written in the BibTeX format. It -consists of three command line tools: - - - bib2bib: is a filter tool that reads one or several bibliography - files, filters the entries with respect to a given criterion, and - outputs the list of selected keys together with a new - bibliography file containing only the selected entries. - - - bibtex2html: is a translator that reads a bibliography file and - outputs two HTML documents that contains respectively the cited - bibliography in a nice presentation, and the original BibTeX file - augmented with several transparent HTML links to allow easy - navigation. bibtex2html can handle any BibTeX style file, - including those producing multiple bibliographies. - - - aux2bib: reads a .aux file as produced by LaTeX and writes to - standard output a BibTeX file containing exactly the BibTeX - entries refereed in the .aux file. - -As part of the documentation, a manual is generated with 'pdflatex'. -For disabling generation of the manual, run: - - DISABLE_DOC=yes ./bibtex2html.SlackBuild diff --git a/office/bibtex2html/bibtex2html.SlackBuild b/office/bibtex2html/bibtex2html.SlackBuild deleted file mode 100644 index 2b6dd19485..0000000000 --- a/office/bibtex2html/bibtex2html.SlackBuild +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/bash - -# Slackware build script for bibtex2html - -# Copyright 2018 Pedro R.M. Júnior, Campinas, SP, Brazil -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, -# is permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=bibtex2html -VERSION=${VERSION:-1.99} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --mandir=/usr/man \ - $([ "${DISABLE_DOC:=no}" = "yes" ] && echo --disable-doc) \ - --build=$ARCH-slackware-linux - -# For some reason, the generated Makefile have a hard coded `MANDIR`, -# so we need to patch this to be based in ${prefix}, as for `BINDIR`. -sed -i 's/MANDIR = \/usr\/man/MANDIR = ${prefix}\/man/' Makefile - -###sbolint off -# Compile the application and install it into the $PKG directory. As -# the Makefile does not support `DESTDIR`, in this case we need to use -# `prefix`. Only `/usr/bin` and `/usr/man` are installed, so it is -# enough to specify `$PKG/usr`. -###sbolint on -make -make install prefix=$PKG/usr - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES COPYING GPL README \ - $([ "$DISABLE_DOC" = "yes" ] || echo manual.pdf manual.html) \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/office/bibtex2html/bibtex2html.info b/office/bibtex2html/bibtex2html.info deleted file mode 100644 index b3110ea000..0000000000 --- a/office/bibtex2html/bibtex2html.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="bibtex2html" -VERSION="1.99" -HOMEPAGE="https://www.lri.fr/~filliatr/bibtex2html" -DOWNLOAD="https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.99.tar.gz" -MD5SUM="85f8d617b13d34a552261b3fbb406a0f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="hevea" -MAINTAINER="Pedro R.M. Júnior" -EMAIL="pedrormjunior@gmail.com" diff --git a/office/bibtex2html/slack-desc b/office/bibtex2html/slack-desc deleted file mode 100644 index 6c7589d1d6..0000000000 --- a/office/bibtex2html/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -bibtex2html: bibtex2html (A translator of BibTeX bibliographies into HTML) -bibtex2html: -bibtex2html: BibTeX2HTML is a collection of tools for automatically producing HTML -bibtex2html: documents from bibliographies written in the BibTeX format. It -bibtex2html: consists of three command line tools: -bibtex2html: -bibtex2html: - bib2bib -bibtex2html: - bibtex2html -bibtex2html: - aux2bib -bibtex2html: -bibtex2html: diff --git a/office/calibre-bin/calibre-bin.SlackBuild b/office/calibre-bin/calibre-bin.SlackBuild index 0adcf0b982..e01633e816 100644 --- a/office/calibre-bin/calibre-bin.SlackBuild +++ b/office/calibre-bin/calibre-bin.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=calibre-bin -VERSION=${VERSION:-7.9.0} +VERSION=${VERSION:-7.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/office/calibre-bin/calibre-bin.info b/office/calibre-bin/calibre-bin.info index 0d2217abd9..30bf1c52f7 100644 --- a/office/calibre-bin/calibre-bin.info +++ b/office/calibre-bin/calibre-bin.info @@ -1,10 +1,10 @@ PRGNAM="calibre-bin" -VERSION="7.9.0" +VERSION="7.10.0" HOMEPAGE="https://calibre-ebook.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.calibre-ebook.com/7.9.0/calibre-7.9.0-x86_64.txz" -MD5SUM_x86_64="fcff97c68fadeb4c9f6e731fae94af35" +DOWNLOAD_x86_64="https://download.calibre-ebook.com/7.10.0/calibre-7.10.0-x86_64.txz" +MD5SUM_x86_64="f16f8530308b81b5d6ab303890c412d9" REQUIRES="" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org" diff --git a/office/epr/README b/office/epr/README new file mode 100644 index 0000000000..a791c92707 --- /dev/null +++ b/office/epr/README @@ -0,0 +1,11 @@ +Terminal/CLI Epub reader written in Python 3.6 with features: + +Remembers last read file (just run epr without any argument) +Remembers last reading state for each file +Per file saved state +Adjustable text area width +Adaptive to terminal resize +Supports EPUB3 (no audio support) +Secondary vim-like bindings +Supports opening images +Dark/Light colorscheme (depends on terminal color capability) diff --git a/libraries/nv-codec-headers/nv-codec-headers.SlackBuild b/office/epr/epr.SlackBuild index 1faff221c0..a2fa151e30 100644 --- a/libraries/nv-codec-headers/nv-codec-headers.SlackBuild +++ b/office/epr/epr.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for nv-codec-headers +# Slackware build script for epr -# Copyright 2018-2023, Andrew Strong, Blue Mountains, Australia. +# Copyright 2024 doclai <toi@doclai.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,13 +24,12 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=nv-codec-headers -# Note that the version number is contained -# within the file ffnvcodec.pc.in: -VERSION=${VERSION:-11.1.5.2} +PRGNAM=epr +VERSION=${VERSION:-2.4.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +GOOS=linux if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -40,6 +39,12 @@ if [ -z "$ARCH" ]; then esac fi +case "$ARCH" in + x86_64) PRINTARCH=amd64 ;; + i586) PRINTARCH=386 ;; + *) PRINTARCH=$ARCH ;; +esac + if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -49,36 +54,22 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG -mkdir -p $PKG -cd $TMP -rm -rf $PRGNAM - -rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz - cd $PRGNAM-$VERSION -chown -R root:root . -make PREFIX=/usr LIBDIR=lib${LIBDIRSUFFIX} install DESTDIR=$PKG +install -dm 755 "$PKG/usr/bin" +install -Dm 644 LICENSE "$PRGNAM/usr/share/licenses/$PRGNAM/LICENSE" + +install -Dm 644 epr.py "$PKG/usr/bin/epr" +chmod +x "$PKG/usr/bin/epr" mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/epr/epr.info b/office/epr/epr.info new file mode 100644 index 0000000000..70443965dd --- /dev/null +++ b/office/epr/epr.info @@ -0,0 +1,10 @@ +PRGNAM="epr" +VERSION="2.4.15" +HOMEPAGE="https://github.com/wustho/epr" +DOWNLOAD="https://github.com/wustho/epr/archive/refs/tags/v2.4.15.tar.gz" +MD5SUM="85c49a9faaf8a69b750d949572d8bbfe" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="doclai" +EMAIL="toi@doclai.com" diff --git a/python/tox/slack-desc b/office/epr/slack-desc index f09b425496..b8a352767b 100644 --- a/python/tox/slack-desc +++ b/office/epr/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -tox: tox (virtualenv-based automation of test activities) -tox: -tox: Tox aims to automate and standardize testing in Python. -tox: It is part of a larger vision of easing the packaging, -tox: testing and release process of Python software. -tox: -tox: -tox: -tox: -tox: Homepage: https://tox.readthedocs.io/en/latest/ -tox: +epr: epr (Terminal/CLI Epub reader) +epr: +epr: +epr: Homepage: https://github.com/wustho/epr +epr: +epr: +epr: +epr: +epr: +epr: +epr: diff --git a/office/gnucash-docs/gnucash-docs.SlackBuild b/office/gnucash-docs/gnucash-docs.SlackBuild index cab82e5ef0..fad6a714af 100644 --- a/office/gnucash-docs/gnucash-docs.SlackBuild +++ b/office/gnucash-docs/gnucash-docs.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gnucash-docs -VERSION=${VERSION:-4.11} +VERSION=${VERSION:-5.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -91,15 +91,15 @@ cd build make $DOCLANG-gnucash-help-pdf || make C-gnucash-help-pdf fi - make install DESTDIR=$PKG + make -j1 install DESTDIR=$PKG # Move the files to where they belong: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION - cp -Rv share/doc/$DOCLANG/* $PKG/usr/doc/$PRGNAM-$VERSION + cp -Rv share/help/$DOCLANG/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # There is no help system for Japanese, so: if [ "$DOCLANG" = "ja" ]; then - cp -Rv share/doc/C/gnucash-help* $PKG/usr/doc/$PRGNAM-$VERSION + cp -Rv share/help/C/gnucash-help* $PKG/usr/doc/$PRGNAM-$VERSION fi mv $PKG/usr/share/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION # get rid of unused folders: diff --git a/office/gnucash-docs/gnucash-docs.info b/office/gnucash-docs/gnucash-docs.info index b4ca5038df..0f7b5ee92d 100644 --- a/office/gnucash-docs/gnucash-docs.info +++ b/office/gnucash-docs/gnucash-docs.info @@ -1,8 +1,8 @@ PRGNAM="gnucash-docs" -VERSION="4.11" +VERSION="5.4" HOMEPAGE="https://www.gnucash.org" -DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-docs-4.11.tar.gz" -MD5SUM="4fd7d4e6cb5ef18fb3e54dc623dd76f6" +DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-docs-5.4.tar.gz" +MD5SUM="62b1a9cd78d9d9fff889c9460716bd5c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gnucash rarian yelp" diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild index f1f89a24ad..0f60d7df45 100644 --- a/office/gnucash/gnucash.SlackBuild +++ b/office/gnucash/gnucash.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gnucash -VERSION=${VERSION:-4.11} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/office/gnucash/gnucash.info b/office/gnucash/gnucash.info index 0f8546165a..d337fd780c 100644 --- a/office/gnucash/gnucash.info +++ b/office/gnucash/gnucash.info @@ -1,8 +1,8 @@ PRGNAM="gnucash" -VERSION="4.11" +VERSION="5.4" HOMEPAGE="https://www.gnucash.org/" -DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-4.11.tar.bz2" -MD5SUM="e6ea5e80ea27f09115439fab881a0ad5" +DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-5.4.tar.bz2" +MD5SUM="d0d850eefe8a54e28a57ac37984158c0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="webkit2gtk gtest" diff --git a/office/gnumeric/gnumeric.SlackBuild b/office/gnumeric/gnumeric.SlackBuild index 8bcfa5691c..0ca64cb5e9 100644 --- a/office/gnumeric/gnumeric.SlackBuild +++ b/office/gnumeric/gnumeric.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for gnumeric # Copyright 2010-2021 Robby Workman, Tuscaloosa, Alabama, USA -# Copyright 2023 Jim Diamond, Dartmouth, Nova Scotia, Canada +# Copyright 2023-24 Jim Diamond, Dartmouth, Nova Scotia, Canada # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gnumeric -VERSION=${VERSION:-1.12.56} +VERSION=${VERSION:-1.12.57} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -54,7 +54,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then +if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then diff --git a/office/gnumeric/gnumeric.info b/office/gnumeric/gnumeric.info index b8de66e8f2..f1ac6550e7 100644 --- a/office/gnumeric/gnumeric.info +++ b/office/gnumeric/gnumeric.info @@ -1,8 +1,8 @@ PRGNAM="gnumeric" -VERSION="1.12.56" +VERSION="1.12.57" HOMEPAGE="https://projects.gnome.org/gnumeric/" -DOWNLOAD="https://download.gnome.org/sources/gnumeric/1.12/gnumeric-1.12.56.tar.xz" -MD5SUM="8d5b6928173797043e0a0aceeb2ceb78" +DOWNLOAD="https://download.gnome.org/sources/gnumeric/1.12/gnumeric-1.12.57.tar.xz" +MD5SUM="237ce4f6c43661892e802bf81dbff1b2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="goffice" diff --git a/office/impressive/impressive.SlackBuild b/office/impressive/impressive.SlackBuild index 010bc29fc6..68f650bd6c 100644 --- a/office/impressive/impressive.SlackBuild +++ b/office/impressive/impressive.SlackBuild @@ -33,7 +33,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=impressive -VERSION=${VERSION:-0.13.0_beta2+20220110_r312} +SRCNAM=Impressive +VERSION=${VERSION:-0.13.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -54,9 +55,9 @@ set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -64,14 +65,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -make sed -i '1s/python/python3/' $PRGNAM.py install -D -m 0755 $PRGNAM.py $PKG/usr/bin/$PRGNAM mkdir -p $PKG/usr/man/man1 gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a site/$PRGNAM.html demo.pdf *.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $PRGNAM.html demo.pdf *.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/impressive/impressive.info b/office/impressive/impressive.info index 56932479d7..01b850cb9a 100644 --- a/office/impressive/impressive.info +++ b/office/impressive/impressive.info @@ -1,8 +1,8 @@ PRGNAM="impressive" -VERSION="0.13.0_beta2+20220110_r312" +VERSION="0.13.2" HOMEPAGE="http://impressive.sourceforge.net/" -DOWNLOAD="https://slackware.uk/~urchlay/src/impressive-0.13.0_beta2+20220110_r312.tar.xz" -MD5SUM="744b4a9edf9d976f2b3caf4d800a8f0c" +DOWNLOAD="https://sourceforge.net/projects/impressive/files/Impressive/0.13.2/Impressive-0.13.2.tar.gz" +MD5SUM="a43e8caf452dff48f42aba05c8aa9ef7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-pygame" diff --git a/office/keepassxc/keepassxc.SlackBuild b/office/keepassxc/keepassxc.SlackBuild index 2696a9d0f2..35064438a3 100644 --- a/office/keepassxc/keepassxc.SlackBuild +++ b/office/keepassxc/keepassxc.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=keepassxc -VERSION=${VERSION:-2.7.7} +VERSION=${VERSION:-2.7.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/office/keepassxc/keepassxc.info b/office/keepassxc/keepassxc.info index 5a00650679..be8700287d 100644 --- a/office/keepassxc/keepassxc.info +++ b/office/keepassxc/keepassxc.info @@ -1,8 +1,8 @@ PRGNAM="keepassxc" -VERSION="2.7.7" +VERSION="2.7.8" HOMEPAGE="https://github.com/keepassxreboot/keepassxc" -DOWNLOAD="https://github.com/keepassxreboot/keepassxc/releases/download/2.7.7/keepassxc-2.7.7-src.tar.xz" -MD5SUM="3d877de7149ab18c0a95fc86b295064f" +DOWNLOAD="https://github.com/keepassxreboot/keepassxc/releases/download/2.7.8/keepassxc-2.7.8-src.tar.xz" +MD5SUM="5bf705a6277e17b162a4ad2a8fd60dbf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="Botan libminizip" diff --git a/office/krop/krop.SlackBuild b/office/krop/krop.SlackBuild index b768e7ec12..44d0c56cb5 100644 --- a/office/krop/krop.SlackBuild +++ b/office/krop/krop.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for krop -# Copyright 2018-2023, Alexander Verbovetsky, Moscow, Russia +# Copyright 2018-2024, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/office/krop/krop.info b/office/krop/krop.info index 0410cf1288..bd03c0a489 100644 --- a/office/krop/krop.info +++ b/office/krop/krop.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/arminstraub/krop/archive/e96d42b/krop-e96d42b2f1ab4 MD5SUM="9ddb0caa00585882e4d3b081bf5b3b4f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="%README% python-poppler-qt5 python3-PyPDF2" +REQUIRES="%README% python-poppler-qt5 python3-pypdf" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org" diff --git a/office/libreoffice-helppack/libreoffice-helppack.SlackBuild b/office/libreoffice-helppack/libreoffice-helppack.SlackBuild index 1152e6eb05..1df7d8669b 100644 --- a/office/libreoffice-helppack/libreoffice-helppack.SlackBuild +++ b/office/libreoffice-helppack/libreoffice-helppack.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libreoffice-helppack -VERSION=${VERSION:-"24.2.2"} +VERSION=${VERSION:-"24.2.3"} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/office/libreoffice-helppack/libreoffice-helppack.info b/office/libreoffice-helppack/libreoffice-helppack.info index e51c799a13..7f16a18ec0 100644 --- a/office/libreoffice-helppack/libreoffice-helppack.info +++ b/office/libreoffice-helppack/libreoffice-helppack.info @@ -1,10 +1,10 @@ PRGNAM="libreoffice-helppack" -VERSION="24.2.2" +VERSION="24.2.3" HOMEPAGE="https://www.libreoffice.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/24.2.2/rpm/x86_64/LibreOffice_24.2.2_Linux_x86-64_rpm_helppack_en-US.tar.gz" -MD5SUM_x86_64="51b02247337c97a95fa873e52a75a991" +DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/24.2.3/rpm/x86_64/LibreOffice_24.2.3_Linux_x86-64_rpm_helppack_en-US.tar.gz" +MD5SUM_x86_64="c43c97ae9070404aae545e910657606d" REQUIRES="libreoffice" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/office/libreoffice-langpack/libreoffice-langpack.SlackBuild b/office/libreoffice-langpack/libreoffice-langpack.SlackBuild index 5c8cd5a3d1..7a99cccf53 100644 --- a/office/libreoffice-langpack/libreoffice-langpack.SlackBuild +++ b/office/libreoffice-langpack/libreoffice-langpack.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libreoffice-langpack -VERSION=${VERSION:-"24.2.2"} +VERSION=${VERSION:-"24.2.3"} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/office/libreoffice-langpack/libreoffice-langpack.info b/office/libreoffice-langpack/libreoffice-langpack.info index 2149b7fe31..4d7a4f7493 100644 --- a/office/libreoffice-langpack/libreoffice-langpack.info +++ b/office/libreoffice-langpack/libreoffice-langpack.info @@ -1,10 +1,10 @@ PRGNAM="libreoffice-langpack" -VERSION="24.2.2" +VERSION="24.2.3" HOMEPAGE="https://www.libreoffice.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/24.2.2/rpm/x86_64/LibreOffice_24.2.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz" -MD5SUM_x86_64="15008149a534cc5340fc1ed2b3c820ae" +DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/24.2.3/rpm/x86_64/LibreOffice_24.2.3_Linux_x86-64_rpm_langpack_en-GB.tar.gz" +MD5SUM_x86_64="4a1fcfeb971e1d0bb266c6eb02f5ef64" REQUIRES="libreoffice" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/office/libreoffice/libreoffice.SlackBuild b/office/libreoffice/libreoffice.SlackBuild index 82137b0e3c..747823e610 100644 --- a/office/libreoffice/libreoffice.SlackBuild +++ b/office/libreoffice/libreoffice.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libreoffice -VERSION=${VERSION:-"24.2.2"} +VERSION=${VERSION:-"24.2.3"} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/office/libreoffice/libreoffice.info b/office/libreoffice/libreoffice.info index 6482c0a1aa..c31c235b28 100644 --- a/office/libreoffice/libreoffice.info +++ b/office/libreoffice/libreoffice.info @@ -1,10 +1,10 @@ PRGNAM="libreoffice" -VERSION="24.2.2" +VERSION="24.2.3" HOMEPAGE="https://www.libreoffice.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/24.2.2/rpm/x86_64/LibreOffice_24.2.2_Linux_x86-64_rpm.tar.gz" -MD5SUM_x86_64="cde06aceac2f7eed5b5761a30a072444" +DOWNLOAD_x86_64="https://download.documentfoundation.org/libreoffice/stable/24.2.3/rpm/x86_64/LibreOffice_24.2.3_Linux_x86-64_rpm.tar.gz" +MD5SUM_x86_64="8970eb3fc932ee7779230f97f89f7222" REQUIRES="zulu-openjdk8 avahi" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/office/lotus123/lotus123.info b/office/lotus123/lotus123.info index 1a8158789d..1069e16b2e 100644 --- a/office/lotus123/lotus123.info +++ b/office/lotus123/lotus123.info @@ -15,7 +15,7 @@ MD5SUM="c1d56afbf72353cfc8b1e478dbbb5bb2 \ 1752432abf4951589386db4f8ace4c92 \ 0965e866b299af5046ec7973e7157211 \ 6e39cad1bb414add02b5b1169c18fdc5" -DOWNLOAD_x86_64="" +DOWNLOAD_x86_64="UNSUPPORTED" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="B. Watson" diff --git a/office/neoleo/neoleo.SlackBuild b/office/neoleo/neoleo.SlackBuild index c8d46d20f8..e9fc6e8a77 100644 --- a/office/neoleo/neoleo.SlackBuild +++ b/office/neoleo/neoleo.SlackBuild @@ -80,6 +80,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i '6i #include <cstdint>' src/neotypes.h + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/office/pandoc-bin/pandoc-bin.SlackBuild b/office/pandoc-bin/pandoc-bin.SlackBuild index 5da85c5178..fa402421ae 100644 --- a/office/pandoc-bin/pandoc-bin.SlackBuild +++ b/office/pandoc-bin/pandoc-bin.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pandoc-bin SRCNAM=pandoc -VERSION=${VERSION:-3.1.13} +VERSION=${VERSION:-3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/office/pandoc-bin/pandoc-bin.info b/office/pandoc-bin/pandoc-bin.info index 3d9e21169f..f0b563b4dc 100644 --- a/office/pandoc-bin/pandoc-bin.info +++ b/office/pandoc-bin/pandoc-bin.info @@ -1,10 +1,10 @@ PRGNAM="pandoc-bin" -VERSION="3.1.13" +VERSION="3.2" HOMEPAGE="https://github.com/jgm/pandoc" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/jgm/pandoc/releases/download/3.1.13/pandoc-3.1.13-1-amd64.deb" -MD5SUM_x86_64="594bf5d14291fe14fa759fa0944f96a5" +DOWNLOAD_x86_64="https://github.com/jgm/pandoc/releases/download/3.2/pandoc-3.2-1-amd64.deb" +MD5SUM_x86_64="62512e0c23bc340a0d151a2c3f488ff4" REQUIRES="" MAINTAINER="Andrew Payne" EMAIL="phalange@komputermatrix.com" diff --git a/office/qpdfview/qpdfview.SlackBuild b/office/qpdfview/qpdfview.SlackBuild index 4e16cd0dc8..ddf9c860da 100644 --- a/office/qpdfview/qpdfview.SlackBuild +++ b/office/qpdfview/qpdfview.SlackBuild @@ -63,6 +63,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + +sed -i 's|c++11|c++17|' qpdfview.pri + # Add localizations lrelease-qt5 qpdfview.pro diff --git a/office/scribus/scribus-1.6.1-poppler-24.03.patch b/office/scribus/scribus-1.6.1-poppler-24.03.patch new file mode 100644 index 0000000000..076e48e14f --- /dev/null +++ b/office/scribus/scribus-1.6.1-poppler-24.03.patch @@ -0,0 +1,70 @@ +From dc2470990ab73c87fdd60068c99518ced01a3edd Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 4 Mar 2024 17:35:11 +0100 +Subject: [PATCH] Fix build with >=poppler-24.03.0 + +Fixes build errors caused by: + +"Use an enum for Function getType" +Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + scribus/plugins/import/pdf/slaoutput.cpp | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 4e31e4b6c..3e4a768ec 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + VGradient FillGradient = VGradient(VGradient::linear);
+ FillGradient.clearStops();
+ GfxColorSpace *color_space = shading->getColorSpace();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ if (func->getType() == Function::Type::Stitching)
++#else
+ if (func->getType() == 3)
++#endif
+ {
+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
+ const double *bounds = stitchingFunc->getBounds();
+@@ -1753,7 +1757,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );
+ }
+ }
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))
++#else
+ else if ((func->getType() == 2) || (func->getType() == 0))
++#endif
+ {
+ GfxColor stop1;
+ shading->getColor(0.0, &stop1);
+@@ -1865,7 +1873,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, + VGradient FillGradient = VGradient(VGradient::linear);
+ FillGradient.clearStops();
+ GfxColorSpace *color_space = shading->getColorSpace();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ if (func->getType() == Function::Type::Stitching)
++#else
+ if (func->getType() == 3)
++#endif
+ {
+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
+ const double *bounds = stitchingFunc->getBounds();
+@@ -1887,7 +1899,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, + FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );
+ }
+ }
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))
++#else
+ else if ((func->getType() == 2) || (func->getType() == 0))
++#endif
+ {
+ GfxColor stop1;
+ shading->getColor(0.0, &stop1);
+-- +2.44.0 + diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild index c7e17f62e8..c816bbf48f 100644 --- a/office/scribus/scribus.SlackBuild +++ b/office/scribus/scribus.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for scribus # Copyright 2006 Martin Lefebvre <dadexter@gmail.com> -# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2024 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=scribus -VERSION=${VERSION:-1.5.7} +VERSION=${VERSION:-1.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -68,6 +68,8 @@ else LIBDIRSUFFIX="" fi +if pkg-config --exists libpodofo ; then PODOFO="On" ; else PODOFO="Off" ; fi + set -e rm -rf $PKG @@ -83,13 +85,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# thanks archlinux! -patch -p1 < $CWD/harfbuzz-3.0.0.patch +patch -p1 < $CWD/scribus-1.6.1-poppler-24.03.patch cmake \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DWANT_CPP17=1 \ + -DWITH_PODOFO=$PODOFO \ -DLIB_SUFFIX=${LIBDIRSUFFIX} make diff --git a/office/scribus/scribus.info b/office/scribus/scribus.info index f1b56cd8de..d076f887a5 100644 --- a/office/scribus/scribus.info +++ b/office/scribus/scribus.info @@ -1,8 +1,8 @@ PRGNAM="scribus" -VERSION="1.5.7" +VERSION="1.6.1" HOMEPAGE="https://www.scribus.net" -DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.5.7.tar.xz" -MD5SUM="4d0c63cfdade8a9abf225a4415e43694" +DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.6.1.tar.xz" +MD5SUM="3fa27801c225e5fdf6920af1d0a1a12d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/semantik/changelog b/office/semantik/changelog index d26fd537cc..f83eda4399 100644 --- a/office/semantik/changelog +++ b/office/semantik/changelog @@ -8,3 +8,7 @@ Added to SlackBuilds.org 15/05/2023: Updated to Version 1.2.10 + +23/04/2024: + +Updated to Version 1.2.11 diff --git a/office/semantik/semantik.SlackBuild b/office/semantik/semantik.SlackBuild index 46409d1bda..67f9094952 100644 --- a/office/semantik/semantik.SlackBuild +++ b/office/semantik/semantik.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for semantik -# Copyright 2022-2023 Vijay Marcel +# Copyright 2022-2024 Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=semantik -VERSION=${VERSION:-1.2.10} +VERSION=${VERSION:-1.2.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/office/semantik/semantik.info b/office/semantik/semantik.info index 2cfa9b3465..0d1c241a39 100644 --- a/office/semantik/semantik.info +++ b/office/semantik/semantik.info @@ -1,8 +1,8 @@ PRGNAM="semantik" -VERSION="1.2.10" +VERSION="1.2.11" HOMEPAGE="https://waf.io/semantik.html" -DOWNLOAD="https://waf.io/semantik-1.2.10.tar.bz2" -MD5SUM="aeabd57ce02b68cb1182a649e8f41924" +DOWNLOAD="https://waf.io/semantik-1.2.11.tar.bz2" +MD5SUM="adc209b898ee63ba8531f6f223acd383" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/xtrkcad/slack-desc b/office/xtrkcad/slack-desc index 0d5c1a3b59..d6ce431c39 100644 --- a/office/xtrkcad/slack-desc +++ b/office/xtrkcad/slack-desc @@ -15,5 +15,5 @@ xtrkcad: is easy with the built-in editor. xtrkcad: xtrkcad: The website is located at http://www.xtrkcad.org and files at xtrkcad: http://sourceforge.net/projects/xtrkcad-fork -xtrkcad: Also check the Yahoo! Group [XtrkCAD]. +xtrkcad: Also check the groups.io-group https://xtrackcad.groups.io. xtrkcad: Note the spelling and CamelCase are inconsistent throughout the app. diff --git a/office/xtrkcad/xtrkcad.SlackBuild b/office/xtrkcad/xtrkcad.SlackBuild index 33804d3c70..c0f98a282b 100644 --- a/office/xtrkcad/xtrkcad.SlackBuild +++ b/office/xtrkcad/xtrkcad.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xtrkcad -# Copyright 2013-2022 Heiko Rosemann Germany +# Copyright 2013-2024 Heiko Rosemann Germany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xtrkcad -VERSION=${VERSION:-5.2.2GA} +VERSION=${VERSION:-5.3.0GA} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -53,16 +53,12 @@ SRCNAM=${PRGNAM}-source-$VERSION if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e @@ -80,6 +76,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Remove libzip.a bundled with xtrkcad to make cmake find the system version +# Required for supporting platforms other than x86_64 +rm -rf app/tools/lib + mkdir -p build cd build cmake \ @@ -89,7 +89,8 @@ cd build -DCMAKE_BUILD_TYPE=Release \ -DXTRKCAD_USE_GETTEXT=ON \ -DXTRKCAD_USE_GTK=ON .. - make + # Remove DBUS access from make to avoid parallel inkscape crashing + DBUS_SESSION_BUS_ADDRESS="" make make install DESTDIR=$PKG cd .. diff --git a/office/xtrkcad/xtrkcad.info b/office/xtrkcad/xtrkcad.info index 24b3c50293..e3ef590bc9 100644 --- a/office/xtrkcad/xtrkcad.info +++ b/office/xtrkcad/xtrkcad.info @@ -1,10 +1,10 @@ PRGNAM="xtrkcad" -VERSION="5.2.2GA" +VERSION="5.3.0GA" HOMEPAGE="http://www.xtrkcad.org" -DOWNLOAD="http://sourceforge.net/projects/xtrkcad-fork/files/XTrackCad/Version%205.2.2/xtrkcad-source-5.2.2GA.tar.gz" -MD5SUM="a91da56b9e509eab1ceab0b8fee92b2f" +DOWNLOAD="http://sourceforge.net/projects/xtrkcad-fork/files/XTrackCad/Version%205.3.0/xtrkcad-source-5.3.0GA.tar.gz" +MD5SUM="d9ea03fcd396a3ff7d1592abd98c3aa3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="FreeImage inkscape" MAINTAINER="Heiko Rosemann" EMAIL="heiko.rosemann@web.de" diff --git a/perl/mod_perl/mod_perl.SlackBuild b/perl/mod_perl/mod_perl.SlackBuild index d197c0b49d..5a5fde9d5a 100644 --- a/perl/mod_perl/mod_perl.SlackBuild +++ b/perl/mod_perl/mod_perl.SlackBuild @@ -77,6 +77,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks to msantinho @ LQ! +patch -p0 < $CWD/r1910623.patch + # Thanks to ARCH Linux sed -i -e '1098,1102d' Apache-Test/lib/Apache/TestRun.pm sed -i '51,56c push @INC, "xs/tables/current24";' lib/ModPerl/MapUtil.pm diff --git a/perl/mod_perl/r1910623.patch b/perl/mod_perl/r1910623.patch new file mode 100644 index 0000000000..a6939c54ec --- /dev/null +++ b/perl/mod_perl/r1910623.patch @@ -0,0 +1,23 @@ +Author: stevehay +Date: Tue Jun 27 08:38:15 2023 +New Revision: 1910623 + +Stop using do_open9() - this deprecated function was removed in 5.37.1 + +Patch by Jitka Plesnikova <jp...@redhat.com> from https://rt.cpan.org/Ticket/Display.html?id=148451 + +Index: src/modules/perl/modperl_io.c +=================================================================== +--- src/modules/perl/modperl_io.c (revision 1910622) ++++ src/modules/perl/modperl_io.c (revision 1910623) +@@ -116,8 +116,8 @@ + save_gp(handle, 1); + + sv_setref_pv(sv, "Apache2::RequestRec", (void*)r); +- status = do_open9(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2", +- 9, FALSE, mode, 0, (PerlIO *)NULL, sv, 1); ++ status = do_openn(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2", ++ 9, FALSE, mode, 0, (PerlIO *)NULL, &sv, 1); + if (status == 0) { + Perl_croak(aTHX_ "Failed to open STD%s: %" SVf, + mode == O_RDONLY ? "IN" : "OUT", get_sv("!", TRUE)); diff --git a/perl/perl-CPAN-Requirements-Dynamic/README b/perl/perl-CPAN-Requirements-Dynamic/README new file mode 100644 index 0000000000..4e35ef9fea --- /dev/null +++ b/perl/perl-CPAN-Requirements-Dynamic/README @@ -0,0 +1,2 @@ +This module implements a format for describing dynamic prerequisites +of a distribution. diff --git a/perl/perl-Locale-Msgfmt/perl-Locale-Msgfmt.SlackBuild b/perl/perl-CPAN-Requirements-Dynamic/perl-CPAN-Requirements-Dynamic.SlackBuild index 647543dde1..888c0e4be1 100644 --- a/perl/perl-Locale-Msgfmt/perl-Locale-Msgfmt.SlackBuild +++ b/perl/perl-CPAN-Requirements-Dynamic/perl-CPAN-Requirements-Dynamic.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for perl-Locale-Msgfmt +# Slackware build script for perl-CPAN-Requirements-Dynamic -# Copyright 2018 Nikos Giotis <nikos.giotis@gmail.com>, Athens, GR +# Copyright 2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=perl-Locale-Msgfmt -VERSION=${VERSION:-0.15} +PRGNAM=perl-CPAN-Requirements-Dynamic +VERSION=${VERSION:-0.001} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -52,20 +49,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG @@ -93,17 +76,13 @@ make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true -find $PKG -depth -type d -empty -delete || true +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - Changes README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README Changes LICENSE MANIFEST $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/perl/perl-CPAN-Requirements-Dynamic/perl-CPAN-Requirements-Dynamic.info b/perl/perl-CPAN-Requirements-Dynamic/perl-CPAN-Requirements-Dynamic.info new file mode 100644 index 0000000000..98b2287eee --- /dev/null +++ b/perl/perl-CPAN-Requirements-Dynamic/perl-CPAN-Requirements-Dynamic.info @@ -0,0 +1,10 @@ +PRGNAM="perl-CPAN-Requirements-Dynamic" +VERSION="0.001" +HOMEPAGE="https://metacpan.org/pod/CPAN::Requirements::Dynamic" +DOWNLOAD="https://cpan.metacpan.org/authors/id/L/LE/LEONT/CPAN-Requirements-Dynamic-0.001.tar.gz" +MD5SUM="be6da67ff17d2b0887f03e0d9cbf873c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="perl-ExtUtils-Config perl-Meta-Requirements-Range" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" diff --git a/perl/perl-CPAN-Requirements-Dynamic/slack-desc b/perl/perl-CPAN-Requirements-Dynamic/slack-desc new file mode 100644 index 0000000000..9f7bfb09ca --- /dev/null +++ b/perl/perl-CPAN-Requirements-Dynamic/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +perl-CPAN-Requirements-Dynamic: perl-CPAN-Requirements-Dynamic (Dynamic prerequisites in meta files) +perl-CPAN-Requirements-Dynamic: +perl-CPAN-Requirements-Dynamic: This module implements a format for describing dynamic prerequisites +perl-CPAN-Requirements-Dynamic: of a distribution. +perl-CPAN-Requirements-Dynamic: +perl-CPAN-Requirements-Dynamic: +perl-CPAN-Requirements-Dynamic: Project URL: https://metacpan.org/pod/CPAN::Requirements::Dynamic +perl-CPAN-Requirements-Dynamic: +perl-CPAN-Requirements-Dynamic: +perl-CPAN-Requirements-Dynamic: +perl-CPAN-Requirements-Dynamic: diff --git a/perl/perl-ExtUtils-Config/perl-ExtUtils-Config.SlackBuild b/perl/perl-ExtUtils-Config/perl-ExtUtils-Config.SlackBuild index 122fa97d39..09a461a300 100644 --- a/perl/perl-ExtUtils-Config/perl-ExtUtils-Config.SlackBuild +++ b/perl/perl-ExtUtils-Config/perl-ExtUtils-Config.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for perl-ExtUtils-Config -# Copyright 2013-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2013-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-ExtUtils-Config -VERSION=${VERSION:-0.008} +VERSION=${VERSION:-0.009} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/perl/perl-ExtUtils-Config/perl-ExtUtils-Config.info b/perl/perl-ExtUtils-Config/perl-ExtUtils-Config.info index a2a7f19e1f..38746ea4c5 100644 --- a/perl/perl-ExtUtils-Config/perl-ExtUtils-Config.info +++ b/perl/perl-ExtUtils-Config/perl-ExtUtils-Config.info @@ -1,10 +1,10 @@ PRGNAM="perl-ExtUtils-Config" -VERSION="0.008" +VERSION="0.009" HOMEPAGE="https://metacpan.org/pod/ExtUtils::Config" -DOWNLOAD="http://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-Config-0.008.tar.gz" -MD5SUM="565a7b09c7cac5907a25bbe2c959a717" +DOWNLOAD="http://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-Config-0.009.tar.gz" +MD5SUM="4333113089815c2aa92573b151bb43cb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="perl-Test-Harness" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.SlackBuild b/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.SlackBuild index ec5ab5a341..e25be3abc9 100644 --- a/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.SlackBuild +++ b/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for perl-ExtUtils-InstallPaths -# Copyright 2013-2018 Willy Sudiarto Raharjo <willysr@slackware-id.org> +# Copyright 2013-2024 Willy Sudiarto Raharjo <willysr@slackware-id.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-ExtUtils-InstallPaths -VERSION=${VERSION:-0.012} +VERSION=${VERSION:-0.013} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.info b/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.info index e05a843b2b..b4a252881b 100644 --- a/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.info +++ b/perl/perl-ExtUtils-InstallPaths/perl-ExtUtils-InstallPaths.info @@ -1,8 +1,8 @@ PRGNAM="perl-ExtUtils-InstallPaths" -VERSION="0.012" +VERSION="0.013" HOMEPAGE="https://metacpan.org/pod/ExtUtils::InstallPaths" -DOWNLOAD="https://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.012.tar.gz" -MD5SUM="9a8d66aab1ffec98ea260faf03ac612b" +DOWNLOAD="https://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.013.tar.gz" +MD5SUM="84d9af4ab9c2d5211681122bcc6e67a3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-ExtUtils-Config" diff --git a/perl/perl-IO-Tty/README b/perl/perl-IO-Tty/README deleted file mode 100644 index 36d395c6c8..0000000000 --- a/perl/perl-IO-Tty/README +++ /dev/null @@ -1,10 +0,0 @@ -perl-IO-Tty (Pseudo TTY object class) - -IO::Tty - Perl extension that provides an interface to allow the -creation of a pseudo tty. - -IO::Tty is used internally by IO::Pty to create a pseudo-tty. Do not -use it directly except to import constants, use IO::Pty. - -IO::Pty inherits from IO::Handle and so provides all the methods -defined by the IO::Handle package. diff --git a/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild b/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild deleted file mode 100644 index e76776bcfb..0000000000 --- a/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -# Slackware build script for perl-IO-Tty - -# Written by ruario - -# Original version of this script had no license. B. Watson's -# modified version is licensed under the WTFPL. See -# http://www.wtfpl.net/txt/copying/ for details. - -# 20230224 bkw: -# - new maintainer. -# - update for v1.17. -# - add license. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=perl-IO-Tty -VERSION=${VERSION:-1.17} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -SRCNAM="$(printf $PRGNAM | cut -d- -f2-)" - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -perl Makefile.PL \ - PREFIX=/usr \ - INSTALLDIRS=vendor \ - INSTALLVENDORMAN3DIR=/usr/man/man3 -make -strip blib/arch/auto/IO/Tty/Tty.so -make test -make install DESTDIR=$PKG -gzip $PKG/usr/man/man*/* - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true - -find $PKG -depth -type d -empty -delete || true - -PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKGDOC -cp -a ChangeLog README* $PKGDOC -cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/perl/perl-IO-Tty/perl-IO-Tty.info b/perl/perl-IO-Tty/perl-IO-Tty.info deleted file mode 100644 index 6968d97353..0000000000 --- a/perl/perl-IO-Tty/perl-IO-Tty.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="perl-IO-Tty" -VERSION="1.17" -HOMEPAGE="https://metacpan.org/pod/IO::Tty" -DOWNLOAD="https://cpan.metacpan.org/authors/id/T/TO/TODDR/IO-Tty-1.17.tar.gz" -MD5SUM="e4cd744de6a686ca78b20002fc66062a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/perl/perl-IO-Tty/slack-desc b/perl/perl-IO-Tty/slack-desc deleted file mode 100644 index 191c529789..0000000000 --- a/perl/perl-IO-Tty/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -perl-IO-Tty: perl-IO-Tty (Pseudo TTY object class) -perl-IO-Tty: -perl-IO-Tty: Perl extension that provides an interface to allow the creation of a -perl-IO-Tty: pseudo tty. -perl-IO-Tty: -perl-IO-Tty: -perl-IO-Tty: -perl-IO-Tty: -perl-IO-Tty: -perl-IO-Tty: -perl-IO-Tty: diff --git a/perl/perl-Locale-Codes/perl-Locale-Codes.SlackBuild b/perl/perl-Locale-Codes/perl-Locale-Codes.SlackBuild index ff588325b8..a6a7213610 100644 --- a/perl/perl-Locale-Codes/perl-Locale-Codes.SlackBuild +++ b/perl/perl-Locale-Codes/perl-Locale-Codes.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-Locale-Codes -VERSION=${VERSION:-3.70} +VERSION=${VERSION:-3.78} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/perl/perl-Locale-Codes/perl-Locale-Codes.info b/perl/perl-Locale-Codes/perl-Locale-Codes.info index b3edafbed0..51402ecaf8 100644 --- a/perl/perl-Locale-Codes/perl-Locale-Codes.info +++ b/perl/perl-Locale-Codes/perl-Locale-Codes.info @@ -1,8 +1,8 @@ PRGNAM="perl-Locale-Codes" -VERSION="3.70" +VERSION="3.78" HOMEPAGE="https://metacpan.org/pod/Locale::Codes" -DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SB/SBECK/Locale-Codes-3.70.tar.gz" -MD5SUM="6e79c77d7c82f00cda3d0137c24fb798" +DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SB/SBECK/Locale-Codes-3.78.tar.gz" +MD5SUM="899cd9b8a9188bad93763ff0aa5ff5ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-Test-Inter" diff --git a/perl/perl-Locale-Msgfmt/README b/perl/perl-Locale-Msgfmt/README deleted file mode 100644 index 854d640c47..0000000000 --- a/perl/perl-Locale-Msgfmt/README +++ /dev/null @@ -1,9 +0,0 @@ -perl-Locale-Msgfmt - -Locale::Msgfmt - Compile .po files to .mo files - -This module does the same thing as msgfmt from GNU gettext-tools, -except this is pure Perl. The interface is best explained through -examples here: - -https://metacpan.org/source/AZAWAWI/Locale-Msgfmt-0.15/lib/Locale/Msgfmt.pm diff --git a/perl/perl-Locale-Msgfmt/perl-Locale-Msgfmt.info b/perl/perl-Locale-Msgfmt/perl-Locale-Msgfmt.info deleted file mode 100644 index 9e2de3c0dd..0000000000 --- a/perl/perl-Locale-Msgfmt/perl-Locale-Msgfmt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="perl-Locale-Msgfmt" -VERSION="0.15" -HOMEPAGE="https://metacpan.org/pod/Locale::Msgfmt" -DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AZ/AZAWAWI/Locale-Msgfmt-0.15.tar.gz" -MD5SUM="7e6fde43db034f765f3a425dfa1dd4d8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="perl-Module-Install" -MAINTAINER="Nikos Giotis" -EMAIL="nikos.giotis@gmail.com" diff --git a/perl/perl-Locale-Msgfmt/slack-desc b/perl/perl-Locale-Msgfmt/slack-desc deleted file mode 100644 index 245da7a8fd..0000000000 --- a/perl/perl-Locale-Msgfmt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -perl-Locale-Msgfmt: perl-Locale-Msgfmt (Compile .po files to .mo files) -perl-Locale-Msgfmt: -perl-Locale-Msgfmt: Locale::Msgfmt is a pure Perl reimplementation of msgfmt from GNU -perl-Locale-Msgfmt: gettext-tools. -perl-Locale-Msgfmt: -perl-Locale-Msgfmt: Homepage: https://metacpan.org/pod/Locale::Msgfmt -perl-Locale-Msgfmt: -perl-Locale-Msgfmt: -perl-Locale-Msgfmt: -perl-Locale-Msgfmt: -perl-Locale-Msgfmt: diff --git a/perl/perl-Meta-Requirements-Range/README b/perl/perl-Meta-Requirements-Range/README new file mode 100644 index 0000000000..0cd7d22c40 --- /dev/null +++ b/perl/perl-Meta-Requirements-Range/README @@ -0,0 +1,4 @@ +A CPAN::Meta::Requirements::Range object models a set of version +constraints like those specified in the META.yml or META.json files +in CPAN distributions, and as defined by CPAN::Meta::Spec; +representation. diff --git a/perl/perl-Test-Script/perl-Test-Script.SlackBuild b/perl/perl-Meta-Requirements-Range/perl-Meta-Requirements-Range.SlackBuild index feed1d477e..8f12d1df79 100644 --- a/perl/perl-Test-Script/perl-Test-Script.SlackBuild +++ b/perl/perl-Meta-Requirements-Range/perl-Meta-Requirements-Range.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for Test-Script +# Slackware build script for perl-Meta-Requirements-Dynamic -# Copyright 2011 Mikko Värri, Finland +# Copyright 2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,14 +24,13 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=perl-Test-Script -VERSION=${VERSION:-1.07} +PRGNAM=perl-Meta-Requirements-Range +SRCNAM=CPAN-Meta-Requirements +VERSION=${VERSION:-2.143} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -SRCNAM="$( echo $PRGNAM | cut -d- -f2- )" - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -40,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -62,28 +58,30 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; perl Makefile.PL \ PREFIX=/usr \ INSTALLDIRS=vendor \ + INSTALLVENDORMAN1DIR=/usr/man/man1 \ INSTALLVENDORMAN3DIR=/usr/man/man3 make make test make install DESTDIR=$PKG +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true -find $PKG -depth -type d -empty -delete || true - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Changes LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README Changes LICENSE MANIFEST $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/perl/perl-Meta-Requirements-Range/perl-Meta-Requirements-Range.info b/perl/perl-Meta-Requirements-Range/perl-Meta-Requirements-Range.info new file mode 100644 index 0000000000..3c9c661f45 --- /dev/null +++ b/perl/perl-Meta-Requirements-Range/perl-Meta-Requirements-Range.info @@ -0,0 +1,10 @@ +PRGNAM="perl-Meta-Requirements-Range" +VERSION="2.143" +HOMEPAGE="https://metacpan.org/pod/CPAN::Meta::Requirements::Range" +DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/CPAN-Meta-Requirements-2.143.tar.gz" +MD5SUM="b26ca50ca6eb04f727876da83b828241" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" diff --git a/perl/perl-Meta-Requirements-Range/slack-desc b/perl/perl-Meta-Requirements-Range/slack-desc new file mode 100644 index 0000000000..8c63690325 --- /dev/null +++ b/perl/perl-Meta-Requirements-Range/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +perl-Meta-Requirements-Range: perl-Meta-Requirements-Range (Version requirements for CPAN Dist) +perl-Meta-Requirements-Range: +perl-Meta-Requirements-Range: A CPAN::Meta::Requirements::Range object models a set of version +perl-Meta-Requirements-Range: constraints like those specified in the META.yml or META.json files +perl-Meta-Requirements-Range: in CPAN distributions, and as defined by CPAN::Meta::Spec; +perl-Meta-Requirements-Range: representation. +perl-Meta-Requirements-Range: +perl-Meta-Requirements-Range: +perl-Meta-Requirements-Range: URL: https://metacpan.org/pod/CPAN::Meta::Requirements::Range +perl-Meta-Requirements-Range: +perl-Meta-Requirements-Range: diff --git a/perl/perl-Module-Build-Tiny/perl-Module-Build-Tiny.SlackBuild b/perl/perl-Module-Build-Tiny/perl-Module-Build-Tiny.SlackBuild index d0a157b7ba..2c2e7eb157 100644 --- a/perl/perl-Module-Build-Tiny/perl-Module-Build-Tiny.SlackBuild +++ b/perl/perl-Module-Build-Tiny/perl-Module-Build-Tiny.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-Module-Build-Tiny -VERSION=${VERSION:-0.047} +VERSION=${VERSION:-0.048} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/perl/perl-Module-Build-Tiny/perl-Module-Build-Tiny.info b/perl/perl-Module-Build-Tiny/perl-Module-Build-Tiny.info index 1453eafff3..148c6cca27 100644 --- a/perl/perl-Module-Build-Tiny/perl-Module-Build-Tiny.info +++ b/perl/perl-Module-Build-Tiny/perl-Module-Build-Tiny.info @@ -1,10 +1,10 @@ PRGNAM="perl-Module-Build-Tiny" -VERSION="0.047" +VERSION="0.048" HOMEPAGE="https://metacpan.org/pod/Module::Build::Tiny" -DOWNLOAD="http://cpan.metacpan.org/authors/id/L/LE/LEONT/Module-Build-Tiny-0.047.tar.gz" -MD5SUM="de9814b3c22825837438fc70adad58ac" +DOWNLOAD="http://cpan.metacpan.org/authors/id/L/LE/LEONT/Module-Build-Tiny-0.048.tar.gz" +MD5SUM="130e952464b3f8d86995392a3cb1314e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="perl-ExtUtils-InstallPaths perl-ExtUtils-Helpers perl-Test-Harness perl-JSON" +REQUIRES="perl-ExtUtils-InstallPaths perl-ExtUtils-Helpers perl-Test-Harness perl-JSON perl-CPAN-Requirements-Dynamic" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/perl/perl-Module-Install/perl-Module-Install.SlackBuild b/perl/perl-Module-Install/perl-Module-Install.SlackBuild index 0e3ae06411..8bef7ddbae 100644 --- a/perl/perl-Module-Install/perl-Module-Install.SlackBuild +++ b/perl/perl-Module-Install/perl-Module-Install.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for perl-Module-Install. # -# Copyright 2020 M.A. Begue mab974@gmail.com +# Copyright 2020 M.A. Begue mab974@misouk.com # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-Module-Install -VERSION=${VERSION:-1.19} +VERSION=${VERSION:-1.21} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -86,6 +86,7 @@ perl Makefile.PL \ INSTALLDIRS=vendor \ INSTALLVENDORMAN3DIR=/usr/man/man3 make +make test make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/perl/perl-Module-Install/perl-Module-Install.info b/perl/perl-Module-Install/perl-Module-Install.info index 7242f629a9..700a418b4a 100644 --- a/perl/perl-Module-Install/perl-Module-Install.info +++ b/perl/perl-Module-Install/perl-Module-Install.info @@ -1,10 +1,10 @@ PRGNAM="perl-Module-Install" -VERSION="1.19" +VERSION="1.21" HOMEPAGE="https://metacpan.org/pod/Module::Install" -DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Module-Install-1.19.tar.gz" -MD5SUM="0d1b78cc13ebf9b9ad008c8928a5b2dd" +DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Module-Install-1.21.tar.gz" +MD5SUM="71a170c4ecc224cb5c8b147830979549" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-YAML-Tiny perl-File-Remove" MAINTAINER="Michel A. BEGUE" -EMAIL="mab974@gmail.com" +EMAIL="mab974@misouk.com" diff --git a/perl/perl-Module-Manifest/perl-Module-Manifest.SlackBuild b/perl/perl-Module-Manifest/perl-Module-Manifest.SlackBuild index 38d572815a..6519146614 100644 --- a/perl/perl-Module-Manifest/perl-Module-Manifest.SlackBuild +++ b/perl/perl-Module-Manifest/perl-Module-Manifest.SlackBuild @@ -7,7 +7,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-Module-Manifest -VERSION=${VERSION:-1.08} +VERSION=${VERSION:-1.09} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/perl/perl-Module-Manifest/perl-Module-Manifest.info b/perl/perl-Module-Manifest/perl-Module-Manifest.info index 4cf3c5dcce..ce620b737f 100644 --- a/perl/perl-Module-Manifest/perl-Module-Manifest.info +++ b/perl/perl-Module-Manifest/perl-Module-Manifest.info @@ -1,8 +1,8 @@ PRGNAM="perl-Module-Manifest" -VERSION="1.08" +VERSION="1.09" HOMEPAGE="https://metacpan.org/release/Module-Manifest" -DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AD/ADAMK/Module-Manifest-1.08.tar.gz" -MD5SUM="90f035a0074c3edcf8f595a38ec90da1" +DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Module-Manifest-1.09.tar.gz" +MD5SUM="71cd43db0ef8d6497b4b0415497453c6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-Params-Util perl-Test-Exception perl-test-warn perl-Module-Install" diff --git a/perl/perl-Mojolicious/perl-Mojolicious.SlackBuild b/perl/perl-Mojolicious/perl-Mojolicious.SlackBuild index dcef0c7cd4..82dd8b953d 100644 --- a/perl/perl-Mojolicious/perl-Mojolicious.SlackBuild +++ b/perl/perl-Mojolicious/perl-Mojolicious.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-Mojolicious -VERSION=${VERSION:-9.35} +VERSION=${VERSION:-9.36} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/perl/perl-Mojolicious/perl-Mojolicious.info b/perl/perl-Mojolicious/perl-Mojolicious.info index 1b6f93e00a..8bf265ac7a 100644 --- a/perl/perl-Mojolicious/perl-Mojolicious.info +++ b/perl/perl-Mojolicious/perl-Mojolicious.info @@ -1,8 +1,8 @@ PRGNAM="perl-Mojolicious" -VERSION="9.35" +VERSION="9.36" HOMEPAGE="https://mojolicious.org/" -DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SR/SRI/Mojolicious-9.35.tar.gz" -MD5SUM="8fba4deae54681d560c275c28803b48c" +DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SR/SRI/Mojolicious-9.36.tar.gz" +MD5SUM="6bc41de3773e35a892ec64f9cb0a2dfd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/perl/perl-Net-DNS-SEC/perl-Net-DNS-SEC.SlackBuild b/perl/perl-Net-DNS-SEC/perl-Net-DNS-SEC.SlackBuild index 5b6692edfb..4dcbd1e587 100644 --- a/perl/perl-Net-DNS-SEC/perl-Net-DNS-SEC.SlackBuild +++ b/perl/perl-Net-DNS-SEC/perl-Net-DNS-SEC.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="perl-Net-DNS-SEC" SRCNAM="Net-DNS-SEC" -VERSION=${VERSION:-1.02} +VERSION=${VERSION:-1.24} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -42,9 +42,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -80,7 +77,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -echo "y" | CFLAGS="$SLKCFLAGS" perl Makefile.PL \ +CFLAGS="$SLKCFLAGS" perl Makefile.PL \ PREFIX=/usr \ INSTALLDIRS=vendor \ INSTALLVENDORMAN3DIR=/usr/man/man3 diff --git a/perl/perl-Net-DNS-SEC/perl-Net-DNS-SEC.info b/perl/perl-Net-DNS-SEC/perl-Net-DNS-SEC.info index 8a4a7db72f..240c039d3f 100644 --- a/perl/perl-Net-DNS-SEC/perl-Net-DNS-SEC.info +++ b/perl/perl-Net-DNS-SEC/perl-Net-DNS-SEC.info @@ -1,8 +1,8 @@ PRGNAM="perl-Net-DNS-SEC" -VERSION="1.02" +VERSION="1.24" HOMEPAGE="https://metacpan.org/pod/Net::DNS::SEC" -DOWNLOAD="https://cpan.metacpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-1.02.tar.gz" -MD5SUM="3d11216697d0fe43e74484b59f94188d" +DOWNLOAD="https://cpan.metacpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-1.24.tar.gz" +MD5SUM="63879e0f104320f63633be7d4b02b851" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-Crypt-OpenSSL-DSA perl-Crypt-OpenSSL-RSA perl-Crypt-OpenSSL-ECDSA perl-Digest-GOST perl-net-dns" diff --git a/perl/perl-PDF-API2/perl-PDF-API2.SlackBuild b/perl/perl-PDF-API2/perl-PDF-API2.SlackBuild index bf2095a64f..4090bcdd05 100644 --- a/perl/perl-PDF-API2/perl-PDF-API2.SlackBuild +++ b/perl/perl-PDF-API2/perl-PDF-API2.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for perl-PDF-API2 -# Copyright 2019 M.A.Begue mab974@gmail.com +# Copyright 2019 M.A.Begue mab974@misouk.com # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-PDF-API2 -VERSION=${VERSION:-2.038} +VERSION=${VERSION:-2.045} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -87,6 +87,7 @@ perl Makefile.PL \ INSTALLVENDORMAN1DIR=/usr/man/man1 \ INSTALLVENDORMAN3DIR=/usr/man/man3 make +make test make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/perl/perl-PDF-API2/perl-PDF-API2.info b/perl/perl-PDF-API2/perl-PDF-API2.info index c54df2e261..66b01b8524 100644 --- a/perl/perl-PDF-API2/perl-PDF-API2.info +++ b/perl/perl-PDF-API2/perl-PDF-API2.info @@ -1,10 +1,10 @@ PRGNAM="perl-PDF-API2" -VERSION="2.038" +VERSION="2.045" HOMEPAGE="https://metacpan.org/pod/PDF::API2" -DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SS/SSIMMS/PDF-API2-2.038.tar.gz" -MD5SUM="2d6683d01b95f554ec5bb2e29f31ff03" +DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SS/SSIMMS/PDF-API2-2.045.tar.gz" +MD5SUM="afe283ab6b1273ed0d129ec1a18cfb8a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="perl-Font-TTF" +REQUIRES="perl-Font-TTF perl-Test-Exception perl-Test-Memory-Cycle" MAINTAINER="Michel A. BEGUE" -EMAIL="mab974@gmail.com" +EMAIL="mab974@misouk.com" diff --git a/perl/perl-SDL/perl-SDL.SlackBuild b/perl/perl-SDL/perl-SDL.SlackBuild index 25abb4f80d..074dee801e 100644 --- a/perl/perl-SDL/perl-SDL.SlackBuild +++ b/perl/perl-SDL/perl-SDL.SlackBuild @@ -80,6 +80,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +export CFLAGS="$SLKCFLAGS -fpermissive" + perl Build.PL \ prefix=/usr \ installdirs=vendor \ diff --git a/perl/perl-SNMP-Info/perl-SNMP-Info.SlackBuild b/perl/perl-SNMP-Info/perl-SNMP-Info.SlackBuild index 29f113ec91..9289fbe653 100644 --- a/perl/perl-SNMP-Info/perl-SNMP-Info.SlackBuild +++ b/perl/perl-SNMP-Info/perl-SNMP-Info.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for perl-SNMP-Info -# Copyright 2013-2023, Thibaut Notteboom, Paris, FRANCE +# Copyright 2013-2024, Thibaut Notteboom, Paris, FRANCE # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-SNMP-Info -VERSION=${VERSION:-3.95} +VERSION=${VERSION:-3.970001} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/perl/perl-SNMP-Info/perl-SNMP-Info.info b/perl/perl-SNMP-Info/perl-SNMP-Info.info index 21ca5dcdf5..fb0016a322 100644 --- a/perl/perl-SNMP-Info/perl-SNMP-Info.info +++ b/perl/perl-SNMP-Info/perl-SNMP-Info.info @@ -1,10 +1,10 @@ PRGNAM="perl-SNMP-Info" -VERSION="3.95" +VERSION="3.970001" HOMEPAGE="https://metacpan.org/release/SNMP-Info" -DOWNLOAD="http://cpan.metacpan.org/authors/id/O/OL/OLIVER/SNMP-Info-3.95.tar.gz" -MD5SUM="54b035d045fa0990fd84bd37d660470c" +DOWNLOAD="http://cpan.metacpan.org/authors/id/O/OL/OLIVER/SNMP-Info-3.970001.tar.gz" +MD5SUM="6fa0105c4914bc667e2a9d3efa40b294" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="perl-Module-Build perl-NetAddr-IP perl-Regexp-Common" +REQUIRES="perl-Math-BigInt perl-Module-Build perl-NetAddr-IP perl-Regexp-Common perl-Scalar-List-Utils" MAINTAINER="Thibaut Notteboom" EMAIL="thibaut.notteboom@gmail.com" diff --git a/perl/perl-Test-Script/README b/perl/perl-Test-Script/README deleted file mode 100644 index 1855d732c0..0000000000 --- a/perl/perl-Test-Script/README +++ /dev/null @@ -1,6 +0,0 @@ -The intent of Test-Script module is to provide a series of basic -tests for 80% of the testing you will need to do for scripts in the -script (or bin as is also commonly used) paths of your Perl -distribution. Further, it aims to provide this functionality with -perfect platform-compatibility, and in a way that is as unobtrusive -as possible. diff --git a/perl/perl-Test-Script/perl-Test-Script.info b/perl/perl-Test-Script/perl-Test-Script.info deleted file mode 100644 index 1ad7a3f757..0000000000 --- a/perl/perl-Test-Script/perl-Test-Script.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="perl-Test-Script" -VERSION="1.07" -HOMEPAGE="https://metacpan.org/pod/Test::Script" -DOWNLOAD="https://cpan.metacpan.org/authors/id/A/AD/ADAMK/Test-Script-1.07.tar.gz" -MD5SUM="f6b5baa6403cd24dac7f023e0ea22384" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="perl-IPC-Run3 perl-Probe-Perl perl-Module-Install" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" diff --git a/perl/perl-Test-Script/slack-desc b/perl/perl-Test-Script/slack-desc deleted file mode 100644 index d05ae887b0..0000000000 --- a/perl/perl-Test-Script/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -perl-Test-Script: perl-Test-Script (Basic cross-platform tests for scripts) -perl-Test-Script: -perl-Test-Script: The intent of Test-Script module is to provide a series of basic -perl-Test-Script: tests for 80% of the testing you will need to do for scripts in the -perl-Test-Script: script (or bin as is also commonly used) paths of your Perl -perl-Test-Script: distribution. Further, it aims to provide this functionality with -perl-Test-Script: perfect platform-compatibility, and in a way that is as unobtrusive -perl-Test-Script: as possible. -perl-Test-Script: -perl-Test-Script: -perl-Test-Script: diff --git a/perl/perl-WWW-Curl/curl-7.71.0.patch.gz b/perl/perl-WWW-Curl/curl-7.71.0.patch.gz Binary files differindex f85592a36f..96e83e4a30 100644 --- a/perl/perl-WWW-Curl/curl-7.71.0.patch.gz +++ b/perl/perl-WWW-Curl/curl-7.71.0.patch.gz diff --git a/perl/perl-WWW-Curl/perl-WWW-Curl.SlackBuild b/perl/perl-WWW-Curl/perl-WWW-Curl.SlackBuild index 46291bd33f..f99a85f115 100644 --- a/perl/perl-WWW-Curl/perl-WWW-Curl.SlackBuild +++ b/perl/perl-WWW-Curl/perl-WWW-Curl.SlackBuild @@ -7,7 +7,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-WWW-Curl VERSION=${VERSION:-4.17} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -21,9 +21,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -64,6 +61,8 @@ find -L . \ zcat $CWD/curl-7.71.0.patch.gz | patch -p1 +PERL_USE_UNSAFE_INC=1 \ +PERL_MM_USE_DEFAULT=1 \ perl Makefile.PL \ PREFIX=/usr \ INSTALLDIRS=vendor \ diff --git a/perl/perl-YAML-Tiny/perl-YAML-Tiny.SlackBuild b/perl/perl-YAML-Tiny/perl-YAML-Tiny.SlackBuild index 735e56ae23..42d511b0fc 100644 --- a/perl/perl-YAML-Tiny/perl-YAML-Tiny.SlackBuild +++ b/perl/perl-YAML-Tiny/perl-YAML-Tiny.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for perl-YAML-Tiny. # -# Copyright 2020 M.A. Begue mab974@gmail.com +# Copyright 2020 M.A. Begue mab974@misouk.com # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-YAML-Tiny -VERSION=${VERSION:-1.73} +VERSION=${VERSION:-1.74} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -86,6 +86,7 @@ perl Makefile.PL \ INSTALLDIRS=vendor \ INSTALLVENDORMAN3DIR=/usr/man/man3 make +make test make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/perl/perl-YAML-Tiny/perl-YAML-Tiny.info b/perl/perl-YAML-Tiny/perl-YAML-Tiny.info index 7373a62810..b4ba6a7fb3 100644 --- a/perl/perl-YAML-Tiny/perl-YAML-Tiny.info +++ b/perl/perl-YAML-Tiny/perl-YAML-Tiny.info @@ -1,10 +1,10 @@ PRGNAM="perl-YAML-Tiny" -VERSION="1.73" +VERSION="1.74" HOMEPAGE="https://metacpan.org/pod/YAML::Tiny" -DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz" -MD5SUM="d1bb2525e4ab46bfab4b22842c467529" +DOWNLOAD="https://cpan.metacpan.org/authors/id/E/ET/ETHER/YAML-Tiny-1.74.tar.gz" +MD5SUM="5a2b53a7cf7f3dcc98173944565ca0d6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Michel A. BEGUE" -EMAIL="mab974@gmail.com" +EMAIL="mab974@misouk.com" diff --git a/perl/perl-html-form/perl-html-form.SlackBuild b/perl/perl-html-form/perl-html-form.SlackBuild index a02769e550..b002bc8df9 100644 --- a/perl/perl-html-form/perl-html-form.SlackBuild +++ b/perl/perl-html-form/perl-html-form.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-html-form -VERSION=${VERSION:-6.07} +VERSION=${VERSION:-6.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -43,9 +43,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -104,7 +101,7 @@ find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f find $PKG -depth -type d -empty -delete || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Changes INSTALL LICENSE $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Changes LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/perl/perl-html-form/perl-html-form.info b/perl/perl-html-form/perl-html-form.info index 79e9e18c1a..330730ef45 100644 --- a/perl/perl-html-form/perl-html-form.info +++ b/perl/perl-html-form/perl-html-form.info @@ -1,10 +1,10 @@ PRGNAM="perl-html-form" -VERSION="6.07" +VERSION="6.11" HOMEPAGE="https://metacpan.org/pod/HTML::Form" -DOWNLOAD="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTML-Form-6.07.tar.gz" -MD5SUM="71718750e6a2132b50eeca417a55e18e" +DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SIMBABQUE/HTML-Form-6.11.tar.gz" +MD5SUM="5348fbdee5ec572e21c1579d4eb183d3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="perl-http-message" +REQUIRES="perl-html-parser perl-Test-Warnings" MAINTAINER="Donald Cooley" EMAIL="chytraeu@sdf.org" diff --git a/perl/perlbrew/perlbrew.SlackBuild b/perl/perlbrew/perlbrew.SlackBuild index 8a0365d8c8..d51ca8033c 100644 --- a/perl/perlbrew/perlbrew.SlackBuild +++ b/perl/perlbrew/perlbrew.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perlbrew -VERSION=${VERSION:-0.85} +VERSION=${VERSION:-0.98} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -81,12 +78,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT +export PERL_MM_USE_DEFAULT=1 MODULEBUILDRC=/dev/null perl Build.PL \ --installdirs vendor \ --config installvendorman1dir=/usr/man/man1 \ --config installvendorman3dir=/usr/man/man3 ./Build -./Build test ./Build install \ --destdir $PKG @@ -97,7 +95,7 @@ find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f find $PKG -depth -type d -empty -delete || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Changes LICENSE README README.md doc/* $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Changes LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/perl/perlbrew/perlbrew.info b/perl/perlbrew/perlbrew.info index 93b49f6bf7..f2c0c29aed 100644 --- a/perl/perlbrew/perlbrew.info +++ b/perl/perlbrew/perlbrew.info @@ -1,8 +1,8 @@ PRGNAM="perlbrew" -VERSION="0.85" +VERSION="0.98" HOMEPAGE="https://perlbrew.pl/" -DOWNLOAD="https://cpan.metacpan.org/authors/id/G/GU/GUGOD/App-perlbrew-0.85.tar.gz" -MD5SUM="0a86d1393206c4a40efb74776f8794d1" +DOWNLOAD="https://cpan.metacpan.org/authors/id/G/GU/GUGOD/App-perlbrew-0.98.tar.gz" +MD5SUM="30ac30758526e57d8b9b8c34ae6ae526" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-CPAN-Perl-Releases perl-Devel-PatchPerl perl-File-Which perl-Module-Build-Tiny perl-IO-All perl-Path-Class perl-Test-Exception perl-Test-Output perl-Test-Spec perl-Test-TempDir-Tiny perl-local-lib" diff --git a/python/PyColorizer/PyColorizer.info b/python/PyColorizer/PyColorizer.info deleted file mode 100644 index b343a76764..0000000000 --- a/python/PyColorizer/PyColorizer.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="PyColorizer" -VERSION="0.1" -HOMEPAGE="https://github.com/PierreRambaud/color" -DOWNLOAD="https://pypi.python.org/packages/source/P/PyColorizer/PyColorizer-0.1.tar.gz" -MD5SUM="dbdecdd00199c52560a867cc7a5ec1f1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/PyColorizer/README b/python/PyColorizer/README deleted file mode 100644 index 1041211019..0000000000 --- a/python/PyColorizer/README +++ /dev/null @@ -1 +0,0 @@ -Add color in your shell. diff --git a/python/PyColorizer/slack-desc b/python/PyColorizer/slack-desc deleted file mode 100644 index 5a0d166400..0000000000 --- a/python/PyColorizer/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -PyColorizer: PyColorizer (Add color in your shell) -PyColorizer: -PyColorizer: ANSII Color formatting for output in terminal. -PyColorizer: -PyColorizer: Homepage: https://github.com/PierreRambaud/color -PyColorizer: -PyColorizer: -PyColorizer: -PyColorizer: -PyColorizer: -PyColorizer: diff --git a/python/PyGithub/PyGithub.SlackBuild b/python/PyGithub/PyGithub.SlackBuild deleted file mode 100644 index 630089438f..0000000000 --- a/python/PyGithub/PyGithub.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for PyGithub - -# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=PyGithub -VERSION=${VERSION:-1.38} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md COPYING* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/PyGithub/PyGithub.info b/python/PyGithub/PyGithub.info deleted file mode 100644 index c8ebaa19df..0000000000 --- a/python/PyGithub/PyGithub.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="PyGithub" -VERSION="1.38" -HOMEPAGE="https://pygithub.readthedocs.io/en/latest/" -DOWNLOAD="https://pypi.python.org/packages/d5/8d/c77ab4ab7a815d74093f8dd45ecbad84fc5ae2341cf92029ea755bc55fe5/PyGithub-1.38.tar.gz" -MD5SUM="2d86c425008dec1af6ff4f67d4ad57b0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="pyjwt" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/PyGithub/README b/python/PyGithub/README deleted file mode 100644 index c7eb44798d..0000000000 --- a/python/PyGithub/README +++ /dev/null @@ -1 +0,0 @@ -PyGithub is a Python library to access the full Github API v3. diff --git a/python/PyInstaller/PyInstaller.SlackBuild b/python/PyInstaller/PyInstaller.SlackBuild deleted file mode 100644 index 84ab1e9aa8..0000000000 --- a/python/PyInstaller/PyInstaller.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for PyInstaller - -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=PyInstaller -VERSION=${VERSION:-3.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a PKG-INFO doc/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/PyInstaller/PyInstaller.info b/python/PyInstaller/PyInstaller.info deleted file mode 100644 index 97cfd08c0e..0000000000 --- a/python/PyInstaller/PyInstaller.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="PyInstaller" -VERSION="3.2" -HOMEPAGE="http://www.pyinstaller.org/" -DOWNLOAD="https://pypi.python.org/packages/33/f9/034a89276301ef5e88efd11e5ea592e3d3b2324706e65bdff7445d271077/PyInstaller-3.2.tar.gz" -MD5SUM="ad924928983014e6b8ce5422d7687832" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/PyInstaller/README b/python/PyInstaller/README deleted file mode 100644 index 814237cdce..0000000000 --- a/python/PyInstaller/README +++ /dev/null @@ -1,7 +0,0 @@ -PyInstaller is a program that converts (packages) Python programs into -stand-alone executables, under Windows, Linux, Mac OS X, Solaris and -AIX. Its main advantages over similar tools are that PyInstaller works -with any version of Python since 2.4, it builds smaller executables -thanks to transparent compression, it is fully multi-platform, and -use the OS support to load the dynamic libraries, thus ensuring full -compatibility. diff --git a/python/PyInstaller/slack-desc b/python/PyInstaller/slack-desc deleted file mode 100644 index 983ade4c5c..0000000000 --- a/python/PyInstaller/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -PyInstaller: PyInstaller (Converts Python programs) -PyInstaller: -PyInstaller: PyInstaller is a program that converts (packages) Python programs -PyInstaller: into stand-alone executables, under Windows, Linux, Mac OS X, AIX -PyInstaller: and Solaris. -PyInstaller: -PyInstaller: Homepage: http://www.pyinstaller.org/ -PyInstaller: -PyInstaller: -PyInstaller: -PyInstaller: diff --git a/python/PyPy/PyPy.SlackBuild b/python/PyPy/PyPy.SlackBuild index 321ed43910..198a892583 100644 --- a/python/PyPy/PyPy.SlackBuild +++ b/python/PyPy/PyPy.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=PyPy -VERSION=${VERSION:-7.3.15} +VERSION=${VERSION:-7.3.16} SRCNAM=pypy2.7 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/PyPy/PyPy.info b/python/PyPy/PyPy.info index 051f4f1617..fb47ee33b2 100644 --- a/python/PyPy/PyPy.info +++ b/python/PyPy/PyPy.info @@ -1,8 +1,8 @@ PRGNAM="PyPy" -VERSION="7.3.15" +VERSION="7.3.16" HOMEPAGE="https://www.pypy.org/" -DOWNLOAD="https://downloads.python.org/pypy/pypy2.7-v7.3.15-src.tar.bz2" -MD5SUM="47a5fffbae1567f0ae3e83bab5a695c1" +DOWNLOAD="https://downloads.python.org/pypy/pypy2.7-v7.3.16-src.tar.bz2" +MD5SUM="9d527bc634e25b793f181580cf58d1a7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pycparser %README%" diff --git a/python/PyPy3/PyPy3.SlackBuild b/python/PyPy3/PyPy3.SlackBuild index 033588860d..15232dfeb9 100644 --- a/python/PyPy3/PyPy3.SlackBuild +++ b/python/PyPy3/PyPy3.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=PyPy3 -VERSION=${VERSION:-7.3.15} +VERSION=${VERSION:-7.3.16} SRCNAM=pypy3.9 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/PyPy3/PyPy3.info b/python/PyPy3/PyPy3.info index 2828704ecd..04474e6a74 100644 --- a/python/PyPy3/PyPy3.info +++ b/python/PyPy3/PyPy3.info @@ -1,8 +1,8 @@ PRGNAM="PyPy3" -VERSION="7.3.15" +VERSION="7.3.16" HOMEPAGE="https://www.pypy.org/" -DOWNLOAD="https://downloads.python.org/pypy/pypy3.9-v7.3.15-src.tar.bz2" -MD5SUM="f98d921a74c98d2037cacf2ca396db71" +DOWNLOAD="https://downloads.python.org/pypy/pypy3.9-v7.3.16-src.tar.bz2" +MD5SUM="78d5d432aee45650d1a24b9a0f17a336" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pycparser %README%" diff --git a/python/alabaster/README b/python/alabaster/README deleted file mode 100644 index 596320ef6e..0000000000 --- a/python/alabaster/README +++ /dev/null @@ -1,13 +0,0 @@ -A configurable sidebar-enabled Sphinx theme - -Alabaster is a visually (c)lean, responsive, configurable theme -for the Sphinx documentation system. It is Python 2+3 compatible. - -It began as a third-party theme, and is still maintained separately, -but as of Sphinx 1.3, Alabaster is an install-time dependency -of Sphinx and is selected as the default theme. - -Live examples of this theme can be seen on this project's own -website, paramiko.org, fabfile.org and pyinvoke.org. - -For more documentation, please see http://alabaster.readthedocs.io. diff --git a/python/alabaster/alabaster.info b/python/alabaster/alabaster.info deleted file mode 100644 index 169e58e1b5..0000000000 --- a/python/alabaster/alabaster.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="alabaster" -VERSION="0.7.13" -HOMEPAGE="https://alabaster.readthedocs.io/" -DOWNLOAD="https://files.pythonhosted.org/packages/94/71/a8ee96d1fd95ca04a0d2e2d9c4081dac4c2d2b12f7ddb899c8cb9bfd1532/alabaster-0.7.13.tar.gz" -MD5SUM="2e05a5f4fe5a8b95e5e576cbf4a5d503" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Nikos Giotis" -EMAIL="nikos.giotis@gmail.com" diff --git a/python/alabaster/slack-desc b/python/alabaster/slack-desc deleted file mode 100644 index ac64dcfad2..0000000000 --- a/python/alabaster/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -alabaster: alabaster (A configurable sidebar-enabled Sphinx theme) -alabaster: -alabaster: Alabaster is a visually (c)lean, responsive, configurable theme for -alabaster: the Sphinx documentation system. It is Python 2+3 compatible. -alabaster: -alabaster: https://alabaster.readthedocs.io/ -alabaster: -alabaster: -alabaster: -alabaster: -alabaster: diff --git a/python/argh/README b/python/argh/README deleted file mode 100644 index 01955b7076..0000000000 --- a/python/argh/README +++ /dev/null @@ -1,6 +0,0 @@ -Building a command-line interface? Found yourself uttering -"argh!" while struggling with the API of `argparse`? Don't like the -complexity but need the power? - -Argh is a smart wrapper for argparse. Argparse is a very powerful tool; -Argh just makes it easy to use. diff --git a/python/argh/argh.SlackBuild b/python/argh/argh.SlackBuild deleted file mode 100644 index a445709849..0000000000 --- a/python/argh/argh.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash - -# Slackware build script for argh - -# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=argh -VERSION=${VERSION:-0.26.2} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -# Python 3 support. -if $(python3 -c 'import sys' 2>/dev/null); then - python3 setup.py install --root=$PKG -fi - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/argh/argh.info b/python/argh/argh.info deleted file mode 100644 index 316c4e0331..0000000000 --- a/python/argh/argh.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="argh" -VERSION="0.26.2" -HOMEPAGE="https://github.com/neithere/argh/" -DOWNLOAD="https://pypi.python.org/packages/e3/75/1183b5d1663a66aebb2c184e0398724b624cecd4f4b679cb6e25de97ed15/argh-0.26.2.tar.gz" -MD5SUM="edda25f3f0164a963dd89c0e3c619973" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/argh/slack-desc b/python/argh/slack-desc deleted file mode 100644 index 1a31d9a6ea..0000000000 --- a/python/argh/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -argh: argh (An unobtrusive argparse wrapper) -argh: -argh: Building a command-line interface? Found yourself uttering "argh!" -argh: while struggling with the API of argparse? Don't like the complexity -argh: but need the power? -argh: Argh is a smart wrapper for argparse. Argparse is a very powerful -argh: toll; Argh just makes it easy to use. -argh: -argh: Homepage: https://github.com/neithere/argh/ -argh: -argh: diff --git a/python/args/README b/python/args/README deleted file mode 100644 index 06068c7588..0000000000 --- a/python/args/README +++ /dev/null @@ -1,4 +0,0 @@ -Command Arguments for Humans. - -This simple module gives you an -elegant interface for your command line argumemnts. diff --git a/python/args/args.info b/python/args/args.info deleted file mode 100644 index 244f143220..0000000000 --- a/python/args/args.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="args" -VERSION="0.1.0" -HOMEPAGE="https://github.com/kennethreitz/args" -DOWNLOAD="https://pypi.python.org/packages/source/a/args/args-0.1.0.tar.gz" -MD5SUM="66faf79ba2511def7b8b81d542482046" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/args/slack-desc b/python/args/slack-desc deleted file mode 100644 index e9a8b957e0..0000000000 --- a/python/args/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -args: args (Command Arguments for Humans) -args: -args: This simple module gives you an -args: elegant interface for your command line argumemnts. -args: -args: -args: -args: -args: -args: Hompepage: https://github.com/kennethreitz/args -args: diff --git a/python/certbot-dns-cloudflare/certbot-dns-cloudflare.SlackBuild b/python/certbot-dns-cloudflare/certbot-dns-cloudflare.SlackBuild index dde14d1a34..37dbd46694 100644 --- a/python/certbot-dns-cloudflare/certbot-dns-cloudflare.SlackBuild +++ b/python/certbot-dns-cloudflare/certbot-dns-cloudflare.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2022 S.S. Bolokanar, Bulgaria <bolokanar@bulgars.org> +# Copyright 2022 S.S. Bolokanar, Bulgaria <bolokanar@bulgarsociety.org> # С. С. Болоканаръ, България # All rights reserved. # @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=certbot-dns-cloudflare -VERSION=${VERSION:-2.9.0} +VERSION=${VERSION:-2.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/certbot-dns-cloudflare/certbot-dns-cloudflare.info b/python/certbot-dns-cloudflare/certbot-dns-cloudflare.info index bde2756c46..48dba67317 100644 --- a/python/certbot-dns-cloudflare/certbot-dns-cloudflare.info +++ b/python/certbot-dns-cloudflare/certbot-dns-cloudflare.info @@ -1,10 +1,10 @@ PRGNAM="certbot-dns-cloudflare" -VERSION="2.9.0" +VERSION="2.10.0" HOMEPAGE="https://pypi.org/project/certbot-dns-cloudflare/" -DOWNLOAD="https://files.pythonhosted.org/packages/cd/b4/db80e1ea8f9165ed816f64acce5e7df8beb8689457f1b1872f5b41124ae4/certbot-dns-cloudflare-2.9.0.tar.gz" -MD5SUM="c5c704fc0035325a90457b01733fb227" +DOWNLOAD="https://files.pythonhosted.org/packages/e9/42/afd7d47caa771fc40eb1b77d126648c3421b9277ca66917aa6d8e3599810/certbot-dns-cloudflare-2.10.0.tar.gz" +MD5SUM="f438fa6dbaf63f1fcea140fa885827a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-cloudflare" MAINTAINER="S. S. Bolokanar" -EMAIL="bolokanar@bulgars.org" +EMAIL="bolokanar@bulgarsociety.org" diff --git a/python/chump/README b/python/chump/README deleted file mode 100644 index 76b06832ab..0000000000 --- a/python/chump/README +++ /dev/null @@ -1 +0,0 @@ -Chump is an Apache2 Licensed, fully featured API wrapper for Pushover. diff --git a/python/chump/chump.info b/python/chump/chump.info deleted file mode 100644 index e003cada8b..0000000000 --- a/python/chump/chump.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="chump" -VERSION="1.5.2" -HOMEPAGE="http://chump.readthedocs.org" -DOWNLOAD="https://pypi.python.org/packages/2a/6d/f0681f06d3324e254492e725e5866c80fe72c491e4269800a02119345b2f/chump-1.5.2.tar.gz" -MD5SUM="765b30548bbdcf65b5f1ef08ad46d569" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/chump/slack-desc b/python/chump/slack-desc deleted file mode 100644 index ec0cd36cea..0000000000 --- a/python/chump/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -chump: chump (API wrapper for Pushover) -chump: -chump: Chump is an Apache2 Licensed, fully featured API wrapper for -chump: Pushover. -chump: -chump: Homepage: http://chump.readthedocs.io/en/latest/ -chump: -chump: -chump: -chump: -chump: diff --git a/python/clint/README b/python/clint/README deleted file mode 100644 index e780ae6ec2..0000000000 --- a/python/clint/README +++ /dev/null @@ -1,22 +0,0 @@ -Clint: Python Command-line Application Tools. - -Clint is a module filled with a set of awesome tools for developing -commandline applications. - -C ommand L ine IN terface T ools . - -Clint is awesome. Crazy awesome. It supports colors, but detects if -the session is a TTY, so doesn't render the colors if you're piping -stuff around. - -Awesome nest-able indentation context manager. Example: (with -indent(4): puts ('indented text')). It supports custom email-style -quotes. Of course, it supports color too, if and when needed. - -It has an awesome Column printer with optional auto-expanding -columns. It detects how wide your current console is and adjusts -accordingly. It wraps your words properly to fit the column size. With -or without colors mixed in. All with a single function call. - -The world's easiest to use implicit argument system w/ chaining -methods for filtering. Seriously. diff --git a/python/clint/clint.info b/python/clint/clint.info deleted file mode 100644 index f7598a01fb..0000000000 --- a/python/clint/clint.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="clint" -VERSION="0.5.1" -HOMEPAGE="https://github.com/kennethreitz/clint" -DOWNLOAD="https://pypi.python.org/packages/3d/b4/41ecb1516f1ba728f39ee7062b9dac1352d39823f513bb6f9e8aeb86e26d/clint-0.5.1.tar.gz" -MD5SUM="8afd569f077886e2f4e6cca377da2623" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="args" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/clint/slack-desc b/python/clint/slack-desc deleted file mode 100644 index 9a70221090..0000000000 --- a/python/clint/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -clint: clint (Python Command-line Application Tools) -clint: -clint: Clint is a module filled with a set of awesome tools for -clint: developing commandline applications. -clint: -clint: Homepage: https://github.com/kennethreitz/clint -clint: -clint: -clint: -clint: -clint: diff --git a/python/colorama/colorama.SlackBuild b/python/colorama/colorama.SlackBuild index 7676d072cb..a9a5720161 100644 --- a/python/colorama/colorama.SlackBuild +++ b/python/colorama/colorama.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for colorama -# Copyright 2014-2022 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=colorama -VERSION=${VERSION:-0.4.4} +VERSION=${VERSION:-0.4.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,12 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG - -# Python 3 support. -if $(python3 -c 'import sys' 2>/dev/null); then - python3 setup.py install --root=$PKG -fi +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/colorama/colorama.info b/python/colorama/colorama.info index 0541da92ab..492743b5fc 100644 --- a/python/colorama/colorama.info +++ b/python/colorama/colorama.info @@ -1,10 +1,10 @@ PRGNAM="colorama" -VERSION="0.4.4" +VERSION="0.4.6" HOMEPAGE="https://github.com/tartley/colorama" -DOWNLOAD="https://files.pythonhosted.org/packages/1f/bb/5d3246097ab77fa083a61bd8d3d527b7ae063c7d8e8671b1cf8c4ec10cbe/colorama-0.4.4.tar.gz" -MD5SUM="57b22f2597f63df051b69906fbf310cc" +DOWNLOAD="https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz" +MD5SUM="11fe1cbf8299798551ac88f824ea11c4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3-build" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/colorclass/README b/python/colorclass/README deleted file mode 100644 index 8d844e6b48..0000000000 --- a/python/colorclass/README +++ /dev/null @@ -1,3 +0,0 @@ -Yet another ANSI color text library for Python. -Provides "auto colors" for dark/light terminals. -Works on Linux, OS X, and Windows. diff --git a/python/colorclass/colorclass.SlackBuild b/python/colorclass/colorclass.SlackBuild deleted file mode 100644 index c3913fd04c..0000000000 --- a/python/colorclass/colorclass.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for colorclass - -# Copyright 2016 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=colorclass -VERSION=${VERSION:-2.2.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/colorclass/colorclass.info b/python/colorclass/colorclass.info deleted file mode 100644 index ab09e62cb1..0000000000 --- a/python/colorclass/colorclass.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="colorclass" -VERSION="2.2.0" -HOMEPAGE="https://github.com/Robpol86/colorclass" -DOWNLOAD="https://pypi.python.org/packages/37/ea/ae8dbb956939d4392e6a7fdef87fda273854da1128edae016c4104240be8/colorclass-2.2.0.tar.gz" -MD5SUM="060139e93e31faafeb5d4bdfd6ea0bb8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/colorclass/slack-desc b/python/colorclass/slack-desc deleted file mode 100644 index 23d70acd74..0000000000 --- a/python/colorclass/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -colorclass: colorclass (ANSI color text library for Python) -colorclass: -colorclass: Yet another ANSI color text library for Python. Provides -colorclass: `auto colors` for dark/light terminals. Works on Linux, OS X, and -colorclass: Windows. -colorclass: -colorclass: Homepage: https://github.com/Robpol86/colorclass -colorclass: -colorclass: -colorclass: -colorclass: diff --git a/python/cryptography/cryptography.SlackBuild b/python/cryptography/cryptography.SlackBuild index 6465d1fd2b..606a982138 100644 --- a/python/cryptography/cryptography.SlackBuild +++ b/python/cryptography/cryptography.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cryptography -VERSION=${VERSION:-42.0.5} +VERSION=${VERSION:-42.0.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -102,6 +102,7 @@ fi PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') export PYTHONPATH=/opt/python$PYVER/site-packages +rm -rf tests/bench python3 -m build --no-isolation python3 -m installer -d "$PKG" dist/*.whl diff --git a/python/cryptography/cryptography.info b/python/cryptography/cryptography.info index 1dc31f380c..5214f2e767 100644 --- a/python/cryptography/cryptography.info +++ b/python/cryptography/cryptography.info @@ -1,10 +1,10 @@ PRGNAM="cryptography" -VERSION="42.0.5" +VERSION="42.0.7" HOMEPAGE="https://cryptography.io/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-42.0.5.tar.gz \ - https://sbo-source.s3.ap-southeast-1.amazonaws.com/cryptography-vendored-sources-42.0.5-1.tar.xz" -MD5SUM="f31af409d2d41b9e8cedb2fe19d4e2dd \ - 90b2104d9ecd410663774970bb95b78d" +DOWNLOAD="https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-42.0.7.tar.gz \ + https://sbo-source.s3.ap-southeast-1.amazonaws.com/cryptography-vendored-sources-42.0.7-1.tar.xz" +MD5SUM="07daf829afd60b3e6326d01166add3a1 \ + cbfb292fbdd71cbc8b9a05ac267af0c8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="rust16 python3-setuptools-rust-opt" diff --git a/python/django-debug-toolbar/django-debug-toolbar.SlackBuild b/python/django-debug-toolbar/django-debug-toolbar.SlackBuild index d8cc7dc755..d9dc46269a 100644 --- a/python/django-debug-toolbar/django-debug-toolbar.SlackBuild +++ b/python/django-debug-toolbar/django-debug-toolbar.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for django-debug-toolbar -# Copyright 2020 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2020-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=django-debug-toolbar -VERSION=${VERSION:-2.1} +SRCNAM=django_debug_toolbar +VERSION=${VERSION:-4.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -69,9 +70,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -79,7 +80,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --root=$PKG +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/django-debug-toolbar/django-debug-toolbar.info b/python/django-debug-toolbar/django-debug-toolbar.info index be55f5e9b8..386cdd982f 100644 --- a/python/django-debug-toolbar/django-debug-toolbar.info +++ b/python/django-debug-toolbar/django-debug-toolbar.info @@ -1,10 +1,10 @@ PRGNAM="django-debug-toolbar" -VERSION="2.1" +VERSION="4.3.0" HOMEPAGE="https://github.com/jazzband/django-debug-toolbar" -DOWNLOAD="https://files.pythonhosted.org/packages/23/0f/3567d62be25e3722be719e9915605a00e8b779620a2d53f2469331884629/django-debug-toolbar-2.1.tar.gz" -MD5SUM="d6a4b4dabc963e70110a7f6aaa491b4f" +DOWNLOAD="https://files.pythonhosted.org/packages/61/ff/b6d3cc2c31f9a6cf68eda0f7a640ada743f5c39122a0c14db8d3eee3f412/django_debug_toolbar-4.3.0.tar.gz" +MD5SUM="6eb042f887e7cf011f5c6e5b4f852d44" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-django" +REQUIRES="python3-hatchling python3-django" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/fabric/README b/python/fabric/README deleted file mode 100644 index 8e80ced49b..0000000000 --- a/python/fabric/README +++ /dev/null @@ -1,3 +0,0 @@ -Fabric is a Python (2.5-2.7) library and command-line tool -for streamlining the use of SSH for application deployment -or systems administration tasks. diff --git a/python/fabric/fabric.SlackBuild b/python/fabric/fabric.SlackBuild deleted file mode 100644 index 3fea9a9e03..0000000000 --- a/python/fabric/fabric.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for fabric - -# Copyright 2016-2017 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fabric -SRCNAM=${PRGNAM^} -VERSION=${VERSION:-1.13.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS LICENSE PKG-INFO README.rst INSTALL $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/fabric/fabric.info b/python/fabric/fabric.info deleted file mode 100644 index 4517639293..0000000000 --- a/python/fabric/fabric.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fabric" -VERSION="1.13.2" -HOMEPAGE="http://www.fabfile.org/" -DOWNLOAD="https://pypi.python.org/packages/2d/f8/8d847b77164b73e70a728f536c805adfe69a3f04772ee7b7dd917763a1c4/Fabric-1.13.2.tar.gz" -MD5SUM="e8a954f72abe0e9cf779b8c2e975b7b6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python2-paramiko" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/fabric/slack-desc b/python/fabric/slack-desc deleted file mode 100644 index 353eab3cd0..0000000000 --- a/python/fabric/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fabric: fabric (tool for remote execution and deployment) -fabric: -fabric: Fabric is a Python (2.5-2.7) library and command-line tool for -fabric: streamlining the use of SSH for application deployment or systems -fabric: administration tasks. -fabric: -fabric: Homepage: http://www.fabfile.org/ -fabric: -fabric: -fabric: -fabric: diff --git a/python/gi-docgen/README b/python/gi-docgen/README deleted file mode 100644 index 0b1edcc084..0000000000 --- a/python/gi-docgen/README +++ /dev/null @@ -1,5 +0,0 @@ -GI-DocGen is a document generator for GObject-based libraries. GObject -is the base type system of the GNOME project. GI-Docgen reuses the -introspection data generated by GObject-based libraries to generate the -API reference of these libraries, as well as other ancillary -documentation. diff --git a/python/gi-docgen/gi-docgen.info b/python/gi-docgen/gi-docgen.info deleted file mode 100644 index 7dba9e14f1..0000000000 --- a/python/gi-docgen/gi-docgen.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gi-docgen" -VERSION="2023.1" -HOMEPAGE="https://gnome.pages.gitlab.gnome.org/gi-docgen" -DOWNLOAD="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/2023.1/gi-docgen-2023.1.tar.gz" -MD5SUM="844e84610246501d3303ae9150d0cc24" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-toml python3-typogrify" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/python/gi-docgen/slack-desc b/python/gi-docgen/slack-desc deleted file mode 100644 index 14f602d26d..0000000000 --- a/python/gi-docgen/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gi-docgen: gi-docgen (Document Generator) -gi-docgen: -gi-docgen: GI-DocGen is a document generator for GObject-based libraries. -gi-docgen: -gi-docgen: Homepage: https://gnome.pages.gitlab.gnome.org/gi-docgen -gi-docgen: -gi-docgen: -gi-docgen: -gi-docgen: -gi-docgen: -gi-docgen: diff --git a/python/gst-python/gst-python.SlackBuild b/python/gst-python/gst-python.SlackBuild index 8add0166ae..805527f8c2 100644 --- a/python/gst-python/gst-python.SlackBuild +++ b/python/gst-python/gst-python.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gst-python -VERSION=${VERSION:-1.18.5} +VERSION=${VERSION:-1.24.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -101,7 +101,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog NEWS RELEASE README TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING ChangeLog NEWS RELEASE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/gst-python/gst-python.info b/python/gst-python/gst-python.info index 27d2f54095..f25ce65561 100644 --- a/python/gst-python/gst-python.info +++ b/python/gst-python/gst-python.info @@ -1,8 +1,8 @@ PRGNAM="gst-python" -VERSION="1.18.5" +VERSION="1.24.1" HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-python.html" -DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz" -MD5SUM="eb19229f72f61506e33182a6fbce4a2e" +DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.24.1.tar.xz" +MD5SUM="a04bf7cfc76de2096d2dfd9feb12ddba" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/gunicorn/gunicorn.SlackBuild b/python/gunicorn/gunicorn.SlackBuild index 3aff3a8ea5..46db2aef69 100644 --- a/python/gunicorn/gunicorn.SlackBuild +++ b/python/gunicorn/gunicorn.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gunicorn -# Copyright 2016-2022 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2016-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gunicorn -VERSION=${VERSION:-20.1.0} +VERSION=${VERSION:-22.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,7 +79,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --root=$PKG +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/gunicorn/gunicorn.info b/python/gunicorn/gunicorn.info index adaf475a12..d8f62aee72 100644 --- a/python/gunicorn/gunicorn.info +++ b/python/gunicorn/gunicorn.info @@ -1,10 +1,10 @@ PRGNAM="gunicorn" -VERSION="20.1.0" +VERSION="22.0.0" HOMEPAGE="https://gunicorn.org/" -DOWNLOAD="https://files.pythonhosted.org/packages/28/5b/0d1f0296485a6af03366604142ea8f19f0833894db3512a40ed07b2a56dd/gunicorn-20.1.0.tar.gz" -MD5SUM="db8a7c5c2064000af70286534803bf1d" +DOWNLOAD="https://files.pythonhosted.org/packages/1e/88/e2f93c5738a4c1f56a458fc7a5b1676fc31dcdbb182bef6b40a141c17d66/gunicorn-22.0.0.tar.gz" +MD5SUM="c02e8493f941ebeddad35788f427aba2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3-setuptools-opt" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/imagesize/imagesize.SlackBuild b/python/imagesize/imagesize.SlackBuild index bf2370fa93..9d860915b6 100644 --- a/python/imagesize/imagesize.SlackBuild +++ b/python/imagesize/imagesize.SlackBuild @@ -81,10 +81,6 @@ find -L . \ python setup.py install --root=$PKG -if python3 -c 'import sys' 2>/dev/null; then - python3 setup.py install --root=$PKG -fi - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/jedi/README b/python/jedi/README deleted file mode 100644 index 71abdb4efa..0000000000 --- a/python/jedi/README +++ /dev/null @@ -1,3 +0,0 @@ -Jedi is an autocompletion tool for Python that can be used in -IDEs/editors. Jedi works. Jedi is fast. It understands all of -the basic Python syntax elements including many builtin functions. diff --git a/python/jedi/jedi.SlackBuild b/python/jedi/jedi.SlackBuild deleted file mode 100644 index 1b99d376f0..0000000000 --- a/python/jedi/jedi.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for jedi - -# Copyright 2015-2019 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=jedi -VERSION=${VERSION:-0.14.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.rst *.txt $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/jedi/jedi.info b/python/jedi/jedi.info deleted file mode 100644 index 73e00ebd00..0000000000 --- a/python/jedi/jedi.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="jedi" -VERSION="0.14.0" -HOMEPAGE="https://github.com/davidhalter/jedi" -DOWNLOAD="https://files.pythonhosted.org/packages/eb/3b/300fd8107e30f7b957a1dc1ef7f67cd382802aaf6be361022f039d95c130/jedi-0.14.0.tar.gz" -MD5SUM="8845cbe6ae3c4e667e7c7239afcbd70b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-parso" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/jedi/slack-desc b/python/jedi/slack-desc deleted file mode 100644 index 77e93cf86c..0000000000 --- a/python/jedi/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -jedi: jedi (Autocompletion tool for Python) -jedi: -jedi: Jedi is an autocompletion tool for Python that can be used in -jedi: IDEs/editors. Jedi works. Jedi is fast. It understands all of the -jedi: basic Python syntax elements including many builtin functions. -jedi: -jedi: Homepage: https://github.com/davidhalter/jedi -jedi: -jedi: -jedi: -jedi: diff --git a/python/kaptan/kaptan.SlackBuild b/python/kaptan/kaptan.SlackBuild index 9bcd133cb2..fd00747f06 100644 --- a/python/kaptan/kaptan.SlackBuild +++ b/python/kaptan/kaptan.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for kaptan -# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kaptan -VERSION=${VERSION:-0.5.12} +VERSION=${VERSION:-0.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,7 +79,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/python/kaptan/kaptan.info b/python/kaptan/kaptan.info index be309c1025..a7341c67ee 100644 --- a/python/kaptan/kaptan.info +++ b/python/kaptan/kaptan.info @@ -1,10 +1,10 @@ PRGNAM="kaptan" -VERSION="0.5.12" +VERSION="0.6.0" HOMEPAGE="https://github.com/emre/kaptan" -DOWNLOAD="https://files.pythonhosted.org/packages/94/64/f492edfcac55d4748014b5c9f9a90497325df7d97a678c5d56443f881b7a/kaptan-0.5.12.tar.gz" -MD5SUM="a58cba3a3f975d5765ce0befef7d8825" +DOWNLOAD="https://files.pythonhosted.org/packages/ca/c8/3569c90535df1b7c6079c75b7fd3f304d6ec8ee1626855d37ca137409ba2/kaptan-0.6.0.tar.gz" +MD5SUM="2d3b4256cface38bf9bd6c2d871da493" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python2-PyYAML" +REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/mando/README b/python/mando/README deleted file mode 100644 index a941d55a7e..0000000000 --- a/python/mando/README +++ /dev/null @@ -1,2 +0,0 @@ -mando is a wrapper around argparse, allowing you to write complete -CLI applications in seconds while maintaining all the flexibility. diff --git a/python/mando/mando.SlackBuild b/python/mando/mando.SlackBuild deleted file mode 100644 index d95b078064..0000000000 --- a/python/mando/mando.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for mando - -# Copyright 2015-2016 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=mando -VERSION=${VERSION:-0.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/mando/mando.info b/python/mando/mando.info deleted file mode 100644 index b038a3d9a6..0000000000 --- a/python/mando/mando.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mando" -VERSION="0.4" -HOMEPAGE="https://mando.readthedocs.org/" -DOWNLOAD="https://pypi.python.org/packages/2b/52/684d9ab8c2ccfb611275f2e44d3ebc76a6a6c56f4afacd2e91237fa07ec3/mando-0.4.tar.gz" -MD5SUM="1d3fe2ab518830d8984218d7b01b4631" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="Sphinx" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/mando/slack-desc b/python/mando/slack-desc deleted file mode 100644 index d528db6298..0000000000 --- a/python/mando/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -mando: mando (Create Python CLI apps) -mando: -mando: mando is a wrapper around argparse, and allows you to write complete -mando: CLI applications in seconds while maintaining all the flexibility. -mando: -mando: Homepage: https://mando.readthedocs.org/ -mando: -mando: -mando: -mando: -mando: diff --git a/python/minidb/minidb.SlackBuild b/python/minidb/minidb.SlackBuild index a901c2b672..2437c47f38 100644 --- a/python/minidb/minidb.SlackBuild +++ b/python/minidb/minidb.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for minidb -# Copyright 2016-2022 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2016-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=minidb -VERSION=${VERSION:-2.0.6} +VERSION=${VERSION:-2.0.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/minidb/minidb.info b/python/minidb/minidb.info index 91cdb290fa..a3d73e6aad 100644 --- a/python/minidb/minidb.info +++ b/python/minidb/minidb.info @@ -1,8 +1,8 @@ PRGNAM="minidb" -VERSION="2.0.6" +VERSION="2.0.8" HOMEPAGE="https://thp.io/2010/minidb/" -DOWNLOAD="https://github.com/thp/minidb/archive/2.0.6/minidb-2.0.6.tar.gz" -MD5SUM="0dddddfd5c433ad5441df3b7b21a6f19" +DOWNLOAD="https://github.com/thp/minidb/archive/2.0.8/minidb-2.0.8.tar.gz" +MD5SUM="4b35a5a24fc3dfe2f763e504ca66816c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/monty/monty.SlackBuild b/python/monty/monty.SlackBuild index 353b872b7d..49bb91935d 100644 --- a/python/monty/monty.SlackBuild +++ b/python/monty/monty.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for monty -# Copyright 2014-2022 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=monty -VERSION=${VERSION:-2022.9.9} +VERSION=${VERSION:-2024.5.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,13 +79,17 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --root=$PKG +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.rst PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.rst PKG-INFO README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/monty/monty.info b/python/monty/monty.info index 9e28dc45a4..3e4dcf20e0 100644 --- a/python/monty/monty.info +++ b/python/monty/monty.info @@ -1,10 +1,10 @@ PRGNAM="monty" -VERSION="2022.9.9" +VERSION="2024.5.15" HOMEPAGE="https://github.com/materialsvirtuallab/monty" -DOWNLOAD="https://files.pythonhosted.org/packages/3d/23/c8894953f21267a0f6ab6360665aef137562c112284ce68a8803f6ec9436/monty-2022.9.9.tar.gz" -MD5SUM="daef8fc3b65453eb7027816bf6466894" +DOWNLOAD="https://files.pythonhosted.org/packages/ae/35/f47e80a6082b27475db29bbf485fb6b214e254db64c5866e1665cf9e6600/monty-2024.5.15.tar.gz" +MD5SUM="c582c55302876fcfdf0cc5f6e29d3963" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3-setuptools-opt" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/more-itertools/more-itertools.SlackBuild b/python/more-itertools/more-itertools.SlackBuild index ad2e75c84c..5497caf053 100644 --- a/python/more-itertools/more-itertools.SlackBuild +++ b/python/more-itertools/more-itertools.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for more-itertools -# Copyright 2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2018-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=more-itertools VERSION=${VERSION:-4.1.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,12 +79,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG - -# Python 3 support. -if $(python3 -c 'import sys' 2>/dev/null); then - python3 setup.py install --root=$PKG -fi +python2 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/more-itertools/more-itertools.info b/python/more-itertools/more-itertools.info index e7a5a4d6b1..80d50239b5 100644 --- a/python/more-itertools/more-itertools.info +++ b/python/more-itertools/more-itertools.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/mypy/mypy.SlackBuild b/python/mypy/mypy.SlackBuild index edadfa83d9..db07edb032 100644 --- a/python/mypy/mypy.SlackBuild +++ b/python/mypy/mypy.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mypy -VERSION=${VERSION:-1.9.0} +VERSION=${VERSION:-1.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/mypy/mypy.info b/python/mypy/mypy.info index 4025b600ed..075f53638a 100644 --- a/python/mypy/mypy.info +++ b/python/mypy/mypy.info @@ -1,8 +1,8 @@ PRGNAM="mypy" -VERSION="1.9.0" +VERSION="1.10.0" HOMEPAGE="https://github.com/python/mypy" -DOWNLOAD="https://files.pythonhosted.org/packages/72/1e/a587a862c766a755a58b62d8c00aed11b74a15dc415c1bf5da7b607b0efd/mypy-1.9.0.tar.gz" -MD5SUM="cb49d141290487e31c067cbb9c8bc362" +DOWNLOAD="https://files.pythonhosted.org/packages/c3/b6/297734bb9f20ddf5e831cf4a83f422ddef5a29a33463999f0959d9cdc2df/mypy-1.10.0.tar.gz" +MD5SUM="fc3dad1171168682b7ddd185cba15cca" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="typing-extensions mypy_extensions" diff --git a/python/numpydoc/numpydoc.SlackBuild b/python/numpydoc/numpydoc.SlackBuild index 561a1b7962..fcc924288e 100644 --- a/python/numpydoc/numpydoc.SlackBuild +++ b/python/numpydoc/numpydoc.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for numpydoc -# Copyright 2015-2021 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2015-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=numpydoc -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,9 +79,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --root=$PKG +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl + +find $PKG -print1 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/python/numpydoc/numpydoc.info b/python/numpydoc/numpydoc.info index fb2fb9a65c..fee5d365c8 100644 --- a/python/numpydoc/numpydoc.info +++ b/python/numpydoc/numpydoc.info @@ -1,10 +1,10 @@ PRGNAM="numpydoc" -VERSION="1.1.0" +VERSION="1.7.0" HOMEPAGE="https://github.com/numpy/numpydoc" -DOWNLOAD="https://files.pythonhosted.org/packages/3d/fb/a70f636102045fc646656f2221c7fcdf92f7a9d71ba7c9875a949a58b3e8/numpydoc-1.1.0.tar.gz" -MD5SUM="2f05c4592e007b7a1fa37ddcb7e0e91b" +DOWNLOAD="https://files.pythonhosted.org/packages/76/69/d745d43617a476a5b5fb7f71555eceaca32e23296773c35decefa1da5463/numpydoc-1.7.0.tar.gz" +MD5SUM="7018ef86ed43dccaeb743127a2b3f542" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="Sphinx" +REQUIRES="python3-setuptools-opt Sphinx python3-tabulate" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/path.py/README b/python/path.py/README deleted file mode 100644 index 6d8a3a2c3b..0000000000 --- a/python/path.py/README +++ /dev/null @@ -1,3 +0,0 @@ -path.py implements a path objects as first-class entities, -allowing common operations on files to be invoked on those -path objects directly. diff --git a/python/path.py/path.py.SlackBuild b/python/path.py/path.py.SlackBuild deleted file mode 100644 index d67251e457..0000000000 --- a/python/path.py/path.py.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for path.py - -# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=path.py -VERSION=${VERSION:-11.0.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst CHANGES.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/path.py/path.py.info b/python/path.py/path.py.info deleted file mode 100644 index ab6185845d..0000000000 --- a/python/path.py/path.py.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="path.py" -VERSION="11.0.1" -HOMEPAGE="https://github.com/jaraco/path.py" -DOWNLOAD="https://pypi.python.org/packages/c0/8e/737f0e163c74ae0fc54ae3004843f6b630f6b29c83fe0d3c59e715e3d6f0/path.py-11.0.1.tar.gz" -MD5SUM="de65181c0efc12efc34d1ff1a0b1edfe" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python2-setuptools-scm" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/pendulum/README b/python/pendulum/README deleted file mode 100644 index 41e4340bdc..0000000000 --- a/python/pendulum/README +++ /dev/null @@ -1 +0,0 @@ -Handle datetimes, timedeltas and timezones in a more natural fashion. diff --git a/python/pendulum/pendulum.SlackBuild b/python/pendulum/pendulum.SlackBuild deleted file mode 100644 index f38cf345f6..0000000000 --- a/python/pendulum/pendulum.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for pendulum - -# Copyright 2016-2018 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=pendulum -VERSION=${VERSION:-2.0.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/pendulum/pendulum.info b/python/pendulum/pendulum.info deleted file mode 100644 index 25db651663..0000000000 --- a/python/pendulum/pendulum.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pendulum" -VERSION="2.0.3" -HOMEPAGE="https://pendulum.eustace.io/" -DOWNLOAD="https://files.pythonhosted.org/packages/c9/ec/93ed35ccd2b654b22992c78ed5e42e9061aa376b554f89e1d1db54b6c12a/pendulum-2.0.3.tar.gz" -MD5SUM="cc82dda147a51156a5a81817d58500f5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python2-dateutil pytzdata" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/pendulum/slack-desc b/python/pendulum/slack-desc deleted file mode 100644 index 00120d4f30..0000000000 --- a/python/pendulum/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pendulum: pendulum (Python datetimes made easy) -pendulum: -pendulum: Handle datetimes, timedeltas and timezones in a more natural fashion. -pendulum: -pendulum: Homepage: https://pendulum.eustace.io/ -pendulum: -pendulum: -pendulum: -pendulum: -pendulum: -pendulum: diff --git a/python/pikepdf/pikepdf.SlackBuild b/python/pikepdf/pikepdf.SlackBuild index ffd52a04d8..ff201dfdb7 100644 --- a/python/pikepdf/pikepdf.SlackBuild +++ b/python/pikepdf/pikepdf.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pikepdf -VERSION=${VERSION:-5.3.2} +VERSION=${VERSION:-6.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/pikepdf/pikepdf.info b/python/pikepdf/pikepdf.info index 841168a293..d5376e1eea 100644 --- a/python/pikepdf/pikepdf.info +++ b/python/pikepdf/pikepdf.info @@ -1,8 +1,8 @@ PRGNAM="pikepdf" -VERSION="5.3.2" +VERSION="6.0.1" HOMEPAGE="https://github.com/pikepdf/pikepdf" -DOWNLOAD="https://pypi.python.org/packages/source/p/pikepdf/pikepdf-5.3.2.tar.gz" -MD5SUM="367ed61eeff72e190c58eb8bc1f882a7" +DOWNLOAD="https://pypi.python.org/packages/source/p/pikepdf/pikepdf-6.0.1.tar.gz" +MD5SUM="38b50358ea6c38212dc99bd6944e165c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-lxml pybind11 python3-deprecation python3-setuptools_scm_git_archive" diff --git a/python/pilkit/README b/python/pilkit/README deleted file mode 100644 index 20d41940ee..0000000000 --- a/python/pilkit/README +++ /dev/null @@ -1 +0,0 @@ -A collection of utilities and processors for the Python Imaging Libary. diff --git a/python/pilkit/pilkit.SlackBuild b/python/pilkit/pilkit.SlackBuild deleted file mode 100644 index f70c27f422..0000000000 --- a/python/pilkit/pilkit.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for pilkit - -# Copyright 2014-2017 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=pilkit -VERSION=${VERSION:-2.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/pilkit/pilkit.info b/python/pilkit/pilkit.info deleted file mode 100644 index c83bf69162..0000000000 --- a/python/pilkit/pilkit.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pilkit" -VERSION="2.0" -HOMEPAGE="https://github.com/matthewwithanm/pilkit/" -DOWNLOAD="https://github.com/matthewwithanm/pilkit/archive/2.0/pilkit-2.0.tar.gz" -MD5SUM="2ca2718b278b911f06f0d405dfcf6434" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/pilkit/slack-desc b/python/pilkit/slack-desc deleted file mode 100644 index 2080607d66..0000000000 --- a/python/pilkit/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pilkit: pilkit (A collection of utilities and processors for Imaging Libary) -pilkit: -pilkit: PILKit is a collection of utilities for working with PIL (the Python -pilkit: Imaging Library). -pilkit: -pilkit: Homepage: https://github.com/matthewwithanm/pilkit/ -pilkit: -pilkit: -pilkit: -pilkit: -pilkit: diff --git a/python/pillowfight/README b/python/pillowfight/README deleted file mode 100644 index 598342a8c8..0000000000 --- a/python/pillowfight/README +++ /dev/null @@ -1,15 +0,0 @@ -Pillow is a replacement for PIL that works as a drop-in replacement. -Unlike PIL, it's actively maintained and easy to install. It's pretty -great. There's only one problem, which is that users must first -uninstall PIL before installing Pillow, as they share a namespace. - -This makes it very hard for Python modules or products that need to -run on a variety of configurations to easily depend on either PIL -or Pillow without inevitably breaking something (perhaps in subtle -ways). That makes it hard to safely transition. - -This package aims to "solve" that by providing a single dependency -that can intelligently depend on either PIL or Pillow, based on what's -already on the system. Packages that still need to work if PIL is -installed, but aim to transition to Pillow, can simply depend on the -pillowfight package. diff --git a/python/pillowfight/pillowfight.SlackBuild b/python/pillowfight/pillowfight.SlackBuild deleted file mode 100644 index 4707e9f47b..0000000000 --- a/python/pillowfight/pillowfight.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for pillowfight - -# Copyright 2016 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=pillowfight -VERSION=${VERSION:-0.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/pillowfight/pillowfight.info b/python/pillowfight/pillowfight.info deleted file mode 100644 index ad5d3e472d..0000000000 --- a/python/pillowfight/pillowfight.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pillowfight" -VERSION="0.2" -HOMEPAGE="https://github.com/beanbaginc/pillowfight" -DOWNLOAD="https://pypi.python.org/packages/69/a3/47d229ad4a1fa90dc550ffee9f400e71c902e879780dbf77f8ab032d9d33/pillowfight-0.2.tar.gz" -MD5SUM="5f5df64de2e2bf7599460da08dfca08d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/pillowfight/slack-desc b/python/pillowfight/slack-desc deleted file mode 100644 index ba2fce6d50..0000000000 --- a/python/pillowfight/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pillowfight: pillowfight (transition from PIL to Pillow) -pillowfight: -pillowfight: Pillow is a replacement for PIL that works as a drop-in replacement. -pillowfight: Unlike PIL, it's actively maintained and easy to install. It's -pillowfight: pretty great. There's only one problem, which is that users must -pillowfight: first uninstall PIL before installing Pillow, as they share a -pillowfight: namespace. -pillowfight: -pillowfight: Homepage: https://github.com/beanbaginc/pillowfight -pillowfight: -pillowfight: diff --git a/python/pluggy/pluggy.SlackBuild b/python/pluggy/pluggy.SlackBuild deleted file mode 100644 index bbc51acd0d..0000000000 --- a/python/pluggy/pluggy.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for pluggy - -# Copyright 2015-2019 Dimitris Zlatanidis Orestiada, Greece -# Copyright 2022 Isaac Yu <isaacyu@protonmail.com> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=pluggy -VERSION=${VERSION:-0.13.1} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG.rst LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/pluggy/slack-desc b/python/pluggy/slack-desc deleted file mode 100644 index 1632943694..0000000000 --- a/python/pluggy/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pluggy: pluggy (mechanisms for python) -pluggy: -pluggy: This is the plugin manager as used by pytest but stripped of pytest -pluggy: specific details. -pluggy: -pluggy: Homepage: https://github.com/pytest-dev/pluggy -pluggy: -pluggy: -pluggy: -pluggy: -pluggy: diff --git a/python/prompt_toolkit/README b/python/prompt_toolkit/README deleted file mode 100644 index 5f781a1d91..0000000000 --- a/python/prompt_toolkit/README +++ /dev/null @@ -1,3 +0,0 @@ -Library for building powerful interactive command lines in Python. -prompt_toolkit could be a replacement for GNU readline, but it can -be much more than that. diff --git a/python/prompt_toolkit/prompt_toolkit.SlackBuild b/python/prompt_toolkit/prompt_toolkit.SlackBuild deleted file mode 100644 index 6bc5e19ffc..0000000000 --- a/python/prompt_toolkit/prompt_toolkit.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for prompt_toolkit - -# Copyright 2015-2019 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=prompt_toolkit -VERSION=${VERSION:-2.0.10} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/prompt_toolkit/prompt_toolkit.info b/python/prompt_toolkit/prompt_toolkit.info deleted file mode 100644 index e8e53c1bee..0000000000 --- a/python/prompt_toolkit/prompt_toolkit.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="prompt_toolkit" -VERSION="2.0.10" -HOMEPAGE="https://github.com/jonathanslenders/python-prompt-toolkit" -DOWNLOAD="https://files.pythonhosted.org/packages/0c/37/7ad3bf3c6dbe96facf9927ddf066fdafa0f86766237cff32c3c7355d3b7c/prompt_toolkit-2.0.10.tar.gz" -MD5SUM="5016c523e603cd7119644fbc0f00ce53" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="wcwidth" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/prompt_toolkit/slack-desc b/python/prompt_toolkit/slack-desc deleted file mode 100644 index f415e8f935..0000000000 --- a/python/prompt_toolkit/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -prompt_toolkit: prompt_toolkit (interactive command lines) -prompt_toolkit: -prompt_toolkit: Library for building powerful interactive command lines in Python. -prompt_toolkit: prompt_toolkit could be a replacement for GNU readline, but it can be -prompt_toolkit: much more than that. -prompt_toolkit: -prompt_toolkit: Homepage: https://github.com/jonathanslenders/python-prompt-toolkit -prompt_toolkit: -prompt_toolkit: -prompt_toolkit: -prompt_toolkit: diff --git a/python/purl/README b/python/purl/README deleted file mode 100644 index f952015bcd..0000000000 --- a/python/purl/README +++ /dev/null @@ -1,4 +0,0 @@ -An immutable URL class for easy URL-building and manipulation. - -A simple, immutable URL class with a clean API for interrogation -and manipulation. Supports Python 2.6, 2.7 and 3.3. diff --git a/python/purl/purl.SlackBuild b/python/purl/purl.SlackBuild deleted file mode 100644 index d37c540624..0000000000 --- a/python/purl/purl.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for purl - -# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=purl -VERSION=${VERSION:-1.5} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION - -cp -a README.rst LICENSE $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/purl/purl.info b/python/purl/purl.info deleted file mode 100644 index c8fd3e074b..0000000000 --- a/python/purl/purl.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="purl" -VERSION="1.5" -HOMEPAGE="https://github.com/codeinthehole/purl" -DOWNLOAD="https://files.pythonhosted.org/packages/b8/f7/eb108f39ffcbebd6a1cc1030b912640fc28edb0146e8658b6a1aa60f1060/purl-1.5.tar.gz" -MD5SUM="2a10782a6f0c771f3f3319956d41f7ff" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/purl/slack-desc b/python/purl/slack-desc deleted file mode 100644 index b093f1bfb8..0000000000 --- a/python/purl/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -purl: purl (An immutable URL class for easy URL-building and manipulation) -purl: -purl: A simple, immutable URL class with a clean API for interrogation and -purl: manipulation. Supports Python 2.6, 2.7 and 3.3. -purl: -purl: -purl: -purl: -purl: Homepage: https://github.com/codeinthehole/purl -purl: -purl: diff --git a/python/pyPdf/README b/python/pyPdf/README deleted file mode 100644 index de81982790..0000000000 --- a/python/pyPdf/README +++ /dev/null @@ -1,16 +0,0 @@ -A Pure-Python library built as a PDF toolkit. It is capable of: - - extracting document information (title, author, ...), - splitting documents page by page, - merging documents page by page, - cropping pages, - merging multiple pages into a single page, - encrypting and decrypting PDF files. - -It should run on any Python platform without any dependencies on -external libraries. It can also work entirely on StringIO objects -rather than file streams, allowing for PDF manipulation in memory. It -is therefore a useful tool for websites that manage or manipulate PDFs. - -NOTE: the upstream project is NOT MAINTAINED. PyPDF2 is a fork based on -this project that provides enhanced features. diff --git a/python/pyPdf/pyPdf.info b/python/pyPdf/pyPdf.info deleted file mode 100644 index 817b2a041d..0000000000 --- a/python/pyPdf/pyPdf.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pyPdf" -VERSION="1.13" -HOMEPAGE="http://pybrary.net/pyPdf/" -DOWNLOAD="http://pybrary.net/pyPdf/pyPdf-1.13.tar.gz" -MD5SUM="7a75ef56f227b78ae62d6e38d4b6b1da" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Alan Alberghini" -EMAIL="414N@slacky.it" diff --git a/python/pyPdf/slack-desc b/python/pyPdf/slack-desc deleted file mode 100644 index 7bd23be9aa..0000000000 --- a/python/pyPdf/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pyPdf: pyPdf (pure Python library built as a PDF toolkit) -pyPdf: -pyPdf: It is capable of: -pyPdf: - extracting document information (title, author, ...), -pyPdf: - splitting documents page by page, -pyPdf: - merging documents page by page, -pyPdf: - cropping pages, -pyPdf: - merging multiple pages into a single page, -pyPdf: - encrypting and decrypting PDF files. -pyPdf: -pyPdf: Homepage: http://pybrary.net/pyPdf/ diff --git a/python/pyfiglet/pyfiglet.SlackBuild b/python/pyfiglet/pyfiglet.SlackBuild index 9260b3b684..0adc2a38de 100644 --- a/python/pyfiglet/pyfiglet.SlackBuild +++ b/python/pyfiglet/pyfiglet.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pyfiglet -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pyfiglet -VERSION=${VERSION:-0.7.5} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.0.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -62,7 +62,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ @@ -73,7 +72,7 @@ gzip -9 doc/$PRGNAM.1 install -D -m0644 doc/$PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README doc/figfont.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md doc/figfont.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/pyfiglet/pyfiglet.info b/python/pyfiglet/pyfiglet.info index 89ad2f7a89..9590065ae7 100644 --- a/python/pyfiglet/pyfiglet.info +++ b/python/pyfiglet/pyfiglet.info @@ -1,10 +1,10 @@ PRGNAM="pyfiglet" -VERSION="0.7.5" +VERSION="1.0.2" HOMEPAGE="https://github.com/pwaller/pyfiglet" -DOWNLOAD="https://pypi.python.org/packages/source/p/pyfiglet/pyfiglet-0.7.5.tar.gz" -MD5SUM="aa956f7af37926ab4b739c9ef87f3808" +DOWNLOAD="https://files.pythonhosted.org/packages/a0/f2/2649b2acace54f861eccd4ab163bfd914236fc93ddb1df02dad2a2552b14/pyfiglet-1.0.2.tar.gz" +MD5SUM="0cb431d9b6b11de98a635f5466455a63" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/pymongo/pymongo.SlackBuild b/python/pymongo/pymongo.SlackBuild index baee1974c3..f02e19d718 100644 --- a/python/pymongo/pymongo.SlackBuild +++ b/python/pymongo/pymongo.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pymongo -# Copyright 2015-2023 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2015-2024 Dimitris Zlatanidis Orestiada, Greece # Copyright 2013-2014 Christoph Willing, Australia # All rights reserved. # @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pymongo -VERSION=${VERSION:-4.6.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-4.7.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -87,7 +87,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.rst doc/tutorial.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE README.md doc/tutorial.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/pymongo/pymongo.info b/python/pymongo/pymongo.info index 829f2a9273..97cf59b5b4 100644 --- a/python/pymongo/pymongo.info +++ b/python/pymongo/pymongo.info @@ -1,8 +1,8 @@ PRGNAM="pymongo" -VERSION="4.6.1" +VERSION="4.7.2" HOMEPAGE="https://github.com/mongodb/mongo-python-driver" -DOWNLOAD="https://files.pythonhosted.org/packages/1d/f0/b5fcf9aee64ac3650a3df3bd1d7e8870838a82944fa4868768ab9db5416a/pymongo-4.6.1.tar.gz" -MD5SUM="7c854a2d1e2ce333ed875edfdd034e9c" +DOWNLOAD="https://files.pythonhosted.org/packages/af/7a/3401c2f16bff666e7b2d0416a345e2cb4059d27c98cb80aad66cb82dda69/pymongo-4.7.2.tar.gz" +MD5SUM="6ebe86590829e8fea43c384e299aeb4b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-setuptools-opt" diff --git a/python/pypy/pypy.SlackBuild b/python/pypy/pypy.SlackBuild index db7175ee10..57b2b9f890 100644 --- a/python/pypy/pypy.SlackBuild +++ b/python/pypy/pypy.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pypy -VERSION=${VERSION:-7.3.15} +VERSION=${VERSION:-7.3.16} SRCNAM=pypy2.7 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/pypy/pypy.info b/python/pypy/pypy.info index 218b9d4193..7e092fb796 100644 --- a/python/pypy/pypy.info +++ b/python/pypy/pypy.info @@ -1,10 +1,10 @@ PRGNAM="pypy" -VERSION="7.3.15" +VERSION="7.3.16" HOMEPAGE="https://www.pypy.org/" -DOWNLOAD="https://downloads.python.org/pypy/pypy2.7-v7.3.15-linux32.tar.bz2" -MD5SUM="30682b3a2afa20cd9679ed0582eaf68d" -DOWNLOAD_x86_64="https://downloads.python.org/pypy/pypy2.7-v7.3.15-linux64.tar.bz2" -MD5SUM_x86_64="1e58859cb8f1af76a6b91a7feceb53dd" +DOWNLOAD="https://downloads.python.org/pypy/pypy2.7-v7.3.16-linux32.tar.bz2" +MD5SUM="3c62b4c8d8ab8e38b7d260eea7d64904" +DOWNLOAD_x86_64="https://downloads.python.org/pypy/pypy2.7-v7.3.16-linux64.tar.bz2" +MD5SUM_x86_64="8efbdf5b721d1d2fab824c9cdf01ea7b" REQUIRES="" MAINTAINER="Yth - Arnaud" EMAIL="yth@ythogtha.org" diff --git a/python/pypy3/pypy3.SlackBuild b/python/pypy3/pypy3.SlackBuild index 519fdc9daf..031c898724 100644 --- a/python/pypy3/pypy3.SlackBuild +++ b/python/pypy3/pypy3.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pypy3 -VERSION=${VERSION:-7.3.15} +VERSION=${VERSION:-7.3.16} SRCNAM=pypy3.9 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/pypy3/pypy3.info b/python/pypy3/pypy3.info index 767b6cdd11..158131cfc6 100644 --- a/python/pypy3/pypy3.info +++ b/python/pypy3/pypy3.info @@ -1,10 +1,10 @@ PRGNAM="pypy3" -VERSION="7.3.15" +VERSION="7.3.16" HOMEPAGE="https://www.pypy.org/" -DOWNLOAD="https://downloads.python.org/pypy/pypy3.9-v7.3.15-linux32.tar.bz2" -MD5SUM="54227609e72be7d6afa41a37125600b9" -DOWNLOAD_x86_64="https://downloads.python.org/pypy/pypy3.9-v7.3.15-linux64.tar.bz2" -MD5SUM_x86_64="970f89d56dbfc7f9c722ba425c647945" +DOWNLOAD="https://downloads.python.org/pypy/pypy3.9-v7.3.16-linux32.tar.bz2" +MD5SUM="a53657ebe1aa4c10122c9a103b674ad7" +DOWNLOAD_x86_64="https://downloads.python.org/pypy/pypy3.9-v7.3.16-linux64.tar.bz2" +MD5SUM_x86_64="d97e99c14eac97e81275ae5548c2c372" REQUIRES="" MAINTAINER="Yth - Arnaud" EMAIL="yth@ythogtha.org" diff --git a/python/pytest/pytest.info b/python/pytest/pytest.info index fc5a4d8b63..f66a59d9d4 100644 --- a/python/pytest/pytest.info +++ b/python/pytest/pytest.info @@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pytest/pytest-3.8.2.t MD5SUM="8e7d324528a63c2dab64a10ae028e0f2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python2-py python2-attrs pluggy more-itertools python2-atomicwrites funcsigs python2-pathlib2" +REQUIRES="python2-py python2-attrs python2-pluggy more-itertools python2-atomicwrites funcsigs python2-pathlib2" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/python/python-PySnooper/python-PySnooper.SlackBuild b/python/python-PySnooper/python-PySnooper.SlackBuild index fa75dbc5c6..50a1783cd9 100644 --- a/python/python-PySnooper/python-PySnooper.SlackBuild +++ b/python/python-PySnooper/python-PySnooper.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python-PySnooper -# Copyright 2023 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2023-2024 Dimitris Zlatanidis Orestiada, Greece # Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python-PySnooper -VERSION=${VERSION:-1.1.1} +VERSION=${VERSION:-1.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -82,6 +82,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i "30d" setup.cfg + python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/python/python-PySnooper/python-PySnooper.info b/python/python-PySnooper/python-PySnooper.info index 41993b21be..941be8a3c2 100644 --- a/python/python-PySnooper/python-PySnooper.info +++ b/python/python-PySnooper/python-PySnooper.info @@ -1,10 +1,10 @@ PRGNAM="python-PySnooper" -VERSION="1.1.1" +VERSION="1.2.0" HOMEPAGE="https://github.com/cool-RR/PySnooper" -DOWNLOAD="https://files.pythonhosted.org/packages/e9/82/3f6d0f73c9fd19bf07953d788e34d1c64c766a03e54625bf9fe98d730822/PySnooper-1.1.1.tar.gz" -MD5SUM="8f64bea7d65ed9c617509ddaff60bba2" +DOWNLOAD="https://files.pythonhosted.org/packages/66/08/474e7891ff7107328404b46f42cdc9bf58b99404924d35933037cd0fb145/PySnooper-1.2.0.tar.gz" +MD5SUM="9b2fe060f46b0c3054e0c30b38cc313a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/python-importlib_metadata/README b/python/python-importlib_metadata/README deleted file mode 100644 index 628ad7454d..0000000000 --- a/python/python-importlib_metadata/README +++ /dev/null @@ -1,4 +0,0 @@ -importlib_metadata is a library which provides an API for accessing -an installed package's metadata, such as its entry points or its -top-level name. This functionality intends to replace most uses of -pkg_resources entry point API and metadata API. diff --git a/python/python-importlib_metadata/python-importlib_metadata.SlackBuild b/python/python-importlib_metadata/python-importlib_metadata.SlackBuild deleted file mode 100644 index f84063c950..0000000000 --- a/python/python-importlib_metadata/python-importlib_metadata.SlackBuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Slackware build script for python-importlib_metadata - -# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# Copyright 2022 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python-importlib_metadata -VERSION=${VERSION:-7.1.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -SRCNAM=importlib_metadata - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages/ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python-importlib_metadata/python-importlib_metadata.info b/python/python-importlib_metadata/python-importlib_metadata.info deleted file mode 100644 index 1f0efb96cd..0000000000 --- a/python/python-importlib_metadata/python-importlib_metadata.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python-importlib_metadata" -VERSION="7.1.0" -HOMEPAGE="https://importlib-metadata.readthedocs.io/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/i/importlib_metadata/importlib_metadata-7.1.0.tar.gz" -MD5SUM="aa0201673a892c5925ffb3622a6adeaa" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python-zipp" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python-importlib_metadata/slack-desc b/python/python-importlib_metadata/slack-desc deleted file mode 100644 index a14e1318e8..0000000000 --- a/python/python-importlib_metadata/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python-importlib_metadata: python-importlib_metadata (Python package metadata) -python-importlib_metadata: -python-importlib_metadata: importlib_metadata is a library which provides an API for accessing -python-importlib_metadata: an installed package's metadata, such as its entry points or its -python-importlib_metadata: top-level name. This functionality intends to replace most uses of -python-importlib_metadata: pkg_resources entry point API and metadata API. -python-importlib_metadata: -python-importlib_metadata: -python-importlib_metadata: -python-importlib_metadata: -python-importlib_metadata: diff --git a/python/python-mysql-replication/python-mysql-replication.SlackBuild b/python/python-mysql-replication/python-mysql-replication.SlackBuild index 439e830544..8617797374 100644 --- a/python/python-mysql-replication/python-mysql-replication.SlackBuild +++ b/python/python-mysql-replication/python-mysql-replication.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python-mysql-replication SRCNAM=mysql-replication -VERSION=${VERSION:-1.0.7} +VERSION=${VERSION:-1.0.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python-mysql-replication/python-mysql-replication.info b/python/python-mysql-replication/python-mysql-replication.info index 2d35516022..4cc3d64634 100644 --- a/python/python-mysql-replication/python-mysql-replication.info +++ b/python/python-mysql-replication/python-mysql-replication.info @@ -1,8 +1,8 @@ PRGNAM="python-mysql-replication" -VERSION="1.0.7" +VERSION="1.0.8" HOMEPAGE="https://github.com/julien-duponchelle/python-mysql-replication" -DOWNLOAD="https://files.pythonhosted.org/packages/40/c7/43da46437af8857e474cdb6d6cc270018a227abeee3f6672edb916210357/mysql-replication-1.0.7.tar.gz" -MD5SUM="33746e65168bb8849307b6e95fd8d5ff" +DOWNLOAD="https://files.pythonhosted.org/packages/65/3b/74c995490ee88c906df4008a6a30c3cb0f7426edd8ed2257faaab27273d7/mysql-replication-1.0.8.tar.gz" +MD5SUM="9004112b965b8dcd72c30c46e1be5ca0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pymysql" diff --git a/python/python-pcapy/python-pcapy.SlackBuild b/python/python-pcapy/python-pcapy.SlackBuild index fd1bd93670..eafdadf75e 100644 --- a/python/python-pcapy/python-pcapy.SlackBuild +++ b/python/python-pcapy/python-pcapy.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python-pcapy -SRCNAM=pcapy -VERSION=${VERSION:-0.11.4} +SRCNAM=pcapy-ng +VERSION=${VERSION:-1.0.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python-pcapy/python-pcapy.info b/python/python-pcapy/python-pcapy.info index abea62f2a2..3956daa295 100644 --- a/python/python-pcapy/python-pcapy.info +++ b/python/python-pcapy/python-pcapy.info @@ -1,8 +1,8 @@ PRGNAM="python-pcapy" -VERSION="0.11.4" +VERSION="1.0.9" HOMEPAGE="https://www.coresecurity.com/corelabs-research/open-source-tools/pcapy" -DOWNLOAD="https://github.com/CoreSecurity/pcapy/archive/0.11.4/pcapy-0.11.4.tar.gz" -MD5SUM="ccc0ece6114a095800c8764f85451677" +DOWNLOAD="https://github.com/stamparm/pcapy-ng/archive/1.0.9/pcapy-ng-1.0.9.tar.gz" +MD5SUM="5f17398bbe18c0679e0ed2d07c470a44" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python-smartypants/README b/python/python-smartypants/README deleted file mode 100644 index f91f30930a..0000000000 --- a/python/python-smartypants/README +++ /dev/null @@ -1,4 +0,0 @@ -smartypants.py is a Python fork of SmartyPants. - -Translate plain ASCII punctuation characters into "smart" typographic -punctuation HTML entities. diff --git a/python/python-smartypants/python-smartypants.SlackBuild b/python/python-smartypants/python-smartypants.SlackBuild deleted file mode 100644 index b52fc9fa0e..0000000000 --- a/python/python-smartypants/python-smartypants.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for python-smartypants - -# Copyright 2022 Steven Voges <Oregon, USA> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python-smartypants -SRCNAM=smartypants.py -VERSION=${VERSION:-2.0.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.rst COPYING docs/*.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python-smartypants/python-smartypants.info b/python/python-smartypants/python-smartypants.info deleted file mode 100644 index 6d5ce4d88c..0000000000 --- a/python/python-smartypants/python-smartypants.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python-smartypants" -VERSION="2.0.1" -HOMEPAGE="https://github.com/leohemsted/smartypants.py" -DOWNLOAD="https://github.com/leohemsted/smartypants.py/archive/v2.0.1/smartypants.py-2.0.1.tar.gz" -MD5SUM="27957540f4718e892039b2ed208c78f3" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/python/python-smartypants/slack-desc b/python/python-smartypants/slack-desc deleted file mode 100644 index ac1deaef3a..0000000000 --- a/python/python-smartypants/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python-smartypants: python-smartypants (Smart Punctuation for Web Sites) -python-smartypants: -python-smartypants: Translate plain ASCII punctuation characters into "smart" typographic -python-smartypants: punctuation HTML entities. -python-smartypants: -python-smartypants: Homepage: https://github.com/leohemsted/smartypants.py -python-smartypants: -python-smartypants: -python-smartypants: -python-smartypants: -python-smartypants: diff --git a/python/python-zipp/README b/python/python-zipp/README deleted file mode 100644 index 6498203e6d..0000000000 --- a/python/python-zipp/README +++ /dev/null @@ -1,2 +0,0 @@ -A pathlib-compatible Zipfile object wrapper. A backport of the Path -object. diff --git a/python/python-zipp/python-zipp.SlackBuild b/python/python-zipp/python-zipp.SlackBuild deleted file mode 100644 index 109e154d76..0000000000 --- a/python/python-zipp/python-zipp.SlackBuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -# Slackware build script for python-zipp - -# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# Copyright 2022 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python-zipp -VERSION=${VERSION:-3.18.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -SRCNAM=zipp - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages/ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst LICENSE $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python-zipp/python-zipp.info b/python/python-zipp/python-zipp.info deleted file mode 100644 index 549d99aa42..0000000000 --- a/python/python-zipp/python-zipp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python-zipp" -VERSION="3.18.1" -HOMEPAGE="https://github.com/jaraco/zipp" -DOWNLOAD="https://files.pythonhosted.org/packages/source/z/zipp/zipp-3.18.1.tar.gz" -MD5SUM="35d5af28231d6464fe2c2bea05d306dd" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-setuptools-opt" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/pluggy/README b/python/python2-pluggy/README index 588eb17442..588eb17442 100644 --- a/python/pluggy/README +++ b/python/python2-pluggy/README diff --git a/python/python3-pluggy/python3-pluggy.SlackBuild b/python/python2-pluggy/python2-pluggy.SlackBuild index 51dc975a0c..ef6b2874e7 100644 --- a/python/python3-pluggy/python3-pluggy.SlackBuild +++ b/python/python2-pluggy/python2-pluggy.SlackBuild @@ -1,9 +1,9 @@ #!/bin/bash -# Slackware build script for python3-pluggy +# Slackware build script for pluggy +# Copyright 2015-2019 Dimitris Zlatanidis Orestiada, Greece # Copyright 2022 Isaac Yu <isaacyu@protonmail.com> -# Copyright 2023-2024 Jeremy Hansen <jebrhansen+SBo@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,13 +25,14 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=python3-pluggy -SRCNAM=pluggy -VERSION=${VERSION:-1.4.0} +PRGNAM=python2-pluggy +VERSION=${VERSION:-0.13.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +SRCNAM=pluggy + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -64,7 +65,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --root=$PKG +python2 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/pluggy/pluggy.info b/python/python2-pluggy/python2-pluggy.info index 17fdcba932..22082499a2 100644 --- a/python/pluggy/pluggy.info +++ b/python/python2-pluggy/python2-pluggy.info @@ -1,4 +1,4 @@ -PRGNAM="pluggy" +PRGNAM="python2-pluggy" VERSION="0.13.1" HOMEPAGE="https://github.com/pytest-dev/pluggy" DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pluggy/pluggy-0.13.1.tar.gz" diff --git a/python/python3-pluggy/slack-desc b/python/python2-pluggy/slack-desc index 3b042787dc..4d8890c877 100644 --- a/python/python3-pluggy/slack-desc +++ b/python/python2-pluggy/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -python3-pluggy: python3-pluggy (mechanisms for python) -python3-pluggy: -python3-pluggy: This is the plugin manager as used by pytest but stripped of pytest -python3-pluggy: specific details. -python3-pluggy: -python3-pluggy: Homepage: https://github.com/pytest-dev/pluggy -python3-pluggy: -python3-pluggy: -python3-pluggy: -python3-pluggy: -python3-pluggy: +python2-pluggy: python2-pluggy (mechanisms for python) +python2-pluggy: +python2-pluggy: This is the plugin manager as used by pytest but stripped of pytest +python2-pluggy: specific details. +python2-pluggy: +python2-pluggy: Homepage: https://github.com/pytest-dev/pluggy +python2-pluggy: +python2-pluggy: +python2-pluggy: +python2-pluggy: +python2-pluggy: diff --git a/python/python2-swiftclient/README b/python/python2-swiftclient/README deleted file mode 100644 index a153117012..0000000000 --- a/python/python2-swiftclient/README +++ /dev/null @@ -1,5 +0,0 @@ -OpenStack Object Storage API Client Library. - -This is a python client for the Swift API. -There's a Python API (the swiftclient module), and a command-line script -(swift) diff --git a/python/python2-swiftclient/python2-swiftclient.info b/python/python2-swiftclient/python2-swiftclient.info deleted file mode 100644 index 2569452542..0000000000 --- a/python/python2-swiftclient/python2-swiftclient.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python2-swiftclient" -VERSION="3.2.0" -HOMEPAGE="https://www.openstack.org/" -DOWNLOAD="https://pypi.python.org/packages/34/f5/d4702a0715ae9ffe4d66c5d519504b18757c6573aaa10af3790a6bdcb7ce/python-swiftclient-3.2.0.tar.gz" -MD5SUM="95f57e4ec252edcb2ab934470b44ff76" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python2-pbr" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/python2-swiftclient/slack-desc b/python/python2-swiftclient/slack-desc deleted file mode 100644 index b5f78ab9f1..0000000000 --- a/python/python2-swiftclient/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python2-swiftclient: python2-swiftclient (OpenStack Object Storage API Client Library) -python2-swiftclient: -python2-swiftclient: This is a python client for the Swift API. There's a Python API -python2-swiftclient: (the swiftclient module), and a command-line script (swift). -python2-swiftclient: -python2-swiftclient: Homepage: https://www.openstack.org/ -python2-swiftclient: -python2-swiftclient: -python2-swiftclient: -python2-swiftclient: -python2-swiftclient: diff --git a/python/python2-unicodecsv/README b/python/python2-unicodecsv/README deleted file mode 100644 index 65f114ab66..0000000000 --- a/python/python2-unicodecsv/README +++ /dev/null @@ -1,2 +0,0 @@ -Python2's stdlib csv module is nice, but it doesn't support unicode. -This module is a drop-in replacement which *does*. diff --git a/python/python2-unicodecsv/python2-unicodecsv.SlackBuild b/python/python2-unicodecsv/python2-unicodecsv.SlackBuild deleted file mode 100644 index ec1d239b9f..0000000000 --- a/python/python2-unicodecsv/python2-unicodecsv.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for python-unicodecsv - -# Copyright 2015-2016 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python2-unicodecsv -SRCNAM=$( echo $PRGNAM | cut -d- -f2 ) -VERSION=${VERSION:-0.14.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python2-unicodecsv/python2-unicodecsv.info b/python/python2-unicodecsv/python2-unicodecsv.info deleted file mode 100644 index 41eed8b4c8..0000000000 --- a/python/python2-unicodecsv/python2-unicodecsv.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python2-unicodecsv" -VERSION="0.14.1" -HOMEPAGE="https://github.com/jdunck/python-unicodecsv" -DOWNLOAD="https://pypi.python.org/packages/source/u/unicodecsv/unicodecsv-0.14.1.tar.gz" -MD5SUM="c18ffe8ded29a4f429224877b2b34252" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/python2-unicodecsv/slack-desc b/python/python2-unicodecsv/slack-desc deleted file mode 100644 index 4db372563c..0000000000 --- a/python/python2-unicodecsv/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python2-unicodecsv: python2-unicodecsv (csv module) -python2-unicodecsv: -python2-unicodecsv: Python2's stdlib csv module is nice, but it doesn't support unicode. -python2-unicodecsv: This module is a drop-in replacement which *does*. -python2-unicodecsv: -python2-unicodecsv: Homepage: https://github.com/jdunck/python2-unicodecsv -python2-unicodecsv: -python2-unicodecsv: -python2-unicodecsv: -python2-unicodecsv: -python2-unicodecsv: diff --git a/python/python3-Flask-Cors/python3-Flask-Cors.SlackBuild b/python/python3-Flask-Cors/python3-Flask-Cors.SlackBuild index dc9de3a222..5f4074fbce 100644 --- a/python/python3-Flask-Cors/python3-Flask-Cors.SlackBuild +++ b/python/python3-Flask-Cors/python3-Flask-Cors.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-Flask-Cors -# Copyright 2022-23 fourtysixandtwo <fourtysixandtwo@sliderr.net> +# Copyright 2022-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-Flask-Cors -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-4.0.0} +SRCNAM=flask_cors +VERSION=${VERSION:-4.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,23 +50,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG diff --git a/python/python3-Flask-Cors/python3-Flask-Cors.info b/python/python3-Flask-Cors/python3-Flask-Cors.info index 0f80c0a0dc..1ae7545b95 100644 --- a/python/python3-Flask-Cors/python3-Flask-Cors.info +++ b/python/python3-Flask-Cors/python3-Flask-Cors.info @@ -1,8 +1,8 @@ PRGNAM="python3-Flask-Cors" -VERSION="4.0.0" +VERSION="4.0.1" HOMEPAGE="https://github.com/corydolphin/flask-cors" -DOWNLOAD="https://files.pythonhosted.org/packages/source/f/flask-cors/Flask-Cors-4.0.0.tar.gz" -MD5SUM="0ccfa375e744200243d85719b38cdbc6" +DOWNLOAD="https://files.pythonhosted.org/packages/source/f/flask_cors/flask_cors-4.0.1.tar.gz" +MD5SUM="1e1eac64500b970dcb2112f0c6989664" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="Flask" diff --git a/python/python3-PyMuPDF/README b/python/python3-PyMuPDF/README index da799f0765..9a35043dd8 100644 --- a/python/python3-PyMuPDF/README +++ b/python/python3-PyMuPDF/README @@ -12,8 +12,13 @@ can also be handled like documents: .png, .jpg, .bmp, .tiff, etc. krop (available on SBo) can use PyMuPDF for both rendering and cropping. -To be on the safe side, keep the version of python3-PyMuPDF in sync with -the mupdf version. +Mupdf is not a dependency because all of the necessary code is built +into PyMuPDF. -Optional autodetected dependencies are python-fonttools, tesseract, and +Optional runtime dependencies are python3-fonttools, tesseract, and python3-pymupdf_fonts. + +To enable Tesseract OCR functions in PyMuPDF, the software must be +installed and the system environment variable TESSDATA_PREFIX must +be defined as follows: +export TESSDATA_PREFIX=/usr/share/tessdata diff --git a/python/python3-PyMuPDF/python3-PyMuPDF.SlackBuild b/python/python3-PyMuPDF/python3-PyMuPDF.SlackBuild index 1d4a8b7a23..c81c259d1a 100644 --- a/python/python3-PyMuPDF/python3-PyMuPDF.SlackBuild +++ b/python/python3-PyMuPDF/python3-PyMuPDF.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-PyMuPDF -VERSION=${VERSION:-1.23.26} +VERSION=${VERSION:-1.24.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -52,27 +52,23 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf ${PRGNAM:8}-$VERSION +rm -rf ${PRGNAM:8}-$VERSION mupdf* +tar xvf $CWD/mupdf-*-source.tar.lz +mv mupdf* mupdf tar xvf $CWD/${PRGNAM:8}-$VERSION.tar.gz cd ${PRGNAM:8}-$VERSION -chown -R root:root . -find -L . \ +chown -R root:root . ../mupdf +find -L . ../mupdf \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sed -i -e 's/"libclang", "swig", //' pyproject.toml +sed -i -e "s/ret.append([ ]*'libclang'[ ]*)/pass/" \ + -e "s/ret.append([ ]*'swig'[ ]*)/pass/" \ + setup.py -mv src_classic/fitz_old.i src_classic/fitz.i - -sed -i "s/fitz_old/fitz/g" setup.py \ - src_classic/__init__.py src_classic/utils.py - -export PYMUPDF_SETUP_MUPDF_BUILD= -export PYMUPDF_SETUP_IMPLEMENTATIONS=a -export PYMUPDF_INCLUDES=/usr/include:/usr/include/mupdf:/usr/include/freetype2 -export TESSDATA_PREFIX=/usr/share/tessdata +export PYMUPDF_SETUP_MUPDF_BUILD=../mupdf python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl diff --git a/python/python3-PyMuPDF/python3-PyMuPDF.info b/python/python3-PyMuPDF/python3-PyMuPDF.info index 6fbc4eef4d..b549a5c6f9 100644 --- a/python/python3-PyMuPDF/python3-PyMuPDF.info +++ b/python/python3-PyMuPDF/python3-PyMuPDF.info @@ -1,10 +1,12 @@ PRGNAM="python3-PyMuPDF" -VERSION="1.23.26" +VERSION="1.24.3" HOMEPAGE="https://github.com/pymupdf/PyMuPDF" -DOWNLOAD="https://github.com/pymupdf/PyMuPDF/archive/1.23.26/PyMuPDF-1.23.26.tar.gz" -MD5SUM="3dd25058cbee9f45e823806901b804e8" +DOWNLOAD="https://github.com/pymupdf/PyMuPDF/archive/1.24.3/PyMuPDF-1.24.3.tar.gz \ + https://mupdf.com/downloads/archive/mupdf-1.24.2-source.tar.lz" +MD5SUM="cba3f4e2c59408a66b60abb2798c01c8 \ + d8f835e414202946d1c6c8192dd4315d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="mupdf python3-psutil %README%" +REQUIRES="python3-psutil %README%" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org" diff --git a/python/python3-ZConfig/python3-ZConfig.SlackBuild b/python/python3-ZConfig/python3-ZConfig.SlackBuild index 42efe8023f..b96b71c9cd 100644 --- a/python/python3-ZConfig/python3-ZConfig.SlackBuild +++ b/python/python3-ZConfig/python3-ZConfig.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-ZConfig -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-4.0} +SRCNAM=zconfig +VERSION=${VERSION:-4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-ZConfig/python3-ZConfig.info b/python/python3-ZConfig/python3-ZConfig.info index f338c0ce30..8d77e17bb1 100644 --- a/python/python3-ZConfig/python3-ZConfig.info +++ b/python/python3-ZConfig/python3-ZConfig.info @@ -1,8 +1,8 @@ PRGNAM="python3-ZConfig" -VERSION="4.0" +VERSION="4.1" HOMEPAGE="https://github.com/zopefoundation/ZConfig/" -DOWNLOAD="https://pypi.python.org/packages/source/Z/ZConfig/ZConfig-4.0.tar.gz" -MD5SUM="10b37b49d50a5006a7135cb086b72184" +DOWNLOAD="https://pypi.python.org/packages/source/z/zconfig/zconfig-4.1.tar.gz" +MD5SUM="2f0fd6de7d56ca7931453f486f347a39" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-aiohttp/python3-aiohttp.SlackBuild b/python/python3-aiohttp/python3-aiohttp.SlackBuild index 691040d5f7..1f43b179fd 100644 --- a/python/python3-aiohttp/python3-aiohttp.SlackBuild +++ b/python/python3-aiohttp/python3-aiohttp.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-aiohttp -VERSION=${VERSION:-3.9.4} +VERSION=${VERSION:-3.9.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-aiohttp/python3-aiohttp.info b/python/python3-aiohttp/python3-aiohttp.info index 63c489598d..b17dc44277 100644 --- a/python/python3-aiohttp/python3-aiohttp.info +++ b/python/python3-aiohttp/python3-aiohttp.info @@ -1,8 +1,8 @@ PRGNAM="python3-aiohttp" -VERSION="3.9.4" +VERSION="3.9.5" HOMEPAGE="https://aiohttp.readthedocs.io/en/stable/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/a/aiohttp/aiohttp-3.9.4.tar.gz" -MD5SUM="f833062e805c0f3cf42a720b969d649c" +DOWNLOAD="https://files.pythonhosted.org/packages/source/a/aiohttp/aiohttp-3.9.5.tar.gz" +MD5SUM="14829a5ea507c8219e3f679fceeb5585" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-async-timeout python3-attrs python3-yarl python3-aiosignal" diff --git a/python/python3-aksharamukha/README b/python/python3-aksharamukha/README index 9bbd61968b..11a95b9de4 100644 --- a/python/python3-aksharamukha/README +++ b/python/python3-aksharamukha/README @@ -4,3 +4,13 @@ transliteration between the main Indian scripts along with sinhala. Apart from simple mapping of characters it implements various script language-specific conventions.Aksharamukha supports 120 scripts. +Some scripts use diacritics to better represent the phonetics in +english.To transliterate to other language from english Use the +compose function in KDE for easier usage of diacritrics. +you can enable it in systemsettings->Input Devices->Keyboard +->Advanced->select configure keyboard option ->position of compose key. +Then you can select which key you want to activate. + +For example if you enabled RightAlt key, to type á first press +RightAlt key then type '+a you will automatically get á afterwards +the compose key is released. diff --git a/python/python3-aksharamukha/python3-aksharamukha.SlackBuild b/python/python3-aksharamukha/python3-aksharamukha.SlackBuild index 66290962da..0bfd757fe5 100644 --- a/python/python3-aksharamukha/python3-aksharamukha.SlackBuild +++ b/python/python3-aksharamukha/python3-aksharamukha.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-aksharamukha -# Copyright 2023 Vijay Marcel +# Copyright 2023-2024 Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-aksharamukha -VERSION=${VERSION:-2.1.2} +VERSION=${VERSION:-2.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -84,10 +84,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --prefix=/usr --root=$PKG --optimize=1 +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" python3 setup.py install --prefix=/usr --root=$PKG --optimize=1 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/python/python3-aksharamukha/python3-aksharamukha.info b/python/python3-aksharamukha/python3-aksharamukha.info index 1af65368de..92e272cc8a 100644 --- a/python/python3-aksharamukha/python3-aksharamukha.info +++ b/python/python3-aksharamukha/python3-aksharamukha.info @@ -1,11 +1,11 @@ PRGNAM="python3-aksharamukha" -VERSION="2.1.2" +VERSION="2.2.2" HOMEPAGE="https://github.com/virtualvinodh/aksharamukha-python" -DOWNLOAD="https://pypi.io/packages/source/a/aksharamukha/aksharamukha-2.1.2.tar.gz \ +DOWNLOAD="https://pypi.io/packages/source/a/aksharamukha/aksharamukha-2.2.2.tar.gz \ https://www.gnu.org/licenses/agpl-3.0.txt \ https://www.gnu.org/licenses/gpl-3.0.txt \ https://github.com/lecramyajiv/akshara-doc/archive/1.0/akshara-doc-1.0.tar.gz" -MD5SUM="4a272bc8daa35e0df603ab48dbe9d5b4 \ +MD5SUM="bb477c7d9181f4982fb8dc7f6635c3d6 \ eb1e647870add0502f8f010b19de32af \ 1ebbd3e34237af26da5dc08a4e440464 \ 1d287bc9c57a0b65489754c30917264d" diff --git a/python/python3-argcomplete/README b/python/python3-argcomplete/README index f1a06888c1..7f94cacc03 100644 --- a/python/python3-argcomplete/README +++ b/python/python3-argcomplete/README @@ -9,7 +9,3 @@ It makes two assumptions: * You're using bash as your shell * You're using argparse to manage your command line arguments/options - -NOTE: -Any version newer than this requires setuptools>=67.7.2 - diff --git a/python/python3-argcomplete/python3-argcomplete.SlackBuild b/python/python3-argcomplete/python3-argcomplete.SlackBuild index c8299f6bf8..9fc0e02978 100644 --- a/python/python3-argcomplete/python3-argcomplete.SlackBuild +++ b/python/python3-argcomplete/python3-argcomplete.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-argcomplete -VERSION=${VERSION:-3.0.8} +VERSION=${VERSION:-3.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -82,7 +82,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 -m build --wheel --no-isolation +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/python/python3-argcomplete/python3-argcomplete.info b/python/python3-argcomplete/python3-argcomplete.info index dacb5bdf40..8afe1d7f5d 100644 --- a/python/python3-argcomplete/python3-argcomplete.info +++ b/python/python3-argcomplete/python3-argcomplete.info @@ -1,10 +1,10 @@ PRGNAM="python3-argcomplete" -VERSION="3.0.8" +VERSION="3.3.0" HOMEPAGE="https://github.com/kislyuk/argcomplete" -DOWNLOAD="https://pypi.io/packages/source/a/argcomplete/argcomplete-3.0.8.tar.gz" -MD5SUM="6f17ed70c9cb961a31b79dd8cbdfc2ba" +DOWNLOAD="https://pypi.io/packages/source/a/argcomplete/argcomplete-3.3.0.tar.gz" +MD5SUM="255e2c9f2cdb18f88d1dc8de9b78a072" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python-importlib_metadata" +REQUIRES="python-importlib_metadata python3-setuptools-opt" MAINTAINER="Vijay Marcel" EMAIL="vijaymarcel@outlook.com" diff --git a/python/python3-astroid/python3-astroid.SlackBuild b/python/python3-astroid/python3-astroid.SlackBuild index e106c9ffcc..4f7bbe5381 100644 --- a/python/python3-astroid/python3-astroid.SlackBuild +++ b/python/python3-astroid/python3-astroid.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-astroid -# Copyright 2022-2023 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2022-2024 Dimitris Zlatanidis Orestiada, Greece # Copyright 2018-2019 Markus Rinne Finland # All rights reserved. # @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-astroid SRCNAM=astroid -VERSION=${VERSION:-3.0.2} +VERSION=${VERSION:-3.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-astroid/python3-astroid.info b/python/python3-astroid/python3-astroid.info index 4a58edf2ff..ab7bed0b9f 100644 --- a/python/python3-astroid/python3-astroid.info +++ b/python/python3-astroid/python3-astroid.info @@ -1,8 +1,8 @@ PRGNAM="python3-astroid" -VERSION="3.0.2" +VERSION="3.2.0" HOMEPAGE="https://github.com/PyCQA/astroid" -DOWNLOAD="https://files.pythonhosted.org/packages/58/03/c44924529da62cfa77a4a8f8fd5b0ac687f6f17dc68afd24d783d2046dfa/astroid-3.0.2.tar.gz" -MD5SUM="978338f294cfabcc5aaa1b7db833ca34" +DOWNLOAD="https://files.pythonhosted.org/packages/b6/e8/f86aa1fd91b7fa5b51ed53c9a06a94dba7cc388b51cb712e8721c41605ef/astroid-3.2.0.tar.gz" +MD5SUM="95091b8798bbffcc43e33a32e274ae26" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-setuptools-opt typing-extensions" diff --git a/python/python3-babel/README b/python/python3-babel/README deleted file mode 100644 index 292ad0fb52..0000000000 --- a/python/python3-babel/README +++ /dev/null @@ -1,10 +0,0 @@ -babel (python internationalization tools) - -Babel is a collection of tools for internationalizing Python apps. -It's composed of two major parts: -- tools to build and work with gettext message catalogs; -- a Python interface to the CLDR (Common Locale Data Repository), - providing access to various locale display names, localized number - and date formatting, etc. - -The pytz dependency must be built with optional Python 3 support. diff --git a/python/python3-babel/python3-babel.SlackBuild b/python/python3-babel/python3-babel.SlackBuild deleted file mode 100644 index bc8f3ad9e8..0000000000 --- a/python/python3-babel/python3-babel.SlackBuild +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-babel -# -# Copyright 2021 Yth | Pont-en-Royans, France | yth@ythogtha.org -# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-babel -VERSION=${VERSION:-2.14.0} -CLDRVER=${CLDRVER:-43.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -SRCNAM=babel - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -sed -i "s/getiterator/iter/" scripts/import_cldr.py # support Python 3.9 -sed -i "s/elem.getchildren()/list(elem)/" scripts/import_cldr.py # support Python 3.9 -ln -s $CWD/cldr-common-$CLDRVER.zip cldr/ -python3 setup.py import_cldr -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS* CHANGES* CONTRIBUTING* LICENSE* README* \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-babel/python3-babel.info b/python/python3-babel/python3-babel.info deleted file mode 100644 index 9e5f31f41a..0000000000 --- a/python/python3-babel/python3-babel.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="python3-babel" -VERSION="2.14.0" -HOMEPAGE="http://babel.pocoo.org/" -DOWNLOAD="https://github.com/python-babel/babel/archive/v2.14.0/babel-2.14.0.tar.gz \ - http://unicode.org/Public/cldr/43/cldr-common-43.0.zip" -MD5SUM="6e152ddfd2fbf4ea9c9c6513d23964c0 \ - 29433ac732f0fe62a98b5ab135479162" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="pytz" -MAINTAINER="Yth - Arnaud" -EMAIL="yth@ythogtha.org" diff --git a/python/python3-babel/slack-desc b/python/python3-babel/slack-desc deleted file mode 100644 index 3da4910178..0000000000 --- a/python/python3-babel/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-babel: python3-babel (python internationalization tools) -python3-babel: -python3-babel: Babel is a collection of tools for internationalizing Python apps. -python3-babel: It's composed of two major parts: -python3-babel: - tools to build and work with gettext message catalogs; -python3-babel: - a Python interface to the CLDR (Common Locale Data Repository), -python3-babel: providing access to various locale display names, localized number -python3-babel: and date formatting, etc. -python3-babel: -python3-babel: homepage: http://babel.edgewall.org/ -python3-babel: diff --git a/python/python3-babelfish/python3-babelfish.SlackBuild b/python/python3-babelfish/python3-babelfish.SlackBuild index 3725d12903..efabb1706d 100644 --- a/python/python3-babelfish/python3-babelfish.SlackBuild +++ b/python/python3-babelfish/python3-babelfish.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-babelfish -# Copyright 2022 fourtysixandtwo <fourtysixandtwo@sliderr.net> +# Copyright 2022-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-babelfish SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.6.0} +VERSION=${VERSION:-0.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -51,20 +48,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG @@ -76,11 +59,15 @@ cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ + +# to get rid of version warning +sed -i '/^importlib-metadata/ s/4.6/7.1.0/' pyproject.toml -python3 setup.py install --root=$PKG +python3 -m build --no-isolation +python3 -m installer -d "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/python3-babelfish/python3-babelfish.info b/python/python3-babelfish/python3-babelfish.info index d3ab04789f..fd24d42956 100644 --- a/python/python3-babelfish/python3-babelfish.info +++ b/python/python3-babelfish/python3-babelfish.info @@ -1,10 +1,10 @@ PRGNAM="python3-babelfish" -VERSION="0.6.0" +VERSION="0.6.1" HOMEPAGE="https://github.com/Diaoul/babelfish" -DOWNLOAD="https://files.pythonhosted.org/packages/source/b/babelfish/babelfish-0.6.0.tar.gz" -MD5SUM="985464e05a7fd275d650347af8aa2439" +DOWNLOAD="https://files.pythonhosted.org/packages/source/b/babelfish/babelfish-0.6.1.tar.gz" +MD5SUM="a3ef27e5b12c795d48aa6fa4005d2826" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3-poetry-core python-importlib_metadata" MAINTAINER="fourtysixandtwo" EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-backports_tarfile/python3-backports_tarfile.SlackBuild b/python/python3-backports_tarfile/python3-backports_tarfile.SlackBuild index 96e108b024..1ee7346e72 100644 --- a/python/python3-backports_tarfile/python3-backports_tarfile.SlackBuild +++ b/python/python3-backports_tarfile/python3-backports_tarfile.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-backports_tarfile -SRCNAM=backports.tarfile -VERSION=${VERSION:-1.0.0} +SRCNAM=backports_tarfile +VERSION=${VERSION:-1.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-backports_tarfile/python3-backports_tarfile.info b/python/python3-backports_tarfile/python3-backports_tarfile.info index e248a767d4..d1d48ccd32 100644 --- a/python/python3-backports_tarfile/python3-backports_tarfile.info +++ b/python/python3-backports_tarfile/python3-backports_tarfile.info @@ -1,8 +1,8 @@ PRGNAM="python3-backports_tarfile" -VERSION="1.0.0" +VERSION="1.1.1" HOMEPAGE="https://github.com/jaraco/backports.tarfile" -DOWNLOAD="https://files.pythonhosted.org/packages/source/b/backports.tarfile/backports.tarfile-1.0.0.tar.gz" -MD5SUM="2cdf557717675495f45f27d9980c6a57" +DOWNLOAD="https://files.pythonhosted.org/packages/source/b/backports_tarfile/backports_tarfile-1.1.1.tar.gz" +MD5SUM="170fa2ce05030f85bf50caf111d83ed4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-setuptools-opt" diff --git a/python/python3-blinker/python3-blinker.SlackBuild b/python/python3-blinker/python3-blinker.SlackBuild index e0d2b5e415..fc553a7f33 100644 --- a/python/python3-blinker/python3-blinker.SlackBuild +++ b/python/python3-blinker/python3-blinker.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-blinker SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.7.0} +VERSION=${VERSION:-1.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,7 +76,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a docs/ PKG-INFO CHANGES.rst README.rst LICENSE.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a docs/ PKG-INFO CHANGES.rst README.md LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/python3-blinker/python3-blinker.info b/python/python3-blinker/python3-blinker.info index c9af2f652e..3c5b1cbc92 100644 --- a/python/python3-blinker/python3-blinker.info +++ b/python/python3-blinker/python3-blinker.info @@ -1,8 +1,8 @@ PRGNAM="python3-blinker" -VERSION="1.7.0" +VERSION="1.8.2" HOMEPAGE="https://pypi.python.org/pypi/blinker/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/b/blinker/blinker-1.7.0.tar.gz" -MD5SUM="0306b831281e9918ffb0ac6e3e18b47f" +DOWNLOAD="https://files.pythonhosted.org/packages/source/b/blinker/blinker-1.8.2.tar.gz" +MD5SUM="ce2f9fb3bc0c0000db11f012f5f5afda" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-setuptools-opt" diff --git a/python/python3-boto3/python3-boto3.SlackBuild b/python/python3-boto3/python3-boto3.SlackBuild index 3343badbf5..c7a0500c75 100644 --- a/python/python3-boto3/python3-boto3.SlackBuild +++ b/python/python3-boto3/python3-boto3.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-boto3 -VERSION=${VERSION:-1.34.14} +VERSION=${VERSION:-1.34.99} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-boto3/python3-boto3.info b/python/python3-boto3/python3-boto3.info index 6d013d3d68..99a3fb7b0a 100644 --- a/python/python3-boto3/python3-boto3.info +++ b/python/python3-boto3/python3-boto3.info @@ -1,8 +1,8 @@ PRGNAM="python3-boto3" -VERSION="1.34.14" +VERSION="1.34.99" HOMEPAGE="https://aws.amazon.com/sdk-for-python/" -DOWNLOAD="https://github.com/boto/boto3/archive/1.34.14/boto3-1.34.14.tar.gz" -MD5SUM="3f35d2664447ec738ac8d5284077edd1" +DOWNLOAD="https://github.com/boto/boto3/archive/1.34.99/boto3-1.34.99.tar.gz" +MD5SUM="584b99efa57fbac24f98dce51dc90ce1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="s3transfer" diff --git a/python/python3-bsdiff4/README b/python/python3-bsdiff4/README new file mode 100644 index 0000000000..88ff0ba161 --- /dev/null +++ b/python/python3-bsdiff4/README @@ -0,0 +1,12 @@ +binary diff and patch using the BSDIFF4-format + +The code is mostly derived from cx_bsdiff (written by Anthony +Tuininga, http://cx-bsdiff.sourceforge.net/). The cx_bsdiff code in +turn was derived from bsdiff, the standalone utility produced for BSD +which can be found at http://www.daemonology.net/bsdiff. In addition +to the two functions (diff and patch) cx_bsdiff provides, this package +includes: + +an interface to the BSDIFF4-format + +command line interfaces: bsdiff4 and bspatch4 diff --git a/python/alabaster/alabaster.SlackBuild b/python/python3-bsdiff4/python3-bsdiff4.SlackBuild index ffc51ad38c..749f2e7e39 100644 --- a/python/alabaster/alabaster.SlackBuild +++ b/python/python3-bsdiff4/python3-bsdiff4.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for alabaster +# Slackware build script for python3-bsdiff4 -# Copyright 2017 Nikos Giotis <nikos.giotis@gmail.com> +# Copyright 2024, Lockywolf # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,16 +22,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Update 2023-11-25: Removed python2 support - cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=alabaster -VERSION=${VERSION:-0.7.13} +PRGNAM=python3-bsdiff4 +VERSION=${VERSION:-1.2.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +TGZNAM=bsdiff4 + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -61,6 +61,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -71,9 +74,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $TGZNAM-$VERSION +tar xvf $CWD/$TGZNAM-$VERSION.tar.gz +cd $TGZNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -86,8 +89,10 @@ python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ +LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/python3-bsdiff4/python3-bsdiff4.info b/python/python3-bsdiff4/python3-bsdiff4.info new file mode 100644 index 0000000000..c031fc66f7 --- /dev/null +++ b/python/python3-bsdiff4/python3-bsdiff4.info @@ -0,0 +1,10 @@ +PRGNAM="python3-bsdiff4" +VERSION="1.2.4" +HOMEPAGE="https://pypi.org/project/bsdiff4/" +DOWNLOAD="https://files.pythonhosted.org/packages/58/b2/ccf01309dda2c08e0600027bc0f5a99534c91f2f8728b5009fc363df6c2c/bsdiff4-1.2.4.tar.gz" +MD5SUM="ebc06d059f3c4ed4c4a5b952f55ae239" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Lockywolf" +EMAIL="for_sbo.python3-bsdiff4_2024-04-32@lockywolf.net" diff --git a/graphics/kImageAnnotator/slack-desc b/python/python3-bsdiff4/slack-desc index 30f29d40bb..24299a8e27 100644 --- a/graphics/kImageAnnotator/slack-desc +++ b/python/python3-bsdiff4/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -kImageAnnotator: kImageAnnotator (Tool for annotating images) -kImageAnnotator: -kImageAnnotator: Tool for annotating images -kImageAnnotator: -kImageAnnotator: Homepage: https://github.com/ksnip/kImageAnnotator -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: +python3-bsdiff4: python3-bsdiff4 (binary diff and patch using the BSDIFF4-format) +python3-bsdiff4: +python3-bsdiff4: Python binding for bsdiff4. +python3-bsdiff4: +python3-bsdiff4: +python3-bsdiff4: +python3-bsdiff4: +python3-bsdiff4: +python3-bsdiff4: +python3-bsdiff4: +python3-bsdiff4: diff --git a/python/python3-build/README b/python/python3-build/README deleted file mode 100644 index 204337b288..0000000000 --- a/python/python3-build/README +++ /dev/null @@ -1,9 +0,0 @@ -A simple, correct PEP517 package builder. - -NOTE: - Has a soft requirement for python-importlib_metadata (and python-zipp) - which should be installed as it fixes a stdlib bug, but newer versions - have a circular dep on this slackbuild so cannot be built before it. - Therefore it will NOT be added to REQUIRES here. - - This change will not affect most python builds. diff --git a/python/python3-build/python3-build.SlackBuild b/python/python3-build/python3-build.SlackBuild deleted file mode 100644 index bed9b2dd61..0000000000 --- a/python/python3-build/python3-build.SlackBuild +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-build - -# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2022 toolonely <lonely_@tutanota.com> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20230507 46and2: New maintainer, updated version and deps. -# -build process changed -# 20231212 46and2: Remove python-importlib_metadata as dep, see README. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-build -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.2.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m flit_core.wheel -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - PKG-INFO \ - README.md \ - LICENSE \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-build/python3-build.info b/python/python3-build/python3-build.info deleted file mode 100644 index ad5c5be3b2..0000000000 --- a/python/python3-build/python3-build.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-build" -VERSION="1.2.1" -HOMEPAGE="https://github.com/pypa/build" -DOWNLOAD="https://files.pythonhosted.org/packages/source/b/build/build-1.2.1.tar.gz" -MD5SUM="9675d7b278f4533b9b75701e6e87390b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-pyproject-hooks" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-build/slack-desc b/python/python3-build/slack-desc deleted file mode 100644 index e81b98eb3b..0000000000 --- a/python/python3-build/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-build: python3-build (a simple, correct PEP517 package builder) -python3-build: -python3-build: Homepage: https://github.com/pypa/build -python3-build: -python3-build: -python3-build: -python3-build: -python3-build: -python3-build: -python3-build: -python3-build: diff --git a/python/python3-cairocffi/python3-cairocffi.SlackBuild b/python/python3-cairocffi/python3-cairocffi.SlackBuild index 31b9d1d7f3..a8cd54b8af 100644 --- a/python/python3-cairocffi/python3-cairocffi.SlackBuild +++ b/python/python3-cairocffi/python3-cairocffi.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-cairocffi SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.6.1} +VERSION=${VERSION:-1.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-cairocffi/python3-cairocffi.info b/python/python3-cairocffi/python3-cairocffi.info index 093d5ec76b..443405dfff 100644 --- a/python/python3-cairocffi/python3-cairocffi.info +++ b/python/python3-cairocffi/python3-cairocffi.info @@ -1,8 +1,8 @@ PRGNAM="python3-cairocffi" -VERSION="1.6.1" +VERSION="1.7.0" HOMEPAGE="https://github.com/Kozea/cairocffi" -DOWNLOAD="https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-1.6.1.tar.gz" -MD5SUM="57cd3346d099e2b4efbe5fad1bf085fc" +DOWNLOAD="https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-1.7.0.tar.gz" +MD5SUM="45546b73a7ec182d44340df50b5ce7a3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-pytest-runner" diff --git a/python/python3-cheroot/python3-cheroot.SlackBuild b/python/python3-cheroot/python3-cheroot.SlackBuild index 37bbafe3f2..42572eef31 100644 --- a/python/python3-cheroot/python3-cheroot.SlackBuild +++ b/python/python3-cheroot/python3-cheroot.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-cheroot -# Copyright 2022-23 fourtysixandtwo <fourtysixandtwo@sliderr.net> +# Copyright 2022-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-cheroot SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-10.0.0} +VERSION=${VERSION:-10.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,23 +50,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG @@ -82,7 +65,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -python3 setup.py install --root=$PKG +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + +python3 -m build --no-isolation +python3 -m installer -d "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/python3-cheroot/python3-cheroot.info b/python/python3-cheroot/python3-cheroot.info index 0d031ba05c..d8108ff27a 100644 --- a/python/python3-cheroot/python3-cheroot.info +++ b/python/python3-cheroot/python3-cheroot.info @@ -1,10 +1,10 @@ PRGNAM="python3-cheroot" -VERSION="10.0.0" +VERSION="10.0.1" HOMEPAGE="https://cheroot.cherrypy.dev" -DOWNLOAD="https://files.pythonhosted.org/packages/source/c/cheroot/cheroot-10.0.0.tar.gz" -MD5SUM="be96fa052c54892240f916fbb06cc571" +DOWNLOAD="https://files.pythonhosted.org/packages/source/c/cheroot/cheroot-10.0.1.tar.gz" +MD5SUM="0fce2608fcb31c16c81945c73e283724" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-jaraco.functools python3-setuptools_scm_git_archive" +REQUIRES="python3-setuptools-scm-opt python3-jaraco.functools" MAINTAINER="fourtysixandtwo" EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-cloudflare/python3-cloudflare.SlackBuild b/python/python3-cloudflare/python3-cloudflare.SlackBuild index 408bfe9426..3e96b6e0ef 100644 --- a/python/python3-cloudflare/python3-cloudflare.SlackBuild +++ b/python/python3-cloudflare/python3-cloudflare.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2022 S.S. Bolokanar, Bulgaria <bolokanar@bulgars.org> +# Copyright 2022 S.S. Bolokanar, Bulgaria <bolokanar@bulgarsociety.org> # С. С. Болоканаръ, България # All rights reserved. # @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-cloudflare SRCNAM=python-cloudflare -VERSION=${VERSION:-2.19.2} +VERSION=${VERSION:-2.19.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-cloudflare/python3-cloudflare.info b/python/python3-cloudflare/python3-cloudflare.info index d27f8e4721..2eb193861d 100644 --- a/python/python3-cloudflare/python3-cloudflare.info +++ b/python/python3-cloudflare/python3-cloudflare.info @@ -1,10 +1,10 @@ PRGNAM="python3-cloudflare" -VERSION="2.19.2" +VERSION="2.19.4" HOMEPAGE="https://github.com/cloudflare/python-cloudflare" -DOWNLOAD="https://github.com/cloudflare/python-cloudflare/archive/2.19.2/python-cloudflare-2.19.2.tar.gz" -MD5SUM="c42dc71320b156eed987c81d9d6e2b6a" +DOWNLOAD="https://github.com/cloudflare/python-cloudflare/archive/2.19.4/python-cloudflare-2.19.4.tar.gz" +MD5SUM="41fa857c2c6ad7124d1fe56dde624a9a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-jsonlines BeautifulSoup4" MAINTAINER="S. S. Bolokanar" -EMAIL="bolokanar@bulgars.org" +EMAIL="bolokanar@bulgarsociety.org" diff --git a/python/python3-dill/python3-dill.SlackBuild b/python/python3-dill/python3-dill.SlackBuild index 3f30685455..ec771dac8c 100644 --- a/python/python3-dill/python3-dill.SlackBuild +++ b/python/python3-dill/python3-dill.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-dill -# Copyright 2022 None Orestiada, Greece +# Copyright 2022-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-dill SRCNAM=dill -VERSION=${VERSION:-0.3.6} +VERSION=${VERSION:-0.3.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-dill/python3-dill.info b/python/python3-dill/python3-dill.info index f1da173201..2c8b82c039 100644 --- a/python/python3-dill/python3-dill.info +++ b/python/python3-dill/python3-dill.info @@ -1,10 +1,10 @@ PRGNAM="python3-dill" -VERSION="0.3.6" +VERSION="0.3.8" HOMEPAGE="https://github.com/uqfoundation/dill" -DOWNLOAD="https://files.pythonhosted.org/packages/7c/e7/364a09134e1062d4d5ff69b853a56cf61c223e0afcc6906b6832bcd51ea8/dill-0.3.6.tar.gz" -MD5SUM="a76261d7418cd8ed1b3f9af0e47f31fc" +DOWNLOAD="https://files.pythonhosted.org/packages/17/4d/ac7ffa80c69ea1df30a8aa11b3578692a5118e7cd1aa157e3ef73b092d15/dill-0.3.8.tar.gz" +MD5SUM="0718c5472a311b15479ac2e1a6702594" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/python3-django/python3-django.SlackBuild b/python/python3-django/python3-django.SlackBuild index 990dc76cae..b7f4fbf497 100644 --- a/python/python3-django/python3-django.SlackBuild +++ b/python/python3-django/python3-django.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-django SRCNAM=$(echo $PRGNAM | cut -c9-14) -VERSION=${VERSION:-4.2.9} +VERSION=${VERSION:-4.2.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-django/python3-django.info b/python/python3-django/python3-django.info index f605f2ff0f..5bc7ec911a 100644 --- a/python/python3-django/python3-django.info +++ b/python/python3-django/python3-django.info @@ -1,8 +1,8 @@ PRGNAM="python3-django" -VERSION="4.2.9" +VERSION="4.2.13" HOMEPAGE="https://www.djangoproject.com/" -DOWNLOAD="https://github.com/django/django/archive/4.2.9/django-4.2.9.tar.gz" -MD5SUM="653896818a682e045188fb8af5e335a0" +DOWNLOAD="https://github.com/django/django/archive/4.2.13/django-4.2.13.tar.gz" +MD5SUM="27ee069bb9f740497b089a127f1298d2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="sqlparse asgiref" diff --git a/python/python3-dogpile.cache/python3-dogpile.cache.SlackBuild b/python/python3-dogpile.cache/python3-dogpile.cache.SlackBuild index 2902d6c931..92b122b07b 100644 --- a/python/python3-dogpile.cache/python3-dogpile.cache.SlackBuild +++ b/python/python3-dogpile.cache/python3-dogpile.cache.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-dogpile.cache -VERSION=${VERSION:-1.3.2} +VERSION=${VERSION:-1.3.3} SRCNAM=${SRCNAM:-dogpile.cache} SRCVER=${SRCVER:-rel_$(echo $VERSION | tr . _)} BUILD=${BUILD:-1} @@ -66,6 +66,19 @@ find -L . \ PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') export PYTHONPATH=/opt/python$PYVER/site-packages/ +# Use newer, non-stock setuptools due to package requirements +# Requres python/python3-setuptools-opt build-time dependency +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + +# Add unused section to avoid ERROR message from setuptools_scm +# Make it an if statement just in case upstream decides to update +# it and I don't notice. +if ! grep -qF "[tool.setuptools_scm]" pyproject.toml; then + echo "[tool.setuptools_scm]" >> pyproject.toml +fi +export SETUPTOOLS_SCM_PRETEND_VERSION=$VERSION + python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl diff --git a/python/python3-dogpile.cache/python3-dogpile.cache.info b/python/python3-dogpile.cache/python3-dogpile.cache.info index 0a1e30fad5..be9404d531 100644 --- a/python/python3-dogpile.cache/python3-dogpile.cache.info +++ b/python/python3-dogpile.cache/python3-dogpile.cache.info @@ -1,8 +1,8 @@ PRGNAM="python3-dogpile.cache" -VERSION="1.3.2" +VERSION="1.3.3" HOMEPAGE="https://dogpilecache.sqlalchemy.org/" -DOWNLOAD="https://github.com/sqlalchemy/dogpile.cache/archive/rel_1_3_2/dogpile.cache-rel_1_3_2.tar.gz" -MD5SUM="b8b7172ee282d5ccf2238cb141d6f3a5" +DOWNLOAD="https://github.com/sqlalchemy/dogpile.cache/archive/rel_1_3_3/dogpile.cache-rel_1_3_3.tar.gz" +MD5SUM="3a252847b9d7c7c083786dd9ddf95afa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-stevedore python3-decorator typing-extensions python3-setuptools-opt" diff --git a/python/python3-dulwich/python3-dulwich.SlackBuild b/python/python3-dulwich/python3-dulwich.SlackBuild index 83ecf9b137..45a80b20ec 100644 --- a/python/python3-dulwich/python3-dulwich.SlackBuild +++ b/python/python3-dulwich/python3-dulwich.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-dulwich SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.21.7} +VERSION=${VERSION:-0.22.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,7 +72,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS *.md *.rst COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS *.rst COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/python3-dulwich/python3-dulwich.info b/python/python3-dulwich/python3-dulwich.info index 17908a292c..9ecc757a3a 100644 --- a/python/python3-dulwich/python3-dulwich.info +++ b/python/python3-dulwich/python3-dulwich.info @@ -1,10 +1,10 @@ PRGNAM="python3-dulwich" -VERSION="0.21.7" +VERSION="0.22.1" HOMEPAGE="https://www.dulwich.io/" -DOWNLOAD="https://pypi.python.org/packages/source/d/dulwich/dulwich-0.21.7.tar.gz" -MD5SUM="c9a188b7bbd0c23fbcce991dbec1f12a" +DOWNLOAD="https://pypi.python.org/packages/source/d/dulwich/dulwich-0.22.1.tar.gz" +MD5SUM="08e441d9f3c978a89ce682bfcc101dda" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-setuptools-opt" +REQUIRES="python3-setuptools-rust-opt" MAINTAINER="Yth - Arnaud" EMAIL="yth@ythogtha.org" diff --git a/python/python3-editables/README b/python/python3-editables/README deleted file mode 100644 index a3cd52fce8..0000000000 --- a/python/python3-editables/README +++ /dev/null @@ -1,6 +0,0 @@ -python3-editables (A Python library for creating editable wheels) - -This library supports the building of wheels which, when installed, -will expose packages in a local directory on sys.path in "editable -mode". In other words, changes to the package source will be reflected -in the package visible to Python, without needing a reinstall. diff --git a/python/python3-editables/python3-editables.info b/python/python3-editables/python3-editables.info deleted file mode 100644 index c954b6059a..0000000000 --- a/python/python3-editables/python3-editables.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-editables" -VERSION="0.5" -HOMEPAGE="https://github.com/pfmoore/editables" -DOWNLOAD="https://files.pythonhosted.org/packages/source/e/editables/editables-0.5.tar.gz" -MD5SUM="520de8c3a9dc5dfb2b365d104541c9de" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build python3-wheel" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-editables/slack-desc b/python/python3-editables/slack-desc deleted file mode 100644 index a0b5bf5903..0000000000 --- a/python/python3-editables/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-editables: python3-editables (A Python library for creating editable wheels) -python3-editables: -python3-editables: This library supports the building of wheels which, when installed, -python3-editables: will expose packages in a local directory on sys.path in "editable -python3-editables: mode". In other words, changes to the package source will be reflected -python3-editables: in the package visible to Python, without needing a reinstall. -python3-editables: -python3-editables: -python3-editables: Homepage: https://github.com/pfmoore/editables -python3-editables: -python3-editables: diff --git a/python/python3-enlighten/python3-enlighten.SlackBuild b/python/python3-enlighten/python3-enlighten.SlackBuild index c8cdd39637..b1d6647c75 100644 --- a/python/python3-enlighten/python3-enlighten.SlackBuild +++ b/python/python3-enlighten/python3-enlighten.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-enlighten -# Copyright 2023 Samuel Young, MO, USA +# Copyright 2023-2024 Samuel Young, MO, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-enlighten -VERSION=${VERSION:-1.12.0} +VERSION=${VERSION:-1.12.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-enlighten/python3-enlighten.info b/python/python3-enlighten/python3-enlighten.info index 5133ef944e..554135a44b 100644 --- a/python/python3-enlighten/python3-enlighten.info +++ b/python/python3-enlighten/python3-enlighten.info @@ -1,8 +1,8 @@ PRGNAM="python3-enlighten" -VERSION="1.12.0" +VERSION="1.12.4" HOMEPAGE="https://github.com/Rockhopper-Technologies/enlighten" -DOWNLOAD="https://github.com/Rockhopper-Technologies/enlighten/archive/1.12.0/enlighten-1.12.0.tar.gz" -MD5SUM="2e5bf73caa7d9583cca813f34bf6dd64" +DOWNLOAD="https://github.com/Rockhopper-Technologies/enlighten/archive/1.12.4/enlighten-1.12.4.tar.gz" +MD5SUM="64d5a277c874816f139509696aa82734" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-exceptiongroup/python3-exceptiongroup.SlackBuild b/python/python3-exceptiongroup/python3-exceptiongroup.SlackBuild index 231f500fcc..b4dc10b43d 100644 --- a/python/python3-exceptiongroup/python3-exceptiongroup.SlackBuild +++ b/python/python3-exceptiongroup/python3-exceptiongroup.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-exceptiongroup -# Copyright 2023 fourtysixandtwo <fourtysixandtwo@sliderr.net> +# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-exceptiongroup SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-1.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-exceptiongroup/python3-exceptiongroup.info b/python/python3-exceptiongroup/python3-exceptiongroup.info index e597d631d1..6efe520170 100644 --- a/python/python3-exceptiongroup/python3-exceptiongroup.info +++ b/python/python3-exceptiongroup/python3-exceptiongroup.info @@ -1,8 +1,8 @@ PRGNAM="python3-exceptiongroup" -VERSION="1.2.0" +VERSION="1.2.1" HOMEPAGE="https://github.com/agronholm/exceptiongroup" -DOWNLOAD="https://files.pythonhosted.org/packages/source/e/exceptiongroup/exceptiongroup-1.2.0.tar.gz" -MD5SUM="470fd85d7bf855a99683e69128c902d6" +DOWNLOAD="https://files.pythonhosted.org/packages/source/e/exceptiongroup/exceptiongroup-1.2.1.tar.gz" +MD5SUM="4b18d11e20aadce2e87accccf434b1c4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-flit_scm" diff --git a/python/python3-filelock/python3-filelock.SlackBuild b/python/python3-filelock/python3-filelock.SlackBuild index a550f526aa..16f1fbb573 100644 --- a/python/python3-filelock/python3-filelock.SlackBuild +++ b/python/python3-filelock/python3-filelock.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-filelock SRCNAM=filelock -VERSION=${VERSION:-3.13.4} +VERSION=${VERSION:-3.14.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-filelock/python3-filelock.info b/python/python3-filelock/python3-filelock.info index 4f70a07e67..2be5bbe7ad 100644 --- a/python/python3-filelock/python3-filelock.info +++ b/python/python3-filelock/python3-filelock.info @@ -1,8 +1,8 @@ PRGNAM="python3-filelock" -VERSION="3.13.4" +VERSION="3.14.0" HOMEPAGE="https://github.com/tox-dev/py-filelock" -DOWNLOAD="https://github.com/tox-dev/py-filelock/archive/3.13.4/filelock-3.13.4.tar.gz" -MD5SUM="b5d0234e09b488bdbc6418430bafbbc2" +DOWNLOAD="https://github.com/tox-dev/py-filelock/archive/3.14.0/filelock-3.14.0.tar.gz" +MD5SUM="2b7e84b2cf5a7f05d0589846d4bbd389" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-hatch_vcs" diff --git a/python/python3-findpython/python3-findpython.SlackBuild b/python/python3-findpython/python3-findpython.SlackBuild index 122d56e816..66f4d307c7 100644 --- a/python/python3-findpython/python3-findpython.SlackBuild +++ b/python/python3-findpython/python3-findpython.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-findpython -VERSION=${VERSION:-0.6.0} +VERSION=${VERSION:-0.6.1} SRCNAM=${SRCNAM:-findpython} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/python3-findpython/python3-findpython.info b/python/python3-findpython/python3-findpython.info index cf1b481e6b..2e5563eb1c 100644 --- a/python/python3-findpython/python3-findpython.info +++ b/python/python3-findpython/python3-findpython.info @@ -1,8 +1,8 @@ PRGNAM="python3-findpython" -VERSION="0.6.0" +VERSION="0.6.1" HOMEPAGE="https://github.com/frostming/findpython/" -DOWNLOAD="https://github.com/frostming/findpython/archive/refs/tags/0.6.0/findpython-0.6.0.tar.gz" -MD5SUM="97a71584462b75dc034b53a5f0be7f22" +DOWNLOAD="https://github.com/frostming/findpython/archive/refs/tags/0.6.1/findpython-0.6.1.tar.gz" +MD5SUM="302c92b3ac2ae8719b047384ac20c4b6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-pdm-backend" diff --git a/python/python3-flake8_annotations/README b/python/python3-flake8_annotations/README new file mode 100644 index 0000000000..9f800ce3f7 --- /dev/null +++ b/python/python3-flake8_annotations/README @@ -0,0 +1,2 @@ +flake8-annotations is a plugin for Flake8 that detects the absence +of PEP 3107-style function annotations. diff --git a/python/python3-pyproject-hooks/python3-pyproject-hooks.SlackBuild b/python/python3-flake8_annotations/python3-flake8_annotations.SlackBuild index acffa128e7..b22acc1c09 100644 --- a/python/python3-pyproject-hooks/python3-pyproject-hooks.SlackBuild +++ b/python/python3-flake8_annotations/python3-flake8_annotations.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for python3-pyproject-hooks +# Slackware build script for python3-flake8_annotations -# Copyright 2023 fourtysixandtwo <fourtysixandtwo@sliderr.net> +# Copyright 2024 Dimitris Zlatanidis Greece, Orestiada # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,9 +24,9 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=python3-pyproject-hooks -SRCNAM=$(echo ${PRGNAM#python3-*} | sed -e "s/-/_/") -VERSION=${VERSION:-1.0.0} +PRGNAM=python3-flake8_annotations +SRCNAM=flake8_annotations +VERSION=${VERSION:-3.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -57,6 +57,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -77,18 +80,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 -m flit_core.wheel -python3 -m installer -d "$PKG" dist/*.whl +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - PKG-INFO \ - README.rst \ - LICENSE \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE CHANGELOG.md README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/python3-flake8_annotations/python3-flake8_annotations.info b/python/python3-flake8_annotations/python3-flake8_annotations.info new file mode 100644 index 0000000000..e37f8d5879 --- /dev/null +++ b/python/python3-flake8_annotations/python3-flake8_annotations.info @@ -0,0 +1,10 @@ +PRGNAM="python3-flake8_annotations" +VERSION="3.0.1" +HOMEPAGE="https://github.com/sco1/flake8-annotations" +DOWNLOAD="https://files.pythonhosted.org/packages/4a/1c/61f759cc427138603a3b2b9aee875193987e74a9c289b79bc9aa6c661687/flake8_annotations-3.0.1.tar.gz" +MD5SUM="03b392727877d3f532062a48698d7d70" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="flake8 python3-poetry-core python3-attrs" +MAINTAINER="Dimitris Zlatanidis" +EMAIL="dslackw@gmail.com" diff --git a/python/python3-flake8_annotations/slack-desc b/python/python3-flake8_annotations/slack-desc new file mode 100644 index 0000000000..6ddd32ae8d --- /dev/null +++ b/python/python3-flake8_annotations/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +python3-flake8_annotations: python3-flake8_annotations (is a plugin for Flake8) +python3-flake8_annotations: +python3-flake8_annotations: flake8_annotations is a plugin for Flake8 that detects the absence +python3-flake8_annotations: of PEP 3107-style function annotations. +python3-flake8_annotations: +python3-flake8_annotations: Homepage: https://github.com/sco1/flake8-annotations +python3-flake8_annotations: +python3-flake8_annotations: +python3-flake8_annotations: +python3-flake8_annotations: +python3-flake8_annotations: diff --git a/python/python3-flask-paginate/python3-flask-paginate.SlackBuild b/python/python3-flask-paginate/python3-flask-paginate.SlackBuild index 947792ae03..9951747ef3 100644 --- a/python/python3-flask-paginate/python3-flask-paginate.SlackBuild +++ b/python/python3-flask-paginate/python3-flask-paginate.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-flask-paginate SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-2024.3.28} +VERSION=${VERSION:-2024.4.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-flask-paginate/python3-flask-paginate.info b/python/python3-flask-paginate/python3-flask-paginate.info index 65187b79a5..44b5c5e4a2 100644 --- a/python/python3-flask-paginate/python3-flask-paginate.info +++ b/python/python3-flask-paginate/python3-flask-paginate.info @@ -1,8 +1,8 @@ PRGNAM="python3-flask-paginate" -VERSION="2024.3.28" +VERSION="2024.4.12" HOMEPAGE="https://github.com/lixxu/flask-paginate" -DOWNLOAD="https://files.pythonhosted.org/packages/source/f/flask-paginate/flask-paginate-2024.3.28.tar.gz" -MD5SUM="4c83a2670f035b04bf51d67e367ea433" +DOWNLOAD="https://files.pythonhosted.org/packages/source/f/flask-paginate/flask-paginate-2024.4.12.tar.gz" +MD5SUM="3b051520ee3b27ec0c45185b091c6f00" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="Flask" diff --git a/python/python3-flit_core/README b/python/python3-flit_core/README deleted file mode 100644 index 67f3ec7efd..0000000000 --- a/python/python3-flit_core/README +++ /dev/null @@ -1,9 +0,0 @@ -python3-flit_core (Simplified pkging of Python modules, core backend) - -Flit is a simple way to put Python packages and modules on PyPI. It -tries to require less thought about packaging and help you avoid -common mistakes. - -This provides a PEP 517 build backend for packages using Flit. -The only public interface is the API specified by PEP 517, at -``flit_core.buildapi``. diff --git a/python/python3-flit_core/python3-flit_core.SlackBuild b/python/python3-flit_core/python3-flit_core.SlackBuild deleted file mode 100644 index 1d016f391e..0000000000 --- a/python/python3-flit_core/python3-flit_core.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-flit_core - -# Copyright 2022-23 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20230412 46and2: Remove DEPS, use bootstrap install. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-flit_core -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-3.9.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m flit_core.wheel -python3 bootstrap_install.py --install-root "$PKG" dist/*.whl - -# installing tests to a subdir of your project might not conflict the toplevel, but -# don't do it anyway... -rm -r "$PKG"/usr/lib*/python*/site-packages/${SRCNAM}/tests/ - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-flit_core/python3-flit_core.info b/python/python3-flit_core/python3-flit_core.info deleted file mode 100644 index c294d24f0c..0000000000 --- a/python/python3-flit_core/python3-flit_core.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-flit_core" -VERSION="3.9.0" -HOMEPAGE="https://github.com/pypa/flit" -DOWNLOAD="https://files.pythonhosted.org/packages/source/f/flit_core/flit_core-3.9.0.tar.gz" -MD5SUM="3bc52f1952b9a78361114147da63c35b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-flit_core/slack-desc b/python/python3-flit_core/slack-desc deleted file mode 100644 index 1ec6924944..0000000000 --- a/python/python3-flit_core/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-flit_core: python3-flit_core (Simplified pkging of Python modules, core backend) -python3-flit_core: -python3-flit_core: Flit is a simple way to put Python packages and modules on PyPI. It -python3-flit_core: tries to require less thought about packaging and help you avoid -python3-flit_core: common mistakes. -python3-flit_core: -python3-flit_core: -python3-flit_core: -python3-flit_core: Homepage: https://github.com/pypa/flit -python3-flit_core: -python3-flit_core: diff --git a/python/python3-fontmake/python3-fontmake.SlackBuild b/python/python3-fontmake/python3-fontmake.SlackBuild index ec152371b3..feb4e6abbf 100644 --- a/python/python3-fontmake/python3-fontmake.SlackBuild +++ b/python/python3-fontmake/python3-fontmake.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-fontmake -VERSION=${VERSION:-3.8.1} +VERSION=${VERSION:-3.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -82,11 +82,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 -m build --wheel --no-isolation +CFLAGS="$SLKCFFLAGS" CXXFLAGS="$SLKCFLAGS" python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a CONTRIBUTING.md LICENSE README.md TROUBLESHOOTING.md USAGE.md $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/python/python3-fontmake/python3-fontmake.info b/python/python3-fontmake/python3-fontmake.info index 407bc69a72..ff8d653bad 100644 --- a/python/python3-fontmake/python3-fontmake.info +++ b/python/python3-fontmake/python3-fontmake.info @@ -1,8 +1,8 @@ PRGNAM="python3-fontmake" -VERSION="3.8.1" +VERSION="3.9.0" HOMEPAGE="https://github.com/googlei18n/fontmake" -DOWNLOAD="https://pypi.io/packages/source/f/fontmake/fontmake-3.8.1.zip" -MD5SUM="a3504c25f40d720000a98a91373c4609" +DOWNLOAD="https://pypi.io/packages/source/f/fontmake/fontmake-3.9.0.zip" +MD5SUM="9a22c3cc017f782e14ab11ac126d7c85" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-pyclipper python3-fontMath ttfautohint-py python3-MutatorMath python3-glyphslib" diff --git a/python/python3-fonttools/python3-fonttools.SlackBuild b/python/python3-fonttools/python3-fonttools.SlackBuild index 9a1842db97..2303aff7c4 100644 --- a/python/python3-fonttools/python3-fonttools.SlackBuild +++ b/python/python3-fonttools/python3-fonttools.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-fonttools SRCNAM=fonttools -VERSION=${VERSION:-4.49.0} +VERSION=${VERSION:-4.51.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,7 +79,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 -m build --wheel --no-isolation +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/python/python3-fonttools/python3-fonttools.info b/python/python3-fonttools/python3-fonttools.info index 5358737260..00f7afbdae 100644 --- a/python/python3-fonttools/python3-fonttools.info +++ b/python/python3-fonttools/python3-fonttools.info @@ -1,8 +1,8 @@ PRGNAM="python3-fonttools" -VERSION="4.49.0" +VERSION="4.51.0" HOMEPAGE="https://github.com/fonttools/fonttools" -DOWNLOAD="https://github.com/fonttools/fonttools/archive/4.49.0/fonttools-4.49.0.tar.gz" -MD5SUM="345cb539ea4ccd96df61699752a63ad6" +DOWNLOAD="https://github.com/fonttools/fonttools/archive/4.51.0/fonttools-4.51.0.tar.gz" +MD5SUM="f3183c58106f442b924a0aa208129544" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python-unicodedata2 munkres python3-scipy python3-zopfli python3-fs python3-uharfbuzz freetype-py python3-matplotlib python3-lxml python3-lz4" diff --git a/python/python3-geventhttpclient/python3-geventhttpclient.SlackBuild b/python/python3-geventhttpclient/python3-geventhttpclient.SlackBuild index 34637d4acd..dce9b7539f 100644 --- a/python/python3-geventhttpclient/python3-geventhttpclient.SlackBuild +++ b/python/python3-geventhttpclient/python3-geventhttpclient.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-geventhttpclient SRCNAM=geventhttpclient VERSION=${VERSION:-2.3.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,6 +77,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# needs newer setuptools to fix "UNKNOWN" and no module generated +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl diff --git a/python/python3-geventhttpclient/python3-geventhttpclient.info b/python/python3-geventhttpclient/python3-geventhttpclient.info index 76b130a857..b7849daf84 100644 --- a/python/python3-geventhttpclient/python3-geventhttpclient.info +++ b/python/python3-geventhttpclient/python3-geventhttpclient.info @@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/8c/14/d4eddae757de44985718a9e3 MD5SUM="a0a235b7579e9b5575e6f1db260f7599" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gevent llhttp python3-wheel python3-build" +REQUIRES="gevent llhttp python3-setuptools-opt" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/python/python3-glad/README b/python/python3-glad/README deleted file mode 100644 index 0dd3f36200..0000000000 --- a/python/python3-glad/README +++ /dev/null @@ -1,5 +0,0 @@ -python3-glad (Python binding for GLAD Loader-Generator) - -GLAD is a Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator -based on the official specifications for multiple languages. - diff --git a/python/python3-glad/python3-glad.SlackBuild b/python/python3-glad/python3-glad.SlackBuild deleted file mode 100644 index c6767c5529..0000000000 --- a/python/python3-glad/python3-glad.SlackBuild +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-glad - -# Copyright 2023 Christoph Willing Brisbane, Australia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-glad -SRCNAM=glad -VERSION=${VERSION:-2.0.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-glad/python3-glad.info b/python/python3-glad/python3-glad.info deleted file mode 100644 index 4ead3d437b..0000000000 --- a/python/python3-glad/python3-glad.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-glad" -VERSION="2.0.4" -HOMEPAGE="https://github.com/Dav1dde/glad" -DOWNLOAD="https://github.com/Dav1dde/glad/archive/v2.0.4/glad-2.0.4.tar.gz" -MD5SUM="154151c79dab047b26db52fe0572a409" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Christoph Willling" -EMAIL="chris.willing@linux.com" diff --git a/python/python3-glyphslib/python3-glyphslib.SlackBuild b/python/python3-glyphslib/python3-glyphslib.SlackBuild index a3a650b7c9..b0a6b82693 100644 --- a/python/python3-glyphslib/python3-glyphslib.SlackBuild +++ b/python/python3-glyphslib/python3-glyphslib.SlackBuild @@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-glyphslib -VERSION=${VERSION:-6.6.5} +VERSION=${VERSION:-6.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -SRCNAM=${SRCNAM:-glyphsLib} +SRCNAM=${SRCNAM:-glyphslib} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -82,11 +82,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 -m build --wheel --no-isolation +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a CONTRIBUTING.md LICENSE README.builder.md README.rst $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/python/python3-glyphslib/python3-glyphslib.info b/python/python3-glyphslib/python3-glyphslib.info index 6d2cc75398..4c2a3e0e25 100644 --- a/python/python3-glyphslib/python3-glyphslib.info +++ b/python/python3-glyphslib/python3-glyphslib.info @@ -1,8 +1,8 @@ PRGNAM="python3-glyphslib" -VERSION="6.6.5" +VERSION="6.7.1" HOMEPAGE="https://github.com/googlefonts/glyphsLib" -DOWNLOAD="https://pypi.io/packages/source/g/glyphsLib/glyphsLib-6.6.5.tar.gz" -MD5SUM="f02ef4451aacc2c3d9c3b875eed1cceb" +DOWNLOAD="https://pypi.io/packages/source/g/glyphsLib/glyphslib-6.7.1.tar.gz" +MD5SUM="2311220c7732cacffbd1f1c608a8a9a3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-openstep-plist python3-ufolib2 python3-ufo2ft python3-xmldiff" diff --git a/python/python3-grpcio/python3-grpcio.SlackBuild b/python/python3-grpcio/python3-grpcio.SlackBuild index 023895ef9c..d58f76d759 100644 --- a/python/python3-grpcio/python3-grpcio.SlackBuild +++ b/python/python3-grpcio/python3-grpcio.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-grpcio -VERSION=${VERSION:-1.62.1} +VERSION=${VERSION:-1.63.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-grpcio/python3-grpcio.info b/python/python3-grpcio/python3-grpcio.info index e17fdc4016..f7f193c75f 100644 --- a/python/python3-grpcio/python3-grpcio.info +++ b/python/python3-grpcio/python3-grpcio.info @@ -1,8 +1,8 @@ PRGNAM="python3-grpcio" -VERSION="1.62.1" +VERSION="1.63.0" HOMEPAGE="https://grpc.io/" -DOWNLOAD="https://github.com/grpc/grpc/archive/v1.62.1/grpc-1.62.1.tar.gz" -MD5SUM="e1d5a5152303a7edb48bdf5f60a22c04" +DOWNLOAD="https://github.com/grpc/grpc/archive/v1.63.0/grpc-1.63.0.tar.gz" +MD5SUM="a7a4cd8ce187c4a49d9498b3fcd148b2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="protobuf3 re2" diff --git a/python/python3-hatchling/README b/python/python3-hatchling/README deleted file mode 100644 index 62415b08ff..0000000000 --- a/python/python3-hatchling/README +++ /dev/null @@ -1,4 +0,0 @@ -python3-hatchling (Hatch build backend) - -This is the extensible, standards compliant build backend used by -Hatch. diff --git a/python/python3-hatchling/python3-hatchling.SlackBuild b/python/python3-hatchling/python3-hatchling.SlackBuild deleted file mode 100644 index 48fe1c76b9..0000000000 --- a/python/python3-hatchling/python3-hatchling.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-hatchling - -# Copyright 2022-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-hatchling -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.22.5} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-hatchling/python3-hatchling.info b/python/python3-hatchling/python3-hatchling.info deleted file mode 100644 index 7311a60d20..0000000000 --- a/python/python3-hatchling/python3-hatchling.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-hatchling" -VERSION="1.22.5" -HOMEPAGE="https://github.com/pypa/hatch/tree/master/backend" -DOWNLOAD="https://files.pythonhosted.org/packages/source/h/hatchling/hatchling-1.22.5.tar.gz" -MD5SUM="e5f74d4918c6831ad9c8ed739b87291e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-editables python3-pathspec python3-pluggy python3-trove-classifiers" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-hatchling/slack-desc b/python/python3-hatchling/slack-desc deleted file mode 100644 index 269e1d0265..0000000000 --- a/python/python3-hatchling/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-hatchling: python3-hatchling (Hatch build backend) -python3-hatchling: -python3-hatchling: This is the extensible, standards compliant build backend used by -python3-hatchling: Hatch. -python3-hatchling: -python3-hatchling: -python3-hatchling: -python3-hatchling: -python3-hatchling: Homepage: https://github.com/pypa/hatch/tree/master/backend -python3-hatchling: -python3-hatchling: diff --git a/python/python3-identify/python3-identify.SlackBuild b/python/python3-identify/python3-identify.SlackBuild index c4eb767328..754c338f1c 100644 --- a/python/python3-identify/python3-identify.SlackBuild +++ b/python/python3-identify/python3-identify.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-identify SRCNAM=identify -VERSION=${VERSION:-2.5.35} +VERSION=${VERSION:-2.5.36} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-identify/python3-identify.info b/python/python3-identify/python3-identify.info index e77b165cf4..8fa4cf69a3 100644 --- a/python/python3-identify/python3-identify.info +++ b/python/python3-identify/python3-identify.info @@ -1,8 +1,8 @@ PRGNAM="python3-identify" -VERSION="2.5.35" +VERSION="2.5.36" HOMEPAGE="https://github.com/pre-commit/identify" -DOWNLOAD="https://files.pythonhosted.org/packages/c4/ba/680e84c24284eba70aebaaa90d03bd039453419151b0e6f92cd36bf69dd5/identify-2.5.35.tar.gz" -MD5SUM="e761ee8cac68c8b0d5ad26ee0362f2ba" +DOWNLOAD="https://files.pythonhosted.org/packages/aa/9a/83775a4e09de8b9d774a2217bfe03038c488778e58561e6970daa39b4801/identify-2.5.36.tar.gz" +MD5SUM="6f9a1ccf7b934e11389a9dc4a3a0898a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-installer/README b/python/python3-installer/README deleted file mode 100644 index 46ae1e6e70..0000000000 --- a/python/python3-installer/README +++ /dev/null @@ -1,3 +0,0 @@ -This is a low-level library for installing a Python package from a -wheel distribution. It provides basic functionality and abstractions -for handling wheels and installing packages from wheels. diff --git a/python/python3-installer/python3-installer.SlackBuild b/python/python3-installer/python3-installer.SlackBuild deleted file mode 100644 index 6d8c04f8ac..0000000000 --- a/python/python3-installer/python3-installer.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-installer - -# Copyright 2023 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2022 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20230517 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-installer -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m flit_core.wheel -PYTHONPATH=src python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CONTRIBUTING.md LICENSE PKG-INFO README.md docs $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-installer/python3-installer.info b/python/python3-installer/python3-installer.info deleted file mode 100644 index 5969ab6d7e..0000000000 --- a/python/python3-installer/python3-installer.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-installer" -VERSION="0.7.0" -HOMEPAGE="https://github.com/pypa/installer" -DOWNLOAD="https://files.pythonhosted.org/packages/source/i/installer/installer-0.7.0.tar.gz" -MD5SUM="d961d1105c9270049528b1167ed021bc" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-flit_core" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-installer/slack-desc b/python/python3-installer/slack-desc deleted file mode 100644 index 23af788c6b..0000000000 --- a/python/python3-installer/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -python3-installer: python3-installer (Library for installing Python packages from wheels) -python3-installer: -python3-installer: This is a low-level library for installing a Python package from a -python3-installer: wheel distribution. It provides basic functionality and abstractions -python3-installer: for handling wheels and installing packages from wheels. -python3-installer: -python3-installer: Homepage: https://github.com/pypa/installer -python3-installer: -python3-installer: -python3-installer: -python3-installer: diff --git a/python/python3-isort/python3-isort.SlackBuild b/python/python3-isort/python3-isort.SlackBuild index d929624828..fcc5bd4e94 100644 --- a/python/python3-isort/python3-isort.SlackBuild +++ b/python/python3-isort/python3-isort.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-isort -# Copyright 2022 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2022-2024 Dimitris Zlatanidis Orestiada, Greece # Copyright 2018 Markus Rinne Finland # All rights reserved. # @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-isort SRCNAM=isort -VERSION=${VERSION:-5.11.3} +VERSION=${VERSION:-5.13.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-isort/python3-isort.info b/python/python3-isort/python3-isort.info index f830d9c150..ace107d5f3 100644 --- a/python/python3-isort/python3-isort.info +++ b/python/python3-isort/python3-isort.info @@ -1,10 +1,10 @@ PRGNAM="python3-isort" -VERSION="5.11.3" +VERSION="5.13.2" HOMEPAGE="https://timothycrosley.github.io/isort/" -DOWNLOAD="https://files.pythonhosted.org/packages/e2/43/d99899bfa24a3914f0318536918ab8c91c09350b5482e4e9bb7291840ae3/isort-5.11.3.tar.gz" -MD5SUM="66fbcee3d4dc83e8e434b1566086f1b1" +DOWNLOAD="https://files.pythonhosted.org/packages/87/f9/c1eb8635a24e87ade2efce21e3ce8cd6b8630bb685ddc9cdaca1349b2eb5/isort-5.13.2.tar.gz" +MD5SUM="a4d791bf2a42d1fbaeb1f5cb2c9147b2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/python3-jaraco.collections/python3-jaraco.collections.SlackBuild b/python/python3-jaraco.collections/python3-jaraco.collections.SlackBuild index 25de4258be..1579904a24 100644 --- a/python/python3-jaraco.collections/python3-jaraco.collections.SlackBuild +++ b/python/python3-jaraco.collections/python3-jaraco.collections.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-jaraco.collections -# Copyright 2022-23 fourtysixandtwo <fourtysixandtwo@sliderr.net> +# Copyright 2022-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-jaraco.collections SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-5.0.0} +VERSION=${VERSION:-5.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -66,6 +66,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + python3 -m build --no-isolation python3 -m installer -d "$PKG" dist/*.whl diff --git a/python/python3-jaraco.collections/python3-jaraco.collections.info b/python/python3-jaraco.collections/python3-jaraco.collections.info index a195d39dd9..7861e90fc1 100644 --- a/python/python3-jaraco.collections/python3-jaraco.collections.info +++ b/python/python3-jaraco.collections/python3-jaraco.collections.info @@ -1,8 +1,8 @@ PRGNAM="python3-jaraco.collections" -VERSION="5.0.0" +VERSION="5.0.1" HOMEPAGE="https://github.com/jaraco/jaraco.collections" -DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jaraco.collections/jaraco.collections-5.0.0.tar.gz" -MD5SUM="2b12f44216432f1ce2ead377fd7a2b93" +DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jaraco.collections/jaraco.collections-5.0.1.tar.gz" +MD5SUM="c04e0e8f98081467f4fdf1c407c22aec" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-jaraco.classes python3-jaraco.text" diff --git a/python/python3-jaraco.functools/python3-jaraco.functools.SlackBuild b/python/python3-jaraco.functools/python3-jaraco.functools.SlackBuild index c9b24d82f1..73227653f6 100644 --- a/python/python3-jaraco.functools/python3-jaraco.functools.SlackBuild +++ b/python/python3-jaraco.functools/python3-jaraco.functools.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-jaraco.functools -# Copyright 2022-23 fourtysixandtwo <fourtysixandtwo@sliderr.net> +# Copyright 2022-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-jaraco.functools -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-4.0.0} +SRCNAM=jaraco_functools +VERSION=${VERSION:-4.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -66,6 +66,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + python3 -m build --no-isolation python3 -m installer -d "$PKG" dist/*.whl diff --git a/python/python3-jaraco.functools/python3-jaraco.functools.info b/python/python3-jaraco.functools/python3-jaraco.functools.info index 5a07f294f7..a71fd03674 100644 --- a/python/python3-jaraco.functools/python3-jaraco.functools.info +++ b/python/python3-jaraco.functools/python3-jaraco.functools.info @@ -1,10 +1,10 @@ PRGNAM="python3-jaraco.functools" -VERSION="4.0.0" +VERSION="4.0.1" HOMEPAGE="https://github.com/jaraco/jaraco.functools" -DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jaraco.functools/jaraco.functools-4.0.0.tar.gz" -MD5SUM="6683d6f56930d4f0b34157b083813cf3" +DOWNLOAD="https://files.pythonhosted.org/packages/source/j/jaraco_functools/jaraco_functools-4.0.1.tar.gz" +MD5SUM="7bc3fe47d508077b0ddbc32f84dc1374" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="typing-extensions python3-more-itertools python3-wheel" +REQUIRES="python3-setuptools-opt typing-extensions python3-more-itertools python3-wheel" MAINTAINER="fourtysixandtwo" EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-joblib/python3-joblib.SlackBuild b/python/python3-joblib/python3-joblib.SlackBuild index 0d9f19d1c3..066b0d438c 100644 --- a/python/python3-joblib/python3-joblib.SlackBuild +++ b/python/python3-joblib/python3-joblib.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-joblib SRCNAM=joblib -VERSION=${VERSION:-1.4.0} +VERSION=${VERSION:-1.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-joblib/python3-joblib.info b/python/python3-joblib/python3-joblib.info index 70c056d5cc..33becc4974 100644 --- a/python/python3-joblib/python3-joblib.info +++ b/python/python3-joblib/python3-joblib.info @@ -1,8 +1,8 @@ PRGNAM="python3-joblib" -VERSION="1.4.0" +VERSION="1.4.2" HOMEPAGE="https://joblib.readthedocs.io/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/j/joblib/joblib-1.4.0.tar.gz" -MD5SUM="496285737120962e2aea01ac21c8bdca" +DOWNLOAD="https://files.pythonhosted.org/packages/source/j/joblib/joblib-1.4.2.tar.gz" +MD5SUM="979072af26696c75dc90b6c9db73c51b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-setuptools-opt" diff --git a/python/python3-keyring/python3-keyring.SlackBuild b/python/python3-keyring/python3-keyring.SlackBuild index 14c403ea65..37ae6fffbe 100644 --- a/python/python3-keyring/python3-keyring.SlackBuild +++ b/python/python3-keyring/python3-keyring.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-keyring -VERSION=${VERSION:-25.1.0} +VERSION=${VERSION:-25.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-keyring/python3-keyring.info b/python/python3-keyring/python3-keyring.info index d82d86cb2c..f598884dd7 100644 --- a/python/python3-keyring/python3-keyring.info +++ b/python/python3-keyring/python3-keyring.info @@ -1,8 +1,8 @@ PRGNAM="python3-keyring" -VERSION="25.1.0" +VERSION="25.2.1" HOMEPAGE="https://github.com/jaraco/keyring" -DOWNLOAD="https://files.pythonhosted.org/packages/source/k/keyring/keyring-25.1.0.tar.gz" -MD5SUM="f5db2f4ff95722e35540e2b4fba2f83c" +DOWNLOAD="https://files.pythonhosted.org/packages/source/k/keyring/keyring-25.2.1.tar.gz" +MD5SUM="f5c4b4a83032af4b8599c74d1eafe101" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python-importlib_metadata python3-jaraco.classes python3-jaraco.context python3-jaraco.functools secretstorage" diff --git a/python/python3-langcodes/python3-langcodes.SlackBuild b/python/python3-langcodes/python3-langcodes.SlackBuild index b6fad28644..7a4ab6822b 100644 --- a/python/python3-langcodes/python3-langcodes.SlackBuild +++ b/python/python3-langcodes/python3-langcodes.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-langcodes -# Copyright 2023 Vijay Marcel +# Copyright 2023-2024 Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-langcodes -VERSION=${VERSION:-3.3.0} +VERSION=${VERSION:-3.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,13 +81,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 -m build --wheel --no-isolation +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+ diff --git a/python/python3-langcodes/python3-langcodes.info b/python/python3-langcodes/python3-langcodes.info index bb4a5ac869..20afe1afdd 100644 --- a/python/python3-langcodes/python3-langcodes.info +++ b/python/python3-langcodes/python3-langcodes.info @@ -1,8 +1,8 @@ PRGNAM="python3-langcodes" -VERSION="3.3.0" +VERSION="3.4.0" HOMEPAGE="https://github.com/rspeer/langcodes" -DOWNLOAD="https://pypi.io/packages/source/l/langcodes/langcodes-3.3.0.tar.gz" -MD5SUM="c257046ae26f6af4097a14d7612fc8f3" +DOWNLOAD="https://pypi.io/packages/source/l/langcodes/langcodes-3.4.0.tar.gz" +MD5SUM="3c1bc81ec347ab3027972924341b7d8e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-language-data" diff --git a/python/python3-language-data/python3-language-data.SlackBuild b/python/python3-language-data/python3-language-data.SlackBuild index 47c7d1d0ee..2ecbbf3e34 100644 --- a/python/python3-language-data/python3-language-data.SlackBuild +++ b/python/python3-language-data/python3-language-data.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-language-data -# Copyright 2023 Vijay Marcel +# Copyright 2023-2024 Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-language-data -VERSION=${VERSION:-1.1} +VERSION=${VERSION:-1.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,11 +81,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 -m build --wheel --no-isolation +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages +CFLAGS="SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a CHANGELOG.md README.md $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/python/python3-language-data/python3-language-data.info b/python/python3-language-data/python3-language-data.info index e0d9bf616d..144fe4ac6e 100644 --- a/python/python3-language-data/python3-language-data.info +++ b/python/python3-language-data/python3-language-data.info @@ -1,10 +1,10 @@ PRGNAM="python3-language-data" -VERSION="1.1" +VERSION="1.2.0" HOMEPAGE="https://github.com/rspeer/language_data" -DOWNLOAD="https://pypi.io/packages/source/l/language-data/language_data-1.1.tar.gz" -MD5SUM="75ea158be78983b0a858e6e157bcfa3a" +DOWNLOAD="https://pypi.io/packages/source/l/language-data/language_data-1.2.0.tar.gz" +MD5SUM="c57f62da4b7240d71a47e798342c80ca" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-wheel python3-poetry-core python3-marisa-trie" +REQUIRES="python3-wheel python3-poetry-core python3-marisa-trie python3-setuptools-opt python3-setuptools-scm-opt" MAINTAINER="Vijay Marcel" EMAIL="vijaymarcel@outlook.com" diff --git a/python/python3-librosa/python3-librosa.SlackBuild b/python/python3-librosa/python3-librosa.SlackBuild index 2c4319b166..c34c2df935 100644 --- a/python/python3-librosa/python3-librosa.SlackBuild +++ b/python/python3-librosa/python3-librosa.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-librosa -# Copyright 2023 Jeremy Hansen jebrhansen+SBo@gmail.com +# Copyright 2023-2024 Jeremy Hansen <jebrhansen+SBo@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-librosa SRCNAM=librosa -VERSION=${VERSION:-0.10.1} +VERSION=${VERSION:-0.10.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -47,20 +47,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG diff --git a/python/python3-librosa/python3-librosa.info b/python/python3-librosa/python3-librosa.info index e58dd15819..33e2a1a4cc 100644 --- a/python/python3-librosa/python3-librosa.info +++ b/python/python3-librosa/python3-librosa.info @@ -1,8 +1,8 @@ PRGNAM="python3-librosa" -VERSION="0.10.1" +VERSION="0.10.2" HOMEPAGE="https://librosa.org/" -DOWNLOAD="https://github.com/librosa/librosa/archive/refs/tags/0.10.1/librosa-0.10.1.tar.gz" -MD5SUM="5c9d22f503c0ea20dac73e775cdca2c9" +DOWNLOAD="https://github.com/librosa/librosa/archive/refs/tags/0.10.2/librosa-0.10.2.tar.gz" +MD5SUM="dfd6cd2aa29050c61cb73c942dee768f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-lazy_loader python3-matplotlib ipython python3-mir_eval python3-soundfile audioread python3-soxr python3-numba python3-llvmlite msgpack-python python3-pooch scikit-learn python3-presets" diff --git a/python/python3-libtmux/python3-libtmux.SlackBuild b/python/python3-libtmux/python3-libtmux.SlackBuild index 8676561934..44aa956600 100644 --- a/python/python3-libtmux/python3-libtmux.SlackBuild +++ b/python/python3-libtmux/python3-libtmux.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-libtmux SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.36.0} +VERSION=${VERSION:-0.37.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-libtmux/python3-libtmux.info b/python/python3-libtmux/python3-libtmux.info index 4554988637..1e06989faa 100644 --- a/python/python3-libtmux/python3-libtmux.info +++ b/python/python3-libtmux/python3-libtmux.info @@ -1,8 +1,8 @@ PRGNAM="python3-libtmux" -VERSION="0.36.0" +VERSION="0.37.0" HOMEPAGE="https://github.com/tony/libtmux" -DOWNLOAD="https://files.pythonhosted.org/packages/source/l/libtmux/libtmux-0.36.0.tar.gz" -MD5SUM="0811bb1baf397eab01fb239663f0eb18" +DOWNLOAD="https://files.pythonhosted.org/packages/source/l/libtmux/libtmux-0.37.0.tar.gz" +MD5SUM="ad5001db65922d348ac03c108bfa28a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-poetry-core" diff --git a/python/python3-lxml/README b/python/python3-lxml/README deleted file mode 100644 index 09ea99ca99..0000000000 --- a/python/python3-lxml/README +++ /dev/null @@ -1,5 +0,0 @@ -lxml is the most feature-rich and easy-to-use library for processing -XML and HTML in the Python language. It's also very fast and memory -friendly, just so you know. - -This can coexist with python2-lxml without issue. diff --git a/python/python3-lxml/python3-lxml.SlackBuild b/python/python3-lxml/python3-lxml.SlackBuild deleted file mode 100644 index be185e0959..0000000000 --- a/python/python3-lxml/python3-lxml.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-lxml - -# Based on Slackware build script for lxml -# Copyright 2009-2019 Larry Hajali <larryhaja[at]gmail[dot]com> - -# Copyright 2024 Jeremy Hansen <jebrhansen+SBo@gmail.com> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-lxml -SRCNAM=lxml -VERSION=${VERSION:-5.2.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -else - SLKCFLAGS="-O2" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -python3 setup.py install --with-unicode-strings --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES.txt CREDITS.txt LICENSE*.txt README.rst doc/FAQ.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-lxml/python3-lxml.info b/python/python3-lxml/python3-lxml.info deleted file mode 100644 index bb56256246..0000000000 --- a/python/python3-lxml/python3-lxml.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-lxml" -VERSION="5.2.1" -HOMEPAGE="https://lxml.de/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/l/lxml/lxml-5.2.1.tar.gz" -MD5SUM="184bcadae701562c67c9ce40b5da5937" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="BeautifulSoup4 html5lib python3-cssselect" -MAINTAINER="Jeremy Hansen" -EMAIL="jebrhansen+SBo@gmail.com" diff --git a/python/python3-lxml/slack-desc b/python/python3-lxml/slack-desc deleted file mode 100644 index 470095bb6a..0000000000 --- a/python/python3-lxml/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-lxml: python3-lxml (The lxml XML toolkit for Python) -python3-lxml: -python3-lxml: lxml is the most feature-rich and easy-to-use library for processing -python3-lxml: XML and HTML in the Python language. It's also very fast and memory -python3-lxml: friendly, just so you know. -python3-lxml: -python3-lxml: Homepage: https://lxml.de/ -python3-lxml: -python3-lxml: -python3-lxml: -python3-lxml: diff --git a/python/python3-marisa-trie/python3-marisa-trie.SlackBuild b/python/python3-marisa-trie/python3-marisa-trie.SlackBuild index 15417683bd..97e1fa963e 100644 --- a/python/python3-marisa-trie/python3-marisa-trie.SlackBuild +++ b/python/python3-marisa-trie/python3-marisa-trie.SlackBuild @@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-marisa-trie -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -SRCNAM=${SRCNAM:-marisa-trie} +SRCNAM=${SRCNAM:-marisa_trie} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -49,13 +49,13 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC" + SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC" + SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC" + SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2" LIBDIRSUFFIX="64" elif [ "$ARCH" = "aarch64" ]; then SLKCFLAGS="-O2 -fPIC" @@ -82,12 +82,12 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --prefix=/usr --root=$PKG --optimize=1 +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" python3 setup.py install --prefix=/usr --root=$PKG --optimize=1 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS.rst CHANGES.rst LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+ diff --git a/python/python3-marisa-trie/python3-marisa-trie.info b/python/python3-marisa-trie/python3-marisa-trie.info index 342c5131ef..94fbf34864 100644 --- a/python/python3-marisa-trie/python3-marisa-trie.info +++ b/python/python3-marisa-trie/python3-marisa-trie.info @@ -1,8 +1,8 @@ PRGNAM="python3-marisa-trie" -VERSION="1.1.0" +VERSION="1.1.1" HOMEPAGE="https://github.com/pytries/marisa-trie" -DOWNLOAD="https://pypi.io/packages/source/m/marisa-trie/marisa-trie-1.1.0.tar.gz" -MD5SUM="a98fd6023f47957a8039786fc39b5ae1" +DOWNLOAD="https://pypi.io/packages/source/m/marisa-trie/marisa_trie-1.1.1.tar.gz" +MD5SUM="f9ba2f0a2e8a9d108d00bd3221e0548d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-meson-opt/README b/python/python3-meson-opt/README deleted file mode 100644 index e72ffb354b..0000000000 --- a/python/python3-meson-opt/README +++ /dev/null @@ -1,18 +0,0 @@ -python3-meson-opt (meson installed to /opt) - -Meson is a cross-platform build system designed to be both as fast and -as user friendly as possible. It supports many languages and -compilers, including GCC, Clang, PGI, Intel, and Visual Studio. Its -build definitions are written in a simple non-Turing complete DSL. - -NOTE: - Install bin and docs to /opt/meson - Installs module to /opt/python$PYVER/site-packages - -Add the following before the python3 build commands in your -Slackbuild to use this version over the stock one in 15.0. My testing -has shown the newer meson bin does not need to be added to PATH, but -YMMV: - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages diff --git a/python/python3-meson-opt/python3-meson-opt.SlackBuild b/python/python3-meson-opt/python3-meson-opt.SlackBuild deleted file mode 100644 index 0d1cb99139..0000000000 --- a/python/python3-meson-opt/python3-meson-opt.SlackBuild +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-meson-opt - -# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-meson-opt -SRCNAM=meson -VERSION=${VERSION:-1.4.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -ARCH=noarch - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" -p "opt/meson" dist/*.whl - -if [ "$PKG/opt/" != "/opt/" ]; then - mkdir -p $PKG/opt - mv $PKG/opt/meson/lib*/python$PYVER $PKG/opt/ - rmdir $PKG/opt/meson/lib* -fi - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a contributing.md COPYING PKG-INFO README* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-meson-opt/python3-meson-opt.info b/python/python3-meson-opt/python3-meson-opt.info deleted file mode 100644 index 924f53b917..0000000000 --- a/python/python3-meson-opt/python3-meson-opt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-meson-opt" -VERSION="1.4.0" -HOMEPAGE="https://github.com/mesonbuild/meson" -DOWNLOAD="https://files.pythonhosted.org/packages/source/m/meson/meson-1.4.0.tar.gz" -MD5SUM="a5cddd4299ead830106242c53ea7f10f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build python3-wheel" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-meson-opt/slack-desc b/python/python3-meson-opt/slack-desc deleted file mode 100644 index 3654d33869..0000000000 --- a/python/python3-meson-opt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-meson-opt: python3-meson-opt (meson installed to /opt) -python3-meson-opt: -python3-meson-opt: Meson is a cross-platform build system designed to be both as fast and -python3-meson-opt: as user friendly as possible. It supports many languages and -python3-meson-opt: compilers, including GCC, Clang, PGI, Intel, and Visual Studio. Its -python3-meson-opt: build definitions are written in a simple non-Turing complete DSL. -python3-meson-opt: -python3-meson-opt: Installs to /opt/python$PYVER/site-packages -python3-meson-opt: -python3-meson-opt: Project URL: https://github.com/mesonbuild/meson -python3-meson-opt: diff --git a/python/python3-orjson/python3-orjson.SlackBuild b/python/python3-orjson/python3-orjson.SlackBuild index 4f4033c6e5..6f4a19e4ef 100644 --- a/python/python3-orjson/python3-orjson.SlackBuild +++ b/python/python3-orjson/python3-orjson.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-orjson SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-3.10.0} +VERSION=${VERSION:-3.10.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-orjson/python3-orjson.info b/python/python3-orjson/python3-orjson.info index ec8df62349..6f556c56ee 100644 --- a/python/python3-orjson/python3-orjson.info +++ b/python/python3-orjson/python3-orjson.info @@ -1,8 +1,8 @@ PRGNAM="python3-orjson" -VERSION="3.10.0" +VERSION="3.10.3" HOMEPAGE="https://github.com/ijl/orjson" -DOWNLOAD="https://files.pythonhosted.org/packages/source/o/orjson/orjson-3.10.0.tar.gz" -MD5SUM="6af9b934fa535fb4f34f05e29b07513c" +DOWNLOAD="https://files.pythonhosted.org/packages/source/o/orjson/orjson-3.10.3.tar.gz" +MD5SUM="4c34f9037cfe42bbc59f7ed032df1748" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-maturin" diff --git a/python/python3-paste/python3-paste.SlackBuild b/python/python3-paste/python3-paste.SlackBuild index b7916536f1..d6ed374f44 100644 --- a/python/python3-paste/python3-paste.SlackBuild +++ b/python/python3-paste/python3-paste.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-paste -SRCNAM=Paste -VERSION=${VERSION:-3.9.0} +SRCNAM=${PRGNAM#python3-*} +VERSION=${VERSION:-3.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-paste/python3-paste.info b/python/python3-paste/python3-paste.info index 6b4bd329c3..8ae60196d4 100644 --- a/python/python3-paste/python3-paste.info +++ b/python/python3-paste/python3-paste.info @@ -1,8 +1,8 @@ PRGNAM="python3-paste" -VERSION="3.9.0" +VERSION="3.10.1" HOMEPAGE="https://pythonpaste.readthedocs.io/" -DOWNLOAD="https://pypi.python.org/packages/source/P/Paste/Paste-3.9.0.tar.gz" -MD5SUM="82c6f39498a69220aba9cbb7453f9222" +DOWNLOAD="https://pypi.python.org/packages/source/p/paste/paste-3.10.1.tar.gz" +MD5SUM="7d59952c9e108d8d381944b40e90e47a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-pathspec/README b/python/python3-pathspec/README deleted file mode 100644 index 9d82dd1624..0000000000 --- a/python/python3-pathspec/README +++ /dev/null @@ -1,6 +0,0 @@ -python3-pathspec (Library for gitignore style matching of file paths) - -pathspec is a utility library for pattern matching of file paths. So -far this only includes Git's wildmatch pattern matching which itself -is derived from Rsync's wildmatch. Git uses wildmatch for its -gitignore files. diff --git a/python/python3-pathspec/python3-pathspec.SlackBuild b/python/python3-pathspec/python3-pathspec.SlackBuild deleted file mode 100644 index 33d07db20e..0000000000 --- a/python/python3-pathspec/python3-pathspec.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-pathspec - -# Copyright 2022-23 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-pathspec -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.12.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-pathspec/python3-pathspec.info b/python/python3-pathspec/python3-pathspec.info deleted file mode 100644 index 91716e25c4..0000000000 --- a/python/python3-pathspec/python3-pathspec.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-pathspec" -VERSION="0.12.1" -HOMEPAGE="https://github.com/cpburnz/python-pathspec" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pathspec/pathspec-0.12.1.tar.gz" -MD5SUM="2b26ad1981bfa23748e115f00085624c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-pathspec/slack-desc b/python/python3-pathspec/slack-desc deleted file mode 100644 index e0349b555b..0000000000 --- a/python/python3-pathspec/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-pathspec: python3-pathspec (Library for gitignore style matching of file paths) -python3-pathspec: -python3-pathspec: pathspec is a utility library for pattern matching of file paths. So -python3-pathspec: far this only includes Git's wildmatch pattern matching which itself -python3-pathspec: is derived from Rsync's wildmatch. Git uses wildmatch for its -python3-pathspec: gitignore files. -python3-pathspec: -python3-pathspec: -python3-pathspec: Homepage: https://github.com/cpburnz/python-pathspec -python3-pathspec: -python3-pathspec: diff --git a/python/python3-pdm-backend/python3-pdm-backend.SlackBuild b/python/python3-pdm-backend/python3-pdm-backend.SlackBuild index de68248567..2910527c10 100644 --- a/python/python3-pdm-backend/python3-pdm-backend.SlackBuild +++ b/python/python3-pdm-backend/python3-pdm-backend.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pdm-backend -VERSION=${VERSION:-2.2.0} +VERSION=${VERSION:-2.3.0} SRCNAM=${SRCNAM:-pdm_backend} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/python3-pdm-backend/python3-pdm-backend.info b/python/python3-pdm-backend/python3-pdm-backend.info index 1307def902..4decac62d8 100644 --- a/python/python3-pdm-backend/python3-pdm-backend.info +++ b/python/python3-pdm-backend/python3-pdm-backend.info @@ -1,8 +1,8 @@ PRGNAM="python3-pdm-backend" -VERSION="2.2.0" +VERSION="2.3.0" HOMEPAGE="https://github.com/pdm-project/pdm-backend" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pdm_backend/pdm_backend-2.2.0.tar.gz" -MD5SUM="82409996b4621df61b054f0d0fafcd5c" +DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pdm_backend/pdm_backend-2.3.0.tar.gz" +MD5SUM="f660cc3f12458e31ab1561c54aedb258" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python-importlib_metadata" diff --git a/python/python3-pdm/python3-pdm.SlackBuild b/python/python3-pdm/python3-pdm.SlackBuild index ad4b992ea7..13a0150954 100644 --- a/python/python3-pdm/python3-pdm.SlackBuild +++ b/python/python3-pdm/python3-pdm.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pdm -VERSION=${VERSION:-2.14.0} +VERSION=${VERSION:-2.15.2} SRCNAM=${SRCNAM:-pdm} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/python3-pdm/python3-pdm.info b/python/python3-pdm/python3-pdm.info index 23c2a09893..d50cdcb18c 100644 --- a/python/python3-pdm/python3-pdm.info +++ b/python/python3-pdm/python3-pdm.info @@ -1,8 +1,8 @@ PRGNAM="python3-pdm" -VERSION="2.14.0" +VERSION="2.15.2" HOMEPAGE="https://github.com/pdm-project/pdm" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pdm/pdm-2.14.0.tar.gz" -MD5SUM="a072cd3e64231851d736cc3402b01d9f" +DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pdm/pdm-2.15.2.tar.gz" +MD5SUM="360099247a49e0dc86f8fc19743eae4a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-blinker python3-dotenv python3-tomlkit python3-dep-logic python3-findpython python3-resolvelib python3-shellingham python3-unearth python3-cachecontrol requests-toolbelt python3-rich python3-hishel" diff --git a/python/python3-pipx/python3-pipx.SlackBuild b/python/python3-pipx/python3-pipx.SlackBuild index 2c3291e3f1..4cfd48ba3f 100644 --- a/python/python3-pipx/python3-pipx.SlackBuild +++ b/python/python3-pipx/python3-pipx.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pipx -VERSION=${VERSION:-1.3.1} +VERSION=${VERSION:-1.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -83,7 +83,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 -m build --wheel --no-isolation +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/python/python3-pipx/python3-pipx.info b/python/python3-pipx/python3-pipx.info index f36b8ec4d0..1ab0b466ea 100644 --- a/python/python3-pipx/python3-pipx.info +++ b/python/python3-pipx/python3-pipx.info @@ -1,8 +1,8 @@ PRGNAM="python3-pipx" -VERSION="1.3.1" +VERSION="1.5.0" HOMEPAGE="https://github.com/pipxproject/pipx" -DOWNLOAD="https://pypi.io/packages/source/p/pipx/pipx-1.3.1.tar.gz" -MD5SUM="973ac385791b4c51bf44f50f36d16f7b" +DOWNLOAD="https://pypi.io/packages/source/p/pipx/pipx-1.5.0.tar.gz" +MD5SUM="a582b57504074f6783b69777dc3f95c9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-hatch_vcs python3-platformdirs python3-argcomplete python3-userpath" diff --git a/python/python3-platformdirs/python3-platformdirs.SlackBuild b/python/python3-platformdirs/python3-platformdirs.SlackBuild index dac8d988e2..6e052c1995 100644 --- a/python/python3-platformdirs/python3-platformdirs.SlackBuild +++ b/python/python3-platformdirs/python3-platformdirs.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-platformdirs -VERSION=${VERSION:-4.2.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-4.2.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-platformdirs/python3-platformdirs.info b/python/python3-platformdirs/python3-platformdirs.info index 7357ff024c..adda1fbb2b 100644 --- a/python/python3-platformdirs/python3-platformdirs.info +++ b/python/python3-platformdirs/python3-platformdirs.info @@ -1,8 +1,8 @@ PRGNAM="python3-platformdirs" -VERSION="4.2.0" +VERSION="4.2.1" HOMEPAGE="https://github.com/platformdirs/platformdirs" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/platformdirs/platformdirs-4.2.0.tar.gz" -MD5SUM="658f1b6259e29c472ea67bc60f3e35f1" +DOWNLOAD="https://files.pythonhosted.org/packages/source/p/platformdirs/platformdirs-4.2.1.tar.gz" +MD5SUM="20ed4a4ffc70a4f7e58e974355ad1895" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-hatch_vcs python3-setuptools-scm-opt" diff --git a/python/python3-plotly/python3-plotly.SlackBuild b/python/python3-plotly/python3-plotly.SlackBuild index 99fec36800..49e9e4af95 100644 --- a/python/python3-plotly/python3-plotly.SlackBuild +++ b/python/python3-plotly/python3-plotly.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-plotly -VERSION=${VERSION:-5.21.0} +VERSION=${VERSION:-5.22.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-plotly/python3-plotly.info b/python/python3-plotly/python3-plotly.info index 21f9e27d28..e0daa6084f 100644 --- a/python/python3-plotly/python3-plotly.info +++ b/python/python3-plotly/python3-plotly.info @@ -1,8 +1,8 @@ PRGNAM="python3-plotly" -VERSION="5.21.0" +VERSION="5.22.0" HOMEPAGE="https://github.com/plotly/plotly.py" -DOWNLOAD="https://github.com/plotly/plotly.py/archive/v5.21.0/plotly.py-5.21.0.tar.gz" -MD5SUM="6dbbb325bbf42cf3860ac77af0c58904" +DOWNLOAD="https://github.com/plotly/plotly.py/archive/v5.22.0/plotly.py-5.22.0.tar.gz" +MD5SUM="43e9f68f9b78083ae4a0bd8842c28818" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-tenacity" diff --git a/python/python3-pluggy/README b/python/python3-pluggy/README deleted file mode 100644 index e446501433..0000000000 --- a/python/python3-pluggy/README +++ /dev/null @@ -1,6 +0,0 @@ -pluggy (mechanisms for python) - -This is the plugin manager as used by pytest but stripped of pytest -specific details. - -This is the Python 3 build of pluggy. diff --git a/python/python3-pluggy/python3-pluggy.info b/python/python3-pluggy/python3-pluggy.info deleted file mode 100644 index e8f7e3f8eb..0000000000 --- a/python/python3-pluggy/python3-pluggy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-pluggy" -VERSION="1.4.0" -HOMEPAGE="https://github.com/pytest-dev/pluggy" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pluggy/pluggy-1.4.0.tar.gz" -MD5SUM="ffb69741271eaeefab3f2ef2435e2d5f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Jeremy Hansen" -EMAIL="jebrhansen+SBo@gmail.com" diff --git a/python/python3-psutil/README b/python/python3-psutil/README deleted file mode 100644 index 8bc631773b..0000000000 --- a/python/python3-psutil/README +++ /dev/null @@ -1,6 +0,0 @@ -python3-psutil is a module providing an interface for retrieving -information on all running processes and system utilization (CPU, -memory, disks, network, users) in a portable way by using Python, -implementing many functionalities offered by command line tools such -as: ps, top, df, kill, free, lsof, netstat, ifconfig, nice, ionice, -iostat, iotop, uptime, pidof, tty, who, taskset, and pmap. diff --git a/python/python3-psutil/python3-psutil.SlackBuild b/python/python3-psutil/python3-psutil.SlackBuild deleted file mode 100644 index 584d70c5cd..0000000000 --- a/python/python3-psutil/python3-psutil.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-psutil - -# Copyright 2022-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-psutil -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-5.9.8} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CREDITS LICENSE {HISTORY,README}.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-psutil/python3-psutil.info b/python/python3-psutil/python3-psutil.info deleted file mode 100644 index 6da2e10e6b..0000000000 --- a/python/python3-psutil/python3-psutil.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-psutil" -VERSION="5.9.8" -HOMEPAGE="https://github.com/giampaolo/psutil" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/psutil/psutil-5.9.8.tar.gz" -MD5SUM="7bb9d4378bd451765b705946a3541393" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build python3-wheel" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-psutil/slack-desc b/python/python3-psutil/slack-desc deleted file mode 100644 index c1cdca097f..0000000000 --- a/python/python3-psutil/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-psutil: python3-psutil (python interface for process and system info) -python3-psutil: -python3-psutil: psutil is a module providing an interface for retrieving information -python3-psutil: on all running processes and system utilization (CPU, memory, disks, -python3-psutil: network, users) in a portable way by using Python, implementing many -python3-psutil: functionalities offered by command line tools such as: ps, top, df, -python3-psutil: kill, free, lsof, netstat, ifconfig, nice, ionice, iostat, iotop, -python3-psutil: uptime, pidof, tty, who, taskset, and pmap -python3-psutil: -python3-psutil: Homepage: https://github.com/giampaolo/psutil -python3-psutil: diff --git a/python/python3-psycopg3/python3-psycopg3.SlackBuild b/python/python3-psycopg3/python3-psycopg3.SlackBuild index dfaa05587f..86ce3297c3 100644 --- a/python/python3-psycopg3/python3-psycopg3.SlackBuild +++ b/python/python3-psycopg3/python3-psycopg3.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-psycopg3 -# Copyright 2022 Zlatanidis Dimitris Greece, Orestiada +# Copyright 2022-2024 Zlatanidis Dimitris Greece, Orestiada # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-psycopg3 SRCNAM=psycopg -VERSION=${VERSION:-3.0.11} +VERSION=${VERSION:-3.1.19} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -85,7 +85,6 @@ python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README.rst LICENSE.txt PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/python/python3-psycopg3/python3-psycopg3.info b/python/python3-psycopg3/python3-psycopg3.info index d2fe6d31a2..3eb6c1d440 100644 --- a/python/python3-psycopg3/python3-psycopg3.info +++ b/python/python3-psycopg3/python3-psycopg3.info @@ -1,10 +1,10 @@ PRGNAM="python3-psycopg3" -VERSION="3.0.11" +VERSION="3.1.19" HOMEPAGE="https://www.psycopg.org/" -DOWNLOAD="https://files.pythonhosted.org/packages/b9/ed/b4a17a02ca1cdccd88a87e964d4eb0625070518c81b7e940d3b9be6bec0a/psycopg-3.0.11.tar.gz" -MD5SUM="772b8cf21f19231716c7525a19b32b7f" +DOWNLOAD="https://files.pythonhosted.org/packages/e5/b8/dc85a3b5d3576527c288197de5db85edd141d6ce27fcf73e9f77e871824a/psycopg-3.1.19.tar.gz" +MD5SUM="8eafcbda12408038a872e3239bc61931" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="postgresql" +REQUIRES="typing-extensions postgresql" MAINTAINER="Zlatanidis Dimitris" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/python3-pydantic-core/python3-pydantic-core.SlackBuild b/python/python3-pydantic-core/python3-pydantic-core.SlackBuild index 2f7571e21c..1aa67afa8c 100644 --- a/python/python3-pydantic-core/python3-pydantic-core.SlackBuild +++ b/python/python3-pydantic-core/python3-pydantic-core.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pydantic-core SRCNAM=pydantic_core -VERSION=${VERSION:-2.16.3} +VERSION=${VERSION:-2.18.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-pydantic-core/python3-pydantic-core.info b/python/python3-pydantic-core/python3-pydantic-core.info index 91bb5c5540..f793a3e89c 100644 --- a/python/python3-pydantic-core/python3-pydantic-core.info +++ b/python/python3-pydantic-core/python3-pydantic-core.info @@ -1,10 +1,10 @@ PRGNAM="python3-pydantic-core" -VERSION="2.16.3" +VERSION="2.18.2" HOMEPAGE="https://github.com/pydantic/pydantic-core" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pydantic-core/pydantic_core-2.16.3.tar.gz \ - https://slackware.uk/~fourtysixandtwo/src/pydantic_core-vendored-sources-2.16.3-1.tar.xz" -MD5SUM="00ba6d00d049179e785658e2a281e99f \ - 48df40b438e039cd89f1964279bd1fbc" +DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pydantic-core/pydantic_core-2.18.2.tar.gz \ + https://slackware.uk/~fourtysixandtwo/src/pydantic_core-vendored-sources-2.18.2-1.tar.xz" +MD5SUM="ab1cb4e3ca6029712348b78cd7dff507 \ + a09f26d30c01d8b60192cb86980d071e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-maturin python3-hatchling" diff --git a/python/python3-pydantic/python3-pydantic.SlackBuild b/python/python3-pydantic/python3-pydantic.SlackBuild index 76a82fc276..c695d7d7de 100644 --- a/python/python3-pydantic/python3-pydantic.SlackBuild +++ b/python/python3-pydantic/python3-pydantic.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pydantic SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-2.6.4} +VERSION=${VERSION:-2.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-pydantic/python3-pydantic.info b/python/python3-pydantic/python3-pydantic.info index ae543fd94d..66ac5edd47 100644 --- a/python/python3-pydantic/python3-pydantic.info +++ b/python/python3-pydantic/python3-pydantic.info @@ -1,8 +1,8 @@ PRGNAM="python3-pydantic" -VERSION="2.6.4" +VERSION="2.7.1" HOMEPAGE="https://github.com/pydantic/pydantic" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pydantic/pydantic-2.6.4.tar.gz" -MD5SUM="d4de7e5de1d5d9e03caaac5d0bf310b6" +DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pydantic/pydantic-2.7.1.tar.gz" +MD5SUM="367d4dfcab65affed15590ab99417850" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-annotated-types python3-pydantic-core python3-hatch_fancy_pypi_readme" diff --git a/python/python3-pylint/python3-pylint.SlackBuild b/python/python3-pylint/python3-pylint.SlackBuild index e44d5f2ecd..e0e34d2c1a 100644 --- a/python/python3-pylint/python3-pylint.SlackBuild +++ b/python/python3-pylint/python3-pylint.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-pylint -# Copyright 2022-2023 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2022-2024 Dimitris Zlatanidis Orestiada, Greece # Copyright 2018 Markus Rinne Finland # All rights reserved. # @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pylint SRCNAM=pylint -VERSION=${VERSION:-3.0.2} +VERSION=${VERSION:-3.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -84,11 +84,6 @@ find -L . \ python3 -m flit_core.wheel python3 -m installer -d "$PKG" dist/*.whl -# Rename executables to avoid conflicts with Python 2 version of pylint. -for executable in pylint-config pylint pyreverse symilar; do - mv $PKG/usr/bin/${executable}{,3} -done - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/python3-pylint/python3-pylint.info b/python/python3-pylint/python3-pylint.info index 3e5e117826..d33f11b8fc 100644 --- a/python/python3-pylint/python3-pylint.info +++ b/python/python3-pylint/python3-pylint.info @@ -1,10 +1,10 @@ PRGNAM="python3-pylint" -VERSION="3.0.2" +VERSION="3.2.0" HOMEPAGE="https://www.pylint.org" -DOWNLOAD="https://files.pythonhosted.org/packages/10/ab/f0ad2a4fb3265d71685627db452398f769b48d64d81c7d66ca8c4f4c198b/pylint-3.0.2.tar.gz" -MD5SUM="73baaa9253c5e16850dd9c89128fb3d2" +DOWNLOAD="https://files.pythonhosted.org/packages/62/75/e48496ea7fc2de24b361dd8084300a2f7e51c47e82363c736026d41cdf2f/pylint-3.2.0.tar.gz" +MD5SUM="ef6f8388897bea9bc845bcc4e696f484" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-astroid python3-isort python3-mccabe python3-dill python3-tomlkit python3-platformdirs" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/python3-pypdf/README b/python/python3-pypdf/README new file mode 100644 index 0000000000..f6c203ff4b --- /dev/null +++ b/python/python3-pypdf/README @@ -0,0 +1,7 @@ +pypdf is a free and open-source pure-python PDF library capable of +splitting, merging, cropping, and transforming the pages of PDF files. +It can also add custom data, viewing options, and passwords to PDF +files. pypdf can retrieve text and metadata from PDFs as well. + +pypdf is a descendant of PyPDF2, which was a fork from the original +pyPdf. (Both pyPdf and PyPDF2 are available on SBo.) diff --git a/python/python3-typogrify/python3-typogrify.SlackBuild b/python/python3-pypdf/python3-pypdf.SlackBuild index e504fd7071..17027e184b 100644 --- a/python/python3-typogrify/python3-typogrify.SlackBuild +++ b/python/python3-pypdf/python3-pypdf.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for python3-typogrify +# Slackware build script for python3-pypdf -# Copyright 2022 Steven Voges <Oregon, USA> +# Copyright 2024, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,9 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=python3-typogrify -SRCNAM=typogrify -VERSION=${VERSION:-2.0.7} +PRGNAM=python3-pypdf +VERSION=${VERSION:-4.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -57,6 +56,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -67,9 +69,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION +rm -rf pypdf-$VERSION +tar xvf $CWD/pypdf-$VERSION.tar.gz +cd pypdf-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -77,15 +79,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --root=$PKG +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - LICENSE.txt PKG-INFO README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG* README* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/python3-pypdf/python3-pypdf.info b/python/python3-pypdf/python3-pypdf.info new file mode 100644 index 0000000000..9f7ff1642e --- /dev/null +++ b/python/python3-pypdf/python3-pypdf.info @@ -0,0 +1,10 @@ +PRGNAM="python3-pypdf" +VERSION="4.2.0" +HOMEPAGE="https://github.com/py-pdf/pypdf" +DOWNLOAD="https://github.com/py-pdf/pypdf/archive/4.2.0/pypdf-4.2.0.tar.gz" +MD5SUM="26feb8968a26c42a974fac391bfe4a22" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="python3-wheel cryptography" +MAINTAINER="Alexander Verbovetsky" +EMAIL="alik@ejik.org" diff --git a/python/python3-pypdf/slack-desc b/python/python3-pypdf/slack-desc new file mode 100644 index 0000000000..49af322ab1 --- /dev/null +++ b/python/python3-pypdf/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +python3-pypdf: python3-pypdf (Python PDF library) +python3-pypdf: +python3-pypdf: pypdf is a free and open-source pure-python PDF library capable of +python3-pypdf: splitting, merging, cropping, and transforming the pages of PDF +python3-pypdf: files. It can also add custom data, viewing options, and passwords +python3-pypdf: to PDFfiles. pypdf can retrieve text and metadata from PDFs as well. +python3-pypdf: +python3-pypdf: +python3-pypdf: Homepage: https://github.com/py-pdf/pypdf +python3-pypdf: +python3-pypdf: diff --git a/python/python3-pyproject-hooks/README b/python/python3-pyproject-hooks/README deleted file mode 100644 index dfa06b5179..0000000000 --- a/python/python3-pyproject-hooks/README +++ /dev/null @@ -1,9 +0,0 @@ -python3-pyproject-hooks (Wrappers to call PEP 517 build backend hooks) - -This is a low-level library for calling build-backends in -pyproject.toml-based project. It provides the basic functionality to -help write tooling that generates distribution files from -Python projects. - -The pep517 project has been replaced by this project (low level) and -the build project (high level). diff --git a/python/python3-pyproject-hooks/python3-pyproject-hooks.info b/python/python3-pyproject-hooks/python3-pyproject-hooks.info deleted file mode 100644 index 59e5d918ae..0000000000 --- a/python/python3-pyproject-hooks/python3-pyproject-hooks.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-pyproject-hooks" -VERSION="1.0.0" -HOMEPAGE="https://github.com/pypa/pyproject-hooks" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pyproject_hooks/pyproject_hooks-1.0.0.tar.gz" -MD5SUM="69b0b6de189bc04c3f9e304281765741" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-installer" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-pyproject-hooks/slack-desc b/python/python3-pyproject-hooks/slack-desc deleted file mode 100644 index 57fe2f9534..0000000000 --- a/python/python3-pyproject-hooks/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-pyproject-hooks: python3-pyproject-hooks (Wrappers to call PEP 517 build backend hooks) -python3-pyproject-hooks: -python3-pyproject-hooks: This is a low-level library for calling build-backends in -python3-pyproject-hooks: pyproject.toml-based project. It provides the basic functionality to -python3-pyproject-hooks: help write tooling that generates distribution files from -python3-pyproject-hooks: Python projects. -python3-pyproject-hooks: -python3-pyproject-hooks: The pep517 project has been replaced by this project (low level) and -python3-pyproject-hooks: the build project (high level). -python3-pyproject-hooks: -python3-pyproject-hooks: Homepage: https://github.com/pypa/pyproject-hooks diff --git a/python/python3-pyproject-metadata/python3-pyproject-metadata.SlackBuild b/python/python3-pyproject-metadata/python3-pyproject-metadata.SlackBuild index d36329bf18..738c30369b 100644 --- a/python/python3-pyproject-metadata/python3-pyproject-metadata.SlackBuild +++ b/python/python3-pyproject-metadata/python3-pyproject-metadata.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-pyproject-metadata -# Copyright 2023 fourtysixandtwo <fourtysixandtwo@sliderr.net> +# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pyproject-metadata -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.7.1} +SRCNAM=pyproject_metadata +VERSION=${VERSION:-0.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-pyproject-metadata/python3-pyproject-metadata.info b/python/python3-pyproject-metadata/python3-pyproject-metadata.info index f4b4ae2c36..e8d856836a 100644 --- a/python/python3-pyproject-metadata/python3-pyproject-metadata.info +++ b/python/python3-pyproject-metadata/python3-pyproject-metadata.info @@ -1,8 +1,8 @@ PRGNAM="python3-pyproject-metadata" -VERSION="0.7.1" +VERSION="0.8.0" HOMEPAGE="https://github.com/FFY00/python-pyproject-metadata" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pyproject_metadata/pyproject-metadata-0.7.1.tar.gz" -MD5SUM="ca5e9527cff96153a976e14530b53746" +DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pyproject_metadata/pyproject_metadata-0.8.0.tar.gz" +MD5SUM="048ef3f91a5ba7c89a33894cb2c7725d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-build python3-wheel" diff --git a/python/python3-pytest/python3-pytest.SlackBuild b/python/python3-pytest/python3-pytest.SlackBuild index 0391443576..79836cd610 100644 --- a/python/python3-pytest/python3-pytest.SlackBuild +++ b/python/python3-pytest/python3-pytest.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pytest SRCNAM=pytest -VERSION=${VERSION:-8.1.1} +VERSION=${VERSION:-8.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-pytest/python3-pytest.info b/python/python3-pytest/python3-pytest.info index 0bc46e97b8..671dc3a0eb 100644 --- a/python/python3-pytest/python3-pytest.info +++ b/python/python3-pytest/python3-pytest.info @@ -1,8 +1,8 @@ PRGNAM="python3-pytest" -VERSION="8.1.1" +VERSION="8.2.0" HOMEPAGE="http://pytest.org" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pytest/pytest-8.1.1.tar.gz" -MD5SUM="6a85eccffeb0fa15c104f408d82ce7fa" +DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pytest/pytest-8.2.0.tar.gz" +MD5SUM="89fe0664e310ee8ee6a8bc1639f44775" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-iniconfig python3-exceptiongroup python3-setuptools-opt" diff --git a/python/python3-pytube/python3-pytube.SlackBuild b/python/python3-pytube/python3-pytube.SlackBuild index bfc76805a3..01ee99b110 100644 --- a/python/python3-pytube/python3-pytube.SlackBuild +++ b/python/python3-pytube/python3-pytube.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-pytube -# Copyright 2022-2023 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2022-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-pytube SRCNAM=pytube -VERSION=${VERSION:-12.1.3} +VERSION=${VERSION:-15.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-pytube/python3-pytube.info b/python/python3-pytube/python3-pytube.info index 8c25467ebf..cf54ec9af9 100644 --- a/python/python3-pytube/python3-pytube.info +++ b/python/python3-pytube/python3-pytube.info @@ -1,10 +1,10 @@ PRGNAM="python3-pytube" -VERSION="12.1.3" +VERSION="15.0.0" HOMEPAGE="https://github.com/pytube/pytube" -DOWNLOAD="https://files.pythonhosted.org/packages/9b/27/768869cb1211218a57bb5bbc7acd8dc8fe4443fe9d36b6b2302940791cfe/pytube-12.1.3.tar.gz" -MD5SUM="baac8084a5e0d06c0eb4323c0f1b58fe" +DOWNLOAD="https://files.pythonhosted.org/packages/d8/e7/16fec46c8d255c4bbc4b185d89c91dc92cdb802836570d8004d0db169c91/pytube-15.0.0.tar.gz" +MD5SUM="fd11326cb975238b63e1365722ecd814" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/python3-regex/python3-regex.SlackBuild b/python/python3-regex/python3-regex.SlackBuild index 9df6529e68..6b891ee52d 100644 --- a/python/python3-regex/python3-regex.SlackBuild +++ b/python/python3-regex/python3-regex.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-regex -VERSION=${VERSION:-2024.4.16} +VERSION=${VERSION:-2024.5.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-regex/python3-regex.info b/python/python3-regex/python3-regex.info index 29f51b0f1f..df20dd12be 100644 --- a/python/python3-regex/python3-regex.info +++ b/python/python3-regex/python3-regex.info @@ -1,8 +1,8 @@ PRGNAM="python3-regex" -VERSION="2024.4.16" +VERSION="2024.5.15" HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex" -DOWNLOAD="https://files.pythonhosted.org/packages/source/r/regex/regex-2024.4.16.tar.gz" -MD5SUM="1887cc71be6feacb692246944be9f59b" +DOWNLOAD="https://files.pythonhosted.org/packages/source/r/regex/regex-2024.5.15.tar.gz" +MD5SUM="ae95e2e37bb82641bb852dd5e1b5701f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-reportlab/python3-reportlab.SlackBuild b/python/python3-reportlab/python3-reportlab.SlackBuild index af46618154..4216cfb977 100644 --- a/python/python3-reportlab/python3-reportlab.SlackBuild +++ b/python/python3-reportlab/python3-reportlab.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-reportlab -VERSION=${VERSION:-4.1.0} +VERSION=${VERSION:-4.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-reportlab/python3-reportlab.info b/python/python3-reportlab/python3-reportlab.info index 260688445d..79c9f7cb0f 100644 --- a/python/python3-reportlab/python3-reportlab.info +++ b/python/python3-reportlab/python3-reportlab.info @@ -1,8 +1,8 @@ PRGNAM="python3-reportlab" -VERSION="4.1.0" +VERSION="4.2.0" HOMEPAGE="https://reportlab.com" -DOWNLOAD="https://pypi.org/packages/source/r/reportlab/reportlab-4.1.0.tar.gz" -MD5SUM="54c5960ee77e4b52c3c4cb096046b861" +DOWNLOAD="https://pypi.org/packages/source/r/reportlab/reportlab-4.2.0.tar.gz" +MD5SUM="83aa69a14f3450cd8e84e376d8713436" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-schedule/python3-schedule.SlackBuild b/python/python3-schedule/python3-schedule.SlackBuild index 9ad3f68d8c..94aa327097 100644 --- a/python/python3-schedule/python3-schedule.SlackBuild +++ b/python/python3-schedule/python3-schedule.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-schedule -# Copyright 2023 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2023-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-schedule SRCNAM=schedule -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-schedule/python3-schedule.info b/python/python3-schedule/python3-schedule.info index b29e8543cf..68a7640917 100644 --- a/python/python3-schedule/python3-schedule.info +++ b/python/python3-schedule/python3-schedule.info @@ -1,10 +1,10 @@ PRGNAM="python3-schedule" -VERSION="1.1.0" +VERSION="1.2.0" HOMEPAGE="https://github.com/dbader/schedule" -DOWNLOAD="https://files.pythonhosted.org/packages/a8/b5/a291a4c0faa491fd5baefa6d89011ece581cff47b23c0a39b42a63383358/schedule-1.1.0.tar.gz" -MD5SUM="9bf7544e37824e450457187633a17b17" +DOWNLOAD="https://files.pythonhosted.org/packages/29/22/9dd374cbf76a42ece1f1f41cc8f4957f0ad512577372527cd3dd52758241/schedule-1.2.1.tar.gz" +MD5SUM="ecb436a797e1a149bac4643330b268ca" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/python3-setuptools-opt/README b/python/python3-setuptools-opt/README deleted file mode 100644 index 5b65d6ba0b..0000000000 --- a/python/python3-setuptools-opt/README +++ /dev/null @@ -1,12 +0,0 @@ -python3-setuptools-opt (Install newer setuptools in /opt) - -Setuptools is a fully-featured, actively-maintained, and stable -library designed to facilitate packaging Python projects. - -Installs to /opt/python$PYVER/site-packages. - -Add the following before the python3 build commands in your -Slackbuild to use this version over the stock one in 15.0: - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages diff --git a/python/python3-setuptools-opt/python3-setuptools-opt.SlackBuild b/python/python3-setuptools-opt/python3-setuptools-opt.SlackBuild deleted file mode 100644 index 5ac75cd8a9..0000000000 --- a/python/python3-setuptools-opt/python3-setuptools-opt.SlackBuild +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-setuptools-opt - -# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2013-2014 Audrius Kažukauskas <audrius@neutrino.lt> -# Copyright 2014, 2017, 2018, 2022 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-setuptools-opt -SRCNAM=setuptools -VERSION=${VERSION:-69.2.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -rm -f setuptools/*.exe - -# Recent Python versions support both a libdir (for pure Python modules) and a -# platlib (for $ARCH specific modules). We've always patched Python to use -# the platform directory (such as /usr/lib64/python$PYVER/site-packages on x86_64) -# for all modules. Perhaps we will rethink this, but since an installed -# setuptools now takes priority for reporting the libdir (and this no longer -# matches the platlib on architectures such as x86_64), let's patch setuptools -# to agree with Python: -if [ "$LIBDIRSUFFIX" = "64" ]; then - zcat $CWD/setuptools.x86_64.diff.gz | patch -p1 --verbose || exit 1 -fi - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -if [ "$PKG/usr/" != "/usr/" ]; then - mkdir -p $PKG/opt - mv $PKG/usr/lib*/python$PYVER $PKG/opt/ - rmdir $PKG/usr/lib* -else - echo "ERROR: \$PKG is not set! We don't want to move the real /usr/lib*/python$PYVER" - exit 1 -fi - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a NEWS.rst LICENSE PKG-INFO README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -# If there's a CHANGES.rst, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r CHANGES.rst ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PRGNAM}-$VERSION) - cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst - touch -r CHANGES.rst $DOCSDIR/CHANGES.rst -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-setuptools-opt/python3-setuptools-opt.info b/python/python3-setuptools-opt/python3-setuptools-opt.info deleted file mode 100644 index 02a55c6ed2..0000000000 --- a/python/python3-setuptools-opt/python3-setuptools-opt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-setuptools-opt" -VERSION="69.2.0" -HOMEPAGE="https://pypi.org/project/setuptools/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-69.2.0.tar.gz" -MD5SUM="940ffdb3a2ce4f6a5ee80032aa115fc7" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build python3-wheel" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-setuptools-opt/setuptools.x86_64.diff.gz b/python/python3-setuptools-opt/setuptools.x86_64.diff.gz Binary files differdeleted file mode 100644 index a04992ad75..0000000000 --- a/python/python3-setuptools-opt/setuptools.x86_64.diff.gz +++ /dev/null diff --git a/python/python3-setuptools-opt/slack-desc b/python/python3-setuptools-opt/slack-desc deleted file mode 100644 index 53ddd75f55..0000000000 --- a/python/python3-setuptools-opt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-setuptools-opt: python3-setuptools-opt (Install setuptools from -current in /opt) -python3-setuptools-opt: -python3-setuptools-opt: Setuptools is a fully-featured, actively-maintained, and stable -python3-setuptools-opt: library designed to facilitate packaging Python projects. -python3-setuptools-opt: -python3-setuptools-opt: Installs to /opt/python$PYVER/site-packages -python3-setuptools-opt: -python3-setuptools-opt: -python3-setuptools-opt: Project URL: https://pypi.org/project/setuptools/ -python3-setuptools-opt: -python3-setuptools-opt: diff --git a/python/python3-setuptools-scm-opt/README b/python/python3-setuptools-scm-opt/README deleted file mode 100644 index 9affc3e333..0000000000 --- a/python/python3-setuptools-scm-opt/README +++ /dev/null @@ -1,17 +0,0 @@ -python3-setuptools-scm-opt (setuptools-scm installed to /opt) - -setuptools_scm extracts Python package versions from git or hg -metadata instead of declaring them as the version argument or in a SCM -managed file. - -# Build your package with this version to fix errors like the following: -ImportError: cannot import name '__version__' from ... - -NOTE: -Installs to /opt/python$PYVER/site-packages - -Add the following before the python3 build commands in your -Slackbuild to use this version over the stock one in 15.0: - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages diff --git a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild b/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild deleted file mode 100644 index ff9895deaf..0000000000 --- a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-setuptools-scm-opt - -# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-setuptools-scm-opt -SRCNAM=setuptools-scm -VERSION=${VERSION:-8.0.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -# set noarch because installing to /opt -ARCH=noarch - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -if [ "$PKG/usr/" != "/usr/" ]; then - mkdir -p $PKG/opt - mv $PKG/usr/lib*/python$PYVER $PKG/opt/ - rmdir $PKG/usr/lib* -else - echo "ERROR: \$PKG is not set! We don't want to move the real /usr/lib*/python$PYVER" - exit 1 -fi - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG.rst LICENSE README.md PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info b/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info deleted file mode 100644 index 6ddaa3d8fb..0000000000 --- a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-setuptools-scm-opt" -VERSION="8.0.2" -HOMEPAGE="https://github.com/pypa/setuptools-scm" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools-scm-8.0.2.tar.gz" -MD5SUM="036efc8cbff77f9ba420225c4807e938" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="typing-extensions python3-rich python-importlib_metadata" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-setuptools-scm-opt/slack-desc b/python/python3-setuptools-scm-opt/slack-desc deleted file mode 100644 index 5a43ac0548..0000000000 --- a/python/python3-setuptools-scm-opt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-setuptools-scm-opt: python3-setuptools-scm-opt (setuptools-scm installed to /opt) -python3-setuptools-scm-opt: -python3-setuptools-scm-opt: setuptools_scm extracts Python package versions from git or hg -python3-setuptools-scm-opt: metadata instead of declaring them as the version argument or in a SCM -python3-setuptools-scm-opt: managed file. -python3-setuptools-scm-opt: -python3-setuptools-scm-opt: -python3-setuptools-scm-opt: -python3-setuptools-scm-opt: -python3-setuptools-scm-opt: Homepage: https://github.com/pypa/setuptools_scm -python3-setuptools-scm-opt: diff --git a/python/python3-simple-term-menu/python3-simple-term-menu.SlackBuild b/python/python3-simple-term-menu/python3-simple-term-menu.SlackBuild index fe632134a1..8b296f2033 100644 --- a/python/python3-simple-term-menu/python3-simple-term-menu.SlackBuild +++ b/python/python3-simple-term-menu/python3-simple-term-menu.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-simple-term-menu -# Copyright 2022 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2022-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-simple-term-menu SRCNAM=simple-term-menu -VERSION=${VERSION:-1.5.2} +VERSION=${VERSION:-1.6.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-simple-term-menu/python3-simple-term-menu.info b/python/python3-simple-term-menu/python3-simple-term-menu.info index 57d3018c3b..656fbcbb69 100644 --- a/python/python3-simple-term-menu/python3-simple-term-menu.info +++ b/python/python3-simple-term-menu/python3-simple-term-menu.info @@ -1,10 +1,10 @@ PRGNAM="python3-simple-term-menu" -VERSION="1.5.2" +VERSION="1.6.4" HOMEPAGE="https://github.com/IngoMeyer441/simple-term-menu" -DOWNLOAD="https://files.pythonhosted.org/packages/97/b6/80cd0b89b41f5b3f98bfaf91278a2354ef0de2ed1f81ef3637c9363fcbe3/simple-term-menu-1.5.2.tar.gz" -MD5SUM="73fbc24ee2513cb6cc9a05b342f34452" +DOWNLOAD="https://files.pythonhosted.org/packages/a1/a0/7e78b93510886f6fb5b7146bd5cee03986fa5c2319644155c275e389c55a/simple-term-menu-1.6.4.tar.gz" +MD5SUM="16607a137205fb7443fa642611798794" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/python3-tenacity/python3-tenacity.SlackBuild b/python/python3-tenacity/python3-tenacity.SlackBuild index 02c6f469b7..e5dd099056 100644 --- a/python/python3-tenacity/python3-tenacity.SlackBuild +++ b/python/python3-tenacity/python3-tenacity.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-tenacity -VERSION=${VERSION:-8.2.3} +VERSION=${VERSION:-8.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-tenacity/python3-tenacity.info b/python/python3-tenacity/python3-tenacity.info index 6d79672ce4..ca39030f13 100644 --- a/python/python3-tenacity/python3-tenacity.info +++ b/python/python3-tenacity/python3-tenacity.info @@ -1,8 +1,8 @@ PRGNAM="python3-tenacity" -VERSION="8.2.3" +VERSION="8.3.0" HOMEPAGE="https://github.com/jd/tenacity" -DOWNLOAD="https://github.com/jd/tenacity/archive/refs/tags/8.2.3/tenacity-8.2.3.tar.gz" -MD5SUM="8a6a7bde47f448ed3c27237ae406b66e" +DOWNLOAD="https://github.com/jd/tenacity/archive/refs/tags/8.3.0/tenacity-8.3.0.tar.gz" +MD5SUM="0a05465d33942718e57b30fd13a6cef8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-textdistance/python3-textdistance.SlackBuild b/python/python3-textdistance/python3-textdistance.SlackBuild index 0900069898..73bd4a37d2 100644 --- a/python/python3-textdistance/python3-textdistance.SlackBuild +++ b/python/python3-textdistance/python3-textdistance.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-textdistance -VERSION=${VERSION:-4.6.1} +VERSION=${VERSION:-4.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -49,20 +49,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG diff --git a/python/python3-textdistance/python3-textdistance.info b/python/python3-textdistance/python3-textdistance.info index 099ec2083e..6c3440fc08 100644 --- a/python/python3-textdistance/python3-textdistance.info +++ b/python/python3-textdistance/python3-textdistance.info @@ -1,8 +1,8 @@ PRGNAM="python3-textdistance" -VERSION="4.6.1" +VERSION="4.6.2" HOMEPAGE="https://github.com/life4/textdistance" -DOWNLOAD="https://github.com/life4/textdistance/archive/4.6.1/textdistance-4.6.1.tar.gz" -MD5SUM="1e642eaf827b7a6c611e1ac7319a12b0" +DOWNLOAD="https://github.com/life4/textdistance/archive/4.6.2/textdistance-4.6.2.tar.gz" +MD5SUM="ce45430e7d68ed7ca8d3bf2cdd0148d7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-threadpoolctl/python3-threadpoolctl.SlackBuild b/python/python3-threadpoolctl/python3-threadpoolctl.SlackBuild index 93ab6d58c5..d1d64ee6ec 100644 --- a/python/python3-threadpoolctl/python3-threadpoolctl.SlackBuild +++ b/python/python3-threadpoolctl/python3-threadpoolctl.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-threadpoolctl SRCNAM=threadpoolctl -VERSION=${VERSION:-3.4.0} +VERSION=${VERSION:-3.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-threadpoolctl/python3-threadpoolctl.info b/python/python3-threadpoolctl/python3-threadpoolctl.info index 8af0b0205f..b08c062aeb 100644 --- a/python/python3-threadpoolctl/python3-threadpoolctl.info +++ b/python/python3-threadpoolctl/python3-threadpoolctl.info @@ -1,8 +1,8 @@ PRGNAM="python3-threadpoolctl" -VERSION="3.4.0" +VERSION="3.5.0" HOMEPAGE="https://github.com/joblib/threadpoolctl/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/t/threadpoolctl/threadpoolctl-3.4.0.tar.gz" -MD5SUM="99b941e8022c91317c1e9bf6decc808b" +DOWNLOAD="https://files.pythonhosted.org/packages/source/t/threadpoolctl/threadpoolctl-3.5.0.tar.gz" +MD5SUM="3ae140ae3bb08f43fdc19db73bcdf478" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-build" diff --git a/python/python3-tinydb/python3-tinydb.SlackBuild b/python/python3-tinydb/python3-tinydb.SlackBuild index c2ee8fff16..2012eafabe 100644 --- a/python/python3-tinydb/python3-tinydb.SlackBuild +++ b/python/python3-tinydb/python3-tinydb.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-tinydb -# Copyright 2023 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2023-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-tinydb SRCNAM=tinydb -VERSION=${VERSION:-4.7.1} +VERSION=${VERSION:-4.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,12 +77,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --root=$PKG +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/python/python3-tinydb/python3-tinydb.info b/python/python3-tinydb/python3-tinydb.info index 8d2d11d6eb..5d0dbf3ca7 100644 --- a/python/python3-tinydb/python3-tinydb.info +++ b/python/python3-tinydb/python3-tinydb.info @@ -1,10 +1,10 @@ PRGNAM="python3-tinydb" -VERSION="4.7.1" +VERSION="4.8.0" HOMEPAGE="https://tinydb.readthedocs.io/en/latest/" -DOWNLOAD="https://files.pythonhosted.org/packages/32/ed/78f24df0fec08f0fb92fc4b4758adcab780660caa8c3f94c2e175eb7e2ba/tinydb-4.7.1.tar.gz" -MD5SUM="d570288bdae4338497ed8655261bbf89" +DOWNLOAD="https://files.pythonhosted.org/packages/30/0b/9e75a8d3333a6a3d9b36de04bf87a37a8d7f100035ea23c9c37bf0a112ab/tinydb-4.8.0.tar.gz" +MD5SUM="8738999976febfe7e8ea81c4b1910f9b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3-poetry-core" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/python3-tomli_w/README b/python/python3-tomli_w/README deleted file mode 100644 index ed35b90bb1..0000000000 --- a/python/python3-tomli_w/README +++ /dev/null @@ -1,5 +0,0 @@ -python3-tomli_w (A lil TOML writer) - -Tomli-W is a Python library for writing TOML. It is a write-only -counterpart to Tomli, which is a read-only TOML parser. Tomli-W is -fully compatible with TOML v1.0.0. diff --git a/python/python3-tomli_w/python3-tomli_w.SlackBuild b/python/python3-tomli_w/python3-tomli_w.SlackBuild deleted file mode 100644 index 7d20a1f227..0000000000 --- a/python/python3-tomli_w/python3-tomli_w.SlackBuild +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-tomli_w - -# Copyright 2022 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-tomli_w -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -# installing tests to a subdir of your project might not conflict the toplevel, but -# don't do it anyway... -#rm -r "$PKG"/usr/lib${LIBDIRSUFFIX}/python*/site-packages/${SRCNAM}/tests/ - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-tomli_w/python3-tomli_w.info b/python/python3-tomli_w/python3-tomli_w.info deleted file mode 100644 index 549ff13565..0000000000 --- a/python/python3-tomli_w/python3-tomli_w.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-tomli_w" -VERSION="1.0.0" -HOMEPAGE="https://github.com/hukkin/tomli-w" -DOWNLOAD="https://files.pythonhosted.org/packages/source/t/tomli_w/tomli_w-1.0.0.tar.gz" -MD5SUM="2c050134d4842b449ec4129c97d51e62" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-tomli_w/slack-desc b/python/python3-tomli_w/slack-desc deleted file mode 100644 index 6030fc98ea..0000000000 --- a/python/python3-tomli_w/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-tomli_w: python3-tomli_w (A lil TOML writer) -python3-tomli_w: -python3-tomli_w: Tomli-W is a Python library for writing TOML. It is a write-only -python3-tomli_w: counterpart to Tomli, which is a read-only TOML parser. Tomli-W is -python3-tomli_w: fully compatible with TOML v1.0.0. -python3-tomli_w: -python3-tomli_w: -python3-tomli_w: -python3-tomli_w: Homepage: https://github.com/hukkin/tomli-w -python3-tomli_w: -python3-tomli_w: diff --git a/python/python3-tomlkit/python3-tomlkit.SlackBuild b/python/python3-tomlkit/python3-tomlkit.SlackBuild index 7651b56273..8145d18a51 100644 --- a/python/python3-tomlkit/python3-tomlkit.SlackBuild +++ b/python/python3-tomlkit/python3-tomlkit.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-tomlkit -VERSION=${VERSION:-0.12.4} +VERSION=${VERSION:-0.12.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-tomlkit/python3-tomlkit.info b/python/python3-tomlkit/python3-tomlkit.info index 499d1f0879..d580e6adeb 100644 --- a/python/python3-tomlkit/python3-tomlkit.info +++ b/python/python3-tomlkit/python3-tomlkit.info @@ -1,8 +1,8 @@ PRGNAM="python3-tomlkit" -VERSION="0.12.4" +VERSION="0.12.5" HOMEPAGE="https://github.com/sdispater/tomlkit" -DOWNLOAD="https://github.com/sdispater/tomlkit/releases/download/0.12.4/tomlkit-0.12.4.tar.gz" -MD5SUM="e182df9625d617692a9ae035266634fe" +DOWNLOAD="https://github.com/sdispater/tomlkit/releases/download/0.12.5/tomlkit-0.12.5.tar.gz" +MD5SUM="d80337406fdca101c12adff115983f31" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-poetry-core" diff --git a/python/python3-tox/python3-tox.SlackBuild b/python/python3-tox/python3-tox.SlackBuild index ca2466b884..bdc47bcacf 100644 --- a/python/python3-tox/python3-tox.SlackBuild +++ b/python/python3-tox/python3-tox.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-tox -VERSION=${VERSION:-4.14.2} +VERSION=${VERSION:-4.15.0} SRCNAM=${SRCNAM:-tox} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/python3-tox/python3-tox.info b/python/python3-tox/python3-tox.info index caf897a8e5..c016ff83ba 100644 --- a/python/python3-tox/python3-tox.info +++ b/python/python3-tox/python3-tox.info @@ -1,8 +1,8 @@ PRGNAM="python3-tox" -VERSION="4.14.2" +VERSION="4.15.0" HOMEPAGE="https://tox.wiki/" -DOWNLOAD="https://github.com/tox-dev/tox/archive/refs/tags/4.14.2/tox-4.14.2.tar.gz" -MD5SUM="656a8032cfa8cd5b16046a64ca218d7d" +DOWNLOAD="https://github.com/tox-dev/tox/archive/refs/tags/4.15.0/tox-4.15.0.tar.gz" +MD5SUM="913ef63e6b6fde79cf84d9126c2ee023" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-cachetools colorama python3-pyproject-api python3-virtualenv" diff --git a/python/python3-trove-classifiers/README b/python/python3-trove-classifiers/README deleted file mode 100644 index 99c4a0202f..0000000000 --- a/python/python3-trove-classifiers/README +++ /dev/null @@ -1,4 +0,0 @@ -python3-trove-classifiers (Canonical source for classifiers on PyPI) - -Classifiers categorize projects per PEP 301. Use this package to -validate classifiers in packages for PyPI upload or download. diff --git a/python/python3-trove-classifiers/python3-trove-classifiers.SlackBuild b/python/python3-trove-classifiers/python3-trove-classifiers.SlackBuild deleted file mode 100644 index fd14295e72..0000000000 --- a/python/python3-trove-classifiers/python3-trove-classifiers.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-trove-classifiers - -# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-trove-classifiers -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-2024.3.25} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CONTRIBUTING.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-trove-classifiers/python3-trove-classifiers.info b/python/python3-trove-classifiers/python3-trove-classifiers.info deleted file mode 100644 index ef9a70cb5e..0000000000 --- a/python/python3-trove-classifiers/python3-trove-classifiers.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-trove-classifiers" -VERSION="2024.3.25" -HOMEPAGE="https://github.com/pypa/trove-classifiers" -DOWNLOAD="https://files.pythonhosted.org/packages/source/t/trove-classifiers/trove-classifiers-2024.3.25.tar.gz" -MD5SUM="ea059326f148738747dfb3e3e9b579a6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-calver" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-trove-classifiers/slack-desc b/python/python3-trove-classifiers/slack-desc deleted file mode 100644 index 7d5b42c647..0000000000 --- a/python/python3-trove-classifiers/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-trove-classifiers: python3-trove-classifiers (Canonical source for classifiers on PyPI) -python3-trove-classifiers: -python3-trove-classifiers: Classifiers categorize projects per PEP 301. Use this package to -python3-trove-classifiers: validate classifiers in packages for PyPI upload or download. -python3-trove-classifiers: -python3-trove-classifiers: Homepage: https://github.com/pypa/trove-classifiers -python3-trove-classifiers: -python3-trove-classifiers: -python3-trove-classifiers: -python3-trove-classifiers: -python3-trove-classifiers: diff --git a/python/python3-typogrify/README b/python/python3-typogrify/README deleted file mode 100644 index 7b85ea97e3..0000000000 --- a/python/python3-typogrify/README +++ /dev/null @@ -1,5 +0,0 @@ -Typogrify provides a set of custom filters that automatically apply -various transformations to plain text in order to yield -typographically-improved HTML. While often used in conjunction with -Jinja and Django template systems, the filters can be used in any -environment. diff --git a/python/python3-typogrify/python3-typogrify.info b/python/python3-typogrify/python3-typogrify.info deleted file mode 100644 index 8d9d21e089..0000000000 --- a/python/python3-typogrify/python3-typogrify.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-typogrify" -VERSION="2.0.7" -HOMEPAGE="https://github.com/mintchaos/typogrify" -DOWNLOAD="https://files.pythonhosted.org/packages/8a/bf/64959d6187d42472acb846bcf462347c9124952c05bd57e5769d5f28f9a6/typogrify-2.0.7.tar.gz" -MD5SUM="63f38f80531996f187d2894cc497ba08" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python-smartypants" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/python/python3-typogrify/slack-desc b/python/python3-typogrify/slack-desc deleted file mode 100644 index f8a55e6af9..0000000000 --- a/python/python3-typogrify/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-typogrify: python3-typogrify (Text to HTML translator) -python3-typogrify: -python3-typogrify: A set of Django template filters to make caring about typography on -python3-typogrify: the web a bit easier. -python3-typogrify: -python3-typogrify: Homepage: https://github.com/mintchaos/typogrify -python3-typogrify: -python3-typogrify: -python3-typogrify: -python3-typogrify: -python3-typogrify: diff --git a/python/python3-ufo2ft/python3-ufo2ft.SlackBuild b/python/python3-ufo2ft/python3-ufo2ft.SlackBuild index c412603a05..b25afbc25f 100644 --- a/python/python3-ufo2ft/python3-ufo2ft.SlackBuild +++ b/python/python3-ufo2ft/python3-ufo2ft.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-ufo2ft -VERSION=${VERSION:-3.1.0} +VERSION=${VERSION:-3.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,7 +81,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 -m build --wheel --no-isolation +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/python/python3-ufo2ft/python3-ufo2ft.info b/python/python3-ufo2ft/python3-ufo2ft.info index 4237b2f62e..16250f8fe4 100644 --- a/python/python3-ufo2ft/python3-ufo2ft.info +++ b/python/python3-ufo2ft/python3-ufo2ft.info @@ -1,8 +1,8 @@ PRGNAM="python3-ufo2ft" -VERSION="3.1.0" +VERSION="3.2.1" HOMEPAGE="https://github.com/googlefonts/ufo2ft" -DOWNLOAD="https://pypi.io/packages/source/u/ufo2ft/ufo2ft-3.1.0.tar.gz" -MD5SUM="f9f3d50f5fcc63b73ce064adee70b16c" +DOWNLOAD="https://pypi.io/packages/source/u/ufo2ft/ufo2ft-3.2.1.tar.gz" +MD5SUM="5d2076df255ef95ed9989ce58bece51b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-booleanOperations python3-defcon python3-cffsubr python3-compreffor" diff --git a/python/python3-uharfbuzz/changelog b/python/python3-uharfbuzz/changelog index faf6c97178..e72816c5e8 100644 --- a/python/python3-uharfbuzz/changelog +++ b/python/python3-uharfbuzz/changelog @@ -13,3 +13,7 @@ Thanks to Nikos Glotis for testing this version 25/02/2024: Updated to version 0.39.0 + +24/05/20204: + +Updated to version 0.39.1 diff --git a/python/python3-uharfbuzz/python3-uharfbuzz.SlackBuild b/python/python3-uharfbuzz/python3-uharfbuzz.SlackBuild index 63109c27f3..ce025bd5fb 100644 --- a/python/python3-uharfbuzz/python3-uharfbuzz.SlackBuild +++ b/python/python3-uharfbuzz/python3-uharfbuzz.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-uharfbuzz -VERSION=${VERSION:-0.39.0} +VERSION=${VERSION:-0.39.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-uharfbuzz/python3-uharfbuzz.info b/python/python3-uharfbuzz/python3-uharfbuzz.info index 451187acd8..3c4d88771e 100644 --- a/python/python3-uharfbuzz/python3-uharfbuzz.info +++ b/python/python3-uharfbuzz/python3-uharfbuzz.info @@ -1,8 +1,8 @@ PRGNAM="python3-uharfbuzz" -VERSION="0.39.0" +VERSION="0.39.1" HOMEPAGE="https://www.github.com/harfbuzz/uharfbuzz" -DOWNLOAD="https://pypi.io/packages/source/u/uharfbuzz/uharfbuzz-0.39.0.zip" -MD5SUM="2754f0861a664ea2e23a29de0c28e59c" +DOWNLOAD="https://pypi.io/packages/source/u/uharfbuzz/uharfbuzz-0.39.1.zip" +MD5SUM="44db375ce3f49ce253303246ff2198f9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-build python3-wheel" diff --git a/python/python3-unearth/python3-unearth.SlackBuild b/python/python3-unearth/python3-unearth.SlackBuild index 6d1d97d55f..8274402fc5 100644 --- a/python/python3-unearth/python3-unearth.SlackBuild +++ b/python/python3-unearth/python3-unearth.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-unearth -VERSION=${VERSION:-0.15.1} +VERSION=${VERSION:-0.15.2} SRCNAM=${SRCNAM:-unearth} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/python3-unearth/python3-unearth.info b/python/python3-unearth/python3-unearth.info index dccf7a394c..c5ab22fc2b 100644 --- a/python/python3-unearth/python3-unearth.info +++ b/python/python3-unearth/python3-unearth.info @@ -1,8 +1,8 @@ PRGNAM="python3-unearth" -VERSION="0.15.1" +VERSION="0.15.2" HOMEPAGE="https://github.com/frostming/unearth" -DOWNLOAD="https://github.com/frostming/unearth/archive/refs/tags/0.15.1/unearth-0.15.1.tar.gz" -MD5SUM="443e252fdc6d243b070f475a2ebd21f4" +DOWNLOAD="https://github.com/frostming/unearth/archive/refs/tags/0.15.2/unearth-0.15.2.tar.gz" +MD5SUM="ef81959caa19f0c79f9aed65d818ed5a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-pdm-backend python3-httpx" diff --git a/python/python3-userpath/python3-userpath.SlackBuild b/python/python3-userpath/python3-userpath.SlackBuild index f93cda2b7a..a9f61e83cf 100644 --- a/python/python3-userpath/python3-userpath.SlackBuild +++ b/python/python3-userpath/python3-userpath.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-userpath -VERSION=${VERSION:-1.9.1} +VERSION=${VERSION:-1.9.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,11 +81,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 -m build --wheel --no-isolation +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/python/python3-userpath/python3-userpath.info b/python/python3-userpath/python3-userpath.info index 004316cfba..52ed860422 100644 --- a/python/python3-userpath/python3-userpath.info +++ b/python/python3-userpath/python3-userpath.info @@ -1,8 +1,8 @@ PRGNAM="python3-userpath" -VERSION="1.9.1" +VERSION="1.9.2" HOMEPAGE="https://github.com/ofek/userpath" -DOWNLOAD="https://pypi.io/packages/source/u/userpath/userpath-1.9.1.tar.gz" -MD5SUM="112c7732826e153841fc3686d008dc4d" +DOWNLOAD="https://pypi.io/packages/source/u/userpath/userpath-1.9.2.tar.gz" +MD5SUM="0bcebc971ce7fb38aa3fde3b137d39e2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="click python3-pytest" diff --git a/python/python3-virtualenv/python3-virtualenv.SlackBuild b/python/python3-virtualenv/python3-virtualenv.SlackBuild index 281c4bb62d..81d989dde0 100644 --- a/python/python3-virtualenv/python3-virtualenv.SlackBuild +++ b/python/python3-virtualenv/python3-virtualenv.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-virtualenv SRCNAM=virtualenv -VERSION=${VERSION:-20.25.3} +VERSION=${VERSION:-20.26.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-virtualenv/python3-virtualenv.info b/python/python3-virtualenv/python3-virtualenv.info index 85b3e59c0d..b96d36ed13 100644 --- a/python/python3-virtualenv/python3-virtualenv.info +++ b/python/python3-virtualenv/python3-virtualenv.info @@ -1,8 +1,8 @@ PRGNAM="python3-virtualenv" -VERSION="20.25.3" +VERSION="20.26.1" HOMEPAGE="https://virtualenv.pypa.io/" -DOWNLOAD="https://github.com/pypa/virtualenv/archive/20.25.3/virtualenv-20.25.3.tar.gz" -MD5SUM="da8e76f886f9d6e93048071c16e96b55" +DOWNLOAD="https://github.com/pypa/virtualenv/archive/20.26.1/virtualenv-20.26.1.tar.gz" +MD5SUM="f7d19fa64089623329de3a4f6cd485f0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-setuptools-scm-opt python3-distlib python3-filelock python3-platformdirs" diff --git a/python/python3-webencodings/README b/python/python3-webencodings/README deleted file mode 100644 index 736e9a2870..0000000000 --- a/python/python3-webencodings/README +++ /dev/null @@ -1,13 +0,0 @@ -webencodings is a Python implementation of the WHATWG Encoding standard. - -In order to be compatible with legacy web content when interpreting -something like Content-Type: text/html; charset=latin1, tools need to -use a particular set of aliases for encoding labels as well as some -overriding rules. For example, US-ASCII and iso-8859-1 on the web are -actually aliases for windows-1252, and an UTF-8 or UTF-16 BOM takes -precedence over any other encoding declaration. The Encoding standard -defines all such details so that implementations do not have to -reverse-engineer each other. - -This module has encoding labels and BOM detection, but the actual -implementation for encoders and decoders is Python's. diff --git a/python/python3-webencodings/python3-webencodings.SlackBuild b/python/python3-webencodings/python3-webencodings.SlackBuild deleted file mode 100644 index 91b1c7be84..0000000000 --- a/python/python3-webencodings/python3-webencodings.SlackBuild +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash -# -# SlackBuild for python3-webencodings - -# Copyright 2021 Yth | Pont-en-Royans, France | yth@ythogtha.org -# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-webencodings -SRCNAM=python-webencodings -VERSION=${VERSION:-0.5.1} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xzf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-webencodings/python3-webencodings.info b/python/python3-webencodings/python3-webencodings.info deleted file mode 100644 index cdd96149be..0000000000 --- a/python/python3-webencodings/python3-webencodings.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-webencodings" -VERSION="0.5.1" -HOMEPAGE="https://pythonhosted.org/webencodings/" -DOWNLOAD="https://github.com/gsnedders/python-webencodings/archive/v0.5.1/python-webencodings-0.5.1.tar.gz" -MD5SUM="7eb67377743cd55eaa356496c439471e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Yth - Arnaud" -EMAIL="yth@ythogtha.org" diff --git a/python/python3-webencodings/slack-desc b/python/python3-webencodings/slack-desc deleted file mode 100644 index 2b41d21154..0000000000 --- a/python/python3-webencodings/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-webencodings: python3-webencodings (Character encoding for the web) -python3-webencodings: -python3-webencodings: webencodings is a Python implementation of the WHATWG Encoding -python3-webencodings: standard. -python3-webencodings: -python3-webencodings: -python3-webencodings: -python3-webencodings: -python3-webencodings: -python3-webencodings: -python3-webencodings: diff --git a/python/python3-websocket-client/python3-websocket-client.SlackBuild b/python/python3-websocket-client/python3-websocket-client.SlackBuild index 1bc458e930..43619dfd8f 100644 --- a/python/python3-websocket-client/python3-websocket-client.SlackBuild +++ b/python/python3-websocket-client/python3-websocket-client.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-websocket-client -# Copyright 2022-23 fourtysixandtwo <fourtysixandtwo@sliderr.net> +# Copyright 2022-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-websocket-client -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-1.7.0} +SRCNAM=websocket_client +VERSION=${VERSION:-1.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-websocket-client/python3-websocket-client.info b/python/python3-websocket-client/python3-websocket-client.info index ce5e608938..440327bb85 100644 --- a/python/python3-websocket-client/python3-websocket-client.info +++ b/python/python3-websocket-client/python3-websocket-client.info @@ -1,8 +1,8 @@ PRGNAM="python3-websocket-client" -VERSION="1.7.0" +VERSION="1.8.0" HOMEPAGE="https://github.com/websocket-client/websocket-client/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/w/websocket-client/websocket-client-1.7.0.tar.gz" -MD5SUM="e70abf1dd976058915365c05b4e8a6c9" +DOWNLOAD="https://files.pythonhosted.org/packages/source/w/websocket-client/websocket_client-1.8.0.tar.gz" +MD5SUM="9cffbda9eefb0a17e9c4cda3b7884493" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-websockets/python3-websockets.SlackBuild b/python/python3-websockets/python3-websockets.SlackBuild index 70b73ee9b0..3be3cf0018 100644 --- a/python/python3-websockets/python3-websockets.SlackBuild +++ b/python/python3-websockets/python3-websockets.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-websockets -# Copyright 2022 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2022-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-websockets SRCNAM=websockets -VERSION=${VERSION:-10.2} +VERSION=${VERSION:-12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,7 +80,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --root=$PKG +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/python3-websockets/python3-websockets.info b/python/python3-websockets/python3-websockets.info index 1d2d80ad9a..003a304dcd 100644 --- a/python/python3-websockets/python3-websockets.info +++ b/python/python3-websockets/python3-websockets.info @@ -1,10 +1,10 @@ PRGNAM="python3-websockets" -VERSION="10.2" +VERSION="12.0" HOMEPAGE="https://github.com/aaugustin/websockets" -DOWNLOAD="https://files.pythonhosted.org/packages/b4/7b/0960d02701f783bb052ec69ea32789d878d2cce05a03950adbd75f164758/websockets-10.2.tar.gz" -MD5SUM="b917be5391934f872145c0473d8d8e41" +DOWNLOAD="https://files.pythonhosted.org/packages/2e/62/7a7874b7285413c954a4cca3c11fd851f11b2fe5b4ae2d9bee4f6d9bdb10/websockets-12.0.tar.gz" +MD5SUM="49d033c8236aa56ba2524f65570a27c5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3-wheel python3-build" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/python3-wheel/README b/python/python3-wheel/README deleted file mode 100644 index d64f5dca0a..0000000000 --- a/python/python3-wheel/README +++ /dev/null @@ -1,6 +0,0 @@ -python3-wheel (A built-package format for Python) - -This library is the reference implementation of the Python wheel -packaging standard, as defined in PEP 427. - -Optional dependencies: python-keyring diff --git a/python/python3-wheel/python3-wheel.SlackBuild b/python/python3-wheel/python3-wheel.SlackBuild deleted file mode 100644 index 2b70507a95..0000000000 --- a/python/python3-wheel/python3-wheel.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# Slackware build script for python3-wheel - -# Copyright 2023-2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=python3-wheel -SRCNAM=${PRGNAM#python3-*} -VERSION=${VERSION:-0.43.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m flit_core.wheel -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/python3-wheel/python3-wheel.info b/python/python3-wheel/python3-wheel.info deleted file mode 100644 index 6c0310fc3f..0000000000 --- a/python/python3-wheel/python3-wheel.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="python3-wheel" -VERSION="0.43.0" -HOMEPAGE="https://github.com/pypa/wheel" -DOWNLOAD="https://files.pythonhosted.org/packages/source/w/wheel/wheel-0.43.0.tar.gz" -MD5SUM="387af15d51367a19d834d6db413547d0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-installer" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/python3-wheel/slack-desc b/python/python3-wheel/slack-desc deleted file mode 100644 index 2e875b9718..0000000000 --- a/python/python3-wheel/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python3-wheel: python3-wheel (A built-package format for Python) -python3-wheel: -python3-wheel: This library is the reference implementation of the Python wheel -python3-wheel: packaging standard, as defined in PEP 427. -python3-wheel: -python3-wheel: Homepage: https://wheel.readthedocs.io -python3-wheel: -python3-wheel: -python3-wheel: -python3-wheel: -python3-wheel: diff --git a/python/python3-wrapt/python3-wrapt.SlackBuild b/python/python3-wrapt/python3-wrapt.SlackBuild index 61da4175ff..57de8c226a 100644 --- a/python/python3-wrapt/python3-wrapt.SlackBuild +++ b/python/python3-wrapt/python3-wrapt.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-wrapt -# Copyright 2022 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2022-2024 Dimitris Zlatanidis Orestiada, Greece # Copyright 2018 Markus Rinne Finland # All rights reserved. # @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-wrapt SRCNAM=wrapt -VERSION=${VERSION:-1.14.1} +VERSION=${VERSION:-1.16.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/python3-wrapt/python3-wrapt.info b/python/python3-wrapt/python3-wrapt.info index be580a2b61..b14f8f8392 100644 --- a/python/python3-wrapt/python3-wrapt.info +++ b/python/python3-wrapt/python3-wrapt.info @@ -1,10 +1,10 @@ PRGNAM="python3-wrapt" -VERSION="1.14.1" +VERSION="1.16.0" HOMEPAGE="https://github.com/GrahamDumpleton/wrapt" -DOWNLOAD="https://files.pythonhosted.org/packages/11/eb/e06e77394d6cf09977d92bff310cb0392930c08a338f99af6066a5a98f92/wrapt-1.14.1.tar.gz" -MD5SUM="6e7340264f038efdefcba707250c91c2" +DOWNLOAD="https://files.pythonhosted.org/packages/95/4c/063a912e20bcef7124e0df97282a8af3ff3e4b603ce84c481d6d7346be0a/wrapt-1.16.0.tar.gz" +MD5SUM="3e370b4bc08f7dcc518cf8895673b19c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/python3-wurlitzer/python3-wurlitzer.SlackBuild b/python/python3-wurlitzer/python3-wurlitzer.SlackBuild index 4ff237441c..8a47c64993 100644 --- a/python/python3-wurlitzer/python3-wurlitzer.SlackBuild +++ b/python/python3-wurlitzer/python3-wurlitzer.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-wurlitzer -# Copyright 2023 Isaac Yu <isaacyu@protonmail.com> +# Copyright 2023-2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-wurlitzer -VERSION=${VERSION:-3.0.3} +VERSION=${VERSION:-3.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -49,20 +49,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG diff --git a/python/python3-wurlitzer/python3-wurlitzer.info b/python/python3-wurlitzer/python3-wurlitzer.info index d6d4b9e72d..b89ea03fc2 100644 --- a/python/python3-wurlitzer/python3-wurlitzer.info +++ b/python/python3-wurlitzer/python3-wurlitzer.info @@ -1,8 +1,8 @@ PRGNAM="python3-wurlitzer" -VERSION="3.0.3" +VERSION="3.1.0" HOMEPAGE="https://github.com/minrk/wurlitzer" -DOWNLOAD="https://github.com/minrk/wurlitzer/archive/3.0.3/wurlitzer-3.0.3.tar.gz" -MD5SUM="b9808275a4cda9485db8d8ebe4132066" +DOWNLOAD="https://github.com/minrk/wurlitzer/archive/3.1.0/wurlitzer-3.1.0.tar.gz" +MD5SUM="ce760bfc29daedca7cab4e7847d934ec" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/python/python3-xmldiff/python3-xmldiff.SlackBuild b/python/python3-xmldiff/python3-xmldiff.SlackBuild index 2481ca8ca5..139c1d2bb5 100644 --- a/python/python3-xmldiff/python3-xmldiff.SlackBuild +++ b/python/python3-xmldiff/python3-xmldiff.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-xmldiff -# Copyright 2023 Vijay Marcel +# Copyright 2023-2024 Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-xmldiff -VERSION=${VERSION:-2.6.3} +VERSION=${VERSION:-2.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -49,6 +49,23 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + set -e trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ERR @@ -66,14 +83,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python3 setup.py install --prefix=/usr --root=$PKG --optimize=1 +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" python3 setup.py install --prefix=/usr --root=$PKG --optimize=1 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES.rst LICENSE.txt README.rst README.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES.rst LICENSE.txt README.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+ diff --git a/python/python3-xmldiff/python3-xmldiff.info b/python/python3-xmldiff/python3-xmldiff.info index c315aafc66..f0cf8a2513 100644 --- a/python/python3-xmldiff/python3-xmldiff.info +++ b/python/python3-xmldiff/python3-xmldiff.info @@ -1,8 +1,8 @@ PRGNAM="python3-xmldiff" -VERSION="2.6.3" +VERSION="2.7.0" HOMEPAGE="https://github.com/Shoobx/xmldiff" -DOWNLOAD="https://pypi.io/packages/source/x/xmldiff/xmldiff-2.6.3.tar.gz" -MD5SUM="139f973cd3b66a642c1dd1737bce40dd" +DOWNLOAD="https://pypi.io/packages/source/x/xmldiff/xmldiff-2.7.0.tar.gz" +MD5SUM="3f548773840e42655c6083940e056207" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-lxml" diff --git a/python/pytz/README b/python/pytz/README deleted file mode 100644 index 354f8ea02c..0000000000 --- a/python/pytz/README +++ /dev/null @@ -1,5 +0,0 @@ -pytz brings the Olson tz database into Python. This library allows -accurate and cross platform timezone calculations using Python 2.3 -or higher. It also solves the issue of ambiguous times at the end -of daylight savings, which you can read more about in the Python -Library Reference (datetime.tzinfo). diff --git a/python/pytz/pytz.SlackBuild b/python/pytz/pytz.SlackBuild deleted file mode 100644 index 2d4da870cc..0000000000 --- a/python/pytz/pytz.SlackBuild +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# Slackware build script for pytz - -# Copyright 2009-2021 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=pytz -VERSION=${VERSION:-2021.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt PKG-INFO README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/pytz/pytz.info b/python/pytz/pytz.info deleted file mode 100644 index 6c4d2d5455..0000000000 --- a/python/pytz/pytz.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pytz" -VERSION="2021.3" -HOMEPAGE="https://launchpad.net/pytz" -DOWNLOAD="https://files.pythonhosted.org/packages/e3/8e/1cde9d002f48a940b9d9d38820aaf444b229450c0854bdf15305ce4a3d1a/pytz-2021.3.tar.gz" -MD5SUM="d7b7060bbac4970afa2050c139c9fcb6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@slackbuilds.org" diff --git a/python/pytz/slack-desc b/python/pytz/slack-desc deleted file mode 100644 index fcd51492e7..0000000000 --- a/python/pytz/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pytz: pytz (World timezone definitions for Python) -pytz: -pytz: pytz brings the Olson tz database into Python. This library allows -pytz: accurate and cross platform timezone calculations using Python 2.3 -pytz: or higher. It also solves the issue of ambiguous times at the end -pytz: of daylight savings, which you can read more about in the Python -pytz: Library Reference (datetime.tzinfo). -pytz: -pytz: Homepage: https://launchpad.net/pytz -pytz: -pytz: diff --git a/python/requirements-detector/README b/python/requirements-detector/README deleted file mode 100644 index 88c6a650b2..0000000000 --- a/python/requirements-detector/README +++ /dev/null @@ -1,2 +0,0 @@ -requirements-detector is a simple Python tool which attempts to find -and list the requirements of a Python project. diff --git a/python/requirements-detector/requirements-detector.SlackBuild b/python/requirements-detector/requirements-detector.SlackBuild deleted file mode 100644 index 7d7b74099e..0000000000 --- a/python/requirements-detector/requirements-detector.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -# Slackware build script for requirements-detector - -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=requirements-detector -VERSION=${VERSION:-0.5.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/requirements-detector/requirements-detector.info b/python/requirements-detector/requirements-detector.info deleted file mode 100644 index 0615f7d044..0000000000 --- a/python/requirements-detector/requirements-detector.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="requirements-detector" -VERSION="0.5.2" -HOMEPAGE="https://github.com/landscapeio/requirements-detector" -DOWNLOAD="https://pypi.python.org/packages/49/b2/375f6fb3544037089468f217f7ccfcd1cabc4ef88316ec74e602063f3da2/requirements-detector-0.5.2.tar.gz" -MD5SUM="8425e62afb95c9f2a6b55c233bfdcac8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="astroid" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/requirements-detector/slack-desc b/python/requirements-detector/slack-desc deleted file mode 100644 index 1dd73a749d..0000000000 --- a/python/requirements-detector/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -requirements-detector: requirements-detector (find requirements of a Python project) -requirements-detector: -requirements-detector: This package is a simple Python tool which attempts to find and list -requirements-detector: the requirements of a Python project. -requirements-detector: -requirements-detector: Homepage: https://github.com/landscapeio/requirements-detector -requirements-detector: -requirements-detector: -requirements-detector: -requirements-detector: -requirements-detector: diff --git a/python/s3transfer/s3transfer.SlackBuild b/python/s3transfer/s3transfer.SlackBuild index cac100f5ba..5f6a2aaadb 100644 --- a/python/s3transfer/s3transfer.SlackBuild +++ b/python/s3transfer/s3transfer.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for s3transfer -# Copyright 2016-2023 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2016-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=s3transfer -VERSION=${VERSION:-0.10.0} +VERSION=${VERSION:-0.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/python/s3transfer/s3transfer.info b/python/s3transfer/s3transfer.info index 28e4ce913d..337f9a9604 100644 --- a/python/s3transfer/s3transfer.info +++ b/python/s3transfer/s3transfer.info @@ -1,8 +1,8 @@ PRGNAM="s3transfer" -VERSION="0.10.0" +VERSION="0.10.1" HOMEPAGE="https://github.com/boto/s3transfer" -DOWNLOAD="https://github.com/boto/s3transfer/archive/0.10.0/s3transfer-0.10.0.tar.gz" -MD5SUM="b6561cf46cf9a0fc39ca4a30cb34fb38" +DOWNLOAD="https://github.com/boto/s3transfer/archive/0.10.1/s3transfer-0.10.1.tar.gz" +MD5SUM="feb321ba027731cee677a0e282610ded" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="botocore" diff --git a/python/snowballstemmer/snowballstemmer.SlackBuild b/python/snowballstemmer/snowballstemmer.SlackBuild index 805761b599..7e3a58571d 100644 --- a/python/snowballstemmer/snowballstemmer.SlackBuild +++ b/python/snowballstemmer/snowballstemmer.SlackBuild @@ -81,7 +81,6 @@ find -L . \ # Build python setup.py install --root=$PKG -python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/sphinx-rtd-theme/README b/python/sphinx-rtd-theme/README deleted file mode 100644 index 6612eac0f6..0000000000 --- a/python/sphinx-rtd-theme/README +++ /dev/null @@ -1,7 +0,0 @@ -The sphinx_rtd_theme is a sphinx theme designed to look modern and be -mobile-friendly. - -This theme is primarily focused to be used on readthedocs.org but can -work with your own sphinx projects. - -To read more and see a working demo head over to readthedocs.org. diff --git a/python/sphinx-rtd-theme/slack-desc b/python/sphinx-rtd-theme/slack-desc deleted file mode 100644 index b8e2b0cd25..0000000000 --- a/python/sphinx-rtd-theme/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinx-rtd-theme: sphinx-rtd-theme (decorator for caching properties in classes) -sphinx-rtd-theme: -sphinx-rtd-theme: The sphinx_rtd_theme is a sphinx theme designed to look modern and be -sphinx-rtd-theme: mobile-friendly. -sphinx-rtd-theme: -sphinx-rtd-theme: -sphinx-rtd-theme: Homepage: https://pypi.org/project/sphinx-rtd-theme -sphinx-rtd-theme: -sphinx-rtd-theme: -sphinx-rtd-theme: -sphinx-rtd-theme: diff --git a/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild b/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild deleted file mode 100644 index 2a8ceb724d..0000000000 --- a/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -# SlackBuild build script for sphinx_rtd_theme - -# Copyright 2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright (c) 2000-2011 Pr. Horstmann <wmh (at) eipg.fr> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240322 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinx-rtd-theme -VERSION=${VERSION:-2.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -SRCNAM=$( printf $PRGNAM | tr - _ ) - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 setup.py install --root=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinx-rtd-theme/sphinx-rtd-theme.info b/python/sphinx-rtd-theme/sphinx-rtd-theme.info deleted file mode 100644 index fe6c57ad95..0000000000 --- a/python/sphinx-rtd-theme/sphinx-rtd-theme.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinx-rtd-theme" -VERSION="2.0.0" -HOMEPAGE="https://pypi.org/project/sphinx-rtd-theme" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinx_rtd_theme/sphinx_rtd_theme-2.0.0.tar.gz" -MD5SUM="8ad74a8e9ca706ed77117be0e9eed7e8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="sphinxcontrib-jquery" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-applehelp/README b/python/sphinxcontrib-applehelp/README deleted file mode 100644 index eda7fa9b74..0000000000 --- a/python/sphinxcontrib-applehelp/README +++ /dev/null @@ -1,2 +0,0 @@ -sphinxcontrib-applehelp is a Sphinx extension to create Apple help -books. diff --git a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild b/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild deleted file mode 100644 index 85317abc70..0000000000 --- a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-applehelp - -# Copyright 2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-applehelp -SRCNAM=sphinxcontrib_applehelp -VERSION=${VERSION:-1.0.8} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES LICENSE README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info b/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info deleted file mode 100644 index b9d6350ceb..0000000000 --- a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-applehelp" -VERSION="1.0.8" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-applehelp" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-applehelp/sphinxcontrib_applehelp-1.0.8.tar.gz" -MD5SUM="5604b67076d57cf229da15daf3472ff5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-devhelp/README b/python/sphinxcontrib-devhelp/README deleted file mode 100644 index abffcbb5ee..0000000000 --- a/python/sphinxcontrib-devhelp/README +++ /dev/null @@ -1,2 +0,0 @@ -sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp -document. diff --git a/python/sphinxcontrib-devhelp/slack-desc b/python/sphinxcontrib-devhelp/slack-desc deleted file mode 100644 index b312071fe8..0000000000 --- a/python/sphinxcontrib-devhelp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinxcontrib-devhelp: sphinxcontrib-devhelp (Sphinx extension) -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp -sphinxcontrib-devhelp: document. -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: -sphinxcontrib-devhelp: diff --git a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild b/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild deleted file mode 100644 index 0eacfe23b9..0000000000 --- a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-devhelp - -# Copyright 2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-devhelp -SRCNAM=sphinxcontrib_devhelp -VERSION=${VERSION:-1.0.6} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES LICENSE README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info b/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info deleted file mode 100644 index 36b4a88722..0000000000 --- a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-devhelp" -VERSION="1.0.6" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-devhelp" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-devhelp/sphinxcontrib_devhelp-1.0.6.tar.gz" -MD5SUM="d5303929509ec209043ba45d63bac1f3" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-htmlhelp/README b/python/sphinxcontrib-htmlhelp/README deleted file mode 100644 index ffefb74a48..0000000000 --- a/python/sphinxcontrib-htmlhelp/README +++ /dev/null @@ -1 +0,0 @@ -sphinxcontrib-htmlhelp is a Sphinx extension to create HTML help files. diff --git a/python/sphinxcontrib-htmlhelp/slack-desc b/python/sphinxcontrib-htmlhelp/slack-desc deleted file mode 100644 index 41edc47af2..0000000000 --- a/python/sphinxcontrib-htmlhelp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinxcontrib-htmlhelp: sphinxcontrib-htmlhelp (HTML help file generator) -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: sphinxcontrib-htmlhelp is a Sphinx extension to create HTML help -sphinxcontrib-htmlhelp: files. -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: -sphinxcontrib-htmlhelp: diff --git a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild b/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild deleted file mode 100644 index 222a9ead15..0000000000 --- a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-htmlhelp - -# Copyright 2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-htmlhelp -SRCNAM=sphinxcontrib_htmlhelp -VERSION=${VERSION:-2.0.5} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES LICENSE README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info b/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info deleted file mode 100644 index 4bb01129b4..0000000000 --- a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-htmlhelp" -VERSION="2.0.5" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-htmlhelp" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib_htmlhelp-2.0.5.tar.gz" -MD5SUM="f7f888239f3d8afd6978e9b11701b739" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-jsmath/README b/python/sphinxcontrib-jsmath/README deleted file mode 100644 index 935d4aca13..0000000000 --- a/python/sphinxcontrib-jsmath/README +++ /dev/null @@ -1,2 +0,0 @@ -sphinxcontrib-jsmath is a Sphinx extension which renders display math -in HTML via JavaScript. diff --git a/python/sphinxcontrib-jsmath/slack-desc b/python/sphinxcontrib-jsmath/slack-desc deleted file mode 100644 index c391e43d79..0000000000 --- a/python/sphinxcontrib-jsmath/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinxcontrib-jsmath: sphinxcontrib-jsmath (Sphinx extension) -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: sphinxcontrib-jsmath is a Sphinx extension which renders display math -sphinxcontrib-jsmath: in HTML via JavaScript -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: -sphinxcontrib-jsmath: diff --git a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.SlackBuild b/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.SlackBuild deleted file mode 100644 index 710a2cf4cc..0000000000 --- a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.SlackBuild +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-jsmath - -# Copyright 2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: New maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-jsmath -VERSION=${VERSION:-1.0.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES LICENSE README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.info b/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.info deleted file mode 100644 index a37ebf4e7c..0000000000 --- a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-jsmath" -VERSION="1.0.1" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-jsmath" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz" -MD5SUM="e45179f0a3608b6766862e0f34c23b62" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-qthelp/README b/python/sphinxcontrib-qthelp/README deleted file mode 100644 index 4b2719c2d4..0000000000 --- a/python/sphinxcontrib-qthelp/README +++ /dev/null @@ -1,2 +0,0 @@ -sphinxcontrib-qthelp is a Sphinx extension to create QtHelp -documentation. diff --git a/python/sphinxcontrib-qthelp/slack-desc b/python/sphinxcontrib-qthelp/slack-desc deleted file mode 100644 index 82af3befe0..0000000000 --- a/python/sphinxcontrib-qthelp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinxcontrib-qthelp: sphinxcontrib-qthelp (QtHelp documentation generation) -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: sphinxcontrib-qthelp is a Sphinx extension to create QtHelp -sphinxcontrib-qthelp: documentation. -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: -sphinxcontrib-qthelp: diff --git a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild b/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild deleted file mode 100644 index 81f1f45322..0000000000 --- a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-qthelp - -# Copyright 2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-qthelp -SRCNAM=sphinxcontrib_qthelp -VERSION=${VERSION:-1.0.7} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES LICENSE README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info b/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info deleted file mode 100644 index 4bd562a7c7..0000000000 --- a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-qthelp" -VERSION="1.0.7" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-qthelp" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib_qthelp-1.0.7.tar.gz" -MD5SUM="84569e876c5e8c0bb423eb145ca481b2" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/sphinxcontrib-serializinghtml/README b/python/sphinxcontrib-serializinghtml/README deleted file mode 100644 index 795e6d8f1d..0000000000 --- a/python/sphinxcontrib-serializinghtml/README +++ /dev/null @@ -1,2 +0,0 @@ -sphinxcontrib-serializinghtml is a sphinx extension which outputs -"serialized" HTML files (json and pickle). diff --git a/python/sphinxcontrib-serializinghtml/slack-desc b/python/sphinxcontrib-serializinghtml/slack-desc deleted file mode 100644 index b056ff25a1..0000000000 --- a/python/sphinxcontrib-serializinghtml/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -sphinxcontrib-serializinghtml: sphinxcontrib-serializinghtml (Sphinx extension) -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: sphinxcontrib-serializinghtml is a sphinx extension which outputs -sphinxcontrib-serializinghtml: "serialized" HTML files (json and pickle). -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: -sphinxcontrib-serializinghtml: diff --git a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild b/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild deleted file mode 100644 index 47ba447570..0000000000 --- a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Slackware build script for sphinxcontrib-serializinghtml - -# Copyright 2024 fourtysixandtwo <fourtysixandtwo@sliderr.net> -# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# 20240101 46and2: Updated version, new maintainer. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=sphinxcontrib-serializinghtml -SRCNAM=sphinxcontrib_serializinghtml -VERSION=${VERSION:-1.1.10} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGES LICENSE README.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info b/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info deleted file mode 100644 index c7419b0d5c..0000000000 --- a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sphinxcontrib-serializinghtml" -VERSION="1.1.10" -HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-serializinghtml" -DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-serializinghtml/sphinxcontrib_serializinghtml-1.1.10.tar.gz" -MD5SUM="cc9ac3fa8ec74262c9a21485d7b47eff" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-build" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/python/terminado/terminado.SlackBuild b/python/terminado/terminado.SlackBuild index 9f5c3b1580..5992c8be24 100644 --- a/python/terminado/terminado.SlackBuild +++ b/python/terminado/terminado.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=terminado -VERSION=${VERSION:-0.18.0} +VERSION=${VERSION:-0.18.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -48,20 +48,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG diff --git a/python/terminado/terminado.info b/python/terminado/terminado.info index 181d11162d..7e61fcaa57 100644 --- a/python/terminado/terminado.info +++ b/python/terminado/terminado.info @@ -1,8 +1,8 @@ PRGNAM="terminado" -VERSION="0.18.0" +VERSION="0.18.1" HOMEPAGE="https://github.com/jupyter/terminado" -DOWNLOAD="https://files.pythonhosted.org/packages/source/t/terminado/terminado-0.18.0.tar.gz" -MD5SUM="30c6e8e61041582724be06f387130071" +DOWNLOAD="https://files.pythonhosted.org/packages/source/t/terminado/terminado-0.18.1.tar.gz" +MD5SUM="9b411cdada4fe129e60c75f95d17ffa9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-ptyprocess python3-tornado python3-hatchling" diff --git a/python/tox/README b/python/tox/README deleted file mode 100644 index e170879d17..0000000000 --- a/python/tox/README +++ /dev/null @@ -1,11 +0,0 @@ -Tox as is a generic virtualenv management and test command line tool -you can use for: - -* checking your package installs correctly with different Python - versions and interpreters - -* running your tests in each of the environments, configuring your - test tool of choice - -* acting as a frontend to Continuous Integration servers, greatly - reducing boilerplate and merging CI and shell-based testing. diff --git a/python/tox/tox.SlackBuild b/python/tox/tox.SlackBuild deleted file mode 100644 index 725593a088..0000000000 --- a/python/tox/tox.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash - -# Slackware build script for tox - -# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=tox -VERSION=${VERSION:-3.1.2} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION - -cp -a README.rst LICENSE PKG-INFO CHANGELOG.rst doc/example/*.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/tox/tox.info b/python/tox/tox.info deleted file mode 100644 index afafe63cbd..0000000000 --- a/python/tox/tox.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="tox" -VERSION="3.1.2" -HOMEPAGE="https://tox.readthedocs.io/en/latest/" -DOWNLOAD="https://files.pythonhosted.org/packages/fc/aa/31296c7cf387d8e1fe57c98273ee6d52c9531c07115a916e334bdf7a247f/tox-3.1.2.tar.gz" -MD5SUM="5cd03e4edc4eeb808cd1cf3eced9debc" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python2-py virtualenv pluggy" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/virtualenv-clone/virtualenv-clone.SlackBuild b/python/virtualenv-clone/virtualenv-clone.SlackBuild index b84c802a33..be145fe853 100644 --- a/python/virtualenv-clone/virtualenv-clone.SlackBuild +++ b/python/virtualenv-clone/virtualenv-clone.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for virtualenv-clone # Copyright <2013> <vvoody> <Shanghai> -# Copyright 2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2016-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=virtualenv-clone -VERSION=${VERSION:-0.2.6} +VERSION=${VERSION:-0.5.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,13 +80,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG +python2 setup.py install --root=$PKG +python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md PKG-INFO LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/virtualenv-clone/virtualenv-clone.info b/python/virtualenv-clone/virtualenv-clone.info index f853020984..35333c93f2 100644 --- a/python/virtualenv-clone/virtualenv-clone.info +++ b/python/virtualenv-clone/virtualenv-clone.info @@ -1,10 +1,10 @@ PRGNAM="virtualenv-clone" -VERSION="0.2.6" +VERSION="0.5.7" HOMEPAGE="https://github.com/edwardgeorge/virtualenv-clone" -DOWNLOAD="https://pypi.python.org/packages/36/66/d95f83255138ded1aec242de5ee51536226fa7b2582a7ce0863fea5dc4f2/virtualenv-clone-0.2.6.tar.gz" -MD5SUM="fb03cd8c7a2be75937a13756d14068fc" +DOWNLOAD="https://files.pythonhosted.org/packages/85/76/49120db3bb8de4073ac199a08dc7f11255af8968e1e14038aee95043fafa/virtualenv-clone-0.5.7.tar.gz" +MD5SUM="1c45da38faeae7447acc05a8c183d07d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/python/virtualenvwrapper/README b/python/virtualenvwrapper/README deleted file mode 100644 index eaa14406fe..0000000000 --- a/python/virtualenvwrapper/README +++ /dev/null @@ -1,7 +0,0 @@ -virtualenvwrapper is a set of extensions to Ian Bicking's virtualenv -tool for creating isolated Python development environments. - -The extensions include wrappers for creating and deleting virtual -environments and otherwise managing your development workflow, -making it easier to work on more than one project at a time without -introducing conflicts in their dependencies. diff --git a/python/virtualenvwrapper/slack-desc b/python/virtualenvwrapper/slack-desc deleted file mode 100644 index 9270cd52bc..0000000000 --- a/python/virtualenvwrapper/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -virtualenvwrapper: virtualenvwrapper (Extensions to Ian Bicking's virtualenv tool) -virtualenvwrapper: -virtualenvwrapper: virtualenvwrapper is a set of extensions to Ian Bicking's virtualenv -virtualenvwrapper: tool for creating isolated Python development environments. -virtualenvwrapper: -virtualenvwrapper: The extensions include wrappers for creating and deleting virtual -virtualenvwrapper: environments and otherwise managing your development workflow, -virtualenvwrapper: making it easier to work on more than one project at a time without -virtualenvwrapper: introducing conflicts in their dependencies. -virtualenvwrapper: -virtualenvwrapper: Homepage: http://www.doughellmann.com/projects/virtualenvwrapper/ diff --git a/python/virtualenvwrapper/virtualenvwrapper.SlackBuild b/python/virtualenvwrapper/virtualenvwrapper.SlackBuild deleted file mode 100644 index e7f9e77abd..0000000000 --- a/python/virtualenvwrapper/virtualenvwrapper.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for virtualenvwrapper - -# Copyright 2016-2019 Dimitris Zlatanidis Orestiada, Greece -# Copyright <2013> <vvoody> <Shanghai> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=virtualenvwrapper -VERSION=${VERSION:-4.8.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python2 setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.txt LICENSE $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/virtualenvwrapper/virtualenvwrapper.info b/python/virtualenvwrapper/virtualenvwrapper.info deleted file mode 100644 index 2db739f734..0000000000 --- a/python/virtualenvwrapper/virtualenvwrapper.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="virtualenvwrapper" -VERSION="4.8.4" -HOMEPAGE="http://www.doughellmann.com/projects/virtualenvwrapper/" -DOWNLOAD="https://files.pythonhosted.org/packages/c1/6b/2f05d73b2d2f2410b48b90d3783a0034c26afa534a4a95ad5f1178d61191/virtualenvwrapper-4.8.4.tar.gz" -MD5SUM="b257b16b593eabd7e809cc76e63c295f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="virtualenv virtualenv-clone stevedore" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/waitress/README b/python/waitress/README deleted file mode 100644 index 411ac9156c..0000000000 --- a/python/waitress/README +++ /dev/null @@ -1,5 +0,0 @@ -Waitress is meant to be a production-quality pure-Python WSGI server -with very acceptable performance. It has no dependencies except ones -which live in the Python standard library. It runs on CPython on Unix -and Windows under Python 2.6+ and Python 3.2+. It is also known to -run on PyPy 1.6.0+ on UNIX. It supports HTTP/1.0 and HTTP/1.1. diff --git a/python/waitress/slack-desc b/python/waitress/slack-desc deleted file mode 100644 index e4a43c5f68..0000000000 --- a/python/waitress/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -waitress: waitress (Waitress WSGI server) -waitress: -waitress: Waitress is meant to be a production-quality pure-Python -waitress: WSGI server with very acceptable performance. It has no -waitress: dependencies except ones which live in the Python standard library. -waitress: It runs on CPython on Unix and Windows under Python 2.6+ and Python -waitress: 3.2+. It is also known to run on PyPy 1.6.0+ on UNIX. It supports -waitress: HTTP/1.0 and HTTP/1.1. -waitress: -waitress: Homepage: https://github.com/Pylons/waitress -waitress: diff --git a/python/waitress/waitress.SlackBuild b/python/waitress/waitress.SlackBuild deleted file mode 100644 index 5c0bedc8ec..0000000000 --- a/python/waitress/waitress.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash - -# Slackware build script for waitress - -# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=waitress -VERSION=${VERSION:-1.3.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.rst CHANGES.txt CONTRIBUTORS.txt COPYRIGHT.txt\ - LICENSE.txt PKG-INFO TODO.txt tox.ini docs/*.rst \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/python/waitress/waitress.info b/python/waitress/waitress.info deleted file mode 100644 index 2464788fae..0000000000 --- a/python/waitress/waitress.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="waitress" -VERSION="1.3.1" -HOMEPAGE="https://github.com/Pylons/waitress" -DOWNLOAD="https://files.pythonhosted.org/packages/a6/e6/708da7bba65898e5d759ade8391b1077e49d07be0b0223c39f5be04def56/waitress-1.3.1.tar.gz" -MD5SUM="d9132d313de0c5e0fec34ef9ede5442e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/python/werkzeug/werkzeug.SlackBuild b/python/werkzeug/werkzeug.SlackBuild index b50f1ec035..5475a6e5f6 100644 --- a/python/werkzeug/werkzeug.SlackBuild +++ b/python/werkzeug/werkzeug.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=werkzeug -VERSION=${VERSION:-3.0.2} +VERSION=${VERSION:-3.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,7 +77,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES.rst LICENSE.rst PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES.rst LICENSE.txt PKG-INFO README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/python/werkzeug/werkzeug.info b/python/werkzeug/werkzeug.info index ea7ca66b02..cb0def12e0 100644 --- a/python/werkzeug/werkzeug.info +++ b/python/werkzeug/werkzeug.info @@ -1,8 +1,8 @@ PRGNAM="werkzeug" -VERSION="3.0.2" +VERSION="3.0.3" HOMEPAGE="https://palletsprojects.com/p/werkzeug/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/w/werkzeug/werkzeug-3.0.2.tar.gz" -MD5SUM="02aea8c05c4bfb797c0fbd9e045b7b46" +DOWNLOAD="https://files.pythonhosted.org/packages/source/w/werkzeug/werkzeug-3.0.3.tar.gz" +MD5SUM="5955ba99c1a7466660fa9445fbabf5e2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-build" diff --git a/ruby/ruby-build/ruby-build.SlackBuild b/ruby/ruby-build/ruby-build.SlackBuild index c54ef40835..58891d4b7f 100644 --- a/ruby/ruby-build/ruby-build.SlackBuild +++ b/ruby/ruby-build/ruby-build.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ruby-build -VERSION=${VERSION:-20240416} +VERSION=${VERSION:-20240501} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/ruby/ruby-build/ruby-build.info b/ruby/ruby-build/ruby-build.info index c34d1d5262..dd6541ed28 100644 --- a/ruby/ruby-build/ruby-build.info +++ b/ruby/ruby-build/ruby-build.info @@ -1,8 +1,8 @@ PRGNAM="ruby-build" -VERSION="20240416" +VERSION="20240501" HOMEPAGE="https://github.com/rbenv/ruby-build" -DOWNLOAD="https://github.com/rbenv/ruby-build/archive/v20240416/ruby-build-20240416.tar.gz" -MD5SUM="b4da2b0ae4ee9765943c620b3f72e925" +DOWNLOAD="https://github.com/rbenv/ruby-build/archive/v20240501/ruby-build-20240501.tar.gz" +MD5SUM="4106dda97bfb33c5302b30d2fef19428" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/B-em/B-em.SlackBuild b/system/B-em/B-em.SlackBuild index 1d64e6b1d4..6facdf20bd 100644 --- a/system/B-em/B-em.SlackBuild +++ b/system/B-em/B-em.SlackBuild @@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=B-em -VERSION=${VERSION:-388e1d8} +VERSION=${VERSION:-20240306_5557a36} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -COMMIT=${COMMIT:-388e1d8db63c4f6b0e68d6e4235b9bd16984a65b} +COMMIT=${COMMIT:-5557a369a0740bbb8cc11f345a05f9e7641c87e2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/system/B-em/B-em.info b/system/B-em/B-em.info index eaf047a9c5..0d08dc8e64 100644 --- a/system/B-em/B-em.info +++ b/system/B-em/B-em.info @@ -1,8 +1,8 @@ PRGNAM="B-em" -VERSION="388e1d8" +VERSION="20240306_5557a36" HOMEPAGE="https://github.com/stardot/b-em" -DOWNLOAD="https://github.com/stardot/b-em/archive/388e1d8db63c4f6b0e68d6e4235b9bd16984a65b/b-em-388e1d8db63c4f6b0e68d6e4235b9bd16984a65b.tar.gz" -MD5SUM="ea2234e2e97437c4c60377963f346fba" +DOWNLOAD="https://github.com/stardot/b-em/archive/5557a369a0740bbb8cc11f345a05f9e7641c87e2/b-em-5557a369a0740bbb8cc11f345a05f9e7641c87e2.tar.gz" +MD5SUM="66a080b2b34d89c8b66454e535a17227" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="allegro" diff --git a/system/B-em/slack-desc b/system/B-em/slack-desc index 1db2863009..121e3d2dad 100644 --- a/system/B-em/slack-desc +++ b/system/B-em/slack-desc @@ -14,6 +14,6 @@ B-em: 2nd processors. B-em: B-em: B-em is licensed under the GPL, see COPYING for more details. B-em: -B-em: +B-em: Homepage at https://github.com/stardot/b-em B-em: B-em: diff --git a/system/CPU-X/CPU-X.SlackBuild b/system/CPU-X/CPU-X.SlackBuild index ea1763bcb1..46d70fa9c8 100644 --- a/system/CPU-X/CPU-X.SlackBuild +++ b/system/CPU-X/CPU-X.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=CPU-X -VERSION=${VERSION:-5.0.3} +VERSION=${VERSION:-5.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/CPU-X/CPU-X.info b/system/CPU-X/CPU-X.info index d2731bc84f..a9a19819c3 100644 --- a/system/CPU-X/CPU-X.info +++ b/system/CPU-X/CPU-X.info @@ -1,8 +1,8 @@ PRGNAM="CPU-X" -VERSION="5.0.3" +VERSION="5.0.4" HOMEPAGE="https://github.com/x0rg/CPU-X/" -DOWNLOAD="https://github.com/x0rg/CPU-X/archive/v5.0.3/CPU-X-5.0.3.tar.gz" -MD5SUM="548d7a6a7b27a58221a3898c47041b64" +DOWNLOAD="https://github.com/x0rg/CPU-X/archive/v5.0.4/CPU-X-5.0.4.tar.gz" +MD5SUM="6a8b6ba8c985c47ae29b30e2c8e84d3f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="glfw3 libcpuid libstatgrab" diff --git a/system/FreeFileSync/FreeFileSync.SlackBuild b/system/FreeFileSync/FreeFileSync.SlackBuild index d3bb3a3a9a..cef00e0792 100644 --- a/system/FreeFileSync/FreeFileSync.SlackBuild +++ b/system/FreeFileSync/FreeFileSync.SlackBuild @@ -2,7 +2,7 @@ # Slackware repackaging script for FreeFileSync -# Copyright 2023 Antonio Leal, Porto Salvo, Oeiras, Portugal +# Copyright 2023-2024 Antonio Leal, Porto Salvo, Oeiras, Portugal # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=FreeFileSync -VERSION=${VERSION:-13.5} +VERSION=${VERSION:-13.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/FreeFileSync/FreeFileSync.info b/system/FreeFileSync/FreeFileSync.info index 43d0759b25..686cf4e9a0 100644 --- a/system/FreeFileSync/FreeFileSync.info +++ b/system/FreeFileSync/FreeFileSync.info @@ -1,8 +1,8 @@ PRGNAM="FreeFileSync" -VERSION="13.5" +VERSION="13.6" HOMEPAGE="https://freefilesync.org/" -DOWNLOAD="https://freefilesync.org/download/FreeFileSync_13.5_Linux.tar.gz" -MD5SUM="54c1cd44eebf7d4834b519e1193e8c2b" +DOWNLOAD="https://raw.githubusercontent.com/antonioleal/myslackbuilds/main/system/FreeFileSync/FreeFileSync_13.6_Linux.tar.gz" +MD5SUM="05d33c93e01ea14e6daa0dca114e7b54" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="p7zip" diff --git a/system/FreeFileSync/README b/system/FreeFileSync/README index 746cb58861..69222922d9 100644 --- a/system/FreeFileSync/README +++ b/system/FreeFileSync/README @@ -5,4 +5,11 @@ differences between a source and a target folder and transfers only the minimum amount of data needed. FreeFileSync is Open Source software,available for Windows, Linux and macOS. -This package installs to /opt/FreeFileSync +Notes: +I) This package installs to /opt/FreeFileSync + + +II) The original binaries are hosted on the package maintainer + github due to the the fact that the FreeFileSync web server is + causing problems with SlackBuilds CI/CD environment. + If in doubt please compare the md5sums. diff --git a/system/Iosevka-aile/Iosevka-aile.SlackBuild b/system/Iosevka-aile/Iosevka-aile.SlackBuild index 4beb1d38a2..91027ee671 100644 --- a/system/Iosevka-aile/Iosevka-aile.SlackBuild +++ b/system/Iosevka-aile/Iosevka-aile.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Iosevka-aile SRCNAM=PkgTTC-IosevkaAile -VERSION=${VERSION:-29.0.5} +VERSION=${VERSION:-30.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/Iosevka-aile/Iosevka-aile.info b/system/Iosevka-aile/Iosevka-aile.info index 013ce6fd00..407c8fc00e 100644 --- a/system/Iosevka-aile/Iosevka-aile.info +++ b/system/Iosevka-aile/Iosevka-aile.info @@ -1,8 +1,8 @@ PRGNAM="Iosevka-aile" -VERSION="29.0.5" +VERSION="30.0.1" HOMEPAGE="https://typeof.net/Iosevka" -DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v29.0.5/PkgTTC-IosevkaAile-29.0.5.zip" -MD5SUM="6de3ab94f40d3bb521971225f1bab31d" +DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v30.0.1/PkgTTC-IosevkaAile-30.0.1.zip" +MD5SUM="2d70e056852e692969f52b671a345425" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/Iosevka-etoile/Iosevka-etoile.SlackBuild b/system/Iosevka-etoile/Iosevka-etoile.SlackBuild index 3aacbe1445..b9fe99f6f8 100644 --- a/system/Iosevka-etoile/Iosevka-etoile.SlackBuild +++ b/system/Iosevka-etoile/Iosevka-etoile.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Iosevka-etoile SRCNAM=PkgTTC-IosevkaEtoile -VERSION=${VERSION:-29.0.5} +VERSION=${VERSION:-30.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/Iosevka-etoile/Iosevka-etoile.info b/system/Iosevka-etoile/Iosevka-etoile.info index 1fa9e6384c..1763237c2c 100644 --- a/system/Iosevka-etoile/Iosevka-etoile.info +++ b/system/Iosevka-etoile/Iosevka-etoile.info @@ -1,8 +1,8 @@ PRGNAM="Iosevka-etoile" -VERSION="29.0.5" +VERSION="30.0.1" HOMEPAGE="https://typeof.net/Iosevka" -DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v29.0.5/PkgTTC-IosevkaEtoile-29.0.5.zip" -MD5SUM="f9dc0b7217481b3a61f5ae859a827bc6" +DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v30.0.1/PkgTTC-IosevkaEtoile-30.0.1.zip" +MD5SUM="23bf6eaebaa9ad8f3e15af3eda6af474" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/Solaar/Solaar.SlackBuild b/system/Solaar/Solaar.SlackBuild index e7d077043f..b739b40052 100644 --- a/system/Solaar/Solaar.SlackBuild +++ b/system/Solaar/Solaar.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Solaar VERSION=${VERSION:-1.1.11} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -68,7 +68,11 @@ find -L . \ python3 setup.py install --root=$PKG -mv $PKG/usr/lib $PKG/ +# 20240429 46and2: make sure to only move the udev dir to $PKG/lib/ +# and remove $PKG/usr/lib if empty. +mkdir $PKG/lib +mv $PKG/usr/lib/udev $PKG/lib/ +rmdir --ignore-fail-on-non-empty $PKG/usr/lib sed -i 's/#MODE="0660", GROUP="plugdev"/MODE="0660", GROUP="plugdev"/g' $PKG/lib/udev/rules.d/42-logitech-unify-permissions.rules mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/alacritty/alacritty.SlackBuild b/system/alacritty/alacritty.SlackBuild index 48199eabc5..03dc2e15f0 100644 --- a/system/alacritty/alacritty.SlackBuild +++ b/system/alacritty/alacritty.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=alacritty -VERSION=${VERSION:-0.13.1} +VERSION=${VERSION:-0.13.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -62,7 +62,11 @@ elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" CARGOTARGET="--target $ARCH-unknown-linux-gnu" LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ]; then +elif [ "$ARCH" = "x86_64" ] ; then + SLKCFLAGS="-O2 -fPIC" + CARGOTARGET="--target $ARCH-unknown-linux-gnu" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then SLKCFLAGS="-O2 -fPIC" CARGOTARGET="--target $ARCH-unknown-linux-gnu" LIBDIRSUFFIX="64" diff --git a/system/alacritty/alacritty.info b/system/alacritty/alacritty.info index 59214b27d8..d585afe9d2 100644 --- a/system/alacritty/alacritty.info +++ b/system/alacritty/alacritty.info @@ -1,34 +1,34 @@ PRGNAM="alacritty" -VERSION="0.13.1" +VERSION="0.13.2" HOMEPAGE="https://github.com/alacritty/alacritty" -DOWNLOAD="https://github.com/alacritty/alacritty/archive/v0.13.1/alacritty-0.13.1.tar.gz \ +DOWNLOAD="https://github.com/alacritty/alacritty/archive/v0.13.2/alacritty-0.13.2.tar.gz \ https://static.crates.io/crates/adler/adler-1.0.2.crate \ - https://static.crates.io/crates/ahash/ahash-0.8.6.crate \ + https://static.crates.io/crates/ahash/ahash-0.8.11.crate \ https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.2.crate \ - https://static.crates.io/crates/android-activity/android-activity-0.5.1.crate \ + https://static.crates.io/crates/android-activity/android-activity-0.5.2.crate \ https://static.crates.io/crates/android-properties/android-properties-0.2.2.crate \ - https://static.crates.io/crates/anstream/anstream-0.6.5.crate \ + https://static.crates.io/crates/anstream/anstream-0.6.13.crate \ https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.3.crate \ https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.0.crate \ https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.1.crate \ - https://static.crates.io/crates/anstyle/anstyle-1.0.4.crate \ + https://static.crates.io/crates/anstyle/anstyle-1.0.6.crate \ https://static.crates.io/crates/arrayref/arrayref-0.3.7.crate \ https://static.crates.io/crates/arrayvec/arrayvec-0.7.4.crate \ https://static.crates.io/crates/as-raw-xcb-connection/as-raw-xcb-connection-1.0.1.crate \ https://static.crates.io/crates/atomic-waker/atomic-waker-1.1.2.crate \ https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \ - https://static.crates.io/crates/base64/base64-0.21.5.crate \ + https://static.crates.io/crates/base64/base64-0.22.0.crate \ https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \ - https://static.crates.io/crates/bitflags/bitflags-2.4.1.crate \ - https://static.crates.io/crates/block-sys/block-sys-0.2.0.crate \ + https://static.crates.io/crates/bitflags/bitflags-2.4.2.crate \ + https://static.crates.io/crates/block-sys/block-sys-0.2.1.crate \ https://static.crates.io/crates/block2/block2-0.3.0.crate \ https://static.crates.io/crates/block/block-0.1.6.crate \ - https://static.crates.io/crates/bumpalo/bumpalo-3.14.0.crate \ - https://static.crates.io/crates/bytemuck/bytemuck-1.14.0.crate \ + https://static.crates.io/crates/bumpalo/bumpalo-3.15.4.crate \ + https://static.crates.io/crates/bytemuck/bytemuck-1.15.0.crate \ https://static.crates.io/crates/bytes/bytes-1.5.0.crate \ https://static.crates.io/crates/calloop-wayland-source/calloop-wayland-source-0.2.0.crate \ - https://static.crates.io/crates/calloop/calloop-0.12.3.crate \ - https://static.crates.io/crates/cc/cc-1.0.83.crate \ + https://static.crates.io/crates/calloop/calloop-0.12.4.crate \ + https://static.crates.io/crates/cc/cc-1.0.90.crate \ https://static.crates.io/crates/cesu8/cesu8-1.1.0.crate \ https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \ https://static.crates.io/crates/cfg_aliases/cfg_aliases-0.1.1.crate \ @@ -45,15 +45,15 @@ DOWNLOAD="https://github.com/alacritty/alacritty/archive/v0.13.1/alacritty-0.13. https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \ https://static.crates.io/crates/combine/combine-4.6.6.crate \ https://static.crates.io/crates/concurrent-queue/concurrent-queue-2.4.0.crate \ - https://static.crates.io/crates/copypasta/copypasta-0.10.0.crate \ + https://static.crates.io/crates/copypasta/copypasta-0.10.1.crate \ https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.6.crate \ https://static.crates.io/crates/core-foundation/core-foundation-0.9.4.crate \ https://static.crates.io/crates/core-graphics-types/core-graphics-types-0.1.3.crate \ https://static.crates.io/crates/core-graphics/core-graphics-0.23.1.crate \ https://static.crates.io/crates/core-text/core-text-20.1.0.crate \ - https://static.crates.io/crates/crc32fast/crc32fast-1.3.2.crate \ - https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.10.crate \ - https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.18.crate \ + https://static.crates.io/crates/crc32fast/crc32fast-1.4.0.crate \ + https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.12.crate \ + https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.19.crate \ https://static.crates.io/crates/crossfont/crossfont-0.7.0.crate \ https://static.crates.io/crates/cursor-icon/cursor-icon-1.1.0.crate \ https://static.crates.io/crates/dirs-sys/dirs-sys-0.4.1.crate \ @@ -62,12 +62,12 @@ DOWNLOAD="https://github.com/alacritty/alacritty/archive/v0.13.1/alacritty-0.13. https://static.crates.io/crates/dlib/dlib-0.5.2.crate \ https://static.crates.io/crates/downcast-rs/downcast-rs-1.2.0.crate \ https://static.crates.io/crates/dwrote/dwrote-0.11.0.crate \ - https://static.crates.io/crates/embed-resource/embed-resource-2.4.0.crate \ + https://static.crates.io/crates/embed-resource/embed-resource-2.4.2.crate \ https://static.crates.io/crates/equivalent/equivalent-1.0.1.crate \ https://static.crates.io/crates/errno/errno-0.3.7.crate \ https://static.crates.io/crates/expat-sys/expat-sys-2.1.6.crate \ https://static.crates.io/crates/fastrand/fastrand-2.0.1.crate \ - https://static.crates.io/crates/fdeflate/fdeflate-0.3.3.crate \ + https://static.crates.io/crates/fdeflate/fdeflate-0.3.4.crate \ https://static.crates.io/crates/filetime/filetime-0.2.22.crate \ https://static.crates.io/crates/flate2/flate2-1.0.28.crate \ https://static.crates.io/crates/foreign-types-macros/foreign-types-macros-0.2.3.crate \ @@ -77,11 +77,10 @@ DOWNLOAD="https://github.com/alacritty/alacritty/archive/v0.13.1/alacritty-0.13. https://static.crates.io/crates/freetype-sys/freetype-sys-0.13.1.crate \ https://static.crates.io/crates/fsevent-sys/fsevent-sys-4.1.0.crate \ https://static.crates.io/crates/futures-io/futures-io-0.3.30.crate \ - https://static.crates.io/crates/gethostname/gethostname-0.3.0.crate \ https://static.crates.io/crates/gethostname/gethostname-0.4.3.crate \ - https://static.crates.io/crates/getrandom/getrandom-0.2.11.crate \ + https://static.crates.io/crates/getrandom/getrandom-0.2.12.crate \ https://static.crates.io/crates/gl_generator/gl_generator-0.14.0.crate \ - https://static.crates.io/crates/glutin/glutin-0.31.2.crate \ + https://static.crates.io/crates/glutin/glutin-0.31.3.crate \ https://static.crates.io/crates/glutin_egl_sys/glutin_egl_sys-0.6.0.crate \ https://static.crates.io/crates/glutin_glx_sys/glutin_glx_sys-0.5.0.crate \ https://static.crates.io/crates/glutin_wgl_sys/glutin_wgl_sys-0.5.0.crate \ @@ -89,40 +88,38 @@ DOWNLOAD="https://github.com/alacritty/alacritty/archive/v0.13.1/alacritty-0.13. https://static.crates.io/crates/heck/heck-0.4.1.crate \ https://static.crates.io/crates/home/home-0.5.5.crate \ https://static.crates.io/crates/icrate/icrate-0.0.4.crate \ - https://static.crates.io/crates/indexmap/indexmap-2.1.0.crate \ + https://static.crates.io/crates/indexmap/indexmap-2.2.5.crate \ https://static.crates.io/crates/inotify-sys/inotify-sys-0.1.5.crate \ https://static.crates.io/crates/inotify/inotify-0.9.6.crate \ https://static.crates.io/crates/itoa/itoa-1.0.10.crate \ https://static.crates.io/crates/jni-sys/jni-sys-0.3.0.crate \ https://static.crates.io/crates/jni/jni-0.21.1.crate \ - https://static.crates.io/crates/jobserver/jobserver-0.1.27.crate \ - https://static.crates.io/crates/js-sys/js-sys-0.3.66.crate \ + https://static.crates.io/crates/jobserver/jobserver-0.1.28.crate \ + https://static.crates.io/crates/js-sys/js-sys-0.3.69.crate \ https://static.crates.io/crates/khronos_api/khronos_api-3.1.0.crate \ https://static.crates.io/crates/kqueue-sys/kqueue-sys-1.0.4.crate \ https://static.crates.io/crates/kqueue/kqueue-1.0.8.crate \ https://static.crates.io/crates/lazy-bytes-cast/lazy-bytes-cast-5.0.1.crate \ https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \ - https://static.crates.io/crates/libc/libc-0.2.151.crate \ - https://static.crates.io/crates/libloading/libloading-0.8.1.crate \ + https://static.crates.io/crates/libc/libc-0.2.153.crate \ + https://static.crates.io/crates/libloading/libloading-0.8.3.crate \ https://static.crates.io/crates/libredox/libredox-0.0.1.crate \ https://static.crates.io/crates/libredox/libredox-0.0.2.crate \ - https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.12.crate \ + https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.13.crate \ https://static.crates.io/crates/lock_api/lock_api-0.4.11.crate \ - https://static.crates.io/crates/log/log-0.4.20.crate \ + https://static.crates.io/crates/log/log-0.4.21.crate \ https://static.crates.io/crates/malloc_buf/malloc_buf-0.0.6.crate \ - https://static.crates.io/crates/memchr/memchr-2.6.4.crate \ - https://static.crates.io/crates/memmap2/memmap2-0.9.3.crate \ - https://static.crates.io/crates/memoffset/memoffset-0.7.1.crate \ - https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.1.crate \ - https://static.crates.io/crates/mio/mio-0.8.10.crate \ + https://static.crates.io/crates/memchr/memchr-2.7.1.crate \ + https://static.crates.io/crates/memmap2/memmap2-0.9.4.crate \ + https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.2.crate \ + https://static.crates.io/crates/mio/mio-0.8.11.crate \ https://static.crates.io/crates/miow/miow-0.6.0.crate \ https://static.crates.io/crates/ndk-context/ndk-context-0.1.1.crate \ https://static.crates.io/crates/ndk-sys/ndk-sys-0.5.0%2B25.2.9519653.crate \ https://static.crates.io/crates/ndk/ndk-0.8.0.crate \ - https://static.crates.io/crates/nix/nix-0.26.4.crate \ https://static.crates.io/crates/notify/notify-6.1.1.crate \ - https://static.crates.io/crates/num_enum/num_enum-0.7.1.crate \ - https://static.crates.io/crates/num_enum_derive/num_enum_derive-0.7.1.crate \ + https://static.crates.io/crates/num_enum/num_enum-0.7.2.crate \ + https://static.crates.io/crates/num_enum_derive/num_enum_derive-0.7.2.crate \ https://static.crates.io/crates/objc-foundation/objc-foundation-0.1.1.crate \ https://static.crates.io/crates/objc-sys/objc-sys-0.3.2.crate \ https://static.crates.io/crates/objc2-encode/objc2-encode-3.0.0.crate \ @@ -137,88 +134,87 @@ DOWNLOAD="https://github.com/alacritty/alacritty/archive/v0.13.1/alacritty-0.13. https://static.crates.io/crates/percent-encoding/percent-encoding-2.3.1.crate \ https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.13.crate \ https://static.crates.io/crates/piper/piper-0.2.1.crate \ - https://static.crates.io/crates/pkg-config/pkg-config-0.3.28.crate \ - https://static.crates.io/crates/png/png-0.17.10.crate \ + https://static.crates.io/crates/pkg-config/pkg-config-0.3.30.crate \ + https://static.crates.io/crates/png/png-0.17.13.crate \ https://static.crates.io/crates/polling/polling-3.3.0.crate \ - https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-2.0.0.crate \ - https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.71.crate \ - https://static.crates.io/crates/quick-xml/quick-xml-0.30.0.crate \ - https://static.crates.io/crates/quote/quote-1.0.33.crate \ + https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-3.1.0.crate \ + https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.79.crate \ + https://static.crates.io/crates/quick-xml/quick-xml-0.31.0.crate \ + https://static.crates.io/crates/quote/quote-1.0.35.crate \ https://static.crates.io/crates/raw-window-handle/raw-window-handle-0.5.2.crate \ https://static.crates.io/crates/redox_syscall/redox_syscall-0.3.5.crate \ https://static.crates.io/crates/redox_syscall/redox_syscall-0.4.1.crate \ https://static.crates.io/crates/redox_users/redox_users-0.4.4.crate \ - https://static.crates.io/crates/regex-automata/regex-automata-0.4.3.crate \ + https://static.crates.io/crates/regex-automata/regex-automata-0.4.6.crate \ https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \ https://static.crates.io/crates/rustc_version/rustc_version-0.4.0.crate \ https://static.crates.io/crates/rustix-openpty/rustix-openpty-0.1.1.crate \ https://static.crates.io/crates/rustix/rustix-0.38.25.crate \ - https://static.crates.io/crates/ryu/ryu-1.0.16.crate \ + https://static.crates.io/crates/ryu/ryu-1.0.17.crate \ https://static.crates.io/crates/same-file/same-file-1.0.6.crate \ https://static.crates.io/crates/scoped-tls/scoped-tls-1.0.1.crate \ https://static.crates.io/crates/scopeguard/scopeguard-1.2.0.crate \ https://static.crates.io/crates/sctk-adwaita/sctk-adwaita-0.8.1.crate \ - https://static.crates.io/crates/semver/semver-1.0.20.crate \ - https://static.crates.io/crates/serde/serde-1.0.193.crate \ - https://static.crates.io/crates/serde_derive/serde_derive-1.0.193.crate \ - https://static.crates.io/crates/serde_json/serde_json-1.0.108.crate \ + https://static.crates.io/crates/semver/semver-1.0.22.crate \ + https://static.crates.io/crates/serde/serde-1.0.197.crate \ + https://static.crates.io/crates/serde_derive/serde_derive-1.0.197.crate \ + https://static.crates.io/crates/serde_json/serde_json-1.0.114.crate \ https://static.crates.io/crates/serde_spanned/serde_spanned-0.6.5.crate \ - https://static.crates.io/crates/serde_yaml/serde_yaml-0.9.29.crate \ + https://static.crates.io/crates/serde_yaml/serde_yaml-0.9.33.crate \ https://static.crates.io/crates/servo-fontconfig-sys/servo-fontconfig-sys-5.1.0.crate \ https://static.crates.io/crates/servo-fontconfig/servo-fontconfig-0.5.1.crate \ https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.1.crate \ https://static.crates.io/crates/signal-hook/signal-hook-0.3.17.crate \ https://static.crates.io/crates/simd-adler32/simd-adler32-0.3.7.crate \ https://static.crates.io/crates/slab/slab-0.4.9.crate \ - https://static.crates.io/crates/smallvec/smallvec-1.11.2.crate \ - https://static.crates.io/crates/smithay-client-toolkit/smithay-client-toolkit-0.18.0.crate \ - https://static.crates.io/crates/smithay-clipboard/smithay-clipboard-0.7.0.crate \ - https://static.crates.io/crates/smol_str/smol_str-0.2.0.crate \ + https://static.crates.io/crates/smallvec/smallvec-1.13.1.crate \ + https://static.crates.io/crates/smithay-client-toolkit/smithay-client-toolkit-0.18.1.crate \ + https://static.crates.io/crates/smithay-clipboard/smithay-clipboard-0.7.1.crate \ + https://static.crates.io/crates/smol_str/smol_str-0.2.1.crate \ https://static.crates.io/crates/strict-num/strict-num-0.1.1.crate \ https://static.crates.io/crates/strsim/strsim-0.10.0.crate \ - https://static.crates.io/crates/syn/syn-2.0.43.crate \ - https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.52.crate \ - https://static.crates.io/crates/thiserror/thiserror-1.0.52.crate \ - https://static.crates.io/crates/tiny-skia-path/tiny-skia-path-0.11.3.crate \ - https://static.crates.io/crates/tiny-skia/tiny-skia-0.11.3.crate \ - https://static.crates.io/crates/toml/toml-0.8.8.crate \ + https://static.crates.io/crates/syn/syn-2.0.53.crate \ + https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.58.crate \ + https://static.crates.io/crates/thiserror/thiserror-1.0.58.crate \ + https://static.crates.io/crates/tiny-skia-path/tiny-skia-path-0.11.4.crate \ + https://static.crates.io/crates/tiny-skia/tiny-skia-0.11.4.crate \ + https://static.crates.io/crates/toml/toml-0.8.11.crate \ https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.5.crate \ - https://static.crates.io/crates/toml_edit/toml_edit-0.20.7.crate \ - https://static.crates.io/crates/toml_edit/toml_edit-0.21.0.crate \ + https://static.crates.io/crates/toml_edit/toml_edit-0.21.1.crate \ + https://static.crates.io/crates/toml_edit/toml_edit-0.22.7.crate \ https://static.crates.io/crates/tracing-core/tracing-core-0.1.32.crate \ https://static.crates.io/crates/tracing/tracing-0.1.40.crate \ https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \ - https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.10.1.crate \ + https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.11.0.crate \ https://static.crates.io/crates/unicode-width/unicode-width-0.1.11.crate \ - https://static.crates.io/crates/unsafe-libyaml/unsafe-libyaml-0.2.10.crate \ + https://static.crates.io/crates/unsafe-libyaml/unsafe-libyaml-0.2.11.crate \ https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \ https://static.crates.io/crates/version_check/version_check-0.9.4.crate \ https://static.crates.io/crates/vswhom-sys/vswhom-sys-0.1.2.crate \ https://static.crates.io/crates/vswhom/vswhom-0.1.0.crate \ https://static.crates.io/crates/vte/vte-0.13.0.crate \ https://static.crates.io/crates/vte_generate_state_changes/vte_generate_state_changes-0.1.1.crate \ - https://static.crates.io/crates/walkdir/walkdir-2.4.0.crate \ + https://static.crates.io/crates/walkdir/walkdir-2.5.0.crate \ https://static.crates.io/crates/wasi/wasi-0.11.0%2Bwasi-snapshot-preview1.crate \ - https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.89.crate \ - https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.39.crate \ - https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.89.crate \ - https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.89.crate \ - https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.89.crate \ - https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.89.crate \ - https://static.crates.io/crates/wayland-backend/wayland-backend-0.3.2.crate \ - https://static.crates.io/crates/wayland-client/wayland-client-0.31.1.crate \ + https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.92.crate \ + https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.42.crate \ + https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.92.crate \ + https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.92.crate \ + https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.92.crate \ + https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.92.crate \ + https://static.crates.io/crates/wayland-backend/wayland-backend-0.3.3.crate \ + https://static.crates.io/crates/wayland-client/wayland-client-0.31.2.crate \ https://static.crates.io/crates/wayland-csd-frame/wayland-csd-frame-0.3.0.crate \ - https://static.crates.io/crates/wayland-cursor/wayland-cursor-0.31.0.crate \ + https://static.crates.io/crates/wayland-cursor/wayland-cursor-0.31.1.crate \ https://static.crates.io/crates/wayland-protocols-plasma/wayland-protocols-plasma-0.2.0.crate \ https://static.crates.io/crates/wayland-protocols-wlr/wayland-protocols-wlr-0.2.0.crate \ - https://static.crates.io/crates/wayland-protocols/wayland-protocols-0.31.0.crate \ - https://static.crates.io/crates/wayland-scanner/wayland-scanner-0.31.0.crate \ + https://static.crates.io/crates/wayland-protocols/wayland-protocols-0.31.2.crate \ + https://static.crates.io/crates/wayland-scanner/wayland-scanner-0.31.1.crate \ https://static.crates.io/crates/wayland-sys/wayland-sys-0.31.1.crate \ - https://static.crates.io/crates/web-sys/web-sys-0.3.66.crate \ + https://static.crates.io/crates/web-sys/web-sys-0.3.69.crate \ https://static.crates.io/crates/web-time/web-time-0.2.4.crate \ https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ https://static.crates.io/crates/winapi-util/winapi-util-0.1.6.crate \ - https://static.crates.io/crates/winapi-wsapoll/winapi-wsapoll-0.1.1.crate \ https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ https://static.crates.io/crates/winapi/winapi-0.3.9.crate \ https://static.crates.io/crates/windows-sys/windows-sys-0.45.0.crate \ @@ -239,51 +235,50 @@ DOWNLOAD="https://github.com/alacritty/alacritty/archive/v0.13.1/alacritty-0.13. https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \ https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.42.2.crate \ https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \ - https://static.crates.io/crates/winit/winit-0.29.9.crate \ - https://static.crates.io/crates/winnow/winnow-0.5.30.crate \ - https://static.crates.io/crates/winreg/winreg-0.51.0.crate \ + https://static.crates.io/crates/winit/winit-0.29.15.crate \ + https://static.crates.io/crates/winnow/winnow-0.5.40.crate \ + https://static.crates.io/crates/winnow/winnow-0.6.5.crate \ + https://static.crates.io/crates/winreg/winreg-0.52.0.crate \ https://static.crates.io/crates/wio/wio-0.2.2.crate \ - https://static.crates.io/crates/x11-clipboard/x11-clipboard-0.8.1.crate \ + https://static.crates.io/crates/x11-clipboard/x11-clipboard-0.9.2.crate \ https://static.crates.io/crates/x11-dl/x11-dl-2.21.0.crate \ - https://static.crates.io/crates/x11rb-protocol/x11rb-protocol-0.12.0.crate \ https://static.crates.io/crates/x11rb-protocol/x11rb-protocol-0.13.0.crate \ - https://static.crates.io/crates/x11rb/x11rb-0.12.0.crate \ https://static.crates.io/crates/x11rb/x11rb-0.13.0.crate \ https://static.crates.io/crates/xcursor/xcursor-0.3.5.crate \ https://static.crates.io/crates/xdg/xdg-2.5.2.crate \ - https://static.crates.io/crates/xkbcommon-dl/xkbcommon-dl-0.4.1.crate \ + https://static.crates.io/crates/xkbcommon-dl/xkbcommon-dl-0.4.2.crate \ https://static.crates.io/crates/xkeysym/xkeysym-0.2.0.crate \ https://static.crates.io/crates/xml-rs/xml-rs-0.8.19.crate \ https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.7.32.crate \ https://static.crates.io/crates/zerocopy/zerocopy-0.7.32.crate" -MD5SUM="9199be2f1d48125de06db0d79553ee2e \ +MD5SUM="175ba04b69b5d60747c4fb227f0a3871 \ 669215548c64019c08c92b2c1afd3deb \ - 62063b829dc1fb0dcb50f845ef981263 \ + adbb51e40b28255c49b2ad1d956eff19 \ 95e5f8d0b7ab37171b8d3118542ba06a \ - 848f406142dbae274a821c9e93da9fbb \ + 4bfc28df67ed345b63f28a426f70dd3d \ 33d654107e29a1ec9c8df5947d1888f2 \ - 2764314f4afc9f9751d60ebad48f6ea6 \ + d1dbe19a84ecc8388654099d69c77b09 \ e188f6de00a35235da008cd39e1a003d \ d2453c99c7af98286c2dc9017a8dba6d \ b57fd47f132f32001e0d4bfc4621f1bf \ - b4f71ffecd3694a82ffb62c357d997a8 \ + dff7c2613686577772e6eaeaf76d6f5c \ ff41a5b5c2364747a7ff11f6bdeee406 \ 504b5d258d68bdb980c997b93f0c6e6e \ 7646c7582d8b97443a94c12d30e60d99 \ 6a44afda654777d2930b93366bdfc7f3 \ 05d77ef52e90ad161fdd41b252420467 \ - 577bba6ae4d7493e169ca895141dd106 \ + 2b85559c818ca984fc61f5e7ef3ccf24 \ a295edb6953237ebbdfa8e731229f9a3 \ - ebcf604c44976809506192718f439dc1 \ - fbcf6847d661bc3fdd8745c06a721b04 \ + fcc84166b0f45067743bd0820f1d92e5 \ + d4a93fc92a1cdf6ccd1c26cd207622c9 \ 1751ef7d3080787345baeb93455f69df \ ea2d23ceb9f98853a7dffc6c02884464 \ - d8cacbb844fca8c0ca102c7576946131 \ - 9dd8e437188fced85429d9d0d9db145f \ + 04420ad0e34cf71c5dd4e473934f8e54 \ + 74970f806fd0f2ab972f077ee2b7e5d7 \ 51ed49380bb7d086c005208e805983b2 \ b760bf4a1a3fc54c76e9d042131a7acc \ - 458113901c4f5ab270e125b867f7dea4 \ - 9241fa90ea8b17c00010be46c9aa1ac5 \ + b8ebda586cee9a5a79403eb33396c182 \ + 3688fd97ff4600fa12dcba8623da73a3 \ 267fc4a374516caa7ab495f0c607c1b4 \ 74634128440dbc3766bda76fdf0aaa05 \ 126712a51ed2962e587048a634186390 \ @@ -300,15 +295,15 @@ MD5SUM="9199be2f1d48125de06db0d79553ee2e \ 010f6d0e98cc2a2b99907a23c6cd6bbc \ 8b15d333a98fc02a34909961900246a4 \ 59e2ac3afb27356dae5b252b6792e73c \ - 277c0eef3e10f7ec1b4db034ff40f1a8 \ + e11e1dd3d9c75ee9bd19a8bb02e824db \ d7624e4ff046ae83eda8e82d90887bdb \ 4d7e3bc6c42f8a875a87246ed14d9948 \ 58ee9a40577f5086ec1f22dc238b9c60 \ 1f2aefb269a8a9d8a86160c67a10c0b0 \ 407b8e24ec9b7a2921414e8e22267d45 \ - a9d6492a1bd21d93dbc27c32eabd0c70 \ - 11452e33fe5f4dfe6f36f2d266a5d343 \ - 4e040f3b7359531ac7134679ea9afcdc \ + 2cdf6f26459b770f7cf497cfba8eb5d4 \ + 86c345cb693c291362662b0eb437af89 \ + 398f4cce1d3067cc7a56662e52a33384 \ b98796f70d39efaf11e6489c1c266d56 \ 716a56ef901b38924bf55e20f602bd34 \ 6681f2b2a1b8854ec13b1d35edc6fdc3 \ @@ -317,12 +312,12 @@ MD5SUM="9199be2f1d48125de06db0d79553ee2e \ 7c8ef8b5fc652fa97d3629d1ec8b18e8 \ 09b520d03e86d50e3ac39d856d5aec32 \ a1544bff9ea95274369bf38508f8266a \ - 34ec0de0ebc730437e6788aa1264f86c \ + 6a4e43c95a4c419cb00fe91d226a9095 \ bdf329a72ecd0605c296f25e53136706 \ 24f6202003a936e73e51f47584ea8bea \ d318084a7a361875006cd156c19db3dc \ 80e1c1b89d858c93fc5946b4a8266504 \ - 597b5678e74f368f512931d828e8ff97 \ + b1e2ff2b24e7c0840bb0cb1174beedfd \ 412f39c3faf2efd34b5fe184e36ccc2f \ 110e56f20886997bc288b6fea8617ce1 \ 38f845b095b4ca30f93e034c7bd5ab14 \ @@ -332,11 +327,10 @@ MD5SUM="9199be2f1d48125de06db0d79553ee2e \ c2682997e48a129ea7cc8afd6e850366 \ 724696d583d5c24321c62a5e443d241f \ bb90dd58c7107a6f586b04588404b0ff \ - 8212aac8fcaeb41265840f72b31c9135 \ cbb52c723c94c83804912cde945b4510 \ - 3b00daaa372df161c5c8eeaf16a741d1 \ + ba5684833f6b40a3aa32ae4989c40f79 \ cd6875725af793cd82db47d68b00ee93 \ - 86c67a9c1f6c51726cf94a84eecb18c0 \ + c50f036618e5f44b0310769cc214d4e9 \ e1054d42008eb59cea63bc22136ed22f \ fb01542b6f62fe5d68d1dd9835d4e80b \ 8f6832ae66ce3c13c0f5da9f585f60e8 \ @@ -344,40 +338,38 @@ MD5SUM="9199be2f1d48125de06db0d79553ee2e \ b92fa50f56a1e06a7f1bf665442d4a73 \ 11681ec4554f1f934b25eeba3f558ea7 \ e1543fd467c420225dabc4d75ff3fe79 \ - f429c89da1e2d0ba564a0cb5e2ed928c \ + 39ee9c142fcb9be5b41be73e42260979 \ 639af0cca65c012e6a028acfb657e417 \ 1c69490f9cefc24e2119217039c61dda \ 0403f58e42c94609207c40a310cfe78a \ 73272fe4aadb91d550dca8fc7ead8bf7 \ be01525e51d79736e7af74fe93d19f93 \ - 9aaf13d622cd02548feaaca35687da9c \ - 6b33b0539f6c25c66268868b6b61e240 \ + 62156c0c6bde4f8190c611a461eb482a \ + c6be9100355c6e77cf37c76ade56baa4 \ 8bc92e2d422193be1d498146e34a0b85 \ 8234d20b9a5ea5e7087bb5ddb414011c \ e646c59e9a7da5308afd8e43149bcfef \ e53d38f6285cdc1bb509983b218d10d3 \ fba3b040a55c01be7376d3dd5c4d4920 \ - 181cb83a57d327b26ebc21db41b28480 \ - feb5919f3a98172d047e10b0bc1ea5ae \ + 49d77531898b3d7846b149c0fb4788c4 \ + 99d57b23f1a7878ef7220513f49db015 \ 4d3764b253ae871241c2f327e519f382 \ 9ea1bc3f82c4c646878376eacbf366ce \ - 1d1b2033b4272a22654e55447ae7f404 \ + f2d8f01a4e5c5236ab55240d09c6e82f \ cc1b0e90e372869ad03ef40bd53fa30f \ - 8ee79b4fe4c43d9ab09f16344612a656 \ + 5a376ab3f01ed9e90e8d71e1d5fa6ae7 \ 7c81e7a61ec172a229d6fdbc553e883d \ - ab9a5f02cef3b8794d810332ebf26a03 \ - 8c7d4897baee5e346d2184d46422ec49 \ - 48e7cc866f45af55ea3f627e29a2cd98 \ - eb7e04508518ed8f29935ec874e1740a \ - 47628a42562928b85cd28cb50e08d8bb \ + f8cc1978aae22df3e656d12810cdf994 \ + 5cf346df4658ff1ab6c0b3b3dba48f75 \ + 86aa81f2561682f16c0be376294bf9d3 \ + 13f47025d308bc16d26a9bc3334f3bbe \ c14d50ef3ce9b2640d2a9d68c53834b9 \ 7e395ce2e673b7d9665751cbbe3cbcdc \ e8ba17285a3c3413579cf23c009a5f52 \ d4aa9768b074d64e8271942682ff0159 \ - 44ab2701d152b855941648698cd7a99e \ 1be22bdbd81580965933512a89c00e25 \ - 99913f0b1e33a0760543c0ca3b5e4dfe \ - 0c7dc4f3d2bd9fa81623fb1f3abef015 \ + 52af5d02a6e146eaf0fc591a5a6ccdaf \ + 110e4691ab282e351abcb4c88687271f \ aecd889de42c8168e1bc97a6f2720d8f \ f3b8c17ba1076acbcd2074e4278f44f9 \ 1986c3b1b3a4968592e1577e8676ac12 \ @@ -392,88 +384,87 @@ MD5SUM="9199be2f1d48125de06db0d79553ee2e \ 0ba30a94d7b8865c23e86d4d64e5b91e \ ffc7c4e1b2639ba6c8579a1c47c5f97c \ 564286699e80741f7c24b16c9a1a5f58 \ - 76c281577ef136b9484166302e37c9bd \ - 7b5035f3ae2acd6abe959249308bb5a1 \ + 524ffd7a9b5b25c4d388686a5dde5cac \ + 263a4e4ee967b56a460b6b717fa53279 \ 4fc82daae9a3fe793c8876370d26bd6a \ - 0df16f0fae76d411cebf1e67c55070d9 \ - e83703ecba7917d4e12c8e639692e169 \ - fc70d4884e65f1c29086807a9aaad534 \ - 0ddb8bccd3198892d0dd0ec7151f7cd3 \ + c755ef59e7394470f9e06673f7e02e2a \ + e0c30e3bc29a1b33c71f2823cd5b5365 \ + 5d249ea25d57d9e5b051a504a2f62a62 \ + 0358b31bf59c7915bb03f9e66f2d1ea3 \ 6150a7bb6ddc7aaa6aba6130de9fd2b8 \ 782ea88d8e5b517b1c9e7d870e20e9e3 \ ff1d093069cfc9eb161907e17a51208b \ bca57d7079177ca0aa651d452c7099fe \ - 4f496143a21775fa7bd22bf329c37f37 \ + 520b920d0c711ec1a17fb19a6060446a \ 91b60a71d44302a8b05bd398eca56c37 \ fdf3aa5e1f6c33e4f68b0f7b08e1e94e \ e60c2f75a7c60276ba15dba4c1766286 \ 9bdda698a3c8ba141f4daba1a7630143 \ - ca664d757b2c95424cf3465e412cce90 \ + feefd8369d6dd6a0f269bbed1b921349 \ 2d8d8b377d144f5e32b4f65a69eb0b24 \ b898bcf321bba46ecd15c9279cdbb290 \ f1358be8c98b98837cbd2cf51e75f8b3 \ 92577365ba12f6bc2c5fd3b639135b62 \ - bf2aac00571a32be8a2fb842e194a728 \ - d6c1f2447aa984e398cdfdeb4cd75d44 \ - d43f1621c76532ffdc7990d23593c61b \ - 3ed0ebc631b1840f3be21e1ba07fa4ed \ + 7b1ab65edc77a1bd7cfd8f03cd889831 \ + 956ace3f4e2b8a6ac55aa74549cc38de \ + e8b93865e80b67f03df2faa417960b88 \ + 1d870838320d2810817ade2a17fcc4f8 \ fa0d5d4e1e3bd20a9ca9aef473fc3665 \ - 6bcc09c6316e342b6076da0828cad63d \ + 0d41acddc353ee66a675dbdf61c9aee4 \ 89b435ff50362dda1abe34a8862cf4ab \ b4a3e97f65acc9e03df7e95defe9b27c \ 22e95901b912671da26457ac33e36a23 \ f60ab8537f924a65fbc0961e958d375b \ d0116882bd495f2b993495a8cf01f6fe \ 5d8c25fc51ffebca67935516c2325860 \ - a88ce3625ee63d53088ad83d8581b368 \ - 3e595c35e2081351d8ba2da3e13353f3 \ - b70a651e684a72d00f732c90856a6a19 \ - c9fc0a9962fd7434e6d76ae22400e72a \ + f50e12db5ae8860e3f067d5dcb4471a6 \ + 1c636a4973414fa9b34d51157583717f \ + 82524d56df67f220fd1232ae2878b84c \ + dcdefdf32b08b2e1b686e30d4ffef310 \ eb8ac974a85ac3219c8c66b17bf5d0f5 \ 82d98dc87dc8503400aa095f5aa70f13 \ - 5b8200043b8a729b7ed1b74825c68073 \ - 93097f1e5375355e5561e947b1b77180 \ - 0d731b0c0babb1f744fce3ef70eec11d \ - 11ccfbb001a8e067c18843864e21e033 \ - 4726ea3b77caf0028375236c677e9a82 \ - b7a1b93f85587ed99e0a46d141f26528 \ + 285d82afae7d638437fd71f94cd1923e \ + f443b2cca547d22f994c2dd99a6e5581 \ + 361668f9f11e4f0eba45f70c24fa8614 \ + b3c2227ede0550f603a0b4be15a7e96e \ + 5e3168bac027527c809f8dfec53dcf2f \ + cd0adf433f780963328c0540237a056f \ 9aecd5ff283534a21d7cd51266abfe89 \ - dff68dc5b0704b8123a947f52e31dc8d \ - 8184f2020a3a5c78844485260ec49a36 \ + 0cb504a1438dd87648b18def4b0e6e10 \ + f86411859a1ef260c568e4b89546785c \ a6655e5e9845cb569991e87b5b38a1fc \ 0a906c03436ec2dcc4c311c21fee0da2 \ ca65153603a1a7240bbd9d2ce19f2d67 \ - b145fb66e71c48f5f7b5b7ad98de963b \ + 43bd6ad524e583eaa8c071dbb01f11ae \ 908ec8a89821b72f3a35726bab24461f \ - 428fc5d72716c000ce20267887878be2 \ + a8c6d404eec9e0efc975e65312b76228 \ ceee1159c41351d05f4cf705490867b3 \ d18d362345c4fe512ef67b738b239fb8 \ 1ad539bb397aab6bb7c261d5b421a1a6 \ 32222c3df2805eabcfe92432db2aee8f \ c67eae79cbc709d1c2c7535f3d7b6281 \ a29fec77b1e07caf7b682b881b676c06 \ - 96481ed810273371ed8b87f062a0dcda \ + f38b27b8c9625110a51293658f1cc014 \ e972ea58ec203bfa6c79c1207852298b \ - 27e1a4ac927346509cf010b024c79e87 \ - 91606eb5d0ce66d748b5fc678b33a0ea \ - 90f2e8c0ca989290eff37cd9b3ec2a87 \ - 9202e1b9c6367013631774f38fdff707 \ - f00d62969f597349b1d460c96b57136c \ - 7f115ec6580072e95e26ab41f3fabb84 \ - e5ab780a9b5951ae6ddd1e0b26a8c6c8 \ - 1a1ac386996554c8f86261509e942f7c \ + 1aa786b0f998b9d0440c2a03b133e991 \ + 65689b5bdeb96ecd47930b430520f676 \ + 651897c3311b074247a1b351bf85b4ff \ + 8b3da5691ef460f035d90f16d3a0bebd \ + 4abb118b896b90518fc32602088933be \ + dca59f56e652d010c754d42df104cd22 \ + 8ab996cc7533caa3a5675e045759e4e2 \ + b40d4c73e3b5fd6670c4e1e253cfd689 \ 2149df0c65b9963e19b4e7ca4050ad96 \ - 4a67d22614c644fef07efb496a053865 \ + a7e739dff4b99e82ce07d8d21adc1533 \ 56608eb750f70d0c9a6643a351cc5ea5 \ 028a529550344ea14623168220fa1901 \ - c0188e94dfca68e01c6bf0450d4f035e \ - 5d8e90b65d01001eef0e5c2a77fed433 \ + 4c9b7fd62dd6099a9a0e583bbdfea1cf \ + d9cf61d9a5387dcbb3bf017aebaf2bf7 \ 7da33160ff24759809edd61619a4a69f \ - e97f7d5779474c95cf1a1769013db24e \ + 50fd776efcd20b40eb7ec5bec9c2d1cf \ b06e8c6d713b11560dd758109343209c \ db96b50050277bf05a3c68534bbb9586 \ 306c0281447d1876e8220007b7a7e053 \ - e2860eb635198a35bdd26d200febc044 \ 09de9d01e7331ff3da11f58be8bef0df \ 0498c4a11448bfc35dc7bb2caa64c753 \ b58284cb8ce52b8de07e09f4f8fb9653 \ @@ -494,19 +485,18 @@ MD5SUM="9199be2f1d48125de06db0d79553ee2e \ 45b469ad607b912256b7c80141fa2d17 \ 8cec8a187df7a7b971009a7693f60140 \ 7799baff9a5664205d9110a2624e8989 \ - 13b0d6da1e9b98af1619505a766656da \ - 0d4bd262b0a39e35e1e00dc97a67b827 \ - d85c237fd9f6e522379b9a41c5f34b16 \ + bede58e46f614f2e9cb24cbb5b6706f9 \ + cb7c86af4d8a969d849c6fce363af240 \ + 89f70cb8305108cc51ccde5569760d5b \ + 3aa6fd0d30e89ae0fef20f01efe44f9d \ 4396bc1704f7337718352f0e6ec2d391 \ - da2424fe9f0c33ec7d8deda1f263abd0 \ + 6debd70bca3c320090eab4677b0b2bb4 \ 1d09c0d1f19fc18bb1c400100df17c0c \ - 260cb5824639b426f46f9fec71ac7ef0 \ ee9610aac4f0c37e3a31f6cea6fb8ff9 \ - 77250c45b58d52e13e3c7d2a67919d1a \ ff16c9daa9afa7ba1d5334699700b042 \ 5a19e54d2580e4c0d72c281df8f54ae6 \ 1613d0f9e24d4b05e81748ea1f355f6c \ - efd9146058a0c646f64bbf9282168f97 \ + d18fcf0fa73d7bd81b2e63e0b8098869 \ 423da0bc6c03a22a8c3181feec42c09b \ f7e1624bbb0598683388e7820bbae8c4 \ 936257597fbe2fd02d954a5db53c687a \ diff --git a/system/apple-fonts-NY/apple-fonts-NY.info b/system/apple-fonts-NY/apple-fonts-NY.info index 3429b3597c..4918a9deaa 100644 --- a/system/apple-fonts-NY/apple-fonts-NY.info +++ b/system/apple-fonts-NY/apple-fonts-NY.info @@ -2,7 +2,7 @@ PRGNAM="apple-fonts-NY" VERSION="2023" HOMEPAGE="https://developer.apple.com/fonts/" DOWNLOAD="https://devimages-cdn.apple.com/design/resources/download/NY.dmg" -MD5SUM="cf4240d1870274142788f898b73e0b04" +MD5SUM="66be3f1753c9d266892db9001abfde7c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="p7zip" diff --git a/system/apple-fonts-SF/apple-fonts-SF.info b/system/apple-fonts-SF/apple-fonts-SF.info index 8a0edd4995..5b802c60b2 100644 --- a/system/apple-fonts-SF/apple-fonts-SF.info +++ b/system/apple-fonts-SF/apple-fonts-SF.info @@ -4,9 +4,9 @@ HOMEPAGE="https://developer.apple.com/fonts/" DOWNLOAD="https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg \ https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg \ https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" -MD5SUM="dbca7b5819e44b3c35d927048896078f \ -5ff6d068b349ac684b44264d00935f29 \ -b7ae94096a43b3ec93e851e4e588b9ed" +MD5SUM="5d018413a9143d281bea4c7d8d6a9742 \ +02585cd22130ace172c0a1dcfbe1d466 \ +83dce1b94964815267e1ba1c9280e977" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="p7zip" diff --git a/system/apptainer/README b/system/apptainer/README index 28182dbd80..178c15c706 100644 --- a/system/apptainer/README +++ b/system/apptainer/README @@ -26,3 +26,10 @@ migration documentation and user compatibility documentation. Usage example: apptainer build slackware.sif \ /usr/share/apptainer/examples/slackware/slackware.def + +Various features can be enabled/disabled by passing variables to the +script (VAR=yes/no ./apptainer.SlackBuild): + +WITH_SUID=auto|yes|no (default: auto) + create a setuid-installation (auto uses upstream's default which + is currently no) diff --git a/system/apptainer/apptainer.SlackBuild b/system/apptainer/apptainer.SlackBuild index 7f60d6af73..be7130c529 100644 --- a/system/apptainer/apptainer.SlackBuild +++ b/system/apptainer/apptainer.SlackBuild @@ -76,6 +76,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +WITH_SUID=${WITH_SUID:-auto} + +if [ "$WITH_SUID" = "no" ] ; then + suid_option="--without-suid" +elif [ "$WITH_SUID" = "yes" ] ; then + suid_option="--with-suid" +else + suid_option="" +fi # this sets the go path without the needs of logout SBOGO=$(find /usr/lib${LIBDIRSUFFIX} -type f -name "go") @@ -88,6 +97,7 @@ PATH=$GOROOT/bin:$PATH \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ + $suid_option \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION diff --git a/system/audit/audit.SlackBuild b/system/audit/audit.SlackBuild index baf85c9b38..45aca7c2a1 100644 --- a/system/audit/audit.SlackBuild +++ b/system/audit/audit.SlackBuild @@ -79,6 +79,9 @@ find -L . \ # Init should check /etc/rc.d/rc.auditd.conf instead of /etc/sysconfig/auditd patch -p1 < $CWD/audit-2.3.6-sysconfig.diff +# python binding are disabled ATM, see +# https://listman.redhat.com/archives/linux-audit/2022-February/msg00085.html +# thanks to fourtysixandtwo for the pointers CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -94,6 +97,8 @@ CFLAGS="$SLKCFLAGS" \ --enable-systemd=no \ --with-libcap-ng=yes \ --enable-gssapi-krb5=yes \ + --without-python \ + --without-python3 \ --build=$ARCH-slackware-linux make diff --git a/system/btop/btop.SlackBuild b/system/btop/btop.SlackBuild index 56ee840492..1550e7d93c 100644 --- a/system/btop/btop.SlackBuild +++ b/system/btop/btop.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for btop -# Copyright 2022-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2022-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=btop -VERSION=${VERSION:-1.2.13} +VERSION=${VERSION:-1.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -75,7 +75,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ sed -i "s|-O2|$SLKCFLAGS|" Makefile || exit 1 -make PREFIX=/usr all +LDFLAGS=-ldl make PREFIX=/usr all make PREFIX=/usr install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/system/btop/btop.info b/system/btop/btop.info index 5fbd5b55aa..faa44836df 100644 --- a/system/btop/btop.info +++ b/system/btop/btop.info @@ -1,8 +1,8 @@ PRGNAM="btop" -VERSION="1.2.13" +VERSION="1.3.2" HOMEPAGE="https://github.com/aristocratos/btop/" -DOWNLOAD="https://github.com/aristocratos/btop/archive/v1.2.13/btop-1.2.13.tar.gz" -MD5SUM="be23bfd87f885c0f606f467ccfebc5e3" +DOWNLOAD="https://github.com/aristocratos/btop/archive/v1.3.2/btop-1.3.2.tar.gz" +MD5SUM="04ff8d32e7bf748705fe34dfea50c628" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild index 828e7e1e3a..dfd716f317 100644 --- a/system/conky/conky.SlackBuild +++ b/system/conky/conky.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=conky -VERSION=${VERSION:-1.20.1} +VERSION=${VERSION:-1.21.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -102,7 +102,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DDOC_PATH=/usr/doc/$PRGNAM-$VERSION \ - -DMAINTAINER_MODE=ON \ + -DMAINTAINER_MODE=OFF \ -DBUILD_DOCS=OFF \ -DBUILD_EXTRAS=ON \ -DBUILD_XDBE=ON \ diff --git a/system/conky/conky.info b/system/conky/conky.info index 30fd153122..c5e66d6dc8 100644 --- a/system/conky/conky.info +++ b/system/conky/conky.info @@ -1,8 +1,8 @@ PRGNAM="conky" -VERSION="1.20.1" +VERSION="1.21.0" HOMEPAGE="https://github.com/brndnmtthws/conky" -DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.20.1/conky-1.20.1.tar.gz" -MD5SUM="6abe61ff017c872487f6b7a184ad68c9" +DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.21.0/conky-1.21.0.tar.gz" +MD5SUM="f635150d2e86b1880db409ab9d4f4e46" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lua53 imlib2" diff --git a/system/corectrl/corectrl.SlackBuild b/system/corectrl/corectrl.SlackBuild index 198120e66e..e2c2e5fb96 100644 --- a/system/corectrl/corectrl.SlackBuild +++ b/system/corectrl/corectrl.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=corectrl -VERSION=${VERSION:-v1.3.2} +VERSION=${VERSION:-v1.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/corectrl/corectrl.info b/system/corectrl/corectrl.info index 681b3e7e29..1df92bae08 100644 --- a/system/corectrl/corectrl.info +++ b/system/corectrl/corectrl.info @@ -1,10 +1,10 @@ PRGNAM="corectrl" -VERSION="v1.3.2" +VERSION="v1.4.0" HOMEPAGE="https://gitlab.com/corectrl/corectrl/" -DOWNLOAD="https://gitlab.com/corectrl/corectrl/-/archive/v1.3.2/corectrl-v1.3.2.tar.gz" -MD5SUM="656d7d307c7f0185794d08239bf00d58" +DOWNLOAD="https://gitlab.com/corectrl/corectrl/-/archive/v1.4.0/corectrl-v1.4.0.tar.gz" +MD5SUM="b5f9571d64905a7594c54b9a419fe139" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="Botan" +REQUIRES="Botan pugixml spdlog" MAINTAINER="Matthew Miller" EMAIL="mattallmill@gmail.com" diff --git a/system/courier-screenplay/courier-screenplay.info b/system/courier-screenplay/courier-screenplay.info index 37095d573a..046740d506 100644 --- a/system/courier-screenplay/courier-screenplay.info +++ b/system/courier-screenplay/courier-screenplay.info @@ -2,7 +2,7 @@ PRGNAM="courier-screenplay" VERSION="1.0" HOMEPAGE="https://www.fadeinpro.com/page.pl?content=download#fonts" DOWNLOAD="https://www.fadeinpro.com/download/fonts/CourierScreenplay.zip" -MD5SUM="0cc0252c07c2273d0e41f529b02acdd2" +MD5SUM="68ba6c864b6c7b7c03d3252cb230318f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/cpmtools/cpmtools.info b/system/cpmtools/cpmtools.info index 16ff90ec17..abd9fd33f1 100644 --- a/system/cpmtools/cpmtools.info +++ b/system/cpmtools/cpmtools.info @@ -2,7 +2,7 @@ PRGNAM="cpmtools" VERSION="2.24" HOMEPAGE="http://www.moria.de/~michael/cpmtools/" DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/cpmtools-2.24.tar.gz" -MD5SUM="98dfb2f3e3246c6ddba63674b1e1af83" +MD5SUM="0cb3a4c2fa7b2b05d9096d06b4b126b7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/distrobox/distrobox.SlackBuild b/system/distrobox/distrobox.SlackBuild index 693318d378..78c41eb02b 100644 --- a/system/distrobox/distrobox.SlackBuild +++ b/system/distrobox/distrobox.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=distrobox -VERSION=${VERSION:-1.7.1} +VERSION=${VERSION:-1.7.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/distrobox/distrobox.info b/system/distrobox/distrobox.info index 3a44b50f50..c0bbd8641e 100644 --- a/system/distrobox/distrobox.info +++ b/system/distrobox/distrobox.info @@ -1,8 +1,8 @@ PRGNAM="distrobox" -VERSION="1.7.1" +VERSION="1.7.2.1" HOMEPAGE="https://github.com/89luca89/distrobox" -DOWNLOAD="https://github.com/89luca89/distrobox/archive/1.7.1/distrobox-1.7.1.tar.gz" -MD5SUM="25e413dbc60fbea908542c392e2affda" +DOWNLOAD="https://github.com/89luca89/distrobox/archive/1.7.2.1/distrobox-1.7.2.1.tar.gz" +MD5SUM="48c91e77f6eb2eeb2db38a06e4f5cc6c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="podman" diff --git a/system/docker-buildx/docker-buildx.SlackBuild b/system/docker-buildx/docker-buildx.SlackBuild index 6dab03e6f3..37a65556b7 100644 --- a/system/docker-buildx/docker-buildx.SlackBuild +++ b/system/docker-buildx/docker-buildx.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=docker-buildx -VERSION=${VERSION:-0.13.1} -GITHASH=${GITHASH:-788433953af10f2a698f5c07611dddce2e08c7a0} +VERSION=${VERSION:-0.14.0} +GITHASH=${GITHASH:-171fcbeb69d67c90ba7f44f41a9e418f6a6ec1da} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/docker-buildx/docker-buildx.info b/system/docker-buildx/docker-buildx.info index 625dad5d7c..4fea8e5bc4 100644 --- a/system/docker-buildx/docker-buildx.info +++ b/system/docker-buildx/docker-buildx.info @@ -1,10 +1,10 @@ PRGNAM="docker-buildx" -VERSION="0.13.1" +VERSION="0.14.0" HOMEPAGE="https://github.com/docker/buildx" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/docker/buildx/archive/v0.13.1/buildx-0.13.1.tar.gz" -MD5SUM_x86_64="42a6b7cc084755ff69b7109fb728f29d" +DOWNLOAD_x86_64="https://github.com/docker/buildx/archive/v0.14.0/buildx-0.14.0.tar.gz" +MD5SUM_x86_64="44115354337df52c9c609c9d41411c3b" REQUIRES="google-go-lang" MAINTAINER="Andrew Clemons" EMAIL="andrew.clemons@gmail.com" diff --git a/system/docker-compose/docker-compose.SlackBuild b/system/docker-compose/docker-compose.SlackBuild index 463bd6d7ef..b34eeb8d87 100644 --- a/system/docker-compose/docker-compose.SlackBuild +++ b/system/docker-compose/docker-compose.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=docker-compose -VERSION=${VERSION:-2.26.1} +VERSION=${VERSION:-2.27.0} GITHASH=${GITHASH:-b929810} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/docker-compose/docker-compose.info b/system/docker-compose/docker-compose.info index d7bf6ea891..1f77fc084d 100644 --- a/system/docker-compose/docker-compose.info +++ b/system/docker-compose/docker-compose.info @@ -1,10 +1,10 @@ PRGNAM="docker-compose" -VERSION="2.26.1" +VERSION="2.27.0" HOMEPAGE="https://docs.docker.com/compose/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/docker/compose/archive/v2.26.1/compose-2.26.1.tar.gz" -MD5SUM_x86_64="64ac36e75914803274d074d107cf3e17" +DOWNLOAD_x86_64="https://github.com/docker/compose/archive/v2.27.0/compose-2.27.0.tar.gz" +MD5SUM_x86_64="19c94f1323a155d19afbfeda1cdecbcc" REQUIRES="docker-cli" MAINTAINER="Ebben Aries" EMAIL="slackbuilds@dscp.org" diff --git a/system/efi-sync/README b/system/efi-sync/README new file mode 100644 index 0000000000..71a5cef40a --- /dev/null +++ b/system/efi-sync/README @@ -0,0 +1,19 @@ +efi-sync is a program which will update your efi when your kernel or its +related files are updated. + +To have efi-sync to start and stop with your host, add to the beginning of +/etc/rc.d/rc.local: + + if [ -x /etc/rc.d/rc.efi-sync ]; then + /etc/rc.d/rc.efi-sync start + fi + +and to /etc/rc.d/rc.local_shutdown (creating it if needed): + + if [ -x /etc/rc.d/rc.efi-sync ]; then + /etc/rc.d/rc.efi-sync stop + fi + +Also ensure your EFI is mounted on boot by having its entry configured in +/etc/fstab. For more instructions, refer to the project's README in this +packages documentation under /usr/doc. diff --git a/system/efi-sync/doinst.sh b/system/efi-sync/doinst.sh new file mode 100644 index 0000000000..519c0d5c0d --- /dev/null +++ b/system/efi-sync/doinst.sh @@ -0,0 +1,25 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.efi-sync.new diff --git a/system/efi-sync/efi-sync.SlackBuild b/system/efi-sync/efi-sync.SlackBuild new file mode 100644 index 0000000000..e9a06ee65a --- /dev/null +++ b/system/efi-sync/efi-sync.SlackBuild @@ -0,0 +1,62 @@ +#!/bin/bash + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=efi-sync +VERSION=${VERSION:-0.2.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +mkdir -p $PKG/usr/sbin +cp efi-sync $PKG/usr/sbin/ +chmod +x $PKG/usr/sbin/efi-sync + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cp -a \ + README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cp "$CWD/README" "$PKG/usr/doc/$PRGNAM-$VERSION/README_slackware.md" + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +mkdir -p "$PKG/etc/rc.d" +cp -R "$CWD/files/rc.efi-sync.new" "$PKG/etc/rc.d/" + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-0.2.0-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/efi-sync/efi-sync.info b/system/efi-sync/efi-sync.info new file mode 100644 index 0000000000..166c307260 --- /dev/null +++ b/system/efi-sync/efi-sync.info @@ -0,0 +1,10 @@ +PRGNAM="efi-sync" +VERSION="0.2.0" +HOMEPAGE="https://git.server.ky/slackcoder/efi-sync" +DOWNLOAD="https://git.server.ky/slackcoder/efi-sync/snapshot/efi-sync-0.2.0.tar.xz" +MD5SUM="9da8ebe6f6bcf30e0b8304c641c72396" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Slack Coder" +EMAIL="slackcoder@server.ky" diff --git a/system/efi-sync/files/rc.efi-sync.new b/system/efi-sync/files/rc.efi-sync.new new file mode 100644 index 0000000000..727c93b84a --- /dev/null +++ b/system/efi-sync/files/rc.efi-sync.new @@ -0,0 +1,60 @@ +#!/bin/sh +# +# Startup/shutdown script for GNU Taler's exchange. +# + +# Seconds to wait for daemon to shutdown. +SHUTDOWN_WAIT=60 + +mkdir -p /run/efi-sync + +start() { + echo "Starting EFI Sync" + + daemon \ + --name=efi-sync \ + --pidfiles=/run/efi-sync \ + --output=/var/log/efi-sync.log \ + -- efi-sync watch +} + +stop() { + echo "Stopping EFI Sync" + + if /usr/bin/daemon --pidfiles=/run/efi-sync --name=efi-sync --running ; then + /usr/bin/daemon --pidfiles=/run/efi-sync --name=efi-sync --stop + fi + + # Wait for daemon to politely shutdown. + sleep 1 + if /usr/bin/daemon --pidfiles=/run/efi-sync --name=efi-sync --running; then + echo "Waiting up to ${SHUTDOWN_WAIT} to stop..." + + let "count = 0" + while /usr/bin/daemon --pidfiles=/run/efi-sync --name=efi-sync --running && [[ $count -lt 60 ]]; do + sleep 1 + let "count = $count + 1" + done + fi +} + +status() { + if /usr/bin/daemon --pidfiles=/run/efi-sync --name=efi-sync --running ; then + /usr/bin/daemon --pidfiles=/run/efi-sync --name=efi-sync --running --verbose + fi +} + +case "$1" in +start) + start + ;; +stop) + stop + ;; +status) + status + ;; +*) + echo $"Usage: $0 {start|stop|status}" + exit 1 +esac diff --git a/games/term2048/slack-desc b/system/efi-sync/slack-desc index 51299727ef..1c4590c6f1 100644 --- a/games/term2048/slack-desc +++ b/system/efi-sync/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -term2048: term2048 (2048 in your terminal) -term2048: -term2048: Join the numbers and get to the 2048 tile! -term2048: -term2048: Homepage: https://github.com/bfontaine/term2048 -term2048: -term2048: -term2048: -term2048: -term2048: -term2048: +efi-sync: efi-sync (Kernel EFI installer) +efi-sync: +efi-sync: Automatically install your kernel into the EFI on updates. +efi-sync: +efi-sync: +efi-sync: +efi-sync: +efi-sync: +efi-sync: +efi-sync: +efi-sync: diff --git a/system/efitools/efitools.SlackBuild b/system/efitools/efitools.SlackBuild index 6670f971bd..c00927de6c 100644 --- a/system/efitools/efitools.SlackBuild +++ b/system/efitools/efitools.SlackBuild @@ -43,9 +43,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -129,7 +126,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cd $PKG/usr/share/efitools -mv README README_Secure_Boot COPYING $PKG/usr/doc/$PRGNAM-$VERSION +mv README COPYING $PKG/usr/doc/$PRGNAM-$VERSION +cp $CWD/README.Secure_Boot $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/fastfetch/fastfetch.SlackBuild b/system/fastfetch/fastfetch.SlackBuild index 57f29bec06..f6e59d1a25 100644 --- a/system/fastfetch/fastfetch.SlackBuild +++ b/system/fastfetch/fastfetch.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fastfetch -VERSION=${VERSION:-2.9.0} +VERSION=${VERSION:-2.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -94,7 +94,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - CHANGELOG.md DEVELOPMENT.md README.md LICENSE \ + CHANGELOG.md README.md LICENSE \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/fastfetch/fastfetch.info b/system/fastfetch/fastfetch.info index 98a2f06064..ce0a3c627e 100644 --- a/system/fastfetch/fastfetch.info +++ b/system/fastfetch/fastfetch.info @@ -1,8 +1,8 @@ PRGNAM="fastfetch" -VERSION="2.9.0" +VERSION="2.12.0" HOMEPAGE="https://github.com/fastfetch-cli/fastfetch" -DOWNLOAD="https://github.com/fastfetch-cli/fastfetch/archive/2.9.0/fastfetch-2.9.0.tar.gz" -MD5SUM="b5e476cbd7fd82bcbc510ff1940ea502" +DOWNLOAD="https://github.com/fastfetch-cli/fastfetch/archive/2.12.0/fastfetch-2.12.0.tar.gz" +MD5SUM="f1cda5f37c9443bec7d55789f8d2a3db" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/fd/fd.SlackBuild b/system/fd/fd.SlackBuild index adcc35d544..536e7140e4 100644 --- a/system/fd/fd.SlackBuild +++ b/system/fd/fd.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for fd # Copyright 2017-2022 Andrew Clemons, Wellington New Zealand -# Copyright 2022-2023 Andrew Clemons, Tokyo, Japan +# Copyright 2022-2024 Andrew Clemons, Tokyo, Japan # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fd -VERSION=${VERSION:-9.0.0} +VERSION=${VERSION:-10.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -62,7 +62,11 @@ elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" CARGOTARGET="--target $ARCH-unknown-linux-gnu" -elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ]; then +elif [ "$ARCH" = "x86_64" ] ; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + CARGOTARGET="--target $ARCH-unknown-linux-gnu" +elif [ "$ARCH" = "aarch64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" CARGOTARGET="--target $ARCH-unknown-linux-gnu" diff --git a/system/fd/fd.info b/system/fd/fd.info index a7c7e9c75e..ccf2c68003 100644 --- a/system/fd/fd.info +++ b/system/fd/fd.info @@ -1,216 +1,228 @@ PRGNAM="fd" -VERSION="9.0.0" +VERSION="10.1.0" HOMEPAGE="https://github.com/sharkdp/fd" -DOWNLOAD="https://github.com/sharkdp/fd/archive/v9.0.0/fd-9.0.0.tar.gz \ - https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.2.crate \ +DOWNLOAD="https://github.com/sharkdp/fd/archive/v10.1.0/fd-10.1.0.tar.gz \ + https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.3.crate \ https://static.crates.io/crates/android-tzdata/android-tzdata-0.1.1.crate \ https://static.crates.io/crates/android_system_properties/android_system_properties-0.1.5.crate \ - https://static.crates.io/crates/anstream/anstream-0.6.4.crate \ - https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.2.crate \ - https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.0.crate \ - https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.1.crate \ - https://static.crates.io/crates/anstyle/anstyle-1.0.4.crate \ - https://static.crates.io/crates/anyhow/anyhow-1.0.75.crate \ + https://static.crates.io/crates/anstream/anstream-0.6.14.crate \ + https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.4.crate \ + https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.3.crate \ + https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.3.crate \ + https://static.crates.io/crates/anstyle/anstyle-1.0.7.crate \ + https://static.crates.io/crates/anyhow/anyhow-1.0.82.crate \ https://static.crates.io/crates/argmax/argmax-0.3.1.crate \ - https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \ + https://static.crates.io/crates/autocfg/autocfg-1.3.0.crate \ https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \ - https://static.crates.io/crates/bitflags/bitflags-2.4.1.crate \ - https://static.crates.io/crates/bstr/bstr-1.7.0.crate \ - https://static.crates.io/crates/bumpalo/bumpalo-3.14.0.crate \ - https://static.crates.io/crates/cc/cc-1.0.83.crate \ + https://static.crates.io/crates/bitflags/bitflags-2.5.0.crate \ + https://static.crates.io/crates/bstr/bstr-1.9.1.crate \ + https://static.crates.io/crates/bumpalo/bumpalo-3.16.0.crate \ + https://static.crates.io/crates/cc/cc-1.0.96.crate \ https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \ - https://static.crates.io/crates/chrono/chrono-0.4.31.crate \ - https://static.crates.io/crates/clap/clap-4.4.10.crate \ - https://static.crates.io/crates/clap_builder/clap_builder-4.4.9.crate \ - https://static.crates.io/crates/clap_complete/clap_complete-4.4.4.crate \ - https://static.crates.io/crates/clap_derive/clap_derive-4.4.7.crate \ - https://static.crates.io/crates/clap_lex/clap_lex-0.6.0.crate \ - https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \ - https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.4.crate \ - https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.8.crate \ - https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.3.crate \ - https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.15.crate \ - https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.16.crate \ - https://static.crates.io/crates/ctrlc/ctrlc-3.4.1.crate \ + https://static.crates.io/crates/cfg_aliases/cfg_aliases-0.1.1.crate \ + https://static.crates.io/crates/chrono/chrono-0.4.38.crate \ + https://static.crates.io/crates/clap/clap-4.5.4.crate \ + https://static.crates.io/crates/clap_builder/clap_builder-4.5.2.crate \ + https://static.crates.io/crates/clap_complete/clap_complete-4.5.2.crate \ + https://static.crates.io/crates/clap_derive/clap_derive-4.5.4.crate \ + https://static.crates.io/crates/clap_lex/clap_lex-0.7.0.crate \ + https://static.crates.io/crates/colorchoice/colorchoice-1.0.1.crate \ + https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.6.crate \ + https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.12.crate \ + https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.5.crate \ + https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.18.crate \ + https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.19.crate \ + https://static.crates.io/crates/ctrlc/ctrlc-3.4.4.crate \ https://static.crates.io/crates/diff/diff-0.1.13.crate \ - https://static.crates.io/crates/errno/errno-0.3.5.crate \ + https://static.crates.io/crates/errno/errno-0.3.8.crate \ https://static.crates.io/crates/etcetera/etcetera-0.8.0.crate \ https://static.crates.io/crates/faccess/faccess-0.2.4.crate \ - https://static.crates.io/crates/fastrand/fastrand-2.0.1.crate \ - https://static.crates.io/crates/filetime/filetime-0.2.22.crate \ + https://static.crates.io/crates/fastrand/fastrand-2.1.0.crate \ + https://static.crates.io/crates/filetime/filetime-0.2.23.crate \ https://static.crates.io/crates/globset/globset-0.4.14.crate \ - https://static.crates.io/crates/heck/heck-0.4.1.crate \ - https://static.crates.io/crates/home/home-0.5.5.crate \ + https://static.crates.io/crates/heck/heck-0.5.0.crate \ + https://static.crates.io/crates/home/home-0.5.9.crate \ https://static.crates.io/crates/humantime/humantime-2.1.0.crate \ https://static.crates.io/crates/iana-time-zone-haiku/iana-time-zone-haiku-0.1.2.crate \ - https://static.crates.io/crates/iana-time-zone/iana-time-zone-0.1.58.crate \ - https://static.crates.io/crates/ignore/ignore-0.4.21.crate \ + https://static.crates.io/crates/iana-time-zone/iana-time-zone-0.1.60.crate \ + https://static.crates.io/crates/ignore/ignore-0.4.22.crate \ + https://static.crates.io/crates/is_terminal_polyfill/is_terminal_polyfill-1.70.0.crate \ https://static.crates.io/crates/jemalloc-sys/jemalloc-sys-0.5.4%2B5.3.0-patched.crate \ https://static.crates.io/crates/jemallocator/jemallocator-0.5.4.crate \ - https://static.crates.io/crates/js-sys/js-sys-0.3.64.crate \ + https://static.crates.io/crates/js-sys/js-sys-0.3.69.crate \ https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \ - https://static.crates.io/crates/libc/libc-0.2.150.crate \ - https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.10.crate \ - https://static.crates.io/crates/log/log-0.4.20.crate \ - https://static.crates.io/crates/lscolors/lscolors-0.16.0.crate \ - https://static.crates.io/crates/memchr/memchr-2.6.4.crate \ - https://static.crates.io/crates/memoffset/memoffset-0.9.0.crate \ + https://static.crates.io/crates/libc/libc-0.2.154.crate \ + https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.13.crate \ + https://static.crates.io/crates/log/log-0.4.21.crate \ + https://static.crates.io/crates/lscolors/lscolors-0.17.0.crate \ + https://static.crates.io/crates/memchr/memchr-2.7.2.crate \ https://static.crates.io/crates/nix/nix-0.24.3.crate \ - https://static.crates.io/crates/nix/nix-0.27.1.crate \ - https://static.crates.io/crates/normpath/normpath-1.1.1.crate \ - https://static.crates.io/crates/nu-ansi-term/nu-ansi-term-0.49.0.crate \ - https://static.crates.io/crates/num-traits/num-traits-0.2.17.crate \ - https://static.crates.io/crates/once_cell/once_cell-1.18.0.crate \ - https://static.crates.io/crates/proc-macro-error-attr/proc-macro-error-attr-1.0.4.crate \ - https://static.crates.io/crates/proc-macro-error/proc-macro-error-1.0.4.crate \ - https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.69.crate \ - https://static.crates.io/crates/quote/quote-1.0.33.crate \ - https://static.crates.io/crates/redox_syscall/redox_syscall-0.3.5.crate \ + https://static.crates.io/crates/nix/nix-0.28.0.crate \ + https://static.crates.io/crates/normpath/normpath-1.2.0.crate \ + https://static.crates.io/crates/nu-ansi-term/nu-ansi-term-0.50.0.crate \ + https://static.crates.io/crates/num-traits/num-traits-0.2.19.crate \ + https://static.crates.io/crates/once_cell/once_cell-1.19.0.crate \ + https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.81.crate \ + https://static.crates.io/crates/quote/quote-1.0.36.crate \ https://static.crates.io/crates/redox_syscall/redox_syscall-0.4.1.crate \ - https://static.crates.io/crates/regex-automata/regex-automata-0.4.3.crate \ - https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \ - https://static.crates.io/crates/regex/regex-1.10.2.crate \ - https://static.crates.io/crates/rustix/rustix-0.38.21.crate \ + https://static.crates.io/crates/regex-automata/regex-automata-0.4.6.crate \ + https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.3.crate \ + https://static.crates.io/crates/regex/regex-1.10.4.crate \ + https://static.crates.io/crates/rustix/rustix-0.38.34.crate \ https://static.crates.io/crates/same-file/same-file-1.0.6.crate \ - https://static.crates.io/crates/scopeguard/scopeguard-1.2.0.crate \ - https://static.crates.io/crates/serde/serde-1.0.189.crate \ - https://static.crates.io/crates/serde_derive/serde_derive-1.0.189.crate \ - https://static.crates.io/crates/strsim/strsim-0.10.0.crate \ - https://static.crates.io/crates/syn/syn-1.0.109.crate \ - https://static.crates.io/crates/syn/syn-2.0.38.crate \ - https://static.crates.io/crates/tempfile/tempfile-3.8.1.crate \ + https://static.crates.io/crates/serde/serde-1.0.200.crate \ + https://static.crates.io/crates/serde_derive/serde_derive-1.0.200.crate \ + https://static.crates.io/crates/strsim/strsim-0.11.1.crate \ + https://static.crates.io/crates/syn/syn-2.0.60.crate \ + https://static.crates.io/crates/tempfile/tempfile-3.10.1.crate \ https://static.crates.io/crates/terminal_size/terminal_size-0.3.0.crate \ - https://static.crates.io/crates/test-case-core/test-case-core-3.2.1.crate \ - https://static.crates.io/crates/test-case-macros/test-case-macros-3.2.1.crate \ + https://static.crates.io/crates/test-case-core/test-case-core-3.3.1.crate \ + https://static.crates.io/crates/test-case-macros/test-case-macros-3.3.1.crate \ https://static.crates.io/crates/test-case/test-case-3.3.1.crate \ https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \ https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \ https://static.crates.io/crates/version_check/version_check-0.9.4.crate \ - https://static.crates.io/crates/walkdir/walkdir-2.4.0.crate \ - https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.87.crate \ - https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.87.crate \ - https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.87.crate \ - https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.87.crate \ - https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.87.crate \ + https://static.crates.io/crates/walkdir/walkdir-2.5.0.crate \ + https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.92.crate \ + https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.92.crate \ + https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.92.crate \ + https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.92.crate \ + https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.92.crate \ https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ - https://static.crates.io/crates/winapi-util/winapi-util-0.1.6.crate \ + https://static.crates.io/crates/winapi-util/winapi-util-0.1.8.crate \ https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ https://static.crates.io/crates/winapi/winapi-0.3.9.crate \ - https://static.crates.io/crates/windows-core/windows-core-0.51.1.crate \ + https://static.crates.io/crates/windows-core/windows-core-0.52.0.crate \ https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \ + https://static.crates.io/crates/windows-sys/windows-sys-0.52.0.crate \ https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \ + https://static.crates.io/crates/windows-targets/windows-targets-0.52.5.crate \ https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \ + https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.52.5.crate \ https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \ + https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.52.5.crate \ https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \ + https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.52.5.crate \ + https://static.crates.io/crates/windows_i686_gnullvm/windows_i686_gnullvm-0.52.5.crate \ https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \ + https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.52.5.crate \ https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \ + https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.52.5.crate \ https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \ - https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate" -MD5SUM="3ee72ca77c9a6b0ad108f48338206f05 \ - 95e5f8d0b7ab37171b8d3118542ba06a \ + https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.5.crate \ + https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \ + https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.5.crate" +MD5SUM="4f08f8538e208de1d6f2505b76168698 \ + 03b2d126766ed746706241b4c7487654 \ e0a03581a6aea080315323651f272d65 \ bf23cd323c33a8c283c41bb9b79e4ce4 \ - d18a8aaf56bfd7418a91540a0174402d \ - 316c95b1454a81db86a56d5af6734c94 \ - d2453c99c7af98286c2dc9017a8dba6d \ - b57fd47f132f32001e0d4bfc4621f1bf \ - b4f71ffecd3694a82ffb62c357d997a8 \ - 39a78bec5a0ae75f210c1f67250152b0 \ + 0d18959173d080ec965717de7f03c2ec \ + ba1d5bf0cf548d5d0114ec4bfb1dd138 \ + a688249621bfca8c4ad27908d5291a9e \ + cef83f13a54d5e9c22e468d266243ae3 \ + d48caa65882ee9fe77a1f4e3ac950bad \ + ef033cf0c03253e394475714883e1f8d \ 36efe34e07a8009f1965a786fab5aecb \ - 05d77ef52e90ad161fdd41b252420467 \ + 88a8c7336f056de768ee2966cefd8303 \ a295edb6953237ebbdfa8e731229f9a3 \ - ebcf604c44976809506192718f439dc1 \ - 58b04c69758e02189595f45cce636284 \ - d8cacbb844fca8c0ca102c7576946131 \ - 9241fa90ea8b17c00010be46c9aa1ac5 \ + f3406374808b01be3a263666aa9aa2f5 \ + db089af54479a055c39ca84bcf915f27 \ + a3c12a0b2ddb55ec1b245f9950e7bdf1 \ + c914fb05ca24569c0670e1d25d8cc455 \ 74634128440dbc3766bda76fdf0aaa05 \ - ddca5e4cff2fcc78d99a9efe991c5cf2 \ - b9fb1a6efa893a291dc40b8f67894047 \ - 7a5fbad4068946fdd6cf5020683d847c \ - 30e4024be60605f771fae98ebf38e441 \ - 08b9a34eadbb01ac16e36694e53eb254 \ - 8f177f61a37d63f805acb925b30a0e58 \ - 010f6d0e98cc2a2b99907a23c6cd6bbc \ - b477cc1c7b45e2187b3cad0377b504d8 \ - 87789a9723d81ff7d65a093a085617ae \ - fd98c74ef4f8e5abcd938173ae8e2ab5 \ - 9970b72159dfdaf0ebb3eab0edfd37a4 \ - f0c49a1a8cb131110f9f14f440bf872c \ - 70cadc77f99579272fbcbed7a6d3f31d \ + 126712a51ed2962e587048a634186390 \ + a84898c2e50fd6cfe7d068a1d6d4b5fe \ + ec573c80325dcb85a463103cf3878a73 \ + 6a7300e86333500f11f30e3e20e68808 \ + 4703ffb8b0409bcc4aff2642a748a9ce \ + 008b5f551130ca3eb7265bce27e0144b \ + f780b94573a4c3e9261b0ef07ace6529 \ + cc59747acec0a70d3cf7e121b19dd403 \ + d7624e4ff046ae83eda8e82d90887bdb \ + 86c345cb693c291362662b0eb437af89 \ + 396f4f63322338c26d76b2f638646178 \ + 44505199ec0964feb5488051b4ac92d5 \ + 398f4cce1d3067cc7a56662e52a33384 \ + 5777335209150ceb1dc2164612afe6da \ 434e2423f372fed80f69ed8873fdd2a3 \ - 616ae19b360c12012591da557ee83f41 \ + 349e0ae5420f0b7e6ff835cd03cc7428 \ f8bbc5e2d829e3a4cb40da5ef6dfcd72 \ d5e8b85429057df45d78e55cdc382369 \ - 80e1c1b89d858c93fc5946b4a8266504 \ - 412f39c3faf2efd34b5fe184e36ccc2f \ + b27485fa46bf04821c8c08402b708432 \ + bc4c2f203d616e83fae2c9648578c618 \ 423ea3c18df8759400c3d0a381738c64 \ - b92fa50f56a1e06a7f1bf665442d4a73 \ - 11681ec4554f1f934b25eeba3f558ea7 \ + ce5935e8063a452913a61e5405b33cb9 \ + d81f9251921f8a289dcf69fe4ccc3788 \ c01022fe0357c10ca1d48b16187f81bd \ 87b1b7cb12ef4dfe842c212b98263048 \ - ddb0ec63d657e9d1f95a314fdff0b260 \ - 5636b9a8ee575ef87589e449726a81e1 \ + 7810a6b901a77b30a16e7f123685e173 \ + b0e8879bc367bdad1fea51407ae22380 \ + ce2ecc3cf8d25a886a51fc7d66503a87 \ 8a1180efc4ebeaecbf8e8e094bcb2659 \ 77b8d4657c9c6ff1050c760a3c868a30 \ - d580c0380408c62e04e018eaaf4258af \ + c6be9100355c6e77cf37c76ade56baa4 \ fba3b040a55c01be7376d3dd5c4d4920 \ - 5a8dc4bf5c57a6487a7247a635347cc9 \ - 70bd18c57397442e0abc67dfa1c99e0f \ - 8ee79b4fe4c43d9ab09f16344612a656 \ - 1e48dcc194400e8d3cb7c69a5b2056cd \ - ab9a5f02cef3b8794d810332ebf26a03 \ - fb6241893b457ed69fae5c1ae19920da \ + 0bc840b564ce2b698189d5b204538624 \ + f2d8f01a4e5c5236ab55240d09c6e82f \ + 5a376ab3f01ed9e90e8d71e1d5fa6ae7 \ + c168cad864faee840f6cead38168fd8c \ + e90235c862e9e1fabe9f569bcfbd9692 \ 6a307d628f32a1522f0791053b546136 \ - 81fab2fb761d130825cdba5fed59b10b \ - 8d526535233ee01e0f1402b5e8f4e8e9 \ - 8be1ace0f1c199d5cd5656f4d1cf8fcb \ - 512bcd4470f351b2049adeb39cfcdec4 \ - 2dc8aacabbc090f8025a4789d4d6d8f0 \ - 7d76a523677de261dda1b65d29a93c4e \ - 6a32bab57772c3a1146d599b65ffb0cb \ - 41bd794efd88a8bcac5ddb16ee6e208f \ - 0ddb8bccd3198892d0dd0ec7151f7cd3 \ - 782ea88d8e5b517b1c9e7d870e20e9e3 \ + fef6cd95c83025d64b8cb50171a4bb74 \ + e6e0e961c6fc0e678ec6ea74d5461f18 \ + 8e7344ce7547f0710435efa5295975b3 \ + e092b3abcc54806f2a35889d725bf95f \ + 8390247ae7126c00e162732b249be9d7 \ + 11d049cc954c7a9744b9fa85d9596b0c \ + 7267e731f46f52edb7b5304b60982cf4 \ ff1d093069cfc9eb161907e17a51208b \ - 4f496143a21775fa7bd22bf329c37f37 \ - 91b60a71d44302a8b05bd398eca56c37 \ - e90f2809a34e2bea0bd5c1120475fb36 \ - 3bd91868192fbb6c457c856a1a430a3d \ + 520b920d0c711ec1a17fb19a6060446a \ + 5ff02ce05f7f204690c26cb20f3cf2d0 \ + e19600513eaf0823f25a621088b44d2c \ + b815e6cf70bcc3512ffbef7f6dea8c5f \ 2d8d8b377d144f5e32b4f65a69eb0b24 \ - f1358be8c98b98837cbd2cf51e75f8b3 \ - 594029ccf41cf6d592619865d06b5c38 \ - bfeacff2ad5324a6e2fda84277824a8b \ - 82d98dc87dc8503400aa095f5aa70f13 \ - 64d9f46e9ba78f68c30c486be3d8b7df \ - 799247562dd69b3b5f4d73f91095dfab \ - f80faded72df19d43134e2b44137376a \ + 9b1baf93cc8caada556e1c45a6f013e0 \ + ff73672601880795d1c901014787924f \ + fbe5da24bd1beef6125107ee41118187 \ + 5f38b77f4cd61a26d90079aaf5ad2257 \ + 449c7bb37fc298d2026fbf2855eb8db0 \ b7eae58d7a80112442643ee2ff481ef7 \ - e7e2681eb16e207f3a89073468ad7c53 \ - df6c5492cbd828679a5fcc1e08f16b2d \ + 4461c602c17462c2293009d4c9e40589 \ + e32faa2eff402ef64b4f387261ece3d4 \ 5832db8037979e44555cd71f8781639e \ ca65153603a1a7240bbd9d2ce19f2d67 \ ceee1159c41351d05f4cf705490867b3 \ d18d362345c4fe512ef67b738b239fb8 \ - 96481ed810273371ed8b87f062a0dcda \ - e1aaf0d487ef02def77307a74ee35606 \ - b3139f7d066250bfaf96b99e913ee75d \ - e41541041285d9f05d372cdac02a4bf7 \ - 4185de0682e5e5f3a9f13285218e59aa \ - 64f9f5c520b25087ba70e4194d6aea9c \ + f38b27b8c9625110a51293658f1cc014 \ + 1aa786b0f998b9d0440c2a03b133e991 \ + 651897c3311b074247a1b351bf85b4ff \ + 8b3da5691ef460f035d90f16d3a0bebd \ + 4abb118b896b90518fc32602088933be \ + dca59f56e652d010c754d42df104cd22 \ db96b50050277bf05a3c68534bbb9586 \ - 306c0281447d1876e8220007b7a7e053 \ + dbdd24e240e42c6852910e7504285712 \ 09de9d01e7331ff3da11f58be8bef0df \ 0498c4a11448bfc35dc7bb2caa64c753 \ - d343f3cc25259c518e594b7bcd4f144b \ + 6fea8456dac26da1a185af6b0318dce1 \ f2797ade0e36f1e5d6be9d11b5076582 \ + 2376de634160158ece40c4bc2ab3eb41 \ 24c64817e85ef77765ed0f26c31c9b4c \ + 940f8708332e8e3720266a7bce4d761d \ dae6d89034a6988042fd8be4cf5e037d \ + 967cf93762a3bc25e18d0b8b7e811b84 \ de2839e16d9d7a9fd1c397da62f62b4a \ + 0bc2062598ed9d8ed536e27fddd81ce7 \ e0c35ffb8cfdb74a39bf799811f79304 \ + a35e6187f2f41e601cf885c279ebb43e \ + 183b6a856fadbc8f21a6c53ca81155c9 \ d990172b607020701f9e84ca8e1c043c \ + cc1f120172ea435e8ac1e813435bc630 \ 0a68848588e847ceccf504891584d00b \ + 1dbfec917710e57b574e92effa934924 \ 45b469ad607b912256b7c80141fa2d17 \ - 7799baff9a5664205d9110a2624e8989" + 3817cf594b24311c4ea944398a58a48d \ + 7799baff9a5664205d9110a2624e8989 \ + 7cc8e977768423992930663aadcc43dd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="rust16" diff --git a/system/fnt/fnt.SlackBuild b/system/fnt/fnt.SlackBuild index 8e7f07ae68..501874d719 100644 --- a/system/fnt/fnt.SlackBuild +++ b/system/fnt/fnt.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fnt -VERSION=${VERSION:-1.5} +VERSION=${VERSION:-1.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/fnt/fnt.info b/system/fnt/fnt.info index 95b799b80c..12b201d68d 100644 --- a/system/fnt/fnt.info +++ b/system/fnt/fnt.info @@ -1,8 +1,8 @@ PRGNAM="fnt" -VERSION="1.5" +VERSION="1.6" HOMEPAGE="https://github.com/alexmyczko/fnt" -DOWNLOAD="https://github.com/alexmyczko/fnt/archive/1.5/fnt-1.5.tar.gz" -MD5SUM="e2d25c7845bc2617f618a0701f7ceabe" +DOWNLOAD="https://github.com/alexmyczko/fnt/archive/1.6/fnt-1.6.tar.gz" +MD5SUM="f52306f5968e8930afd99a4542196170" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="chafa lcdf-typetools" diff --git a/system/fnt/makefile.patch b/system/fnt/makefile.patch index cbfac98aeb..abdbb87e1b 100644 --- a/system/fnt/makefile.patch +++ b/system/fnt/makefile.patch @@ -1,11 +1,11 @@ ---- makefile 2023-08-22 18:06:03.000000000 +0530 -+++ makefile1 2024-02-05 18:00:30.130997385 +0530 +--- makefile 2024-03-27 01:02:16.000000000 +0530 ++++ makefile1 2024-04-22 18:24:26.887740205 +0530 @@ -1,6 +1,6 @@ BINDIR=/usr/bin -MANDIR=/usr/share/man -ZCOMPDIR=/usr/local/share/zsh/site-functions +MANDIR=/usr/man +ZCOMPDIR=/usr/share/zsh/site-functions - VERSION=1.3 + VERSION=1.5 all: diff --git a/system/fwupd/doinst.sh b/system/fwupd/doinst.sh index 489536e95b..75c960ecd9 100644 --- a/system/fwupd/doinst.sh +++ b/system/fwupd/doinst.sh @@ -9,11 +9,9 @@ config() { } config etc/fwupd/fwupd.conf.new -config etc/fwupd/remotes.d/fwupd-tests.conf.new config etc/fwupd/remotes.d/lvfs-testing.conf.new config etc/fwupd/remotes.d/lvfs.conf.new config etc/fwupd/remotes.d/vendor-directory.conf.new -config etc/fwupd/remotes.d/vendor.conf.new config etc/grub.d/35_fwupd.new if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then diff --git a/system/fwupd/fwupd.SlackBuild b/system/fwupd/fwupd.SlackBuild index 7d8312a4db..b69daad80d 100644 --- a/system/fwupd/fwupd.SlackBuild +++ b/system/fwupd/fwupd.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fwupd -VERSION=${VERSION:-1.9.12} +VERSION=${VERSION:-1.9.19} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -126,11 +126,9 @@ mv $PKG/usr/bin/{,fwupd-}dbxtool mv $PKG/usr/man/man1/{,fwupd-}dbxtool.1.gz mv $PKG/etc/fwupd/fwupd.conf $PKG/etc/fwupd/fwupd.conf.new -mv $PKG/etc/fwupd/remotes.d/fwupd-tests.conf $PKG/etc/fwupd/remotes.d/fwupd-tests.conf.new -mv $PKG/etc/fwupd/remotes.d/lvfs-testing.conf $PKG/etc/fwupd/remotes.d/lvfs-testing.conf.new mv $PKG/etc/fwupd/remotes.d/lvfs.conf $PKG/etc/fwupd/remotes.d/lvfs.conf.new +mv $PKG/etc/fwupd/remotes.d/lvfs-testing.conf $PKG/etc/fwupd/remotes.d/lvfs-testing.conf.new mv $PKG/etc/fwupd/remotes.d/vendor-directory.conf $PKG/etc/fwupd/remotes.d/vendor-directory.conf.new -mv $PKG/etc/fwupd/remotes.d/vendor.conf $PKG/etc/fwupd/remotes.d/vendor.conf.new mv $PKG/etc/grub.d/35_fwupd $PKG/etc/grub.d/35_fwupd.new rm -rf $PKG/usr/share/installed-tests diff --git a/system/fwupd/fwupd.info b/system/fwupd/fwupd.info index 582d503eed..d6d4041f9c 100644 --- a/system/fwupd/fwupd.info +++ b/system/fwupd/fwupd.info @@ -1,8 +1,8 @@ PRGNAM="fwupd" -VERSION="1.9.12" +VERSION="1.9.19" HOMEPAGE="https://www.fwupd.org" -DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.9.12/fwupd-1.9.12.tar.gz" -MD5SUM="37ed2352146d1caf78f9c453b1b905ac" +DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.9.19/fwupd-1.9.19.tar.gz" +MD5SUM="050c5fbbb50ee9bb10914bf19348161c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gcab libjcat libxmlb libgusb libsmbios pefile protobuf-c python3-toml python3-meson-opt python3-typogrify" diff --git a/system/fzf/fzf.SlackBuild b/system/fzf/fzf.SlackBuild index 82af663b0f..b207e0740d 100644 --- a/system/fzf/fzf.SlackBuild +++ b/system/fzf/fzf.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fzf -VERSION=${VERSION:-0.49.0} +VERSION=${VERSION:-0.52.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -82,8 +82,8 @@ done mkdir -p vendor/golang.org/x for DEPENDENCY in sync/0.5.0 \ - sys/0.18.0 \ - term/0.18.0 \ + sys/0.20.0 \ + term/0.20.0 \ text/0.14.0 ; do DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f1)" DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f2)" @@ -103,7 +103,6 @@ github.com/gdamore/encoding # github.com/gdamore/tcell/v2 v2.7.4 ## explicit; go 1.12 github.com/gdamore/tcell/v2 -github.com/gdamore/tcell/v2/encoding github.com/gdamore/tcell/v2/terminfo github.com/gdamore/tcell/v2/terminfo/a/aixterm github.com/gdamore/tcell/v2/terminfo/a/alacritty @@ -155,24 +154,18 @@ github.com/mattn/go-shellwords # github.com/rivo/uniseg v0.4.7 ## explicit; go 1.18 github.com/rivo/uniseg -# golang.org/x/sys v0.18.0 +# golang.org/x/sys v0.20.0 ## explicit; go 1.18 golang.org/x/sys/plan9 golang.org/x/sys/unix golang.org/x/sys/windows -# golang.org/x/term v0.18.0 +# golang.org/x/term v0.20.0 ## explicit; go 1.18 golang.org/x/term # golang.org/x/text v0.14.0 ## explicit; go 1.18 golang.org/x/text/encoding -golang.org/x/text/encoding/charmap -golang.org/x/text/encoding/internal golang.org/x/text/encoding/internal/identifier -golang.org/x/text/encoding/japanese -golang.org/x/text/encoding/korean -golang.org/x/text/encoding/simplifiedchinese -golang.org/x/text/encoding/traditionalchinese golang.org/x/text/transform EOF diff --git a/system/fzf/fzf.info b/system/fzf/fzf.info index 0ab652eb52..da0c38d8e7 100644 --- a/system/fzf/fzf.info +++ b/system/fzf/fzf.info @@ -1,7 +1,7 @@ PRGNAM="fzf" -VERSION="0.49.0" +VERSION="0.52.0" HOMEPAGE="https://github.com/junegunn/fzf" -DOWNLOAD="https://github.com/junegunn/fzf/archive/0.49.0/fzf-0.49.0.tar.gz \ +DOWNLOAD="https://github.com/junegunn/fzf/archive/0.52.0/fzf-0.52.0.tar.gz \ https://github.com/charlievieth/fastwalk/archive/v1.0.3/fastwalk-1.0.3.tar.gz \ https://github.com/gdamore/encoding/archive/v1.0.0/encoding-1.0.0.tar.gz \ https://github.com/gdamore/tcell/archive/v2.7.4/tcell-2.7.4.tar.gz \ @@ -11,10 +11,10 @@ DOWNLOAD="https://github.com/junegunn/fzf/archive/0.49.0/fzf-0.49.0.tar.gz \ https://github.com/mattn/go-shellwords/archive/v1.0.12/go-shellwords-1.0.12.tar.gz \ https://github.com/rivo/uniseg/archive/v0.4.7/uniseg-0.4.7.tar.gz \ https://github.com/golang/sync/archive/v0.5.0/sync-0.5.0.tar.gz \ - https://github.com/golang/sys/archive/v0.18.0/sys-0.18.0.tar.gz \ - https://github.com/golang/term/archive/v0.18.0/term-0.18.0.tar.gz \ + https://github.com/golang/sys/archive/v0.20.0/sys-0.20.0.tar.gz \ + https://github.com/golang/term/archive/v0.20.0/term-0.20.0.tar.gz \ https://github.com/golang/text/archive/v0.14.0/text-0.14.0.tar.gz" -MD5SUM="ae80282d8f779c58782b89eb06599306 \ +MD5SUM="4096cfaf447b597623f95ac250c805ad \ ab5a2274c5ccac2d968e768ac2415209 \ fbadc383bc1ace79fa769fe2de36b87b \ a03c6d4612a12e949e05ea7d67624142 \ @@ -24,8 +24,8 @@ MD5SUM="ae80282d8f779c58782b89eb06599306 \ 71a4ecaadfb90ffccb392799a2f00743 \ 3751c82dd342cd5823703910b9da173d \ a8371f5f0569f41210ca8a3f30e445c6 \ - e00453d8847cde61907bcbee219c44bb \ - 8f5afb0df38c6eb06f51f483e30eddba \ + 7b645e9b79a0c60a4272df2e6cc9a5f3 \ + ea5c6fd60dc50377829905f270a68ca1 \ 9f64144d4b1647ce4597abf657028a8d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/gnome-vfs/gnome-vfs.SlackBuild b/system/gnome-vfs/gnome-vfs.SlackBuild index c30e90ed9b..2f145faf48 100644 --- a/system/gnome-vfs/gnome-vfs.SlackBuild +++ b/system/gnome-vfs/gnome-vfs.SlackBuild @@ -79,7 +79,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p0 < $CWD/openssl-1.1.patch +for i in $CWD/patches/* ; do patch -p1 < $i ; done # Fix for the newer glib sed -i "/-DG_DISABLE_DEPRECATED/d" */Makefile.* diff --git a/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch b/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch new file mode 100644 index 0000000000..438a89de6e --- /dev/null +++ b/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch @@ -0,0 +1,20 @@ +--- gnome-vfs-2.8.2/schemas/desktop_gnome_url_handlers.schemas.in.browser_default 2004-10-18 21:38:08.605885937 -0400 ++++ gnome-vfs-2.8.2/schemas/desktop_gnome_url_handlers.schemas.in 2004-10-18 21:38:20.470253994 -0400 +@@ -153,7 +153,7 @@ + <applyto>/desktop/gnome/url-handlers/http/command</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>epiphany %s</default> ++ <default>gio open %s</default> + <locale name="C"> + <short>The handler for "http" URLs</short> + <long>The command used to handle "http" URLs, if enabled.</long> +@@ -187,7 +187,7 @@ + <applyto>/desktop/gnome/url-handlers/https/command</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>epiphany %s</default> ++ <default>gio open %s</default> + <locale name="C"> + <short>The handler for "https" URLs</short> + <long>The command used to handle "https" URLs, if enabled.</long> diff --git a/system/gnome-vfs/patches/gnome-vfs2-c99.patch b/system/gnome-vfs/patches/gnome-vfs2-c99.patch new file mode 100644 index 0000000000..a8b9b5d416 --- /dev/null +++ b/system/gnome-vfs/patches/gnome-vfs2-c99.patch @@ -0,0 +1,16 @@ +Include <glib/gprintf.h> for the g_printf function. This avoids an +implicit function declaration and build failures with future +compilers. + +diff --git a/test/test-async-directory.c b/test/test-async-directory.c +index 2698d8e6e41f9ead..8d7e0f320edbb5fc 100644 +--- a/test/test-async-directory.c ++++ b/test/test-async-directory.c +@@ -24,6 +24,7 @@ + #include <config.h> + + #include <glib.h> ++#include <glib/gprintf.h> + #include <libgnomevfs/gnome-vfs-async-ops.h> + #include <libgnomevfs/gnome-vfs-init.h> + #include <stdio.h> diff --git a/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch b/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch new file mode 100644 index 0000000000..829c31f0c6 --- /dev/null +++ b/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch @@ -0,0 +1,21 @@ +Avoid an implicit int and an implicit declaration of exit. This +prevents build failures with future compilers. + +diff --git a/configure.in b/configure.in +index 1a0ad1be03f9f9fe..011c1d919885536a 100644 +--- a/configure.in ++++ b/configure.in +@@ -366,11 +366,11 @@ AC_TRY_RUN([ + + struct linger li; + +-main () ++int main (void) + { + li.l_onoff = 1; + li.l_linger = 120; +- exit (0); ++ return 0; + } + ],[ + AC_DEFINE(HAVE_STRUCT_LINGER, 1, [Define to 1 if struct linger is available]) diff --git a/system/gnome-vfs/openssl-1.1.patch b/system/gnome-vfs/patches/openssl-1.1.patch index 14207f28d1..3ed1d5edad 100644 --- a/system/gnome-vfs/openssl-1.1.patch +++ b/system/gnome-vfs/patches/openssl-1.1.patch @@ -4,8 +4,8 @@ struct SSL is opaque in openssl-1.1; and the SSL_free() man page says that one should not free members of it manually (in both the openssl-1.0 and openssl-1.1 man pages). ---- libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000 -+++ libgnomevfs/gnome-vfs-ssl.c +--- ./libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000 ++++ ./libgnomevfs/gnome-vfs-ssl.c @@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS } } diff --git a/system/greetd/greetd.SlackBuild b/system/greetd/greetd.SlackBuild index 6930e89311..611b57090d 100644 --- a/system/greetd/greetd.SlackBuild +++ b/system/greetd/greetd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=greetd PRGUID=greeter PRGGID=greeter -VERSION=${VERSION:-0.9.0} +VERSION=${VERSION:-0.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/greetd/greetd.info b/system/greetd/greetd.info index d666978424..07cbb542b6 100644 --- a/system/greetd/greetd.info +++ b/system/greetd/greetd.info @@ -1,102 +1,128 @@ PRGNAM="greetd" -VERSION="0.9.0" +VERSION="0.10.0" HOMEPAGE="https://git.sr.ht/~kennylevinsen/greetd" -DOWNLOAD="https://static.crates.io/crates/async-trait/async-trait-0.1.60.crate \ - https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \ - https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \ - https://static.crates.io/crates/bytes/bytes-1.3.0.crate \ +DOWNLOAD="https://github.com/kennylevinsen/greetd/archive/0.10.0/greetd-0.10.0.tar.gz \ + https://static.crates.io/crates/addr2line/addr2line-0.21.0.crate \ + https://static.crates.io/crates/adler/adler-1.0.2.crate \ + https://static.crates.io/crates/async-trait/async-trait-0.1.80.crate \ + https://static.crates.io/crates/backtrace/backtrace-0.3.71.crate \ + https://static.crates.io/crates/bitflags/bitflags-2.5.0.crate \ + https://static.crates.io/crates/bytes/bytes-1.6.0.crate \ + https://static.crates.io/crates/cc/cc-1.0.95.crate \ https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \ https://static.crates.io/crates/enquote/enquote-1.1.0.crate \ https://static.crates.io/crates/getopts/getopts-0.2.21.crate \ - https://static.crates.io/crates/itoa/itoa-1.0.5.crate \ - https://static.crates.io/crates/libc/libc-0.2.139.crate \ - https://static.crates.io/crates/log/log-0.4.17.crate \ - https://static.crates.io/crates/memchr/memchr-2.5.0.crate \ - https://static.crates.io/crates/memoffset/memoffset-0.7.1.crate \ - https://static.crates.io/crates/mio/mio-0.8.5.crate \ - https://static.crates.io/crates/nix/nix-0.26.1.crate \ + https://static.crates.io/crates/gimli/gimli-0.28.1.crate \ + https://static.crates.io/crates/itoa/itoa-1.0.11.crate \ + https://static.crates.io/crates/libc/libc-0.2.153.crate \ + https://static.crates.io/crates/memchr/memchr-2.7.2.crate \ + https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.2.crate \ + https://static.crates.io/crates/mio/mio-0.8.11.crate \ + https://static.crates.io/crates/nix/nix-0.27.1.crate \ + https://static.crates.io/crates/object/object-0.32.2.crate \ https://static.crates.io/crates/pam-sys/pam-sys-0.5.6.crate \ - https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.9.crate \ - https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \ - https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.49.crate \ - https://static.crates.io/crates/quote/quote-1.0.23.crate \ + https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.14.crate \ + https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.81.crate \ + https://static.crates.io/crates/quote/quote-1.0.36.crate \ https://static.crates.io/crates/rpassword/rpassword-5.0.1.crate \ - https://static.crates.io/crates/ryu/ryu-1.0.12.crate \ - https://static.crates.io/crates/serde/serde-1.0.152.crate \ - https://static.crates.io/crates/serde_derive/serde_derive-1.0.152.crate \ - https://static.crates.io/crates/serde_json/serde_json-1.0.91.crate \ - https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.0.crate \ - https://static.crates.io/crates/socket2/socket2-0.4.7.crate \ - https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate \ - https://static.crates.io/crates/syn/syn-1.0.107.crate \ - https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.38.crate \ - https://static.crates.io/crates/thiserror/thiserror-1.0.38.crate \ - https://static.crates.io/crates/tokio-macros/tokio-macros-1.8.2.crate \ - https://static.crates.io/crates/tokio/tokio-1.24.0.crate \ - https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.6.crate \ - https://static.crates.io/crates/unicode-width/unicode-width-0.1.10.crate \ - https://static.crates.io/crates/users/users-0.11.0.crate \ + https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.23.crate \ + https://static.crates.io/crates/ryu/ryu-1.0.17.crate \ + https://static.crates.io/crates/serde/serde-1.0.198.crate \ + https://static.crates.io/crates/serde_derive/serde_derive-1.0.198.crate \ + https://static.crates.io/crates/serde_json/serde_json-1.0.116.crate \ + https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.1.crate \ + https://static.crates.io/crates/socket2/socket2-0.5.6.crate \ + https://static.crates.io/crates/syn/syn-2.0.60.crate \ + https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.58.crate \ + https://static.crates.io/crates/thiserror/thiserror-1.0.58.crate \ + https://static.crates.io/crates/tokio-macros/tokio-macros-2.2.0.crate \ + https://static.crates.io/crates/tokio/tokio-1.37.0.crate \ + https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \ + https://static.crates.io/crates/unicode-width/unicode-width-0.1.11.crate \ https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \ https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ https://static.crates.io/crates/winapi/winapi-0.3.9.crate \ - https://static.crates.io/crates/windows-sys/windows-sys-0.42.0.crate \ - https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.42.0.crate \ - https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.42.0.crate \ - https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.42.0.crate \ - https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.42.0.crate \ - https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.42.0.crate \ - https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.42.0.crate \ - https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.42.0.crate \ - https://github.com/kennylevinsen/greetd/archive/0.9.0/greetd-0.9.0.tar.gz" -MD5SUM="fdfbe819b079678795b1ee1e1c61b9cb \ - 05d77ef52e90ad161fdd41b252420467 \ - a295edb6953237ebbdfa8e731229f9a3 \ - 4dfac92ee6bdeb44117342cb203dd36c \ + https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \ + https://static.crates.io/crates/windows-sys/windows-sys-0.52.0.crate \ + https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \ + https://static.crates.io/crates/windows-targets/windows-targets-0.52.5.crate \ + https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \ + https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.52.5.crate \ + https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \ + https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.52.5.crate \ + https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \ + https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.52.5.crate \ + https://static.crates.io/crates/windows_i686_gnullvm/windows_i686_gnullvm-0.52.5.crate \ + https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \ + https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.52.5.crate \ + https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \ + https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.52.5.crate \ + https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \ + https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.5.crate \ + https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \ + https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.5.crate" +MD5SUM="c7caa14a01035f4d80444e8ce4359ee2 \ + 55e15000c4c210f0bb2aca6f38fbe424 \ + 669215548c64019c08c92b2c1afd3deb \ + 1b41868d6e1277abee3b6c84a7b7ff83 \ + cacc6bd5d3b1a38d103a212e0dbaebcc \ + f3406374808b01be3a263666aa9aa2f5 \ + 722cab9ebe9eb019d5c3b400325de876 \ + 63fe036b9d15f66507b3d9a374b65916 \ 74634128440dbc3766bda76fdf0aaa05 \ 14be1ab75b7fa1711d7c81313f15ea4d \ c3ec5977ecc0f6244ef3be87f5325e72 \ - f2ffcbe94a83f2437ffe47d7dbf4ad04 \ - 2f4991ee29e75b732dbfbbe637506066 \ - b31bf94ffe7e0f2ada93afae1076eaeb \ - 94b8bf179385ff071bdc33b58bf047c0 \ - 48e7cc866f45af55ea3f627e29a2cd98 \ - a8a1c536701e539cdce215fd7f55de9f \ - 5574bd0280c1d59555909f6b598ced79 \ + fbc6f6d82084b19c006198508b1ac489 \ + 5d87e8530342ef2a980b1c96dafd27f0 \ + 49d77531898b3d7846b149c0fb4788c4 \ + e90235c862e9e1fabe9f569bcfbd9692 \ + 86aa81f2561682f16c0be376294bf9d3 \ + 13f47025d308bc16d26a9bc3334f3bbe \ + 81fab2fb761d130825cdba5fed59b10b \ + 0d98aaf27d3cace75f9959c04b910891 \ 1a61e05436ba382ed378ec9cf100fea2 \ - ce6dde2ea2691fdd97632fb8c9b3e042 \ - 07c75fec267864bcbb800ca7709ceae2 \ - e6bfe297f458a83f516e46e9b0ba07b4 \ - 41defdffa40e7cbcc7e17a933c5660ab \ + a9a6ce6cd4b12f9c4f6840df87d5da0d \ + 11d049cc954c7a9744b9fa85d9596b0c \ + 7267e731f46f52edb7b5304b60982cf4 \ 1e585d25db7b5bb009b060befc74e9fe \ - 4ca29f2ce41fb9f282c527c1d8ae5cc4 \ - 2d82330c9f218f42ccc9e44c2d18ff8f \ - 3338953ce1388e5ff5fef5aac76ab1f5 \ - 4da6e91a5a30bc8163694b0809798d0e \ - 21b43d5721b3a9c16059acb691f4314d \ - 362eebacce3b2c9204fdef6d1c04d757 \ - c9defe80406280bcfce4ecf31c0200b3 \ - 8efa8e23cddda0540efe4ba8ff60840b \ - 44e45d4d9b0904fd06d6f46107eda592 \ - 3d2277774414ad0f59584e7021b9be06 \ - d6f24a12196b2e717d4fd869f3410e7f \ - 6cdee292cf5bfd88a1608ebe48e3cab7 \ - e522898b2cb1fd23af2695324b3a5c78 \ - 7d6d4fc9fad200d6e295f6930e97e022 \ - d4c929fc9daf131daef04ee7eaa91fd4 \ + 24fcbc2986fad09b25c9a4f9aef0a9e4 \ + feefd8369d6dd6a0f269bbed1b921349 \ + c87a7eb9d5acaa5a380ec5cdc0b3ec7e \ + 6bfc46c5bc79cd99e55253ae77195967 \ + ecf1e501541e064d3e96172bd0f3c709 \ + 22e95901b912671da26457ac33e36a23 \ + e0a2eb3573e89a1462cb180fd0a326cd \ + 5f38b77f4cd61a26d90079aaf5ad2257 \ + 361668f9f11e4f0eba45f70c24fa8614 \ + f443b2cca547d22f994c2dd99a6e5581 \ + 7d6059d699479e0b6a99ce0281522217 \ + bf33e2d27126b29c8a9b1239c688a424 \ + ca65153603a1a7240bbd9d2ce19f2d67 \ + 908ec8a89821b72f3a35726bab24461f \ e972ea58ec203bfa6c79c1207852298b \ + 0498c4a11448bfc35dc7bb2caa64c753 \ db96b50050277bf05a3c68534bbb9586 \ 09de9d01e7331ff3da11f58be8bef0df \ - 0498c4a11448bfc35dc7bb2caa64c753 \ - 110789f2dd21a2ea820ebed976b4b1c2 \ - 86854324255f07e8f64cc11ef8be3b3c \ - 510f0324dbaea90d9d3ca2eea5e71a04 \ - 38cf2b9fa16048f19e0d3b2d73479e50 \ - c373eadcbc79dfc0b580d12851add17d \ - f41cbc66ecf1f5006d0f0a7df2726c73 \ - b04135c0705b10e9866585e1d75e68a3 \ - 404688aa3e82019927df8a16c7d258d1 \ - af714594386b3e648f20d6d923d2357d" + f2797ade0e36f1e5d6be9d11b5076582 \ + 2376de634160158ece40c4bc2ab3eb41 \ + 24c64817e85ef77765ed0f26c31c9b4c \ + 940f8708332e8e3720266a7bce4d761d \ + dae6d89034a6988042fd8be4cf5e037d \ + 967cf93762a3bc25e18d0b8b7e811b84 \ + de2839e16d9d7a9fd1c397da62f62b4a \ + 0bc2062598ed9d8ed536e27fddd81ce7 \ + e0c35ffb8cfdb74a39bf799811f79304 \ + a35e6187f2f41e601cf885c279ebb43e \ + 183b6a856fadbc8f21a6c53ca81155c9 \ + d990172b607020701f9e84ca8e1c043c \ + cc1f120172ea435e8ac1e813435bc630 \ + 0a68848588e847ceccf504891584d00b \ + 1dbfec917710e57b574e92effa934924 \ + 45b469ad607b912256b7c80141fa2d17 \ + 3817cf594b24311c4ea944398a58a48d \ + 7799baff9a5664205d9110a2624e8989 \ + 7cc8e977768423992930663aadcc43dd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtk-layer-shell rust16 scdoc" diff --git a/system/heirloom-sh/heirloom-sh-glibc-2.34.patch b/system/heirloom-sh/heirloom-sh-glibc-2.34.patch new file mode 100644 index 0000000000..35cb565526 --- /dev/null +++ b/system/heirloom-sh/heirloom-sh-glibc-2.34.patch @@ -0,0 +1,18 @@ +--- a/fault.c ++++ b/fault.c +@@ -43,6 +43,15 @@ + #include <errno.h> + #include <string.h> + ++#if __GLIBC__ >= 2 ++# undef SIGSTKSZ ++# if defined __ia64__ ++# define SIGSTKSZ 262144 ++# else ++# define SIGSTKSZ 65536 ++# endif ++#endif ++ + static void (*psig0_func)() = SIG_ERR; /* previous signal handler for signal 0 */ + static char sigsegv_stack[SIGSTKSZ]; + diff --git a/system/heirloom-sh/heirloom-sh.SlackBuild b/system/heirloom-sh/heirloom-sh.SlackBuild index b805981e57..ce9edf218e 100644 --- a/system/heirloom-sh/heirloom-sh.SlackBuild +++ b/system/heirloom-sh/heirloom-sh.SlackBuild @@ -61,6 +61,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/heirloom-sh-glibc-2.34.patch + # configure is the worst way to build a package except for all the others # 1. make static changes to the makefile with a patch patch -p1 < $CWD/makefile.patch diff --git a/system/inotify-info/inotify-info.SlackBuild b/system/inotify-info/inotify-info.SlackBuild index 35417bf478..5de56ed254 100644 --- a/system/inotify-info/inotify-info.SlackBuild +++ b/system/inotify-info/inotify-info.SlackBuild @@ -25,8 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=inotify-info -VERSION=${VERSION:-20230226_8add69e} -COMMIT=${COMMIT:-8add69efcfc702322819321387bae9043d7d4b59} +VERSION=${VERSION:-0.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -53,16 +52,12 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e @@ -70,9 +65,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$COMMIT -tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz -cd $PRGNAM-$COMMIT +rm -rf $PRGNAM-v$VERSION +tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz +cd $PRGNAM-v$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/system/inotify-info/inotify-info.info b/system/inotify-info/inotify-info.info index 4f5ac61bf0..3107d693ed 100644 --- a/system/inotify-info/inotify-info.info +++ b/system/inotify-info/inotify-info.info @@ -1,8 +1,8 @@ PRGNAM="inotify-info" -VERSION="20230226_8add69e" +VERSION="0.0.1" HOMEPAGE="https://github.com/mikesart/inotify-info" -DOWNLOAD="https://github.com/mikesart/inotify-info/archive/8add69e/inotify-info-8add69efcfc702322819321387bae9043d7d4b59.tar.gz" -MD5SUM="a800f3eaaec2ef5812a3c20ccee3244c" +DOWNLOAD="https://github.com/mikesart/inotify-info/releases/download/v0.0.1/inotify-info-v0.0.1.tar.gz" +MD5SUM="e63e740fc3fcf91c03bbcbc5045937b3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/intel-microcode/intel-microcode.SlackBuild b/system/intel-microcode/intel-microcode.SlackBuild index 7a559f3cb3..baacfcd19f 100644 --- a/system/intel-microcode/intel-microcode.SlackBuild +++ b/system/intel-microcode/intel-microcode.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for intel-microcode -# Copyright 2023 Andrzej Telszewski, Koszalin +# Copyright 2024 Andrzej Telszewski, Koszalin # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=intel-microcode SRCNAM=Intel-Linux-Processor-Microcode-Data-Files-microcode -VERSION=${VERSION:-20231114} +VERSION=${VERSION:-20240514} SRCVER=$(printf "%s" "${VERSION}" | tr _ -) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/intel-microcode/intel-microcode.info b/system/intel-microcode/intel-microcode.info index ae14367a08..dacccca07f 100644 --- a/system/intel-microcode/intel-microcode.info +++ b/system/intel-microcode/intel-microcode.info @@ -1,8 +1,8 @@ PRGNAM="intel-microcode" -VERSION="20231114" +VERSION="20240514" HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files" -DOWNLOAD="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20231114/Intel-Linux-Processor-Microcode-Data-Files-microcode-20231114.tar.gz" -MD5SUM="1648cf08cb7176db32aff82889e5cb1d" +DOWNLOAD="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20240514/Intel-Linux-Processor-Microcode-Data-Files-microcode-20240514.tar.gz" +MD5SUM="0cebf1e441f98ba590f10b5b7e4c0c58" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="iucode_tool" diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild index 0475d03e96..2f7f4518ba 100644 --- a/system/jenkins/jenkins.SlackBuild +++ b/system/jenkins/jenkins.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jenkins -VERSION=${VERSION:-2.440.3} +VERSION=${VERSION:-2.452.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/jenkins/jenkins.info b/system/jenkins/jenkins.info index 7ecbae78fe..04ea30e7be 100644 --- a/system/jenkins/jenkins.info +++ b/system/jenkins/jenkins.info @@ -1,8 +1,8 @@ PRGNAM="jenkins" -VERSION="2.440.3" +VERSION="2.452.1" HOMEPAGE="https://www.jenkins.io/" -DOWNLOAD="https://get.jenkins.io/war-stable/2.440.3/jenkins.war" -MD5SUM="c381bfdfb6d30ddd6e5aedc669d14764" +DOWNLOAD="https://get.jenkins.io/war-stable/2.452.1/jenkins.war" +MD5SUM="32f6d38ccad25bc93839d621d0bf0e08" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="zulu-openjdk21" diff --git a/system/kitty/kitty.SlackBuild b/system/kitty/kitty.SlackBuild index 50211bc0f2..81d907d472 100644 --- a/system/kitty/kitty.SlackBuild +++ b/system/kitty/kitty.SlackBuild @@ -12,7 +12,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kitty -VERSION=${VERSION:-0.34.0} +VERSION=${VERSION:-0.34.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/kitty/kitty.info b/system/kitty/kitty.info index bc48b71549..aadc6f8ac2 100644 --- a/system/kitty/kitty.info +++ b/system/kitty/kitty.info @@ -1,8 +1,8 @@ PRGNAM="kitty" -VERSION="0.34.0" +VERSION="0.34.1" HOMEPAGE="https://sw.kovidgoyal.net/kitty/" -DOWNLOAD="https://download.dlackware.com/hosted-sources/kitty/kitty-0.34.0.tar.xz" -MD5SUM="57e592cf4634d2b903885ed50e5ad5ff" +DOWNLOAD="https://download.dlackware.com/hosted-sources/kitty/kitty-0.34.1.tar.xz" +MD5SUM="992c3ed6c2209a4aa8446afda0c8ee72" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="librsync google-go-lang simde" diff --git a/system/limine/limine-sample.cfg b/system/limine/limine-sample.cfg index 34aeb2411d..237c2047a2 100644 --- a/system/limine/limine-sample.cfg +++ b/system/limine/limine-sample.cfg @@ -1,9 +1,8 @@ -TIMEOUT=5 # Boot prompt timeout in seconds. -TERM_FONT_SCALE=2x2 # Scale font both vertically and horizontally. +# Boot prompt timeout in seconds. +TIMEOUT=5 +# Scale font both vertically and horizontally. +TERM_FONT_SCALE=2x2 -# Example Slackware boot entry. -# Limine can boot Linux natively. -# # boot:// refers to the partition limine config is located at. :Slackware PROTOCOL=linux @@ -11,12 +10,4 @@ TERM_FONT_SCALE=2x2 # Scale font both vertically and horizontally. MODULE_PATH=boot:///EFI/Slackware/initrd.gz # Adjust ramdisk path. CMDLINE=root=/dev/sda3 vga=normal ro # Adjust root filesystem path. -# Example MS Windows entry using UEFI bootloader chainloading. -# Limine cannot boot MS Windows natively, so it will instead launch the UEFI -# bootloader provided by MS Windows and let it do the job. -# -# This entry refers to the partition by its UUID, invoke `sudo blkid` to list -# out partition UUIDs. -:Windows - PROTOCOL=chainload - IMAGE_PATH=uuid://6c1ac528-cc9a-804d-b28a-82b7ae8ec9d7/EFI/Microsoft/Boot/bootmgfw.efi +# For more examples, see https://wiki.archlinux.org/title/Limine diff --git a/system/limine/limine.SlackBuild b/system/limine/limine.SlackBuild index 309d917533..a0c89610d1 100644 --- a/system/limine/limine.SlackBuild +++ b/system/limine/limine.SlackBuild @@ -25,7 +25,7 @@ cd "$(dirname "$0")" ; CWD=$(pwd) PRGNAM=limine -VERSION=${VERSION:-7.3.1} +VERSION=${VERSION:-7.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -97,6 +97,7 @@ cat "$SRC/CONFIG.md" > "$PKG/usr/doc/$NAMVER/CONFIG.md" cat "$SRC/COPYING" > "$PKG/usr/share/$NAMVER/LICENSE" cat "$SRC/PHILOSOPHY.md" > "$PKG/usr/share/$NAMVER/PHILOSOPHY.md" cat "$SRC/PROTOCOL.md" > "$PKG/usr/share/$NAMVER/PROTOCOL.md" +cat "$SRC/ChangeLog" > "$PKG/usr/share/$NAMVER/ChangeLog" cat "$SRC/README.md" > "$PKG/usr/doc/$NAMVER/repository-README.md" cd "$PKG" diff --git a/system/limine/limine.info b/system/limine/limine.info index 05f9a52420..51c11a7990 100644 --- a/system/limine/limine.info +++ b/system/limine/limine.info @@ -1,8 +1,8 @@ PRGNAM="limine" -VERSION="7.3.1" +VERSION="7.4.1" HOMEPAGE="https://limine-bootloader.org/" -DOWNLOAD="https://github.com/limine-bootloader/limine/releases/download/v7.3.1/limine-7.3.1.tar.gz" -MD5SUM="51a80cfdccb2e883ed70bc3057aa4ac9" +DOWNLOAD="https://github.com/limine-bootloader/limine/releases/download/v7.4.1/limine-7.4.1.tar.gz" +MD5SUM="9ef991b2c130b5156cbf180b2543c331" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/locust/locust.SlackBuild b/system/locust/locust.SlackBuild index 9ee283a301..c8ea999554 100644 --- a/system/locust/locust.SlackBuild +++ b/system/locust/locust.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=locust -VERSION=${VERSION:-2.26.0} +VERSION=${VERSION:-2.27.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/locust/locust.info b/system/locust/locust.info index 88dcde1d56..3c70d198a5 100644 --- a/system/locust/locust.info +++ b/system/locust/locust.info @@ -1,8 +1,8 @@ PRGNAM="locust" -VERSION="2.26.0" +VERSION="2.27.0" HOMEPAGE="https://github.com/locustio/locust" -DOWNLOAD="https://files.pythonhosted.org/packages/3d/94/fe78c17e7cdcc606aab1a244936e70f9d9d1cff9368af3554bd523b9466a/locust-2.26.0.tar.gz" -MD5SUM="777451c112311aee0dd57f76770e7a04" +DOWNLOAD="https://files.pythonhosted.org/packages/4b/73/77a94b1b07dbce20dbaa0b5a5c97c890a42334a1429f2dd67839c412cffc/locust-2.27.0.tar.gz" +MD5SUM="ff83ce98a0501ba0ad4e752b30dc4ab2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-geventhttpclient python3-Flask-Basicauth python3-pyzmq msgpack-python zope.interface zope.event python3-psutil python3-configargparse typing-extensions roundrobin python3-Flask-Cors python3-blinker python3-Flask-Login" diff --git a/system/lxdm/README b/system/lxdm/README index eff7c7fd0a..0de31dd925 100644 --- a/system/lxdm/README +++ b/system/lxdm/README @@ -2,8 +2,8 @@ LXDM - GUI login manager for LXDE LXDM is a lightweight drop-in replacement for GDM or KDM. -By default the gtk+3 version of the greeter is built: to -build the gtk+2 one instead, the script can be run as +By default the gtk+3 version of the greeter is built: to build +the gtk+2 one instead (unsupported), the script can be run as GTK3=no ./lxdm.SlackBuild diff --git a/system/lxdm/lxdm.SlackBuild b/system/lxdm/lxdm.SlackBuild index 0547691012..de77b8312a 100644 --- a/system/lxdm/lxdm.SlackBuild +++ b/system/lxdm/lxdm.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for lxdm # Copyright 2010,2011 Robby Workman, Northport, Alabama, USA -# Copyright 2012-2017 Matteo Bernardini, Pisa, Italy +# Copyright 2012-2024 Matteo Bernardini, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxdm VERSION=${VERSION:-20170805_e3e7517} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,7 +73,7 @@ INDUSLACK_VER=${INDUSLACK_VER:-20170818} # WITH_INDUSLACK=${WITH_INDUSLACK:-yes} -with_gtk3="" ; [ "${GTK3:-yes}" = "yes" ] && with_gtk3="--enable-gtk3" +with_gtk3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && with_gtk3="" set -e @@ -128,7 +128,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --without-pam \ + --with-pam \ $with_gtk3 \ --build=$ARCH-slackware-linux @@ -171,9 +171,7 @@ if [ "${WITH_INDUSLACK}" = "yes" ] ; then fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING INSTALL README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING INSTALL README TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE diff --git a/system/lxinput/README b/system/lxinput/README index 8e3ca14e80..513ca55203 100644 --- a/system/lxinput/README +++ b/system/lxinput/README @@ -1,4 +1,6 @@ -lxinput (input settings for LXDE) - -lxnput is part of the LXDE project. +lxinput is part of the LXDE project. It implements selectable input settings for LXDE. + +If you want to build this for gtk+2, pass to the script the switch + + GTK3=no diff --git a/system/lxinput/lxinput.SlackBuild b/system/lxinput/lxinput.SlackBuild index 3d33a83d7a..5e4a062e2f 100644 --- a/system/lxinput/lxinput.SlackBuild +++ b/system/lxinput/lxinput.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Slackware build script for lxinput -# Copyright 2010-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2010-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxinput VERSION=${VERSION:-0.3.5} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -66,6 +63,10 @@ else LIBDIRSUFFIX="" fi +WITHGTK3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && WITHGTK3="--enable-gtk" + +DOCS="AUTHOR COPYING ChangeLog NEWS README TODO" + set -e rm -rf $PKG @@ -93,6 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-man \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + $WITHGTK3 \ --build=$ARCH-slackware-linux make @@ -102,9 +104,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHOR COPYING ChangeLog NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION || true +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/lxrandr/README b/system/lxrandr/README index 51a088f664..b770221d91 100644 --- a/system/lxrandr/README +++ b/system/lxrandr/README @@ -2,3 +2,7 @@ lxrandr (LXDE monitor config tool) LXRandR is a monitor configuration tool using X.Org's XRandR extension (if the graphics driver supports it). + +If you want to build this for gtk+2, pass to the script the switch + + GTK3=no diff --git a/system/lxrandr/lxrandr.SlackBuild b/system/lxrandr/lxrandr.SlackBuild index bab357a4ae..d97837c321 100644 --- a/system/lxrandr/lxrandr.SlackBuild +++ b/system/lxrandr/lxrandr.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # $Id: lxrandr.SlackBuild,v 1.2 2009/09/11 10:27:05 root Exp root $ # Copyright (c) 2008-2009 Eric Hameleers, Eindhoven, NL -# Copyright 2010-2019 Matteo Bernardini <ponce@slackbuilds.org, Pisa, Italy +# Copyright 2010-2024 Matteo Bernardini <ponce@slackbuilds.org, Pisa, Italy # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -47,6 +47,8 @@ # * update. # 0.3.2-1 11/mar/2019 by Matteo Bernardini <ponce@slackbuilds.org> # * update. +# 0.3.2-2 24/apr/2024 by Matteo Bernardini <ponce@slackbuilds.org> +# * Switch to gtk+3. # # Run 'sh lxrandr.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -58,7 +60,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxrandr VERSION=${VERSION:-0.3.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -70,9 +72,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -96,6 +95,8 @@ else LIBDIRSUFFIX="" fi +WITHGTK3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && WITHGTK3="" + DOCS="AUTHORS COPYING README" set -e @@ -126,14 +127,16 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --program-prefix= \ --program-suffix= \ + $WITHGTK3 \ --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG +echo 'X-AppStream-Ignore=true' >> $PKG/usr/share/applications/$PRGNAM.desktop + find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -# Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/lxsession/README b/system/lxsession/README index 1f715bf79f..a5d2e2888f 100644 --- a/system/lxsession/README +++ b/system/lxsession/README @@ -4,5 +4,8 @@ LXSession is the standard session manager used by LXDE (Lightweight X11 Desktop Environment). A session manager is used to automatically start a set of applications and set up a working desktop environment. -if you want to build this for gtk+3 pass to the script the switch - GTK3=yes +if you want to build this for gtk+2 pass to the script the switch + + GTK3=no + +you will need libunique as a dependency, in this case diff --git a/system/lxsession/gcc14.patch b/system/lxsession/gcc14.patch new file mode 100644 index 0000000000..5e612edc6a --- /dev/null +++ b/system/lxsession/gcc14.patch @@ -0,0 +1,89 @@ +From a0d8f8b865ce25867983cd45720adfff33b3fdfb Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Sun, 25 Feb 2024 16:58:43 +0900 +Subject: [PATCH] Fix: support gcc14 -Werror=incompatible-pointer-types + +gcc14 now defaults to -Werror=incompatible-pointer-types. +To support compilation with gcc14, cast GTK related objects +properly. +--- + lxpolkit/lxpolkit-listener.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lxpolkit/lxpolkit-listener.c b/lxpolkit/lxpolkit-listener.c +index 00bda42..819d2c5 100644 +--- a/lxpolkit/lxpolkit-listener.c ++++ b/lxpolkit/lxpolkit-listener.c +@@ -85,13 +85,13 @@ static void on_completed(PolkitAgentSession* session, gboolean authorized, DlgDa + + if(!authorized && !g_cancellable_is_cancelled(data->cancellable)) + { +- show_msg(data->dlg, GTK_MESSAGE_ERROR, _("Authentication failed!\nWrong password?")); ++ show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_ERROR, _("Authentication failed!\nWrong password?")); + /* initiate a new session */ + g_object_unref(data->session); + data->session = NULL; +- gtk_entry_set_text(data->request, ""); ++ gtk_entry_set_text(GTK_ENTRY(data->request), ""); + gtk_widget_grab_focus(data->request); +- on_user_changed(data->id, data); ++ on_user_changed(GTK_COMBO_BOX(data->id), data); + return; + } + g_simple_async_result_complete(data->result); +@@ -106,20 +106,20 @@ static void on_request(PolkitAgentSession* session, gchar* request, gboolean ech + msg = _("Password: "); + else + msg = request; +- gtk_label_set_text(data->request_label, msg); +- gtk_entry_set_visibility(data->request, echo_on); ++ gtk_label_set_text(GTK_LABEL(data->request_label), msg); ++ gtk_entry_set_visibility(GTK_ENTRY(data->request), echo_on); + } + + static void on_show_error(PolkitAgentSession* session, gchar* text, DlgData* data) + { + DEBUG("on error: %s", text); +- show_msg(data->dlg, GTK_MESSAGE_ERROR, text); ++ show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_ERROR, text); + } + + static void on_show_info(PolkitAgentSession* session, gchar* text, DlgData* data) + { + DEBUG("on info: %s", text); +- show_msg(data->dlg, GTK_MESSAGE_INFO, text); ++ show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_INFO, text); + } + + void on_dlg_response(GtkDialog* dlg, int response, DlgData* data) +@@ -127,7 +127,7 @@ void on_dlg_response(GtkDialog* dlg, int response, DlgData* data) + DEBUG("on_response: %d", response); + if(response == GTK_RESPONSE_OK) + { +- const char* request = gtk_entry_get_text(data->request); ++ const char* request = gtk_entry_get_text(GTK_ENTRY(data->request)); + polkit_agent_session_response(data->session, request); + gtk_widget_set_sensitive(data->dlg, FALSE); + } +@@ -195,7 +195,7 @@ static void initiate_authentication(PolkitAgentListener *listener, + DEBUG("%s: %s", *p, polkit_details_lookup(details, *p)); + #endif + data->listener = (LXPolkitListener*)listener; +- data->result = g_simple_async_result_new(listener, callback, user_data, initiate_authentication); ++ data->result = g_simple_async_result_new(G_OBJECT(listener), callback, user_data, initiate_authentication); + + data->action_id = g_strdup(action_id); + data->cancellable = (GCancellable*)g_object_ref(cancellable); +@@ -260,10 +260,10 @@ static void initiate_authentication(PolkitAgentListener *listener, + g_free(str); + } + } +- gtk_combo_box_set_model(data->id, GTK_TREE_MODEL(store)); ++ gtk_combo_box_set_model(GTK_COMBO_BOX(data->id), GTK_TREE_MODEL(store)); + g_object_unref(store); + /* select the fist user in the list */ +- gtk_combo_box_set_active(data->id, 0); ++ gtk_combo_box_set_active(GTK_COMBO_BOX(data->id), 0); + } + else + { diff --git a/system/lxsession/lxsession.SlackBuild b/system/lxsession/lxsession.SlackBuild index 183c52298a..16ca1227b8 100644 --- a/system/lxsession/lxsession.SlackBuild +++ b/system/lxsession/lxsession.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # $Id: lxsession.SlackBuild,v 1.1 2009/09/11 10:33:13 root Exp root $ # Copyright (c) 2008-2009 Eric Hameleers, Eindhoven, NL -# Copyright (c) 2010-2019 Matteo Bernardini, Pisa, IT +# Copyright (c) 2010-2024 Matteo Bernardini, Pisa, IT # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -61,6 +61,8 @@ # * update. # 0.5.5-2: 13/apr/2022 by B. Watson <urchlay@slackware.uk> # * remove empty file from doc dir. +# 0.5.5-3: 24/apr/2024 by Matteo Bernardini <ponce@slackbuilds.org> +# * Switch to gtk+3. # # Run 'sh lxsession.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -71,8 +73,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxsession -VERSION=${VERSION:-0.5.5} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20240415_f68f477} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -84,9 +86,6 @@ if [ -z "$ARCH" ]; then esac fi -# 20220413 bkw: don't include NEWS, it's a 0-byte placeholder. -DOCS="AUTHORS COPYING ChangeLog README" - if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -110,8 +109,10 @@ else LIBDIRSUFFIX="" fi -WITHGTK3="" -[ "${GTK3:-no}" = "yes" ] && WITHGTK3="--enable-gtk3" +WITHGTK3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && WITHGTK3="--enable-gtk" + +# 20220413 bkw: don't include NEWS, it's a 0-byte placeholder. +DOCS="AUTHORS COPYING ChangeLog README" set -e @@ -123,10 +124,14 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +patch -p1 < $CWD/gcc14.patch + +./autogen.sh || true CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ @@ -139,7 +144,6 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --program-prefix= \ --program-suffix= \ - --enable-gtk \ $WITHGTK3 \ --enable-buildin-clipboard \ --enable-buildin-polkit \ @@ -147,9 +151,12 @@ CFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG + +echo 'X-AppStream-Ignore=true' >> $PKG/usr/share/applications/lxsession-default-apps.desktop +echo 'X-AppStream-Ignore=true' >> $PKG/usr/share/applications/lxsession-edit.desktop + gzip -9 $PKG/usr/man/man*/* -# Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/lxsession/lxsession.info b/system/lxsession/lxsession.info index d652daab67..b773231844 100644 --- a/system/lxsession/lxsession.info +++ b/system/lxsession/lxsession.info @@ -1,10 +1,10 @@ PRGNAM="lxsession" -VERSION="0.5.5" +VERSION="20240415_f68f477" HOMEPAGE="https://wiki.lxde.org/en/LXSession" -DOWNLOAD="https://downloads.sf.net/lxde/lxsession-0.5.5.tar.xz" -MD5SUM="e8380acef215ee7c99c067a2241c2c7b" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/lxsession-20240415_f68f477.tar.xz" +MD5SUM="4903b76d535be464c20e57e7a5aea6c1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libunique" +REQUIRES="libunique3" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/system/lxtask/README b/system/lxtask/README index 6bf97e6b7c..f7e24888d4 100644 --- a/system/lxtask/README +++ b/system/lxtask/README @@ -3,3 +3,7 @@ lxtask (simple task manager for LXDE) LXTask is lightweight and desktop-independent task manager derived from xfce4-taskmanager with all dependencies on xfce removed, new features, and some improvement of the user interface. + +If you want to build this for gtk+2, pass to the script the switch + + GTK3=no diff --git a/system/lxtask/lxtask.SlackBuild b/system/lxtask/lxtask.SlackBuild index 8137d5fa01..d5fc6b4349 100644 --- a/system/lxtask/lxtask.SlackBuild +++ b/system/lxtask/lxtask.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # $Id: lxtask.SlackBuild,v 1.2 2009/09/11 10:39:38 root Exp root $ # Copyright (c) 2008-2009 Eric Hameleers, Eindhoven, NL -# Copyright 2010-2019 Matteo Bernardini <ponce@slackbuilds.org, Pisa, Italy +# Copyright 2010-2024 Matteo Bernardini <ponce@slackbuilds.org, Pisa, Italy # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -53,6 +53,8 @@ # * updated. # 0.1.10-1: 10/apr/2021 by Matteo Bernardini <ponce@slackbuilds.org> # * updated. +# 0.1.10-2: 24/apr/2024 by Matteo Bernardini <ponce@slackbuilds.org> +# * Switch to gtk+3. # # Run 'sh lxtask.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -64,7 +66,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxtask VERSION=${VERSION:-0.1.10} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,11 +78,6 @@ if [ -z "$ARCH" ]; then esac fi -DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO" - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -104,6 +101,10 @@ else LIBDIRSUFFIX="" fi +WITHGTK3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && WITHGTK3="" + +DOCS="AUTHORS COPYING ChangeLog INSTALL README TODO" + set -e rm -rf $PKG @@ -131,13 +132,15 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --program-prefix= \ --program-suffix= \ + $WITHGTK3 \ --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG +echo 'X-AppStream-Ignore=true' >> "$PKG/usr/share/applications/$PRGNAM.desktop" + find $PKG/usr/man -type f -exec gzip -9 {} \; -# Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/lxterminal/README b/system/lxterminal/README index bf0c77122c..e6780940da 100644 --- a/system/lxterminal/README +++ b/system/lxterminal/README @@ -2,5 +2,8 @@ LXTerminal is a quick configurable terminal emulator, based on vte libs. It uses a single process for each window/tab so it's very light on resources. -Pass the script the variable GTK3=yes if you want to link this against -gtk+3 instead of the default gtk+2. +If you want to build this for gtk+2, pass to the script the switch + + GTK3=no + +you will need the additional dependency vte2 in this case diff --git a/system/lxterminal/gcc14.patch b/system/lxterminal/gcc14.patch new file mode 100644 index 0000000000..5eecd92e74 --- /dev/null +++ b/system/lxterminal/gcc14.patch @@ -0,0 +1,49 @@ +From c947b9065b470c24064ac1b1c4935e8093970531 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Wed, 21 Feb 2024 17:01:14 +0900 +Subject: [PATCH] Fix: support gcc14 -Werror=incompatible-pointer-types + +gcc14 now defaults to -Werror=incompatible-pointer-types . +Fix code to support this. + +* Add GTK cast for GTK_STYLE_PROVIDER +* VteRegex must be deref'ed with vte_regex_unref + +Fixes #121 . +--- + src/lxterminal.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/lxterminal.c b/src/lxterminal.c +index 680e411..dcd7405 100644 +--- a/src/lxterminal.c ++++ b/src/lxterminal.c +@@ -1208,7 +1208,7 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch + GtkStyleContext* box_style_ctx = + gtk_widget_get_style_context(GTK_WIDGET(terminal->box)); + gtk_style_context_add_provider( +- box_style_ctx, box_css_provider, ++ box_style_ctx, GTK_STYLE_PROVIDER(box_css_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + #endif + +@@ -1232,6 +1232,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch + vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer"); + ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0); + vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer"); ++ vte_regex_unref(dingus1); ++ vte_regex_unref(dingus2); + #else + GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL); + GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL); +@@ -1239,9 +1241,9 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch + vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer"); + ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0); + vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer"); +-#endif + g_regex_unref(dingus1); + g_regex_unref(dingus2); ++#endif + + /* Create a horizontal box inside an event box as the toplevel for the tab label. */ + term->tab = gtk_event_box_new(); diff --git a/system/lxterminal/lxterminal.SlackBuild b/system/lxterminal/lxterminal.SlackBuild index 8fc4a29be0..4a04a1d835 100644 --- a/system/lxterminal/lxterminal.SlackBuild +++ b/system/lxterminal/lxterminal.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # $Id: lxterminal.SlackBuild,v 1.6 2009/09/11 10:43:05 root Exp root $ # Copyright (c) 2008-2009 Eric Hameleers, Eindhoven, NL -# Copyright (c) 2010-2021 Matteo Bernardini, Pisa, IT +# Copyright (c) 2010-2024 Matteo Bernardini, Pisa, IT # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -69,6 +69,10 @@ # * Update. # 0.4.0: 10/apr/2021 by Matteo Bernardini <ponce@slackbuilds.org> # * Update. +# 0.4.0-2: 24/apr/2024 by Matteo Bernardini <ponce@slackbuilds.org> +# * Switch to gtk+3. +# 20230917_9b4299c: 15/may/2024 by Matteo Bernardini <ponce@slackbuilds.org> +# * Fix building with gcc14. # # Run 'sh lxterminal.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -79,7 +83,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxterminal -VERSION=${VERSION:-0.4.0} +VERSION=${VERSION:-20230917_9b4299c} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -92,9 +96,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -118,7 +119,7 @@ else LIBDIRSUFFIX="" fi -gtk3="" ; [ "${GTK3:-no}" = "yes" ] && gtk3="--enable-gtk3" +gtk3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && gtk3="" DOCS="AUTHORS COPYING ChangeLog NEWS" @@ -137,6 +138,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/gcc14.patch + sh autogen.sh || true CXXFLAGS="$SLKCFLAGS" \ @@ -158,7 +161,6 @@ make install-strip DESTDIR=$PKG find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -# Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info index 574b0e866d..b724fc5081 100644 --- a/system/lxterminal/lxterminal.info +++ b/system/lxterminal/lxterminal.info @@ -1,10 +1,10 @@ PRGNAM="lxterminal" -VERSION="0.4.0" +VERSION="20230917_9b4299c" HOMEPAGE="https://wiki.lxde.org/en/LXTerminal" -DOWNLOAD="http://downloads.sf.net/lxde/lxterminal-0.4.0.tar.xz" -MD5SUM="7938dbd50e3826c11f4735a742b278d3" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/lxterminal-20230917_9b4299c.tar.xz" +MD5SUM="d10f0f84b2a5c44eaa338d3b6cf6cfdb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="vte2" +REQUIRES="" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/system/mongodb/README b/system/mongodb/README index f2e41d4aff..8898ea3511 100644 --- a/system/mongodb/README +++ b/system/mongodb/README @@ -13,9 +13,4 @@ if [ -x /etc/rc.d/rc.mongodb ]; then /etc/rc.d/rc.mongodb start fi -NOTE: mongodb 5.0 requires use of the AVX instruction set: check if -your cpu supports it with - - grep avx /proc/cpuinfo | uniq - -(no output means it doesn't) +NOTE: This script repackage binary source diff --git a/system/mongodb/doinst.sh b/system/mongodb/doinst.sh index 8721b3d5ee..a23b6a9f1f 100644 --- a/system/mongodb/doinst.sh +++ b/system/mongodb/doinst.sh @@ -23,6 +23,6 @@ preserve_perms() { } preserve_perms etc/rc.d/rc.mongodb.new -config etc/mongodb.conf.new +config etc/mongod.conf.new config etc/mongos.conf.new config etc/logrotate.d/mongodb.new diff --git a/system/mongodb/files/mongodb.conf b/system/mongodb/files/mongodb.conf deleted file mode 100644 index 83b4cc0589..0000000000 --- a/system/mongodb/files/mongodb.conf +++ /dev/null @@ -1,34 +0,0 @@ -# !! IMPORTANT !! -# -# This file uses the YAML format as described in the documentation: -# http://docs.mongodb.org/manual/reference/configuration-options/ - -storage: - dbPath: "/var/lib/mongodb" - #engine: wiredTiger - -systemLog: - destination: file - path: "/var/log/mongodb/mongodb.log" - quiet: true - logAppend: true - -net: - port: 27017 - bindIp: 127.0.0.1 - #ssl: - # mode: disabled - -#security: - #keyFile: - #clusterAuthMode: - -#replication: - #replSetName: - -# Specifies one of the MongoDB parameters described here: -# http://docs.mongodb.org/manual/reference/parameters/ -# -# You can specify multiple setParameter fields such as: -# setParameter: {enableTestCommands: 1} -#setParameter: diff --git a/system/mongodb/mongodb.SlackBuild b/system/mongodb/mongodb.SlackBuild index 7bcc41e901..56cb0e953b 100644 --- a/system/mongodb/mongodb.SlackBuild +++ b/system/mongodb/mongodb.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="mongodb" -VERSION=${VERSION:-7.0.8} +VERSION=${VERSION:-7.0.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -52,9 +52,6 @@ OUTPUT=${OUTPUT:-/tmp} MONGO_USER=${MONGO_USER:-285} MONGO_GROUP=${MONGO_GROUP:-285} -SRC_FILE=$PRGNAM-src-r$VERSION.tar.gz -SRC_FLDR=$PRGNAM-src-r$VERSION - if [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" @@ -81,15 +78,11 @@ EOF getent passwd mongo &>/dev/null || bailout getent group mongo &>/dev/null || bailout -rm -fr $TMP/$SRC_FLDR $PKG +rm -fr $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP -tar xvf $CWD/$SRC_FILE -cd $SRC_FLDR -# remove bundled libs -rm -fR src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} -# remove compass -rm -fR src/mongo/installer/compass +cd $PKG +ar p $CWD/mongodb-org-server_${VERSION}_amd64.deb data.tar.zst | zstd --decompress | tar xv +ar p $CWD/mongodb-org-mongos_${VERSION}_amd64.deb data.tar.zst | zstd --decompress | tar xv chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -97,63 +90,24 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# thanks gentoo, also for these patches -for i in $CWD/patches/* ; do patch -p1 < $i ; done - -sed -i "s|GCC 11.3|GCC 11.2|g" SConstruct -sed -i "s|__GNUC_MINOR__ < 3|__GNUC_MINOR__ < 2|g" SConstruct - -scons_opts=( - --disable-warnings-as-errors - --use-system-boost - --use-system-pcre2 - --use-system-snappy - --use-system-yaml - --use-system-zlib - --use-system-zstd - --use-sasl-client - --use-system-libbson - --use-system-mongo-c - --ssl -) - -# Thanks to Lockywolf -# scons can use multiple jobs. For convenience, read MAKEFLAGS from the environment, if set -JOBS="$( echo $MAKEFLAGS | sed 's,.*-j *\([0-9][0-9]*\)*.*,\1,' )" -# or if no MAKEFLAGS, use the number of cores minus 1 -JOBS="${JOBS:-$(( $( nproc ) - 1 ))}" -# or 1, if we really have one core -[ "$JOBS" = "0" ] && JOBS=1 - -if [ "$ARCH" = "x86_64" ]; then - PREFIX=${PKG}/usr CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" LDFLAGS="-L /lib$LIBDIRSUFFIX -L/usr/lib$LIBDIRSUFFIX" \ - ./buildscripts/scons.py "${scons_opts[@]}" --force-jobs --jobs="$JOBS" install-core -else - PREFIX=${PKG}/usr CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" LDFLAGS="-L /lib$LIBDIRSUFFIX -L/usr/lib$LIBDIRSUFFIX" \ - ./buildscripts/scons.py "${scons_opts[@]}" --force-jobs --jobs="$JOBS" --wiredtiger=off install-core -fi - -# manual install -( cd build/install/bin - for i in * ; do install -D -m 0755 $i $PKG/usr/bin/$i ; done ) -( cd debian - for i in *.1 ; do install -D -m 0644 $i $PKG/usr/man/man1/$i ; done ) +# We don't need systemd files +rm -rf lib find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +mv usr/share/man usr/ mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION} -cp distsrc/* ${PKG}/usr/doc/${PRGNAM}-${VERSION} +mv usr/share/doc/mongodb-org-* ${PKG}/usr/doc/${PRGNAM}-${VERSION} cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -rf usr/share/doc mkdir -p $PKG/etc/{logrotate,rc}.d -cat $CWD/files/mongodb.conf > $PKG/etc/mongodb.conf.new cat $CWD/files/mongos.conf > $PKG/etc/mongos.conf.new cat $CWD/files/mongodb.logrotate > $PKG/etc/logrotate.d/mongodb.new cat $CWD/files/rc.mongodb > $PKG/etc/rc.d/rc.mongodb.new +mv etc/mongod.conf etc/mongod.conf.new mkdir -p $PKG/var/{lib,log}/mongodb chmod 750 $PKG/var/{lib,log}/mongodb diff --git a/system/mongodb/mongodb.info b/system/mongodb/mongodb.info index 37d4117a32..5653908c61 100644 --- a/system/mongodb/mongodb.info +++ b/system/mongodb/mongodb.info @@ -1,10 +1,12 @@ PRGNAM="mongodb" -VERSION="7.0.8" +VERSION="7.0.9" HOMEPAGE="https://www.mongodb.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://fastdl.mongodb.org/src/mongodb-src-r7.0.8.tar.gz" -MD5SUM_x86_64="40608f11bf26fef651bcb4bb172a2c29" -REQUIRES="cheetah3 python3-psutil snappy snowballstemmer yaml-cpp python3-jsonschema mongo-c-driver pymongo" +DOWNLOAD_x86_64="https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/7.0/multiverse/binary-amd64/mongodb-org-server_7.0.9_amd64.deb \ + https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/7.0/multiverse/binary-amd64/mongodb-org-mongos_7.0.9_amd64.deb" +MD5SUM_x86_64="5c0915bf5b0bca2f96d272927953c24c \ + e51a4a81965f4d8ea9d482b7ca69ee8c" +REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/system/mongodb/patches/mongodb-5.0.2-no-compass.patch b/system/mongodb/patches/mongodb-5.0.2-no-compass.patch deleted file mode 100644 index 7772515772..0000000000 --- a/system/mongodb/patches/mongodb-5.0.2-no-compass.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/mongo/installer/SConscript b/src/mongo/installer/SConscript -index 5bd89fe9..489e70ac 100644 ---- a/src/mongo/installer/SConscript -+++ b/src/mongo/installer/SConscript -@@ -7,7 +7,6 @@ env = env.Clone() - - env.SConscript( - dirs=[ -- 'compass', - 'msi', - ], - exports=[ diff --git a/system/mongodb/patches/mongodb-5.0.2-skip-reqs-check.patch b/system/mongodb/patches/mongodb-5.0.2-skip-reqs-check.patch deleted file mode 100644 index 823d481c20..0000000000 --- a/system/mongodb/patches/mongodb-5.0.2-skip-reqs-check.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/buildscripts/scons.py b/buildscripts/scons.py -index 534fca32..c38f64df 100755 ---- a/buildscripts/scons.py -+++ b/buildscripts/scons.py -@@ -19,13 +19,13 @@ SITE_TOOLS_DIR = os.path.join(MONGODB_ROOT, 'site_scons') - sys.path = [SCONS_DIR, SITE_TOOLS_DIR] + sys.path - - # pylint: disable=C0413 --from mongo.pip_requirements import verify_requirements, MissingRequirements -+#from mongo.pip_requirements import verify_requirements, MissingRequirements - --try: -- verify_requirements('etc/pip/compile-requirements.txt') --except MissingRequirements as ex: -- print(ex) -- sys.exit(1) -+#try: -+# verify_requirements('etc/pip/compile-requirements.txt') -+#except MissingRequirements as ex: -+# print(ex) -+# sys.exit(1) - - try: - import SCons.Script diff --git a/system/mongodb/patches/mongodb-7.0.2-sconstruct.patch b/system/mongodb/patches/mongodb-7.0.2-sconstruct.patch deleted file mode 100644 index 822bd81d0b..0000000000 --- a/system/mongodb/patches/mongodb-7.0.2-sconstruct.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index 92d557b..80ee9e8 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -23,7 +23,6 @@ from pkg_resources import parse_version - - import SCons - import SCons.Script --from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics - from site_scons.mongo import build_profiles - - # This must be first, even before EnsureSConsVersion, if -@@ -1649,13 +1648,6 @@ env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption - - # The placement of this is intentional. Here we setup an atexit method to store tooling metrics. - # We should only register this function after env, env_vars and the parser have been properly initialized. --SConsToolingMetrics.register_metrics( -- utc_starttime=datetime.utcnow(), -- artifact_dir=env.Dir('$BUILD_DIR').get_abspath(), -- env_vars=env_vars, -- env=env, -- parser=_parser, --) - - if get_option('build-metrics'): - env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR' -@@ -3026,7 +3018,6 @@ if env.TargetOSIs('posix'): - env.Append( - CCFLAGS=[ - "-fasynchronous-unwind-tables", -- "-g2" if not env.TargetOSIs('emscripten') else "-g", - "-Wall", - "-Wsign-compare", - "-Wno-unknown-pragmas", -@@ -3093,6 +3084,8 @@ if env.TargetOSIs('posix'): - - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - env.Append(CXXFLAGS=["-Woverloaded-virtual"]) -+ env.Append(CXXFLAGS=os.environ['CXXFLAGS']) -+ env.Append(LINKFLAGS=os.environ['LDFLAGS']) - - # On OS X, clang doesn't want the pthread flag at link time, or it - # issues warnings which make it impossible for us to declare link -@@ -3143,7 +3136,7 @@ if env.TargetOSIs('posix'): - ], ) - - #make scons colorgcc friendly -- for key in ('HOME', 'TERM'): -+ for key in ('HOME', 'TERM', 'PATH'): - try: - env['ENV'][key] = os.environ[key] - except KeyError: -@@ -3543,33 +3536,6 @@ def doConfigure(myenv): - myenv.AddMethod( - functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported") - -- if myenv.ToolchainIs('gcc', 'clang'): -- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker -- # because it is much faster. Don't use it if the user has already configured another linker -- # selection manually. -- if any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']): -- myenv.FatalError( -- f"Use the '--linker' option instead of modifying the LINKFLAGS directly.") -- -- linker_ld = get_option('linker') -- if linker_ld == 'auto': -- if not env.TargetOSIs('darwin', 'macOS'): -- if not myenv.AddToLINKFLAGSIfSupported('-fuse-ld=lld'): -- myenv.FatalError( -- f"The recommended linker 'lld' is not supported with the current compiler configuration, you can try the 'gold' linker with '--linker=gold'." -- ) -- elif link_model.startswith("dynamic") and linker_ld == 'bfd': -- # BFD is not supported due to issues with it causing warnings from some of -- # the third party libraries that mongodb is linked with: -- # https://jira.mongodb.org/browse/SERVER-49465 -- myenv.FatalError(f"Linker {linker_ld} is not supported with dynamic link model builds.") -- else: -- if not myenv.AddToLINKFLAGSIfSupported(f'-fuse-ld={linker_ld}'): -- myenv.FatalError(f"Linker {linker_ld} could not be configured.") -- -- if has_option('gcov') and myenv.AddToCCFLAGSIfSupported('-fprofile-update=single'): -- myenv.AppendUnique(LINKFLAGS=['-fprofile-update=single']) -- - detectCompiler = Configure( - myenv, - help=False, -@@ -4621,43 +4587,6 @@ def doConfigure(myenv): - if optBuild == "off" and myenv.ToolchainIs('clang') and env.TargetOSIs('darwin'): - myenv.AddToLINKFLAGSIfSupported("-Wl,-no_deduplicate") - -- # Apply any link time optimization settings as selected by the 'lto' option. -- if has_option('lto'): -- if myenv.ToolchainIs('msvc'): -- # Note that this is actually more aggressive than LTO, it is whole program -- # optimization due to /GL. However, this is historically what we have done for -- # windows, so we are keeping it. -- # -- # /GL implies /LTCG, so no need to say it in CCFLAGS, but we do need /LTCG on the -- # link flags. -- myenv.Append(CCFLAGS=['/GL']) -- myenv.Append(LINKFLAGS=['/LTCG']) -- myenv.Append(ARFLAGS=['/LTCG']) -- elif myenv.ToolchainIs('gcc', 'clang'): -- # For GCC and clang, the flag is -flto, and we need to pass it both on the compile -- # and link lines. -- if not myenv.AddToCCFLAGSIfSupported('-flto') or \ -- not myenv.AddToLINKFLAGSIfSupported('-flto'): -- myenv.ConfError("Link time optimization requested, " -- "but selected compiler does not honor -flto") -- -- if myenv.TargetOSIs('darwin'): -- myenv.AddToLINKFLAGSIfSupported('-Wl,-object_path_lto,${TARGET}.lto') -- else: -- # According to intel benchmarks -fno-plt increases perf -- # See PM-2215 -- if linker_ld != "gold": -- myenv.ConfError("lto compilation currently only works with the --linker=gold") -- if link_model != "object": -- myenv.ConfError( -- "lto compilation currently only works with the --link-model=object") -- if not myenv.AddToCCFLAGSIfSupported('-fno-plt') or \ -- not myenv.AddToLINKFLAGSIfSupported('-fno-plt'): -- myenv.ConfError("-fno-plt is not supported by the compiler") -- -- else: -- myenv.ConfError("Don't know how to enable --lto on current toolchain") -- - if get_option('runtime-hardening') == "on" and optBuild != "off": - # Older glibc doesn't work well with _FORTIFY_SOURCE=2. Selecting 2.11 as the minimum was an - # emperical decision, as that is the oldest non-broken glibc we seem to require. It is possible -@@ -5120,17 +5049,13 @@ def doConfigure(myenv): - "BOOST_LOG_NO_SHORTHAND_NAMES", - "BOOST_LOG_USE_NATIVE_SYSLOG", - "BOOST_LOG_WITHOUT_THREAD_ATTR", -+ "BOOST_LOG_DYN_LINK", - "BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS", - "BOOST_SYSTEM_NO_DEPRECATED", - "BOOST_THREAD_USES_DATETIME", - ("BOOST_THREAD_VERSION", "5"), - ]) - -- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk': -- conf.env.AppendUnique(CPPDEFINES=[ -- "BOOST_LOG_DYN_LINK", -- ]) -- - if use_system_version_of_library("boost"): - if not conf.CheckCXXHeader("boost/filesystem/operations.hpp"): - myenv.ConfError("can't find boost headers") -@@ -5327,6 +5252,9 @@ def doConfigure(myenv): - - mongoc_mode = get_option('use-system-mongo-c') - conf.env['MONGO_HAVE_LIBMONGOC'] = False -+ conf.env.ParseConfig('pkg-config libbson-1.0 libmongoc-1.0 --cflags') -+ conf.env['LIBDEPS_LIBBSON_SYSLIBDEP'] = 'bson-1.0' -+ - if mongoc_mode != 'off': - if conf.CheckLibWithHeader( - ["mongoc-1.0"], diff --git a/system/netdata/netdata.SlackBuild b/system/netdata/netdata.SlackBuild index 338e1da25e..2551034909 100644 --- a/system/netdata/netdata.SlackBuild +++ b/system/netdata/netdata.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=netdata -VERSION=${VERSION:-1.45.3} +VERSION=${VERSION:-1.45.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/netdata/netdata.info b/system/netdata/netdata.info index 7959f2f02d..a76638b3f7 100644 --- a/system/netdata/netdata.info +++ b/system/netdata/netdata.info @@ -1,8 +1,8 @@ PRGNAM="netdata" -VERSION="1.45.3" +VERSION="1.45.4" HOMEPAGE="https://github.com/netdata/netdata" -DOWNLOAD="https://github.com/netdata/netdata/releases/download/v1.45.3/netdata-v1.45.3.tar.gz" -MD5SUM="862400053058599901fcb9b61573d866" +DOWNLOAD="https://github.com/netdata/netdata/releases/download/v1.45.4/netdata-v1.45.4.tar.gz" +MD5SUM="a4ec6d65c2cf1159e7c93d5415dc2782" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python2-PyYAML google-go-lang freeipmi" diff --git a/system/numactl/numactl.SlackBuild b/system/numactl/numactl.SlackBuild index ccff6ffa79..a363427c28 100644 --- a/system/numactl/numactl.SlackBuild +++ b/system/numactl/numactl.SlackBuild @@ -7,7 +7,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=numactl -VERSION=${VERSION:-2.0.13} +VERSION=${VERSION:-2.0.17} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -83,7 +83,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -ar INSTALL.md README.md test $PKG/usr/doc/$PRGNAM-$VERSION +cp -ar INSTALL.md README.md LICENSE.GPL2 LICENSE.LGPL2.1 test $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rm -f $PKG/usr/lib*/*.la diff --git a/system/numactl/numactl.info b/system/numactl/numactl.info index 1cda19b3ff..c60ee5d757 100644 --- a/system/numactl/numactl.info +++ b/system/numactl/numactl.info @@ -1,8 +1,8 @@ PRGNAM="numactl" -VERSION="2.0.13" +VERSION="2.0.17" HOMEPAGE="https://github.com/numactl/numactl" -DOWNLOAD="https://github.com/numactl/numactl/releases/download/v2.0.13/numactl-2.0.13.tar.gz" -MD5SUM="9a9a94bfebf6c9c67defeedc9795e568" +DOWNLOAD="https://github.com/numactl/numactl/releases/download/v2.0.17/numactl-2.0.17.tar.gz" +MD5SUM="13b5cc5c54e73bdd9387234cd7bc76ff" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/nut/README b/system/nut/README deleted file mode 100644 index bf5ba069e1..0000000000 --- a/system/nut/README +++ /dev/null @@ -1,8 +0,0 @@ -The Network UPS Tools is a collection of programs which provide a -common interface for monitoring and administering UPS hardware. It -uses a layered apporoach to connect all the components. Drivers are -provided for a wide assortment of equipment. The primary goal of the -NUT project is to provide reliable monitoring of UPS hardware and -ensure safe shutdowns of the systems which are connected. - -See README.SLACKWARE for configuration hints. diff --git a/system/nut/README.SLACKWARE b/system/nut/README.SLACKWARE deleted file mode 100644 index a73275956c..0000000000 --- a/system/nut/README.SLACKWARE +++ /dev/null @@ -1,43 +0,0 @@ -README.SLACKWARE -Written by V'yacheslav Stetskevych <slava18 dont_spam_me gmail com> - -In order to configure Network UPS tools on Slackware you need to rename -or make copies of the sample config files in /etc/nut and edit them -to suit your needs. See documentation in /usr/doc/nut-* for reference. -As you make your new config files, don't forget to secure them: - chown root:nut /etc/nut/*.conf /etc/nut/*.users - chmod 640 /etc/nut/*.conf /etc/nut/*.users - -If you are using a serial-connected UPS, be sure to add the nut user to -the 'dialout' group: - usermod -a -G dialout nut - -A startup script /etc/rc.d/rc.ups is provided with this build. -You can add these lines to /etc/rc.d/rc.local to launch it on system start: - if [ -x /etc/rc.d/rc.ups ]; then - /etc/rc.d/rc.ups start - fi - -If you have more than one box sitting on the same UPS, you should only use -'start' on the one box that is connected to the device using a signal cable. -On the other boxes, start rc.ups with the 'start_upsmon' parameter to only -monitor the power status (client mode). Configure access permissions on the -server box accordingly. - -If you wish for your UPS to turn off it's power during an extended power outage -in order not to drain it's battery completely, you should make two simple edits -to the Slackware shutdown script /etc/rc.d/rc.6 near the end of it. -These are only needed on the server box, one that is connected to the UPS: -1) Insert after the rootfs has been remounted read-only: - if [ -x /usr/libexec/nut/nut_restart_udev ]; then - . /usr/libexec/nut/nut_restart_udev - fi -2) Insert after the genpowerd block and before the actual halt: - if [ -x /usr/libexec/nut/nut_kill_inverter ]; then - . /usr/libexec/nut/nut_kill_inverter - fi - -Don't forget to set your motherboard BIOS to automatically turn the machine on -when the power comes back. - -Have fun! diff --git a/system/nut/doinst.sh b/system/nut/doinst.sh deleted file mode 100644 index ea64d25add..0000000000 --- a/system/nut/doinst.sh +++ /dev/null @@ -1,21 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -# Keep same perms on rc.ups.new: -if [ -e etc/rc.d/rc.ups ]; then - cp -a etc/rc.d/rc.ups etc/rc.d/rc.ups.new.incoming - cat etc/rc.d/rc.ups.new > etc/rc.d/rc.ups.new.incoming - mv etc/rc.d/rc.ups.new.incoming etc/rc.d/rc.ups.new -fi - -config etc/rc.d/rc.ups.new diff --git a/system/nut/nut.SlackBuild b/system/nut/nut.SlackBuild deleted file mode 100644 index d4b19e36ee..0000000000 --- a/system/nut/nut.SlackBuild +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/bash - -# Slackware build script for nut (Network UPS Tools) - -# Copyright 2010 V'yacheslav Stetskevych <slava18 dont_spam_me gmail com> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=nut -VERSION=${VERSION:-2.7.4} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -NUTUSER=${NUTUSER:-nut} -NUTGROUP=${NUTGROUP:-nut} - -# The user and group accounts have to be created manually. -# For slackbuilds.org, assigned nut uid/gid are 218/218. -# See http://slackbuilds.org/uid_gid.txt -if ! grep -q ^$NUTGROUP: /etc/group; then - echo " You must have a \"$NUTGROUP\" group to run this script." - echo " # groupadd -g 218 $NUTGROUP" - exit 1 -elif ! grep -q ^$NUTUSER: /etc/passwd; then - echo " You must have a \"$NUTUSER\" user to run this script." - echo " # useradd -u 218 -g $NUTGROUP -s /bin/false $NUTUSER" - exit 1 -fi - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=c++14" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/$PRGNAM \ - --localstatedir=/var \ - --datadir=/usr/share/nut \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --enable-strip \ - --disable-static \ - --with-dev \ - --with-serial \ - --with-usb \ - --with-snmp \ - --with-neon \ - --with-wrap \ - --with-cgi\ - --with-cgipath=/var/www/cgi-bin/nut \ - --with-htmlpath=/var/www/htdocs/ups \ - --with-drvpath=/usr/libexec/nut \ - --with-statepath=/var/run/nut \ - --with-pidpath=/var/run/nut \ - --with-altpidpath=/var/run/nut \ - --with-user=nut \ - --with-group=nut -make -make install DESTDIR=$PKG - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -# Install the bash_completion script -install -d $PKG/usr/share/bash-completion/completions -install -m 755 scripts/misc/nut.bash_completion $PKG/usr/share/bash-completion/completions/nut - -# Install the startup script -install -d $PKG/etc/rc.d -install -m 644 $CWD/rc.ups $PKG/etc/rc.d/rc.ups.new - -# Create the state and run dirs -install -d -o root -g $NUTGROUP -m 770 $PKG/var/state/ups -install -d -o $NUTUSER -g $NUTGROUP -m 770 $PKG/var/run/nut - -# Install shutdown helper files -install -m 755 $CWD/nut_restart_udev $CWD/nut_kill_inverter $PKG/usr/libexec/nut - -# Install documentation -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -ar docs \ - AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING \ - $PKG/usr/doc/$PRGNAM-$VERSION -rm $PKG/usr/doc/$PRGNAM-$VERSION/docs/Makefile* -cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/nut/nut.info b/system/nut/nut.info deleted file mode 100644 index b6e4db3b0c..0000000000 --- a/system/nut/nut.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nut" -VERSION="2.7.4" -HOMEPAGE="http://www.networkupstools.org/" -DOWNLOAD="http://www.networkupstools.org/source/2.7/nut-2.7.4.tar.gz" -MD5SUM="3ba53656933d7471f95140b32a5b8d5c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="V'yacheslav Stetskevych" -EMAIL="slava18@gmail.com" diff --git a/system/nut/nut_kill_inverter b/system/nut/nut_kill_inverter deleted file mode 100644 index 251a047df7..0000000000 --- a/system/nut/nut_kill_inverter +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# This file is part of Network UPS Tools build for Slackware Linux. -# It should be sourced in /etc/rc.d/rc.0 as part of the poweroff sequence. -# Here, we signal the UPS to shut off the power. -# Reference: http://www.mail-archive.com/nut-upsdev@lists.alioth.debian.org/msg01099.html -# To be sourced after the genpowerd block and before the actual halt. - -if [ -f /etc/killpower ]; then - echo "----------------------------------------Shutting down UPS power!" - /etc/rc.d/rc.ups shutdown - sleep 40 - echo "The UPS was not shut off properly, or the power came back in the" - echo "middle of the shutdown process, or USB communication failed." - sleep 10 -fi diff --git a/system/nut/nut_restart_udev b/system/nut/nut_restart_udev deleted file mode 100644 index d289c0f87a..0000000000 --- a/system/nut/nut_restart_udev +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# This file is part of Network UPS Tools build for Slackware Linux. -# It should be sourced in /etc/rc.d/rc.0 as part of the poweroff sequence. -# Here, we restart udev so that the system is able to kill off the UPS inverter. -# Reference: http://www.mail-archive.com/nut-upsdev@lists.alioth.debian.org/msg01099.html -# To be sourced after the rootfs has been remounted read-only. - -if [ -f /etc/killpower ]; then -echo "Restarting udev to be able to shut the UPS inverter off..." -/etc/rc.d/rc.udev start -sleep 10 -fi diff --git a/system/nut/rc.ups b/system/nut/rc.ups deleted file mode 100644 index 37916951bd..0000000000 --- a/system/nut/rc.ups +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# Slackware startup script for Network UPS Tools -# Copyright 2010 V'yacheslav Stetskevych - -# UPS drivers live here -DRIVERPATH=/usr/libexec/nut -export PATH=$DRIVERPATH:$PATH - -POWERDOWNFLAG=/etc/killpower -NUTUSER=nut -NUTGROUP=nut -UPSDCONF=/etc/ups/upsd.conf -UPSCONF=/etc/ups/ups.conf -UPSMONCONF=/etc/ups/upsmon.conf - -# Check for existense of the nut user and group -# For slackbuilds.org, assigned nut uid/gid are 218/218. -# See http://slackbuilds.org/uid_gid.txt -if ! grep -q ^$NUTGROUP: /etc/group; then - echo " You must have a \"$NUTGROUP\" group to run this script." - echo " # groupadd -g 218 $NUTGROUP" - exit 1 -elif ! grep -q ^$NUTUSER: /etc/passwd; then - echo " You must have a \"$NUTUSER\" user to run this script." - echo " # useradd -u 218 -g $NUTGROUP -s /bin/false $NUTUSER" - exit 1 -fi - -start_driver() { - upsdrvctl -u $NUTUSER start || exit 1 -} - -start_upsd() { - upsd -u $NUTUSER || exit 1 -} - -start_upsmon() { - upsmon -u $NUTUSER || exit 1 -} - -stop() { - echo "Stopping the UPS services... " - if pgrep upsd 2>&1 >/dev/null; then - upsd -c stop; fi - if pgrep upsmon 2>&1 >/dev/null; then - upsmon -c stop; fi - upsdrvctl stop -} - -case "$1" in - start) # starts everything (for a ups server box) - mkdir -p /var/run/nut - chown $NUTUSER:$NUTGROUP /var/run/nut - chmod 0770 /var/run/nut - start_driver - start_upsd - start_upsmon - ;; - start_upsmon) # starts upsmon only (for a ups client box) - start_upsmon - ;; - stop) # stops all UPS-related daemons - stop - ;; - shutdown) # shuts down the UPS - echo "Killing inverter..." - upsdrvctl shutdown - ;; - reload) - echo "Reloading config files..." - upsd -c reload - upsmon -c reload - ;; - *) - echo "Usage: $0 {start|start_upsmon|stop|shutdown|reload}" -esac diff --git a/system/nut/slack-desc b/system/nut/slack-desc deleted file mode 100644 index c4c8a99c23..0000000000 --- a/system/nut/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -nut: nut (Network UPS Tools) -nut: -nut: The Network UPS Tools is a collection of programs which provide a -nut: common interface for monitoring and administering UPS hardware. -nut: It uses a layered apporoach to connect all the components. Drivers -nut: are provided for a wide assortment of equipment. The primary goal of -nut: the NUT project is to provide reliable monitoring of UPS hardware -nut: and ensure safe shutdowns of the systems which are connected. -nut: -nut: Homepage: http://www.networkupstools.org -nut: diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index d2d4ba4ff6..fd93bbc57a 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-driver -VERSION=${VERSION:-550.67} +VERSION=${VERSION:-550.78} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info index 09404eb52f..6240dfea02 100644 --- a/system/nvidia-driver/nvidia-driver.info +++ b/system/nvidia-driver/nvidia-driver.info @@ -1,20 +1,20 @@ PRGNAM="nvidia-driver" -VERSION="550.67" +VERSION="550.78" HOMEPAGE="https://www.nvidia.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/550.67/NVIDIA-Linux-x86_64-550.67.run \ - https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.67.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.67.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.67.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-550.67.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.67.tar.bz2" -MD5SUM_x86_64="4190c0255fa40acdae1fe00b607ae4f3 \ - c5cb3f5063b56fbb31e2442cd8c812ed \ - 36e33e89995eb937fddaf96762c30b97 \ - 3da30e7e56b8533a87f7e2f1ed1c94d4 \ - c424b165a61afe2391aa09d4c4c94d9c \ - eed570ccfceef899e6f4f58b63e25d5b" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/550.78/NVIDIA-Linux-x86_64-550.78.run \ + https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.78.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.78.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.78.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-550.78.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.78.tar.bz2" +MD5SUM_x86_64="c289987ebda8e9419a73e7e8e3409244 \ + 4fcca5040078e6dfd3a13e888a26acd1 \ + 1ec43587f9203a053eff81368b1e72e0 \ + 98fa129afe0d10881452cb1c6eaff611 \ + 315d74b2871f3021fece1d49113517fc \ + 48d62a9de216a349a07f10f7c31db56c" REQUIRES="nvidia-kernel" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/system/nvidia-fabricmanager/README b/system/nvidia-fabricmanager/README new file mode 100644 index 0000000000..99e1f1aceb --- /dev/null +++ b/system/nvidia-fabricmanager/README @@ -0,0 +1,6 @@ +The nvidia-fabricmanager manages NVLink, which is the data transfer +fabric that interconnects NVIDIA data-center GPUs. + +The driver (package nvidia-kernel on SBo) requires the +nv-fabricmanager daemon from the "exact same version" of this package +to initialize GPUs connected by NVLink. diff --git a/system/nvidia-fabricmanager/README.SBo b/system/nvidia-fabricmanager/README.SBo new file mode 100644 index 0000000000..9bace49bc7 --- /dev/null +++ b/system/nvidia-fabricmanager/README.SBo @@ -0,0 +1,7 @@ +The nvidia-kernel and nvidia-driver packages on SlackBuilds.org +default to the version number and download links for consumer GPUs. + +Drivers for data-center GPUs are distributed by NVIDIA in +separate packages from that for their consumer GPUs, +usually compatible with these two packages despite bearing different +version numbers. diff --git a/system/nvidia-fabricmanager/doinst.sh.gz b/system/nvidia-fabricmanager/doinst.sh.gz Binary files differnew file mode 100644 index 0000000000..d84c6bc589 --- /dev/null +++ b/system/nvidia-fabricmanager/doinst.sh.gz diff --git a/libraries/libtorch-cxx11-abi-shared-with-deps/libtorch-cxx11-abi-shared-with-deps.SlackBuild b/system/nvidia-fabricmanager/nvidia-fabricmanager.SlackBuild index b305f42544..6da635118e 100644 --- a/libraries/libtorch-cxx11-abi-shared-with-deps/libtorch-cxx11-abi-shared-with-deps.SlackBuild +++ b/system/nvidia-fabricmanager/nvidia-fabricmanager.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for libtorch-cxx11-abi-shared-with-deps +# Slackware build script for nvidia-fabricmanager -# Copyright 2024 Johannes Schoepfer, Germany +# Copyright 2024 GUAN Xin <guanx.bac@gmail.com> from Beijing # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,9 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=libtorch-cxx11-abi-shared-with-deps -VERSION=${VERSION:-2.1.1} +PRGNAM=nvidia-fabricmanager +VERSION=${VERSION:-550.54.14} +SRCVER=${SRCVER:-$(printf "%s_%s-1" `echo $VERSION | cut -d. -f1,1` $VERSION)} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,7 +40,7 @@ if [ -z "$ARCH" ]; then fi if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 fi @@ -47,34 +48,40 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +if [ "$ARCH" = "x86_64" ]; then + SRCARCH=amd64 +else + echo "$ARCH is not supported" + exit 1 +fi + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf libtorch -unzip $CWD/$PRGNAM-$VERSION+cpu.zip -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} + -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + +cd $PKG +ar p $CWD/$PRGNAM-${SRCVER}_$SRCARCH.deb data.tar.xz | tar -Jxv -mkdir -p $PKG/opt/ -mv libtorch $PKG/opt -rmdir $PKG/opt/libtorch/bin -chmod 755 $PKG/opt/libtorch/lib/libgomp-52f2fd74.so.1 +# This file should really be under /etc but let's keep it as is for the +# least surpise of users migrated from other distributions to Slackware: +mv $PKG/usr/share/nvidia/nvswitch/fabricmanager.cfg $PKG/usr/share/nvidia/nvswitch/fabricmanager.cfg.new -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# Replace systemd files with sysvinit script +rm -fr $PKG/lib +mkdir -p $PKG/etc/rc.d +cat $CWD/rc.nvidia-fabricmanager > $PKG/etc/rc.d/rc.nvidia-fabricmanager +chmod 755 $PKG/etc/rc.d/rc.nvidia-fabricmanager mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv -t $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/share/doc/$PRGNAM/* +rm -fr $PKG/usr/share/doc +cp -t $PKG/usr/doc/$PRGNAM-$VERSION $CWD/README* cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/nvidia-fabricmanager/nvidia-fabricmanager.info b/system/nvidia-fabricmanager/nvidia-fabricmanager.info new file mode 100644 index 0000000000..d03783d698 --- /dev/null +++ b/system/nvidia-fabricmanager/nvidia-fabricmanager.info @@ -0,0 +1,10 @@ +PRGNAM="nvidia-fabricmanager" +VERSION="550.54.14" +HOMEPAGE="https://www.nvidia.com" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://developer.download.nvidia.com/compute/cuda/repos/debian12/x86_64/nvidia-fabricmanager-550_550.54.14-1_amd64.deb" +MD5SUM_x86_64="3516bc2432678f9335d8c7670d684f84" +REQUIRES="" +MAINTAINER="GUAN Xin" +EMAIL="guanx.bac@gmail.com" diff --git a/system/nvidia-fabricmanager/rc.nvidia-fabricmanager b/system/nvidia-fabricmanager/rc.nvidia-fabricmanager new file mode 100644 index 0000000000..2f90f16725 --- /dev/null +++ b/system/nvidia-fabricmanager/rc.nvidia-fabricmanager @@ -0,0 +1,75 @@ +#!/bin/sh + +# Slackware init script to start/stop/restart nvidia-fabricmanager. + +# Copyright 2024 GUAN Xin <guanx.bac@gmail.com> from Beijing +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +EXE="/usr/bin/nv-fabricmanager" +CFG="/usr/share/nvidia/nvswitch/fabricmanager.cfg" +CMD="$EXE -c $CFG" + +# Start nvidia-fabricmanager: +fabricmanager_start() { + PID=`pgrep -f "$CMD"` + if [ $PID -gt 0 ] 2>/dev/null; then + echo "nvidia-fabricmanager is already running as PID $PID" >&2 + exit 3 + elif [ -x $EXE ]; then + echo "Starting nvidia-fabricmanager: $CMD" + $CMD + fi +} + +# Stop nvidia-fabricmanager: +fabricmanager_stop() { + PID=`pgrep -f "$CMD"` + if [ $PID -gt 0 ] 2>/dev/null; then + printf 'Stopping nvidia-fabricmanager (PID %d).' $PID + kill $PID + timeout 10 tail --pid=$PID -f /dev/null + if [ $? -eq 124 ]; then + echo " Timeout." + exit 124 + fi + echo + fi +} + +# Restart nvidia-fabricmanager: +fabricmanager_restart() { + fabricmanager_stop + fabricmanager_start +} + +case "$1" in +'start') + fabricmanager_start + ;; +'stop') + fabricmanager_stop + ;; +'restart') + fabricmanager_restart + ;; +*) + echo "usage $0 start|stop|restart" + exit 2 +esac diff --git a/system/nvidia-fabricmanager/slack-desc b/system/nvidia-fabricmanager/slack-desc new file mode 100644 index 0000000000..b642a49e61 --- /dev/null +++ b/system/nvidia-fabricmanager/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +nvidia-fabricmanager: nvidia-fabricmanager (required to initialized NVLink connected GPUs) +nvidia-fabricmanager: +nvidia-fabricmanager: The nvidia-fabricmanager manages NVLink, which is the data transfer +nvidia-fabricmanager: fabric that interconnects NVIDIA data-center GPUs. +nvidia-fabricmanager: +nvidia-fabricmanager: The driver (nvidia-kernel) requires the nvidia-fabricmanager daemon +nvidia-fabricmanager: of the exact same version to initialize GPUs connected by NVLink. +nvidia-fabricmanager: +nvidia-fabricmanager: NVIDIA home page: https://www.nvidia.com/ +nvidia-fabricmanager: NVLink home page: https://www.nvidia.com/en-us/data-center/nvlink/ +nvidia-fabricmanager: diff --git a/system/nvidia-firmware/README b/system/nvidia-firmware/README deleted file mode 100644 index ba64cbc845..0000000000 --- a/system/nvidia-firmware/README +++ /dev/null @@ -1,7 +0,0 @@ -This is the proprietary firmware extracted from the NVIDIA binary driver -needed by nouveau for video decoding. - -See the documentation at freedesktop.org to see if your hardware is -supported or not. One way to find out which chip you have is by running: - - lspci -nn -d 10de: diff --git a/system/nvidia-firmware/nvidia-firmware.info b/system/nvidia-firmware/nvidia-firmware.info deleted file mode 100644 index 2e848a4635..0000000000 --- a/system/nvidia-firmware/nvidia-firmware.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="nvidia-firmware" -VERSION="325.15" -HOMEPAGE="https://wiki.freedesktop.org/nouveau/VideoAcceleration/" -DOWNLOAD="http://us.download.nvidia.com/XFree86/Linux-x86/325.15/NVIDIA-Linux-x86-325.15.run \ - https://raw.githubusercontent.com/imirkin/re-vp2/d19d818d1e05c7c68afb052073cc8a487cac8f5d/extract_firmware.py" -MD5SUM="528fc538584de6446384b9cec3099d6c \ - 7975d50a07d9cd9131dba60aef32a86f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@riseup.net" diff --git a/system/nvidia-firmware/slack-desc b/system/nvidia-firmware/slack-desc deleted file mode 100644 index 6632852ec0..0000000000 --- a/system/nvidia-firmware/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -nvidia-firmware: nvidia-firmware (video firmware for nouveau) -nvidia-firmware: -nvidia-firmware: This is the proprietary firmware extracted from the NVIDIA -nvidia-firmware: binary driver needed by nouveau for video decoding. -nvidia-firmware: -nvidia-firmware: -nvidia-firmware: -nvidia-firmware: -nvidia-firmware: -nvidia-firmware: -nvidia-firmware: diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild index 815aa79dd1..67c1a5d369 100644 --- a/system/nvidia-kernel/nvidia-kernel.SlackBuild +++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-kernel -VERSION=${VERSION:-550.67} +VERSION=${VERSION:-550.78} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info index 26efa390c4..19d0915495 100644 --- a/system/nvidia-kernel/nvidia-kernel.info +++ b/system/nvidia-kernel/nvidia-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-kernel" -VERSION="550.67" +VERSION="550.78" HOMEPAGE="https://www.nvidia.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/550.67/NVIDIA-Linux-x86_64-550.67.run" -MD5SUM_x86_64="4190c0255fa40acdae1fe00b607ae4f3" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/550.78/NVIDIA-Linux-x86_64-550.78.run" +MD5SUM_x86_64="c289987ebda8e9419a73e7e8e3409244" REQUIRES="" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/system/nvidia-legacy470-kernel/README b/system/nvidia-legacy470-kernel/README index 453a636378..7793219958 100644 --- a/system/nvidia-legacy470-kernel/README +++ b/system/nvidia-legacy470-kernel/README @@ -15,3 +15,6 @@ xorg.conf. The xf86-video-nouveau-blacklist package from /extra is required. The Nvidia 470.xx series will be supported through December 2024. + +NOTE: To build in -current with gcc14 against the new 6.9.x kernel, +pass "CURRENT=yes" to the script. diff --git a/system/nvidia-legacy470-kernel/nvidia-470.239.06-gcc14.patch b/system/nvidia-legacy470-kernel/nvidia-470.239.06-gcc14.patch new file mode 100644 index 0000000000..772236e5cf --- /dev/null +++ b/system/nvidia-legacy470-kernel/nvidia-470.239.06-gcc14.patch @@ -0,0 +1,29 @@ +diff --git a/conftest.sh b/conftest.sh +index 6e6da83..678b79c 100755 +--- a/conftest.sh ++++ b/conftest.sh +@@ -101,7 +101,8 @@ test_header_presence() { + build_cflags() { + BASE_CFLAGS="-O2 -D__KERNEL__ \ + -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \ +--nostdinc -isystem $ISYSTEM" ++-nostdinc -isystem $ISYSTEM -fshort-wchar \ ++-Wno-implicit-function-declaration -Wno-strict-prototypes" + + if [ "$OUTPUT" != "$SOURCES" ]; then + OUTPUT_CFLAGS="-I$OUTPUT/include2 -I$OUTPUT/include" +@@ -4592,8 +4592,13 @@ compile_test() { + # + CODE=" + #include <drm/drm_gem.h> ++ #if defined(NV_LINUX_IOSYS_MAP_H_PRESENT) ++ typedef struct iosys_map nv_sysio_map_t; ++ #else ++ typedef struct dma_buf_map nv_sysio_map_t; ++ #endif + int conftest_drm_gem_object_vmap_has_map_arg( +- struct drm_gem_object *obj, struct dma_buf_map *map) { ++ struct drm_gem_object *obj, nv_sysio_map_t *map) { + return obj->funcs->vmap(obj, map); + }" + diff --git a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild index ac68713929..22d852dbcd 100644 --- a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild +++ b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-legacy470-kernel VERSION=${VERSION:-470.239.06} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -89,6 +89,11 @@ find -L . \ unset ARCH +# Patch for gcc-14 in current: +if [ "${CURRENT:-no}" = "yes" ]; then + patch -p1 < $CWD/nvidia-470.239.06-gcc14.patch +fi + # CC=${CC:-gcc} suppresses an otherwise harmless "compiler mismatch" # message. If you custom-build your kernel with clang, # then pass CC=clang to this script. diff --git a/system/nvidia-open-kernel/README b/system/nvidia-open-kernel/README index 8812b2ea51..280c3d66f9 100644 --- a/system/nvidia-open-kernel/README +++ b/system/nvidia-open-kernel/README @@ -20,31 +20,47 @@ The xf86-video-nouveau-blacklist package from /extra is required. NOTES (quoted from the Nvidia driver README) -"The open flavor of kernel modules supports Turing, Ampere, and -forward. The open kernel modules cannot support GPUs before Turing, -because the open kernel modules depend on the GPU System Processor -(GSP) first introduced in Turing. +"The open flavor of kernel modules supports Turing and later GPUs. The +open kernel modules cannot support GPUs before Turing, because the open +kernel modules depend on the GPU System Processor (GSP) first +introduced in Turing. "Most features of the Linux GPU driver are supported with the open flavor of kernel modules, including CUDA, Vulkan, OpenGL, OptiX, and -X11. G-Sync with desktop GPUs is supported. Suspend, Hibernate, -and Resume power management is supported, as is Run Time D3 (RTD3) on -Ampere and later GPUs. However, in the current release, some display -and graphics features (notably: SLI, G-Sync on notebooks, preserving -video memory across power management events with -NVreg_PreserveVideoMemoryAllocations set) and NVIDIA virtual GPU -(vGPU), are not yet supported. These features will be added in -upcoming driver releases. +X11. We eventually intend for the open kernel modules to replace the +proprietary kernel modules. -"Use of the open kernel modules on GeForce and Workstation GPUs should -be considered alpha-quality in this release due to the missing features -listed above." +"The following features will only work with the open kernel modules +flavor of the driver: -To use this module on these GPUs, pass GEFORCE=yes to the script. + o NVIDIA Confidential Computing -PLEASE NOTE that ffmpeg hardware video encoding will NOT work with this -module. If you need this functionality, you MUST use the nvidia-kernel -script which builds from the proprietary release package. + o Magnum IO GPUDirect Storage (GDS) + + o Heterogeneous Memory Management (HMM) + + o CPU affinity for GPU fault handlers + + o DMABUF support for CUDA allocations + + +"The following features are not yet supported by the open kernel +modules: + + o G-Sync on notebooks + + o Preserving video memory across power management events + + +Use of the open kernel modules on GeForce and Workstation GPUs should +be considered Beta quality in this release and no longer requires +setting of the "NVreg_OpenRmEnableUnsupportedGpus" nvidia.ko kernel +module parameter. The open kernel modules are suitable for broad +usage, and NVIDIA requests feedback on any issues encountered that are +specific to them." After installation, you will need to reboot your computer for the changes to take effect. + +I am happy to report that ffmpeg hardware video encoding via h264_nvenc +and hevc_nvenc now WORKS with this module. diff --git a/system/nvidia-open-kernel/geforce.conf b/system/nvidia-open-kernel/geforce.conf deleted file mode 100644 index 9753fd91b4..0000000000 --- a/system/nvidia-open-kernel/geforce.conf +++ /dev/null @@ -1 +0,0 @@ -options nvidia NVreg_OpenRmEnableUnsupportedGpus=1 diff --git a/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild b/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild index 90290c7438..2b537d8023 100644 --- a/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild +++ b/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-open-kernel -VERSION=${VERSION:-550.67} +VERSION=${VERSION:-550.78} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -101,13 +101,6 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER cp -a README.md CHANGELOG.md SECURITY.md $PKG/usr/doc/$PRGNAM-$PKGVER cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild -# Geforce and workstation GPUs are not yet fully supported, -# so we need this if you are on those GPUs: -if [ "${GEFORCE:-no}" = "yes" ]; then - mkdir -p $PKG/etc/modprobe.d - cat $CWD/geforce.conf > $PKG/etc/modprobe.d/geforce.conf -fi - mkdir -p $PKG/install sed "s%@VERSION@%$VERSION%" $CWD/slack-desc > $PKG/install/slack-desc sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/system/nvidia-open-kernel/nvidia-open-kernel.info b/system/nvidia-open-kernel/nvidia-open-kernel.info index 17dbf177dd..eb2890eb1b 100644 --- a/system/nvidia-open-kernel/nvidia-open-kernel.info +++ b/system/nvidia-open-kernel/nvidia-open-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-open-kernel" -VERSION="550.67" +VERSION="550.78" HOMEPAGE="https://github.com/NVIDIA/open-gpu-kernel-modules/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-550.67.tar.xz" -MD5SUM_x86_64="044025c997205dc165e95084d40aa775" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-550.78.tar.xz" +MD5SUM_x86_64="fd8640459f2b68ae2f8f98bc795707e8" REQUIRES="" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/system/onefetch/onefetch-misc-2.20.0.tar b/system/onefetch/onefetch-misc-2.21.0.tar Binary files differindex 54b3c948e5..a87b1e3c71 100644 --- a/system/onefetch/onefetch-misc-2.20.0.tar +++ b/system/onefetch/onefetch-misc-2.21.0.tar diff --git a/system/onefetch/onefetch.SlackBuild b/system/onefetch/onefetch.SlackBuild index 413c9f57ea..090e13bb68 100644 --- a/system/onefetch/onefetch.SlackBuild +++ b/system/onefetch/onefetch.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=onefetch -VERSION=${VERSION:-2.20.0} +VERSION=${VERSION:-2.21.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/onefetch/onefetch.info b/system/onefetch/onefetch.info index 7f07c5ee44..813c1a7955 100644 --- a/system/onefetch/onefetch.info +++ b/system/onefetch/onefetch.info @@ -1,7 +1,7 @@ PRGNAM="onefetch" -VERSION="2.20.0" +VERSION="2.21.0" HOMEPAGE="https://github.com/o2sh/onefetch" -DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz \ +DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.21.0/onefetch-2.21.0.tar.gz \ https://static.crates.io/crates/addr2line/addr2line-0.19.0.crate \ https://static.crates.io/crates/adler/adler-1.0.2.crate \ https://static.crates.io/crates/ahash/ahash-0.7.7.crate \ @@ -18,14 +18,14 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.1.crate \ https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.0.crate \ https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.1.crate \ - https://static.crates.io/crates/anyhow/anyhow-1.0.75.crate \ + https://static.crates.io/crates/anyhow/anyhow-1.0.83.crate \ https://static.crates.io/crates/arc-swap/arc-swap-1.6.0.crate \ https://static.crates.io/crates/arrayvec/arrayvec-0.7.4.crate \ https://static.crates.io/crates/askalono/askalono-0.4.6.crate \ https://static.crates.io/crates/atty/atty-0.2.14.crate \ https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \ https://static.crates.io/crates/backtrace/backtrace-0.3.67.crate \ - https://static.crates.io/crates/base64/base64-0.22.0.crate \ + https://static.crates.io/crates/base64/base64-0.22.1.crate \ https://static.crates.io/crates/bit_field/bit_field-0.10.2.crate \ https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \ https://static.crates.io/crates/bitflags/bitflags-2.4.1.crate \ @@ -36,15 +36,15 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/bstr/bstr-1.8.0.crate \ https://static.crates.io/crates/btoi/btoi-0.4.3.crate \ https://static.crates.io/crates/bumpalo/bumpalo-3.13.0.crate \ - https://static.crates.io/crates/byte-unit/byte-unit-5.1.2.crate \ + https://static.crates.io/crates/byte-unit/byte-unit-5.1.4.crate \ https://static.crates.io/crates/bytecheck/bytecheck-0.6.11.crate \ https://static.crates.io/crates/bytecheck_derive/bytecheck_derive-0.6.11.crate \ - https://static.crates.io/crates/bytecount/bytecount-0.6.7.crate \ + https://static.crates.io/crates/bytecount/bytecount-0.6.8.crate \ https://static.crates.io/crates/bytemuck/bytemuck-1.13.1.crate \ https://static.crates.io/crates/byteorder/byteorder-1.4.3.crate \ https://static.crates.io/crates/bytes/bytes-1.5.0.crate \ https://static.crates.io/crates/byteyarn/byteyarn-0.2.3.crate \ - https://static.crates.io/crates/cargo_toml/cargo_toml-0.19.1.crate \ + https://static.crates.io/crates/cargo_toml/cargo_toml-0.20.2.crate \ https://static.crates.io/crates/cast/cast-0.3.0.crate \ https://static.crates.io/crates/cc/cc-1.0.79.crate \ https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \ @@ -56,10 +56,10 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/ciborium-io/ciborium-io-0.2.1.crate \ https://static.crates.io/crates/ciborium-ll/ciborium-ll-0.2.1.crate \ https://static.crates.io/crates/clap/clap-2.34.0.crate \ - https://static.crates.io/crates/clap/clap-4.5.3.crate \ + https://static.crates.io/crates/clap/clap-4.5.4.crate \ https://static.crates.io/crates/clap_builder/clap_builder-4.5.2.crate \ - https://static.crates.io/crates/clap_complete/clap_complete-4.5.1.crate \ - https://static.crates.io/crates/clap_derive/clap_derive-4.5.3.crate \ + https://static.crates.io/crates/clap_complete/clap_complete-4.5.2.crate \ + https://static.crates.io/crates/clap_derive/clap_derive-4.5.4.crate \ https://static.crates.io/crates/clap_lex/clap_lex-0.7.0.crate \ https://static.crates.io/crates/clru/clru-0.6.1.crate \ https://static.crates.io/crates/cmake/cmake-0.1.50.crate \ @@ -74,11 +74,11 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/criterion/criterion-0.5.1.crate \ https://static.crates.io/crates/criterion-plot/criterion-plot-0.5.0.crate \ https://static.crates.io/crates/crossbeam/crossbeam-0.8.2.crate \ - https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.9.crate \ + https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.12.crate \ https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.3.crate \ https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.15.crate \ https://static.crates.io/crates/crossbeam-queue/crossbeam-queue-0.3.8.crate \ - https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.17.crate \ + https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.19.crate \ https://static.crates.io/crates/crunchy/crunchy-0.2.2.crate \ https://static.crates.io/crates/crypto-common/crypto-common-0.1.6.crate \ https://static.crates.io/crates/dashmap/dashmap-4.0.2.crate \ @@ -124,10 +124,10 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/getrandom/getrandom-0.2.10.crate \ https://static.crates.io/crates/gif/gif-0.13.1.crate \ https://static.crates.io/crates/gimli/gimli-0.27.3.crate \ - https://static.crates.io/crates/gix/gix-0.60.0.crate \ + https://static.crates.io/crates/gix/gix-0.62.0.crate \ https://static.crates.io/crates/gix-actor/gix-actor-0.27.0.crate \ https://static.crates.io/crates/gix-actor/gix-actor-0.28.1.crate \ - https://static.crates.io/crates/gix-actor/gix-actor-0.31.0.crate \ + https://static.crates.io/crates/gix-actor/gix-actor-0.31.1.crate \ https://static.crates.io/crates/gix-attributes/gix-attributes-0.19.0.crate \ https://static.crates.io/crates/gix-attributes/gix-attributes-0.22.2.crate \ https://static.crates.io/crates/gix-bitmap/gix-bitmap-0.2.11.crate \ @@ -135,20 +135,20 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/gix-command/gix-command-0.3.6.crate \ https://static.crates.io/crates/gix-commitgraph/gix-commitgraph-0.21.0.crate \ https://static.crates.io/crates/gix-commitgraph/gix-commitgraph-0.24.2.crate \ - https://static.crates.io/crates/gix-config/gix-config-0.36.0.crate \ + https://static.crates.io/crates/gix-config/gix-config-0.36.1.crate \ https://static.crates.io/crates/gix-config-value/gix-config-value-0.14.6.crate \ https://static.crates.io/crates/gix-date/gix-date-0.8.5.crate \ - https://static.crates.io/crates/gix-diff/gix-diff-0.42.0.crate \ - https://static.crates.io/crates/gix-dir/gix-dir-0.2.0.crate \ + https://static.crates.io/crates/gix-diff/gix-diff-0.43.0.crate \ + https://static.crates.io/crates/gix-dir/gix-dir-0.4.1.crate \ https://static.crates.io/crates/gix-discover/gix-discover-0.26.0.crate \ https://static.crates.io/crates/gix-discover/gix-discover-0.31.0.crate \ https://static.crates.io/crates/gix-features/gix-features-0.35.0.crate \ https://static.crates.io/crates/gix-features/gix-features-0.36.1.crate \ https://static.crates.io/crates/gix-features/gix-features-0.38.1.crate \ - https://static.crates.io/crates/gix-filter/gix-filter-0.11.0.crate \ + https://static.crates.io/crates/gix-filter/gix-filter-0.11.1.crate \ https://static.crates.io/crates/gix-fs/gix-fs-0.7.0.crate \ https://static.crates.io/crates/gix-fs/gix-fs-0.8.1.crate \ - https://static.crates.io/crates/gix-fs/gix-fs-0.10.1.crate \ + https://static.crates.io/crates/gix-fs/gix-fs-0.10.2.crate \ https://static.crates.io/crates/gix-glob/gix-glob-0.13.0.crate \ https://static.crates.io/crates/gix-glob/gix-glob-0.16.2.crate \ https://static.crates.io/crates/gix-hash/gix-hash-0.13.3.crate \ @@ -158,7 +158,7 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/gix-ignore/gix-ignore-0.8.0.crate \ https://static.crates.io/crates/gix-ignore/gix-ignore-0.11.2.crate \ https://static.crates.io/crates/gix-index/gix-index-0.25.0.crate \ - https://static.crates.io/crates/gix-index/gix-index-0.31.0.crate \ + https://static.crates.io/crates/gix-index/gix-index-0.32.1.crate \ https://static.crates.io/crates/gix-lock/gix-lock-10.0.0.crate \ https://static.crates.io/crates/gix-lock/gix-lock-11.0.1.crate \ https://static.crates.io/crates/gix-lock/gix-lock-13.1.1.crate \ @@ -166,12 +166,12 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/gix-mailmap/gix-mailmap-0.23.0.crate \ https://static.crates.io/crates/gix-object/gix-object-0.37.0.crate \ https://static.crates.io/crates/gix-object/gix-object-0.38.0.crate \ - https://static.crates.io/crates/gix-object/gix-object-0.42.0.crate \ - https://static.crates.io/crates/gix-odb/gix-odb-0.59.0.crate \ - https://static.crates.io/crates/gix-pack/gix-pack-0.49.0.crate \ - https://static.crates.io/crates/gix-packetline-blocking/gix-packetline-blocking-0.17.3.crate \ + https://static.crates.io/crates/gix-object/gix-object-0.42.1.crate \ + https://static.crates.io/crates/gix-odb/gix-odb-0.60.0.crate \ + https://static.crates.io/crates/gix-pack/gix-pack-0.50.0.crate \ + https://static.crates.io/crates/gix-packetline-blocking/gix-packetline-blocking-0.17.4.crate \ https://static.crates.io/crates/gix-path/gix-path-0.10.7.crate \ - https://static.crates.io/crates/gix-pathspec/gix-pathspec-0.7.1.crate \ + https://static.crates.io/crates/gix-pathspec/gix-pathspec-0.7.4.crate \ https://static.crates.io/crates/gix-quote/gix-quote-0.4.12.crate \ https://static.crates.io/crates/gix-ref/gix-ref-0.38.0.crate \ https://static.crates.io/crates/gix-ref/gix-ref-0.43.0.crate \ @@ -180,20 +180,20 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/gix-revwalk/gix-revwalk-0.8.0.crate \ https://static.crates.io/crates/gix-revwalk/gix-revwalk-0.13.0.crate \ https://static.crates.io/crates/gix-sec/gix-sec-0.10.6.crate \ - https://static.crates.io/crates/gix-status/gix-status-0.7.0.crate \ + https://static.crates.io/crates/gix-status/gix-status-0.9.0.crate \ https://static.crates.io/crates/gix-submodule/gix-submodule-0.10.0.crate \ https://static.crates.io/crates/gix-tempfile/gix-tempfile-10.0.0.crate \ https://static.crates.io/crates/gix-tempfile/gix-tempfile-11.0.1.crate \ https://static.crates.io/crates/gix-tempfile/gix-tempfile-13.1.1.crate \ https://static.crates.io/crates/gix-testtools/gix-testtools-0.13.0.crate \ - https://static.crates.io/crates/gix-trace/gix-trace-0.1.8.crate \ + https://static.crates.io/crates/gix-trace/gix-trace-0.1.9.crate \ https://static.crates.io/crates/gix-traverse/gix-traverse-0.33.0.crate \ - https://static.crates.io/crates/gix-traverse/gix-traverse-0.38.0.crate \ - https://static.crates.io/crates/gix-url/gix-url-0.27.2.crate \ - https://static.crates.io/crates/gix-utils/gix-utils-0.1.11.crate \ + https://static.crates.io/crates/gix-traverse/gix-traverse-0.39.0.crate \ + https://static.crates.io/crates/gix-url/gix-url-0.27.3.crate \ + https://static.crates.io/crates/gix-utils/gix-utils-0.1.12.crate \ https://static.crates.io/crates/gix-validate/gix-validate-0.8.4.crate \ https://static.crates.io/crates/gix-worktree/gix-worktree-0.26.0.crate \ - https://static.crates.io/crates/gix-worktree/gix-worktree-0.32.0.crate \ + https://static.crates.io/crates/gix-worktree/gix-worktree-0.33.1.crate \ https://static.crates.io/crates/glob/glob-0.3.1.crate \ https://static.crates.io/crates/globset/globset-0.4.14.crate \ https://static.crates.io/crates/globwalk/globwalk-0.8.1.crate \ @@ -217,8 +217,8 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/ignore/ignore-0.4.20.crate \ https://static.crates.io/crates/image/image-0.24.9.crate \ https://static.crates.io/crates/imara-diff/imara-diff-0.1.5.crate \ - https://static.crates.io/crates/indexmap/indexmap-2.0.0.crate \ - https://static.crates.io/crates/insta/insta-1.34.0.crate \ + https://static.crates.io/crates/indexmap/indexmap-2.2.6.crate \ + https://static.crates.io/crates/insta/insta-1.38.0.crate \ https://static.crates.io/crates/instant/instant-0.1.12.crate \ https://static.crates.io/crates/inventory/inventory-0.3.11.crate \ https://static.crates.io/crates/io-close/io-close-0.3.7.crate \ @@ -234,7 +234,7 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/kstring/kstring-2.0.0.crate \ https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \ https://static.crates.io/crates/lebe/lebe-0.5.2.crate \ - https://static.crates.io/crates/libc/libc-0.2.153.crate \ + https://static.crates.io/crates/libc/libc-0.2.154.crate \ https://static.crates.io/crates/libm/libm-0.2.7.crate \ https://static.crates.io/crates/libz-ng-sys/libz-ng-sys-1.1.9.crate \ https://static.crates.io/crates/linked-hash-map/linked-hash-map-0.5.6.crate \ @@ -263,7 +263,7 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/os_info/os_info-3.7.0.crate \ https://static.crates.io/crates/owo-colors/owo-colors-3.5.0.crate \ https://static.crates.io/crates/parking_lot/parking_lot-0.11.2.crate \ - https://static.crates.io/crates/parking_lot/parking_lot-0.12.1.crate \ + https://static.crates.io/crates/parking_lot/parking_lot-0.12.2.crate \ https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.8.6.crate \ https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.8.crate \ https://static.crates.io/crates/parse-zoneinfo/parse-zoneinfo-0.3.0.crate \ @@ -308,8 +308,8 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.16.crate \ https://static.crates.io/crates/redox_syscall/redox_syscall-0.3.5.crate \ https://static.crates.io/crates/redox_users/redox_users-0.4.3.crate \ - https://static.crates.io/crates/regex/regex-1.10.2.crate \ - https://static.crates.io/crates/regex-automata/regex-automata-0.4.3.crate \ + https://static.crates.io/crates/regex/regex-1.10.4.crate \ + https://static.crates.io/crates/regex-automata/regex-automata-0.4.6.crate \ https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \ https://static.crates.io/crates/relative-path/relative-path-1.8.0.crate \ https://static.crates.io/crates/rend/rend-0.4.1.crate \ @@ -317,8 +317,8 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/rkyv_derive/rkyv_derive-0.7.43.crate \ https://static.crates.io/crates/rmp/rmp-0.8.11.crate \ https://static.crates.io/crates/rmp-serde/rmp-serde-0.14.4.crate \ - https://static.crates.io/crates/rstest/rstest-0.18.2.crate \ - https://static.crates.io/crates/rstest_macros/rstest_macros-0.18.2.crate \ + https://static.crates.io/crates/rstest/rstest-0.19.0.crate \ + https://static.crates.io/crates/rstest_macros/rstest_macros-0.19.0.crate \ https://static.crates.io/crates/rust_decimal/rust_decimal-1.33.1.crate \ https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.23.crate \ https://static.crates.io/crates/rustc_version/rustc_version-0.4.0.crate \ @@ -330,11 +330,11 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/scopeguard/scopeguard-1.1.0.crate \ https://static.crates.io/crates/seahash/seahash-4.1.0.crate \ https://static.crates.io/crates/semver/semver-1.0.17.crate \ - https://static.crates.io/crates/serde/serde-1.0.197.crate \ - https://static.crates.io/crates/serde_derive/serde_derive-1.0.197.crate \ - https://static.crates.io/crates/serde_json/serde_json-1.0.108.crate \ + https://static.crates.io/crates/serde/serde-1.0.200.crate \ + https://static.crates.io/crates/serde_derive/serde_derive-1.0.200.crate \ + https://static.crates.io/crates/serde_json/serde_json-1.0.116.crate \ https://static.crates.io/crates/serde_spanned/serde_spanned-0.6.4.crate \ - https://static.crates.io/crates/serde_yaml/serde_yaml-0.9.27.crate \ + https://static.crates.io/crates/serde_yaml/serde_yaml-0.9.34+deprecated.crate \ https://static.crates.io/crates/sha1_smol/sha1_smol-1.0.0.crate \ https://static.crates.io/crates/sha2/sha2-0.10.7.crate \ https://static.crates.io/crates/shell-words/shell-words-1.1.0.crate \ @@ -367,10 +367,10 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.47.crate \ https://static.crates.io/crates/thread_local/thread_local-1.1.4.crate \ https://static.crates.io/crates/tiff/tiff-0.9.0.crate \ - https://static.crates.io/crates/time/time-0.3.34.crate \ + https://static.crates.io/crates/time/time-0.3.36.crate \ https://static.crates.io/crates/time-core/time-core-0.1.2.crate \ https://static.crates.io/crates/time-humanize/time-humanize-0.1.3.crate \ - https://static.crates.io/crates/time-macros/time-macros-0.2.17.crate \ + https://static.crates.io/crates/time-macros/time-macros-0.2.18.crate \ https://static.crates.io/crates/tinytemplate/tinytemplate-1.2.1.crate \ https://static.crates.io/crates/tinyvec/tinyvec-1.6.0.crate \ https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.1.crate \ @@ -397,7 +397,7 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.9.crate \ https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.22.crate \ https://static.crates.io/crates/unicode-width/unicode-width-0.1.10.crate \ - https://static.crates.io/crates/unsafe-libyaml/unsafe-libyaml-0.2.10.crate \ + https://static.crates.io/crates/unsafe-libyaml/unsafe-libyaml-0.2.11.crate \ https://static.crates.io/crates/url/url-2.5.0.crate \ https://static.crates.io/crates/utf8-width/utf8-width-0.1.6.crate \ https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \ @@ -452,7 +452,6 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/winres/winres-0.1.12.crate \ https://static.crates.io/crates/wyz/wyz-0.5.1.crate \ https://static.crates.io/crates/xz2/xz2-0.1.7.crate \ - https://static.crates.io/crates/yaml-rust/yaml-rust-0.4.5.crate \ https://static.crates.io/crates/yansi/yansi-0.5.1.crate \ https://static.crates.io/crates/zerocopy/zerocopy-0.7.32.crate \ https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.7.32.crate \ @@ -460,7 +459,7 @@ DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz https://static.crates.io/crates/zstd-safe/zstd-safe-5.0.2+zstd.1.5.2.crate \ https://static.crates.io/crates/zstd-sys/zstd-sys-2.0.8+zstd.1.5.5.crate \ https://static.crates.io/crates/zune-inflate/zune-inflate-0.2.54.crate" -MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ +MD5SUM="a5ef2e3716b8c1a202fc259b8395afda \ b8e7ee27350aad1efd1cbe7a6a32c551 \ 669215548c64019c08c92b2c1afd3deb \ 9651c5e4f543baa1936451ff40d8a322 \ @@ -477,14 +476,14 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ a6c4e3f7eda9068fe0049c291e8e7d89 \ d2453c99c7af98286c2dc9017a8dba6d \ b57fd47f132f32001e0d4bfc4621f1bf \ - 39a78bec5a0ae75f210c1f67250152b0 \ + d750070888d80c68a85ebbdd428c847e \ b7916cf807e8e1e3d0bc59b71f7f2500 \ 504b5d258d68bdb980c997b93f0c6e6e \ 7e55e25f387145f36dbfa9ff2390e0ae \ 142cb4b9a653e56e56311f0c883b8582 \ 05d77ef52e90ad161fdd41b252420467 \ 58637599fb4e68ecbca68939709aca1a \ - 2b85559c818ca984fc61f5e7ef3ccf24 \ + 20084c4c04bcc06fd3d7ff662deca706 \ 521abf54ccebb983d14c40f47a908a97 \ a295edb6953237ebbdfa8e731229f9a3 \ ebcf604c44976809506192718f439dc1 \ @@ -495,15 +494,15 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ 494bc55e3713f1e861b0b6ae328a40f4 \ 841b2dfaad47fc76cd42a45e074a1e78 \ e77008d07412b61bb1b5d67c5758c95d \ - 39cfa6f22ef51646096b072638f7d17c \ + a8ada3e30f22f0ad4d25ce76c130c60d \ ba444785b3772c818677c4ccd42ee16f \ 4a30bb499d535a719fca7f7775ff29d6 \ - d2ff6bc07572bd5842794cc70cc0733a \ + 96778ea2eff9b39c42d90967ec6adce2 \ 9a279086f2974a706e1f62fb2aac1e4c \ 1e704be5ddde9d6b5383ef1035309f91 \ 51ed49380bb7d086c005208e805983b2 \ d733a7dcbaf0a4bc44e4fef568dcee32 \ - c1d1de018112c1d2d855fa7808a9f6f3 \ + 1cf66c610dd5a19dac21a4af105ef97c \ f686e99053239b98e9aca46c3e06c6f9 \ 7d83f411bb22318c65fec8bbee937ece \ 74634128440dbc3766bda76fdf0aaa05 \ @@ -515,10 +514,10 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ aa7628187a64682bef0500d38db6b309 \ 435b8bef0d3bd0b0ab5297728f1073c2 \ 59ae9122b2946d4d52bc48a1da5c5e06 \ - b444496ca4d820b2c75bd6ca4f269126 \ + ec573c80325dcb85a463103cf3878a73 \ 6a7300e86333500f11f30e3e20e68808 \ - 31f09812c68c3d67e0abc29ebcf74f1a \ - fae4ac14d3f6db474aad2d3c73649420 \ + 4703ffb8b0409bcc4aff2642a748a9ce \ + 008b5f551130ca3eb7265bce27e0144b \ f780b94573a4c3e9261b0ef07ace6529 \ b4b717e9ccaca16de32c52b11e851916 \ 54e4adfd2d64f037c5115993a5da57b2 \ @@ -533,11 +532,11 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ c3ca987d21c9d0af2c1e9794f70e7175 \ 4cb359fe1ce3ec8463a78cabc468037e \ 275b369d81fc7f92f4ad2a7adc6ca74b \ - 41cea5adc01c6c125dd675cff2559fed \ + 86c345cb693c291362662b0eb437af89 \ fd98c74ef4f8e5abcd938173ae8e2ab5 \ 9970b72159dfdaf0ebb3eab0edfd37a4 \ 075bba4c4ec3da4784a8842db294845c \ - f990d49f0e0b507415b06dfac2b02a36 \ + 398f4cce1d3067cc7a56662e52a33384 \ 32e5a346cb92729cf6c2d8d0e8202c73 \ 89e88633cab0e4b6f3d3878b84dffe8b \ 42707c74fb3d19c2457f8b1f36136bce \ @@ -583,10 +582,10 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ f204ba6fc9394724826f177433fe9a98 \ 2ec5419c5ca1c626f0b158e5ebec75d4 \ ff87974aed9ddf2f97785fae88b9027a \ - db79900dbfc6f8c7433f6d2f3a6c2e20 \ + c06610e40e360dade48f5574cab4c18b \ 0947453e2549f2345bb78b3960bc5c43 \ fdd2e9f2c895cf626e0e94dfc14ad78d \ - 05e7099ffe7a6978b92850e2dc25836a \ + 0fef5601b4a1577fb338eb5cc57e5fb2 \ e1af794e9888f836976bc09d0a77bf72 \ f37c2af51761ee99148accc64a789dbc \ 101226d32a04adc0a4232050dbf85056 \ @@ -594,20 +593,20 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ 980abe4b3b80e451332e7f38105425d6 \ 026d80b53333b71b18854ceb02e958b0 \ 3b8e59515d02078032fbf89d2f7b47ec \ - 34659f460f1c9d7d938d167b3ae322ff \ + 39c6b05cc140ad30eb693bae4b43672e \ 2f1beb665ae673db2d89821a436b1cef \ e1aa1cf30530143595c6efaa1823731d \ - b93d074890d39df694839d7d7abf0e48 \ - cc547438ab5a5d0b50014083f57e2d32 \ + 314cb8742040d4d738d79b01a96dfd85 \ + 1e6c5403299f615f276911c8e1441ef6 \ ecf93232214d1e643e3b4cc76374db4b \ ced6fbb4456383135131cc616b75df8c \ 258cc63567b01321d5090b3a4895d79a \ 674f63065bbac7ced2770b0b5f02e749 \ fadaf8220f83f0ac4b8323919f2f5084 \ - 94051695cf569c0684d6f79b9ee20c9d \ + 426bb4dd55249aeb37cd9ad15af528d1 \ c6234296409a24272b1783b8e1034385 \ ed939afc9dc6b2d98622184d1404933a \ - 8720b43335c8f32a89d01c8596aa428c \ + a54b547b14359df46e6a059c7d955b42 \ 226c77aabe608ec895e09eb138ad6fdb \ 67fe1df33f7a2b122066176117d068f5 \ e949ccbcbb010c4e05896ab14562bf86 \ @@ -617,7 +616,7 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ dc2287b30f0ddde28a3afbca83f252b3 \ 1fa83fef2a7b9fc99c31de029f660d70 \ 7a91807db2398fae9834f664a963c076 \ - 062d496249d9639508c106a2a393d199 \ + 9b673d00ec71fba2718dd4b6973d3bf8 \ 03ef15a9cfe3d6befacd9ff7cdbd1634 \ d4d0effc77b6f82b37e0c783382711bd \ fd74cb12863c361e5e96d73cd7f4539e \ @@ -625,12 +624,12 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ b825bef7d62cf8e4e7d01968264e6a2f \ ed01e512e43388faba720890b368b164 \ c552aefe481234861e76c933da373d78 \ - ad5436ea271f08706a1fd7430f034d58 \ - 0ebc0020bfa6e96a49bc2d6ab110023c \ - d241450b0e03845ade667e536f021376 \ - d1520e89eee5687482d00bbf693732ef \ + 3f1c56b3274498b8eda27c5dd69b166d \ + f5a333c4c878bded7fce59e11ba860ad \ + e5679249e04e995db5cb3cc7512e17c8 \ + 985d331d661a642b72570dc2d9ce6fb3 \ afb7f0126b110b2b69385e7da7b038ee \ - 2db9ac38028a9e4a835694b3ee2ad1e4 \ + 999d93243e6b76c20ef1062dab382cd1 \ 539588dc3151dd1a2eafb1abc1b328e7 \ 97ce0b3fde37ca86ec399a8832dd909e \ 356b4a97654b1166cc19d2e01c50f285 \ @@ -639,20 +638,20 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ c511739ea5d706ec5514605c3822ee22 \ bc9add4fa8e8d6925b1cabe74e7ac108 \ a865ed2b74e73c390f769b702aa02713 \ - fc67bbd30be33b63741209b920e248f2 \ + 15f69f7d8a3a6b4c9cbbf1cb300e8a6d \ 3d177ac594201061c57c199cea0b1156 \ 3952f33e9615f0c3cb881de6973470ed \ 0659f4d8c73fba300470c8b507ea59e7 \ 82efaf83a661ed30807897cac0c128b5 \ 8b073553327fe547d0b367cfcd81bb59 \ - 2853be6b1b40b0e9731893a50660915a \ + 22c18c8034a833c91bb51cbd1433fd13 \ 65fbc7f054a0295660ccd6ceb6dac760 \ - dc2df652164cf85a1056a2e4e89f62b3 \ - c6bdde89a5ba20c1047647566c78f32d \ - e9ba7f6e1efec40f348488b04a50e5a6 \ + f3d291021e5b6e50eeb22391a21aa9f7 \ + 7ec3b6baf798700701969961379d9958 \ + 102dd5ccf7f0e35f281febc864643590 \ 6cf5295ccac485b29e978e762b0f3d8a \ 7baeb96294a80f18ce722ec603737044 \ - e671fc1401198c93ba9b382795fcbdcc \ + 2b77a416cc13c6701bb061a600038bc8 \ 2d6d28ec311884da69bcaf320ada8ad5 \ 423ea3c18df8759400c3d0a381738c64 \ 28fb2d3e8fbb4c9df2e53c8a6c7f3e88 \ @@ -676,8 +675,8 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ bdee49940363352f112ccce7ee1f504d \ 785764aa3ae2b351594278ed45a69aa6 \ 4debd3be7deef9489df4d04841cbb631 \ - 18dfeab855ade5255a7f1a68b0151b7a \ - ae1f7ca9b9189b6fa16f8db780fc79f1 \ + 75d480d43a87d733f9f497c647f7d973 \ + 55c872a11330d783758483aa43f2e94b \ 5f153f7135dceb02f88266121c836b4e \ 95f8af69264003b0fe9bc5e687ec80d3 \ 7d58a2a23cd19ed8e889afdbeb7986b1 \ @@ -693,7 +692,7 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ 0c07198f804f9c9788567f8c061acaec \ fba3b040a55c01be7376d3dd5c4d4920 \ 2db26dd3b5201776a36e40217bfdfe26 \ - 49d77531898b3d7846b149c0fb4788c4 \ + 0bc840b564ce2b698189d5b204538624 \ 71bf1bf53c8321f7f1cbc13575353d6b \ b4c849c8ee20bb24d1dab019f8a020f0 \ ef352de59e1b26277213640319c87e88 \ @@ -722,7 +721,7 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ 0aa601dab19b62c32def2e7be85d50b3 \ aa7024f7b3b6cc9c16f218c076a31ccc \ 12e4ba5909e1f30b9142932571eaa4da \ - 1be45f99109d447849f4244b58c5a470 \ + 9d6c117b30034665155c9e6852b86e88 \ b1713fb3ae03d434680cff5fb4c14144 \ ad1239c8377e9764ee2924fadcc73c5f \ 7fb976dbf9428d88125a556348db0ddb \ @@ -767,8 +766,8 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ 16111f31a29feae4ce4a324b83dc0189 \ 782ea88d8e5b517b1c9e7d870e20e9e3 \ 2793ed3e6807d79ff72271baec586531 \ - e90f2809a34e2bea0bd5c1120475fb36 \ - 4f496143a21775fa7bd22bf329c37f37 \ + e19600513eaf0823f25a621088b44d2c \ + 520b920d0c711ec1a17fb19a6060446a \ 91b60a71d44302a8b05bd398eca56c37 \ 56a4d4b53f05b81e881428f327bbd19b \ 1c9a7182c62a3f9ea6f81420f3766f6b \ @@ -776,8 +775,8 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ 66c01e9bd7f3d1463a3da113eb280a1a \ 3677dde35602658c64bcab434a0d053b \ 2d7d5aa79ff9ed90aa9a1ab6ce32d2f0 \ - 0643d5949f80b6e187ef39a5f9a325c0 \ - 7bd723f44b24fc491c1923c7a59bc364 \ + 97446d04ea526bf0a22d529026f5c1d9 \ + 364d64916f288f9cef824c9688915cf7 \ 28dd2ad9373e97891cb7ed3444aaa3b7 \ 24fcbc2986fad09b25c9a4f9aef0a9e4 \ fdf3aa5e1f6c33e4f68b0f7b08e1e94e \ @@ -789,11 +788,11 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ b4a0a98a54439a5a37952c8879187ee3 \ 8046df86e976ce7ef8954e916f0e7f74 \ eb6238cbf278a63e0afc0804cf527c62 \ - 956ace3f4e2b8a6ac55aa74549cc38de \ - e8b93865e80b67f03df2faa417960b88 \ - 3ed0ebc631b1840f3be21e1ba07fa4ed \ + 9b1baf93cc8caada556e1c45a6f013e0 \ + ff73672601880795d1c901014787924f \ + ecf1e501541e064d3e96172bd0f3c709 \ 07174ad3942b5dba8d02f628a4f56792 \ - 822665dbb2a2d1974965080ab74a89b2 \ + 39e3168b0ff2d77bcca05882310b2a06 \ 74d8afce717ff89fb2cb5141f121782b \ 00f467980f89a77f541dab0e421480e8 \ ce622fdb8d18cd1c13ed8fadc5400c10 \ @@ -826,10 +825,10 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ cb03f4cb4d4a71fc2b6a41875cc9b005 \ d03f75b223b8c2a58c73971ec0227fc0 \ 4a9c9f7d6e764b4abefee62fe610edab \ - 00a1017b4831ad4073be63ee145f37f1 \ + 19e6e4e45004e2b023e49e37c34b4e31 \ 7818a75208424a6d05d1d868559f0adf \ 70b96eca0359f82c818eee7615d6ee21 \ - 4875c5068f17bbcd90afbff582925a0a \ + cbfa351bd29e3779266c82b3996fc9ab \ a160b14e423954c978ca95aa78ca4210 \ 5f0470696baaa4e5953bddbf196998f9 \ c678a7da0ee4b850ebde0474144a0415 \ @@ -856,7 +855,7 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ 2e6f3d2a4c7414137fa48dfd73678840 \ c12d182417999fc365f952e701f6071f \ 7d6d4fc9fad200d6e295f6930e97e022 \ - 428fc5d72716c000ce20267887878be2 \ + a8c6d404eec9e0efc975e65312b76228 \ e547b0e754cd61f24f9ef8c9e26fcd95 \ 86baecce43858faab832d3ddf3bf800f \ ceee1159c41351d05f4cf705490867b3 \ @@ -911,7 +910,6 @@ MD5SUM="15077553660cff22d928a08cd1c1a5f0 \ 76fb85a025e6e1e6fda6569acf460505 \ 589309abba88dd6e8099a95640457f7d \ a4a2fb6845bb8ae426053dc7821ff75f \ - 331d07cdd036d528ede2f69c7ff0beb6 \ f5a883f6e013c5dcedc0c13d3096c612 \ ae2ca148274c581aa6ee8a8e292ca2af \ 936257597fbe2fd02d954a5db53c687a \ diff --git a/system/openzfs/openzfs.SlackBuild b/system/openzfs/openzfs.SlackBuild index 3b56954416..6fe94de719 100644 --- a/system/openzfs/openzfs.SlackBuild +++ b/system/openzfs/openzfs.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for openzfs -# Copyright 2023 Matt Egger <bru.barwal@sdf.org>, USA +# Copyright 2023-24 Matt Egger <bru.barwal@sdf.org>, USA # Copyright 2021-23 Markus Reichelt <slackbuilds@mareichelt.de>, Germany # Copyright 2017 Marcin Szychowski <szycha@gmail.com>, Poland # Copyright 2016 Kevin Paulus <goarilla@gmail.com>, Belgium @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=openzfs SRCNAM=zfs -VERSION=${VERSION:-2.2.3} +VERSION=${VERSION:-2.2.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -49,9 +49,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -110,8 +107,6 @@ CFLAGS="$SLKCFLAGS" \ --includedir=/usr/include \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-linux="/lib/modules/${KERNEL}/source" \ - --with-linux-obj="/lib/modules/${KERNEL}/source" \ --with-udevdir=/lib/udev \ --enable-static=no \ $DRACUTLIBDIR \ @@ -125,7 +120,7 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la # clean up leftovers if [ "$ARCH" = "x86_64" ]; then rm -fr $PKG/usr/lib -elif [ -z "${DRACUTLIBDIR}" ]; then +elif [ -z "${DRACUTLIBDIR}" ]; then rm -fr $PKG/usr/lib/dracut fi rm -fr $PKG/usr/src diff --git a/system/openzfs/openzfs.info b/system/openzfs/openzfs.info index d09a5ee281..efa078abf7 100644 --- a/system/openzfs/openzfs.info +++ b/system/openzfs/openzfs.info @@ -1,8 +1,8 @@ PRGNAM="openzfs" -VERSION="2.2.3" +VERSION="2.2.4" HOMEPAGE="https://openzfs.org" -DOWNLOAD="https://github.com/openzfs/zfs/releases/download/zfs-2.2.3/zfs-2.2.3.tar.gz" -MD5SUM="e0f2b72ccd47a5b401cbc9f38b1d9073" +DOWNLOAD="https://github.com/openzfs/zfs/releases/download/zfs-2.2.4/zfs-2.2.4.tar.gz" +MD5SUM="8d563179aadb2a008f501aee34d3daf9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/osinfo-db-tools/libxml-2.12.patch b/system/osinfo-db-tools/libxml-2.12.patch new file mode 100644 index 0000000000..af42e41229 --- /dev/null +++ b/system/osinfo-db-tools/libxml-2.12.patch @@ -0,0 +1,85 @@ +From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001 +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 27 Nov 2023 15:04:43 +0100 +Subject: [PATCH 1/2] Make xmlError structs constant + +In libxml2 commits v2.12.0~14 and v2.12.0~77 the API changed so +that: + +1) xmlGetLastError() returns pointer to a constant xmlError + struct, and + +2) xmlSetStructuredErrorFunc() changed the signature of callback + (validate_structured_error_nop()), it too is passed pointer to + a constant xmlError struct. + +But of course, older libxml2 expects different callback +signature. Therefore, we need to typecast it anyway. + +Also, drop obviously incorrect @error annotation in +validate_structured_error_nop; the variable is used. + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + tools/osinfo-db-validate.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c +index a721b4d..b1434a6 100644 +--- a/tools/osinfo-db-validate.c ++++ b/tools/osinfo-db-validate.c +@@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED, + } + + static void validate_structured_error_nop(void *userData G_GNUC_UNUSED, +- xmlErrorPtr error G_GNUC_UNUSED) ++ const xmlError *error) + { + if (error->file) + g_printerr("%s:%d %s", error->file, error->line, error->message); +@@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro + g_autofree gchar *schemapath = NULL; + + xmlSetGenericErrorFunc(NULL, validate_generic_error_nop); +- xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop); ++ /* Drop this typecast when >=libxml2-2.12.0 is required */ ++ xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop); + + schemapath = g_file_get_path(schema); + rngParser = xmlRelaxNGNewParserCtxt(schemapath); +-- +GitLab + + +From 019487cbc79925e49988789bf533c78dab7e1842 Mon Sep 17 00:00:00 2001 +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 27 Nov 2023 15:06:04 +0100 +Subject: [PATCH 2/2] osinfo-db-validate: Add more libxml/ includes + +In its 2.12.0 release, libxml reworked their header files (some +might even call it cleaning up, I call it API incompatible +change) and now we don't get all declarations we need by just +including one file. Add missing includes. + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + tools/osinfo-db-validate.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c +index b1434a6..f3275db 100644 +--- a/tools/osinfo-db-validate.c ++++ b/tools/osinfo-db-validate.c +@@ -20,7 +20,9 @@ + * Daniel P. Berrange <berrange@redhat.com> + */ + ++#include <libxml/parser.h> + #include <libxml/relaxng.h> ++#include <libxml/tree.h> + #include <locale.h> + #include <glib/gi18n.h> + +-- +GitLab + diff --git a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild index c689e31156..368b4424a6 100644 --- a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild +++ b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for osinfo-db-tools -# Copyright 2016-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2016-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=osinfo-db-tools -VERSION=${VERSION:-1.10.0} +VERSION=${VERSION:-1.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,6 +81,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/libxml-2.12.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/system/osinfo-db-tools/osinfo-db-tools.info b/system/osinfo-db-tools/osinfo-db-tools.info index ad699ecdc1..99dae01bac 100644 --- a/system/osinfo-db-tools/osinfo-db-tools.info +++ b/system/osinfo-db-tools/osinfo-db-tools.info @@ -1,8 +1,8 @@ PRGNAM="osinfo-db-tools" -VERSION="1.10.0" +VERSION="1.11.0" HOMEPAGE="http://libosinfo.org" -DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.10.0.tar.xz" -MD5SUM="f0c83772ce612b5d0befb77a8d6f309b" +DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.11.0.tar.xz" +MD5SUM="8fed1cfc692b6fa1a80f002b0a8447ac" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/osinfo-db/osinfo-db.SlackBuild b/system/osinfo-db/osinfo-db.SlackBuild index f1d803ad2f..36b70adec7 100644 --- a/system/osinfo-db/osinfo-db.SlackBuild +++ b/system/osinfo-db/osinfo-db.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for osinfo-db -# Copyright 2016-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2016-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=osinfo-db -VERSION=${VERSION:-20230308} +VERSION=${VERSION:-20231215} SLVERSION=${SLVERSION:-20220214} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/osinfo-db/osinfo-db.info b/system/osinfo-db/osinfo-db.info index c61d3a665e..4ce4d8ae5b 100644 --- a/system/osinfo-db/osinfo-db.info +++ b/system/osinfo-db/osinfo-db.info @@ -1,9 +1,9 @@ PRGNAM="osinfo-db" -VERSION="20230308" +VERSION="20231215" HOMEPAGE="http://libosinfo.org" -DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20230308.tar.xz \ +DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20231215.tar.xz \ https://harrier.slackbuilds.org/misc/osinfo-db-slackware-20220214.tar.xz" -MD5SUM="0293bded4e2b7b22fe87bd629d2b71ce \ +MD5SUM="45021bc702e722d1f5dd062f4823d160 \ 65ed4d991bdab6ab00bc34bcbb5d16ff" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/pacemaker/pacemaker.info b/system/pacemaker/pacemaker.info index ca4cceefd4..36fa7e9b59 100644 --- a/system/pacemaker/pacemaker.info +++ b/system/pacemaker/pacemaker.info @@ -2,7 +2,7 @@ PRGNAM="pacemaker" VERSION="2.0.5" HOMEPAGE="https://wiki.clusterlabs.org/wiki/Pacemaker" DOWNLOAD="https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-2.0.5/pacemaker-Pacemaker-2.0.5.tar.gz" -MD5SUM="c36c8ed401e39ff3e727ba4bf5fcc2e7" +MD5SUM="f58503c3939de68cd45b37e87745108a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="corosync" diff --git a/system/pcmanfm/README b/system/pcmanfm/README index a8e5b2a028..f7b14ceb9f 100644 --- a/system/pcmanfm/README +++ b/system/pcmanfm/README @@ -1,10 +1,10 @@ PCManFM is an extremely fast and lightweight GTK+ based file manager which features tabbed browsing and a user-friendly interface. -By default the gtk+2 version is built: if you prefer to build the -gtk+3 one pass the script the parameter GTK=3, like +By default the gtk+3 version is built: if you prefer to build the +gtk+2 one pass the script the parameter GTK3=no, like - GTK=3 ./pcmanfm.SlackBuild + GTK3=no ./pcmanfm.SlackBuild If you have problems viewing icons on pcmanfm and you're using the gtk+2 version, include this line to your $HOME/.gtkrc-2.0: diff --git a/system/pcmanfm/pcmanfm.SlackBuild b/system/pcmanfm/pcmanfm.SlackBuild index e919aa3934..b599e98d70 100644 --- a/system/pcmanfm/pcmanfm.SlackBuild +++ b/system/pcmanfm/pcmanfm.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com> # Copyright 2010 Chris Abela <chris.abela@maltats.com> -# Copyright 2011-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2011-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -31,8 +31,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pcmanfm -VERSION=${VERSION:-1.3.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20230917_e6b422b} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -67,10 +67,7 @@ else LIBDIRSUFFIX="" fi -case "$GTK" in - 3) gtk="--with-gtk=3" ;; - *) gtk="--with-gtk=2" ;; -esac +gtk="--with-gtk=3" ; [ "${GTK3:-yes}" = "no" ] && gtk="--with-gtk=2" DOCS="AUTHORS COPYING NEWS README TODO" @@ -91,7 +88,7 @@ find -L . \ sh autogen.sh || true -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/pcmanfm/pcmanfm.info b/system/pcmanfm/pcmanfm.info index d3546b675e..0a347feab9 100644 --- a/system/pcmanfm/pcmanfm.info +++ b/system/pcmanfm/pcmanfm.info @@ -1,8 +1,8 @@ PRGNAM="pcmanfm" -VERSION="1.3.2" +VERSION="20230917_e6b422b" HOMEPAGE="https://wiki.lxde.org/en/PCManFM" -DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.2.tar.xz" -MD5SUM="ef7c4417d2697ef138d175db7aeae15a" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/pcmanfm-20230917_e6b422b.tar.xz" +MD5SUM="8b263571312ea14fde719831f61b8be1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libfm" diff --git a/system/polychromatic/polychromatic.SlackBuild b/system/polychromatic/polychromatic.SlackBuild index b342a056f7..78acd11c09 100644 --- a/system/polychromatic/polychromatic.SlackBuild +++ b/system/polychromatic/polychromatic.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=polychromatic -VERSION=${VERSION:-0.8.3} +VERSION=${VERSION:-0.8.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/polychromatic/polychromatic.info b/system/polychromatic/polychromatic.info index 67cd3906da..5b2c64606a 100644 --- a/system/polychromatic/polychromatic.info +++ b/system/polychromatic/polychromatic.info @@ -1,8 +1,8 @@ PRGNAM="polychromatic" -VERSION="0.8.3" +VERSION="0.8.4" HOMEPAGE="https://polychromatic.app/" -DOWNLOAD="https://github.com/polychromatic/polychromatic/archive/v0.8.3/polychromatic-0.8.3.tar.gz" -MD5SUM="30a83bb6ac020c3c30d82fd59cfab0c9" +DOWNLOAD="https://github.com/polychromatic/polychromatic/archive/v0.8.4/polychromatic-0.8.4.tar.gz" +MD5SUM="800d7bb4845728175d1d2b49b15a614c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="openrazer-daemon colorama python-colour python3-PyQtWebEngine" diff --git a/system/prometheus/prometheus.SlackBuild b/system/prometheus/prometheus.SlackBuild index 97cc74954f..eb16667317 100644 --- a/system/prometheus/prometheus.SlackBuild +++ b/system/prometheus/prometheus.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=prometheus -VERSION=${VERSION:-2.51.1} +VERSION=${VERSION:-2.52.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/prometheus/prometheus.info b/system/prometheus/prometheus.info index 594936a452..0bd00d63dc 100644 --- a/system/prometheus/prometheus.info +++ b/system/prometheus/prometheus.info @@ -1,10 +1,10 @@ PRGNAM="prometheus" -VERSION="2.51.1" +VERSION="2.52.0" HOMEPAGE="https://prometheus.io" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/prometheus/prometheus/releases/download/v2.51.1/prometheus-2.51.1.linux-amd64.tar.gz" -MD5SUM_x86_64="ba67aa6f4b383c3839bc82d477948828" +DOWNLOAD_x86_64="https://github.com/prometheus/prometheus/releases/download/v2.52.0/prometheus-2.52.0.linux-amd64.tar.gz" +MD5SUM_x86_64="dc21cdcd4e3b1f4e2a06ab390ceff964" REQUIRES="" MAINTAINER="Ebben Aries" EMAIL="slackbuilds@dscp.org" diff --git a/system/pv/pv.SlackBuild b/system/pv/pv.SlackBuild index c2547522f0..081b174404 100644 --- a/system/pv/pv.SlackBuild +++ b/system/pv/pv.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pv -VERSION=${VERSION:-1.8.5} +VERSION=${VERSION:-1.8.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/pv/pv.info b/system/pv/pv.info index 38715744eb..4339a3de9a 100644 --- a/system/pv/pv.info +++ b/system/pv/pv.info @@ -1,8 +1,8 @@ PRGNAM="pv" -VERSION="1.8.5" +VERSION="1.8.9" HOMEPAGE="https://www.ivarch.com/programs/pv.shtml" -DOWNLOAD="https://codeberg.org/a-j-wood/pv/releases/download/v1.8.5/pv-1.8.5.tar.gz" -MD5SUM="45136fe0da3bb866d4f1e70e8644a0b0" +DOWNLOAD="https://codeberg.org/a-j-wood/pv/releases/download/v1.8.9/pv-1.8.9.tar.gz" +MD5SUM="6a6ebd8ec5585c1753ffff45f5cc55a5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/qemu/README b/system/qemu/README index 1c9b196e0c..be1fde0db3 100644 --- a/system/qemu/README +++ b/system/qemu/README @@ -41,22 +41,17 @@ your processor) prior to launching qemu-system-ARCH with kvm enabled. For older/unmaintained qemu frontends, this build also creates a symlink to qemu-system-ARCH at /usr/bin/qemu-kvm. -libslirp (user mode networking), libcacard, spice, usbredir, -virglrenderer, libnfs, snappy, device-tree-compiler, glusterfs, and vde2 -are optional dependencies. +libiscsi (to access iSCSI targets directly), libcacard, spice, usbredir +virglrenderer, libnfs, snappy, glusterfs, vde2, sphinx-rtd-theme and +Sphinx (to build documentation) are optional dependencies that will be +automatically detected during compilation, if present (all avialable on +SBo). -To enable user mode networking, install libslirp (availale on SBO), then -compile qemu: +To disable user mode networking compile qemu with: -SLIRP=yes ./qemu.SlackBuild + SLIRP=no ./qemu.SlackBuild -libiscsi (to access iSCSI targets directly) is optional dependency, -and will be picked up, if present, during the compilation. - -sphinx-rtd-theme and Sphinx (both on SBo) are optional but required in -order for any of the documentation to be built. - -If you wish to emulate ARM, you will want device-tree-compiler. +The dependency virtiofsd isn't usable on a 32bit operating system. NOTES: This version breaks some backward compatibility with earlier versions. diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild index 73604dc9e3..b0f7ed0575 100644 --- a/system/qemu/qemu.SlackBuild +++ b/system/qemu/qemu.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qemu VERSION=${VERSION:-8.2.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -93,6 +93,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + || true +# Use newer meson from python3-meson-opt +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + # Remove double CFLAGS sed -i "s|^\ \ CFLAGS=\"-O2\ | CFLAGS=\"|" configure @@ -112,10 +116,10 @@ else fi # To enable user mode networking use SLIRP=yes -if [ "$SLIRP" = "yes" ]; then - with_slirp="--enable-slirp" +if [ "$SLIRP" = "no" ]; then + with_slirp="--disable-slirp" else - with_slirp="" + with_slirp="--enable-slirp" fi CFLAGS="$SLKCFLAGS" \ @@ -133,7 +137,6 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-virtfs \ --enable-sdl \ --enable-malloc=jemalloc \ - --enable-fdt=auto \ --enable-nettle \ --${uring}able-linux-io-uring \ --audio-drv-list=${AUDIODRIVERS} \ diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info index 7e9f20f028..db39a7520c 100644 --- a/system/qemu/qemu.info +++ b/system/qemu/qemu.info @@ -5,6 +5,6 @@ DOWNLOAD="https://download.qemu.org/qemu-8.2.2.tar.xz" MD5SUM="e43091262671c1728b09522932b75b1d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="device-tree-compiler libslirp python3-meson-opt virtiofsd" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@linuxgalaxy.org" diff --git a/system/qtxdg-tools/qtxdg-tools.SlackBuild b/system/qtxdg-tools/qtxdg-tools.SlackBuild index 65b1cf51bd..a462a73b58 100644 --- a/system/qtxdg-tools/qtxdg-tools.SlackBuild +++ b/system/qtxdg-tools/qtxdg-tools.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for qtxdg-tools -# Copyright 2022-2023 Isaac Yu <isaacyu@protonmail.com> +# Copyright 2022-2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qtxdg-tools -VERSION=${VERSION:-3.11.0} +VERSION=${VERSION:-3.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/qtxdg-tools/qtxdg-tools.info b/system/qtxdg-tools/qtxdg-tools.info index 732d5ea019..f9620f8e0d 100644 --- a/system/qtxdg-tools/qtxdg-tools.info +++ b/system/qtxdg-tools/qtxdg-tools.info @@ -1,8 +1,8 @@ PRGNAM="qtxdg-tools" -VERSION="3.11.0" +VERSION="3.12.0" HOMEPAGE="https://github.com/lxqt/qtxdg-tools" -DOWNLOAD="https://github.com/lxqt/qtxdg-tools/releases/download/3.11.0/qtxdg-tools-3.11.0.tar.xz" -MD5SUM="4898d657bd4a92f7b738df78866297ac" +DOWNLOAD="https://github.com/lxqt/qtxdg-tools/releases/download/3.12.0/qtxdg-tools-3.12.0.tar.xz" +MD5SUM="6fd76563ef496796e9517c65045eb38e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libqtxdg" diff --git a/system/readpe/readpe.SlackBuild b/system/readpe/readpe.SlackBuild index dd36510809..bc560a2695 100644 --- a/system/readpe/readpe.SlackBuild +++ b/system/readpe/readpe.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=readpe -VERSION=${VERSION:-20240131_3c4163e} -GITHASH=${GITHASH:-3c4163e30896c9a22e996815d5e0f7876b3fc64f} +VERSION=${VERSION:-20240427_d94c794} +GITHASH=${GITHASH:-d94c79459692cd6abbf6051328b225319e2caadf} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/readpe/readpe.info b/system/readpe/readpe.info index dbc828f761..be049f4715 100644 --- a/system/readpe/readpe.info +++ b/system/readpe/readpe.info @@ -1,8 +1,8 @@ PRGNAM="readpe" -VERSION="20240131_3c4163e" +VERSION="20240427_d94c794" HOMEPAGE="https://github.com/mentebinaria/readpe" -DOWNLOAD="https://github.com/mentebinaria/readpe/archive/3c4163e/readpe-3c4163e30896c9a22e996815d5e0f7876b3fc64f.tar.gz" -MD5SUM="85f1fa2212a7d996efbab4fe2d5e238b" +DOWNLOAD="https://github.com/mentebinaria/readpe/archive/d94c794/readpe-d94c79459692cd6abbf6051328b225319e2caadf.tar.gz" +MD5SUM="7dcf55ee3a582febfa447732cecc62a7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/redis-py/redis-py.SlackBuild b/system/redis-py/redis-py.SlackBuild index f7c4368973..092f9b088f 100644 --- a/system/redis-py/redis-py.SlackBuild +++ b/system/redis-py/redis-py.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=redis-py -VERSION=${VERSION:-5.0.3} +VERSION=${VERSION:-5.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/redis-py/redis-py.info b/system/redis-py/redis-py.info index eac44c73b8..3869928087 100644 --- a/system/redis-py/redis-py.info +++ b/system/redis-py/redis-py.info @@ -1,8 +1,8 @@ PRGNAM="redis-py" -VERSION="5.0.3" +VERSION="5.0.4" HOMEPAGE="https://github.com/andymccurdy/redis-py" -DOWNLOAD="https://github.com/andymccurdy/redis-py/archive/v5.0.3/redis-py-5.0.3.tar.gz" -MD5SUM="63e2b3e83cf316b50ea4d1da2061b6f9" +DOWNLOAD="https://github.com/andymccurdy/redis-py/archive/v5.0.4/redis-py-5.0.4.tar.gz" +MD5SUM="bb43da83c49bc851f91b686da9a2afef" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="redis" diff --git a/system/rewise/rewise.SlackBuild b/system/rewise/rewise.SlackBuild index abf2e02d5d..fb787afde7 100644 --- a/system/rewise/rewise.SlackBuild +++ b/system/rewise/rewise.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for rewise -# Copyright 2023 Vijay Marcel +# Copyright 2023-2024 Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=rewise -VERSION=${VERSION:-0.1.0} +VERSION=${VERSION:-0.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/rewise/rewise.info b/system/rewise/rewise.info index e67f99bec2..4bfa08438f 100644 --- a/system/rewise/rewise.info +++ b/system/rewise/rewise.info @@ -1,8 +1,8 @@ PRGNAM="rewise" -VERSION="0.1.0" -HOMEPAGE="https://notabug.org/CYBERDEViL/REWise" -DOWNLOAD="https://notabug.org/CYBERDEViL/REWise/archive/v0.1.0.tar.gz" -MD5SUM="4a016459207d1218142b40ac093bffad" +VERSION="0.2.0" +HOMEPAGE="https://codeberg.org/CYBERDEV/REWise" +DOWNLOAD="https://codeberg.org/CYBERDEV/REWise/archive/v0.2.0.tar.gz" +MD5SUM="e0392be6c8cdba0c76f8bc09ba8b6190" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/rewise/slack-desc b/system/rewise/slack-desc index ed9a063c8a..46e143ae95 100644 --- a/system/rewise/slack-desc +++ b/system/rewise/slack-desc @@ -14,6 +14,6 @@ rewise: [.exe] files, so they can be used with free software implementation rewise: of the game engine.Rewise tries to focus on old game installers rewise: [1999-2003] in the form of PE executables. rewise: -rewise: Homepage:https://notabug.org/CYBERDEViL/REWise +rewise: Homepage:https://codeberg.org/CYBERDEV/REWise rewise: rewise: diff --git a/system/sarasa-gothic/sarasa-gothic.SlackBuild b/system/sarasa-gothic/sarasa-gothic.SlackBuild index f917dd79d9..75306e8c68 100644 --- a/system/sarasa-gothic/sarasa-gothic.SlackBuild +++ b/system/sarasa-gothic/sarasa-gothic.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sarasa-gothic SRCNAM=Sarasa-TTC -VERSION=${VERSION:-1.0.9} +VERSION=${VERSION:-1.0.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/sarasa-gothic/sarasa-gothic.info b/system/sarasa-gothic/sarasa-gothic.info index c6e7c40e19..567563f78e 100644 --- a/system/sarasa-gothic/sarasa-gothic.info +++ b/system/sarasa-gothic/sarasa-gothic.info @@ -1,8 +1,8 @@ PRGNAM="sarasa-gothic" -VERSION="1.0.9" +VERSION="1.0.12" HOMEPAGE="https://github.com/be5invis/Sarasa-Gothic" -DOWNLOAD="https://github.com/be5invis/Sarasa-Gothic/releases/download/v1.0.9/Sarasa-TTC-1.0.9.zip" -MD5SUM="e10dd4b30aa48991a60026a226bac85c" +DOWNLOAD="https://github.com/be5invis/Sarasa-Gothic/releases/download/v1.0.12/Sarasa-TTC-1.0.12.zip" +MD5SUM="50407d63fb0f0a53ecb0a7fc104225f8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/sbpkg/sbpkg.SlackBuild b/system/sbpkg/sbpkg.SlackBuild index 69b783e868..d221a6346b 100644 --- a/system/sbpkg/sbpkg.SlackBuild +++ b/system/sbpkg/sbpkg.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sbpkg -VERSION=${VERSION:-1.0.8} +VERSION=${VERSION:-1.0.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/sbpkg/sbpkg.info b/system/sbpkg/sbpkg.info index 23f9f43c76..0206c4d21f 100644 --- a/system/sbpkg/sbpkg.info +++ b/system/sbpkg/sbpkg.info @@ -1,8 +1,8 @@ PRGNAM="sbpkg" -VERSION="1.0.8" +VERSION="1.0.9" HOMEPAGE="https://gitlab.com/dslackw/sbpkg" -DOWNLOAD="https://gitlab.com/dslackw/sbpkg/-/archive/1.0.8/sbpkg-1.0.8.tar.gz" -MD5SUM="f83fdff3ae389575c09ea9cbec0def09" +DOWNLOAD="https://gitlab.com/dslackw/sbpkg/-/archive/1.0.9/sbpkg-1.0.9.tar.gz" +MD5SUM="5114e109e395f70e8c38cb9f40011586" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/slackrepo-hints/slackrepo-hints.SlackBuild b/system/slackrepo-hints/slackrepo-hints.SlackBuild index 61abc75bfc..6c83a08e51 100644 --- a/system/slackrepo-hints/slackrepo-hints.SlackBuild +++ b/system/slackrepo-hints/slackrepo-hints.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=slackrepo-hints -VERSION=${VERSION:-20240420} +VERSION=${VERSION:-20240503} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/slackrepo-hints/slackrepo-hints.info b/system/slackrepo-hints/slackrepo-hints.info index 51b4bee6d2..6dc5175d70 100644 --- a/system/slackrepo-hints/slackrepo-hints.info +++ b/system/slackrepo-hints/slackrepo-hints.info @@ -1,8 +1,8 @@ PRGNAM="slackrepo-hints" -VERSION="20240420" +VERSION="20240503" HOMEPAGE="https://github.com/aclemons/slackrepo-hints" -DOWNLOAD="https://github.com/aclemons/slackrepo-hints/archive/v20240420/slackrepo-hints-20240420.tar.gz" -MD5SUM="63925bb6151fe3074fb08d99a03a3c47" +DOWNLOAD="https://github.com/aclemons/slackrepo-hints/archive/v20240503/slackrepo-hints-20240503.tar.gz" +MD5SUM="24441ebdae1c13bcef96a719e7fe05af" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/slpkg/slpkg.SlackBuild b/system/slpkg/slpkg.SlackBuild index 7ce48dca49..d2ff762ba2 100644 --- a/system/slpkg/slpkg.SlackBuild +++ b/system/slpkg/slpkg.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=slpkg -VERSION=${VERSION:-5.0.6} +VERSION=${VERSION:-5.0.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/slpkg/slpkg.info b/system/slpkg/slpkg.info index 4f41452f37..1d35a96f20 100644 --- a/system/slpkg/slpkg.info +++ b/system/slpkg/slpkg.info @@ -1,8 +1,8 @@ PRGNAM="slpkg" -VERSION="5.0.6" +VERSION="5.0.8" HOMEPAGE="https://dslackw.gitlab.io/slpkg" -DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/5.0.6/slpkg-5.0.6.tar.gz" -MD5SUM="e60a6209746b71acab473f09e406d441" +DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/5.0.8/slpkg-5.0.8.tar.gz" +MD5SUM="4030e14f0a955c641636f630ba4e784c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-build python3-pythondialog" diff --git a/system/stressapptest/stressapptest.SlackBuild b/system/stressapptest/stressapptest.SlackBuild index 24ef170a42..ce0e6848bc 100644 --- a/system/stressapptest/stressapptest.SlackBuild +++ b/system/stressapptest/stressapptest.SlackBuild @@ -58,14 +58,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -# This patch is based on Debian's support_i586_builds for -# stressapptest-1.0.6. Extra logic here to avoid running autoreconf if -# we don't need to (since it's slow). Allow PATCH=yes in the env for my -# own testing purposes. -if [ "${PATCH:-no}" = "yes" ]; then - patch -p1 < $CWD/support_i586.diff - autoreconf -if -fi +patch -p1 < $CWD/support_i586.diff +autoreconf -if CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/stressapptest/support_i586.diff b/system/stressapptest/support_i586.diff index ca9d1302cd..18826c8076 100644 --- a/system/stressapptest/support_i586.diff +++ b/system/stressapptest/support_i586.diff @@ -1,23 +1,22 @@ -diff -Naur stressapptest-1.0.9/configure.ac stressapptest-1.0.9.patched/configure.ac ---- stressapptest-1.0.9/configure.ac 2018-08-09 20:01:24.000000000 -0400 -+++ stressapptest-1.0.9.patched/configure.ac 2020-06-06 13:34:23.000966542 -0400 -@@ -19,6 +19,10 @@ +--- stressapptest-1.0.11/configure.ac.orig 2024-05-16 06:24:36.806255976 +0700 ++++ stressapptest-1.0.11/configure.ac 2024-05-16 06:25:18.914725236 +0700 +@@ -26,6 +26,10 @@ AC_DEFINE([STRESSAPPTEST_CPU_X86_64],[], [Defined if the target CPU is x86_64]) - ], + ], + [*i586*], [ -+ AC_DEFINE([STRESSAPPTEST_CPU_I686],[], ++ AC_DEFINE([STRESSAPPTEST_CPU_I586],[], + [Defined if the target CPU is i586]) -+ ], ++ ], [*i686*], [ AC_DEFINE([STRESSAPPTEST_CPU_I686],[], [Defined if the target CPU is i686]) -@@ -35,7 +39,7 @@ - AC_DEFINE([STRESSAPPTEST_CPU_AARCH64],[], - [Defined if the target CPU is aarch64]) +@@ -50,7 +54,7 @@ + AC_DEFINE([STRESSAPPTEST_CPU_LOONGARCH],[], + [Defined if the target CPU is LOONGARCH]) ], --[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i686, powerpc, armv7a, or aarch64])] -+[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i586, i686, powerpc, armv7a, or aarch64])] +-[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i686, mips, powerpc, armv7a, aarch64 or loongarch])] ++[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i586, i686, mips, powerpc, armv7a, aarch64 or loongarch])] ) ## The following allows like systems to share settings. This is not meant to diff --git a/system/sysdig/sysdig.SlackBuild b/system/sysdig/sysdig.SlackBuild index bb0d7af4b4..f777bb8e6a 100644 --- a/system/sysdig/sysdig.SlackBuild +++ b/system/sysdig/sysdig.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sysdig -VERSION=${VERSION:-0.28.0} +VERSION=${VERSION:-0.36.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,7 +73,7 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -FALCO_HASH=${FALCO_HASH:-2160111cd088aea9ae2235d3385ecb0b1ab6623c} +FALCO_HASH=${FALCO_HASH:-b3734896de3fa23a78003a0d203d6a3aae896339} mkdir -p build/falcosecurity-libs-repo/falcosecurity-libs-prefix/src cp $CWD/libs-$FALCO_HASH.tar.gz \ diff --git a/system/sysdig/sysdig.info b/system/sysdig/sysdig.info index 9e0f5eebe6..dc2642fd1a 100644 --- a/system/sysdig/sysdig.info +++ b/system/sysdig/sysdig.info @@ -1,12 +1,12 @@ PRGNAM="sysdig" -VERSION="0.28.0" +VERSION="0.36.1" HOMEPAGE="https://www.sysdig.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/draios/sysdig/archive/0.28.0/sysdig-0.28.0.tar.gz \ - https://github.com/falcosecurity/libs/archive/2160111/libs-2160111cd088aea9ae2235d3385ecb0b1ab6623c.tar.gz" -MD5SUM_x86_64="b0a25f902d6d520380f03a1f39177033 \ - 52ff63dc35604d0a37aa780a4472a114" -REQUIRES="jsoncpp lua libb64 jq tbb grpc gtest" +DOWNLOAD_x86_64="https://github.com/draios/sysdig/archive/0.36.1/sysdig-0.36.1.tar.gz \ + https://github.com/falcosecurity/libs/archive/b3734896de3fa23a78003a0d203d6a3aae896339/libs-b3734896de3fa23a78003a0d203d6a3aae896339.tar.gz" +MD5SUM_x86_64="8bb31353ae213dffcf61ef5342e9ea35 \ + 42b0d6b7815379f50d52e7817261d6fd" +REQUIRES="jsoncpp lua52 libb64 jq tbb grpc gtest uthash yaml-cpp nlohmann_json" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com" diff --git a/system/testdisk/README b/system/testdisk/README index 703732c26a..ac04e7f21d 100644 --- a/system/testdisk/README +++ b/system/testdisk/README @@ -6,12 +6,10 @@ accidentally deleting a Partition Table). Partition table recovery using TestDisk is really easy. PhotoRec is file data recovery software designed to recover lost files -including video, documents and archives from Hard Disks and CDRom and +including video, documents and archives from Hard Disks and CD-ROM and lost pictures from digital camera memory. -To enable the use of sudo, run the script with SUDO=true, ie: +To enable the use of sudo, run the script with SUDO=true, i.e.: SUDO=true ./testdisk.SlackBuild libewf is an optional dependency. - -Website - https://www.cgsecurity.org/wiki/TestDisk diff --git a/system/testdisk/slack-desc b/system/testdisk/slack-desc index c460e28ee4..2311e8f137 100644 --- a/system/testdisk/slack-desc +++ b/system/testdisk/slack-desc @@ -15,5 +15,5 @@ testdisk: error (such as accidentally deleting a Partition Table). testdisk: testdisk: PhotoRec is file data recovery software designed to recover lost testdisk: files including video, documents and archives from Hard Disks and -testdisk: CDRom and lost pictures from digital camera memory. +testdisk: CD-ROM and lost pictures from digital camera memory. testdisk: diff --git a/system/testdisk/testdisk.SlackBuild b/system/testdisk/testdisk.SlackBuild index 4f84854e0b..b7a3a4f2f6 100644 --- a/system/testdisk/testdisk.SlackBuild +++ b/system/testdisk/testdisk.SlackBuild @@ -6,6 +6,8 @@ # Copyright 2011 Grigorios Bouzakis <grbzks@imap.cc> # Copyright 2014-2024 Aaditya <aaditya_gnulinux@zoho.com> # All rights reserved. +# Copyright 2024 Bloyburt +# All rights reserved. # # Permission to use, copy, modify, and distribute this software for any purpose # with or without fee is hereby granted, provided that the above copyright @@ -26,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=testdisk VERSION=${VERSION:-7.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/testdisk/testdisk.info b/system/testdisk/testdisk.info index ab762629ec..11de6544a5 100644 --- a/system/testdisk/testdisk.info +++ b/system/testdisk/testdisk.info @@ -6,5 +6,5 @@ MD5SUM="c6809b6fd06b5022467c8faa32d49a27" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Aaditya" -EMAIL="aaditya_gnulinux@zoho.com" +MAINTAINER="Bloyburt" +EMAIL="alexpen@startmail.com" diff --git a/system/ti99sim/ti99sim.SlackBuild b/system/ti99sim/ti99sim.SlackBuild index a56499dfb3..40a572a5ea 100644 --- a/system/ti99sim/ti99sim.SlackBuild +++ b/system/ti99sim/ti99sim.SlackBuild @@ -70,7 +70,7 @@ sed -i "s,-g3 *-O3,$SLKCFLAGS," rules.mak # Binaries already installed stripped. SYS_BIN must be <DATA_DIR>/bin # to avoid it creating absolute symlinks (we'll create relative ones, below). -make install DATA_DIR=$PKG/opt/$PRGNAM SYS_BIN=$PKG/opt/$PRGNAM/bin +env -u ARCH make install DATA_DIR=$PKG/opt/$PRGNAM SYS_BIN=$PKG/opt/$PRGNAM/bin # Modified setup script requires arguments (original one didn't). sh scripts/setup $CWD $PKG/opt/$PRGNAM diff --git a/system/tmuxp/tmuxp.SlackBuild b/system/tmuxp/tmuxp.SlackBuild index 022f11b853..8fc61fd211 100644 --- a/system/tmuxp/tmuxp.SlackBuild +++ b/system/tmuxp/tmuxp.SlackBuild @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tmuxp -VERSION=${VERSION:-1.45.0} +VERSION=${VERSION:-1.47.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/tmuxp/tmuxp.info b/system/tmuxp/tmuxp.info index c134edec3d..943fb7ca44 100644 --- a/system/tmuxp/tmuxp.info +++ b/system/tmuxp/tmuxp.info @@ -1,8 +1,8 @@ PRGNAM="tmuxp" -VERSION="1.45.0" +VERSION="1.47.0" HOMEPAGE="https://github.com/tony/tmuxp/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/t/tmuxp/tmuxp-1.45.0.tar.gz" -MD5SUM="2b137a14e27b20c0b6112e467b333b99" +DOWNLOAD="https://files.pythonhosted.org/packages/source/t/tmuxp/tmuxp-1.47.0.tar.gz" +MD5SUM="5b2ad66c75e18de5396388b7b5c57413" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="colorama python3-libtmux" diff --git a/system/trrntzip/slack-desc b/system/trrntzip/slack-desc index eecb353ad1..ae8002db6d 100644 --- a/system/trrntzip/slack-desc +++ b/system/trrntzip/slack-desc @@ -15,5 +15,5 @@ trrntzip: trrntzip: trrntzip: trrntzip: -trrntzip: https://sourceforge.net/projects/trrntzip/ +trrntzip: https://github.com/0-wiz-0/trrntzip/ trrntzip: diff --git a/system/trrntzip/trrntzip.SlackBuild b/system/trrntzip/trrntzip.SlackBuild index 1a8fa43f80..2e59a1dd86 100644 --- a/system/trrntzip/trrntzip.SlackBuild +++ b/system/trrntzip/trrntzip.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=trrntzip -VERSION=${VERSION:-v02} +VERSION=${VERSION:-1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -64,9 +64,9 @@ set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM -tar xvf $CWD/${PRGNAM}_${VERSION}_src.tar.gz -cd $PRGNAM +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/${PRGNAM}-${VERSION}.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -74,20 +74,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# A small patch to fix a permissions issue: -patch -p1 < $CWD/trrntzip_permission_fix.diff - -./autogen.sh -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr - -make -make install-strip DESTDIR=$PKG +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/trrntzip/trrntzip.info b/system/trrntzip/trrntzip.info index 7858763586..e5af1235a9 100644 --- a/system/trrntzip/trrntzip.info +++ b/system/trrntzip/trrntzip.info @@ -1,8 +1,8 @@ PRGNAM="trrntzip" -VERSION="v02" -HOMEPAGE="https://sourceforge.net/projects/trrntzip/" -DOWNLOAD="https://downloads.sourceforge.net/trrntzip/trrntzip_v02_src.tar.gz" -MD5SUM="2635a4042b3cf5611ffdffb4019ec8b7" +VERSION="1.3" +HOMEPAGE="https://github.com/0-wiz-0/trrntzip/" +DOWNLOAD="https://github.com/0-wiz-0/trrntzip/archive/v1.3/trrntzip-1.3.tar.gz" +MD5SUM="712ebea3daf181bce4c67473bafed513" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ttf-babelstone-cjk/APL.txt b/system/ttf-babelstone-cjk/APL.txt deleted file mode 100644 index c1aba41d3f..0000000000 --- a/system/ttf-babelstone-cjk/APL.txt +++ /dev/null @@ -1,58 +0,0 @@ -ARPHIC PUBLIC LICENSE - -Copyright (C) 1999 Arphic Technology Co., Ltd. -11Fl. No.168, Yung Chi Rd., Taipei, 110 Taiwan -All rights reserved except as specified below. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is forbidden. - -Preamble - - The licenses for most software are designed to take away your freedom to share and change it. By contrast, the ARPHIC PUBLIC LICENSE specifically permits and encourages you to use this software, provided that you give the recipients all the rights that we gave you and make sure they can get the modifications of this software. - -Legal Terms - -0. Definitions: - Throughout this License, "Font" means the TrueType fonts "AR PL Mingti2L Big5", "AR PL KaitiM Big5" (BIG-5 character set) and "AR PL SungtiL GB", "AR PL KaitiM GB" (GB character set) which are originally distributed by Arphic, and the derivatives of those fonts created through any modification including modifying glyph, reordering glyph, converting format, changing font name, or adding/deleting some characters in/from glyph table. - - "PL" means "Public License". - - "Copyright Holder" means whoever is named in the copyright or copyrights for the Font. - - "You" means the licensee, or person copying, redistributing or modifying the Font. - - "Freely Available" means that you have the freedom to copy or modify the Font as well as redistribute copies of the Font under the same conditions you received, not price. If you wish, you can charge for this service. - -1. Copying & Distribution - You may copy and distribute verbatim copies of this Font in any medium, without restriction, provided that you retain this license file (ARPHICPL.TXT) unaltered in all copies. - -2. Modification - You may otherwise modify your copy of this Font in any way, including modifying glyph, reordering glyph, converting format, changing font name, or adding/deleting some characters in/from glyph table, and copy and distribute such modifications under the terms of Section 1 above, provided that the following conditions are met: - - a) You must insert a prominent notice in each modified file stating how and when you changed that file. - - b) You must make such modifications Freely Available as a whole to all third parties under the terms of this License, such as by offering access to copy the modifications from a designated place, or distributing the modifications on a medium customarily used for software interchange. - - c) If the modified fonts normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the Font under these conditions, and telling the user how to view a copy of this License. - - These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Font, and can be reasonably considered independent and separate works in themselves, then this License and its terms, do not apply to those sections when you distribute them as separate works. Therefore, mere aggregation of another work not based on the Font with the Font on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - -3. Condition Subsequent - You may not copy, modify, sublicense, or distribute the Font except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Font will automatically retroactively void your rights under this License. However, parties who have received copies or rights from you under this License will keep their licenses valid so long as such parties remain in full compliance. - -4. Acceptance - You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to copy, modify, sublicense or distribute the Font. These actions are prohibited by law if you do not accept this License. Therefore, by copying, modifying, sublicensing or distributing the Font, you indicate your acceptance of this License and all its terms and conditions. - -5. Automatic Receipt - Each time you redistribute the Font, the recipient automatically receives a license from the original licensor to copy, distribute or modify the Font subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - -6. Contradiction - If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Font at all. For example, if a patent license would not permit royalty-free redistribution of the Font by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Font. - - If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. - -7. NO WARRANTY - BECAUSE THE FONT IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE FONT, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS OR OTHER PARTIES PROVIDE THE FONT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE FONT IS WITH YOU. SHOULD THE FONT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -8. DAMAGES WAIVER - UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, IN NO EVENT WILL ANY COPYRIGHTT HOLDERS, OR OTHER PARTIES WHO MAY COPY, MODIFY OR REDISTRIBUTE THE FONT AS PERMITTED ABOVE, BE LIABLE TO YOU FOR ANY DIRECT, INDIRECT, CONSEQUENTIAL, INCIDENTAL, SPECIAL OR EXEMPLARY DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE FONT (INCLUDING BUT NOT LIMITED TO PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA OR PROFITS; OR BUSINESS INTERRUPTION), EVEN IF SUCH HOLDERS OR OTHER PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. diff --git a/system/ttf-babelstone-cjk/BabelStoneOFL.txt b/system/ttf-babelstone-cjk/BabelStoneOFL.txt deleted file mode 100644 index ef758932ab..0000000000 --- a/system/ttf-babelstone-cjk/BabelStoneOFL.txt +++ /dev/null @@ -1,94 +0,0 @@ -Copyright (c) 2013, Andrew West (www.babelstone.co.uk), -with Reserved Font Name BabelStone. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/system/ttf-babelstone-cjk/README b/system/ttf-babelstone-cjk/README index 849bc0af07..8bab1bdd99 100644 --- a/system/ttf-babelstone-cjk/README +++ b/system/ttf-babelstone-cjk/README @@ -3,3 +3,8 @@ contains the chinese fonts along with regional variants. It covers Han,Jurchen,Khitan,Tangut,Sui,Naxi Dongba and Yi scripts.It also covers Hanzi,Kanji and Hanja. +In this release I have moved fonts for scripts that are +no longer used today apart from academia. + +To install archaic fonts run the slackbuild as +archaic=yes ./ttf-babelstone-cjk.SlackBuild diff --git a/system/ttf-babelstone-cjk/copyright b/system/ttf-babelstone-cjk/copyright deleted file mode 100644 index 0a7deeeffd..0000000000 --- a/system/ttf-babelstone-cjk/copyright +++ /dev/null @@ -1,13 +0,0 @@ -Tangut Yinchuan v. 15.102 copyright Prof. Jing Yongshi - -Tangut yinchuan Font is made available for free download -and use with the permission of Prof. Jing Yongshi, who -reserves the copyright to the font. This font may not be -modified, sold or redistributed for profit without the express -permission of the copyright holders. If you use this font in -a publication you are requested to -acknowledge Prof. Jing Yongshi's copyright of the font. - -The font is maintained by Andrew West, and any feature requests -or bug reports should be directed to Andrew West by email -Email: babelstone@gmail.com diff --git a/system/ttf-babelstone-cjk/copyright2 b/system/ttf-babelstone-cjk/copyright2 deleted file mode 100644 index 91eea19f45..0000000000 --- a/system/ttf-babelstone-cjk/copyright2 +++ /dev/null @@ -1,6 +0,0 @@ -BabelStone Fonts Copyright Andrew West - -These fonts are free to use for personal or commercial purposes, -and you are also free to redistribute them by themself or as part -of a free or commercial software package, just as long as you -do not sell the fonts on its own. diff --git a/system/ttf-babelstone-cjk/readme_fonts b/system/ttf-babelstone-cjk/readme_fonts deleted file mode 100644 index 473b73a9ea..0000000000 --- a/system/ttf-babelstone-cjk/readme_fonts +++ /dev/null @@ -1,147 +0,0 @@ -ttf-babelstone-cjk contains the following fonts: - -Babelstonehan: - -It is a free Unicode CJK font with over 56,000 Han -characters (hanzi, kanji, hanja), and 64,973 Unicode -characters in total. It is a Song/Ming style font. -with glyphs modelled on the official character forms -used in the People's Republic of China, and is primarily -intended for writing Modern Standard Chinese, -Classical Chinese, and various Sinitic languages and dialects. -The font also includes many rare or archaic characters that are -not found in most CJK fonts, as well as many characters used for -the scholarly transcription of Early Chinese texts written on -bone, bronze, wood, bamboo, and silk. - -Babelstonehan PUA: - -it includes 4,444 unencoded CJK ideographs and ideographic -components in the PUA, in the range U+E080 through U+F8DF. - -BabelStone Erijan 1 and 2: - -BabelStone Erjian 1 and 2 are two Unicode Han fonts -using the draft second stage simplified forms of characters. -Both fonts cover 8,157 high-frequency Hanzi, comprising -8,105 Level 1, Level 2 and Level 3 characters listed in -Tōngyòng Guīfàn Hànzì Zìdiǎn.and 52 other characters. -"BabelStone Erjian 1" uses second stage simplified glyph -forms for the characters listed in Table 1 only; whereas -"BabelStone Erjian 2" uses second stage simplified glyph -forms for the characters listed in Table 1 and Table 2 -(where the glyph for the same character differs between -Table 1 and Table 2, the form given in Table 2 is used). - -Babelstone Jurchen Scan PUA fonts: - -urchen Berlin, Jurchen Tianyige, and Jurchen Toyo Bunko -are three Jurchen fonts with glyphs scanned from the -Jurchen section of three copies of the Ming dynasty Huáyí Yìyǔ. - "Sino-Foreign Vocabulary" (i.e. the Sino-Jurchen Vocabulary). -Jurchen Berlin is derived from the manuscript copy held at the -Berlin State Library (Staatsbibliothek zu Berlin) -(pressmark Libri sin. Hirth Ms. 1); -Jurchen Tianyige is derived from the Ming dynasty -woodblock printed edition held at the Tiānyīgé -library in Níngbō (pressmark 善0376); -Jurchen Toyo Bunko is the manuscript copy held at the -Tōyō Bunko (東洋文庫) in Tokyo (presssmark XI-5-2). -There is currently no scan font for the manuscript -copy held at the National Library of China -in Běijīng (pressmark 10507). The characters are mapped -non-contiguously to the PUA at E000..E6FA -(matching the code points in my private Jurchen font). - -Babelstone Khitan Large scropt PUA fonts: - -it is an experimental font containing 1,469 Khitan -Large Script glyphs, mapped to the PUA at E000..E5BC. -This font is being developed as I slowly go through -all Khitan Large Script sources, and will continue to grow. -The glyphs are not ordered in the font, -but have been added sequentially as I encounter -each new character form. In addition, very many of the -glyphs are variant forms of the same character, -often trivial variants. - -Babelstone Khitan small script fonts: - -It is a Unicode font supporting the 470 Khitan Small Script -characters which were encoded in Unicode version 13.0 (March 2020). -This font does not support cluster composition, but is intended -for displaying individual glyphs in horizontal linear layout -as used in Daniel Kane's The Kitan Language and Script (Brill, 2009). -This font uses a Chinese (Song/Ming) style of glyphs which is -not attested in surviving examples of Khitan -small script text (mostly epitaphs engraved on stone tablets). - -It also contains font for for the thirty-six seal script style -Khitan small script characters which are engraved on the covers -for the eulogies for Emperor Daozong and Empress Xuanyi - -BabelStone Naxi Dongba PUA Fonts: - -It is a scan font covering 2,162 glyphs for the -Naxi Dongba (Naxi Tomba) script. The glyphs are -derived from Lǐ Líncàn's 李霖灿 Nàxīzú -xiàngxíng biāo yīn wénzì zìdiǎn 纳西族象形标音文字字典 -[Naxi Pictographic Symbols Dictionary] -(Kunming: Yunnan minzu chubanshe, 2001) -[ISBN 7-5367-2126-9]. The 2,120 glyphs at E000..E849 are the main -entries in the dictionary, and the 42 glyphs at -F000..F029 are variant glyphs for some of the main entries. - -Babelstone Sui (Shuishu) PUA Fonts: - -These are a set of scan fonts covering Sui -(Shuishu 水书) characters listed in various -printed sources, with characters mapped to -the Unicode Private Use Area (PUA). - -Babelstone Tangut Scan Fonts: - -These are a set of fonts covering Tangut glyphs from -various sources, mapped to the PUA. The fonts were created -from scanned images of the source glyphs, and the quality -of the resultant font glyphs is generally quite poor. These fonts -are not intended for use in typesetting Tangut text, but were -created in order to facilitate mapping of Tangut characters -between sources. - -BabelStone Tangut Wenhai Font: - -BabelStone Tangut Wenhai is a Unicode Tangut font covering -3,061 of the 6,125 Tangut ideographs encoded in Unicode version 9.0 -(released in June 2016). The glyphs are derived from the -3,064 head characters in the calligraphic facsimile reproduction of the -Sea of Writing [Wénhǎi 文海] text in -Wénhǎi Yánjiū 文海研究 [Study of the Sea of Writing] (Beijing, 1983) by -Shi Bojin 史金波 et al. This font also includes 442 of the 755 -encoded Tangut components, but these are poorer quality compared with -the Tangut ideographs, and may be replaced with glyphs derived from the -Tangut ideographs in the future. -NB This font does not cover many common Tangut characters, -and so is not suitable for use in typesetting Tangut text in academic works. - -Tangut Yinchuan Font: - -Tangut Yinchuan v. 15.102 is a font for the Tangut script -that supports the full set of Tangut characters defined in -Unicode version 15.0 (Tangut, Tangut Supplement, Tangut Components code charts). -It is based on a font named XXZT (西夏字体 in Chinese) that was -designed by Prof. Jǐng Yǒngshí 景永时 of the -Beifang Ethnic University (北方民族大学) in Yinchuan. The original -font was used for typesetting the revised 2nd edition of the -Tangut-Chinese dictionary Xià-Hàn Zìdiǎn 夏漢字典 (Beijing, 2008) -by Prof. Li Fanwen - -BabelStone Sani Yi PUA Font: - -BabelStone Sani Yi is a PUA font covering characters in the Sani Yi script. -The font was created from scanned images of the hand-written characters in -Yí-Hàn Jiǎnmíng Cídiǎn 彝汉简明词典 [Concise Yi-Chinese Dictionary] -(Kunming: Yunnan Minzu Chubanshe, 1984). The quality of the resultant font -glyphs is generally quite poor. This font is not intended for use in typesetting -Yi text, but was created in order to facilitate work on the encoding of the -Sani Yi script in Unicode. diff --git a/system/ttf-babelstone-cjk/ttf-babelstone-cjk.SlackBuild b/system/ttf-babelstone-cjk/ttf-babelstone-cjk.SlackBuild index fe2458ce8f..27047ef064 100644 --- a/system/ttf-babelstone-cjk/ttf-babelstone-cjk.SlackBuild +++ b/system/ttf-babelstone-cjk/ttf-babelstone-cjk.SlackBuild @@ -25,14 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ttf-babelstone-cjk -VERSION=${VERSION:-1.0} +VERSION=${VERSION:-1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} ARCH=noarch -SRCH=${SRCH:-BabelStoneHan} -SRCS=${SRCS:-BabelStoneShuishu} -SRCT=${SRCT:-TangutScanFonts} if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" @@ -50,6 +47,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -57,27 +56,16 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -mkdir -pv $TMP/han -mkdir -pv $TMP/sui -mkdir -pv $TMP/tangut mkdir -pv $PKG/usr/share/fonts/TTF +find $TMP/$PRGNAM-$VERSION/ttf/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \; -unzip -d $TMP/han $CWD/$SRCH.zip -unzip -d $TMP/sui $CWD/$SRCS.zip -unzip -d $TMP/tangut $CWD/$SRCT.zip - -install -D -m0644 -v $CWD/*.ttf -t $PKG/usr/share/fonts/TTF -install -D -m0644 -v $TMP/han/*.ttf -t $PKG/usr/share/fonts/TTF -install -D -m0644 -v $TMP/sui/*.ttf -t $PKG/usr/share/fonts/TTF -install -D -m0644 -v $TMP/tangut/*.ttf -t $PKG/usr/share/fonts/TTF +if [ "$archaic" = "yes" ]; then + find $TMP/$PRGNAM-$VERSION/archaic/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \; +fi mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/APL.txt > $PKG/usr/doc/$PRGNAM-$VERSION/APL.txt -cat $CWD/BabelStoneOFL.txt > $PKG/usr/doc/$PRGNAM-$VERSION/babelstoneOFL.txt +cp -av APL.txt COPYRIGHT IDS.TXT LICENSE OFL.txt readme_fonts $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/copyright > $PKG/usr/doc/$PRGNAM-$VERSION/copyright -cat $CWD/copyright2 > $PKG/usr/doc/$PRGNAM-$VERSION/copyright2 -cat $CWD/readme_fonts > $PKG/usr/doc/$PRGNAM-$VERSION/readme_fonts find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+ mkdir -p $PKG/install diff --git a/system/ttf-babelstone-cjk/ttf-babelstone-cjk.info b/system/ttf-babelstone-cjk/ttf-babelstone-cjk.info index 7b96a36442..59472f863c 100644 --- a/system/ttf-babelstone-cjk/ttf-babelstone-cjk.info +++ b/system/ttf-babelstone-cjk/ttf-babelstone-cjk.info @@ -1,54 +1,8 @@ PRGNAM="ttf-babelstone-cjk" -VERSION="1.0" -HOMEPAGE="https://www/babelstone.co.uk" -DOWNLOAD="https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneHanPUA.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneErjian1.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneErjian2.ttf \ - https://www.babelstone.co.uk/Fonts/Download/JurchenBerlin.ttf \ - https://www.babelstone.co.uk/Fonts/Download/JurchenTianyige.ttf \ - https://www.babelstone.co.uk/Fonts/Download/JurchenToyoBunko.ttf \ - https://www.babelstone.co.uk/Fonts/Download/JurchenSmall.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneKhitanLargeGlyphs.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneKhitanSeals.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneKhitanSealGlyphs.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneKhitanSmallLinear.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneKhitanSmallSeal.ttf \ - https://www.babelstone.co.uk/Fonts/Download/KhitanSmallLinear.ttf \ - https://www.babelstone.co.uk/Fonts/Download/KhitanSmallRotated.ttf \ - https://www.babelstone.co.uk/Fonts/Download/KhitanSmallVertical.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneNaxiLLC.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneShuishu.zip \ - https://www.babelstone.co.uk/Fonts/Download/TangutScanFonts.zip \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneTangutWenhai.ttf \ - https://www.babelstone.co.uk/Fonts/Download/TangutYinchuan.ttf \ - https://www.babelstone.co.uk/Fonts/Download/TangutYinchuanInverse.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneTangutRadicals.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneSaniYi.ttf" -MD5SUM="d7568d28ba67c7a6fc9fc896c4ae9bc2 \ - 6220c97e5da381b53462eef28fa81873 \ - 3dac88173ade093d945ccdae7d1f2fce \ - fa33f8875b032c1d6bb70a203e418dd4 \ - 4baf9e3a67a8ad3c002e348f9d5b6bf7 \ - 6fde3b3dd390c66e79719eba0388a7d4 \ - 1214b2722a2ebf128d8138edc3b0209d \ - a540c2fa397ae2b41191792c6023db80 \ - 5a528a3a699ab870a1ac52ffff5e5978 \ - 0d07928f544c3d873389412d1d04a94b \ - e5764f3d5e0d5540e40190d8ccf4a2cd \ - a1f9cda6991c3b0dc25afe9c98015f63 \ - 7867caf246b3f1f2f1824cd6024a44fa \ - 7ff6a2c4f32ef03343436bf4050feda5 \ - 7a3e2bd8aefdd0bb594f0f0e4b751bb7 \ - 3f80fb811bb14334f5c79f432a065445 \ - b4d2f92f9b7e3ec375b9b2b1260d267c \ - 2e46a52a13f1c37b6d4f0956e8547618 \ - 75dd9971a19f12a1a3f5cef4d0990657 \ - 3d7fb66f97e5fe530504ef8736debb47 \ - e86eae33ab5c7a4cfa3d459cc2ee1b0b \ - 70eaa3c7c9f2cdd31b6ac38b0b514298 \ - b55128a55c2200c995f1cfe60e390867 \ - b3c6baa077e7c3f4b5a75bd55c4ee650" +VERSION="1.1" +HOMEPAGE="https://www.babelstone.co.uk" +DOWNLOAD="https://github.com/lecramyajiv/ttf-babelstone-cjk/archive/1.1/ttf-babelstone-cjk-1.1.tar.gz" +MD5SUM="866582125ee408025fec30955da86a34" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ttf-babelstone-tibetan/BabelStoneOFL.txt b/system/ttf-babelstone-tibetan/BabelStoneOFL.txt deleted file mode 100644 index ef758932ab..0000000000 --- a/system/ttf-babelstone-tibetan/BabelStoneOFL.txt +++ /dev/null @@ -1,94 +0,0 @@ -Copyright (c) 2013, Andrew West (www.babelstone.co.uk), -with Reserved Font Name BabelStone. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/system/ttf-babelstone-tibetan/copyright b/system/ttf-babelstone-tibetan/copyright deleted file mode 100644 index 91eea19f45..0000000000 --- a/system/ttf-babelstone-tibetan/copyright +++ /dev/null @@ -1,6 +0,0 @@ -BabelStone Fonts Copyright Andrew West - -These fonts are free to use for personal or commercial purposes, -and you are also free to redistribute them by themself or as part -of a free or commercial software package, just as long as you -do not sell the fonts on its own. diff --git a/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.SlackBuild b/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.SlackBuild index 218bdc6018..0e3357368a 100644 --- a/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.SlackBuild +++ b/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ttf-babelstone-tibetan -# Copyright 2023 Vijay Marcel +# Copyright 2023-2024 Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,12 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ttf-babelstone-tibetan -VERSION=${VERSION:-1.0} +VERSION=${VERSION:-10.011} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} ARCH=noarch -SRCP=${SRCP:-BabelStonePhagspa_v2} if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" @@ -48,6 +47,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -55,17 +56,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -mkdir -pv $TMP/phagspa mkdir -pv $PKG/usr/share/fonts/TTF - -unzip -d $TMP/phagspa $CWD/$SRCP.zip - -install -D -m0644 -v $CWD/*.ttf -t $PKG/usr/share/fonts/TTF -install -D -m0644 -v $TMP/phagspa/*.ttf -t $PKG/usr/share/fonts/TTF +find $TMP/$PRGNAM-$VERSION/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \; mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/BabelStoneOFL.txt > $PKG/usr/doc/$PRGNAM-$VERSION/babelstoneOFL.txt -cat $CWD/copyright > $PKG/usr/doc/$PRGNAM-$VERSION/copyright +cp -av BabelStoneOFL.txt copyright $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+ diff --git a/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.info b/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.info index b0805bcd74..c6d6f3e96e 100644 --- a/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.info +++ b/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.info @@ -1,18 +1,8 @@ PRGNAM="ttf-babelstone-tibetan" -VERSION="1.0" +VERSION="10.011" HOMEPAGE="https://www.babelstone.co.uk" -DOWNLOAD="https://www.babelstone.co.uk/Fonts/Download/BabelStoneMarchen.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneZanabazar.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneTibetan.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStoneTibetanSlim.ttf \ - https://www.babelstone.co.uk/Fonts/Download/BabelStonePhagspa_v2.zip \ - https://www.babelstone.co.uk/Fonts/Download/BabelStonePhagspaSeal_v1.ttf" -MD5SUM="9b31c772f05bb6e9c3ed3b908b7265f5 \ - 79bea5f34d05300fecbc871138998244 \ - a2e1823db85fc0f85c423307ce79b428 \ - 787bfecc53ef373f3aff41a5179da7f8 \ - 5fe660073811281e1c13165fe879edd6 \ - ed5b297d4e793ab60f432ef63b03929d" +DOWNLOAD="https://github.com/lecramyajiv/ttf-babelstone-tibetan/archive/10.011/ttf-babelstone-tibetan-10.011.tar.gz" +MD5SUM="05790e208c40a16a097c954f0ebf402e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ttf-lato/slack-desc b/system/ttf-lato/slack-desc index baa815e17d..5728df1caf 100644 --- a/system/ttf-lato/slack-desc +++ b/system/ttf-lato/slack-desc @@ -12,7 +12,7 @@ ttf-lato: Lato is a sanserif type face family designed in the Summer 2010 by ttf-lato: Warsaw-based designer Lukasz Dziedzic ("Lato" means "Summer" in ttf-lato: Polish). ttf-lato: -ttf-lato: Home page: http://www.latofonts.com/lato-free-fonts/ +ttf-lato: Home page: https://www.latofonts.com/lato-free-fonts/ ttf-lato: ttf-lato: ttf-lato: diff --git a/system/ttf-lato/ttf-lato.SlackBuild b/system/ttf-lato/ttf-lato.SlackBuild index ab401eeae9..5df11b0a26 100644 --- a/system/ttf-lato/ttf-lato.SlackBuild +++ b/system/ttf-lato/ttf-lato.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ttf-lato -VERSION=${VERSION:-1.0} +VERSION=${VERSION:-2.015} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -70,6 +70,7 @@ cp -a $SRCNAM/Lato*.ttf $PKG/usr/share/fonts/TTF/ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $SRCNAM/OFL.txt $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE +chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/ttf-lato/ttf-lato.info b/system/ttf-lato/ttf-lato.info index fb2b7445f4..9581e7d59c 100644 --- a/system/ttf-lato/ttf-lato.info +++ b/system/ttf-lato/ttf-lato.info @@ -1,7 +1,7 @@ PRGNAM="ttf-lato" -VERSION="1.0" -HOMEPAGE="http://www.latofonts.com/lato-free-fonts/" -DOWNLOAD="http://www.latofonts.com/download/Lato2OFL.zip" +VERSION="2.015" +HOMEPAGE="https://www.latofonts.com/lato-free-fonts/" +DOWNLOAD="https://www.latofonts.com/download/Lato2OFL.zip" MD5SUM="29e379a6ecc1b86c96931fa6ce4b3b0c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/ttf-xo-fonts/ttf-xo-fonts.SlackBuild b/system/ttf-xo-fonts/ttf-xo-fonts.SlackBuild index e0a61bc9fb..2754a22c23 100644 --- a/system/ttf-xo-fonts/ttf-xo-fonts.SlackBuild +++ b/system/ttf-xo-fonts/ttf-xo-fonts.SlackBuild @@ -46,7 +46,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT mkdir -p $PKG/usr/share/fonts/TTF -unzip -j $CWD/all_fonts_myoffice.zip *.ttf -x "*__*" -d $PKG/usr/share/fonts/TTF +unzip -j $CWD/MyOffice_XO_Fonts_1.1.zip *.ttf -x "*__*" -d $PKG/usr/share/fonts/TTF cd $PKG/usr/share/fonts/TTF diff --git a/system/ttf-xo-fonts/ttf-xo-fonts.info b/system/ttf-xo-fonts/ttf-xo-fonts.info index 7182f99ce6..398a60f86d 100644 --- a/system/ttf-xo-fonts/ttf-xo-fonts.info +++ b/system/ttf-xo-fonts/ttf-xo-fonts.info @@ -1,7 +1,7 @@ PRGNAM="ttf-xo-fonts" VERSION="2022" HOMEPAGE="https://myoffice.ru/products/fonts/" -DOWNLOAD="https://myoffice.ru/files/fonts/all_fonts_myoffice.zip" +DOWNLOAD="https://myoffice.ru/files/fonts/MyOffice_XO_Fonts_1.1.zip" MD5SUM="076c0cd2520074b3397bf4dbb2d02f3a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/uhd/uhd.SlackBuild b/system/uhd/uhd.SlackBuild index 54aa0051ed..5e8171fa21 100644 --- a/system/uhd/uhd.SlackBuild +++ b/system/uhd/uhd.SlackBuild @@ -85,6 +85,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +# fix building with gcc >= 13.x +sed -i s/\#include\ \<stddef.h\>/\#include\ \<stddef.h\>\\n\#include\ \<cstdint\>/ ./include/uhd/cal/database.hpp +sed -i s/\#include\ \<string\>/\#include\ \<string\>\\n\#include\ \<cstdint\>/ ./include/uhd/rfnoc/defaults.hpp +sed -i s/\#include\ \<cstddef\>/\#include\ \<cstddef\>\\n\#include\ \<cstdint\>/ ./lib/usrp/dboard/magnesium/magnesium_constants.hpp +sed -i s/\#include\ \<cstddef\>/\#include\ \<cstddef\>\\n\#include\ \<cstdint\>/ ./lib/usrp/dboard/rhodium/rhodium_constants.hpp +sed -i s/\#include\ \<string\>/\#include\ \<string\>\\n\#include\ \<cstdint\>/ ./include/uhd/types/eeprom.hpp +sed -i s/\#include\ \<string\>/\#include\ \<string\>\\n\#include\ \<cstdint\>/ ./lib/include/uhdlib/utils/serial_number.hpp +sed -i s/\#include\ "cast.h"/\#include\ "cast.h"\\n\#include\ \<cstdint\>/ ./lib/deps/pybind11/include/pybind11/attr.h + mkdir -p build cd build cmake \ diff --git a/system/usbredir/usbredir.SlackBuild b/system/usbredir/usbredir.SlackBuild index 93d9db22bc..b260b01ac9 100644 --- a/system/usbredir/usbredir.SlackBuild +++ b/system/usbredir/usbredir.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Slackware build script for usbredir -# Copyright 2013-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=usbredir -VERSION=${VERSION:-0.13.0} +VERSION=${VERSION:-0.14.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -37,9 +37,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/system/usbredir/usbredir.info b/system/usbredir/usbredir.info index 0924b9aa87..0778f58168 100644 --- a/system/usbredir/usbredir.info +++ b/system/usbredir/usbredir.info @@ -1,8 +1,8 @@ PRGNAM="usbredir" -VERSION="0.13.0" +VERSION="0.14.0" HOMEPAGE="https://www.spice-space.org" -DOWNLOAD="https://www.spice-space.org/download/usbredir/usbredir-0.13.0.tar.xz" -MD5SUM="8b6766c0de82cb686486ea141b25f5f2" +DOWNLOAD="https://www.spice-space.org/download/usbredir/usbredir-0.14.0.tar.xz" +MD5SUM="68f232c87c086a25c13fc71ddbdc28a5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/usermin/usermin.SlackBuild b/system/usermin/usermin.SlackBuild index 3bd8f88367..77263f8051 100644 --- a/system/usermin/usermin.SlackBuild +++ b/system/usermin/usermin.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=usermin -VERSION=${VERSION:-2.005} +VERSION=${VERSION:-2.010} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/usermin/usermin.info b/system/usermin/usermin.info index 3757f0c8b6..1430cd7c8f 100644 --- a/system/usermin/usermin.info +++ b/system/usermin/usermin.info @@ -1,8 +1,8 @@ PRGNAM="usermin" -VERSION="2.005" +VERSION="2.010" HOMEPAGE="http://webmin.com/usermin.html" -DOWNLOAD="http://jaist.dl.sourceforge.net/project/webadmin/usermin/2.005/usermin-2.005.tar.gz" -MD5SUM="cee4af2a4186dfc1e8b1a2ce7756a9de" +DOWNLOAD="http://jaist.dl.sourceforge.net/project/webadmin/usermin/2.010/usermin-2.010.tar.gz" +MD5SUM="912789fe1baa26a86b5447ddae1aa243" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="webmin" diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index 38aa08d8c5..1a47be3e2c 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -166,14 +166,14 @@ config() { # at all. # 20230504 bkw: note to self: -w means disable all warnings. - CFLAGS="$SLKCFLAGS -w -fcommon" \ + CFLAGS="$SLKCFLAGS -w -fcommon -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ DOS2UNIX=/bin/true \ XA=/bin/true \ XDG_DESKTOP_MENU=/bin/true \ ./configure \ $configarg \ - $ffmpeg \ + --disable-ffmpeg \ $pulseopt \ --enable-html-docs \ --enable-platformdox \ diff --git a/system/vinterm/includes.diff b/system/vinterm/includes.diff new file mode 100644 index 0000000000..28b9096c59 --- /dev/null +++ b/system/vinterm/includes.diff @@ -0,0 +1,10 @@ +--- vinterm-0.5.0/terminal/pty.h 2013-08-20 01:34:06.000000000 +0900 ++++ vinterm-0.5.0.patched/terminal/pty.h 2023-07-01 09:41:53.057899502 +0900 +@@ -3,6 +3,7 @@ + + #include <string> + #include <ostream> ++#include <cstdint> + using namespace std; + + class Options; diff --git a/system/vinterm/vinterm.SlackBuild b/system/vinterm/vinterm.SlackBuild index 05afe5718c..5d88b5236d 100644 --- a/system/vinterm/vinterm.SlackBuild +++ b/system/vinterm/vinterm.SlackBuild @@ -15,7 +15,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vinterm VERSION=${VERSION:-0.5.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -66,6 +66,8 @@ sed -i -e "s,-Os,$SLKCFLAGS," -e "s,usr/lib,usr/lib$LIBDIRSUFFIX," config.mk # GRR. "make install" respects DESTDIR... except for the icons and .desktop. patch -p1 < $CWD/fix_destdir.diff +# Add an include statement for GCC compatibility. +patch -p1 < $CWD/includes.diff export TERMINFO=$PKG/usr/share/terminfo mkdir -p $TERMINFO diff --git a/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch b/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch new file mode 100644 index 0000000000..46c708b9d3 --- /dev/null +++ b/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch @@ -0,0 +1,36 @@ +https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117.patch +https://bugs.gentoo.org/831963 + +From 41cc016278e713d3db156761fce6437dff81a53a Mon Sep 17 00:00:00 2001 +From: Michal Vasilek <michal@vasilek.cz> +Date: Sat, 22 Jan 2022 23:28:20 +0100 +Subject: [PATCH] meson: fix build with meson 0.61 + +i18n.merge_file doesn't accept positional arguments +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,6 @@ if host_machine.system() != 'windows' + desktop = 'remote-viewer.desktop' + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -14,7 +13,6 @@ if host_machine.system() != 'windows' + mimetypes = 'virt-viewer-mime.xml' + + i18n.merge_file ( +- mimetypes, + type: 'xml', + input: mimetypes + '.in', + output: mimetypes, +@@ -27,7 +25,6 @@ if host_machine.system() != 'windows' + metainfo = 'remote-viewer.appdata.xml' + + i18n.merge_file ( +- metainfo, + type: 'xml', + input: metainfo + '.in', + output: metainfo, +GitLab diff --git a/system/virt-viewer/virt-viewer.SlackBuild b/system/virt-viewer/virt-viewer.SlackBuild index c0601c673f..01d6ef5068 100644 --- a/system/virt-viewer/virt-viewer.SlackBuild +++ b/system/virt-viewer/virt-viewer.SlackBuild @@ -68,6 +68,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/virt-viewer-10.0_p20210730-meson-0.61.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/system/virtiofsd/README b/system/virtiofsd/README new file mode 100644 index 0000000000..45d12f2526 --- /dev/null +++ b/system/virtiofsd/README @@ -0,0 +1,19 @@ +virtiofsd is a vhost-user virtio-fs device backend written in Rust. + +This won't work on a 32bit operating system. + +NOTE: if you wish to update virtiofsd yourself you need to create a +tarball first with the vendored versions of the rust dependencies: +to create the "vendor" source dir yourself unpack the virtiofsd +tarball, enter its directory and execute these three commands + + export LD_LIBRARY_PATH="/opt/rust16/lib64:$LD_LIBRARY_PATH" + export PATH="/opt/rust16/bin:$PATH" + cargo vendor + +then you can create a tarball with + + tar Jcf ../virtiofsd-vendor-$VERSION.tar.xz vendor + +this is necessary to avoid downloading stuff during execution of +the SlackBuild. diff --git a/misc/fcitx5-qt/slack-desc b/system/virtiofsd/slack-desc index 701a0d8e04..a1e87c22f0 100644 --- a/misc/fcitx5-qt/slack-desc +++ b/system/virtiofsd/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fcitx5-qt: fcitx5-qt (Qt libraries for Fcitx5) -fcitx5-qt: -fcitx5-qt: Qt library and IM module for fcitx5 -fcitx5-qt: -fcitx5-qt: Homepage: https://fcitx-im.org/wiki/Fcitx_5 -fcitx5-qt: -fcitx5-qt: -fcitx5-qt: -fcitx5-qt: -fcitx5-qt: -fcitx5-qt: +virtiofsd: virtiofsd (vhost-user virtio-fs device backend) +virtiofsd: +virtiofsd: virtiofsd is a vhost-user virtio-fs device backend written in Rust. +virtiofsd: +virtiofsd: homepage: https://virtio-fs.gitlab.io +virtiofsd: +virtiofsd: +virtiofsd: +virtiofsd: +virtiofsd: +virtiofsd: diff --git a/python/PyColorizer/PyColorizer.SlackBuild b/system/virtiofsd/virtiofsd.SlackBuild index f61df59ba0..fa42211bc3 100644 --- a/python/PyColorizer/PyColorizer.SlackBuild +++ b/system/virtiofsd/virtiofsd.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for PyColorizer +# Slackware build script for virtiofsd -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2023-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,26 +22,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=PyColorizer -VERSION=${VERSION:-0.1} +PRGNAM=virtiofsd +VERSION=${VERSION:-1.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; + x86_64) ARCH=x86_64 ;; +# arm*) ARCH=arm ;; + *) echo "ARCH $(uname -m) is unsupported."; exit 1 ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -52,16 +48,12 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi @@ -70,9 +62,10 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-v$VERSION +tar xvf $CWD/$PRGNAM-v$VERSION.tar.?z* +cd $PRGNAM-v$VERSION +tar xvf $CWD/$PRGNAM-$VERSION-vendor.tar.xz chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -80,13 +73,28 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG +export PATH="/opt/rust16/bin:$PATH" +if [ -z "$LD_LIBRARY_PATH" ]; then + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" +else + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" +fi + +mkdir .cargo +cat <<EOT >>.cargo/config.toml +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" +EOT -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +cargo build --release +install -D -p -s -m 0755 target/release/$PRGNAM $PKG/usr/libexec/$PRGNAM +install -D -p -m 0644 50-virtiofsd.json $PKG/usr/share/qemu/vhost-user/50-virtiofsd.json mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.md doc/*.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/virtiofsd/virtiofsd.info b/system/virtiofsd/virtiofsd.info new file mode 100644 index 0000000000..4f10e98319 --- /dev/null +++ b/system/virtiofsd/virtiofsd.info @@ -0,0 +1,12 @@ +PRGNAM="virtiofsd" +VERSION="1.10.1" +HOMEPAGE="https://virtio-fs.gitlab.io" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://gitlab.com/virtio-fs/virtiofsd/-/archive/v1.10.1/virtiofsd-v1.10.1.tar.bz2 \ + https://ponce.cc/slackware/sources/repo/virtiofsd-1.10.1-vendor.tar.xz" +MD5SUM_x86_64="c6fd3f5b7a83c908f9e08127ec92edc6 \ + d4538be9ccd5f48561e9dc5d98981eb6" +REQUIRES="rust16" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/virtualbox-addons/gcc13.patch b/system/virtualbox-addons/gcc13.patch new file mode 100644 index 0000000000..40701d717f --- /dev/null +++ b/system/virtualbox-addons/gcc13.patch @@ -0,0 +1,11 @@ +--- Config.kmk.orig 2023-04-13 03:15:13.000000000 -0600 ++++ Config.kmk 2023-06-16 09:59:19.820597642 -0600 +@@ -7485,7 +7485,7 @@ + TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 = -m elf_x86_64 + endif + TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-pie -fno-merge-constants -std=c99 -ffreestanding +-TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants -ffreestanding ++TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants + TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h + TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h + TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild index 2f24d766d5..d2445314c4 100644 --- a/system/virtualbox-addons/virtualbox-addons.SlackBuild +++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virtualbox-addons -# Copyright 2008-2023 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2024 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=virtualbox-addons SRCNAM=VirtualBox -VERSION=${VERSION:-6.1.44} +VERSION=${VERSION:-6.1.50} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -89,6 +89,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p0 < $CWD/gcc13.patch + ./configure \ --only-additions \ --disable-kmods \ diff --git a/system/virtualbox-addons/virtualbox-addons.info b/system/virtualbox-addons/virtualbox-addons.info index 1cfc3d8b53..fd54bba65c 100644 --- a/system/virtualbox-addons/virtualbox-addons.info +++ b/system/virtualbox-addons/virtualbox-addons.info @@ -1,8 +1,8 @@ PRGNAM="virtualbox-addons" -VERSION="6.1.44" +VERSION="6.1.50" HOMEPAGE="https://www.virtualbox.org" -DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.44/VirtualBox-6.1.44.tar.bz2" -MD5SUM="309f868297447291db980a1d8fa11ec6" +DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.50/VirtualBox-6.1.50.tar.bz2" +MD5SUM="57073540cb522ded3ad142c7f1fb01ac" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild b/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild index c4d107b2cf..8d53c6fb86 100644 --- a/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild +++ b/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild @@ -4,7 +4,7 @@ # Originally written by Vliegendehuiskat, vliegendehuiskat [at] gmail [dot] com -# Copyright 2014-2023 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2014-2024 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=virtualbox-extension-pack -VERSION=${VERSION:-6.1.44} +VERSION=${VERSION:-6.1.50} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/virtualbox-extension-pack/virtualbox-extension-pack.info b/system/virtualbox-extension-pack/virtualbox-extension-pack.info index 2f4dc9dda0..2c6f7fe351 100644 --- a/system/virtualbox-extension-pack/virtualbox-extension-pack.info +++ b/system/virtualbox-extension-pack/virtualbox-extension-pack.info @@ -1,8 +1,8 @@ PRGNAM="virtualbox-extension-pack" -VERSION="6.1.44" +VERSION="6.1.50" HOMEPAGE="https://www.virtualbox.org" -DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.44/Oracle_VM_VirtualBox_Extension_Pack-6.1.44.vbox-extpack" -MD5SUM="bbd4fb48b1e3494247163fd61de35bc4" +DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.50/Oracle_VM_VirtualBox_Extension_Pack-6.1.50.vbox-extpack" +MD5SUM="3cebe84c4b954f804f5a73b943186a41" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild index 3db6cb3351..bc2d979b04 100644 --- a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild +++ b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virtualbox-kernel -# Copyright 2008-2023 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2024 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=virtualbox-kernel -VERSION=${VERSION:-6.1.44} +VERSION=${VERSION:-6.1.50} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/virtualbox-kernel/virtualbox-kernel.info b/system/virtualbox-kernel/virtualbox-kernel.info index e27edacdce..07890a2108 100644 --- a/system/virtualbox-kernel/virtualbox-kernel.info +++ b/system/virtualbox-kernel/virtualbox-kernel.info @@ -1,10 +1,10 @@ PRGNAM="virtualbox-kernel" -VERSION="6.1.44" +VERSION="6.1.50" HOMEPAGE="https://www.virtualbox.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://sources.liwjatan.org/virtualbox-kernel/virtualbox-kernel-6.1.44.tar.xz" -MD5SUM_x86_64="61f3a59cea124459bd6d760a9ed5ac19" +DOWNLOAD_x86_64="https://sources.liwjatan.org/virtualbox-kernel/virtualbox-kernel-6.1.50.tar.xz" +MD5SUM_x86_64="e8c1ea71da0c8f6ae8c83b553a3e37e3" REQUIRES="" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@slackbuilds.org" diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff index 97e0d0af23..80a04aa65e 100644 --- a/system/virtualbox/vboxdrv.sh-setup.diff +++ b/system/virtualbox/vboxdrv.sh-setup.diff @@ -1,5 +1,5 @@ ---- vboxdrv.sh.orig 2023-01-11 18:59:15.000000000 +0100 -+++ vboxdrv.sh 2023-03-11 16:35:46.673798632 +0100 +--- vboxdrv.sh.orig 2024-02-28 15:40:56.680861821 +0100 ++++ vboxdrv.sh 2024-02-28 15:47:52.417842405 +0100 @@ -45,39 +45,13 @@ MODPROBE="$MODPROBE --allow-unsupported-modules" fi @@ -40,7 +40,7 @@ if test -u "${VIRTUALBOX}"; then GROUP=root DEVICE_MODE=0600 -@@ -173,299 +147,12 @@ +@@ -173,333 +147,12 @@ lsmod | grep -q "$1[^_-]" } @@ -215,7 +215,7 @@ - --state "$opt_name" 2>/dev/null - elif test -f /lib/modules/"$KERN_VER"/build/.config; then - # Extract config option manually. -- grep "$opt_name" /lib/modules/"$KERN_VER"/build/.config | sed -e "s/^$opt_name=//" -e "s/\"//g" +- grep "$opt_name=" /lib/modules/"$KERN_VER"/build/.config | sed -e "s/^$opt_name=//" -e "s/\"//g" - fi -} - @@ -242,6 +242,40 @@ - echo "1" -} - +-# Check if kernel configuration requires modules signature. +-kernel_requires_module_signature() +-{ +- vbox_sys_lockdown_path="/sys/kernel/security/lockdown" +- +- requires="" +- # We consider that if kernel is running in the following configurations, +- # it will require modules to be signed. +- if [ "$(kernel_get_config_opt "CONFIG_MODULE_SIG")" = "y" ]; then +- +- # Modules signature verification is hardcoded in kernel config. +- [ "$(kernel_get_config_opt "CONFIG_MODULE_SIG_FORCE")" = "y" ] && requires="1" +- +- # Unsigned modules loading is restricted by "lockdown" feature in runtime. +- if [ "$(kernel_get_config_opt "CONFIG_LOCK_DOWN_KERNEL")" = "y" \ +- -o "$(kernel_get_config_opt "CONFIG_SECURITY_LOCKDOWN_LSM")" = "y" \ +- -o "$(kernel_get_config_opt "CONFIG_SECURITY_LOCKDOWN_LSM_EARLY")" = "y" ]; then +- +- # Once lockdown level is set to something different than "none" (e.g., "integrity" +- # or "confidentiality"), kernel will reject unsigned modules loading. +- if [ -r "$vbox_sys_lockdown_path" ]; then +- [ -n "$(cat "$vbox_sys_lockdown_path" | grep "\[integrity\]")" ] && requires="1" +- [ -n "$(cat "$vbox_sys_lockdown_path" | grep "\[confidentiality\]")" ] && requires="1" +- fi +- +- # This configuration is used by a number of modern Linux distributions and restricts +- # unsigned modules loading when Secure Boot mode is enabled. +- [ "$(kernel_get_config_opt "CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT")" = "y" -a -n "$HAVE_SEC_BOOT" ] && requires="1" +- fi +- fi +- +- [ -n "$requires" ] && echo "1" +-} +- -# Returns "1" if module is signed and signature can be verified -# with public key provided in DEB_PUB_KEY. Or empty string otherwise. -module_signed() @@ -318,8 +352,8 @@ - mod_dir="$(dirname "$mod_path" | sed 's;^.*/;;')" - [ "$mod_dir" = "misc" ] || return - -- # In case if system is running in Secure Boot mode, check if module is signed. -- if test -n "$HAVE_SEC_BOOT"; then +- # In case if kernel configuration requires module signature, check if module is signed. +- if test "$(kernel_requires_module_signature)" = "1"; then - [ "$(module_signed "$mod")" = "1" ] || return - fi - @@ -340,18 +374,17 @@ start() { begin_msg "Starting VirtualBox services" console -@@ -483,10 +170,6 @@ - fi +@@ -518,9 +171,6 @@ if ! running vboxdrv; then -- + - # Check if system already has matching modules installed. - [ "$(setup_complete)" = "1" ] || setup - if ! rm -f $DEVICE; then failure "Cannot remove $DEVICE" fi -@@ -538,8 +221,6 @@ +@@ -572,8 +222,6 @@ mkdir -p -m 0750 /dev/vboxusb 2>/dev/null chown root:vboxusers /dev/vboxusb 2>/dev/null fi @@ -360,7 +393,7 @@ succ_msg "VirtualBox services started" } -@@ -620,153 +301,10 @@ +@@ -654,153 +302,10 @@ fi } @@ -425,7 +458,7 @@ - module_build_log "$myerr" - failure "Look at $LOG to find out what went wrong" - fi -- log "Building the net adaptor module." +- log "Building the net adapter module." - if ! myerr=`$BUILDINTMP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --module-source "$MODULE_SRC/vboxnetadp" \ @@ -450,8 +483,8 @@ - sync - succ_msg "VirtualBox kernel modules built" - -- # Secure boot on Ubuntu, Debian and Oracle Linux. -- if test -n "$HAVE_SEC_BOOT"; then +- # Sign kernel modules if kernel configuration requires it. +- if test "$(kernel_requires_module_signature)" = "1"; then - begin_msg "Signing VirtualBox kernel modules" console - - # Generate new signing key if needed. @@ -515,7 +548,7 @@ } dmnstatus() -@@ -816,20 +354,7 @@ +@@ -850,20 +355,7 @@ stop && start ;; setup) @@ -537,7 +570,7 @@ ;; force-reload) stop -@@ -839,7 +364,7 @@ +@@ -873,7 +365,7 @@ dmnstatus ;; *) diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild index 665cb7aeab..e4c4d04639 100644 --- a/system/virtualbox/virtualbox.SlackBuild +++ b/system/virtualbox/virtualbox.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virtualbox -# Copyright 2008-2023 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2024 Heinz Wiesinger, Amsterdam, The Netherlands # Copyright 2008 Mauro Giachero <mauro.giachero@gmail.com> # All rights reserved. # @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=virtualbox SRCNAM=VirtualBox -VERSION=${VERSION:-6.1.44} +VERSION=${VERSION:-6.1.50} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info index adbeae3452..44e1b2819c 100644 --- a/system/virtualbox/virtualbox.info +++ b/system/virtualbox/virtualbox.info @@ -1,16 +1,16 @@ PRGNAM="virtualbox" -VERSION="6.1.44" +VERSION="6.1.50" HOMEPAGE="https://www.virtualbox.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="http://download.virtualbox.org/virtualbox/6.1.44/VirtualBox-6.1.44.tar.bz2 \ - http://download.virtualbox.org/virtualbox/6.1.44/VBoxGuestAdditions_6.1.44.iso \ - http://download.virtualbox.org/virtualbox/6.1.44/UserManual.pdf \ - http://download.virtualbox.org/virtualbox/6.1.44/SDKRef.pdf" -MD5SUM_x86_64="309f868297447291db980a1d8fa11ec6 \ - 282a2d395eac07d7bcde128b529f2bc9 \ - 8b4b2dccba569cba4a82b7441010d86f \ - 62847ffd60056b3377c9974ca98791c7" +DOWNLOAD_x86_64="http://download.virtualbox.org/virtualbox/6.1.50/VirtualBox-6.1.50.tar.bz2 \ + http://download.virtualbox.org/virtualbox/6.1.50/VBoxGuestAdditions_6.1.50.iso \ + http://download.virtualbox.org/virtualbox/6.1.50/UserManual.pdf \ + http://download.virtualbox.org/virtualbox/6.1.50/SDKRef.pdf" +MD5SUM_x86_64="57073540cb522ded3ad142c7f1fb01ac \ + 1041bbc411d15720694a76ca06c2795b \ + ede83ce195f62c406e5fd77639101a0f \ + 3cb39e3b30f5fb64c4ba00eee8a4833d" REQUIRES="acpica virtualbox-kernel" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@slackbuilds.org" diff --git a/system/webmin/webmin.SlackBuild b/system/webmin/webmin.SlackBuild index da8e6f77ad..526f016770 100644 --- a/system/webmin/webmin.SlackBuild +++ b/system/webmin/webmin.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for Webmin http://www.webmin.com # Copyright 2006-2019 David Somero (dsomero@hotmail.com) +# Copyright 2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=webmin -VERSION=${VERSION:-2.105} +VERSION=${VERSION:-2.111} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/webmin/webmin.info b/system/webmin/webmin.info index 79ff5a17e7..deddb65df2 100644 --- a/system/webmin/webmin.info +++ b/system/webmin/webmin.info @@ -1,10 +1,10 @@ PRGNAM="webmin" -VERSION="2.105" +VERSION="2.111" HOMEPAGE="https://www.webmin.com/" -DOWNLOAD="https://downloads.sf.net/project/webadmin/webmin/2.105/webmin-2.105.tar.gz" -MD5SUM="b518ad1a5750fd92647613d707478403" +DOWNLOAD="https://downloads.sf.net/project/webadmin/webmin/2.111/webmin-2.111.tar.gz" +MD5SUM="347b08feb6a07965d928c530e51bc427" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="zulu-openjdk8" -MAINTAINER="David Somero" -EMAIL="dsomero@hotmail.com" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild index 4c669faaec..138bf6251d 100644 --- a/system/wine-staging/wine-staging.SlackBuild +++ b/system/wine-staging/wine-staging.SlackBuild @@ -33,7 +33,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wine-staging -VERSION=${VERSION:-9.6} +VERSION=${VERSION:-9.7} WINEVERSION=$VERSION STAGINGVERSION=$VERSION ARCHS="i386,x86_64" diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info index 9eba5cc053..019dab3def 100644 --- a/system/wine-staging/wine-staging.info +++ b/system/wine-staging/wine-staging.info @@ -1,10 +1,10 @@ PRGNAM="wine-staging" -VERSION="9.6" +VERSION="9.7" HOMEPAGE="https://wiki.winehq.org/Wine-Staging" -DOWNLOAD="https://dl.winehq.org/wine/source/9.x/wine-9.6.tar.xz \ - https://github.com/wine-staging/wine-staging/archive/v9.6/wine-staging-9.6.tar.gz" -MD5SUM="9bc6c11d200b717fa2ad33be31d91da2 \ - ab997f4aded3004ed736d0bdbf114fb3" +DOWNLOAD="https://dl.winehq.org/wine/source/9.x/wine-9.7.tar.xz \ + https://github.com/wine-staging/wine-staging/archive/v9.7/wine-staging-9.7.tar.gz" +MD5SUM="a419a59b3a00a0aa49646065c1aa78a0 \ + 26234ce1a1f9eacce2ea9b19ca70137b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/xarchiver/xarchiver.SlackBuild b/system/xarchiver/xarchiver.SlackBuild index 6cae31e1cb..700f950d0e 100644 --- a/system/xarchiver/xarchiver.SlackBuild +++ b/system/xarchiver/xarchiver.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for Xarchiver # Copyright 2007, 2008 Frank Caraballo <fecaraballo{at}gmail{dot}com> -# Copyright 2019 Edward W. Koenig <kingbeowulf{at}gmail{dot}com> +# Copyright 2019 Edward W. Koenig, Vancouver, WA USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xarchiver -VERSION=${VERSION:-0.5.4.21} +VERSION=${VERSION:-0.5.4.23} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/xarchiver/xarchiver.info b/system/xarchiver/xarchiver.info index f99069d9e9..dfb4c396a5 100644 --- a/system/xarchiver/xarchiver.info +++ b/system/xarchiver/xarchiver.info @@ -1,8 +1,8 @@ PRGNAM="xarchiver" -VERSION="0.5.4.21" +VERSION="0.5.4.23" HOMEPAGE="https://github.com/ib/xarchiver" -DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.21/xarchiver-0.5.4.21.tar.gz" -MD5SUM="94621a793a45521ef55702e940442552" +DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.23/xarchiver-0.5.4.23.tar.gz" +MD5SUM="bfdace2b113417e1bc77ef304280d103" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/xen/dom0/README.dom0 b/system/xen/dom0/README.dom0 index 804d0efb00..b620e21e81 100644 --- a/system/xen/dom0/README.dom0 +++ b/system/xen/dom0/README.dom0 @@ -57,7 +57,7 @@ kernel-xen.sh: This script builds the Linux Kernel for a Xen Hypervisor. * To make things a bit easier, a copy of Xen EFI binary can be found here: - http://slackware.hr/~mario/xen/xen-4.17.1.efi.gz + http://slackware.hr/~mario/xen/xen-4.18.2.efi.gz !!! Make sure to understand what are you doing at this point, you could easily lose your data. Always create backups !!! diff --git a/system/xen/dom0/config-5.15.139-xen.x86_64 b/system/xen/dom0/config-5.15.145-xen.x86_64 index b5c74fb8ff..ab75ec2a78 100644 --- a/system/xen/dom0/config-5.15.139-xen.x86_64 +++ b/system/xen/dom0/config-5.15.145-xen.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.139 Kernel Configuration +# Linux/x86 5.15.145 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y @@ -3371,7 +3371,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STMMAC_PLATFORM=m CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_INTEL=m -# CONFIG_DWMAC_LOONGSON is not set # CONFIG_STMMAC_PCI is not set CONFIG_NET_VENDOR_SUN=y CONFIG_HAPPYMEAL=m diff --git a/system/xen/dom0/kernel-xen.sh b/system/xen/dom0/kernel-xen.sh index 0741ee7ce9..f5d50513a0 100644 --- a/system/xen/dom0/kernel-xen.sh +++ b/system/xen/dom0/kernel-xen.sh @@ -5,8 +5,8 @@ # Written by Chris Abela <chris.abela@maltats.com>, 20100515 # Modified by Mario Preksavec <mario@slackware.hr> -KERNEL=${KERNEL:-5.15.139} -XEN=${XEN:-4.18.0} +KERNEL=${KERNEL:-5.15.145} +XEN=${XEN:-4.18.2} ROOTMOD=${ROOTMOD:-ext4} ROOTFS=${ROOTFS:-ext4} diff --git a/system/xen/domU/domU.sh b/system/xen/domU/domU.sh index 4b167fc63a..9eb2bcd770 100644 --- a/system/xen/domU/domU.sh +++ b/system/xen/domU/domU.sh @@ -7,7 +7,7 @@ set -e -KERNEL=${KERNEL:-5.15.139} +KERNEL=${KERNEL:-5.15.145} # Build an image for the root file system and another for the swap # Default values : 8GB and 500MB resepectively. diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild index 5f3f380186..3f90291c4a 100644 --- a/system/xen/xen.SlackBuild +++ b/system/xen/xen.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xen -# Copyright 2010, 2023 Mario Preksavec, Zagreb, Croatia +# Copyright 2010, 2024 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xen -VERSION=${VERSION:-4.18.0} +VERSION=${VERSION:-4.18.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/xen/xen.info b/system/xen/xen.info index 83847ec031..1c9a36ce98 100644 --- a/system/xen/xen.info +++ b/system/xen/xen.info @@ -1,9 +1,9 @@ PRGNAM="xen" -VERSION="4.18.0" +VERSION="4.18.2" HOMEPAGE="http://www.xenproject.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="http://mirror.slackware.hr/sources/xen/xen-4.18.0.tar.gz \ +DOWNLOAD_x86_64="http://mirror.slackware.hr/sources/xen/xen-4.18.2.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/ipxe-git-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/lwip-1.3.0.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/zlib-1.2.3.tar.gz \ @@ -15,7 +15,7 @@ DOWNLOAD_x86_64="http://mirror.slackware.hr/sources/xen/xen-4.18.0.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/tpm_emulator-0.7.4.tar.gz \ http://mirror.slackware.hr/sources/xen-seabios/seabios-1.16.2.tar.gz \ http://mirror.slackware.hr/sources/xen-ovmf/xen-ovmf-20230524_ba91d0292e.tar.bz2" -MD5SUM_x86_64="c564d641a8638cfd43a0a810ebce2179 \ +MD5SUM_x86_64="d3cb8b75ea77efb858ce2da80ff72256 \ 0d0dc7451b47f2c7a2992bbec20bf4d0 \ 36cc57650cffda9a0269493be2a169bb \ debc62758716a169df9f62e6ab2bc634 \ diff --git a/system/xvfb-run/xvfb-run.SlackBuild b/system/xvfb-run/xvfb-run.SlackBuild index cff238081a..741732e880 100644 --- a/system/xvfb-run/xvfb-run.SlackBuild +++ b/system/xvfb-run/xvfb-run.SlackBuild @@ -25,11 +25,12 @@ # 20-05-2023: Updated to version 21.1.7 and cleaned up to adhere to # sbopkglint standards. - Bob Funk # 20-12-2023: Updated to version 21.1.10 +# 08-05-2024: Updated to version 21.1.12 cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xvfb-run -VERSION=${VERSION:-21.1.11} +VERSION=${VERSION:-21.1.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/xvfb-run/xvfb-run.info b/system/xvfb-run/xvfb-run.info index b80dc2b315..fadbfbbf69 100644 --- a/system/xvfb-run/xvfb-run.info +++ b/system/xvfb-run/xvfb-run.info @@ -1,8 +1,8 @@ PRGNAM="xvfb-run" -VERSION="21.1.11" +VERSION="21.1.12" HOMEPAGE="https://packages.gentoo.org/packages/x11-misc/xvfb-run" -DOWNLOAD="http://ftp.us.debian.org/debian/pool/main/x/xorg-server/xvfb_21.1.11-2_i386.deb" -MD5SUM="f37981494621f43f29a4d97ee4b0177e" +DOWNLOAD="http://ftp.us.debian.org/debian/pool/main/x/xorg-server/xvfb_21.1.12-1_i386.deb" +MD5SUM="692c648ce01220b6dff51372e733735f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |
