scop pushed to vdr (f22). "Enable systemd notification support (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 6 11:56:53 UTC 2015
>From de859eeb672b9ad7fae0b9cd593df4838ba22c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Thu, 19 Feb 2015 22:48:47 +0200
Subject: Enable systemd notification support
- Refresh some patches
diff --git a/epghandler-segment-transfer.patch b/epghandler-segment-transfer.patch
deleted file mode 100644
index 8374a66..0000000
--- a/epghandler-segment-transfer.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- ../vdr-2.0.2.plain//eit.c 2012-12-04 12:10:10.000000000 +0100
-+++ eit.c 2013-05-22 16:49:37.635027462 +0200
-@@ -46,6 +46,8 @@
- return;
- }
-
-+ EpgHandlers.BeginSegmentTransfer(channel, OnlyRunningStatus);
-+
- bool handledExternally = EpgHandlers.HandledExternally(channel);
- cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channel, true);
-
-@@ -310,6 +312,7 @@
- Schedules->SetModified(pSchedule);
- }
- Channels.Unlock();
-+ EpgHandlers.EndSegmentTransfer(Modified, OnlyRunningStatus);
- }
-
- // --- cTDT ------------------------------------------------------------------
---- ../vdr-2.0.2.plain//epg.c 2013-02-17 15:12:07.000000000 +0100
-+++ epg.c 2013-05-22 16:50:29.043029281 +0200
-@@ -1537,3 +1537,19 @@
- }
- Schedule->DropOutdated(SegmentStart, SegmentEnd, TableID, Version);
- }
-+
-+void cEpgHandlers::BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus)
-+{
-+ for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
-+ if (eh->BeginSegmentTransfer(Channel, OnlyRunningStatus))
-+ return;
-+ }
-+}
-+
-+void cEpgHandlers::EndSegmentTransfer(bool Modified, bool OnlyRunningStatus)
-+{
-+ for (cEpgHandler *eh = First(); eh; eh = Next(eh)) {
-+ if (eh->EndSegmentTransfer(Modified, OnlyRunningStatus))
-+ return;
-+ }
-+}
---- ../vdr-2.0.2.plain//epg.h 2012-09-24 14:53:53.000000000 +0200
-+++ epg.h 2013-05-22 16:50:16.867028850 +0200
-@@ -273,6 +273,12 @@
- virtual bool DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version) { return false; }
- ///< Takes a look at all EPG events between SegmentStart and SegmentEnd and
- ///< drops outdated events.
-+ virtual bool BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus) { return false; }
-+ ///< called directly after IgnoreChannel before any other handler method called
-+ ///< designed to give handlers the ossibility to prepare a transaction
-+ virtual bool EndSegmentTransfer(bool Modified, bool OnlyRunningStatus) { return false; }
-+ ///< called at last after the segment data is processed
-+ ///< at this oint handlers should close/commt/rollback their transactions
- };
-
- class cEpgHandlers : public cList<cEpgHandler> {
-@@ -295,6 +301,8 @@
- void HandleEvent(cEvent *Event);
- void SortSchedule(cSchedule *Schedule);
- void DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
-+ void BeginSegmentTransfer(const cChannel *Channel, bool OnlyRunningStatus);
-+ void EndSegmentTransfer(bool Modified, bool OnlyRunningStatus);
- };
-
- extern cEpgHandlers EpgHandlers;
diff --git a/sources b/sources
index 17dedbe..4e40a97 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
3e9287f726df5a667054a15078235791 vdr_1.4.5-2.ds.diff.gz
-d76b06a7bf1f458a02f2d1169776fb7f vdr_2.0.3-1.debian.tar.bz2
b01a5d964af6379af5e7aa0f5203e1d3 vdr-2.1.9-menuselection.patch.gz
8853f64c0fc3d41ffd3b4bfc6f0a14b7 vdr-2.2.0.tar.bz2
+f84cc801c1495829ef0f22b768dcfb2f vdr_2.0.6-2.debian.tar.bz2
diff --git a/vdr.spec b/vdr.spec
index 918838a..b432a6c 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -24,7 +24,7 @@
Name: vdr
Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Video Disk Recorder
License: GPLv2+
@@ -47,7 +47,7 @@ Source14: %{name}-shutdown.sh
Source15: %{name}-moveto.sh
Source16: %{name}-CHANGES.package.old
Source17: %{name}.macros
-Source18: http://cdn.debian.net/debian/pool/main/v/vdr/vdr_2.0.3-1.debian.tar.bz2
+Source18: http://cdn.debian.net/debian/pool/main/v/vdr/vdr_2.0.6-2.debian.tar.bz2
Source19: %{name}-check-setup.sh
Source20: %{name}-rcu.conf
Source21: %{name}-set-wakeup.sh
@@ -74,7 +74,6 @@ Patch15: %{name}-1.7.37-fedora-pkgconfig.patch
Patch17: http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr.epgsearch-exttimeredit-0.0.2.diff
Patch18: %{name}-timer-info-2.2.0.patch
Patch19: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-2.1.9-menuselection.patch.gz
-Patch20: http://projects.vdr-developer.org/git/vdr-plugin-epg2vdr.git/plain/patches/epghandler-segment-transfer.patch
BuildRequires: libjpeg-devel
BuildRequires: libcap-devel
@@ -85,6 +84,7 @@ BuildRequires: freetype-devel
BuildRequires: gettext
# systemd >= 186 for scriptlet macros
BuildRequires: systemd >= 186
+BuildRequires: systemd-devel
%if %{with docs}
BuildRequires: doxygen
BuildRequires: graphviz
@@ -198,8 +198,6 @@ sed \
#patch17 -p0 -F 3
%patch18 -p1
%patch19 -p1
-# TODO: causes crashes at startup
-#patch20 -p0
for f in CONTRIBUTORS HISTORY UPDATE-1.4.0 README.timer-info \
PLUGINS/src/dvbhddevice/HISTORY; do
@@ -259,6 +257,7 @@ LIBDIR = \$(PLUGINLIBDIR)
PLGCFG = \$(LIBDIR)/plugins.mk
LIRC_DEVICE = %{_localstatedir}/run/lirc/lircd
VDR_USER = \$(shell pkg-config vdr --variable=user)
+SDNOTIFY = 1
EOF
cat << EOF > plugins.mk
@@ -558,6 +557,10 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
%changelog
+* Thu Feb 19 2015 Ville Skyttä <ville.skytta at iki.fi> - 2.2.0-2
+- Enable systemd notification support
+- Refresh some patches
+
* Thu Feb 19 2015 Ville Skyttä <ville.skytta at iki.fi> - 2.2.0-1
- Update to 2.2.0
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/vdr.git/commit/?h=f22&id=de859eeb672b9ad7fae0b9cd593df4838ba22c29
More information about the scm-commits
mailing list