Skip to content

Commit e59da05

Browse files
XdaviusxdaviusElsie19oklopferpre-commit-ci[bot]
authored
upd(tenacity-git): 1.3.1 -> 1.3.3 (#6732)
Co-authored-by: xdavius <xdavius@github.com> Co-authored-by: Elsie <hwengerstickel@protonmail.com> Co-authored-by: oklopfer <104327997+oklopfer@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Elsie <elsie19@pm.me>
1 parent 0df5881 commit e59da05

File tree

3 files changed

+76
-81
lines changed

3 files changed

+76
-81
lines changed

packages/tenacity-git/.SRCINFO

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
pkgbase = tenacity-git
2-
pkgver = 1.3.1
2+
gives = tenacity
3+
pkgver = 1.3.3
34
pkgdesc = FLOSS Audacity Fork. No telemetry, crash reports and other shenanigans like that!
45
arch = any
56
depends = libc6
@@ -23,17 +24,22 @@ pkgbase = tenacity-git
2324
depends = libvorbis0a
2425
depends = libvorbisenc2
2526
depends = libvorbisfile3
26-
depends = libavcodec60
27-
depends = libavformat60
28-
depends = libavutil58
27+
depends = libportmidi0
28+
depends = libzip-dev
29+
depends = libjsoncpp-dev
30+
depends = libavcodec-dev
31+
depends = libavformat-dev
32+
depends = libavutil-dev
2933
depends = libflac++10
3034
depends = libflac12
31-
depends = libportsmf0v5
35+
depends = libportsmf-dev
3236
depends = libwxbase3.2-1
3337
depends = libwxgtk3.2-1
34-
makedepends = python3-pip
35-
makedepends = build-essential
36-
makedepends = ninja-build
38+
makedepends = clang
39+
makedepends = chrpath
40+
makedepends = cmake
41+
makedepends = pkg-config
42+
makedepends = libelf-dev
3743
makedepends = libavcodec-dev
3844
makedepends = libavformat-dev
3945
makedepends = libavutil-dev
@@ -65,7 +71,6 @@ pkgbase = tenacity-git
6571
makedepends = lv2-dev
6672
makedepends = zlib1g-dev
6773
makedepends = cmake
68-
makedepends = ninja-build
6974
makedepends = libjpeg-dev
7075
makedepends = libtiff-dev
7176
makedepends = liblzma-dev
@@ -76,25 +81,11 @@ pkgbase = tenacity-git
7681
makedepends = zipcmp
7782
makedepends = zipmerge
7883
makedepends = ziptool
79-
makedepends = libzip4
8084
makedepends = gettext
8185
optdepends = ffmpeg: additional import/export capabilities
82-
replaces = audacity
83-
incompatible = ubuntu:bionic
84-
incompatible = ubuntu:focal
85-
incompatible = ubuntu:jammy
86-
incompatible = debian:stretch
87-
incompatible = debian:buster
88-
incompatible = debian:bullseye
8986
maintainer = echometerain <echometer@disroot.org>
90-
source = https://codeberg.org/tenacityteam/tenacity.git
91-
depends_bookworm = libavcodec59
92-
depends_bookworm = libavformat59
93-
depends_bookworm = libavutil57
94-
depends_bookworm = libflac++10
95-
depends_bookworm = libflac12
96-
depends_bookworm = libportsmf0
97-
depends_bookworm = libwxbase3.2-1
98-
depends_bookworm = libwxgtk3.2-1
87+
maintainer = xdavius <xdavius@github.com>
88+
source = git+https://codeberg.org/tenacityteam/tenacity.git
89+
source = tenacity-libnyquist::git+https://codeberg.org/tenacityteam/libnyquist.git
9990

10091
pkgname = tenacity-git
Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,56 @@
11
pkgname="tenacity-git"
2-
source=("https://codeberg.org/tenacityteam/tenacity.git")
2+
gives="tenacity"
3+
source=("git+https://codeberg.org/tenacityteam/tenacity.git"
4+
"tenacity-libnyquist::git+https://codeberg.org/tenacityteam/libnyquist.git")
5+
pkgver="1.3.3"
36
arch=("any")
4-
pkgver="1.3.1"
5-
makedepends=("python3-pip" "build-essential" "ninja-build" "libavcodec-dev" "libavformat-dev" "libavutil-dev" "libavdevice-dev" "libavfilter-dev" "libpostproc-dev" "libportsmf-dev" "libflac++-dev" "libglib2.0-dev" "libgtk-3-dev" "libid3tag0-dev" "libjack-jackd2-dev" "liblilv-dev" "libmad0-dev" "libmp3lame-dev" "libogg-dev" "libpng-dev" "portaudio19-dev" "libportmidi-dev" "libserd-dev" "libsndfile1-dev" "libsord-dev" "libsoundtouch-dev" "libsoxr-dev" "libsuil-dev" "libtwolame-dev" "vamp-plugin-sdk" "libvorbis-dev" "lv2-dev" "zlib1g-dev" "cmake" "ninja-build" "libjpeg-dev" "libtiff-dev" "liblzma-dev" "libsqlite3-dev" "libwxgtk3.2-dev" "libjsoncpp-dev" "libzip-dev" "zipcmp" "zipmerge" "ziptool" "libzip4" "gettext")
6-
depends=("libc6" "libexpat1" "libgcc-s1" "libgdk-pixbuf-2.0-0" "libglib2.0-0" "libgtk-3-0" "libid3tag0" "liblilv-0-0" "libmad0" "libogg0" "libportaudio2" "libsndfile1" "libsoundtouch1" "libsoxr0" "libstdc++6" "libsuil-0-0" "libtwolame0" "libvamp-hostsdk3v5" "libvorbis0a" "libvorbisenc2" "libvorbisfile3")
7-
depends_bookworm=("libavcodec59" "libavformat59" "libavutil57" "libflac++10" "libflac12" "libportsmf0" "libwxbase3.2-1" "libwxgtk3.2-1")
8-
depends_kinetic=("libavcodec59" "libavformat59" "libavutil57" "libflac++6v5" "libflac8" "libportsmf0v5" "libwxbase3.2-0" "libwxgtk3.2-0")
9-
depends_lunar=("libavcodec59" "libavformat59" "libavutil57" "libflac++10" "libflac8" "libportsmf0v5" "libwxbase3.2-0" "libwxgtk3.2-0")
10-
if [[ ! "bookworm kinetic lunar" =~ ${DISTRO#*:} ]]; then
11-
depends+=("libavcodec60" "libavformat60" "libavutil58" "libflac++10" "libflac12" "libportsmf0v5" "libwxbase3.2-1" "libwxgtk3.2-1")
12-
fi
13-
replaces=("audacity")
147
pkgdesc="FLOSS Audacity Fork. No telemetry, crash reports and other shenanigans like that!"
8+
makedepends=("clang" "chrpath" "cmake" "pkg-config" "libelf-dev" "libavcodec-dev" "libavformat-dev" "libavutil-dev" "libavdevice-dev" "libavfilter-dev" "libpostproc-dev" "libportsmf-dev" "libflac++-dev" "libglib2.0-dev" "libgtk-3-dev" "libid3tag0-dev" "libjack-jackd2-dev" "liblilv-dev" "libmad0-dev" "libmp3lame-dev" "libogg-dev" "libpng-dev" "portaudio19-dev" "libportmidi-dev" "libserd-dev" "libsndfile1-dev" "libsord-dev" "libsoundtouch-dev" "libsoxr-dev" "libsuil-dev" "libtwolame-dev" "vamp-plugin-sdk" "libvorbis-dev" "lv2-dev" "zlib1g-dev" "cmake" "libjpeg-dev" "libtiff-dev" "liblzma-dev" "libsqlite3-dev" "libwxgtk3.2-dev" "libjsoncpp-dev" "libzip-dev" "zipcmp" "zipmerge" "ziptool" "gettext")
9+
10+
depends=("libc6" "libexpat1" "libgcc-s1" "libgdk-pixbuf-2.0-0" "libglib2.0-0" "libgtk-3-0" "libid3tag0" "liblilv-0-0" "libmad0" "libogg0" "libportaudio2" "libsndfile1" "libsoundtouch1" "libsoxr0" "libstdc++6" "libsuil-0-0" "libtwolame0" "libvamp-hostsdk3v5" "libvorbis0a" "libvorbisenc2" "libvorbisfile3" "libportmidi0" "libzip-dev" "libjsoncpp-dev" "libavcodec-dev" "libavformat-dev" "libavutil-dev" "libflac++10" "libflac12" "libportsmf-dev" "libwxbase3.2-1" "libwxgtk3.2-1")
1511

1612
optdepends=("ffmpeg: additional import/export capabilities")
17-
maintainer=("echometerain <echometer@disroot.org>")
18-
incompatible=("ubuntu:bionic" "ubuntu:focal" "ubuntu:jammy" "debian:stretch" "debian:buster" "debian:bullseye")
13+
maintainer=("echometerain <echometer@disroot.org>" "xdavius <xdavius@github.com>")
14+
external_connection=true
1915

2016
prepare() {
21-
modern=("devel" "sid" "lunar" "bookworm" "mantic" "noble" "trixie" "testing" "unstable")
22-
# shellcheck disable=SC2076
23-
if [[ " ${modern[*]} " =~ " ${DISTRO#*:} " ]]; then
24-
pyhack=("--break-system-packages")
25-
else
26-
pyhack=()
27-
fi
28-
cd "tenacity"
29-
pip3 install conan "${pyhack[@]}"
17+
cd tenacity
18+
git submodule init
19+
git config submodule.vcpkg.update none
20+
git config submodule.lib-src/libnyquist.url "${srcdir}/tenacity-libnyquist"
21+
git -c protocol.file.allow=always submodule update
22+
23+
cd images/icons
24+
for i in *; do # fix for png icons not following hicolor category folders
25+
cd "${i}"
26+
mkdir -p apps
27+
[[ -f tenacity.png ]] && mv tenacity.png apps
28+
cd ..
29+
done
30+
cd ../..
31+
mkdir -p build
3032
}
3133

3234
build() {
33-
cd "tenacity"
34-
cmake -G Ninja -S . -B build \
35-
-D CMAKE_BUILD_TYPE=Release \
36-
-D CMAKE_INSTALL_PREFIX="${pkgdir}/usr/local"
37-
cmake --build build
35+
cd tenacity/build
36+
CC=clang CXX=clang++ cmake \
37+
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
38+
-DCMAKE_INSTALL_PREFIX=/usr \
39+
-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config \
40+
-Wno-dev \
41+
..
42+
cmake --build .
43+
make -j"${NCPU}" .
3844
}
3945

4046
package() {
41-
cd "tenacity"
42-
cmake --install build
47+
cd tenacity/build
48+
make DESTDIR="${pkgdir}" install
49+
[[ -f "${pkgdir}/usr/tenacity" ]] && rm "${pkgdir}/usr/tenacity" # remove unused launch script
50+
51+
mv "${pkgdir}/usr/share/pixmaps/gnome-mime-application-x-audacity-project.xpm" \
52+
"${pkgdir}/usr/share/pixmaps/gnome-mime-application-x-tenacity-project.xpm"
53+
54+
chrpath --delete "${pkgdir}"/usr/lib/x86_64-linux-gnu/tenacity/*.so
55+
chrpath --delete "${pkgdir}"/usr/lib/x86_64-linux-gnu/tenacity/modules/*.so
4356
}

srclist

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11036,7 +11036,8 @@ pkgbase = telegram-bin
1103611036
pkgname = telegram-bin
1103711037
---
1103811038
pkgbase = tenacity-git
11039-
pkgver = 1.3.1
11039+
gives = tenacity
11040+
pkgver = 1.3.3
1104011041
pkgdesc = FLOSS Audacity Fork. No telemetry, crash reports and other shenanigans like that!
1104111042
arch = any
1104211043
depends = libc6
@@ -11060,17 +11061,22 @@ pkgbase = tenacity-git
1106011061
depends = libvorbis0a
1106111062
depends = libvorbisenc2
1106211063
depends = libvorbisfile3
11063-
depends = libavcodec60
11064-
depends = libavformat60
11065-
depends = libavutil58
11064+
depends = libportmidi0
11065+
depends = libzip-dev
11066+
depends = libjsoncpp-dev
11067+
depends = libavcodec-dev
11068+
depends = libavformat-dev
11069+
depends = libavutil-dev
1106611070
depends = libflac++10
1106711071
depends = libflac12
11068-
depends = libportsmf0v5
11072+
depends = libportsmf-dev
1106911073
depends = libwxbase3.2-1
1107011074
depends = libwxgtk3.2-1
11071-
makedepends = python3-pip
11072-
makedepends = build-essential
11073-
makedepends = ninja-build
11075+
makedepends = clang
11076+
makedepends = chrpath
11077+
makedepends = cmake
11078+
makedepends = pkg-config
11079+
makedepends = libelf-dev
1107411080
makedepends = libavcodec-dev
1107511081
makedepends = libavformat-dev
1107611082
makedepends = libavutil-dev
@@ -11102,7 +11108,6 @@ pkgbase = tenacity-git
1110211108
makedepends = lv2-dev
1110311109
makedepends = zlib1g-dev
1110411110
makedepends = cmake
11105-
makedepends = ninja-build
1110611111
makedepends = libjpeg-dev
1110711112
makedepends = libtiff-dev
1110811113
makedepends = liblzma-dev
@@ -11113,26 +11118,12 @@ pkgbase = tenacity-git
1111311118
makedepends = zipcmp
1111411119
makedepends = zipmerge
1111511120
makedepends = ziptool
11116-
makedepends = libzip4
1111711121
makedepends = gettext
1111811122
optdepends = ffmpeg: additional import/export capabilities
11119-
replaces = audacity
11120-
incompatible = ubuntu:bionic
11121-
incompatible = ubuntu:focal
11122-
incompatible = ubuntu:jammy
11123-
incompatible = debian:stretch
11124-
incompatible = debian:buster
11125-
incompatible = debian:bullseye
1112611123
maintainer = echometerain <echometer@disroot.org>
11127-
source = https://codeberg.org/tenacityteam/tenacity.git
11128-
depends_bookworm = libavcodec59
11129-
depends_bookworm = libavformat59
11130-
depends_bookworm = libavutil57
11131-
depends_bookworm = libflac++10
11132-
depends_bookworm = libflac12
11133-
depends_bookworm = libportsmf0
11134-
depends_bookworm = libwxbase3.2-1
11135-
depends_bookworm = libwxgtk3.2-1
11124+
maintainer = xdavius <xdavius@github.com>
11125+
source = git+https://codeberg.org/tenacityteam/tenacity.git
11126+
source = tenacity-libnyquist::git+https://codeberg.org/tenacityteam/libnyquist.git
1113611127

1113711128
pkgname = tenacity-git
1113811129
---

0 commit comments

Comments
 (0)