update build, still room for improvements

This commit is contained in:
FabioLolix 2021-05-22 20:08:24 +02:00
parent 724a5d1203
commit 6e7e5f5436
3 changed files with 55 additions and 159 deletions

View File

@ -1,65 +1,46 @@
pkgbase = audacity-git pkgbase = audacity-git
pkgdesc = A program that lets you manipulate digital audio waveforms pkgdesc = A program that lets you manipulate digital audio waveforms
pkgver = 2.4.2.r0.g16d52f63a pkgver = 3.0.2.r126.g90903d237
pkgrel = 2 pkgrel = 1
url = http://www.audacityteam.org/ url = https://www.audacityteam.org/
arch = i686 arch = i686
arch = x86_64 arch = x86_64
license = GPL groups = pro-audio
makedepends = alsa-lib license = GPL2
makedepends = clang license = CCPL
makedepends = cmake
makedepends = ffmpeg
makedepends = flac
makedepends = git makedepends = git
makedepends = glib2 makedepends = cmake
makedepends = gtk3 makedepends = clang
makedepends = sdl2
makedepends = libsoup
makedepends = libnotify
makedepends = gstreamer
makedepends = gst-plugins-bad-libs
makedepends = ffmpeg
makedepends = jack makedepends = jack
makedepends = lame makedepends = nasm
makedepends = libid3tag depends = alsa-lib
makedepends = libogg depends = libx11
makedepends = libsndfile depends = gtk3
makedepends = libvorbis
makedepends = lilv
makedepends = lv2
makedepends = portsmf
makedepends = suil
makedepends = twolame
makedepends = vamp-plugin-sdk
depends = expat depends = expat
depends = gcc-libs depends = libid3tag
depends = gdk-pixbuf2 depends = libogg
depends = glibc depends = libsndfile
depends = libvorbis
depends = lilv
depends = lv2
depends = portsmf
depends = suil
depends = libmad depends = libmad
depends = libFLAC++.so depends = twolame
depends = libFLAC.so depends = vamp-plugin-sdk
depends = libasound.so
depends = libgdk-3.so
depends = libsoxr depends = libsoxr
depends = soundtouch depends = soundtouch
depends = wxgtk3
depends = libglib-2.0.so
depends = libgobject-2.0.so
depends = libgtk-3.so
depends = libid3tag.so
depends = libjack.so
depends = liblilv-0.so
depends = libogg.so
depends = libportSMF.so
depends = libsndfile.so
depends = libsuil-0.so
depends = libtwolame.so
depends = libvamp-hostsdk.so
depends = libvorbis.so
depends = libvorbisenc.so
depends = libvorbisfile.so
depends = wxgtk2
optdepends = ffmpeg: additional import/export capabilities optdepends = ffmpeg: additional import/export capabilities
optdepends = audacity-extras: nyquist plugins for audacity
provides = audacity provides = audacity
conflicts = audacity conflicts = audacity
source = audacity::git+https://github.com/audacity/audacity.git source = git+https://github.com/audacity/audacity.git
sha1sums = SKIP sha256sums = SKIP
pkgname = audacity-git pkgname = audacity-git

105
PKGBUILD
View File

@ -1,101 +1,46 @@
# Maintainer: Bernhard Landauer <oberon@manjaro.org> # Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
# Contributor: Bernhard Landauer <oberon@manjaro.org>
# Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org>
_pkgname=audacity pkgname=audacity-git
pkgname=$_pkgname-git pkgver=3.0.2.r126.g90903d237
pkgver=2.4.2.r0.g16d52f63a pkgrel=1
pkgrel=2
pkgdesc="A program that lets you manipulate digital audio waveforms" pkgdesc="A program that lets you manipulate digital audio waveforms"
arch=('i686' 'x86_64') arch=(i686 x86_64)
url="http://www.audacityteam.org/" url="https://www.audacityteam.org/"
license=('GPL') license=(GPL2 CCPL)
depends=('expat' groups=(pro-audio)
'gcc-libs' depends=(alsa-lib libx11 gtk3 expat libid3tag libogg libsndfile
'gdk-pixbuf2' libvorbis lilv lv2 portsmf suil libmad twolame vamp-plugin-sdk libsoxr soundtouch)
'glibc' makedepends=(git cmake clang sdl2 libsoup libnotify gstreamer gst-plugins-bad-libs
'libmad' ffmpeg jack nasm)
'libFLAC++.so' # can't find system lame portmidi
'libFLAC.so' optdepends=('ffmpeg: additional import/export capabilities')
'libasound.so' provides=(audacity)
'libgdk-3.so' conflicts=(audacity)
'libsoxr' source=("git+https://github.com/audacity/audacity.git")
'soundtouch' sha256sums=('SKIP')
'wxgtk3'
'libglib-2.0.so'
'libgobject-2.0.so'
'libgtk-3.so'
'libid3tag.so'
'libjack.so'
'liblilv-0.so'
'libogg.so'
'libportSMF.so'
'libsndfile.so'
'libsuil-0.so'
'libtwolame.so'
'libvamp-hostsdk.so'
'libvorbis.so'
'libvorbisenc.so'
'libvorbisfile.so'
'wxgtk2')
makedepends=('alsa-lib'
'clang'
'cmake'
'ffmpeg'
'flac'
'git'
'glib2'
'gtk3'
'jack'
'lame'
'libid3tag'
'libogg'
'libsndfile'
'libvorbis'
'lilv'
'lv2'
'portsmf'
'suil'
'twolame'
'vamp-plugin-sdk')
optdepends=('ffmpeg: additional import/export capabilities'
'audacity-extras: nyquist plugins for audacity')
provides=("$_pkgname")
conflicts=("$_pkgname")
source=("$_pkgname::git+https://github.com/$_pkgname/$_pkgname.git")
sha1sums=('SKIP')
pkgver() { pkgver() {
cd $_pkgname cd audacity
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | cut -d'.' -f2- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | cut -d'.' -f2-
} }
build() { build() {
mkdir $_pkgname/build mkdir audacity/build
cd $_pkgname/build cd audacity/build
CC=clang cmake \ CC=clang cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
audacity_use_sndfile:STRING=system \ -DwxBUILD_TOOLKIT:STRING=gtk3 \
-Daudacity_use_wxwidgets=local \
audacity_use_ffmpeg:STRING=loaded \ audacity_use_ffmpeg:STRING=loaded \
audacity_use_expat:STRING=system \
audacity_use_lame:STRING=local \
audacity_use_portaudio:STRING=local \
audacity_use_midi:STRING=local \
audacity_use_flac:STRING=system \
audacity_use_id3tag:STRING=system \
audacity_use_sbsms:STRING=local \
audacity_use_soundtouch:STRING=system \
audacity_use_twolame:STRING=system \
audacity_use_vorbis:STRING=system \
audacity_use_lv2:STRING=local \
.. ..
cmake --build . cmake --build .
make . make .
} }
package() { package() {
cd $_pkgname/build cd audacity/build
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
cd ..
install -vDm 644 plug-ins/*.ny -t "${pkgdir}/usr/share/${pkgname}/plug-ins"
} }

View File

@ -1,30 +0,0 @@
diff -Naur audacity-src-2.0.6-orig/src/FFmpeg.h audacity-src-2.0.6/src/FFmpeg.h
--- audacity-src-2.0.6-orig/src/FFmpeg.h 2014-09-28 21:54:55.159636208 -0400
+++ audacity-src-2.0.6/src/FFmpeg.h 2014-09-28 21:55:11.246276766 -0400
@@ -688,7 +688,7 @@
FFMPEG_FUNCTION_WITH_RETURN(
AVOutputFormat*,
av_oformat_next,
- (AVOutputFormat *f),
+ (const AVOutputFormat *f),
(f)
);
FFMPEG_FUNCTION_WITH_RETURN(
@@ -755,7 +755,7 @@
FFMPEG_FUNCTION_WITH_RETURN(
int,
av_fifo_size,
- (AVFifoBuffer *f),
+ (const AVFifoBuffer *f),
(f)
);
FFMPEG_FUNCTION_WITH_RETURN(
@@ -801,7 +801,7 @@
FFMPEG_FUNCTION_WITH_RETURN(
AVDictionaryEntry *,
av_dict_get,
- (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
+ (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
(m, key, prev, flags)
);
FFMPEG_FUNCTION_WITH_RETURN(