$ git diff --patch-with-stat --summary 02de3ca8eb209f0b78b634eefba31b7fbf4a911c..d55fe0ada9a8d14a30962652c74860f278db72f5
.abf.yml | 2 +-
pkgdir.patch | 12 ++++++++++++
roc-c++unwind.patch | 12 ++++++------
roc-toolkit.spec | 18 ++++++++++--------
4 files changed, 29 insertions(+), 15 deletions(-)
create mode 100644 pkgdir.patch
diff --git a/.abf.yml b/.abf.yml
index 2da8b0a..e5a8ba5 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- master.tar.gz: b7cacf09d1bc5b313ce760cb3f4a841bf89412ef
+ roc-toolkit-0.2.1.tar.gz: 12d1f3268a258c4689a7f6646f20342ff9546e6b
diff --git a/pkgdir.patch b/pkgdir.patch
new file mode 100644
index 0000000..c4c8f70
--- /dev/null
+++ b/pkgdir.patch
@@ -0,0 +1,12 @@
+diff -ru roc-toolkit-0.2.1/src/SConscript roc-toolkit-0.2.1.new/src/SConscript
+--- roc-toolkit-0.2.1/src/SConscript 2022-12-26 12:02:40.000000000 +0100
++++ roc-toolkit-0.2.1.new/src/SConscript 2023-01-10 10:14:45.212536410 +0100
+@@ -141,7 +141,7 @@
+ 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['ROC_SYSTEM_LIBDIR'] + '/pkgconfig', pc_file)
+
+ if GetOption('enable_examples'):
+ examples_env = subenvs.examples.Clone()
diff --git a/roc-c++unwind.patch b/roc-c++unwind.patch
index 0b0507d..c3391cc 100644
--- a/roc-c++unwind.patch
+++ b/roc-c++unwind.patch
@@ -1,10 +1,10 @@
-diff -up roc-toolkit-master/src/modules/roc_core/target_libunwind/roc_core/backtrace.cpp.omv~ roc-toolkit-master/src/modules/roc_core/target_libunwind/roc_core/backtrace.cpp
---- roc-toolkit-master/src/modules/roc_core/target_libunwind/roc_core/backtrace.cpp.omv~ 2022-11-17 23:55:41.207112993 +0100
-+++ roc-toolkit-master/src/modules/roc_core/target_libunwind/roc_core/backtrace.cpp 2022-11-17 23:56:10.889282281 +0100
-@@ -7,6 +7,7 @@
- */
+diff -up roc-toolkit-0.2.1/src/internal_modules/roc_core/target_libunwind/roc_core/backtrace.cpp.1~ roc-toolkit-0.2.1/src/internal_modules/roc_core/target_libunwind/roc_core/backtrace.cpp
+--- roc-toolkit-0.2.1/src/internal_modules/roc_core/target_libunwind/roc_core/backtrace.cpp.1~ 2023-01-01 21:12:38.145032822 +0100
++++ roc-toolkit-0.2.1/src/internal_modules/roc_core/target_libunwind/roc_core/backtrace.cpp 2023-01-01 21:19:10.635435557 +0100
+@@ -15,6 +15,7 @@
+ #define alignas(x) ROC_ATTR_ALIGNED(x)
+ #endif
- #define UNW_LOCAL_ONLY
+#define alignas _Alignas // make the libunwind/C++ combo great again
#include <libunwind.h>
diff --git a/roc-toolkit.spec b/roc-toolkit.spec
index 4304501..5c66138 100644
--- a/roc-toolkit.spec
+++ b/roc-toolkit.spec
@@ -1,14 +1,15 @@
-%define snapshot 20221117
+#define snapshot 20221117
%undefine _debugsource_packages
Name: roc-toolkit
Version: 0.2.1
-Release: %{?snapshot:0.%{snapshot}.}1
+Release: %{?snapshot:0.%{snapshot}.}2
Summary: Real-time audio streaming
License: MPL-2.0 AND LGPL-2.1-or-later AND CECILL-C
URL: https://github.com/roc-streaming/roc-toolkit
Source0: https://github.com/roc-streaming/roc-toolkit/archive/%{?snapshot:refs/heads/master}%{!?snapshot:v%{version}/%{name}-%{version}}.tar.gz
-Patch: roc-c++unwind.patch
+Patch0: roc-c++unwind.patch
+Patch1: https://src.fedoraproject.org/fork/wtaymans/rpms/roc-toolkit/raw/d31d30281a036556dae16f72e7b3d641cb1ce2ad/f/pkgdir.patch
BuildRequires: pkgconfig(python)
BuildRequires: scons
@@ -20,6 +21,7 @@ BuildRequires: pkgconfig(libuv)
BuildRequires: pkgconfig(libunwind)
BuildRequires: pkgconfig(sox)
BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(speexdsp)
BuildRequires: openfec-devel
#BuildRequires: pkgconfig(cpputest)
BuildRequires: doxygen
@@ -59,20 +61,21 @@ Documentation for roc-toolkit.
%build
scons \
--with-openfec-includes=%{_includedir}/openfec \
- --disable-tests
-
+ --disable-libunwind CC=%{__cc} CXX=%{__cxx}
+
%install
scons install --with-openfec-includes=%{_includedir}/openfec --prefix=%{buildroot}%{_prefix} \
- --libdir=%{buildroot}%{_libdir} --disable-tests
+ --libdir=%{buildroot}%{_libdir} CC=%{__cc} CXX=%{__cxx}
%files
%license LICENSE
-%doc README.md CONTRIBUTING.md
+%doc README.md
%{_libdir}/libroc.so.0*
%files devel
%{_includedir}/roc
%{_libdir}/libroc.so
+%{_libdir}/pkgconfig/roc.pc
%files utils
%{_bindir}/roc-conv
@@ -81,4 +84,3 @@ scons install --with-openfec-includes=%{_includedir}/openfec --prefix=%{buildroo
%{_mandir}/man1/*.1*
%files doc
-%doc html