From 18fddd4dfba683a113ed7b2c8aa2aa6f58a57f65 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 1 Aug 2019 15:40:59 +0000 Subject: [PATCH 01/22] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..1f73cde --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# srt + +The srt package \ No newline at end of file From 9eaeb2dcfedc0c28767f5f50720abba94245ecdf Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Fri, 2 Aug 2019 08:58:49 +0300 Subject: [PATCH 02/22] Initial import (#1734696) --- .gitignore | 1 + sources | 1 + srt.spec | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 .gitignore create mode 100644 sources create mode 100644 srt.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a3095d7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/srt-1.3.3.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..afb6436 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (srt-1.3.3.tar.gz) = daa7cd29415c252c10ca2eeb13f0eeaa024232d3f9cd1a40533a8add01b1a8f8458d8ea7b4504ea98b67625c3543e502078c07ccc65cfb0fe638155ac4c9e1d8 diff --git a/srt.spec b/srt.spec new file mode 100644 index 0000000..565ca67 --- /dev/null +++ b/srt.spec @@ -0,0 +1,68 @@ +Name: srt +Version: 1.3.3 +Release: 3%{?dist} +Summary: Secure Reliable Transport protocol tools + +License: MPLv2.0 +URL: https://www.srtalliance.org +Source0: https://github.com/Haivision/srt/archive/v%{version}/%{name}-%{version}.tar.gz + +BuildRequires: cmake gcc-c++ +BuildRequires: openssl-devel + +%description +Secure Reliable Transport (SRT) is an open source transport technology that +optimizes streaming performance across unpredictable networks, such as +the Internet. + +%package libs +Summary: Secure Reliable Transport protocol libraries + +%description libs +Secure Reliable Transport protocol libraries + +%package devel +Summary: Secure Reliable Transport protocol development libraries and headers +Requires: srt-libs%{?_isa} = %{version}-%{release} + +%description devel +Secure Reliable Transport protocol development libraries and header files + + +%prep +%autosetup + + +%build +%cmake -DENABLE_STATIC=OFF +%make_build + + +%install +%make_install +# remove old upstream temporary compatibility pc +rm -f %{buildroot}/%{_libdir}/pkgconfig/haisrt.pc + + +%files +%license LICENSE +%doc README.md docs +%{_bindir}/srt-ffplay +%{_bindir}/srt-file-transmit +%{_bindir}/srt-live-transmit +%{_bindir}/srt-tunnel + +%files libs +%license LICENSE +%{_libdir}/libsrt.so.1* + +%files devel +%doc examples +%{_includedir}/srt +%{_libdir}/libsrt.so +%{_libdir}/pkgconfig/srt.pc + +%changelog +* Thu Aug 1 2019 Yanko Kaneti - 1.3.3-3 +- First attempt +- Adjustments suggested by review From f80c8cab20a2faa432bb4003bff36be8fe9cd29d Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Wed, 11 Sep 2019 14:42:00 +0300 Subject: [PATCH 03/22] Update to 1.3.4 --- .gitignore | 1 + sources | 2 +- srt.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a3095d7..2a969c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /srt-1.3.3.tar.gz +/srt-1.3.4.tar.gz diff --git a/sources b/sources index afb6436..7b007b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (srt-1.3.3.tar.gz) = daa7cd29415c252c10ca2eeb13f0eeaa024232d3f9cd1a40533a8add01b1a8f8458d8ea7b4504ea98b67625c3543e502078c07ccc65cfb0fe638155ac4c9e1d8 +SHA512 (srt-1.3.4.tar.gz) = 3a9f9a8fd8ba56ae9ca04203bdea9e9a25275e1f531ca10deee0e760e6beaf44e83ee7a616cfe3ade9676082d9cc8611214de876f64d141e1e8c3b1e16273001 diff --git a/srt.spec b/srt.spec index 565ca67..725f52a 100644 --- a/srt.spec +++ b/srt.spec @@ -1,6 +1,6 @@ Name: srt -Version: 1.3.3 -Release: 3%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 @@ -63,6 +63,9 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/haisrt.pc %{_libdir}/pkgconfig/srt.pc %changelog +* Wed Sep 11 2019 Yanko Kaneti - 1.3.4-1 +- Update to 1.3.4 + * Thu Aug 1 2019 Yanko Kaneti - 1.3.3-3 - First attempt - Adjustments suggested by review From 29ffe75bd6626b9904f3fd35ffe7a6e116b85919 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Mon, 16 Sep 2019 10:59:11 +0300 Subject: [PATCH 04/22] Update to 1.4.0 --- .gitignore | 1 + sources | 2 +- srt.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2a969c0..0450e4e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /srt-1.3.3.tar.gz /srt-1.3.4.tar.gz +/srt-1.4.0.tar.gz diff --git a/sources b/sources index 7b007b9..128d731 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (srt-1.3.4.tar.gz) = 3a9f9a8fd8ba56ae9ca04203bdea9e9a25275e1f531ca10deee0e760e6beaf44e83ee7a616cfe3ade9676082d9cc8611214de876f64d141e1e8c3b1e16273001 +SHA512 (srt-1.4.0.tar.gz) = b22e7c98b3a5f8ad9647f03bc697254f0f3637716a84b077307f894a193bcf0348c9c10bf09e2ae197f5c721bd6118e2b6134d6770f80eb440783c2d87dd5248 diff --git a/srt.spec b/srt.spec index 725f52a..a239925 100644 --- a/srt.spec +++ b/srt.spec @@ -1,5 +1,5 @@ Name: srt -Version: 1.3.4 +Version: 1.4.0 Release: 1%{?dist} Summary: Secure Reliable Transport protocol tools @@ -63,6 +63,9 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/haisrt.pc %{_libdir}/pkgconfig/srt.pc %changelog +* Mon Sep 16 2019 Yanko Kaneti - 1.4.0-1 +- Update to 1.4.0 + * Wed Sep 11 2019 Yanko Kaneti - 1.3.4-1 - Update to 1.3.4 From 1b2ffdc4a77b615c9368e4964a75609ff7cf8ae5 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Mon, 9 Dec 2019 15:10:18 +0200 Subject: [PATCH 05/22] Update to 1.4.1 --- .gitignore | 1 + sources | 2 +- srt.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0450e4e..f2b266d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /srt-1.3.3.tar.gz /srt-1.3.4.tar.gz /srt-1.4.0.tar.gz +/srt-1.4.1.tar.gz diff --git a/sources b/sources index 128d731..4713b59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (srt-1.4.0.tar.gz) = b22e7c98b3a5f8ad9647f03bc697254f0f3637716a84b077307f894a193bcf0348c9c10bf09e2ae197f5c721bd6118e2b6134d6770f80eb440783c2d87dd5248 +SHA512 (srt-1.4.1.tar.gz) = ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94 diff --git a/srt.spec b/srt.spec index a239925..7f95f9f 100644 --- a/srt.spec +++ b/srt.spec @@ -1,5 +1,5 @@ Name: srt -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: Secure Reliable Transport protocol tools @@ -63,6 +63,9 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/haisrt.pc %{_libdir}/pkgconfig/srt.pc %changelog +* Mon Dec 9 2019 Yanko Kaneti - 1.4.1-1 +- Update to 1.4.1 + * Mon Sep 16 2019 Yanko Kaneti - 1.4.0-1 - Update to 1.4.0 From 2e118092d74c57579fe646b7335fcaac4fe2d1ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 00:12:43 +0000 Subject: [PATCH 06/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- srt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srt.spec b/srt.spec index 7f95f9f..f12ef4b 100644 --- a/srt.spec +++ b/srt.spec @@ -1,6 +1,6 @@ Name: srt Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 @@ -63,6 +63,9 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/haisrt.pc %{_libdir}/pkgconfig/srt.pc %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Dec 9 2019 Yanko Kaneti - 1.4.1-1 - Update to 1.4.1 From c03f3192777537f8419aa65c5c03aabae48160bd Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 6 Apr 2020 13:05:18 +0200 Subject: [PATCH 07/22] Switch to gnutls --- srt.spec | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/srt.spec b/srt.spec index f12ef4b..c01c92c 100644 --- a/srt.spec +++ b/srt.spec @@ -1,6 +1,6 @@ Name: srt Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 @@ -8,7 +8,12 @@ URL: https://www.srtalliance.org Source0: https://github.com/Haivision/srt/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake gcc-c++ -BuildRequires: openssl-devel +BuildRequires: gnutls-devel +BuildRequires: gmock-devel +BuildRequires: gtest-devel + +Requires: srt-libs%{?_isa} = %{version}-%{release} + %description Secure Reliable Transport (SRT) is an open source transport technology that @@ -34,7 +39,13 @@ Secure Reliable Transport protocol development libraries and header files %build -%cmake -DENABLE_STATIC=OFF +%cmake \ + -DENABLE_STATIC=OFF \ + -DENABLE_UNITTESTS=ON \ + -DENABLE_GETNAMEINFO=ON \ + -DUSE_ENCLIB=gnutls \ + . + %make_build @@ -44,6 +55,13 @@ Secure Reliable Transport protocol development libraries and header files rm -f %{buildroot}/%{_libdir}/pkgconfig/haisrt.pc +%check +make test + + +%ldconfig_scriptlets libs + + %files %license LICENSE %doc README.md docs @@ -51,6 +69,7 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/haisrt.pc %{_bindir}/srt-file-transmit %{_bindir}/srt-live-transmit %{_bindir}/srt-tunnel +%{_bindir}/test-srt %files libs %license LICENSE @@ -62,7 +81,13 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/haisrt.pc %{_libdir}/libsrt.so %{_libdir}/pkgconfig/srt.pc + %changelog +* Mon Apr 06 2020 Nicolas Chauvet - 1.4.1-3 +- Switch to gnutls instead of openssl +- Enable tests +- Enforce strict EVR from main to -libs + * Fri Jan 31 2020 Fedora Release Engineering - 1.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8c7f1ffb6585828fb1f7640dbfdfb69de9a06043 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 6 Apr 2020 13:27:46 +0200 Subject: [PATCH 08/22] Update gitignore --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f2b266d..d8c2934 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/srt-1.3.3.tar.gz -/srt-1.3.4.tar.gz -/srt-1.4.0.tar.gz -/srt-1.4.1.tar.gz +srt-*.tar.gz From 16c97da45dde97f844c277504009963bf5052c0a Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 6 Apr 2020 14:46:17 +0200 Subject: [PATCH 09/22] Fails on s390x --- srt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srt.spec b/srt.spec index c01c92c..62ab56c 100644 --- a/srt.spec +++ b/srt.spec @@ -56,7 +56,11 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/haisrt.pc %check -make test +# Fails with x390x +make test \ +%ifarch s390x + || : +%endif %ldconfig_scriptlets libs From b60a6cc7abf8a91575029c24d730f31f9d87960d Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 24 Jul 2020 15:24:10 -0600 Subject: [PATCH 10/22] Use __cmake_in_source_build --- srt.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srt.spec b/srt.spec index 62ab56c..cad76a3 100644 --- a/srt.spec +++ b/srt.spec @@ -1,6 +1,8 @@ +%global __cmake_in_source_build 1 + Name: srt Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 @@ -87,6 +89,9 @@ make test \ %changelog +* Fri Jul 24 2020 Jeff Law - 1.4.1-4 +- Use __cmake_in_source_build + * Mon Apr 06 2020 Nicolas Chauvet - 1.4.1-3 - Switch to gnutls instead of openssl - Enable tests From f92a068f7468c43c4788ecc96a8be39baafe88c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 11:24:14 +0000 Subject: [PATCH 11/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- srt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srt.spec b/srt.spec index cad76a3..894b87c 100644 --- a/srt.spec +++ b/srt.spec @@ -2,7 +2,7 @@ Name: srt Version: 1.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 @@ -89,6 +89,9 @@ make test \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 24 2020 Jeff Law - 1.4.1-4 - Use __cmake_in_source_build From 8bfffa6ac71a3f49252e696f2adc41100e558874 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 29 Oct 2020 09:47:01 +0100 Subject: [PATCH 12/22] Update to 1.4.2 --- srt.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srt.spec b/srt.spec index 894b87c..29cbbef 100644 --- a/srt.spec +++ b/srt.spec @@ -1,8 +1,6 @@ -%global __cmake_in_source_build 1 - Name: srt -Version: 1.4.1 -Release: 5%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 @@ -45,14 +43,13 @@ Secure Reliable Transport protocol development libraries and header files -DENABLE_STATIC=OFF \ -DENABLE_UNITTESTS=ON \ -DENABLE_GETNAMEINFO=ON \ - -DUSE_ENCLIB=gnutls \ - . + -DUSE_ENCLIB=gnutls -%make_build +%cmake_build %install -%make_install +%cmake_install # remove old upstream temporary compatibility pc rm -f %{buildroot}/%{_libdir}/pkgconfig/haisrt.pc @@ -89,6 +86,9 @@ make test \ %changelog +* Thu Oct 29 2020 Nicolas Chauvet - 1.4.2-1 +- Update to 1.4.2 + * Wed Jul 29 2020 Fedora Release Engineering - 1.4.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 529adac4d424a287c818643df3e31b508ae6f87c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 29 Oct 2020 09:53:44 +0100 Subject: [PATCH 13/22] Add sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 4713b59..bb36bda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (srt-1.4.1.tar.gz) = ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94 +SHA512 (srt-1.4.2.tar.gz) = 4c978e3898737e566f47222a0095df1b49591d79927850cc94c838b7eaccf401faf1c5d038fa45b6fd30c85f980e7c212a79c07ed6f9008430e8a5a594a31ffe From 6465c7c2701d0a210a936024cb5500c03080ef23 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 2 Nov 2020 17:15:31 -0700 Subject: [PATCH 14/22] Fix missing #includes for gcc-11 --- srt-gcc11.patch | 158 ++++++++++++++++++++++++++++++++++++++++++++++++ srt.spec | 8 ++- 2 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 srt-gcc11.patch diff --git a/srt-gcc11.patch b/srt-gcc11.patch new file mode 100644 index 0000000..d16d4eb --- /dev/null +++ b/srt-gcc11.patch @@ -0,0 +1,158 @@ +diff --git a/srtcore/api.cpp b/srtcore/api.cpp +index b61b720..0302d41 100644 +--- a/srtcore/api.cpp ++++ b/srtcore/api.cpp +@@ -59,6 +59,7 @@ modified by + #include + + #include ++#include + #include "utilities.h" + #include "netinet_any.h" + #include "api.h" +diff --git a/srtcore/cache.cpp b/srtcore/cache.cpp +index 56d327c..388fe45 100644 +--- a/srtcore/cache.cpp ++++ b/srtcore/cache.cpp +@@ -42,6 +42,8 @@ written by + #include "platform_sys.h" + + #include ++#include ++ + #include "cache.h" + #include "core.h" + +diff --git a/srtcore/channel.cpp b/srtcore/channel.cpp +index 3473e75..6821912 100644 +--- a/srtcore/channel.cpp ++++ b/srtcore/channel.cpp +@@ -56,6 +56,7 @@ modified by + #include // Logging + #include + #include ++#include + + #include "channel.h" + #include "core.h" // srt_logging:kmlog +diff --git a/srtcore/crypto.cpp b/srtcore/crypto.cpp +index 4c6c02b..74978d5 100644 +--- a/srtcore/crypto.cpp ++++ b/srtcore/crypto.cpp +@@ -19,6 +19,7 @@ written by + #include + #include + #include ++#include + + #include "udt.h" + #include "utilities.h" +diff --git a/srtcore/epoll.cpp b/srtcore/epoll.cpp +index 80302b6..ecd7673 100644 +--- a/srtcore/epoll.cpp ++++ b/srtcore/epoll.cpp +@@ -57,6 +57,7 @@ modified by + #include + #include + #include ++#include + + #include "common.h" + #include "epoll.h" +diff --git a/srtcore/fec.cpp b/srtcore/fec.cpp +index ba26626..ceb409a 100644 +--- a/srtcore/fec.cpp ++++ b/srtcore/fec.cpp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include "packetfilter.h" + #include "core.h" +diff --git a/srtcore/handshake.cpp b/srtcore/handshake.cpp +index e3726ea..1209e9a 100644 +--- a/srtcore/handshake.cpp ++++ b/srtcore/handshake.cpp +@@ -50,6 +50,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include ++#include + + #include "udt.h" + #include "core.h" +diff --git a/srtcore/list.cpp b/srtcore/list.cpp +index a2ef993..3479a5a 100644 +--- a/srtcore/list.cpp ++++ b/srtcore/list.cpp +@@ -50,6 +50,8 @@ modified by + Haivision Systems Inc. + *****************************************************************************/ + ++#include ++ + #include "platform_sys.h" + + #include "list.h" +diff --git a/srtcore/logging.h b/srtcore/logging.h +index bfdfb37..29f6699 100644 +--- a/srtcore/logging.h ++++ b/srtcore/logging.h +@@ -17,6 +17,7 @@ written by + #define INC_SRT_LOGGING_H + + ++#include + #include + #include + #include +diff --git a/srtcore/packet.cpp b/srtcore/packet.cpp +index 5b8bada..c10ba76 100644 +--- a/srtcore/packet.cpp ++++ b/srtcore/packet.cpp +@@ -162,6 +162,7 @@ modified by + #include "platform_sys.h" + + #include ++#include + #include "packet.h" + #include "handshake.h" + #include "logging.h" +diff --git a/srtcore/packetfilter.cpp b/srtcore/packetfilter.cpp +index 85fc584..c3ff91b 100644 +--- a/srtcore/packetfilter.cpp ++++ b/srtcore/packetfilter.cpp +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #include "packetfilter.h" + #include "packetfilter_builtin.h" +diff --git a/srtcore/queue.cpp b/srtcore/queue.cpp +index 3f9cdf0..6ca2d0d 100644 +--- a/srtcore/queue.cpp ++++ b/srtcore/queue.cpp +@@ -53,6 +53,7 @@ modified by + #include "platform_sys.h" + + #include ++#include + + #include "common.h" + #include "api.h" +diff --git a/srtcore/srt_c_api.cpp b/srtcore/srt_c_api.cpp +index 1763198..a894f51 100644 +--- a/srtcore/srt_c_api.cpp ++++ b/srtcore/srt_c_api.cpp +@@ -17,6 +17,7 @@ written by + + #include + #include ++#include + #include "srt.h" + #include "common.h" + #include "packet.h" diff --git a/srt.spec b/srt.spec index 29cbbef..ccaa1cd 100644 --- a/srt.spec +++ b/srt.spec @@ -1,11 +1,12 @@ Name: srt Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 URL: https://www.srtalliance.org Source0: https://github.com/Haivision/srt/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: %{name}-gcc11.patch BuildRequires: cmake gcc-c++ BuildRequires: gnutls-devel @@ -35,7 +36,7 @@ Secure Reliable Transport protocol development libraries and header files %prep -%autosetup +%autosetup -p1 %build @@ -86,6 +87,9 @@ make test \ %changelog +* Mon Nov 02 2020 Jeff Law - 1.4.2-2 +- Fix missing #includes for gcc-11 + * Thu Oct 29 2020 Nicolas Chauvet - 1.4.2-1 - Update to 1.4.2 From 20588196879c8c345191a41896fef5203b388518 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:56:13 +0000 Subject: [PATCH 15/22] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- srt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/srt.spec b/srt.spec index ccaa1cd..9499b4b 100644 --- a/srt.spec +++ b/srt.spec @@ -8,6 +8,7 @@ URL: https://www.srtalliance.org Source0: https://github.com/Haivision/srt/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: %{name}-gcc11.patch +BuildRequires: make BuildRequires: cmake gcc-c++ BuildRequires: gnutls-devel BuildRequires: gmock-devel From 8ddad312bf35c21a4fb4fac5a7d8b5fd83405a83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:59:23 +0000 Subject: [PATCH 16/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- srt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srt.spec b/srt.spec index 9499b4b..b98a2c7 100644 --- a/srt.spec +++ b/srt.spec @@ -1,6 +1,6 @@ Name: srt Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 @@ -88,6 +88,9 @@ make test \ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Nov 02 2020 Jeff Law - 1.4.2-2 - Fix missing #includes for gcc-11 From 102a5773f456d94d31b2f268aa2b5b7bb64196ca Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:40:06 +0100 Subject: [PATCH 17/22] Rebuilt for removed libstdc++ symbol (#1937698) --- srt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srt.spec b/srt.spec index b98a2c7..7169cc0 100644 --- a/srt.spec +++ b/srt.spec @@ -1,6 +1,6 @@ Name: srt Version: 1.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 @@ -88,6 +88,9 @@ make test \ %changelog +* Tue Mar 30 2021 Jonathan Wakely - 1.4.2-4 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Wed Jan 27 2021 Fedora Release Engineering - 1.4.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 1a3f422d2c07bf7c915fe4bf3c64a4379c9c2091 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Sun, 9 May 2021 17:57:32 +0300 Subject: [PATCH 18/22] Update to 1.4.3. New soname --- sources | 2 +- srt-gcc11.patch | 158 ------------------------------------------------ srt.spec | 8 ++- 3 files changed, 6 insertions(+), 162 deletions(-) delete mode 100644 srt-gcc11.patch diff --git a/sources b/sources index bb36bda..a1c96af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (srt-1.4.2.tar.gz) = 4c978e3898737e566f47222a0095df1b49591d79927850cc94c838b7eaccf401faf1c5d038fa45b6fd30c85f980e7c212a79c07ed6f9008430e8a5a594a31ffe +SHA512 (srt-1.4.3.tar.gz) = 5cd15fd0c7b324226ab096c1b6c6f81b4ce5600617e1bd2c38985f18d7d551c9a4a09b1e34c7a705c92ae54bb57c5d736ca7eff6e4992e67666aa167e0da855f diff --git a/srt-gcc11.patch b/srt-gcc11.patch deleted file mode 100644 index d16d4eb..0000000 --- a/srt-gcc11.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/srtcore/api.cpp b/srtcore/api.cpp -index b61b720..0302d41 100644 ---- a/srtcore/api.cpp -+++ b/srtcore/api.cpp -@@ -59,6 +59,7 @@ modified by - #include - - #include -+#include - #include "utilities.h" - #include "netinet_any.h" - #include "api.h" -diff --git a/srtcore/cache.cpp b/srtcore/cache.cpp -index 56d327c..388fe45 100644 ---- a/srtcore/cache.cpp -+++ b/srtcore/cache.cpp -@@ -42,6 +42,8 @@ written by - #include "platform_sys.h" - - #include -+#include -+ - #include "cache.h" - #include "core.h" - -diff --git a/srtcore/channel.cpp b/srtcore/channel.cpp -index 3473e75..6821912 100644 ---- a/srtcore/channel.cpp -+++ b/srtcore/channel.cpp -@@ -56,6 +56,7 @@ modified by - #include // Logging - #include - #include -+#include - - #include "channel.h" - #include "core.h" // srt_logging:kmlog -diff --git a/srtcore/crypto.cpp b/srtcore/crypto.cpp -index 4c6c02b..74978d5 100644 ---- a/srtcore/crypto.cpp -+++ b/srtcore/crypto.cpp -@@ -19,6 +19,7 @@ written by - #include - #include - #include -+#include - - #include "udt.h" - #include "utilities.h" -diff --git a/srtcore/epoll.cpp b/srtcore/epoll.cpp -index 80302b6..ecd7673 100644 ---- a/srtcore/epoll.cpp -+++ b/srtcore/epoll.cpp -@@ -57,6 +57,7 @@ modified by - #include - #include - #include -+#include - - #include "common.h" - #include "epoll.h" -diff --git a/srtcore/fec.cpp b/srtcore/fec.cpp -index ba26626..ceb409a 100644 ---- a/srtcore/fec.cpp -+++ b/srtcore/fec.cpp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include "packetfilter.h" - #include "core.h" -diff --git a/srtcore/handshake.cpp b/srtcore/handshake.cpp -index e3726ea..1209e9a 100644 ---- a/srtcore/handshake.cpp -+++ b/srtcore/handshake.cpp -@@ -50,6 +50,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include "udt.h" - #include "core.h" -diff --git a/srtcore/list.cpp b/srtcore/list.cpp -index a2ef993..3479a5a 100644 ---- a/srtcore/list.cpp -+++ b/srtcore/list.cpp -@@ -50,6 +50,8 @@ modified by - Haivision Systems Inc. - *****************************************************************************/ - -+#include -+ - #include "platform_sys.h" - - #include "list.h" -diff --git a/srtcore/logging.h b/srtcore/logging.h -index bfdfb37..29f6699 100644 ---- a/srtcore/logging.h -+++ b/srtcore/logging.h -@@ -17,6 +17,7 @@ written by - #define INC_SRT_LOGGING_H - - -+#include - #include - #include - #include -diff --git a/srtcore/packet.cpp b/srtcore/packet.cpp -index 5b8bada..c10ba76 100644 ---- a/srtcore/packet.cpp -+++ b/srtcore/packet.cpp -@@ -162,6 +162,7 @@ modified by - #include "platform_sys.h" - - #include -+#include - #include "packet.h" - #include "handshake.h" - #include "logging.h" -diff --git a/srtcore/packetfilter.cpp b/srtcore/packetfilter.cpp -index 85fc584..c3ff91b 100644 ---- a/srtcore/packetfilter.cpp -+++ b/srtcore/packetfilter.cpp -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #include "packetfilter.h" - #include "packetfilter_builtin.h" -diff --git a/srtcore/queue.cpp b/srtcore/queue.cpp -index 3f9cdf0..6ca2d0d 100644 ---- a/srtcore/queue.cpp -+++ b/srtcore/queue.cpp -@@ -53,6 +53,7 @@ modified by - #include "platform_sys.h" - - #include -+#include - - #include "common.h" - #include "api.h" -diff --git a/srtcore/srt_c_api.cpp b/srtcore/srt_c_api.cpp -index 1763198..a894f51 100644 ---- a/srtcore/srt_c_api.cpp -+++ b/srtcore/srt_c_api.cpp -@@ -17,6 +17,7 @@ written by - - #include - #include -+#include - #include "srt.h" - #include "common.h" - #include "packet.h" diff --git a/srt.spec b/srt.spec index 7169cc0..43f34d2 100644 --- a/srt.spec +++ b/srt.spec @@ -1,12 +1,11 @@ Name: srt -Version: 1.4.2 -Release: 4%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 URL: https://www.srtalliance.org Source0: https://github.com/Haivision/srt/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: %{name}-gcc11.patch BuildRequires: make BuildRequires: cmake gcc-c++ @@ -88,6 +87,9 @@ make test \ %changelog +* Sun May 9 2021 Yanko Kaneti - 1.4.3-1 +- Update to 1.4.3. New soname + * Tue Mar 30 2021 Jonathan Wakely - 1.4.2-4 - Rebuilt for removed libstdc++ symbol (#1937698) From 101e265418dccdfcc579d9fc0650d4d15a69444f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:13:16 +0000 Subject: [PATCH 19/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- srt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srt.spec b/srt.spec index 43f34d2..6f15bf0 100644 --- a/srt.spec +++ b/srt.spec @@ -1,6 +1,6 @@ Name: srt Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 @@ -87,6 +87,9 @@ make test \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun May 9 2021 Yanko Kaneti - 1.4.3-1 - Update to 1.4.3. New soname From 8c268544c190d439287a19b80fc2ef59b2e90197 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Mon, 6 Sep 2021 13:16:47 +0300 Subject: [PATCH 20/22] Bump rebuild for gtest soname change --- srt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srt.spec b/srt.spec index 6f15bf0..ea2aee9 100644 --- a/srt.spec +++ b/srt.spec @@ -1,6 +1,6 @@ Name: srt Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 @@ -87,6 +87,9 @@ make test \ %changelog +* Mon Sep 6 2021 Yanko Kaneti - 1.4.3-3 +- Bump rebuild for gtest soname change + * Fri Jul 23 2021 Fedora Release Engineering - 1.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 160647985392d168b09eaa74ee4ed1f956446c9c Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Mon, 4 Oct 2021 21:39:13 +0300 Subject: [PATCH 21/22] Update to 1.4.4 - Various tweaks around tests/checks - Tighten soname wildcard --- sources | 2 +- srt.spec | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/sources b/sources index a1c96af..a69531e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (srt-1.4.3.tar.gz) = 5cd15fd0c7b324226ab096c1b6c6f81b4ce5600617e1bd2c38985f18d7d551c9a4a09b1e34c7a705c92ae54bb57c5d736ca7eff6e4992e67666aa167e0da855f +SHA512 (srt-1.4.4.tar.gz) = 0d51e0ef73f4aa7eb284288cdbbd75b1c161969c2c2fed3a6d4e13a931341ca41dfcf2d6c1b9728f72b43454a9fde3764da67a27af9f0c99a6818682e4f4d4ba diff --git a/srt.spec b/srt.spec index ea2aee9..44f2789 100644 --- a/srt.spec +++ b/srt.spec @@ -1,6 +1,6 @@ Name: srt -Version: 1.4.3 -Release: 3%{?dist} +Version: 1.4.4 +Release: 1%{?dist} Summary: Secure Reliable Transport protocol tools License: MPLv2.0 @@ -56,10 +56,14 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/haisrt.pc %check -# Fails with x390x -make test \ -%ifarch s390x - || : +# - test are broken on s390x for some slowness/timing reason +# - tests can't be run in parallel because they reuse port numbers +# - %%ctest macro doesn't support additional ctest arguments +# - TestIPv6 are known broken due to v4_v6 mapping differnces between platforms +# https://github.com/Haivision/srt/issues/1972# +%ifnarch s390x +cd "%{__cmake_builddir}" +%{__ctest} --output-on-failure --force-new-ctest-process -j1 -E TestIPv6 %endif @@ -73,11 +77,10 @@ make test \ %{_bindir}/srt-file-transmit %{_bindir}/srt-live-transmit %{_bindir}/srt-tunnel -%{_bindir}/test-srt %files libs %license LICENSE -%{_libdir}/libsrt.so.1* +%{_libdir}/libsrt.so.1.4* %files devel %doc examples @@ -87,6 +90,11 @@ make test \ %changelog +* Mon Oct 4 2021 Yanko Kaneti - 1.4.4-1 +- Update to 1.4.4 +- Various tweaks around tests/checks +- Tighten soname wildcard + * Mon Sep 6 2021 Yanko Kaneti - 1.4.3-3 - Bump rebuild for gtest soname change From 923842511a0a3ad7370fff236f7b59e070404fc4 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 31 Oct 2023 00:22:15 +0300 Subject: [PATCH 22/22] Remove unnecessary files --- README.md | 3 --- sources | 1 - 2 files changed, 4 deletions(-) delete mode 100644 README.md delete mode 100644 sources diff --git a/README.md b/README.md deleted file mode 100644 index 1f73cde..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# srt - -The srt package \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index a69531e..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (srt-1.4.4.tar.gz) = 0d51e0ef73f4aa7eb284288cdbbd75b1c161969c2c2fed3a6d4e13a931341ca41dfcf2d6c1b9728f72b43454a9fde3764da67a27af9f0c99a6818682e4f4d4ba