From 4f9e5ca21b25269cf3c14cbfc39cc5e47e0aa8df Mon Sep 17 00:00:00 2001 From: "Michael Mair-Keimberger (asterix)" Date: Thu, 5 Jan 2017 19:38:39 +0100 Subject: [PATCH] media-plugins/vdr-live: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3338 --- .../files/vdr-1.7.28-compatibility.patch | 44 ------------------- .../vdr-live/files/vdr-live_pcre.patch | 26 ----------- 2 files changed, 70 deletions(-) delete mode 100644 media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch delete mode 100644 media-plugins/vdr-live/files/vdr-live_pcre.patch diff --git a/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch b/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch deleted file mode 100644 index d95ebd748c73..000000000000 --- a/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e154fec60a27d5a74e6940941f789e17d7169d54 Mon Sep 17 00:00:00 2001 -From: Christian Ruppert -Date: Mon, 4 Jun 2012 01:42:31 +0200 -Subject: [PATCH] Compile fix for >=vdr-1.7.28 - ---- - tasks.cpp | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/tasks.cpp b/tasks.cpp -index 9f20190..2a2b8d5 100644 ---- a/tasks.cpp -+++ b/tasks.cpp -@@ -60,9 +60,15 @@ void PlayRecordingTask::Action() - - const char *current = NowReplaying(); - if (!current || (0 != strcmp(current, recording->FileName()))) { -+#if VDRVERSNUM >= 10728 -+ cReplayControl::SetRecording( 0 ); -+ cControl::Shutdown(); -+ cReplayControl::SetRecording( recording->FileName() ); -+#else - cReplayControl::SetRecording( 0, 0 ); - cControl::Shutdown(); - cReplayControl::SetRecording( recording->FileName(), recording->Title() ); -+#endif - cControl::Launch( new cReplayControl ); - cControl::Attach(); - } -@@ -122,7 +128,11 @@ void StopRecordingTask::Action() - return; - } - -+#if VDRVERSNUM >= 10728 -+ cReplayControl::SetRecording( 0 ); -+#else - cReplayControl::SetRecording( 0, 0 ); -+#endif - cControl::Shutdown(); - } - --- -1.7.3.4 - diff --git a/media-plugins/vdr-live/files/vdr-live_pcre.patch b/media-plugins/vdr-live/files/vdr-live_pcre.patch deleted file mode 100644 index 9767cca173a5..000000000000 --- a/media-plugins/vdr-live/files/vdr-live_pcre.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6b2965a86a20c885fc1fae8d4dea24b29b38805e Mon Sep 17 00:00:00 2001 -From: Christian Ruppert -Date: Mon, 4 Jun 2012 02:29:55 +0200 -Subject: [PATCH] Make PCRE optional - ---- - pages/recordings.ecpp | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp -index ebd57e0..8bdad66 100644 ---- a/pages/recordings.ecpp -+++ b/pages/recordings.ecpp -@@ -1,6 +1,9 @@ - <%pre> - #include -+ -+#ifdef HAVE_LIBPCRECPP - #include -+#endif - - #include - #include --- -1.7.3.4 - -- 2.26.2