Date: Saturday, January 28, 2023 @ 12:23:27
Author: dvzrv
Revision: 1389350
archrelease: copy trunk to community-x86_64
Added:
roc-toolkit/repos/community-x86_64/PKGBUILD
(from rev 1389349, roc-toolkit/trunk/PKGBUILD)
roc-toolkit/repos/community-x86_64/roc-toolkit-0.2.1-destdir.patch
(from rev 1389349, roc-toolkit/trunk/roc-toolkit-0.2.1-destdir.patch)
roc-toolkit/repos/community-x86_64/roc-toolkit-0.2.1-pkgconfig_deps.patch
(from rev 1389349, roc-toolkit/trunk/roc-toolkit-0.2.1-pkgconfig_deps.patch)
Deleted:
roc-toolkit/repos/community-x86_64/PKGBUILD
roc-toolkit/repos/community-x86_64/roc-toolkit-0.2.1-destdir.patch
----------------------------------------+
PKGBUILD | 143 ++++++++++++++--------------
roc-toolkit-0.2.1-destdir.patch | 156 +++++++++++++++----------------
roc-toolkit-0.2.1-pkgconfig_deps.patch | 34 ++++++
3 files changed, 186 insertions(+), 147 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-28 12:22:58 UTC (rev 1389349)
+++ PKGBUILD 2023-01-28 12:23:27 UTC (rev 1389350)
@@ -1,69 +0,0 @@
-# Maintainer: David Runge <[email protected]>
-
-pkgname=roc-toolkit
-pkgver=0.2.1
-pkgrel=2
-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)
-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
- # add support for DESTDIR:
https://github.com/roc-streaming/roc-toolkit/pull/505
- $pkgname-0.2.1-destdir.patch
-)
-sha512sums=('482d11d35bdb2b298f368d4d0c2c223f48a166c57880c0d19df503923ec36a1515ed2d32d110966ceb0de4771584adf2ccb50a1ae5fbe9e5c47c42d17d9cc37c'
-
'76ca9f78fe4eff47fac18c8b66aadb72f88f9a04fbf073f36cecaa73cd595ad397ccf59d5ced057ace1494b9d22954dcc0029086235d0a98b45fa35e52921cc4')
-b2sums=('0d84c616006f3944a13c63ec3bee0a17d909464049d7b3ab2f45c27cabe064ab1967721b29e2c8e060a0e22f6d51eb4420c1b2c3f2840d3bc4f51bd4f71e6db7'
-
'f61dc0e0c21c4951fba7448bcfacd665e66920ff54378db557e28ff82283168242fe8fc24073b6ccc77ece6bf0cc39f798c44a1b159c318079046e40f32433bb')
-
-prepare() {
- patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.2.1-destdir.patch
-}
-
-build() {
- local scons_options=(
- --prefix=/usr
- --libdir=/usr/lib
- --enable-tests
- --enable-examples
- )
-
- cd $pkgname-$pkgver
- scons "${scons_options[@]}"
-}
-
-check() {
- local scons_options=(
- --prefix=/usr
- --libdir=/usr/lib
- --enable-tests
- --enable-examples
- )
-
- cd $pkgname-$pkgver
- scons test "${scons_options[@]}"
-}
-
-package() {
- local scons_options=(
- --prefix=/usr
- --libdir=/usr/lib
- )
- depends+=(
- openfec libopenfec.so
- speexdsp libspeexdsp.so
- )
-
- cd $pkgname-$pkgver
- scons DESTDIR="$pkgdir/" "${scons_options[@]}" install
-
- install -vDm 644 3rdparty/hedley/COPYING -t
"$pkgdir/usr/share/licenses/$pkgname/hedley.COPYING"
-}
Copied: roc-toolkit/repos/community-x86_64/PKGBUILD (from rev 1389349,
roc-toolkit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-01-28 12:23:27 UTC (rev 1389350)
@@ -0,0 +1,74 @@
+# Maintainer: David Runge <[email protected]>
+
+pkgname=roc-toolkit
+pkgver=0.2.1
+pkgrel=3
+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)
+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
+ # add support for DESTDIR:
https://github.com/roc-streaming/roc-toolkit/pull/505
+ $pkgname-0.2.1-destdir.patch
+ # 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=('482d11d35bdb2b298f368d4d0c2c223f48a166c57880c0d19df503923ec36a1515ed2d32d110966ceb0de4771584adf2ccb50a1ae5fbe9e5c47c42d17d9cc37c'
+
'76ca9f78fe4eff47fac18c8b66aadb72f88f9a04fbf073f36cecaa73cd595ad397ccf59d5ced057ace1494b9d22954dcc0029086235d0a98b45fa35e52921cc4'
+
'59ab91620a1c1a013f5f3da51d78d0e56df10fb5c3e21e156c0a86929652f7f9921798b2b8ada1ab8056109a9c30712e9dfa00f41697b3ca6d81e5ff92d0dfdf')
+b2sums=('0d84c616006f3944a13c63ec3bee0a17d909464049d7b3ab2f45c27cabe064ab1967721b29e2c8e060a0e22f6d51eb4420c1b2c3f2840d3bc4f51bd4f71e6db7'
+
'f61dc0e0c21c4951fba7448bcfacd665e66920ff54378db557e28ff82283168242fe8fc24073b6ccc77ece6bf0cc39f798c44a1b159c318079046e40f32433bb'
+
'7cff5118b8773f3266d345f410308e110bd9c4615b230ce6586def53ea0028c6c417ba66bde61be472ac5ae7988eae25ffb858ce9d2b3431794c155d2149752d')
+
+prepare() {
+ patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.2.1-destdir.patch
+ patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.2.1-pkgconfig_deps.patch
+}
+
+build() {
+ local scons_options=(
+ --prefix=/usr
+ --libdir=/usr/lib
+ --enable-tests
+ --enable-examples
+ )
+
+ cd $pkgname-$pkgver
+ scons "${scons_options[@]}"
+}
+
+check() {
+ local scons_options=(
+ --prefix=/usr
+ --libdir=/usr/lib
+ --enable-tests
+ --enable-examples
+ )
+
+ cd $pkgname-$pkgver
+ scons test "${scons_options[@]}"
+}
+
+package() {
+ local scons_options=(
+ --prefix=/usr
+ --libdir=/usr/lib
+ )
+ depends+=(
+ openfec libopenfec.so
+ speexdsp libspeexdsp.so
+ )
+
+ cd $pkgname-$pkgver
+ scons DESTDIR="$pkgdir/" "${scons_options[@]}" install
+
+ install -vDm 644 3rdparty/hedley/COPYING -t
"$pkgdir/usr/share/licenses/$pkgname/hedley.COPYING"
+}
Deleted: roc-toolkit-0.2.1-destdir.patch
===================================================================
--- roc-toolkit-0.2.1-destdir.patch 2023-01-28 12:22:58 UTC (rev 1389349)
+++ roc-toolkit-0.2.1-destdir.patch 2023-01-28 12:23:27 UTC (rev 1389350)
@@ -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()
Copied: roc-toolkit/repos/community-x86_64/roc-toolkit-0.2.1-destdir.patch
(from rev 1389349, roc-toolkit/trunk/roc-toolkit-0.2.1-destdir.patch)
===================================================================
--- roc-toolkit-0.2.1-destdir.patch (rev 0)
+++ roc-toolkit-0.2.1-destdir.patch 2023-01-28 12:23:27 UTC (rev 1389350)
@@ -0,0 +1,78 @@
+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()
Copied:
roc-toolkit/repos/community-x86_64/roc-toolkit-0.2.1-pkgconfig_deps.patch (from
rev 1389349, roc-toolkit/trunk/roc-toolkit-0.2.1-pkgconfig_deps.patch)
===================================================================
--- roc-toolkit-0.2.1-pkgconfig_deps.patch (rev 0)
+++ roc-toolkit-0.2.1-pkgconfig_deps.patch 2023-01-28 12:23:27 UTC (rev
1389350)
@@ -0,0 +1,34 @@
+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',
