From 584b311f046c1da331245170a246e7119a88293b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 13 Feb 2013 20:36:35 +0200 Subject: [PATCH] vdr-epgsearch: update to vdr-epgsearch-0fc4817 --- .../3rdparty/multimedia/vdr-epgsearch/meta | 4 +- .../vdr-epgsearch-1.0.0-vdr_1.7.25-01.patch | 46 ------------------- .../3rdparty/multimedia/vdr-epgsearch/rename | 27 ----------- 3 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-1.0.0-vdr_1.7.25-01.patch delete mode 100755 packages/3rdparty/multimedia/vdr-epgsearch/rename 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-epgsearch/rename b/packages/3rdparty/multimedia/vdr-epgsearch/rename deleted file mode 100755 index cc1d8bcc58..0000000000 --- a/packages/3rdparty/multimedia/vdr-epgsearch/rename +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $BUILD -#mv epgsearch-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION} -mv epgsearch-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION}