From 624310eae5a6ff65fc247b854d750e11ce3c1e7e Mon Sep 17 00:00:00 2001 From: arabian Date: Fri, 6 Mar 2026 22:27:02 +0300 Subject: [PATCH] feat: convert aur submodules to regular directories --- .gitignore | 2 + .gitmodules | 9 -- packages/aur/bin | 1 - packages/aur/bin/.SRCINFO | 17 ++++ packages/aur/bin/.gitignore | 163 +++++++++++++++++++++++++++++++ packages/aur/bin/PKGBUILD | 32 ++++++ packages/aur/standart | 1 - packages/aur/standart/.SRCINFO | 16 +++ packages/aur/standart/.gitignore | 163 +++++++++++++++++++++++++++++++ packages/aur/standart/PKGBUILD | 47 +++++++++ 10 files changed, 440 insertions(+), 11 deletions(-) delete mode 160000 packages/aur/bin create mode 100644 packages/aur/bin/.SRCINFO create mode 100644 packages/aur/bin/.gitignore create mode 100644 packages/aur/bin/PKGBUILD delete mode 160000 packages/aur/standart create mode 100644 packages/aur/standart/.SRCINFO create mode 100644 packages/aur/standart/.gitignore create mode 100644 packages/aur/standart/PKGBUILD diff --git a/.gitignore b/.gitignore index 3a8cabc..52c9f28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /target .idea +packages/aur/bin/.git +packages/aur/standart/.git diff --git a/.gitmodules b/.gitmodules index 55ac3b8..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +0,0 @@ -[submodule "packages/aur"] - path = packages/aur - url = ssh://aur@aur.archlinux.org/pwsp.git -[submodule "packages/aur/standart"] - path = packages/aur/standart - url = ssh://aur@aur.archlinux.org/pwsp.git -[submodule "packages/aur/bin"] - path = packages/aur/bin - url = ssh://aur@aur.archlinux.org/pwsp-bin.git diff --git a/packages/aur/bin b/packages/aur/bin deleted file mode 160000 index 8a0b306..0000000 --- a/packages/aur/bin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8a0b3067dc6413f9624c0e3ba2df88278a07586e diff --git a/packages/aur/bin/.SRCINFO b/packages/aur/bin/.SRCINFO new file mode 100644 index 0000000..f529470 --- /dev/null +++ b/packages/aur/bin/.SRCINFO @@ -0,0 +1,17 @@ +pkgbase = pwsp-bin +pkgdesc = Lets you play audio files through your microphone (Pre-built binaries) +pkgver = 1.6.1 +pkgrel = 2 +url = https://github.com/arabianq/pipewire-soundpad +arch = x86_64 +license = MIT +depends = pipewire +depends = alsa-lib +provides = pwsp +conflicts = pwsp +source = pwsp-bin-1.6.1.zip :: https://github.com/arabianq/pipewire-soundpad/releases/download/v1.6.1/pwsp-v1.6.1-linux-x64.zip +source = pipewire-soundpad-1.6.1.tar.gz :: https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.6.1.tar.gz +sha256sums = SKIP +sha256sums = SKIP + +pkgname = pwsp-bin \ No newline at end of file diff --git a/packages/aur/bin/.gitignore b/packages/aur/bin/.gitignore new file mode 100644 index 0000000..958dc61 --- /dev/null +++ b/packages/aur/bin/.gitignore @@ -0,0 +1,163 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal +*.db +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +poetry.lock + +.poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cythikaaryhon_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ +#.vscode/ diff --git a/packages/aur/bin/PKGBUILD b/packages/aur/bin/PKGBUILD new file mode 100644 index 0000000..18d63a5 --- /dev/null +++ b/packages/aur/bin/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Alexander Tarasov +pkgname=pwsp-bin +_pkgname=pipewire-soundpad +pkgver=1.6.1 +pkgrel=2 +pkgdesc="Lets you play audio files through your microphone (Pre-built binaries)" +arch=('x86_64') +url="https://github.com/arabianq/pipewire-soundpad" +license=('MIT') +depends=('pipewire' 'alsa-lib') +provides=('pwsp') +conflicts=('pwsp') + +source=("${pkgname}-${pkgver}.zip::https://github.com/arabianq/$_pkgname/releases/download/v$pkgver/pwsp-v$pkgver-linux-x64.zip" + "${_pkgname}-${pkgver}.tar.gz::https://github.com/arabianq/$_pkgname/archive/refs/tags/v$pkgver.tar.gz") + +sha256sums=('SKIP' + 'SKIP') + +package() { + _srcsrc="${srcdir}/${_pkgname}-${pkgver}" + + install -Dm755 "${srcdir}/pwsp-cli" "${pkgdir}/usr/bin/pwsp-cli" + install -Dm755 "${srcdir}/pwsp-daemon" "${pkgdir}/usr/bin/pwsp-daemon" + install -Dm755 "${srcdir}/pwsp-gui" "${pkgdir}/usr/bin/pwsp-gui" + + install -Dm644 "$_srcsrc/assets/pwsp-gui.desktop" "${pkgdir}/usr/share/applications/pwsp-gui.desktop" + install -Dm644 "$_srcsrc/assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/icon.png" + install -Dm644 "$_srcsrc/assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service" + + install -Dm644 "$_srcsrc/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} \ No newline at end of file diff --git a/packages/aur/standart b/packages/aur/standart deleted file mode 160000 index fd46ecd..0000000 --- a/packages/aur/standart +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fd46ecde69efaba2ea1e1bda81271f7efbe16743 diff --git a/packages/aur/standart/.SRCINFO b/packages/aur/standart/.SRCINFO new file mode 100644 index 0000000..58c9229 --- /dev/null +++ b/packages/aur/standart/.SRCINFO @@ -0,0 +1,16 @@ +pkgbase = pwsp + pkgdesc = Lets you play audio files through your microphone + pkgver = 1.6.1 + pkgrel = 1 + url = https://github.com/arabianq/pipewire-soundpad + arch = any + license = MIT + makedepends = clang + makedepends = rust + makedepends = cargo + makedepends = pipewire + makedepends = alsa-lib + source = https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.6.1.tar.gz + sha256sums = SKIP + +pkgname = pwsp diff --git a/packages/aur/standart/.gitignore b/packages/aur/standart/.gitignore new file mode 100644 index 0000000..958dc61 --- /dev/null +++ b/packages/aur/standart/.gitignore @@ -0,0 +1,163 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal +*.db +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +poetry.lock + +.poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cythikaaryhon_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ +#.vscode/ diff --git a/packages/aur/standart/PKGBUILD b/packages/aur/standart/PKGBUILD new file mode 100644 index 0000000..4158b1c --- /dev/null +++ b/packages/aur/standart/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer: Alexander Tarasov +pkgsubn=pwsp +pkgname=pwsp +pkgver=1.6.1 +pkgrel=1 +pkgdesc="Lets you play audio files through your microphone" +arch=('any') +url="https://github.com/arabianq/pipewire-soundpad" +license=('MIT') +makedepends=(clang rust cargo pipewire alsa-lib) +source=("$url/archive/refs/tags/v$pkgver.tar.gz") +sha256sums=('SKIP') + + +prepare() { + cd "${srcdir}/pipewire-soundpad-${pkgver}" + + export CARGO_HOME="${srcdir}/${pkgname%}/.cargo" # Download all to src directory, not in ~/.cargo + + cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')" +} + +build() { + cd "${srcdir}/pipewire-soundpad-${pkgver}" + + export CARGO_ENCODED_RUSTFLAGS="--remap-path-prefix=${srcdir}=/" # Prevent warning: 'Package contains reference to $srcdir' + [[ -n "${_sccache}" ]] && export RUSTC_WRAPPER=sccache # If $_sccache not empty, build using binary cache + + export CARGO_HOME="${srcdir}/${pkgname%}/.cargo" # Use downloaded earlier from src directory, not from ~/.cargo + export CARGO_TARGET_DIR=target # Place the output in target relative to the current directory + + cargo build --frozen --release +} + + +package() { + cd "${srcdir}/pipewire-soundpad-${pkgver}" + + install -Dm755 "target/release/pwsp-cli" "${pkgdir}/usr/bin/pwsp-cli" + install -Dm755 "target/release/pwsp-daemon" "${pkgdir}/usr/bin/pwsp-daemon" + install -Dm755 "target/release/pwsp-gui" "${pkgdir}/usr/bin/pwsp-gui" + + install -Dm644 "assets/pwsp-gui.desktop" "${pkgdir}/usr/share/applications/pwsp-gui.desktop" + install -Dm644 "assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/icon.png" + + install -Dm644 "assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service" +}