Date: Thursday, March 9, 2023 @ 17:23:00 Author: dvzrv Revision: 1417145
upgpkg: roc-toolkit 0.2.3-1: Upgrade to 0.2.3. Remove now unneeded patches. Disable use of openssl (it's not yet used and would otherwise be required via pkgconfig). Modified: roc-toolkit/trunk/PKGBUILD Deleted: roc-toolkit/trunk/roc-toolkit-0.2.1-destdir.patch roc-toolkit/trunk/roc-toolkit-0.2.1-pkgconfig_deps.patch ----------------------------------------+ PKGBUILD | 38 ++++++++------- roc-toolkit-0.2.1-destdir.patch | 78 ------------------------------- roc-toolkit-0.2.1-pkgconfig_deps.patch | 34 ------------- 3 files changed, 22 insertions(+), 128 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-09 17:19:45 UTC (rev 1417144) +++ PKGBUILD 2023-03-09 17:23:00 UTC (rev 1417145) @@ -1,37 +1,42 @@ # Maintainer: David Runge <[email protected]> pkgname=roc-toolkit -pkgver=0.2.2 +pkgver=0.2.3 pkgrel=1 pkgdesc="Real-time audio streaming over the network" arch=(x86_64) url="https://github.com/roc-streaming/roc-toolkit/"; license=(MPL2 custom:CC0) -depends=(glibc libunwind libuv) -makedepends=(alsa-lib cpputest gengetopt libpulse openfec ragel scons sox speexdsp) +depends=( + glibc + libunwind + libuv +) +makedepends=( + alsa-lib + cpputest + gengetopt + libpulse + openfec + ragel + scons + sox + speexdsp +) 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 - # remove unnecessary library dependencies from pkg-config integration: https://github.com/roc-streaming/roc-toolkit/pull/507 - $pkgname-0.2.1-pkgconfig_deps.patch -) -sha512sums=('b39a88811c3d7c8dfbaeb73f22d24715240c0e7ce0ae6b9148980a520efc0cf4939e1d461f05c7f00b15282756826c145a5560b2cbce8373ecc13b4ad93c47ee' - '59ab91620a1c1a013f5f3da51d78d0e56df10fb5c3e21e156c0a86929652f7f9921798b2b8ada1ab8056109a9c30712e9dfa00f41697b3ca6d81e5ff92d0dfdf') -b2sums=('3f90b771e360bf1a6f2fe67fa5586076a16adb8ddf991190082de308fbef6a4d174f9072a83693195fbd08d9ab6b8d5e91916f7e8c9e77147119da80a8ed7792' - '7cff5118b8773f3266d345f410308e110bd9c4615b230ce6586def53ea0028c6c417ba66bde61be472ac5ae7988eae25ffb858ce9d2b3431794c155d2149752d') +source=($url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz) +sha512sums=('f57b76cf6e5bda00072008b17c13fb9e5ae74e6fd6c141da10a2395d4b1ea150f1353081937afe7493af7e7e4d4db1bae87cd4cdea073fa9c138c9c5ada0d90a') +b2sums=('cd75f33feacdab77fdfadea87d8e72a39a2cf7ef423450c511eb39e1506055ca6db7d38f378aaa7500d9d4bfb4c6b2111a9b4f43800f87c7e1fe559bcb522711') -prepare() { - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.2.1-pkgconfig_deps.patch -} - build() { local scons_options=( --prefix=/usr --libdir=/usr/lib + --disable-openssl # disable as it is not yet used --enable-tests --enable-examples ) @@ -44,6 +49,7 @@ local scons_options=( --prefix=/usr --libdir=/usr/lib + --disable-openssl # disable as it is not yet used --enable-tests --enable-examples ) Deleted: roc-toolkit-0.2.1-destdir.patch =================================================================== --- roc-toolkit-0.2.1-destdir.patch 2023-03-09 17:19:45 UTC (rev 1417144) +++ roc-toolkit-0.2.1-destdir.patch 2023-03-09 17:23:00 UTC (rev 1417145) @@ -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() Deleted: roc-toolkit-0.2.1-pkgconfig_deps.patch =================================================================== --- roc-toolkit-0.2.1-pkgconfig_deps.patch 2023-03-09 17:19:45 UTC (rev 1417144) +++ roc-toolkit-0.2.1-pkgconfig_deps.patch 2023-03-09 17:23:00 UTC (rev 1417145) @@ -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',
