From ca740f50564770dfe796e704cf486fd995226f30 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 29 May 2011 20:41:19 +0200 Subject: [PATCH 1/7] SickBeard: remove for reworking Signed-off-by: Stephan Raue --- .../addons/downloadmanager/SickBeard/addon | 30 ----- .../downloadmanager/SickBeard/changelog.txt | 2 - .../downloadmanager/SickBeard/icon/icon.png | Bin 35061 -> 0 bytes .../addons/downloadmanager/SickBeard/meta | 40 ------ ..._update-header_and_donate_button-0.1.patch | 44 ------- ...af04-002-remove_default_settings-0.3.patch | 74 ----------- .../SickBeard/source/bin/ini_tool | 117 ------------------ .../SickBeard/source/default.py | 26 ---- .../downloadmanager/SickBeard/source/start.sh | 111 ----------------- 9 files changed, 444 deletions(-) delete mode 100755 packages/addons/downloadmanager/SickBeard/addon delete mode 100644 packages/addons/downloadmanager/SickBeard/changelog.txt delete mode 100644 packages/addons/downloadmanager/SickBeard/icon/icon.png delete mode 100644 packages/addons/downloadmanager/SickBeard/meta delete mode 100644 packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-001-remove_logo_update-header_and_donate_button-0.1.patch delete mode 100644 packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-002-remove_default_settings-0.3.patch delete mode 100755 packages/addons/downloadmanager/SickBeard/source/bin/ini_tool delete mode 100644 packages/addons/downloadmanager/SickBeard/source/default.py delete mode 100755 packages/addons/downloadmanager/SickBeard/source/start.sh diff --git a/packages/addons/downloadmanager/SickBeard/addon b/packages/addons/downloadmanager/SickBeard/addon deleted file mode 100755 index 9b37c454b5..0000000000 --- a/packages/addons/downloadmanager/SickBeard/addon +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com) -# -# 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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1 - cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib - cp -R $BUILD/Cheetah*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib \ No newline at end of file diff --git a/packages/addons/downloadmanager/SickBeard/changelog.txt b/packages/addons/downloadmanager/SickBeard/changelog.txt deleted file mode 100644 index 7b85927133..0000000000 --- a/packages/addons/downloadmanager/SickBeard/changelog.txt +++ /dev/null @@ -1,2 +0,0 @@ -0.99.1 -- initial version SickBeard-48caf04 \ No newline at end of file diff --git a/packages/addons/downloadmanager/SickBeard/icon/icon.png b/packages/addons/downloadmanager/SickBeard/icon/icon.png deleted file mode 100644 index 682044c5cc5666d90700da2dba57ca720c995019..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35061 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 diff --git a/packages/addons/downloadmanager/SickBeard/meta b/packages/addons/downloadmanager/SickBeard/meta deleted file mode 100644 index 4f9ca06405..0000000000 --- a/packages/addons/downloadmanager/SickBeard/meta +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com) -# -# 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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="SickBeard" -PKG_VERSION="48caf04" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="https://github.com/midgetspy/Sick-Beard" -PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS="Python SABnzbd Cheetah" -PKG_BUILD_DEPENDS="toolchain Python Cheetah" -PKG_PRIORITY="optional" -PKG_SECTION="downloadmanager" -PKG_SHORTDESC="SickBeard: automated TV show downloading." -PKG_LONGDESC="SickBeard: automated TV show downloading." - -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.service" -PKG_ADDON_REQUIRES="addon.downloadmanager.SABnzbd:0.99.1" - -PKG_AUTORECONF="no" diff --git a/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-001-remove_logo_update-header_and_donate_button-0.1.patch b/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-001-remove_logo_update-header_and_donate_button-0.1.patch deleted file mode 100644 index a8608033aa..0000000000 --- a/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-001-remove_logo_update-header_and_donate_button-0.1.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur SickBeard-48caf04/data/interfaces/default/config.tmpl SickBeard-48caf04.patch/data/interfaces/default/config.tmpl ---- SickBeard-48caf04/data/interfaces/default/config.tmpl 2011-04-22 19:15:10.000000000 +0200 -+++ SickBeard-48caf04.patch/data/interfaces/default/config.tmpl 2011-04-23 03:57:14.515808144 +0200 -@@ -24,9 +24,4 @@ - - - -- -- -- --
[donate]Sickbeard is free, but you can contribute by giving a donation.
-- - #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl") -diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl ---- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl 2011-04-22 19:15:10.000000000 +0200 -+++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl 2011-04-23 03:59:09.088665913 +0200 -@@ -147,19 +147,6 @@ - - - --#if $sickbeard.NEWEST_VERSION_STRING: --

--
-- $sickbeard.NEWEST_VERSION_STRING --
--
--
--#end if -- - - #if $varExists('submenu'): - - -- --
--
--

Libnotify Libnotify

--

The standard desktop notification API for Linux/*nix systems. This notifier will only function if the pynotify module is installed (Ubuntu/Debian package python-notify).

--
-- --
--
-- -- --
-- --
--
-- -- --
-- --
-- -- --
-- --
Click below to test.
-- -- -- --
-- --
--
-- -
- -
-diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl ---- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl 2011-04-23 03:59:09.000000000 +0200 -+++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl 2011-04-23 14:24:01.035048035 +0200 -@@ -172,7 +172,6 @@ - -
- --
--
--

$T('systemFolders')

--

$T('base-folder'):
$my_lcldata

--
--
--
-- -- -- --
--
-- -- --
--
-- -- --
--
--
-- -
-
-

 

-diff -Naur SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_general.tmpl SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_general.tmpl ---- SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_general.tmpl 2011-04-10 16:06:26.000000000 +0200 -+++ SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_general.tmpl 2011-04-22 14:59:06.304131312 +0200 -@@ -14,82 +14,6 @@ -
-
-
-- -- --
--
-- -- --
--
-- -- --
--
-- -- --
--
-- -- --
--
-- -- --
--
- --
-
-
- -@@ -152,36 +69,6 @@ - $T('explain-enable_https') - -
--
-- -- --
--
-- -- --
--
-- -- --
- - - -diff -Naur SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_switches.tmpl SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_switches.tmpl ---- SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_switches.tmpl 2011-04-10 16:06:26.000000000 +0200 -+++ SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_switches.tmpl 2011-04-22 15:21:32.791455752 +0200 -@@ -12,20 +12,6 @@ -

$T('swtag-general')

- -
--
-- 0 then "checked=1" else ""#--> /> -- --
--
-- 0 then "checked=1" else ""#--> /> -- --
- -
- 0 then "checked=1" else ""#--> /> diff --git a/packages/addons/downloadmanager/SABnzbd/source/bin/ini_tool b/packages/addons/downloadmanager/SABnzbd/source/bin/ini_tool deleted file mode 100755 index 97f7b4c433..0000000000 --- a/packages/addons/downloadmanager/SABnzbd/source/bin/ini_tool +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env python - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2011 Travis Glenn Hansen (travisghansen@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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -from configobj import ConfigObj -import sys -import os -import string - -python_major = sys.version_info[0] -python_minor = sys.version_info[1] - -prog="ini_tool" -description="""Read/Write config files. - -Examples: - %(prog)s --file config.ini --action read --option [section:]username - %(prog)s --file config.ini --action write --option [section:]username --value foo""" % {'prog':prog} - -def option_required_error(option): - parser.print_usage() - print prog + ": error: " + option + " is required" - exit(2) - -if python_major > 2 or (python_major == 2 and python_minor >= 7): - import argparse - - parser = argparse.ArgumentParser( - prog=prog, - description=description, - formatter_class=argparse.RawDescriptionHelpFormatter, - ) - - parser.add_argument('--file', help='file to read/write to/from', required=True) - parser.add_argument('--action', help='read|write', required=True) - parser.add_argument('--option', help='the option key', required=True) - parser.add_argument('--value', help='value to store in the given option (only for write action)') - - options = parser.parse_args() - -else: - import optparse - - parser = optparse.OptionParser( - prog=prog, - description=description, - ) - - parser.add_option('--file', help='file to read/write to/from') - parser.add_option('--action', help='read|write') - parser.add_option('--option', help='the option key') - parser.add_option('--value', help='value to store in the given option (only for write action)') - - (options, args) = parser.parse_args() - - if not options.file: - option_required_error("--file") - if not options.action: - option_required_error("--action") - if not options.option: - option_required_error("--option") - - -if options.action != "read" and options.action != "write": - print "'" + options.action + "' is not a valid action" - parser.print_help() - exit(2) - -if options.action == "read" and not os.path.isfile(options.file): - print "'" + options.file + "' is not a file" - exit(2) - -config = ConfigObj(options.file) -keys = string.split(options.option, ":") -key_len = len(keys) -current_section = config - -if options.action == 'read': - i = 1 - for key in keys: - if i == key_len: - print current_section[key] - exit(0) - else: - current_section = current_section[key] - i += 1 -elif options.action == 'write': - i = 1 - for key in keys: - if i == key_len: - current_section[key] = options.value - elif key not in current_section: - current_section[key] = {} - current_section = current_section[key] - i += 1 - - config.write() -else: - exit(1) \ No newline at end of file diff --git a/packages/addons/downloadmanager/SABnzbd/source/default.py b/packages/addons/downloadmanager/SABnzbd/source/default.py deleted file mode 100644 index 5f07881ccc..0000000000 --- a/packages/addons/downloadmanager/SABnzbd/source/default.py +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -import sys -import xbmcaddon -import os - -if ( __name__ == "__main__" ): - os.system("sh start.sh") diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml deleted file mode 100644 index 69ffefaeb3..0000000000 --- a/packages/addons/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd - Gebruikers instellingen - Gebruikersnaam - Wachtwoord - Netwerk instellingen - Toegestane IP adressen - - diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/English/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/English/strings.xml deleted file mode 100644 index 68cb162a30..0000000000 --- a/packages/addons/downloadmanager/SABnzbd/source/resources/language/English/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd - User Settings - Username - Password - Network Settings - Allowed IP addresses - - diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/French/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/French/strings.xml deleted file mode 100644 index fb3f0fc1f9..0000000000 --- a/packages/addons/downloadmanager/SABnzbd/source/resources/language/French/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd - Préférences utilisateur - Nom d'utilisateur - Mot de passe - Préférences réseau - Adresses IP autorisées - - diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/German/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/German/strings.xml deleted file mode 100644 index ad209d26c7..0000000000 --- a/packages/addons/downloadmanager/SABnzbd/source/resources/language/German/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd - Benutzer Einstellungen - Benutzername - Passwort - Netzwerk Einstellungen - Erlaubte IP Adressen - - diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml deleted file mode 100644 index a70961eb4c..0000000000 --- a/packages/addons/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd - Bruker Instillinger - Brukernavn - Passord - Nettverksinstillinger - Tilatte IP addresser - - diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/settings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/settings.xml deleted file mode 100644 index 8ee2bb0ab2..0000000000 --- a/packages/addons/downloadmanager/SABnzbd/source/resources/settings.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/packages/addons/downloadmanager/SABnzbd/source/start.sh b/packages/addons/downloadmanager/SABnzbd/source/start.sh deleted file mode 100755 index c272b269d3..0000000000 --- a/packages/addons/downloadmanager/SABnzbd/source/start.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -export PATH="$PATH:./bin" -export PYTHONPATH="$PYTHONPATH:./pylib" - -SABNZBD_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.SABnzbd" -SABNZBD_SETTINGS="$SABNZBD_HOME/settings.xml" - -SABNZBD_DISABLEAPIKEY="0" -SABNZBD_CHECKRELEASE="0" -SABNZBD_LAUNCHBROWSER="0" - -SABNZBD_HTTPPORT="8081" -SABNZBD_HTTPSPORT="9081" -SABNZBD_HTTPSCERT="server.cert" -SABNZBD_HTTPSKEY="server.key" - -SABNZBD_SKIN="Plush" -SABNZBD_SKIN2="Plush" -SABNZBD_WEBCOLOR="gold" -SABNZBD_WEBCOLOR2="gold" - -SABNZBD_LOGDIR="logs" -SABNZBD_ADMINDIR="admin" -SABNZBD_BACKUPDIR="backup" - -SABNZBD_INCOMPLETEDIR="/storage/downloads/incomplete" -SABNZBD_COMPLETEDIR="/storage/downloads" -SABNZBD_WATCHDIR="/storage/downloads/watch" - -write_ini() { -python bin/ini_tool --action=write \ - --file=$SABNZBD_HOME/sabnzbd.ini \ - --option="$1:$2" \ - --value="$3" -} - -mkdir -p $SABNZBD_HOME -chmod +x ./bin/* - -if [ ! -f "$SABNZBD_SETTINGS" ]; then - cp settings-default.xml $SABNZBD_SETTINGS -fi - -if [ ! -f "$SABNZBD_HOME/sabnzbd.ini" ]; then - SABNZBD_FIRSTRUN="yes" -fi - -# use settings from xbmc setup dialog -SABNZBD_USER=`grep SABNZBD_USER $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` -SABNZBD_PWD=`grep SABNZBD_PWD $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` -SABNZBD_IP=`grep SABNZBD_IP $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` - -if [ -z "$SABNZBD_IP" ]; then - SABNZBD_IP="0.0.0.0" -fi - -write_ini misc disable_api_key $SABNZBD_DISABLEAPIKEY -write_ini misc check_new_rel $SABNZBD_CHECKRELEASE -write_ini misc auto_browser $SABNZBD_LAUNCHBROWSER -write_ini misc username $SABNZBD_USER -write_ini misc password $SABNZBD_PWD -write_ini misc port $SABNZBD_HTTPPORT -write_ini misc https_port $SABNZBD_HTTPSPORT -write_ini misc https_cert $SABNZBD_HTTPSCERT -write_ini misc https_key $SABNZBD_HTTPSKEY -write_ini misc host $SABNZBD_IP -write_ini misc web_dir $SABNZBD_SKIN -write_ini misc web_dir2 $SABNZBD_SKIN2 -write_ini misc web_color $SABNZBD_WEBCOLOR -write_ini misc web_color2 $SABNZBD_WEBCOLOR2 -write_ini misc log_dir $SABNZBD_LOGDIR -write_ini misc admin_dir $SABNZBD_ADMINDIR -write_ini misc nzb_backup_dir $SABNZBD_BACKUPDIR - -if [ "$SABNZBD_FIRSTRUN" = "yes" ]; then - mkdir -p "$SABNZBD_INCOMPLETEDIR" - mkdir -p "$SABNZBD_COMPLETEDIR" - mkdir -p "$SABNZBD_WATCHDIR" - write_ini misc download_dir $SABNZBD_INCOMPLETEDIR - write_ini misc complete_dir $SABNZBD_COMPLETEDIR - write_ini misc dirscan_dir $SABNZBD_WATCHDIR - - write_ini servers:localhost name "localhost" - write_ini servers:localhost host "localhost" - write_ini servers:localhost port "119" - write_ini servers:localhost enable "0" -fi - -python ./SABnzbd/SABnzbd.py -d -f $SABNZBD_HOME/sabnzbd.ini -l 0 From 65fdd6b38a4755fb1ed37e15bd9cd12561ae1934 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 29 May 2011 20:41:58 +0200 Subject: [PATCH 3/7] CouchPotato: remove for reworking Signed-off-by: Stephan Raue --- .../addons/downloadmanager/CouchPotato/addon | 28 --- .../downloadmanager/CouchPotato/changelog.txt | 2 - .../downloadmanager/CouchPotato/icon/icon.png | Bin 5749 -> 0 bytes .../addons/downloadmanager/CouchPotato/meta | 40 ---- ...0-add_datadir_and_config_support-0.1.patch | 186 ------------------ .../CouchPotato/source/bin/ini_tool | 117 ----------- .../CouchPotato/source/default.py | 26 --- .../CouchPotato/source/start.sh | 102 ---------- 8 files changed, 501 deletions(-) delete mode 100755 packages/addons/downloadmanager/CouchPotato/addon delete mode 100644 packages/addons/downloadmanager/CouchPotato/changelog.txt delete mode 100644 packages/addons/downloadmanager/CouchPotato/icon/icon.png delete mode 100644 packages/addons/downloadmanager/CouchPotato/meta delete mode 100644 packages/addons/downloadmanager/CouchPotato/patches/CouchPotato-ded60e1-000-add_datadir_and_config_support-0.1.patch delete mode 100755 packages/addons/downloadmanager/CouchPotato/source/bin/ini_tool delete mode 100644 packages/addons/downloadmanager/CouchPotato/source/default.py delete mode 100755 packages/addons/downloadmanager/CouchPotato/source/start.sh diff --git a/packages/addons/downloadmanager/CouchPotato/addon b/packages/addons/downloadmanager/CouchPotato/addon deleted file mode 100755 index a6d6b3cab7..0000000000 --- a/packages/addons/downloadmanager/CouchPotato/addon +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com) -# -# 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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1 - cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1 - diff --git a/packages/addons/downloadmanager/CouchPotato/changelog.txt b/packages/addons/downloadmanager/CouchPotato/changelog.txt deleted file mode 100644 index feb3355a71..0000000000 --- a/packages/addons/downloadmanager/CouchPotato/changelog.txt +++ /dev/null @@ -1,2 +0,0 @@ -0.99.1 -- initial version CouchPotato diff --git a/packages/addons/downloadmanager/CouchPotato/icon/icon.png b/packages/addons/downloadmanager/CouchPotato/icon/icon.png deleted file mode 100644 index d189fe8ba2f4840e448bee3bb10971c2d07a4090..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5749 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 diff --git a/packages/addons/downloadmanager/CouchPotato/meta b/packages/addons/downloadmanager/CouchPotato/meta deleted file mode 100644 index e4f92d7d35..0000000000 --- a/packages/addons/downloadmanager/CouchPotato/meta +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com) -# -# 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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="CouchPotato" -PKG_VERSION="ded60e1" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="https://github.com/RuudBurger/CouchPotato" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="Python SABnzbd" -PKG_BUILD_DEPENDS="toolchain Python" -PKG_PRIORITY="optional" -PKG_SECTION="downloadmanager" -PKG_SHORTDESC="CouchPotato: automated movie downloading." -PKG_LONGDESC="CouchPotato: automated movie downloading." - -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.service" -PKG_ADDON_REQUIRES="addon.downloadmanager.SABnzbd:0.99.1" - -PKG_AUTORECONF="no" diff --git a/packages/addons/downloadmanager/CouchPotato/patches/CouchPotato-ded60e1-000-add_datadir_and_config_support-0.1.patch b/packages/addons/downloadmanager/CouchPotato/patches/CouchPotato-ded60e1-000-add_datadir_and_config_support-0.1.patch deleted file mode 100644 index afa884f705..0000000000 --- a/packages/addons/downloadmanager/CouchPotato/patches/CouchPotato-ded60e1-000-add_datadir_and_config_support-0.1.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff -Naur CouchPotato-ded60e1/app/config/db.py CouchPotato-ded60e1.patch/app/config/db.py ---- CouchPotato-ded60e1/app/config/db.py 2011-04-23 19:55:33.000000000 +0200 -+++ CouchPotato-ded60e1.patch/app/config/db.py 2011-04-23 20:26:44.495557932 +0200 -@@ -10,6 +10,7 @@ - import datetime - import os - import sys -+import app.config - - log = CPLog(__name__) - -@@ -24,7 +25,7 @@ - else: - path = os.path.join(os.path.abspath(os.path.curdir), 'data.db') - else: -- path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), 'data.db') -+ path = os.path.join(app.config.DATADIR, 'data.db') - - engine = create_engine('sqlite:///%s' % path) - metadata = MetaData(engine) -diff -Naur CouchPotato-ded60e1/app/config/__init__.py CouchPotato-ded60e1.patch/app/config/__init__.py ---- CouchPotato-ded60e1/app/config/__init__.py 2011-04-23 19:55:33.000000000 +0200 -+++ CouchPotato-ded60e1.patch/app/config/__init__.py 2011-04-23 20:26:44.480558230 +0200 -@@ -0,0 +1 @@ -+DATADIR=None -diff -Naur CouchPotato-ded60e1/app/controllers/log.py CouchPotato-ded60e1.patch/app/controllers/log.py ---- CouchPotato-ded60e1/app/controllers/log.py 2011-04-23 19:55:33.000000000 +0200 -+++ CouchPotato-ded60e1.patch/app/controllers/log.py 2011-04-23 20:26:44.505557734 +0200 -@@ -4,6 +4,7 @@ - from markupsafe import escape - import cherrypy - import os -+import app.config - - log = CPLog(__name__) - file = 'CouchPotato.log' -@@ -56,7 +57,7 @@ - return redirect(url(controller = 'log', action = 'index')) - - def logDir(self): -- return os.path.join(cherrypy.config.get('runPath'), 'logs') -+ return os.path.join(app.config.DATADIR, 'logs') - - def logFile(self): - return os.path.join(self.logDir(), file) -diff -Naur CouchPotato-ded60e1/CouchPotato.py CouchPotato-ded60e1.patch/CouchPotato.py ---- CouchPotato-ded60e1/CouchPotato.py 2011-04-23 19:55:33.000000000 +0200 -+++ CouchPotato-ded60e1.patch/CouchPotato.py 2011-04-23 20:26:50.127445945 +0200 -@@ -3,6 +3,7 @@ - import os - - rundir = os.path.dirname(os.path.abspath(__file__)) -+ - try: - frozen = sys.frozen - except AttributeError: -@@ -20,28 +21,9 @@ - sys.path.insert(0, path_base) - sys.path.insert(0, os.path.join(path_base, 'library')) - --# Configure logging --from app.config.cplog import CPLog --debug = os.path.isfile(os.path.join(path_base, 'debug.conf')) --log = CPLog() --log.config(os.path.join(rundir, 'logs'), debug) -- --# Create cache dir --cachedir = os.path.join(rundir, 'cache') --if not os.path.isdir(cachedir): -- os.mkdir(cachedir) -- --import cherrypy --import app.config.render --from app.config.db import initDb --from optparse import OptionParser --from app.config.configApp import configApp --from app.config.routes import setup as Routes --from app.lib.cron import CronJobs --from app.config.updater import Updater --from cherrypy.process import plugins -- - def server_start(): -+ from optparse import OptionParser -+ - p = OptionParser() - p.add_option('-d', action = "store_true", - dest = 'daemonize', help = "Run the server as a daemon") -@@ -50,19 +32,80 @@ - p.add_option('-p', '--pidfile', - dest = 'pidfile', default = None, - help = "Store the process id in the given file") -+ p.add_option('--config', -+ dest = 'config', default = None, -+ help = "Path to config.ini file") -+ p.add_option('--datadir', -+ dest = 'datadir', default = None, -+ help = "Path to the data directory") -+ - - options, args = p.parse_args() -+ -+ if options.datadir: -+ datadir = options.datadir -+ -+ if not os.path.isdir(datadir): -+ os.makedirs(datadir) -+ -+ else: -+ datadir = rundir -+ -+ datadir = os.path.abspath(datadir) -+ -+ if not os.access(datadir, os.W_OK): -+ raise SystemExit("Data dir must be writeable '" + datadir + "'") -+ -+ import app.config -+ app.config.DATADIR = datadir -+ -+ if options.config: -+ config = options.config -+ else: -+ config = os.path.join(datadir, 'config.ini') -+ -+ config = os.path.abspath(config) - -- config = os.path.join(rundir, 'config.ini') -+ if not os.access(os.path.dirname(config), os.W_OK) and not os.access(config, os.W_OK): -+ if not os.path.exists(os.path.dirname(config)): -+ os.makedirs(os.path.dirname(config)) -+ else: -+ raise SystemExit("Directory for config file must be writeable") -+ -+ import cherrypy -+ import app.config.render -+ -+ # Configure logging -+ from app.config.cplog import CPLog -+ -+ # Setup logging -+ debug = os.path.isfile(os.path.join(datadir, 'debug.conf')) -+ log = CPLog() -+ log.config(os.path.join(datadir, 'logs'), debug) -+ -+ # Create cache dir -+ cachedir = os.path.join(datadir, 'cache') -+ if not os.path.isdir(cachedir): -+ os.mkdir(cachedir) - - # Stop logging - if options.quiet or options.daemonize: - cherrypy.config.update({'log.screen': False}) -+ - - # Config app -+ from app.config.configApp import configApp - ca = configApp(config) -+ -+ # Setup db -+ from app.config.db import initDb - initDb() - -+ from app.config.routes import setup as Routes -+ from app.lib.cron import CronJobs -+ from app.config.updater import Updater -+ from cherrypy.process import plugins -+ - # Check an see if CP is already running - import socket - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) -@@ -129,7 +172,7 @@ - }, - '/cache':{ - 'tools.staticdir.on': True, -- 'tools.staticdir.root': rundir, -+ 'tools.staticdir.root': datadir, - 'tools.staticdir.dir': "cache", - 'tools.expires.on': True, - 'tools.expires.secs': 3600 * 24 * 7 -@@ -173,7 +216,6 @@ - if hasattr(cherrypy.engine, "console_control_handler"): - cherrypy.engine.console_control_handler.subscribe() - -- - ## start the app - try: - cherrypy.engine.start() diff --git a/packages/addons/downloadmanager/CouchPotato/source/bin/ini_tool b/packages/addons/downloadmanager/CouchPotato/source/bin/ini_tool deleted file mode 100755 index 97f7b4c433..0000000000 --- a/packages/addons/downloadmanager/CouchPotato/source/bin/ini_tool +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env python - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2011 Travis Glenn Hansen (travisghansen@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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -from configobj import ConfigObj -import sys -import os -import string - -python_major = sys.version_info[0] -python_minor = sys.version_info[1] - -prog="ini_tool" -description="""Read/Write config files. - -Examples: - %(prog)s --file config.ini --action read --option [section:]username - %(prog)s --file config.ini --action write --option [section:]username --value foo""" % {'prog':prog} - -def option_required_error(option): - parser.print_usage() - print prog + ": error: " + option + " is required" - exit(2) - -if python_major > 2 or (python_major == 2 and python_minor >= 7): - import argparse - - parser = argparse.ArgumentParser( - prog=prog, - description=description, - formatter_class=argparse.RawDescriptionHelpFormatter, - ) - - parser.add_argument('--file', help='file to read/write to/from', required=True) - parser.add_argument('--action', help='read|write', required=True) - parser.add_argument('--option', help='the option key', required=True) - parser.add_argument('--value', help='value to store in the given option (only for write action)') - - options = parser.parse_args() - -else: - import optparse - - parser = optparse.OptionParser( - prog=prog, - description=description, - ) - - parser.add_option('--file', help='file to read/write to/from') - parser.add_option('--action', help='read|write') - parser.add_option('--option', help='the option key') - parser.add_option('--value', help='value to store in the given option (only for write action)') - - (options, args) = parser.parse_args() - - if not options.file: - option_required_error("--file") - if not options.action: - option_required_error("--action") - if not options.option: - option_required_error("--option") - - -if options.action != "read" and options.action != "write": - print "'" + options.action + "' is not a valid action" - parser.print_help() - exit(2) - -if options.action == "read" and not os.path.isfile(options.file): - print "'" + options.file + "' is not a file" - exit(2) - -config = ConfigObj(options.file) -keys = string.split(options.option, ":") -key_len = len(keys) -current_section = config - -if options.action == 'read': - i = 1 - for key in keys: - if i == key_len: - print current_section[key] - exit(0) - else: - current_section = current_section[key] - i += 1 -elif options.action == 'write': - i = 1 - for key in keys: - if i == key_len: - current_section[key] = options.value - elif key not in current_section: - current_section[key] = {} - current_section = current_section[key] - i += 1 - - config.write() -else: - exit(1) \ No newline at end of file diff --git a/packages/addons/downloadmanager/CouchPotato/source/default.py b/packages/addons/downloadmanager/CouchPotato/source/default.py deleted file mode 100644 index 08ea1c0de4..0000000000 --- a/packages/addons/downloadmanager/CouchPotato/source/default.py +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -import sys -import xbmcaddon -import os - -if ( __name__ == "__main__" ): - os.system("start.sh") diff --git a/packages/addons/downloadmanager/CouchPotato/source/start.sh b/packages/addons/downloadmanager/CouchPotato/source/start.sh deleted file mode 100755 index 7f956d88a2..0000000000 --- a/packages/addons/downloadmanager/CouchPotato/source/start.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com) -# -# 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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - - export PATH="$PATH:./bin" - export PYTHONPATH="$PYTHONPATH:./pylib" - - COUCHPOTATO_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.CouchPotato" - SABNZBD_SETTINGS="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.SABnzbd/sabnzbd.ini" - XBMC_SETTINGS="$HOME/.xbmc/userdata/guisettings.xml" - - write_ini() { - python bin/ini_tool --action=write \ - --file=$COUCHPOTATO_HOME/config.ini \ - --option="$1:$2" \ - --value="$3" - } - - read_sabconfig() { - python bin/ini_tool --action=read \ - --file=$SABNZBD_SETTINGS \ - --option="$1:$2" - } - - read_xbmcconfig() { - grep "<$1>" $XBMC_SETTINGS | sed -e "s,[[:space:]]*<$1>,," -e "s,,," - } - - mkdir -p $COUCHPOTATO_HOME - chmod +x ./bin/* - - sleep 5 - - if [ ! -f "$COUCHPOTATO_HOME/config.ini" ]; then - COUCHPOTATO_FIRSTRUN="yes" - fi - - # default values - COUCHPOTATO_LAUNCHBROWSER="False" - COUCHPOTATO_VERSIONCHECK="False" - COUCHPOTATO_PORT="8083" - COUCHPOTATO_USEXBMC="True" - COUCHPOTATO_UPDATEXBMC="True" - - # read xbmc settings - XBMC_HOST="127.0.0.1" - XBMC_PORT=`read_xbmcconfig webserverport` - XBMC_USER=`read_xbmcconfig webserverusername` - XBMC_PWD=`read_xbmcconfig webserverpassword` - - # read sabnzbd settings - SABNZBD_HOST="127.0.0.1" - SABNZBD_PORT="8081" - SABNZBD_APIKEY=`read_sabconfig misc api_key` - SABNZBD_WEBUSERNAME=`read_sabconfig misc username` - SABNZBD_WEBPASSWORD=`read_sabconfig misc password` - - if [ -z "$COUCHPOTATO_HOST" ]; then - COUCHPOTATO_HOST="0.0.0.0" - fi - - write_ini global host $COUCHPOTATO_HOST - write_ini global port $COUCHPOTATO_PORT - write_ini global username $SABNZBD_WEBUSERNAME - write_ini global password $SABNZBD_WEBPASSWORD - write_ini global launchbrowser $COUCHPOTATO_LAUNCHBROWSER - write_ini global updater $COUCHPOTATO_VERSIONCHECK - - write_ini Sabnzbd username $SABNZBD_WEBUSERNAME - write_ini Sabnzbd password $SABNZBD_WEBPASSWORD - write_ini Sabnzbd apikey $SABNZBD_APIKEY - write_ini Sabnzbd host "$SABNZBD_HOST:$SABNZBD_PORT" - - write_ini XBMC enabled $COUCHPOTATO_USEXBMC - write_ini XBMC host "$XBMC_HOST:$XBMC_PORT" - write_ini XBMC username $XBMC_USER - write_ini XBMC password $XBMC_PWD - - if [ "$COUCHPOTATO_FIRSTRUN" = "yes" ]; then - write_ini XBMC updateoneonly $COUCHPOTATO_UPDATEXBMC - fi - - python ./CouchPotato/CouchPotato.py -d --datadir $COUCHPOTATO_HOME --config $COUCHPOTATO_HOME/config.ini From 57e346f053b5ab8c80d8d18b2db777074c632bb9 Mon Sep 17 00:00:00 2001 From: Martin Mrvka Date: Mon, 25 Apr 2011 20:21:38 +0200 Subject: [PATCH 4/7] initial makemkv library support --- packages/multimedia/makemkv/build | 27 ++++++++++++++ packages/multimedia/makemkv/install | 28 +++++++++++++++ packages/multimedia/makemkv/meta | 36 +++++++++++++++++++ .../patches/makemkv-v1.6.5_oss-noqt-0.1.patch | 20 +++++++++++ 4 files changed, 111 insertions(+) create mode 100755 packages/multimedia/makemkv/build create mode 100755 packages/multimedia/makemkv/install create mode 100644 packages/multimedia/makemkv/meta create mode 100644 packages/multimedia/makemkv/patches/makemkv-v1.6.5_oss-noqt-0.1.patch diff --git a/packages/multimedia/makemkv/build b/packages/multimedia/makemkv/build new file mode 100755 index 0000000000..0adfdefe30 --- /dev/null +++ b/packages/multimedia/makemkv/build @@ -0,0 +1,27 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +cd $PKG_BUILD + +make -f makefile.linux diff --git a/packages/multimedia/makemkv/install b/packages/multimedia/makemkv/install new file mode 100755 index 0000000000..105bd56871 --- /dev/null +++ b/packages/multimedia/makemkv/install @@ -0,0 +1,28 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/usr/lib + rm -f $PKG_BUILD/out/*full + cp -P $PKG_BUILD/out/libmakemkv.so.* $INSTALL/usr/lib + cp -P $PKG_BUILD/out/libdriveio.so.* $INSTALL/usr/lib diff --git a/packages/multimedia/makemkv/meta b/packages/multimedia/makemkv/meta new file mode 100644 index 0000000000..60850e1413 --- /dev/null +++ b/packages/multimedia/makemkv/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="makemkv" +PKG_VERSION="v1.6.5_oss" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="OSS" +PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3" +PKG_URL="http://www.makemkv.com/download/${PKG_NAME}_${PKG_VERSION}.tar.gz" +PKG_DEPENDS="openssl" +PKG_BUILD_DEPENDS="toolchain openssl" +PKG_PRIORITY="optional" +PKG_SECTION="multimedia" +PKG_SHORTDESC="MakeMKV converts the video clips from proprietary (and usually encrypted) disc into a set of MKV files, preserving most information but not changing it in any way." +PKG_LONGDESC="MakeMKV can instantly stream decrypted video without intermediate conversion to wide range of players, so you may watch Blu-ray and DVD discs with your favorite player on your favorite OS or on your favorite device." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/multimedia/makemkv/patches/makemkv-v1.6.5_oss-noqt-0.1.patch b/packages/multimedia/makemkv/patches/makemkv-v1.6.5_oss-noqt-0.1.patch new file mode 100644 index 0000000000..a3dd95091e --- /dev/null +++ b/packages/multimedia/makemkv/patches/makemkv-v1.6.5_oss-noqt-0.1.patch @@ -0,0 +1,20 @@ +--- makemkv_v1.6.5_oss/makefile.linux 2011-02-16 05:16:27.000000000 +0100 ++++ makemkv_v1.6.5_oss.patch/makefile.linux 2011-03-21 00:30:21.946735001 +0100 +@@ -12,7 +12,7 @@ + BUILDINFO_BUILD_DATE=$(shell date) + + +-all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv ++all: out/libdriveio.so.0 out/libmakemkv.so.1 + @echo "type \"sudo make -f makefile.linux install\" to install" + + clean: +@@ -40,7 +40,7 @@ + + out/libmakemkv.so.1.full: tmp/gen_buildinfo.h + mkdir -p out +- $(GCC) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBMATROSKA_INC) \ ++ $(GCC) -DOPENSSL_NO_EC -D_REENTRANT -shared -Wl,-z,defs -o$@ -L$(SYSROOT_PREFIX)/usr/lib $(LIBEBML_INC) $(LIBMATROSKA_INC) \ + $(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFCODEC_INC) \ + $(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \ + $(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFCODEC_SRC) \ From f98bea5b31a17cc38dfd153bacb4050decc6794b Mon Sep 17 00:00:00 2001 From: Martin Mrvka Date: Mon, 25 Apr 2011 21:39:05 +0200 Subject: [PATCH 5/7] pumped makemkv libs to v1.6.8 --- packages/multimedia/makemkv/meta | 2 +- .../patches/makemkv-v1.6.5_oss-noqt-0.1.patch | 20 ----------- .../patches/makemkv-v1.6.8_oss-noqt-0.1.patch | 35 +++++++++++++++++++ 3 files changed, 36 insertions(+), 21 deletions(-) delete mode 100644 packages/multimedia/makemkv/patches/makemkv-v1.6.5_oss-noqt-0.1.patch create mode 100644 packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch diff --git a/packages/multimedia/makemkv/meta b/packages/multimedia/makemkv/meta index 60850e1413..2f13a23058 100644 --- a/packages/multimedia/makemkv/meta +++ b/packages/multimedia/makemkv/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="makemkv" -PKG_VERSION="v1.6.5_oss" +PKG_VERSION="v1.6.8_oss" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/multimedia/makemkv/patches/makemkv-v1.6.5_oss-noqt-0.1.patch b/packages/multimedia/makemkv/patches/makemkv-v1.6.5_oss-noqt-0.1.patch deleted file mode 100644 index a3dd95091e..0000000000 --- a/packages/multimedia/makemkv/patches/makemkv-v1.6.5_oss-noqt-0.1.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- makemkv_v1.6.5_oss/makefile.linux 2011-02-16 05:16:27.000000000 +0100 -+++ makemkv_v1.6.5_oss.patch/makefile.linux 2011-03-21 00:30:21.946735001 +0100 -@@ -12,7 +12,7 @@ - BUILDINFO_BUILD_DATE=$(shell date) - - --all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv -+all: out/libdriveio.so.0 out/libmakemkv.so.1 - @echo "type \"sudo make -f makefile.linux install\" to install" - - clean: -@@ -40,7 +40,7 @@ - - out/libmakemkv.so.1.full: tmp/gen_buildinfo.h - mkdir -p out -- $(GCC) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBMATROSKA_INC) \ -+ $(GCC) -DOPENSSL_NO_EC -D_REENTRANT -shared -Wl,-z,defs -o$@ -L$(SYSROOT_PREFIX)/usr/lib $(LIBEBML_INC) $(LIBMATROSKA_INC) \ - $(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFCODEC_INC) \ - $(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \ - $(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFCODEC_SRC) \ diff --git a/packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch b/packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch new file mode 100644 index 0000000000..c1ac8992e8 --- /dev/null +++ b/packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch @@ -0,0 +1,35 @@ +--- makemkv_v1.6.8_oss/makefile.linux 2011-04-25 08:44:43.000000000 +0200 ++++ makemkv_v1.6.8_oss.patch/makefile.linux 2011-04-25 21:26:11.262636081 +0200 +@@ -14,7 +14,7 @@ + BUILDINFO_BUILD_DATE=$(shell date) + + +-all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv ++all: out/libdriveio.so.0 out/libmakemkv.so.1 + @echo "type \"sudo make -f makefile.linux install\" to install" + + clean: +@@ -23,13 +23,11 @@ + rm -f out/* + rm -f tmp/* + +-install: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv ++install: out/libdriveio.so.0 out/libmakemkv.so.1 + rm -f /usr/lib/libdriveio.so.0 + rm -f /usr/lib/libmakemkv.so.1 +- rm -f /usr/bin/makemkv + install -t /usr/lib out/libdriveio.so.0 out/libmakemkv.so.1 + ldconfig +- install -t /usr/bin out/makemkv + + out/%: out/%.full + objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ +@@ -42,7 +40,7 @@ + + out/libmakemkv.so.1.full: tmp/gen_buildinfo.h + mkdir -p out +- $(GCC) $(CXXOPTS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBMATROSKA_INC) \ ++ $(GCC) $(CXXOPTS) -DOPENSSL_NO_EC -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBMATROSKA_INC) \ + $(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFCODEC_INC) \ + $(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \ + $(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFCODEC_SRC) \ From 2363f5b31a058aff4a05401233ccc44d86aca02f Mon Sep 17 00:00:00 2001 From: Martin Mrvka Date: Tue, 26 Apr 2011 21:31:52 +0200 Subject: [PATCH 6/7] Fixed openssl dependencies --- .../makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch b/packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch index c1ac8992e8..eac96659b2 100644 --- a/packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch +++ b/packages/multimedia/makemkv/patches/makemkv-v1.6.8_oss-noqt-0.1.patch @@ -29,7 +29,7 @@ out/libmakemkv.so.1.full: tmp/gen_buildinfo.h mkdir -p out - $(GCC) $(CXXOPTS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBMATROSKA_INC) \ -+ $(GCC) $(CXXOPTS) -DOPENSSL_NO_EC -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBMATROSKA_INC) \ ++ $(GCC) $(CXXOPTS) -L$(PKG_CONFIG_SYSROOT_DIR)/usr/lib -DOPENSSL_NO_EC -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBMATROSKA_INC) \ $(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFCODEC_INC) \ $(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \ $(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFCODEC_SRC) \ From 9094dd10c1ce4c6512f65a16003fee01312a89b5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 30 May 2011 00:27:26 +0200 Subject: [PATCH 7/7] projects/Intel/linux: add ATL1C network driver Signed-off-by: Stephan Raue --- projects/Intel/linux/linux.i386.conf | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 457a2d0849..7202f1978e 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1000,7 +1000,7 @@ CONFIG_R8169=y # CONFIG_QLA3XXX is not set # CONFIG_ATL1 is not set # CONFIG_ATL1E is not set -# CONFIG_ATL1C is not set +CONFIG_ATL1C=y # CONFIG_JME is not set # CONFIG_STMMAC_ETH is not set # CONFIG_PCH_GBE is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index f6f0ebd978..219190dc74 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -950,7 +950,7 @@ CONFIG_R8169=y # CONFIG_QLA3XXX is not set # CONFIG_ATL1 is not set # CONFIG_ATL1E is not set -# CONFIG_ATL1C is not set +CONFIG_ATL1C=y # CONFIG_JME is not set # CONFIG_STMMAC_ETH is not set # CONFIG_PCH_GBE is not set