build: update Fedora spec file, docs, out-of-tree compile fixes, misc tidy up

2026-01-12 00:05:02 +08:00 · 2022-11-18 16:45:33 +01:00
parent ced4412229
commit 1c161164c3
25 changed files with 32 additions and 440 deletions
--- a/README_RPM-based-Linux.txt
+++ b/README_RPM-based-Linux.txt
@@ -99,7 +99,15 @@ Install reSIProcate build environment dependencies
                   xerces-c-devel \
                   net-snmp-devel \
                   qpid-proton-cpp-devel \
-                   soci-devel soci-postgresql-devel
+                   soci-devel soci-postgresql-devel soci-mysql-devel \
+                   vim-common \
+                   sox \
+                   fmt-devel \
+                   websocketpp-devel \
+                   gstreamer1-devel \
+                   gstreamer1-plugins-base-devel \
+                   gstreamer1-plugins-bad-free-devel \
+                   gstreamermm-devel

 Manually create some dependencies
 ---------------------------------
--- a/build/.cvsignore
+++ b/build/.cvsignore
@@ -1,2 +0,0 @@
-ares_dns.h
-sip.build
--- a/contrib/.cvsignore
+++ b/contrib/.cvsignore
@@ -1 +0,0 @@
-.DS_Store
--- a/deprecated/SipIMP/.cvsignore
+++ b/deprecated/SipIMP/.cvsignore
@@ -1,10 +0,0 @@
-Debug
-Release
-*.suo
-*.ncb
-*~
-SSL-Release
-SSL-Debug
-Debug
-Release
-*.aps
--- a/deprecated/SipIMP/SipIMPSetup/.cvsignore
+++ b/deprecated/SipIMP/SipIMPSetup/.cvsignore
@@ -1,4 +0,0 @@
-SSL-Release
-SSL-Debug
-Debug
-Release
--- a/deprecated/gag/.cvsignore
+++ b/deprecated/gag/.cvsignore
@@ -1,3 +0,0 @@
-.GagConduit.d
-.GagMessage.d
-.gag.d
--- a/media/gstreamer/GStreamerUtils.hxx
+++ b/media/gstreamer/GStreamerUtils.hxx
@@ -2,7 +2,7 @@
 #define RESIP_GSTREAMER_UTILS

 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
 #endif

 #ifdef USE_GSTREAMER
--- a/media/gstreamer/GstRtpManager.hxx
+++ b/media/gstreamer/GstRtpManager.hxx
@@ -2,7 +2,7 @@
 #define RESIP_GSTRTPMANAGER

 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
 #endif

 #ifdef USE_GSTREAMER
--- a/media/gstreamer/GstRtpSession.hxx
+++ b/media/gstreamer/GstRtpSession.hxx
@@ -2,7 +2,7 @@
 #define RESIP_GSTRTPSESSION

 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
 #endif

 #ifdef USE_GSTREAMER
--- a/repro/.cvsignore
+++ b/repro/.cvsignore
@@ -1,21 +0,0 @@
-.dependlibs
-.gdb_history
-bin.*
-foo
-genUsers
-identity-in
-identity-in-base64
-identity-in-hash
-identity-in-rsa
-obj.*
-repro
-repro
-repro_acl.db
-repro_config.db
-repro_route.db
-repro_user.db
-userAdmin
-Debug
-Release
-SSL-Debug
-SSL-Release
--- a/resip/.cvsignore
+++ b/resip/.cvsignore
@@ -1,19 +0,0 @@
-*.ncb
-*.suo
-.DS_Store
-.make_prefs
-Makefile.in
-autom4te*.cache
-autoscan.log
-config.log
-config.status
-configure.scan
-lib.debug.Linux.i686
-lib.opt.Linux.i686
-lib.prof.Linux.i686
-libtool
-resiprocate-old-junk
-depcomp
-install-sh
-compile
-proj
--- a/resip/certs/.cvsignore
+++ b/resip/certs/.cvsignore
@@ -1,109 +0,0 @@
-.
-.DS_Store
-alice@a.example.com.p12
-alice@a.example.com_cert.pem
-alice@a.example.com_key.pem
-alice@a.example.com_req.pem
-bob@b.example.com.p12
-bob@b.example.com_cert.pem
-bob@b.example.com_key.pem
-bob@b.example.com_req.pem
-cj.cisco.sipit.net.p12
-cj.cisco.sipit.net_cert.pem
-cj.cisco.sipit.net_key.pem
-cj.cisco.sipit.net_req.pem
-demoCA
-fluffy@h0.ntt2.sipit.net.p12
-fluffy@h0.ntt2.sipit.net_cert.pem
-fluffy@h0.ntt2.sipit.net_key.pem
-fluffy@h0.ntt2.sipit.net_req.pem
-fluffy@h1.cisco1.sipit.net.p12
-fluffy@h1.cisco1.sipit.net_cert.pem
-fluffy@h1.cisco1.sipit.net_key.pem
-fluffy@h1.cisco1.sipit.net_req.pem
-foo.com.p12
-foo.com_cert.pem
-foo.com_key.pem
-foo.com_req.pem
-h0.sipit.net.p12
-h0.sipit.net_cert.pem
-h0.sipit.net_key.pem
-h0.sipit.net_req.pem
-h1.cisco1.sipit.net.p12
-h1.cisco1.sipit.net_cert.pem
-h1.cisco1.sipit.net_key.pem
-h1.cisco1.sipit.net_req.pem
-h1.m5t.sipit.net.p12
-h1.m5t.sipit.net_cert.pem
-h1.m5t.sipit.net_key.pem
-h1.m5t.sipit.net_req.pem
-h1.nnl1.sipit.net.p12
-h1.nnl1.sipit.net_cert.pem
-h1.nnl1.sipit.net_key.pem
-h1.nnl1.sipit.net_req.pem
-h6.cisco.sipit.net.p12
-h6.cisco.sipit.net_cert.pem
-h6.cisco.sipit.net_key.pem
-h6.cisco.sipit.net_req.pem
-h6.cisco3.sipit.net.p12
-h6.cisco3.sipit.net_cert.pem
-h6.cisco3.sipit.net_key.pem
-h6.cisco3.sipit.net_req.pem
-host1.ntt.sipit.net_cert.pem
-host1.ntt.sipit.net_privatekey.pem
-id.pem
-id_key.pem
-igor.sipit.net.p12
-igor.sipit.net_cert.pem
-igor.sipit.net_key.pem
-igor.sipit.net_req.pem
-itoh@host1.ntt.sipit.net_cert.pem
-itoh@host1.ntt.sipit.net_privatekey.pem
-krishna.nrc1.sipit.net.p12
-krishna.nrc1.sipit.net_cert.pem
-krishna.nrc1.sipit.net_key.pem
-krishna.nrc1.sipit.net_req.pem
-ofra.rv2.sipit.net.p12
-ofra.rv2.sipit.net_cert.pem
-ofra.rv2.sipit.net_key.pem
-ofra.rv2.sipit.net_req.pem
-ofra.sipit.net.p12
-ofra.sipit.net_cert.pem
-ofra.sipit.net_key.pem
-ofra.sipit.net_req.pem
-ofra6.rv2.sipit.net.p12
-ofra6.rv2.sipit.net_cert.pem
-ofra6.rv2.sipit.net_key.pem
-ofra6.rv2.sipit.net_req.pem
-ofra6.sipit.net.p12
-ofra6.sipit.net_cert.pem
-ofra6.sipit.net_key.pem
-ofra6.sipit.net_req.pem
-openssl.cnf
-pc.cisco.sipit.net_cert.pem
-pekka.nrc1.sipit.net.p12
-pekka.nrc1.sipit.net_cert.pem
-pekka.nrc1.sipit.net_key.pem
-pekka.nrc1.sipit.net_req.pem
-proxy.rv3.sipit.net.p12
-proxy.rv3.sipit.net_cert.pem
-proxy.rv3.sipit.net_key.pem
-proxy.rv3.sipit.net_req.pem
-rohan@pc.cisco.sipit.net_cert.pem
-root-certificate.pem
-rv2.sipit.net.p12
-rv2.sipit.net_cert.pem
-rv2.sipit.net_key.pem
-rv2.sipit.net_req.pem
-rv3.sipit.net.p12
-rv3.sipit.net_cert.pem
-rv3.sipit.net_key.pem
-rv3.sipit.net_req.pem
-rvsipserver.rv3.sipit.net.p12
-rvsipserver.rv3.sipit.net_cert.pem
-rvsipserver.rv3.sipit.net_key.pem
-rvsipserver.rv3.sipit.net_req.pem
-sua.rv3.sipit.net.p12
-sua.rv3.sipit.net_cert.pem
-sua.rv3.sipit.net_key.pem
-sua.rv3.sipit.net_req.pem
--- a/resip/dum/.cvsignore
+++ b/resip/dum/.cvsignore
@@ -1,13 +0,0 @@
-.dependlibs
-bin.debug.Darwin.ppc
-bin.debug.Linux.i686
-html
-obj.*
-bin.*
-.gdb_history
-Makefile.in
-Release
-Debug
-SSL-Release
-SSL-Debug
-*.user
--- a/resip/dum/doc/.cvsignore
+++ b/resip/dum/doc/.cvsignore
@@ -1,2 +0,0 @@
-*.pdf
-*.ps
--- a/resip/dum/test/.cvsignore
+++ b/resip/dum/test/.cvsignore
@@ -1,35 +0,0 @@
-.dependlibs
-bin.debug.Darwin.ppc
-bin.debug.Linux.i686
-html
-obj.debug.Darwin.ppc
-obj.debug.Linux.i686
-testIntrusiveList
-testTransportSelector
-testTimer
-testAppTimer
-testPidf
-testParseUtil
-testResponses
-testTcp
-testXMLCursor
-testSipStack1
-testCorruption
-testStack
-testUri
-testMultipartRelated
-testThreadIf
-testSelect
-testTypedef
-testRlmi
-testMem
-testLockStep
-testPksc7
-testTransactionFSM
-obj.debug.Darwin.Power_Macintosh
-bin.debug.Darwin.Power_Macintosh
-.gdb_history
-Debug
-Release
-SSL-Debug
-SSL-Release
--- a/resip/recon/GstBridgeMixer.hxx
+++ b/resip/recon/GstBridgeMixer.hxx
@@ -2,7 +2,7 @@
 #define GstBridgeMixer_hxx

 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
 #endif

 #if (_MSC_VER >= 1600)
--- a/resip/recon/KurentoBridgeMixer.cxx
+++ b/resip/recon/KurentoBridgeMixer.cxx
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
 #endif

 #include "KurentoBridgeMixer.hxx"
--- a/resip/recon/LibWebRTCBridgeMixer.hxx
+++ b/resip/recon/LibWebRTCBridgeMixer.hxx
@@ -2,7 +2,7 @@
 #define LibWebRTCBridgeMixer_hxx

 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
 #endif

 #if (_MSC_VER >= 1600)
--- a/resip/recon/SipXBridgeMixer.hxx
+++ b/resip/recon/SipXBridgeMixer.hxx
@@ -2,7 +2,7 @@
 #define SipXBridgeMixer_hxx

 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
 #endif

 #if (_MSC_VER >= 1600)
--- a/resip/stack/.cvsignore
+++ b/resip/stack/.cvsignore
@@ -1,74 +0,0 @@
-*-raw.cxx
-*.d
-*.la
-*.lo
-*~
-dox
-.DS_Store
-.dependlibs
-.deps
-.gdb_history
-.libs
-Debug
-English.lproj
-ExpandedSipMessage
-JF
-Makefile.in
-Release
-SSL-Debug
-SSL-Release
-UserAgentCore.hxx
-a.out
-backup
-bak
-bar
-bin.*
-build
-config.hxx
-dumpasn1
-enc64
-foo
-foo2
-foo3
-foo4
-fooMsg
-gmon.out
-headers-hash.c
-hotsip_stun1
-hotsip_stun2
-html
-j2
-junk
-log
-log1
-log1.txt
-log2
-log2.txt
-log3.txt
-memprof.sh
-new-pp.tgz
-obj.*
-pp-safe.tgz
-pp-todo
-save
-save2
-sipit14_ntt1
-sipit14_ntt2
-sipit14_ntt3
-sipit14_ntt4
-sipit14_ntt5
-sipit14_ntt6
-sipit14_radvision1
-sipit_ntt7
-stamp-h1
-testSipStack1
-testUdp
-tmp
-un64
-doxygen
-*.stackdump
-*.diff
-*.tar
-*.gz
-TAGS
-*.tmp
--- a/resip/stack/doc/.cvsignore
+++ b/resip/stack/doc/.cvsignore
@@ -1,6 +0,0 @@
-Preparse.dot
-design-overview.html
-out
-Preparse.png.dot
-Preparse.ps.dot
-Preparse.svg.dot
--- a/resip/stack/test/.cvsignore
+++ b/resip/stack/test/.cvsignore
@@ -1,85 +0,0 @@
-*.la
-*.lo
-.DS_Store
-.dependlibs
-.deps
-.gdb_history
-.libs
-Makefile.in
-SipTortureTests
-bar
-bin.*
-foo
-id.pem
-id_key.pem
-lg
-limpc
-obj.*
-root.pem
-test1
-test2
-testApplicationSip
-testAppTimer
-testClient
-testCoders
-testCorruption
-testCountStream
-testData
-testDataPerformance
-testDataStream
-testDigestAuthentication
-testDns
-testEmbedded
-testEmptyHeader
-testIntrusiveList
-testIM
-testLockStep
-testLogger
-testMem
-testMessageWaiting
-testMultipartMixedContents
-testParseBuffer
-testParserCategories
-testPlainContents
-testPreparse
-testRandomHex
-testSdp
-testServer
-testSipFrag
-testSipMessage
-testSipMessageMemory
-testSpeed
-testUdp
-test[^.0-9A-Z]*
-tests.out
-testMultipartRelated
-testParseUtil
-testPidf
-testPksc7
-testResponses
-testRlmi
-testSelect
-testSipStack1
-testStack
-testTcp
-testThreadIf
-testTimer
-testTransactionFSM
-testTransportSelector
-testTypedef
-testUri
-testXMLCursor
-core.*
-Debug
-Release
-SSL-Debug
-SSL-Release
-*.stackdump
-testFileSystem
-testExternalLogger
-testFifo
-makeSelfCert
-testTime
-testDnsUtil
-testRSP-254
-test503Generator
--- a/resiprocate.spec.in
+++ b/resiprocate.spec.in
@@ -17,6 +17,10 @@ BuildRequires: c-ares-devel
 BuildRequires: cppunit-devel
 BuildRequires: fmt-devel
 BuildRequires: gperf
+BuildRequires: gstreamer1-devel
+BuildRequires: gstreamer1-plugins-base-devel
+BuildRequires: gstreamer1-plugins-bad-free-devel
+BuildRequires: gstreamermm-devel
 %if 0%{?fedora} >= 34 || 0%{?rhel} >= 8
 BuildRequires: libdb-cxx-devel
 %endif
@@ -53,7 +57,11 @@ BuildRequires: xerces-c-devel
 BuildRequires: net-snmp-devel
 BuildRequires: qpid-proton-cpp-devel
 BuildRequires: soci-devel
+BuildRequires: soci-mysql-devel
 BuildRequires: soci-postgresql-devel
+BuildRequires: sox
+# vim-common contains the xxd utility
+BuildRequires: vim-common
 BuildRequires: websocketpp-devel
 Requires: openssl >= 1.1.0
 %if %use_systemd
@@ -440,6 +448,7 @@ fi
 %{_libdir}/libreflow-*.so
 %{_libdir}/librepro-*.so
 %{_libdir}/libresip-*.so
+%{_libdir}/libresipmedia-*.so
 %if %build_return
 %{_libdir}/libreTurnClient-*.so
 %{_libdir}/libreTurnCommon-*.so
@@ -456,9 +465,9 @@ fi
 %dir %{_includedir}/reTurn/client/
 %endif
 %dir %{_includedir}/recon/
+%dir %{_includedir}/recon/sdp/
 %dir %{_includedir}/reflow/
 %dir %{_includedir}/reflow/dtls_wrapper/
-%dir %{_includedir}/reflow/rtcp/
 %dir %{_includedir}/repro/
 %dir %{_includedir}/repro/monkeys/
 %dir %{_includedir}/repro/stateAgents/
@@ -469,20 +478,22 @@ fi
 %dir %{_includedir}/resip/stack/ssl/
 %dir %{_includedir}/rutil/
 %dir %{_includedir}/rutil/dns/
+%dir %{_includedir}/rutil/rtcp/
 %dir %{_includedir}/rutil/ssl/
 %dir %{_includedir}/rutil/stun/
 %dir %{_includedir}/rutil/wince/
 %dir %{_includedir}/sipdial/
 %{_includedir}/clicktocall/*.hxx
-%dir %{_includedir}/media/kurento/*.hxx
+%{_includedir}/media/*.hxx
+%{_includedir}/media/kurento/*.hxx
 %if %build_return
 %{_includedir}/reTurn/*.hxx
 %{_includedir}/reTurn/client/*.hxx
 %endif
 %{_includedir}/recon/*.hxx
+%{_includedir}/recon/*/*.hxx
 %{_includedir}/reflow/*.hxx
 %{_includedir}/reflow/dtls_wrapper/*.hxx
-%{_includedir}/reflow/rtcp/*.h
 %{_includedir}/repro/*.hxx
 %{_includedir}/repro/*/*.hxx
 %{_includedir}/resip/dum/*.hxx
@@ -492,6 +503,7 @@ fi
 %{_includedir}/rutil/*.hxx
 %{_includedir}/rutil/*.h
 %{_includedir}/rutil/*/*.hxx
+%{_includedir}/rutil/*/*.h
 %{_includedir}/sipdial/*.hxx
 %{_libdir}/libdum.so
 %{_libdir}/libkurentoclient.so
@@ -499,6 +511,7 @@ fi
 %{_libdir}/libreflow.so
 %{_libdir}/librepro.so
 %{_libdir}/libresip.so
+%{_libdir}/libresipmedia.so
 %if %build_return
 %{_libdir}/libreTurnClient.so
 %{_libdir}/libreTurnCommon.so
--- a/rutil/.cvsignore
+++ b/rutil/.cvsignore
@@ -1,30 +0,0 @@
-*~
-.DS_Store
-.dependlibs
-Assert.cxx
-Assert.h
-Debug
-Release
-bar
-bin.debug.Darwin.Power_Macintosh
-bin.debug.Linux.i686
-bin.debug.QNX.x86pc
-bin.debug.SunOS.sun4u
-bin.i686
-bin.nodebug.Linux.i686
-bin.opt.Linux.i686
-bin.opt.QNX.x86pc
-bin.prof.Linux.i686
-cassert
-obj.debug.Darwin.Power_Macintosh
-obj.debug.Linux.i686
-obj.debug.QNX.x86pc
-obj.debug.SunOS.sun4u
-obj.i686
-obj.nodebug.Linux.i686
-obj.opt.Linux.i686
-obj.opt.QNX.x86pc
-obj.prof.Linux.i686
-SSL-Release
-SSL-Debug
-*.user
--- a/rutil/dns/ares/.cvsignore
+++ b/rutil/dns/ares/.cvsignore
@@ -1,15 +0,0 @@
-.DS_Store
-Debug
-Release
-Makefile
-adig
-ahost
-config.cache
-config.log
-config.status
-Makefile
-config.cache
-config.log
-config.status
-libares.a
-*.user