* update roc-toolkit to 0.4.0-1

This commit is contained in:
Alexander Baldeck 2025-01-24 09:09:55 +01:00
parent 29a7c1e732
commit 6361072f44
4 changed files with 40 additions and 128 deletions

View File

@ -1,13 +1,9 @@
pkgbase = roc-toolkit
pkgdesc = Real-time audio streaming over the network
pkgver = 0.3.0
pkgrel = 1.1
pkgver = 0.4.0
pkgrel = 1
url = https://github.com/roc-streaming/roc-toolkit/
arch = x86_64
arch = powerpc64le
arch = powerpc64
arch = powerpc
arch = riscv64
license = CC0-1.0
license = MPL-2.0
makedepends = alsa-lib
@ -23,18 +19,20 @@ pkgbase = roc-toolkit
depends = gcc-libs
depends = libunwind
depends = libuv
depends = openssl
optdepends = libpulse: for roc-conv, roc-receive and roc-send
optdepends = sox: for roc-conv, roc-receive and roc-send
provides = libroc.so
source = https://github.com/roc-streaming/roc-toolkit//archive/v0.3.0/roc-toolkit-v0.3.0.tar.gz
sha512sums = 447532862dc1714054ebd03ce7fd101525c213a87bc7198a55c8e6068c28db318d59389bafd83681a4e6b34a61e68ac305c66b84e417a3f791b02340a821e6ec
b2sums = 31775d330bdfb3c42278d1ecbbbb5e14f695ca82f22929e435b6c9bf10c2e25c3367d11cf2913a81e6469876c255193be11eb78b775fad3b17f57c5be9c4bb39
source = https://github.com/roc-streaming/roc-toolkit//archive/v0.4.0/roc-toolkit-v0.4.0.tar.gz
sha512sums = 51763287ee825b6617273ededd9e77560f4223b8ba4a577855c3225908e848895a4f925163862cf6d19a8215245ec26f33d07d6cb80c51768d37eaa06ac02063
b2sums = 2ffcf6b1ca50fcae09c7aaa27939e23428feb21f330d578d731e494c62aa088c7e00de3b1a1b488d1bb13ffcc979fede1fc2726e2293a383a87174a4480e8aec
pkgname = roc-toolkit
depends = glibc
depends = gcc-libs
depends = libunwind
depends = libuv
depends = openssl
depends = openfec
depends = libopenfec.so
depends = speexdsp

View File

@ -2,8 +2,8 @@
# Maintainer: David Runge <dvzrv@archlinux.org>
pkgname=roc-toolkit
pkgver=0.3.0
pkgrel=1.1
pkgver=0.4.0
pkgrel=1
pkgdesc="Real-time audio streaming over the network"
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
url="https://github.com/roc-streaming/roc-toolkit/"
@ -16,6 +16,7 @@ depends=(
gcc-libs
libunwind
libuv
openssl
)
makedepends=(
alsa-lib
@ -28,33 +29,58 @@ makedepends=(
sox
speexdsp
)
checkdepends=(
cpputest
)
optdepends=(
'libpulse: for roc-conv, roc-receive and roc-send'
'sox: for roc-conv, roc-receive and roc-send'
)
provides=(libroc.so)
source=($url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz)
sha512sums=('447532862dc1714054ebd03ce7fd101525c213a87bc7198a55c8e6068c28db318d59389bafd83681a4e6b34a61e68ac305c66b84e417a3f791b02340a821e6ec')
b2sums=('31775d330bdfb3c42278d1ecbbbb5e14f695ca82f22929e435b6c9bf10c2e25c3367d11cf2913a81e6469876c255193be11eb78b775fad3b17f57c5be9c4bb39')
sha512sums=('51763287ee825b6617273ededd9e77560f4223b8ba4a577855c3225908e848895a4f925163862cf6d19a8215245ec26f33d07d6cb80c51768d37eaa06ac02063')
b2sums=('2ffcf6b1ca50fcae09c7aaa27939e23428feb21f330d578d731e494c62aa088c7e00de3b1a1b488d1bb13ffcc979fede1fc2726e2293a383a87174a4480e8aec')
case "${CARCH}" in
powerpc64|riscv64) options=(!lto) ;;
esac
build() {
local scons_options=(
--prefix=/usr
--libdir=/usr/lib
--disable-openssl # disable as it is not yet used
--enable-tests
--enable-examples
)
case "${CARCH}" in
powerpc64|riscv64)
scons_options+=(
#--disable-tests
)
;;
*)
scons_options+=(
--enable-tests
)
;;
esac
cd $pkgname-$pkgver
scons "${scons_options[@]}"
}
check() {
case "${CARCH}" in
powerpc64|riscv64)
warn "skipping test for ${CARCH}"
return 0
;;
esac
local scons_options=(
--prefix=/usr
--libdir=/usr/lib
--disable-openssl # disable as it is not yet used
--enable-tests
--enable-examples
)

View File

@ -1,78 +0,0 @@
diff --git i/SConstruct w/SConstruct
index 081e26a2..7dad6ee4 100644
--- i/SConstruct
+++ w/SConstruct
@@ -296,6 +296,7 @@ env.OverrideFromArgument('BREATHE_APIDOC', default='breathe-apidoc')
env.PrependFromArgument('CPPFLAGS')
env.PrependFromArgument('CXXFLAGS')
env.PrependFromArgument('CFLAGS')
+env.PrependFromArgument('DESTDIR', default='/')
env.PrependFromArgument('LINKFLAGS', names=['LINKFLAGS', 'LDFLAGS'])
env.PrependFromArgument('STRIPFLAGS')
diff --git i/docs/SConscript w/docs/SConscript
index c32d9519..a18c8076 100644
--- i/docs/SConscript
+++ w/docs/SConscript
@@ -77,5 +77,5 @@ if GetOption('enable_sphinx'):
doc_env.AlwaysBuild(doc_env.Alias('docs', ['doxygen', 'sphinx']))
for manpage in doc_env.GlobFiles('#docs/sphinx/manuals/*.rst'):
- doc_env.AddDistFile(GetOption('mandir'), '#docs/man/%s.1' %
+ doc_env.AddDistFile(doc_env["DESTDIR"] + GetOption('mandir'), '#docs/man/%s.1' %
manpage.srcnode().name.replace('.rst', '').replace('_', '-'))
diff --git i/src/SConscript w/src/SConscript
index b59f67a7..8dad9f87 100644
--- i/src/SConscript
+++ w/src/SConscript
@@ -88,14 +88,14 @@ if not GetOption('disable_shared') or GetOption('enable_static') or GetOption('e
public_api_targets += [install_target]
public_api_targets += symlinks
- env.AddDistFile(env['ROC_SYSTEM_LIBDIR'], install_target)
+ env.AddDistFile(env['DESTDIR'] + env['ROC_SYSTEM_LIBDIR'], install_target)
if env.NeedsFixupSharedLibrary():
env.AddDistAction(env.FixupSharedLibrary(
os.path.join(env['ROC_SYSTEM_LIBDIR'], install_target[0].name)))
for lnk in symlinks:
- env.AddDistFile(env['ROC_SYSTEM_LIBDIR'], lnk)
+ env.AddDistFile(env['DESTDIR'] + env['ROC_SYSTEM_LIBDIR'], lnk)
if GetOption('enable_static'):
thirdparty_libs = libs_env.GetThirdPartyStaticLibs()
@@ -123,13 +123,13 @@ if not GetOption('disable_shared') or GetOption('enable_static') or GetOption('e
install_target = env.Install(env['ROC_BINDIR'], libroc_static)
public_api_targets += [install_target]
- env.AddDistFile(env['ROC_SYSTEM_LIBDIR'], install_target)
+ env.AddDistFile(env['DESTDIR'] + env['ROC_SYSTEM_LIBDIR'], install_target)
if not GetOption('disable_shared') or GetOption('enable_static'):
env.Alias('public_api', public_api_targets, env.Action(''))
env.AlwaysBuild('public_api')
- env.AddDistFile(env['ROC_SYSTEM_INCDIR'], '#src/public_api/include/roc')
+ env.AddDistFile(env['DESTDIR'] + env['ROC_SYSTEM_INCDIR'], '#src/public_api/include/roc')
if 'PKG_CONFIG_PATH' in env.Dictionary():
pc_file = env.GeneratePkgConfig(
@@ -141,7 +141,7 @@ if not GetOption('disable_shared') or GetOption('enable_static') or GetOption('e
desc='Real-time audio streaming over the network.',
url='https://roc-streaming.org',
version=env['ROC_VERSION'])
- env.AddDistFile(env['PKG_CONFIG_PATH'], pc_file)
+ env.AddDistFile(env['DESTDIR'] + env['PKG_CONFIG_PATH'], pc_file)
if GetOption('enable_examples'):
examples_env = subenvs.examples.Clone()
@@ -197,7 +197,7 @@ if not GetOption('disable_tools'):
env.Alias(exe_name, [target], env.Action(''))
env.AlwaysBuild(exe_name)
- env.AddDistFile(env['ROC_SYSTEM_BINDIR'], target)
+ env.AddDistFile(env['DESTDIR'] + env['ROC_SYSTEM_BINDIR'], target)
if GetOption('enable_tests') or GetOption('enable_benchmarks'):
common_test_env = subenvs.tests.Clone()

View File

@ -1,34 +0,0 @@
diff --git i/3rdparty/SConscript w/3rdparty/SConscript
index 8083170b..cb236dff 100644
--- i/3rdparty/SConscript
+++ w/3rdparty/SConscript
@@ -240,9 +240,6 @@ if 'pulseaudio' in autobuild_dependencies:
elif 'pulseaudio' in system_dependencies:
conf = Configure(env, custom_tests=env.CustomTests)
- if not conf.AddPkgConfigDependency('libpulse', '--cflags --libs'):
- conf.env.AddPkgConfigLibs(['pulse'])
-
if not conf.CheckLibWithHeaderExt(
'pulse', 'pulse/pulseaudio.h', 'C', run=not is_crosscompiling):
env.Die("libpulse not found (see 'config.log' for details)")
@@ -252,9 +249,6 @@ elif 'pulseaudio' in system_dependencies:
if GetOption('enable_examples'):
conf = Configure(subenvs.examples, custom_tests=env.CustomTests)
- if not conf.AddPkgConfigDependency('libpulse-simple', '--cflags --libs'):
- conf.env.AddPkgConfigLibs(['pulse-simple'])
-
if not conf.CheckLibWithHeaderExt(
'pulse-simple', 'pulse/simple.h', 'C', run=not is_crosscompiling):
env.Die("libpulse-simple not found (see 'config.log' for details)")
@@ -292,9 +286,6 @@ if 'sox' in autobuild_dependencies:
elif 'sox' in system_dependencies:
conf = Configure(env, custom_tests=env.CustomTests)
- if not conf.AddPkgConfigDependency('sox', '--cflags --libs'):
- conf.env.AddPkgConfigLibs(['sox'])
-
if not is_crosscompiling:
if not conf.CheckLibWithHeaderExt(
'sox', 'sox.h', 'C',