diff --git a/packages/3rdparty/multimedia/vdr-xmltv2vdr/build b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/build similarity index 100% rename from packages/3rdparty/multimedia/vdr-xmltv2vdr/build rename to packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/build diff --git a/packages/3rdparty/multimedia/vdr-xmltv2vdr/meta b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta similarity index 87% rename from packages/3rdparty/multimedia/vdr-xmltv2vdr/meta rename to packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta index 22b97d5889..72ec50c41d 100644 --- a/packages/3rdparty/multimedia/vdr-xmltv2vdr/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta @@ -18,13 +18,13 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="vdr-xmltv2vdr" -PKG_VERSION="0.1.1" +PKG_NAME="vdr-plugin-xmltv2vdr" +PKG_VERSION="8be374e781e734b44edbd6bc03cfdc1694f6617e" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr" -PKG_URL="http://projects.vdr-developer.org/attachments/download/946/${PKG_NAME}-${PKG_VERSION}.tgz" +PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-xmltv2vdr.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS="vdr sqlite curl libzip libxml libxslt" PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml libxslt enca" PKG_PRIORITY="optional" diff --git a/packages/3rdparty/multimedia/vdr-xmltv2vdr/patches/vdr-xmltv2vdr-0.1.1-curl_compile-01.patch b/packages/3rdparty/multimedia/vdr-xmltv2vdr/patches/vdr-xmltv2vdr-0.1.1-curl_compile-01.patch deleted file mode 100644 index 91a187224c..0000000000 --- a/packages/3rdparty/multimedia/vdr-xmltv2vdr/patches/vdr-xmltv2vdr-0.1.1-curl_compile-01.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -NaurwB xmltv2vdr-0.1.1_orig/dist/epgdata2xmltv/epgdata2xmltv.h xmltv2vdr-0.1.1/dist/epgdata2xmltv/epgdata2xmltv.h ---- xmltv2vdr-0.1.1_orig/dist/epgdata2xmltv/epgdata2xmltv.h 2012-05-07 07:34:21.000000000 +0200 -+++ xmltv2vdr-0.1.1/dist/epgdata2xmltv/epgdata2xmltv.h 2012-05-07 07:34:36.000000000 +0200 -@@ -7,7 +7,6 @@ - #define __EPGDATA2XMLTV_H - - #include --#include - #include - - #include diff --git a/packages/3rdparty/multimedia/vdr-xmltv2vdr/rename b/packages/3rdparty/multimedia/vdr-xmltv2vdr/rename deleted file mode 100755 index b7dc45b6cf..0000000000 --- a/packages/3rdparty/multimedia/vdr-xmltv2vdr/rename +++ /dev/null @@ -1,26 +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 xmltv2vdr-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION} diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index 4ebf287c03..b9d13a98c6 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -43,7 +43,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv - cp $BUILD/vdr-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv/ + cp $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv/ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin @@ -60,7 +60,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/rotorng-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-control-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-epgsearch*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $BUILD/vdr-xmltv2vdr*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin + cp -PR $BUILD/vdr-plugin-xmltv2vdr*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-xineliboutput-[0-9]*/libvdr*.so.1.7.27 $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-text2skin-[0-9]*/libvdr*.so.1.7.27 $ADDON_BUILD/$PKG_ADDON_ID/plugin @@ -74,7 +74,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $BUILD/vdr-[0-9]*/vdr $ADDON_BUILD/$PKG_ADDON_ID/bin/vdr.bin - cp -P $BUILD/vdr-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib cp -P $BUILD/attr-[0-9]*/libattr/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index a64ee532b8..b7aa917311 100644 --- a/packages/addons/service/multimedia/vdr-addon/meta +++ b/packages/addons/service/multimedia/vdr-addon/meta @@ -27,7 +27,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-xmltv2vdr vdr-xineliboutput vdr-text2skin vdr-skinanthra_1280_OS" +PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-xineliboutput vdr-text2skin vdr-skinanthra_1280_OS" PKG_PRIORITY="optional" PKG_SECTION="service.multimedia" PKG_SHORTDESC="vdr: A powerful DVB TV application"