From 9eaeb2dcfedc0c28767f5f50720abba94245ecdf Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Fri, 2 Aug 2019 08:58:49 +0300 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] - 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 6/8] 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 7/8] 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 8/8] 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