diff options
| author | HurricanePootis | 2024-05-08 21:46:48 -0500 |
|---|---|---|
| committer | HurricanePootis | 2024-05-08 21:46:48 -0500 |
| commit | 05e64e1f0842610fc0b2b282f3c990f738a56b80 (patch) | |
| tree | ea3b4c321825ed560434fc92361e5d6ad1e135af | |
| parent | f80c68e2af01013fe8bd8dc398f3a7363e9e80c8 (diff) | |
| download | aur-05e64e1f0842610fc0b2b282f3c990f738a56b80.tar.gz | |
Fix package, check comments for details
| -rw-r--r-- | .SRCINFO | 29 | ||||
| -rw-r--r-- | PKGBUILD | 56 | ||||
| -rw-r--r-- | pedantic.patch | 14 | ||||
| -rw-r--r-- | pedantic2.patch | 13 | ||||
| -rw-r--r-- | vstsdkpath.patch | 11 | ||||
| -rw-r--r-- | xrealloc.patch | 10 |
6 files changed, 82 insertions, 51 deletions
@@ -1,22 +1,33 @@ pkgbase = rju-git pkgdesc = JackAudioToolkit - pkgver = r220.8d86d170 - pkgrel = 2 + pkgver = 0.19.r15.g359627c + pkgrel = 1 url = https://rohandrape.net/?t=rju arch = x86_64 - license = gpl + license = GPL-2.0-only makedepends = git + makedepends = cmake + makedepends = asciidoc depends = jack - depends = asciidoc depends = libsamplerate depends = liblo depends = libsndfile + depends = libxext + depends = libx11 + depends = libpng + provides = rju conflicts = rju - source = git+https://gitlab.com/rd--/rju#commit=8d86d170 - source = vstsdkpath.patch - source = xrealloc.patch + options = !lto + options = !buildflags + source = git+https://gitlab.com/rd--/rju.git + source = git+https://gitlab.com/rd--/r-common.git + source = vstsdk::git+https://github.com/R-Tur/VST_SDK_2.4.git + source = pedantic.patch + source = pedantic2.patch sha256sums = SKIP - sha256sums = 11dfd9a08f916f3f03904b59ae3c49df4686a1ba86baa7b27773e050ed62380b - sha256sums = fe261c0185256ff4a698f0a6e25a2789d197972863b3f17158af44a4452119f0 + sha256sums = SKIP + sha256sums = SKIP + sha256sums = 51310e029f4f861f63693593aa95c7f83854807afea466f3491b4ff715254bc7 + sha256sums = 602d5b75419f0552f845af0b173cc5666cb2e80869ad7b5afa8bfa7661332378 pkgname = rju-git @@ -1,37 +1,51 @@ +# Maintainer: HurricanePootis <hurricanepootis@protonmail.com> # Maintainer: yustin <#archlinux-proaudio@libera.chat> pkgname=rju-git _pkgname=rju -_commit=8d86d170 -pkgver=r220.8d86d170 -pkgrel=2 +pkgver=0.19.r15.g359627c +pkgrel=1 pkgdesc='JackAudioToolkit' -arch=( 'x86_64' ) +arch=('x86_64') url='https://rohandrape.net/?t=rju' -license=( 'gpl' ) -depends=( 'jack' 'asciidoc' 'libsamplerate' 'liblo' 'libsndfile' ) -makedepends=( 'git' ) -conflicts=( 'rju' ) -source=( "git+https://gitlab.com/rd--/rju#commit=${_commit}" - vstsdkpath.patch - xrealloc.patch +license=('GPL-2.0-only') +depends=( 'jack' 'libsamplerate' 'liblo' 'libsndfile' 'libxext' 'libx11' 'libpng') +makedepends=('git' 'cmake' 'asciidoc') +options=('!lto' '!buildflags') +conflicts=('rju') +provides=('rju') +source=( "git+https://gitlab.com/rd--/rju.git" + "git+https://gitlab.com/rd--/r-common.git" + "vstsdk::git+https://github.com/R-Tur/VST_SDK_2.4.git" + "pedantic.patch" + "pedantic2.patch" ) -sha256sums=( 'SKIP' - '11dfd9a08f916f3f03904b59ae3c49df4686a1ba86baa7b27773e050ed62380b' - 'fe261c0185256ff4a698f0a6e25a2789d197972863b3f17158af44a4452119f0' - ) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + '51310e029f4f861f63693593aa95c7f83854807afea466f3491b4ff715254bc7' + '602d5b75419f0552f845af0b173cc5666cb2e80869ad7b5afa8bfa7661332378') + +pkgver() { + cd "$srcdir/$_pkgname" + git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} prepare() { - cd ${srcdir}/${_pkgname}/cmd - patch -p0 < ${startdir}/vstsdkpath.patch - git submodule update --init --recursive - patch -p0 < ${startdir}/xrealloc.patch + cd "${srcdir}/${_pkgname}" + patch -p1 < "$srcdir/pedantic.patch" + git config --file=.gitmodules submodule.cmd/r-command.url "$srcdir/r-command" + git -c protocol.file.allow=always submodule update --init + cd "$srcdir/$_pkgname/cmd/r-common" + patch -p1 < "$srcdir/pedantic2.patch" } build() { - cd ${srcdir}/${_pkgname}/cmd - make all -j1 + cd "$srcdir/$_pkgname/cmd" + export CFLAGS+=" -I$srcdir/vstsdk/" + export CXXFLAGS+=" -I$srcdir/vstsdk/" + make all cd ${srcdir}/${_pkgname}/md for i in *.md ; do asciidoc $i; done diff --git a/pedantic.patch b/pedantic.patch new file mode 100644 index 000000000000..9dfa7100b866 --- /dev/null +++ b/pedantic.patch @@ -0,0 +1,14 @@ + +diff --git a/cmd/Makefile b/cmd/Makefile +index 23bacd1..0fe5e8c 100644 +--- a/cmd/Makefile ++++ b/cmd/Makefile +@@ -8,7 +8,7 @@ CC = gcc # gcc clang + CXX = g++ # g++ clang++ + AR = ar # ar llvm-ar + +-CPPFLAGS += -Wall -pedantic -O3 -g -ffast-math ++CPPFLAGS += -Wall -O3 -g -ffast-math -fpermissive + CFLAGS += -D_POSIX_C_SOURCE=200809 -std=c99 + CXXFLAGS += + LDLIBS = r-common/c/lib-r-common.a -ljack -lpthread -lm diff --git a/pedantic2.patch b/pedantic2.patch new file mode 100644 index 000000000000..8571be17badd --- /dev/null +++ b/pedantic2.patch @@ -0,0 +1,13 @@ +diff --git a/c/Makefile b/c/Makefile +index e6fa6f7..b496c1d 100644 +--- a/c/Makefile ++++ b/c/Makefile +@@ -86,7 +86,7 @@ obj = beq.o \ + CC = gcc # gcc clang + AR = ar # ar llvm-ar-13 + +-CPPFLAGS += -g -Wall -pedantic -O3 -ffast-math ++CPPFLAGS += -g -Wall -O3 -ffast-math -fpermissive + CFLAGS += -D_POSIX_C_SOURCE=200809 -std=c11 + + %.o : %.c %.h diff --git a/vstsdkpath.patch b/vstsdkpath.patch deleted file mode 100644 index 6edf3565ddbb..000000000000 --- a/vstsdkpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2023-02-02 11:36:36.880472368 +0100 -+++ Makefile 2023-02-02 11:39:18.057135099 +0100 -@@ -2,7 +2,7 @@ - - bin = rju-data rju-dl rju-level rju-lxvst rju-osc rju-play rju-plumbing rju-record rju-scope rju-transport rju-udp lxvst-query - --VST_SDK = $(HOME)/opt/src/vst3_sdk -+VST_SDK = /usr/include/vst36 - - CC = gcc # gcc clang - CXX = g++ # g++ clang++ diff --git a/xrealloc.patch b/xrealloc.patch deleted file mode 100644 index 63cb15e75ebc..000000000000 --- a/xrealloc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- r-common/c/file.h.orig 2023-02-02 12:24:32.340402083 +0100 -+++ r-common/c/file.h 2023-02-02 12:24:41.567068523 +0100 -@@ -1,7 +1,6 @@ - #ifndef _COMMON_FILE_H - #define _COMMON_FILE_H - --void *xrealloc(void *p, size_t size); - bool file_exists_p(const char *filename); - time_t stat_mtime(const char *filename); - size_t stat_size(const char *filename); |