[vdr-streamdev] Apply upstream VDR 1.7.25+ patches.
Ville Skyttä
scop at fedoraproject.org
Tue Mar 6 21:16:31 UTC 2012
commit 50a9915146c55c5756ee275e05dbbd2e26a7e759
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Tue Mar 6 23:16:24 2012 +0200
Apply upstream VDR 1.7.25+ patches.
vdr-streamdev-0.5.1-vdr1725.patch | 220 +++++++++++++++++++++++++++++++++++++
vdr-streamdev.spec | 7 +-
2 files changed, 226 insertions(+), 1 deletions(-)
---
diff --git a/vdr-streamdev-0.5.1-vdr1725.patch b/vdr-streamdev-0.5.1-vdr1725.patch
new file mode 100644
index 0000000..064695d
--- /dev/null
+++ b/vdr-streamdev-0.5.1-vdr1725.patch
@@ -0,0 +1,220 @@
+commit 26af4459d806d4dbfbe53ec7c69e2ee498cee6e3
+Author: Frank Schmirler <vdr at schmirler.de>
+Date: Sun Mar 4 01:15:40 2012 +0100
+
+ Use the new streamdev-client setup option "Live TV Priority" to control
+ precedence among multiple clients. The VDR option "Primary Limit" which
+ has previouly been used for this purpose has been dropped in VDR 1.7.25.
+
+diff --git a/client/device.c b/client/device.c
+index 2dec904..ad7a6bd 100644
+--- a/client/device.c
++++ b/client/device.c
+@@ -321,8 +321,9 @@ void cStreamdevDevice::UpdatePriority(void) {
+ m_Device->Lock();
+ if (m_Device->m_UpdatePriority && ClientSocket.DataSocket(siLive)) {
+ int Priority = m_Device->Priority();
+- if (m_Device == cDevice::ActualDevice() && Priority < Setup.PrimaryLimit)
+- Priority = Setup.PrimaryLimit;
++ // override TRANSFERPRIORITY (-1) with live TV priority from setup
++ if (m_Device == cDevice::ActualDevice() && Priority == -1)
++ Priority = StreamdevClientSetup.LivePriority;
+ if (m_Device->m_Priority != Priority && ClientSocket.SetPriority(Priority))
+ m_Device->m_Priority = Priority;
+ }
+diff --git a/client/po/de_DE.po b/client/po/de_DE.po
+index 5635b96..2b817ef 100644
+--- a/client/po/de_DE.po
++++ b/client/po/de_DE.po
+@@ -46,6 +46,9 @@ msgstr "Timeout (s)"
+ msgid "Filter Streaming"
+ msgstr "Filter-Daten streamen"
+
++msgid "Live TV Priority"
++msgstr "Live TV Priorität"
++
+ msgid "Minimum Priority"
+ msgstr "Minimale Priorität"
+
+diff --git a/client/po/fi_FI.po b/client/po/fi_FI.po
+index ca1dc1c..1d56d49 100644
+--- a/client/po/fi_FI.po
++++ b/client/po/fi_FI.po
+@@ -46,6 +46,9 @@ msgstr ""
+ msgid "Filter Streaming"
+ msgstr "Suodatetun tiedon suoratoisto"
+
++msgid "Live TV Priority"
++msgstr ""
++
+ msgid "Minimum Priority"
+ msgstr "Pienin prioriteetti"
+
+diff --git a/client/po/fr_FR.po b/client/po/fr_FR.po
+index 1a01535..81e228b 100644
+--- a/client/po/fr_FR.po
++++ b/client/po/fr_FR.po
+@@ -46,6 +46,9 @@ msgstr ""
+ msgid "Filter Streaming"
+ msgstr "Filtre streaming"
+
++msgid "Live TV Priority"
++msgstr ""
++
+ msgid "Minimum Priority"
+ msgstr ""
+
+diff --git a/client/po/it_IT.po b/client/po/it_IT.po
+index 355238c..342c7ad 100644
+--- a/client/po/it_IT.po
++++ b/client/po/it_IT.po
+@@ -48,6 +48,9 @@ msgstr ""
+ msgid "Filter Streaming"
+ msgstr "Filtra trasmissione"
+
++msgid "Live TV Priority"
++msgstr ""
++
+ msgid "Minimum Priority"
+ msgstr "Priorità minima"
+
+diff --git a/client/po/lt_LT.po b/client/po/lt_LT.po
+index 02929f8..a8f7412 100644
+--- a/client/po/lt_LT.po
++++ b/client/po/lt_LT.po
+@@ -46,6 +46,9 @@ msgstr ""
+ msgid "Filter Streaming"
+ msgstr "Filtruoti transliavimą"
+
++msgid "Live TV Priority"
++msgstr ""
++
+ msgid "Minimum Priority"
+ msgstr "Minimalus prioritetas"
+
+diff --git a/client/po/ru_RU.po b/client/po/ru_RU.po
+index 14d30ae..c6528b1 100644
+--- a/client/po/ru_RU.po
++++ b/client/po/ru_RU.po
+@@ -46,6 +46,9 @@ msgstr ""
+ msgid "Filter Streaming"
+ msgstr "ÄØÛìâà ßÞâÞÚÐ"
+
++msgid "Live TV Priority"
++msgstr ""
++
+ msgid "Minimum Priority"
+ msgstr ""
+
+diff --git a/client/po/sk_SK.po b/client/po/sk_SK.po
+index 2deffc1..54a9419 100644
+--- a/client/po/sk_SK.po
++++ b/client/po/sk_SK.po
+@@ -48,6 +48,9 @@ msgstr ""
+ msgid "Filter Streaming"
+ msgstr "filtrova» prúdy"
+
++msgid "Live TV Priority"
++msgstr ""
++
+ msgid "Minimum Priority"
+ msgstr "minimálna priorita"
+
+diff --git a/client/setup.c b/client/setup.c
+index 9d4452e..c671c63 100644
+--- a/client/setup.c
++++ b/client/setup.c
+@@ -15,4 +15,5 @@ cStreamdevClientSetup::cStreamdevClientSetup(void) {
+ StreamFilters = false;
+ HideMenuEntry = false;
++ LivePriority = 0;
+ MinPriority = -1;
+ MaxPriority = MAXPRIORITY;
+@@ -35,4 +36,5 @@ bool cStreamdevClientSetup::SetupParse(const char *Name, const char *Value) {
+ else if (strcmp(Name, "StreamFilters") == 0) StreamFilters = atoi(Value);
+ else if (strcmp(Name, "HideMenuEntry") == 0) HideMenuEntry = atoi(Value);
++ else if (strcmp(Name, "LivePriority") == 0) LivePriority = atoi(Value);
+ else if (strcmp(Name, "MinPriority") == 0) MinPriority = atoi(Value);
+ else if (strcmp(Name, "MaxPriority") == 0) MaxPriority = atoi(Value);
+@@ -53,4 +55,5 @@ cStreamdevClientMenuSetupPage::cStreamdevClientMenuSetupPage(void) {
+ Add(new cMenuEditIntItem (tr("Remote Port"), &m_NewSetup.RemotePort, 0, 65535));
+ Add(new cMenuEditBoolItem(tr("Filter Streaming"), &m_NewSetup.StreamFilters));
++ Add(new cMenuEditIntItem (tr("Live TV Priority"), &m_NewSetup.LivePriority, 0, MAXPRIORITY));
+ Add(new cMenuEditIntItem (tr("Minimum Priority"), &m_NewSetup.MinPriority, -1, MAXPRIORITY));
+ Add(new cMenuEditIntItem (tr("Maximum Priority"), &m_NewSetup.MaxPriority, -1, MAXPRIORITY));
+@@ -81,4 +84,5 @@ void cStreamdevClientMenuSetupPage::Store(void) {
+ SetupStore("StreamFilters", m_NewSetup.StreamFilters);
+ SetupStore("HideMenuEntry", m_NewSetup.HideMenuEntry);
++ SetupStore("LivePriority", m_NewSetup.LivePriority);
+ SetupStore("MinPriority", m_NewSetup.MinPriority);
+ SetupStore("MaxPriority", m_NewSetup.MaxPriority);
+diff --git a/client/setup.h b/client/setup.h
+index 591bbd2..7bcf889 100644
+--- a/client/setup.h
++++ b/client/setup.h
+@@ -18,4 +18,5 @@ struct cStreamdevClientSetup {
+ int StreamFilters;
+ int HideMenuEntry;
++ int LivePriority;
+ int MinPriority;
+ int MaxPriority;
+commit 83b05a629222b48a045c4f885739ef146d09cd15
+Author: Frank Schmirler <vdr at schmirler.de>
+Date: Tue Mar 6 15:27:12 2012 +0100
+
+ Updated Finnish translation (thanks to Rolf Ahrenberg)
+
+diff --git a/client/po/fi_FI.po b/client/po/fi_FI.po
+index 1d56d49..e356147 100644
+--- a/client/po/fi_FI.po
++++ b/client/po/fi_FI.po
+@@ -47,7 +47,7 @@
+ msgstr "Suodatetun tiedon suoratoisto"
+
+ msgid "Live TV Priority"
+-msgstr ""
++msgstr "Live-katselun prioriteetti"
+
+ msgid "Minimum Priority"
+ msgstr "Pienin prioriteetti"
+commit a63f7247cb78954d1a25fb1d6e2996c0e39f12cd
+Author: Frank Schmirler <vdr at schmirler.de>
+Date: Sun Mar 4 01:20:57 2012 +0100
+
+ With VDR 1.7.25 priorities down to -99 will be used
+
+diff --git a/client/device.c b/client/device.c
+index ad7a6bd..f82e7d5 100644
+--- a/client/device.c
++++ b/client/device.c
+@@ -34,7 +34,7 @@ cStreamdevDevice::cStreamdevDevice(void) {
+
+ m_Device = this;
+ m_Pids = 0;
+- m_Priority = -1;
++ m_Priority = -100;
+ m_DvrClosed = true;
+ }
+
+diff --git a/client/setup.c b/client/setup.c
+index c671c63..dbb2dcc 100644
+--- a/client/setup.c
++++ b/client/setup.c
+@@ -16,7 +16,7 @@ cStreamdevClientSetup::cStreamdevClientSetup(void) {
+ StreamFilters = false;
+ HideMenuEntry = false;
+ LivePriority = 0;
+- MinPriority = -1;
++ MinPriority = -MAXPRIORITY;
+ MaxPriority = MAXPRIORITY;
+ #if APIVERSNUM >= 10700
+ NumProvidedSystems = 1;
+@@ -56,6 +56,6 @@ cStreamdevClientMenuSetupPage::cStreamdevClientMenuSetupPage(void) {
+ Add(new cMenuEditBoolItem(tr("Filter Streaming"), &m_NewSetup.StreamFilters));
+ Add(new cMenuEditIntItem (tr("Live TV Priority"), &m_NewSetup.LivePriority, 0, MAXPRIORITY));
+- Add(new cMenuEditIntItem (tr("Minimum Priority"), &m_NewSetup.MinPriority, -1, MAXPRIORITY));
+- Add(new cMenuEditIntItem (tr("Maximum Priority"), &m_NewSetup.MaxPriority, -1, MAXPRIORITY));
++ Add(new cMenuEditIntItem (tr("Minimum Priority"), &m_NewSetup.MinPriority, -MAXPRIORITY, MAXPRIORITY));
++ Add(new cMenuEditIntItem (tr("Maximum Priority"), &m_NewSetup.MaxPriority, -MAXPRIORITY, MAXPRIORITY));
+ #if APIVERSNUM >= 10715
+ Add(new cMenuEditIntItem (tr("Broadcast Systems / Cost"), &m_NewSetup.NumProvidedSystems, 1, 15));
diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec
index dae3759..1442a07 100644
--- a/vdr-streamdev.spec
+++ b/vdr-streamdev.spec
@@ -6,7 +6,7 @@
Name: vdr-%{pname}
Version: 0.5.1
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Streaming plug-in for VDR
Group: Applications/Multimedia
@@ -19,6 +19,7 @@ Source2: %{name}-client.conf
Patch0: %{name}-gpl-fsf-fix.patch
# http://projects.vdr-developer.org/issues/786
Patch1: 0001-Fix-build-with-liemikuutio-1.32.patch
+Patch2: %{name}-0.5.1-vdr1725.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: vdr-devel >= 1.5.9
@@ -49,6 +50,7 @@ VDR will then be able to work even without a DVB device.
%setup -q -n %{pname}-%{version}%{?prever:-pre-%{prever}}
%patch0 -p1
%patch1 -p1
+%patch2 -p1 -F 2
sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile
@@ -97,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README
%changelog
+* Tue Mar 6 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.5.1-10
+- Apply upstream VDR 1.7.25+ patches.
+
* Mon Feb 20 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.5.1-9
- Rebuild.
More information about the scm-commits
mailing list