diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/meta b/packages/3rdparty/multimedia/vdr-epgsearch/meta index f1a1313889..6df7ca695f 100644 --- a/packages/3rdparty/multimedia/vdr-epgsearch/meta +++ b/packages/3rdparty/multimedia/vdr-epgsearch/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="vdr-epgsearch" -PKG_VERSION="1.0.0" +PKG_VERSION="0fc4817" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://winni.vdr-developer.org/epgsearch/" -PKG_URL="http://winni.vdr-developer.org/epgsearch/downloads/${PKG_NAME}-${PKG_VERSION}.tgz" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="vdr" PKG_BUILD_DEPENDS="toolchain vdr" PKG_PRIORITY="optional" diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-1.0.0-vdr_1.7.25-01.patch b/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-1.0.0-vdr_1.7.25-01.patch deleted file mode 100644 index e8c1b8b507..0000000000 --- a/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-1.0.0-vdr_1.7.25-01.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 15d08ffb09de612ae1eb53b2aeca2f906f7076a6 Mon Sep 17 00:00:00 2001 -From: Christian Wieninger -Date: Sun, 04 Mar 2012 08:44:19 +0000 -Subject: support for vdr 1.7.25 - ---- -diff --git a/Makefile b/Makefile -index 0397217..4a72b41 100644 ---- a/Makefile -+++ b/Makefile -@@ -64,7 +64,7 @@ CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -Wno-format-y2k - - ### The directory environment: - --DVBDIR = ../../../../DVB -+#DVBDIR = ../../../../DVB - VDRDIR = ../../.. - LIBDIR = ../../lib - TMPDIR = /tmp -diff --git a/conflictcheck.h b/conflictcheck.h -index fcc6dcb..7e6fb7a 100644 ---- a/conflictcheck.h -+++ b/conflictcheck.h -@@ -163,12 +163,20 @@ class cConflictCheckDevice - result = true; - #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE - else -+#if APIVERSNUM < 10725 - result = Priority >= Setup.PrimaryLimit; -+#else -+ result = Priority >= 0; -+#endif - #endif - #endif - } - else -+#if APIVERSNUM < 10725 - result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit; -+#else -+ result = !IsPrimaryDevice() || Priority >= 0; -+#endif - } - else - needsDetachReceivers = true; --- -cgit v0.9.0.2-39-g756e diff --git a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-05_do-not-use-the-direct-access-to-crecoding.patch b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-05_do-not-use-the-direct-access-to-crecoding.patch new file mode 100644 index 0000000000..a7c143e7e2 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-05_do-not-use-the-direct-access-to-crecoding.patch @@ -0,0 +1,50 @@ +From 94a0a210a485ce1fc95c47a6bc67c4c16c89a0f9 Mon Sep 17 00:00:00 2001 +From: Dieter Hametner +Date: Sun, 25 Mar 2012 14:42:12 +0000 +Subject: Updated LIVE to latest changes in vdr 1.7.27 + +- Do not use the direct access to cRecoding members any more. +--- +diff --git a/epg_events.cpp b/epg_events.cpp +index a514769..cd4996e 100644 +--- a/epg_events.cpp ++++ b/epg_events.cpp +@@ -182,12 +182,20 @@ namespace vdrlive + + time_t EpgRecording::GetStartTime() const + { ++#if VDRVERSNUM < 10726 + return m_recording ? m_recording->start : 0; ++#else ++ return m_recording ? m_recording->Start() : 0; ++#endif + } + + time_t EpgRecording::GetEndTime() const + { ++#if VDRVERSNUM < 10726 + return m_recording ? m_recording->start : 0; ++#else ++ return m_recording ? m_recording->Start() : 0; ++#endif + } + + const string EpgRecording::Name() const +diff --git a/recman.cpp b/recman.cpp +index fb315d2..6a2fc00 100644 +--- a/recman.cpp ++++ b/recman.cpp +@@ -383,7 +383,11 @@ namespace vdrlive { + + time_t RecordingsItemRec::StartTime() const + { ++#if VDRVERSNUM < 10726 + return m_recording->start; ++#else ++ return m_recording->Start(); ++#endif + } + + long RecordingsItemRec::Duration() const +-- +cgit v0.9.0.2-40-g7c79 diff --git a/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-06_compile-fix-for-vdr.1.7.28+.patch b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-06_compile-fix-for-vdr.1.7.28+.patch new file mode 100644 index 0000000000..38dc1a5f81 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-06_compile-fix-for-vdr.1.7.28+.patch @@ -0,0 +1,40 @@ +From c3ecf9fabb674bc154f5a08cdd62e74e2b5d0e36 Mon Sep 17 00:00:00 2001 +From: Christian Ruppert +Date: Sun, 03 Jun 2012 23:42:31 +0000 +Subject: Compile fix for >=vdr-1.7.28 + +--- +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(); + } + +-- +cgit v0.9.0.2-40-g7c79 diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/rename b/tools/mkpkg/mkpkg_vdr-epgsearch similarity index 64% rename from packages/3rdparty/multimedia/vdr-epgsearch/rename rename to tools/mkpkg/mkpkg_vdr-epgsearch index cc1d8bcc58..3d389f53b0 100755 --- a/packages/3rdparty/multimedia/vdr-epgsearch/rename +++ b/tools/mkpkg/mkpkg_vdr-epgsearch @@ -1,5 +1,4 @@ #!/bin/sh - ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) @@ -20,8 +19,25 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 +echo "getting sources..." + if [ ! -d vdr-epgsearch.git ]; then + git clone git://projects.vdr-developer.org/vdr-plugin-epgsearch.git vdr-epgsearch.git + fi -cd $BUILD -#mv epgsearch-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION} -mv epgsearch-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION} + cd vdr-epgsearch.git + git pull + GIT_REV=`git log -n1 --format=%h` + cd .. + +echo "copying sources..." + rm -rf vdr-epgsearch-$GIT_REV + cp -R vdr-epgsearch.git vdr-epgsearch-$GIT_REV + +echo "cleaning sources..." + rm -rf vdr-epgsearch-$GIT_REV/.git + +echo "packing sources..." + tar cvJf vdr-epgsearch-$GIT_REV.tar.xz vdr-epgsearch-$GIT_REV + +echo "remove temporary sourcedir..." + rm -rf vdr-epgsearch-$GIT_REV