diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..7e7c3a5b92 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "packages/unofficial"] + path = packages/unofficial + url = https://github.com/OpenELEC/unofficial-addons.git diff --git a/config/addon/addon.xml b/config/addon/addon.xml index f528f9c914..6cba11fb76 100644 --- a/config/addon/addon.xml +++ b/config/addon/addon.xml @@ -2,7 +2,7 @@ + provider-name="@PROVIDER_NAME@"> diff --git a/config/path b/config/path index 4ace4b59e5..9b6c22fe11 100644 --- a/config/path +++ b/config/path @@ -55,12 +55,26 @@ SED="sed -i" PKG_IS_ADDON="no" if [ -n "$1" ]; then - PKG_DIR=`find $PACKAGES -type d -name $1 ! -wholename \*\/source\/\* 2>/dev/null` - if [ "${PKG_DIR}" != "$(echo $PKG_DIR | tr -d '\n')" ]; then - echo "Error - multiple package folders:" - echo "$PKG_DIR" - exit 1 - fi + FOUND=0 + for DIR in `find $PACKAGES -type d -name $1 ! -wholename \*\/source\/\* 2>/dev/null` ; do + # keep track of dirs with meta for debugging + if [ -z "$ALL_DIRS" ] ; then + ALL_DIRS="$DIR" + else + ALL_DIRS="$ALL_DIRS\\n$DIR" + fi + if [ -f "$DIR/meta" -o -f "$DIR/install" -o -f "$DIR/build" ] ; then + FOUND=$((FOUND+1)) + # found first. set $PKG_DIR + PKG_DIR="$DIR" + if [ $FOUND -gt 1 ] ; then + # found more ? fail + echo "Error - multiple package folders:" + echo -e "$ALL_DIRS" + exit 1 + fi + fi + done fi [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta diff --git a/packages/3rdparty/download/CouchPotatoServer/meta b/packages/3rdparty/download/CouchPotatoServer/meta deleted file mode 100644 index e3bcd56436..0000000000 --- a/packages/3rdparty/download/CouchPotatoServer/meta +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="CouchPotatoServer" -PKG_VERSION="5c0d8a7" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="https://github.com/RuudBurger/CouchPotatoServer" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="Python SABnzbd" -PKG_BUILD_DEPENDS="toolchain Python" -PKG_PRIORITY="optional" -PKG_SECTION="service/downloadmanager" -PKG_SHORTDESC="CouchPotatoServer: automated movie downloading." -PKG_LONGDESC="CouchPotatoServer: automated movie downloading." - -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-move-cache.patch b/packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-move-cache.patch deleted file mode 100644 index 80953fb67f..0000000000 --- a/packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-move-cache.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/couchpotato/runner.py b/couchpotato/runner.py -index c0b7eb8..3a550f9 100644 ---- a/couchpotato/runner.py -+++ b/couchpotato/runner.py -@@ -112,7 +112,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En - Env.set('data_dir', data_dir) - Env.set('log_path', os.path.join(log_dir, 'CouchPotato.log')) - Env.set('db_path', 'sqlite:///' + db_path) -- Env.set('cache_dir', os.path.join(data_dir, 'cache')) -+ Env.set('cache_dir', os.path.join(data_dir, 'cache.cpv2')) - Env.set('cache', FileSystemCache(os.path.join(Env.get('cache_dir'), 'python'))) - Env.set('console_log', options.console_log) - Env.set('quiet', options.quiet) diff --git a/packages/3rdparty/download/Headphones/meta b/packages/3rdparty/download/Headphones/meta deleted file mode 100644 index 84cd07b998..0000000000 --- a/packages/3rdparty/download/Headphones/meta +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="Headphones" -PKG_VERSION="452cf15" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://github.com/rembo10/headphones" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="Python SABnzbd" -PKG_BUILD_DEPENDS="toolchain Python" -PKG_PRIORITY="optional" -PKG_SECTION="service/downloadmanager" -PKG_SHORTDESC="Headphones: Automatic music downloader for SABnzbd." -PKG_LONGDESC="Headphones: This a pretty early release of a third-party add-on for SABnzbd." - -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/3rdparty/download/SABnzbd/meta b/packages/3rdparty/download/SABnzbd/meta deleted file mode 100644 index dd411ad525..0000000000 --- a/packages/3rdparty/download/SABnzbd/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="SABnzbd" -PKG_VERSION="0.7.11" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://sabnzbd.org/" -PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz" -PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline" -PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline configobj" -PKG_PRIORITY="optional" -PKG_SECTION="service/downloadmanager" -PKG_SHORTDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can." -PKG_LONGDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction." - -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.11-001_remove_default_settings-0.3.patch b/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.11-001_remove_default_settings-0.3.patch deleted file mode 100644 index d3080986c5..0000000000 --- a/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.11-001_remove_default_settings-0.3.patch +++ /dev/null @@ -1,234 +0,0 @@ -diff --git a/interfaces/Plush/templates/config_folders.tmpl b/interfaces/Plush/templates/config_folders.tmpl -index 92bb5d1..94c1502 100644 ---- a/interfaces/Plush/templates/config_folders.tmpl -+++ b/interfaces/Plush/templates/config_folders.tmpl -@@ -76,16 +76,6 @@ - $T('explain-dirscan_speed') - - --
-- -- --
-
-
- --
--
--

$T('systemFolders')

--

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

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

 

-diff --git a/interfaces/Plush/templates/config_general.tmpl b/interfaces/Plush/templates/config_general.tmpl -index 0c293ec..56f9488 100644 ---- a/interfaces/Plush/templates/config_general.tmpl -+++ b/interfaces/Plush/templates/config_general.tmpl -@@ -14,82 +14,6 @@ -
-
-
-- -- --
--
-- -- --
--
-- -- --
--
-- -- --
--
-- -- --
--
-- -- --
--
- --
-
-
- -@@ -154,36 +71,6 @@ - $T('explain-enable_https') - - --
-- -- --
--
-- -- --
--
-- -- --
- - - -diff --git a/interfaces/Plush/templates/config_switches.tmpl b/interfaces/Plush/templates/config_switches.tmpl -index a8f1069..6f50b49 100644 ---- a/interfaces/Plush/templates/config_switches.tmpl -+++ b/interfaces/Plush/templates/config_switches.tmpl -@@ -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/3rdparty/download/SickBeard/meta b/packages/3rdparty/download/SickBeard/meta deleted file mode 100644 index da89b19021..0000000000 --- a/packages/3rdparty/download/SickBeard/meta +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="SickBeard" -PKG_VERSION="fb37d33" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="https://github.com/midgetspy/Sick-Beard" -PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz" -PKG_DEPENDS="Python SABnzbd Cheetah" -PKG_BUILD_DEPENDS="toolchain Python Cheetah" -PKG_PRIORITY="optional" -PKG_SECTION="service/downloadmanager" -PKG_SHORTDESC="SickBeard: automated TV show downloading." -PKG_LONGDESC="SickBeard: automated TV show downloading." - -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-001-remove_logo_update-header_and_donate_button-0.1.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-001-remove_logo_update-header_and_donate_button-0.1.patch deleted file mode 100644 index 18fe8a3314..0000000000 --- a/packages/3rdparty/download/SickBeard/patches/SickBeard-001-remove_logo_update-header_and_donate_button-0.1.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/data/interfaces/default/config.tmpl b/data/interfaces/default/config.tmpl -index ec28766..fdf3e30 100644 ---- a/data/interfaces/default/config.tmpl -+++ b/data/interfaces/default/config.tmpl -@@ -36,13 +36,4 @@ - -
- --
-- -- -- -- -- --
[donate]Sick Beard is free, but you can contribute by giving a donation.
--
-- - #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl") -diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl -index f791be8..fb38f17 100644 ---- a/data/interfaces/default/inc_top.tmpl -+++ b/data/interfaces/default/inc_top.tmpl -@@ -108,20 +108,6 @@ - - -
--#if $sickbeard.NEWEST_VERSION_STRING: --
--
-- $sickbeard.NEWEST_VERSION_STRING --
--
--
--#end if -- -- -
-
-
-@@ -208,11 +194,6 @@ - -
  • - --
      --
    • -- [donate] --
      • --
    -
    - -
    diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-002-remove_default_settings-0.3.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-002-remove_default_settings-0.3.patch deleted file mode 100644 index 32f5c86111..0000000000 --- a/packages/3rdparty/download/SickBeard/patches/SickBeard-002-remove_default_settings-0.3.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl -index 2144a0f..703c99e 100755 ---- a/data/interfaces/default/config_notifications.tmpl -+++ b/data/interfaces/default/config_notifications.tmpl -@@ -639,45 +639,6 @@ - -
    -
    -- --

    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.
    -- -- --
    -- --
    --
    -- -- --
    --
    - -

    Pushover

    -

    Pushover makes it easy to send real-time notifications to your Android and iOS devices.

    -diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl -index fb38f17..4ead36f 100644 ---- a/data/interfaces/default/inc_top.tmpl -+++ b/data/interfaces/default/inc_top.tmpl -@@ -172,8 +172,6 @@ -
      -
    • Help & Info
      • -
    • --
    • General
      • --
    • -
    • Search Settings
      • -
    • -
    • Search Providers
      • -diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py -index da9ff7f..36b608e 100644 ---- a/sickbeard/webserve.py -+++ b/sickbeard/webserve.py -@@ -613,7 +613,6 @@ class History: - - - ConfigMenu = [ -- { 'title': 'General', 'path': 'config/general/' }, - { 'title': 'Search Settings', 'path': 'config/search/' }, - { 'title': 'Search Providers', 'path': 'config/providers/' }, - { 'title': 'Post Processing', 'path': 'config/postProcessing/' }, diff --git a/packages/3rdparty/system/pcsc-lite/meta b/packages/3rdparty/system/pcsc-lite/meta deleted file mode 100644 index 910bbc2212..0000000000 --- a/packages/3rdparty/system/pcsc-lite/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 -################################################################################ - -PKG_NAME="pcsc-lite" -PKG_VERSION="1.8.8" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html" -PKG_URL="https://alioth.debian.org/frs/download.php/3862/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain libusb" -PKG_PRIORITY="optional" -PKG_SECTION="service/system" -PKG_SHORTDESC="Middleware to access a smart card using SCard API (PC/SC)" -PKG_LONGDESC="Middleware to access a smart card using SCard API (PC/SC)" -PKG_IS_ADDON="yes" -PKG_AUTORECONF="yes" diff --git a/packages/3rdparty/web/pycurl/meta b/packages/3rdparty/web/pycurl/meta deleted file mode 100644 index 77df467de9..0000000000 --- a/packages/3rdparty/web/pycurl/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="pycurl" -PKG_VERSION="7.19.0" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL-2" -PKG_SITE="http://pycurl.sourceforge.net/" -PKG_URL="http://pycurl.sourceforge.net/download/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python curl" -PKG_BUILD_DEPENDS="toolchain Python distutilscross curl libgcrypt" -PKG_PRIORITY="optional" -PKG_SECTION="python/web" -PKG_SHORTDESC="pycurl: a Python interface to libcurl" -PKG_LONGDESC="PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program, similar to the urllib Python module. PycURL is mature, very fast, and supports a lot of features." -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" diff --git a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch deleted file mode 100644 index 7e20b15c2f..0000000000 --- a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/pycurl.c -+++ a/src/pycurl.c -@@ -1452,6 +1452,7 @@ do_curl_reset(CurlObject *self) - } - } - -+ Py_INCREF(Py_None); - return Py_None; - } - ---- a/tests/test_internals.py -+++ a/tests/test_internals.py -@@ -245,6 +245,11 @@ if 1 and gc: - if opts.verbose >= 1: - print "Tracked objects:", len(gc.get_objects()) - -+if 1: -+ # Ensure that the refcounting error in "reset" is fixed: -+ for i in xrange(100000): -+ c = Curl() -+ c.reset() - - # /*********************************************************************** - # // done diff --git a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-linking_with_gcrypt.patch b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-linking_with_gcrypt.patch deleted file mode 100644 index 5940c7d3d7..0000000000 --- a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-linking_with_gcrypt.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr pycurl-7.19.0-orig/setup.py pycurl-7.19.0-new/setup.py ---- pycurl-7.19.0-orig/setup.py 2012-12-21 19:20:27.000000000 +0100 -+++ pycurl-7.19.0-new/setup.py 2012-12-21 19:31:11.000000000 +0100 -@@ -104,6 +104,7 @@ - if e[2:] == 'ssl': - define_macros.append(('HAVE_CURL_OPENSSL', 1)) - if e[2:] == 'gnutls': -+ libraries.append("gcrypt") - define_macros.append(('HAVE_CURL_GNUTLS', 1)) - elif e[:2] == "-L": - library_dirs.append(e[2:]) diff --git a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch deleted file mode 100644 index 06ac2c1f1e..0000000000 --- a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- pycurl/setup.py~ 2008-04-22 17:00:45.000000000 +0300 -+++ pycurl/setup.py 2008-07-03 21:53:36.000000000 +0300 -@@ -97,8 +97,7 @@ - else: - extra_compile_args.append(e) - libs = split_quoted( -- os.popen("'%s' --libs" % CURL_CONFIG).read()+\ -- os.popen("'%s' --static-libs" % CURL_CONFIG).read()) -+ os.popen("'%s' --libs" % CURL_CONFIG).read()) - for e in libs: - if e[:2] == "-l": - libraries.append(e[2:]) diff --git a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch b/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch deleted file mode 100644 index 8ceba310a2..0000000000 --- a/packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur pycurl-7.19.0/setup.py pycurl-7.19.0.patch/setup.py ---- pycurl-7.19.0/setup.py 2008-09-09 19:40:34.000000000 +0200 -+++ pycurl-7.19.0.patch/setup.py 2011-09-29 02:07:22.584412664 +0200 -@@ -11,8 +11,8 @@ - - import glob, os, re, sys, string - import distutils --from distutils.core import setup --from distutils.extension import Extension -+from setuptools import setup -+from setuptools import Extension - from distutils.util import split_quoted - from distutils.version import LooseVersion - diff --git a/packages/accessibility/atk/build b/packages/accessibility/atk/build deleted file mode 100755 index 472b9186ca..0000000000 --- a/packages/accessibility/atk/build +++ /dev/null @@ -1,67 +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 $PKG_BUILD - -ac_cv_func_posix_getpwuid_r=yes \ -glib_cv_stack_grows=no glib_cv_uscore=no \ -ac_cv_func_strtod=yes ac_fsusage_space=yes \ -fu_cv_sys_stat_statfs2_bsize=yes ac_cv_func_closedir_void=no \ -ac_cv_func_getloadavg=no ac_cv_lib_util_getloadavg=no \ -ac_cv_lib_getloadavg_getloadavg=no ac_cv_func_getgroups=yes \ -ac_cv_func_getgroups_works=yes ac_cv_func_chown_works=yes \ -ac_cv_have_decl_euidaccess=no ac_cv_func_euidaccess=no \ -ac_cv_have_decl_strnlen=yes ac_cv_func_strnlen_working=yes \ -ac_cv_func_lstat_dereferences_slashed_symlink=yes ac_cv_func_lstat_empty_string_bug=no \ -ac_cv_func_stat_empty_string_bug=no vb_cv_func_rename_trailing_slash_bug=no \ -ac_cv_have_decl_nanosleep=yes jm_cv_func_nanosleep_works=yes \ -gl_cv_func_working_utimes=yes ac_cv_func_utime_null=yes \ -ac_cv_have_decl_strerror_r=yes ac_cv_func_strerror_r_char_p=no \ -jm_cv_func_svid_putenv=yes ac_cv_func_getcwd_null=yes \ -ac_cv_func_getdelim=yes ac_cv_func_mkstemp=yes \ -utils_cv_func_mkstemp_limitations=no utils_cv_func_mkdir_trailing_slash_bug=no \ -ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes \ -gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes \ -ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes \ -jm_cv_func_gettimeofday_clobber=no gl_cv_func_working_readdir=yes \ -jm_ac_cv_func_link_follows_symlink=no utils_cv_localtime_cache=no \ -ac_cv_struct_st_mtim_nsec=no gl_cv_func_tzset_clobber=no \ -gl_cv_func_getcwd_null=yes gl_cv_func_getcwd_path_max=yes \ -ac_cv_func_fnmatch_gnu=yes am_getline_needs_run_time_check=no \ -am_cv_func_working_getline=yes gl_cv_func_mkdir_trailing_slash_bug=no \ -gl_cv_func_mkstemp_limitations=no ac_cv_func_working_mktime=yes \ -jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \ -gl_cv_c_restrict=no ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \ -ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config" \ -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - --disable-glibtest \ - -make -$MAKEINSTALL \ No newline at end of file diff --git a/packages/accessibility/atk/meta b/packages/accessibility/atk/meta deleted file mode 100644 index 2f31ac63cf..0000000000 --- a/packages/accessibility/atk/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="atk" -PKG_VERSION="2.6.0" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://library.gnome.org/devel/atk/" -PKG_URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/2.6/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="glib" -PKG_BUILD_DEPENDS="toolchain glib" -PKG_PRIORITY="optional" -PKG_SECTION="accessibility" -PKG_SHORTDESC="ATK - Accessibility Toolkit" -PKG_LONGDESC="ATK provides the set of accessibility interfaces that are implemented by other toolkits and applications. Using the ATK interfaces, accessibility tools have full access to view and control running applications." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/addons/multimedia/makemkv/addon b/packages/addons/multimedia/makemkv/addon deleted file mode 100755 index cc0677e119..0000000000 --- a/packages/addons/multimedia/makemkv/addon +++ /dev/null @@ -1,34 +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 - -MAKEMKV_ARCH=i386 -[ "$TARGET_ARCH" = x86_64 ] && MAKEMKV_ARCH=amd64 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_BUILD/bin/bin/$MAKEMKV_ARCH/makemkvcon $ADDON_BUILD/$PKG_ADDON_ID/bin/makemkvcon.bin - chmod 755 $ADDON_BUILD/$PKG_ADDON_ID/bin/makemkvcon.bin - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib - cp $PKG_BUILD/lib/out/libmakemkv.so.[0-9] $ADDON_BUILD/$PKG_ADDON_ID/lib - cp $PKG_BUILD/lib/out/libdriveio.so.[0-9] $ADDON_BUILD/$PKG_ADDON_ID/lib diff --git a/packages/addons/multimedia/makemkv/changelog.txt b/packages/addons/multimedia/makemkv/changelog.txt deleted file mode 100644 index 4fd7b8a47e..0000000000 --- a/packages/addons/multimedia/makemkv/changelog.txt +++ /dev/null @@ -1,63 +0,0 @@ -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.6 -- update to makemkv-1.8.3 - -3.0.5 -- update to makemkv-1.8.2 - -3.0.4 -- update to makemkv-1.8.0 - -3.0.3 -- update to makemkv-1.7.10 - -3.0.2 -- update to makemkv-1.7.9 - -3.0.1 -- bump addon version -- update to makemkv-1.7.8 - -2.1.4 -- update to makemkv-1.7.7 - -2.1.3 -- update to makemkv-1.7.6 - -2.1.2 -- update to makemkv-1.7.4 - -2.1.1 -- update to addon version 2.1 - -2.0.2 -- update to makemkv-1.7.2 - -2.0.1 -- update to makemkv-1.7.0 - -2.0.0 -- prepare for OpenELEC-2.0 release - -1.90.2 -- depends on xbmc.python API 2.0 - -1.90.1 -- update to makemkv-1.6.16 - -1.90.0 -- prepare for OpenELEC-1.90 release - -1.0.0 -- prepare for OpenELEC-1.0 release - -0.99.3 -- update to makemkv-1.6.15 - -0.99.2 -- change icon - -0.99.1 -- initial addon based on makemkv-1.6.10 diff --git a/packages/addons/multimedia/makemkv/icon/icon.png b/packages/addons/multimedia/makemkv/icon/icon.png deleted file mode 100644 index dc82051426..0000000000 Binary files a/packages/addons/multimedia/makemkv/icon/icon.png and /dev/null differ diff --git a/packages/addons/multimedia/makemkv/meta b/packages/addons/multimedia/makemkv/meta deleted file mode 100644 index 250d7521e3..0000000000 --- a/packages/addons/multimedia/makemkv/meta +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="makemkv" -PKG_VERSION="1.8.3" -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}-oss-${PKG_VERSION}.tar.gz" -PKG_URL="$PKG_URL http://www.makemkv.com/download/${PKG_NAME}-bin-${PKG_VERSION}.tar.gz" -PKG_DEPENDS="openssl" -PKG_BUILD_DEPENDS="toolchain openssl expat" -PKG_PRIORITY="optional" -PKG_SECTION="lib/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="yes" -PKG_ADDON_TYPE="xbmc.python.script" - -PKG_AUTORECONF="no" diff --git a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-000-crosscompiling-0.1.patch b/packages/addons/multimedia/makemkv/patches.upstream/makemkv-000-crosscompiling-0.1.patch deleted file mode 100644 index e2ca9f4ce5..0000000000 --- a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-000-crosscompiling-0.1.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/lib/makefile.linux b/lib/makefile.linux -index b3b5afa..07322ad 100644 ---- a/lib/makefile.linux -+++ b/lib/makefile.linux -@@ -1,10 +1,10 @@ - - include makefile.common - --GCC=gcc -+GCC:=gcc - MOC=$(strip $(shell which moc-qt4)) - ifeq ($(MOC),) --MOC=moc -+MOC:=moc - endif - - CXXOPTS=-Os -D_GNU_SOURCE -D_linux_ -@@ -16,7 +16,7 @@ PREFIX=/usr - LIBDIR=${PREFIX}/lib - - --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: diff --git a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-001-crosscompiling-objcopy.patch b/packages/addons/multimedia/makemkv/patches.upstream/makemkv-001-crosscompiling-objcopy.patch deleted file mode 100644 index 10e67fa8b8..0000000000 --- a/packages/addons/multimedia/makemkv/patches.upstream/makemkv-001-crosscompiling-objcopy.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/makefile.linux b/lib/makefile.linux -index dedf8cf..5fac196 100644 ---- a/lib/makefile.linux -+++ b/lib/makefile.linux -@@ -38,7 +38,7 @@ endif - install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png - - out/%: out/%.full -- objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ -+ $(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ - - out/libdriveio.so.0.full: - mkdir -p out diff --git a/packages/addons/multimedia/makemkv/source/bin/makemkvcon b/packages/addons/multimedia/makemkv/source/bin/makemkvcon deleted file mode 100755 index b3c55da8a1..0000000000 --- a/packages/addons/multimedia/makemkv/source/bin/makemkvcon +++ /dev/null @@ -1,29 +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 -################################################################################ - -. /etc/profile - -ADDON_DIR="/storage/.xbmc/addons/lib.multimedia.makemkv" - -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ADDON_DIR/lib" - -makemkvcon.bin $@ diff --git a/packages/addons/multimedia/makemkv/unpack b/packages/addons/multimedia/makemkv/unpack deleted file mode 100755 index 08a25ef195..0000000000 --- a/packages/addons/multimedia/makemkv/unpack +++ /dev/null @@ -1,38 +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 - -require_eglibc $1 - -[ -d $PKG_BUILD ] && rm -rf $PKG_BUILD - -mkdir -p $BUILD/$PKG_NAME-$PKG_VERSION -mv $BUILD/${PKG_NAME}-oss-${PKG_VERSION} $BUILD/$PKG_NAME-$PKG_VERSION/lib -mv $BUILD/${PKG_NAME}-bin-${PKG_VERSION} $BUILD/$PKG_NAME-$PKG_VERSION/bin - -echo "### Applying upstream patches ###" - -for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do - cat $patch | patch -d \ - `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1 -done diff --git a/packages/addons/networking/backup/rsync/addon b/packages/addons/networking/backup/rsync/addon deleted file mode 100755 index 54ffd5b090..0000000000 --- a/packages/addons/networking/backup/rsync/addon +++ /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 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_BUILD/rsync $ADDON_BUILD/$PKG_ADDON_ID/bin diff --git a/packages/addons/networking/backup/rsync/build b/packages/addons/networking/backup/rsync/build deleted file mode 100755 index 221aabf73c..0000000000 --- a/packages/addons/networking/backup/rsync/build +++ /dev/null @@ -1,35 +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 $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-acl-support \ - --disable-xattr-support \ - --with-included-popt \ - -make diff --git a/packages/addons/networking/backup/rsync/changelog.txt b/packages/addons/networking/backup/rsync/changelog.txt deleted file mode 100644 index 4a4e468414..0000000000 --- a/packages/addons/networking/backup/rsync/changelog.txt +++ /dev/null @@ -1,39 +0,0 @@ -3.1.2 -- use internal popt - -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.2 -- rebuild against static libpopt - -3.0.1 -- bump addon version - -2.1.1 -- update to addon version 2.1 - -2.0.1 -- rebuild for libiconv changes - -2.0.0 -- prepare for OpenELEC-2.0 release - -1.90.1 -- depends on xbmc.python API 2.0 - -1.90.0 -- prepare for OpenELEC-1.90 release - -1.0.0 -- update to rsync-3.0.9 -- prepare for OpenELEC-1.0 release - -0.99.3 -- change icon - -0.99.2 -- prepare for release - -0.99.1 -- initial addon based on rsync-3.0.8 diff --git a/packages/addons/networking/backup/rsync/icon/icon.png b/packages/addons/networking/backup/rsync/icon/icon.png deleted file mode 100644 index b56515574a..0000000000 Binary files a/packages/addons/networking/backup/rsync/icon/icon.png and /dev/null differ diff --git a/packages/addons/networking/backup/rsync/meta b/packages/addons/networking/backup/rsync/meta deleted file mode 100644 index 5e0d8be516..0000000000 --- a/packages/addons/networking/backup/rsync/meta +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="rsync" -PKG_VERSION="3.0.9" -PKG_REV="2" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html" -PKG_URL="ftp://rsync.samba.org/pub/rsync/src/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="network/backup" -PKG_SHORTDESC="rsync: A replacement for rcp that has many more features" -PKG_LONGDESC="Rsync uses an own 'rsync' algorithm which provides a very fast method for bringing remote files into sync. It does this by sending just the differences in the files across the link, without requiring that both sets of files are present at one of the ends of the link beforehand. At first glance this may seem impossible because the calculation of diffs between two files normally requires local access to both files." - -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.python.script" - -PKG_AUTORECONF="yes" diff --git a/packages/addons/networking/testing/iperf/addon b/packages/addons/networking/testing/iperf/addon deleted file mode 100755 index cade4ce551..0000000000 --- a/packages/addons/networking/testing/iperf/addon +++ /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 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_BUILD/src/iperf $ADDON_BUILD/$PKG_ADDON_ID/bin diff --git a/packages/addons/networking/testing/iperf/build b/packages/addons/networking/testing/iperf/build deleted file mode 100755 index dbd731035e..0000000000 --- a/packages/addons/networking/testing/iperf/build +++ /dev/null @@ -1,35 +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 $PKG_BUILD -ac_cv_func_malloc_0_nonnull=yes \ -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-acl-support \ - --disable-xattr-support \ - -make diff --git a/packages/addons/networking/testing/iperf/changelog.txt b/packages/addons/networking/testing/iperf/changelog.txt deleted file mode 100644 index 50c293bb56..0000000000 --- a/packages/addons/networking/testing/iperf/changelog.txt +++ /dev/null @@ -1,11 +0,0 @@ -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.2 -- rebuild - -3.0.1 -- bump addon version - -2.1.1 -- initial addon based on iperf-2.0.5 diff --git a/packages/addons/networking/testing/iperf/icon/icon.png b/packages/addons/networking/testing/iperf/icon/icon.png deleted file mode 100644 index 9f8063f885..0000000000 Binary files a/packages/addons/networking/testing/iperf/icon/icon.png and /dev/null differ diff --git a/packages/addons/networking/testing/iperf/meta b/packages/addons/networking/testing/iperf/meta deleted file mode 100644 index 4ddc5a1ecf..0000000000 --- a/packages/addons/networking/testing/iperf/meta +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="iperf" -PKG_VERSION="2.0.5" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://sourceforge.net/projects/iperf/" -PKG_URL="$SOURCEFORGE_SRC/iperf/files/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="network/testing" -PKG_SHORTDESC="iperf: A modern alternative for measuring maximum TCP and UDP bandwidth performance" -PKG_LONGDESC="Iperf was developed by NLANR/DAST as a modern alternative for measuring maximum TCP and UDP bandwidth performance. Iperf allows the tuning of various parameters and UDP characteristics. Iperf reports bandwidth, delay jitter, datagram loss." - -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.python.script" - -PKG_AUTORECONF="yes" diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/addon b/packages/addons/service/downloadmanager/SABnzbd-Suite/addon deleted file mode 100755 index 6d7c7d6eea..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/addon +++ /dev/null @@ -1,49 +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 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID - cp -PR $PKG_DIR/config/settings.xml* $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $BUILD/par2cmdline-*/par2 $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $BUILD/unzip*/unzip $ADDON_BUILD/$PKG_ADDON_ID/bin - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib - cp -R $BUILD/Cheetah*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib - cp -R $BUILD/pyOpenSSL*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib - cp -R $BUILD/yenc*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib - cp -R $BUILD/configobj*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SABnzbd - cp -PR $BUILD/SABnzbd-*/* $ADDON_BUILD/$PKG_ADDON_ID/SABnzbd - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SickBeard - cp -PR $BUILD/SickBeard-*/* $ADDON_BUILD/$PKG_ADDON_ID/SickBeard - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/CouchPotatoServer - cp -PR $BUILD/CouchPotatoServer-*/* $ADDON_BUILD/$PKG_ADDON_ID/CouchPotatoServer - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/Headphones - cp -PR $BUILD/Headphones-*/* $ADDON_BUILD/$PKG_ADDON_ID/Headphones diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt deleted file mode 100644 index 8da5b9a91d..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt +++ /dev/null @@ -1,127 +0,0 @@ -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.9 -- update to CouchPotatoServe-5c0d8a7 -- update to Headphones-452cf15 -- remove CouchPotato (v1) - -3.0.8 -- update to CouchPotatoServe-f1dde5c -- update to Headphones-ebbe908 -- update to SickBeard-fb37d33 - -3.0.7 -- update to CouchPotatoServe-5a23be2 -- update to SickBeard-ebec1de -- fix executehttpapi startup error - -3.0.6 -- fix configobj error n startup - -3.0.5 -- rebuild. configobj included - -3.0.4 -- update to SickBeard-4e57625 -- update to CouchPotatoServer-a49a00a -- fix keep awake option - -3.0.3 -- update to SABnzbd-0.7.11 -- update to CouchPotatoServer-811f35b -- update to SickBeard-6cb5e76 -- added option to restart the suite on suspend / resume - -3.0.2 -- Fixed bug causing configobj to throw an exception with Couchpotato v2s config -- corrected a bug causing most of the suite to crash on first launch in certain circumstances -- update to SABnzbd-0.7.9 -- update to CouchPotatoServer-393c14d -- update to Headphones-263272c -- update to SickBeard-e6dcfb3 - -3.0.1 -- bump addon version - -2.1.8 -- update to SABnzbd-0.7.3 -- update to CouchPotato-806bed6 -- update to CouchPotatoServer-e1d7440 -- update to Headphones-d07dc39 -- update to SickBeard-b7cf06e - -2.1.7 -- update to SABnzbd-0.7.0 -- update to Headphones-89c2a8c -- perform "Keep awake while downloading" and "Wake up periodically" only if sabnzbd is enabled -- updated Turkish translation - -2.1.6 -- fixed another startup bug - -2.1.5 -- fixed bug in startup (caused by couchpotatoserver / configobj) -- add possibilty to start / stop addon from addon manager with enable / disable - -2.1.4 -- fixes bug in sleep control -- added couchpotato v2 -- added ability to enable or disable parts of the Suite from the addon settings page - -2.1.3 -- fix so python dont steal xbmc's webserver port (again) -- add option to wake up periodically -- update to SickBeard-a24eac6 -- update to Headphones-298463a - -2.1.2 -- improve startup script - -2.1.1 -- update to addon version 2.1 -- update to SABnzbd-0.6.15 -- update to SickBeard-a24eac6 -- update to CouchPotato-46dbb59 -- update to Headphones-818458e - -2.0.1 -- fix so python dont steal xbmc's webserver port - -2.0.0 -- prepare for OpenELEC-2.0 release -- update to SABnzbd-0.6.14 -- update to SickBeard-9b43f71 -- update to CouchPotato-75f12fa -- update to Headphones-8d80c6d - -1.90.2 -- depends on xbmc.python API 2.0 - -1.90.1 -- rebuild for OpenSSL upgrade - -1.90.0 -- prepare for OpenELEC-1.90 release - -1.0.0 -- update to unrar-4.0.7 -- update to CouchPotato-4eec8e0 -- update to Headphones-e9a1e55 -- update to SickBeard-9f64728 -- update to SABnzbd-0.6.10 -- prepare for OpenELEC-1.0 release - -0.99.4 -- add Headphones-ee3326e - -0.99.3 -- rebuild against fixed 'yenc', 'Cheetah' and 'pyOpenSSL' - -0.99.2 -- update to SABnzbd-0.6.7 -- update to SickBeard-e0e8f0e -- update to CouchPotato-6cd66ae - -0.99.1 -- initial version SABnzbd-Suite diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml deleted file mode 100644 index 4bace92a16..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/icon/icon.png b/packages/addons/service/downloadmanager/SABnzbd-Suite/icon/icon.png deleted file mode 100644 index 2c62900063..0000000000 Binary files a/packages/addons/service/downloadmanager/SABnzbd-Suite/icon/icon.png and /dev/null differ diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta deleted file mode 100644 index 23030e17ab..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="SABnzbd-Suite" -PKG_VERSION="3.1" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.openelec.tv" -PKG_URL="" -PKG_DEPENDS="Python" -PKG_BUILD_DEPENDS="toolchain Python SABnzbd SickBeard Headphones CouchPotatoServer" -PKG_PRIORITY="optional" -PKG_SECTION="service/downloadmanager" -PKG_SHORTDESC="SABnzbd-Suite is a Metapackage which combines SABnzbd, SickBeard, Couchpotato and Headphones in one Addon" -PKG_LONGDESC="SABnzbd-Suite makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction." - -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.service" - -PKG_AUTORECONF="no" diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py deleted file mode 100755 index ed7a4a3ba9..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py +++ /dev/null @@ -1,466 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2012 Lukas Heiniger -# -# 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 -################################################################################ - -# Initializes and launches SABnzbd, Couchpotato, Sickbeard and Headphones - -import os -import shutil -import xbmc -import signal -import subprocess -import urllib2 -import hashlib -import sys -from xml.dom.minidom import parseString -import logging -import traceback - -logging.basicConfig(filename='/var/log/sabnzbd-suite.log', - filemode='w', - format='%(asctime)s SABnzbd-Suite: %(message)s', - level=logging.WARNING) - -# helper functions -# ---------------- - -def createDir(dir): - if not os.path.isdir(dir): - os.makedirs(dir) - -def getAddonSetting(doc,id): - for element in doc.getElementsByTagName('setting'): - if element.getAttribute('id')==id: - return element.getAttribute('value') - -def loadWebInterface(url,user,pwd): - passman = urllib2.HTTPPasswordMgrWithDefaultRealm() - passman.add_password(None, url, user, pwd) - authhandler = urllib2.HTTPBasicAuthHandler(passman) - opener = urllib2.build_opener(authhandler) - urllib2.install_opener(opener) - pagehandle = urllib2.urlopen(url) - return pagehandle.read() - -# define some things that we're gonna need, mainly paths -# ------------------------------------------------------ - -# addon -pAddon = os.path.expanduser('~/.xbmc/addons/service.downloadmanager.SABnzbd-Suite') -pAddonHome = os.path.expanduser('~/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite') - -# settings -pDefaultSuiteSettings = os.path.join(pAddon, 'settings-default.xml') -pSuiteSettings = os.path.join(pAddonHome, 'settings.xml') -pXbmcSettings = '/storage/.xbmc/userdata/guisettings.xml' -pSabNzbdSettings = os.path.join(pAddonHome, 'sabnzbd.ini') -pSickBeardSettings = os.path.join(pAddonHome, 'sickbeard.ini') -pCouchPotatoServerSettings = os.path.join(pAddonHome, 'couchpotatoserver.ini') -pHeadphonesSettings = os.path.join(pAddonHome, 'headphones.ini') -pTransmission_Addon_Settings ='/storage/.xbmc/userdata/addon_data/service.downloadmanager.transmission/settings.xml' - -# directories -pSabNzbdComplete = '/storage/downloads' -pSabNzbdCompleteMov = '/storage/downloads/movies' -pSabNzbdCompleteMusic = '/storage/downloads/music' -pSabNzbdIncomplete = '/storage/downloads/incomplete' -pSickBeardTvScripts = os.path.join(pAddon, 'SickBeard/autoProcessTV') -pSabNzbdScripts = os.path.join(pAddonHome, 'scripts') - -# pylib -pPylib = os.path.join(pAddon, 'pylib') - -# service commands -sabnzbd = ['python', os.path.join(pAddon, 'SABnzbd/SABnzbd.py'), - '-d', '-f', pSabNzbdSettings, '-l 0'] -sickBeard = ['python', os.path.join(pAddon, 'SickBeard/SickBeard.py'), - '--daemon', '--datadir', pAddonHome, '--config', pSickBeardSettings] -couchPotatoServer = ['python', os.path.join(pAddon, 'CouchPotatoServer/CouchPotato.py'), - '--daemon', '--pid_file', os.path.join(pAddonHome, 'couchpotato.pid'), '--config_file', pCouchPotatoServerSettings] -headphones = ['python', os.path.join(pAddon, 'Headphones/Headphones.py'), - '-d', '--datadir', pAddonHome, '--config', pHeadphonesSettings] - -# Other stuff -sabNzbdHost = '127.0.0.1:8081' -addonId = 'service.downloadmanager.SABnzbd-Suite' - -# create directories and settings on first launch -# ----------------------------------------------- - -firstLaunch = not os.path.exists(pSabNzbdSettings) -if firstLaunch: - logging.debug('First launch, creating directories') - createDir(pAddonHome) - createDir(pSabNzbdComplete) - createDir(pSabNzbdCompleteMov) - createDir(pSabNzbdCompleteMusic) - createDir(pSabNzbdIncomplete) - createDir(pSabNzbdScripts) - shutil.copy(os.path.join(pSickBeardTvScripts,'sabToSickBeard.py'), pSabNzbdScripts) - shutil.copy(os.path.join(pSickBeardTvScripts,'autoProcessTV.py'), pSabNzbdScripts) - os.chmod(os.path.join(pSabNzbdScripts,'sabToSickBeard.py'), 0755) - # the settings file already exists if the user set settings before the first launch - if not os.path.exists(pSuiteSettings): - shutil.copy(pDefaultSuiteSettings, pSuiteSettings) - # make utilities executable - for utility in {'par2','unrar','unzip'}: - try: - os.chmod(os.path.join(pAddon, 'bin', utility), 0755) - except: - pass - -# read addon and xbmc settings -# ---------------------------- - -# Transmission-Daemon -if os.path.exists(pTransmission_Addon_Settings): - fTransmission_Addon_Settings = open(pTransmission_Addon_Settings, 'r') - data = fTransmission_Addon_Settings.read() - fTransmission_Addon_Settings.close - transmission_addon_settings = parseString(data) - transuser = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_USER') - transpwd = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_PWD') - transauth = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_AUTH') -else: - transauth = 'false' - -# SABnzbd-Suite -fSuiteSettings = open(pSuiteSettings, 'r') -data = fSuiteSettings.read() -fSuiteSettings.close -suiteSettings = parseString(data) -user = getAddonSetting(suiteSettings, 'SABNZBD_USER') -pwd = getAddonSetting(suiteSettings, 'SABNZBD_PWD') -host = getAddonSetting(suiteSettings, 'SABNZBD_IP') -sabNzbdKeepAwake = getAddonSetting(suiteSettings, 'SABNZBD_KEEP_AWAKE') -sabnzbd_launch = getAddonSetting(suiteSettings, 'SABNZBD_LAUNCH') -sickbeard_launch = getAddonSetting(suiteSettings, 'SICKBEARD_LAUNCH') -couchpotato_launch = getAddonSetting(suiteSettings, 'COUCHPOTATO_LAUNCH') -headphones_launch = getAddonSetting(suiteSettings, 'HEADPHONES_LAUNCH') - -# merge defaults -fDefaultSuiteSettings = open(pDefaultSuiteSettings, 'r') -data = fDefaultSuiteSettings.read() -fDefaultSuiteSettings.close -DefaultSuiteSettings = parseString(data) -if not sabnzbd_launch: - sabnzbd_launch = getAddonSetting(DefaultSuiteSettings, 'SABNZBD_LAUNCH') -if not sickbeard_launch: - sickbeard_launch = getAddonSetting(DefaultSuiteSettings, 'SICKBEARD_LAUNCH') -if not couchpotato_launch: - couchpotato_launch = getAddonSetting(DefaultSuiteSettings, 'COUCHPOTATO_LAUNCH') -if not headphones_launch: - headphones_launch = getAddonSetting(DefaultSuiteSettings, 'HEADPHONES_LAUNCH') - -# XBMC -fXbmcSettings = open(pXbmcSettings, 'r') -data = fXbmcSettings.read() -fXbmcSettings.close -xbmcSettings = parseString(data) -xbmcServices = xbmcSettings.getElementsByTagName('services')[0] -xbmcPort = xbmcServices.getElementsByTagName('webserverport')[0].firstChild.data -try: - xbmcUser = xbmcServices.getElementsByTagName('webserverusername')[0].firstChild.data -except: - xbmcUser = '' -try: - xbmcPwd = xbmcServices.getElementsByTagName('webserverpassword')[0].firstChild.data -except: - xbmcPwd = '' - -# prepare execution environment -# ----------------------------- - -signal.signal(signal.SIGCHLD, signal.SIG_DFL) -os.environ['PYTHONPATH'] = str(os.environ.get('PYTHONPATH')) + ':' + pPylib -sys.path.append(pPylib) - -from configobj import ConfigObj - -# SABnzbd start -try: - # write SABnzbd settings - # ---------------------- - sabNzbdConfig = ConfigObj(pSabNzbdSettings,create_empty=True) - defaultConfig = ConfigObj() - defaultConfig['misc'] = {} - defaultConfig['misc']['disable_api_key'] = '0' - defaultConfig['misc']['check_new_rel'] = '0' - defaultConfig['misc']['auto_browser'] = '0' - defaultConfig['misc']['username'] = user - defaultConfig['misc']['password'] = pwd - defaultConfig['misc']['port'] = '8081' - defaultConfig['misc']['https_port'] = '9081' - defaultConfig['misc']['https_cert'] = 'server.cert' - defaultConfig['misc']['https_key'] = 'server.key' - defaultConfig['misc']['host'] = host - defaultConfig['misc']['web_dir'] = 'Plush' - defaultConfig['misc']['web_dir2'] = 'Plush' - defaultConfig['misc']['web_color'] = 'gold' - defaultConfig['misc']['web_color2'] = 'gold' - defaultConfig['misc']['log_dir'] = 'logs' - defaultConfig['misc']['admin_dir'] = 'admin' - defaultConfig['misc']['nzb_backup_dir'] = 'backup' - defaultConfig['misc']['script_dir'] = 'scripts' - - if firstLaunch: - defaultConfig['misc']['download_dir'] = pSabNzbdIncomplete - defaultConfig['misc']['complete_dir'] = pSabNzbdComplete - servers = {} - servers['localhost'] = {} - servers['localhost']['host'] = 'localhost' - servers['localhost']['port'] = '119' - servers['localhost']['enable'] = '0' - categories = {} - categories['tv'] = {} - categories['tv']['name'] = 'tv' - categories['tv']['script'] = 'sabToSickBeard.py' - categories['tv']['priority'] = '-100' - categories['movies'] = {} - categories['movies']['name'] = 'movies' - categories['movies']['dir'] = 'movies' - categories['movies']['priority'] = '-100' - categories['music'] = {} - categories['music']['name'] = 'music' - categories['music']['dir'] = 'music' - categories['music']['priority'] = '-100' - defaultConfig['servers'] = servers - defaultConfig['categories'] = categories - - sabNzbdConfig.merge(defaultConfig) - sabNzbdConfig.write() - - # also keep the autoProcessTV config up to date - autoProcessConfig = ConfigObj(os.path.join(pSabNzbdScripts, 'autoProcessTV.cfg'), create_empty=True) - defaultConfig = ConfigObj() - defaultConfig['SickBeard'] = {} - defaultConfig['SickBeard']['host'] = 'localhost' - defaultConfig['SickBeard']['port'] = '8082' - defaultConfig['SickBeard']['username'] = user - defaultConfig['SickBeard']['password'] = pwd - autoProcessConfig.merge(defaultConfig) - autoProcessConfig.write() - - # launch SABnzbd and get the API key - # ---------------------------------- - if firstLaunch or "true" in sabnzbd_launch: - logging.debug('Launching SABnzbd...') - subprocess.call(sabnzbd,close_fds=True) - logging.debug('...done') - - # SABnzbd will only complete the .ini file when we first access the web interface - if firstLaunch: - loadWebInterface('http://' + sabNzbdHost,user,pwd) - sabNzbdConfig.reload() - sabNzbdApiKey = sabNzbdConfig['misc']['api_key'] - logging.debug('SABnzbd api key: ' + sabNzbdApiKey) - if firstLaunch and "false" in sabnzbd_launch: - urllib2.urlopen('http://' + sabNzbdHost + '/api?mode=shutdown&apikey=' + sabNzbdApiKey) -except Exception,e: - print 'SABnzbd: exception occurred:', e - print traceback.format_exc() -# SABnzbd end - -# SickBeard start -try: - # write SickBeard settings - # ------------------------ - sickBeardConfig = ConfigObj(pSickBeardSettings,create_empty=True) - defaultConfig = ConfigObj() - defaultConfig['General'] = {} - defaultConfig['General']['launch_browser'] = '0' - defaultConfig['General']['version_notify'] = '0' - defaultConfig['General']['log_dir'] = 'logs' - defaultConfig['General']['web_port'] = '8082' - defaultConfig['General']['web_host'] = host - defaultConfig['General']['web_username'] = user - defaultConfig['General']['web_password'] = pwd - if "true" in sabnzbd_launch: - defaultConfig['SABnzbd'] = {} - defaultConfig['SABnzbd']['sab_username'] = user - defaultConfig['SABnzbd']['sab_password'] = pwd - defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey - defaultConfig['SABnzbd']['sab_host'] = 'http://' + sabNzbdHost + '/' - defaultConfig['XBMC'] = {} - defaultConfig['XBMC']['use_xbmc'] = '1' - defaultConfig['XBMC']['xbmc_host'] = '127.0.0.1:' + xbmcPort - defaultConfig['XBMC']['xbmc_username'] = xbmcUser - defaultConfig['XBMC']['xbmc_password'] = xbmcPwd - - if firstLaunch: - defaultConfig['General']['metadata_xbmc'] = '1|1|1|1|1|1' - defaultConfig['General']['nzb_method'] = 'sabnzbd' - defaultConfig['General']['keep_processed_dir'] = '0' - defaultConfig['General']['use_banner'] = '1' - defaultConfig['General']['rename_episodes'] = '1' - defaultConfig['General']['naming_ep_name'] = '0' - defaultConfig['General']['naming_use_periods'] = '1' - defaultConfig['General']['naming_sep_type'] = '1' - defaultConfig['General']['naming_ep_type'] = '1' - defaultConfig['General']['root_dirs'] = '0|/storage/tvshows' - defaultConfig['SABnzbd']['sab_category'] = 'tv' - # workaround: on first launch, sick beard will always add - # 'http://' and trailing '/' on its own - defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost - defaultConfig['XBMC']['xbmc_notify_ondownload'] = '1' - defaultConfig['XBMC']['xbmc_update_library'] = '1' - defaultConfig['XBMC']['xbmc_update_full'] = '1' - - sickBeardConfig.merge(defaultConfig) - sickBeardConfig.write() - - # launch SickBeard - # ---------------- - if "true" in sickbeard_launch: - logging.debug('Launching SickBeard...') - subprocess.call(sickBeard,close_fds=True) - logging.debug('...done') -except Exception,e: - print 'SickBeard: exception occurred:', e - print traceback.format_exc() -# SickBeard end - -# CouchPotatoServer start -try: - # empty password hack - if pwd == '': - md5pwd = '' - else: - #convert password to md5 - md5pwd = hashlib.md5(str(pwd)).hexdigest() - - # write CouchPotatoServer settings - # -------------------------- - couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True, list_values=False) - defaultConfig = ConfigObj() - defaultConfig['core'] = {} - defaultConfig['core']['username'] = user - defaultConfig['core']['password'] = md5pwd - defaultConfig['core']['port'] = '8083' - defaultConfig['core']['launch_browser'] = '0' - defaultConfig['core']['host'] = host - defaultConfig['core']['data_dir'] = pAddonHome - defaultConfig['core']['permission_folder'] = '0644' - defaultConfig['core']['permission_file'] = '0644' - defaultConfig['core']['show_wizard'] = '0' - defaultConfig['core']['debug'] = '0' - defaultConfig['core']['development'] = '0' - defaultConfig['updater'] = {} - defaultConfig['updater']['enabled'] = '0' - defaultConfig['updater']['notification'] = '0' - defaultConfig['updater']['automatic'] = '0' - if "true" in sabnzbd_launch: - defaultConfig['Sabnzbd'] = {} - defaultConfig['Sabnzbd']['username'] = user - defaultConfig['Sabnzbd']['password'] = pwd - defaultConfig['Sabnzbd']['api_key'] = sabNzbdApiKey - defaultConfig['Sabnzbd']['host'] = sabNzbdHost - defaultConfig['xbmc'] = {} - defaultConfig['xbmc']['enabled'] = '1' - defaultConfig['xbmc']['host'] = '127.0.0.1:' + xbmcPort - defaultConfig['xbmc']['username'] = xbmcUser - defaultConfig['xbmc']['password'] = xbmcPwd - - if 'true' in transauth: - defaultConfig['transmission'] = {} - defaultConfig['transmission']['username'] = transuser - defaultConfig['transmission']['password'] = transpwd - defaultConfig['transmission']['directory'] = pSabNzbdCompleteMov - defaultConfig['transmission']['host'] = 'localhost:9091' - - if firstLaunch: - defaultConfig['xbmc']['xbmc_update_library'] = '1' - defaultConfig['xbmc']['xbmc_update_full'] = '1' - defaultConfig['xbmc']['xbmc_notify_onsnatch'] = '1' - defaultConfig['xbmc']['xbmc_notify_ondownload'] = '1' - defaultConfig['Sabnzbd']['category'] = 'movies' - defaultConfig['Sabnzbd']['pp_directory'] = pSabNzbdCompleteMov - defaultConfig['Renamer'] = {} - defaultConfig['Renamer']['enabled'] = '1' - defaultConfig['Renamer']['download'] = pSabNzbdCompleteMov - defaultConfig['Renamer']['destination'] = '/storage/videos' - defaultConfig['Renamer']['separator'] = '.' - defaultConfig['Renamer']['cleanup'] = '0' - - couchPotatoServerConfig.merge(defaultConfig) - couchPotatoServerConfig.write() - - # launch CouchPotatoServer - # ------------------ - if "true" in couchpotato_launch: - logging.debug('Launching CouchPotatoServer...') - subprocess.call(couchPotatoServer,close_fds=True) - logging.debug('...done') -except Exception,e: - print 'CouchPotatoServer: exception occurred:', e - print traceback.format_exc() -# CouchPotatoServer end - -# Headphones start -try: - # write Headphones settings - # ------------------------- - headphonesConfig = ConfigObj(pHeadphonesSettings,create_empty=True) - defaultConfig = ConfigObj() - defaultConfig['General'] = {} - defaultConfig['General']['launch_browser'] = '0' - defaultConfig['General']['http_port'] = '8084' - defaultConfig['General']['http_host'] = host - defaultConfig['General']['http_username'] = user - defaultConfig['General']['http_password'] = pwd - defaultConfig['General']['check_github'] = '0' - defaultConfig['General']['check_github_on_startup'] = '0' - defaultConfig['General']['log_dir'] = pAddonHome + '/logs' - defaultConfig['General']['folder_permissions'] = '0644' - defaultConfig['XBMC'] = {} - defaultConfig['XBMC']['xbmc_enabled'] = '1' - defaultConfig['XBMC']['xbmc_host'] = '127.0.0.1:' + xbmcPort - defaultConfig['XBMC']['xbmc_username'] = xbmcUser - defaultConfig['XBMC']['xbmc_password'] = xbmcPwd - defaultConfig['SABnzbd'] = {} - - if "true" in sabnzbd_launch: - defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey - defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost - defaultConfig['SABnzbd']['sab_username'] = user - defaultConfig['SABnzbd']['sab_password'] = pwd - - if firstLaunch: - defaultConfig['SABnzbd']['sab_category'] = 'music' - defaultConfig['XBMC']['xbmc_update'] = '1' - defaultConfig['XBMC']['xbmc_notify'] = '1' - defaultConfig['General']['music_dir'] = '/storage/music' - defaultConfig['General']['destination_dir'] = '/storage/music' - defaultConfig['General']['download_dir'] = '/storage/downloads/music' - defaultConfig['General']['move_files'] = '1' - defaultConfig['General']['rename_files'] = '1' - - headphonesConfig.merge(defaultConfig) - headphonesConfig.write() - - # launch Headphones - # ----------------- - if "true" in headphones_launch: - logging.debug('Launching Headphones...') - subprocess.call(headphones,close_fds=True) - logging.debug('...done') -except Exception,e: - print 'Headphones: exception occurred:', e - print traceback.format_exc() -# Headphones end diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop deleted file mode 100755 index f240d07576..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -kill `ps | grep -E 'python.*service.downloadmanager.SABnzbd-Suite' | awk '{print $1}'` 2>/dev/null diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py deleted file mode 100644 index 9845897e72..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py +++ /dev/null @@ -1,139 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -import os -import sys -import xbmcaddon -import time -import subprocess -import xbmc -import urllib2 -import socket -import time -import datetime - -__scriptname__ = "SABnzbd Suite" -__author__ = "OpenELEC" -__url__ = "http://www.openelec.tv" -__settings__ = xbmcaddon.Addon(id='service.downloadmanager.SABnzbd-Suite') -__cwd__ = __settings__.getAddonInfo('path') -__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.py") ) -__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.stop") ) - -#make binary files executable in adson bin folder -subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True) - -checkInterval = 240 -timeout = 20 -wake_times = ['01:00','03:00','05:00','07:00','09:00','11:00','13:00','15:00','17:00','19:00','21:00','23:00'] -idleTimer = 0 - -# Launch Suite -subprocess.call(['python',__start__]) - -# check for launching sabnzbd -sabNzbdLaunch = (__settings__.getSetting('SABNZBD_LAUNCH').lower() == 'true') - -sys.path.append(os.path.join(__cwd__, 'pylib')) -from configobj import ConfigObj - -if sabNzbdLaunch: - # SABnzbd addresses and api key - sabNzbdAddress = '127.0.0.1:8081' - sabNzbdConfigFile = '/storage/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite/sabnzbd.ini' - sabConfiguration = ConfigObj(sabNzbdConfigFile) - sabNzbdApiKey = sabConfiguration['misc']['api_key'] - sabNzbdUser = sabConfiguration['misc']['username'] - sabNzbdPass = sabConfiguration['misc']['password'] - sabNzbdQueue = 'http://' + sabNzbdAddress + '/api?mode=queue&output=xml&apikey=' + sabNzbdApiKey + '&ma_username=' + sabNzbdUser + '&ma_password=' + sabNzbdPass - sabNzbdHistory = 'http://' + sabNzbdAddress + '/api?mode=history&output=xml&apikey=' + sabNzbdApiKey + '&ma_username=' + sabNzbdUser + '&ma_password=' + sabNzbdPass - sabNzbdQueueKeywords = ['Downloading', 'Fetching', 'Force'] - sabNzbdHistoryKeywords = ['Repairing', 'Verifying', 'Extracting'] - - # start checking SABnzbd for activity and prevent sleeping if necessary - socket.setdefaulttimeout(timeout) - - # perform some initial checks and log essential settings - shouldKeepAwake = (__settings__.getSetting('SABNZBD_KEEP_AWAKE').lower() == 'true') - wakePeriodically = (__settings__.getSetting('SABNZBD_PERIODIC_WAKE').lower() == 'true') - wakeHourIdx = int(__settings__.getSetting('SABNZBD_WAKE_AT')) - if shouldKeepAwake: - xbmc.log('SABnzbd-Suite: will prevent idle sleep/shutdown while downloading') - if wakePeriodically: - xbmc.log('SABnzbd-Suite: will try to wake system daily at ' + wake_times[wakeHourIdx]) - - -while (not xbmc.abortRequested): - - if sabNzbdLaunch: - # reread setting in case it has changed - shouldKeepAwake = (__settings__.getSetting('SABNZBD_KEEP_AWAKE').lower() == 'true') - wakePeriodically = (__settings__.getSetting('SABNZBD_PERIODIC_WAKE').lower() == 'true') - wakeHourIdx = int(__settings__.getSetting('SABNZBD_WAKE_AT')) - - # check if SABnzbd is downloading - if shouldKeepAwake: - idleTimer += 1 - # check SABnzbd every ~60s (240 cycles) - if idleTimer == checkInterval: - sabIsActive = False - idleTimer = 0 - req = urllib2.Request(sabNzbdQueue) - try: handle = urllib2.urlopen(req) - except IOError, e: - xbmc.log('SABnzbd-Suite: could not determine SABnzbds queue status', level=xbmc.LOGERROR) - else: - queue = handle.read() - handle.close() - if any(x in queue for x in sabNzbdQueueKeywords): - sabIsActive = True - - req = urllib2.Request(sabNzbdHistory) - try: handle = urllib2.urlopen(req) - except IOError, e: - xbmc.log('SABnzbd-Suite: could not determine SABnzbds history status', level=xbmc.LOGERROR) - else: - history = handle.read() - handle.close() - if any(x in history for x in sabNzbdHistoryKeywords): - sabIsActive = True - - # reset idle timer if queue is downloading/reparing/verifying/extracting - if sabIsActive: - xbmc.executebuiltin('InhibitIdleShutdown(true)') - else: - xbmc.executebuiltin('InhibitIdleShutdown(false)') - - # calculate and set the time to wake up at (if any) - if wakePeriodically: - wakeHour = wakeHourIdx * 2 + 1 - timeOfDay = datetime.time(hour=wakeHour) - now = datetime.datetime.now() - wakeTime = now.combine(now.date(),timeOfDay) - if now.time() > timeOfDay: - wakeTime += datetime.timedelta(days=1) - secondsSinceEpoch = time.mktime(wakeTime.timetuple()) - open("/sys/class/rtc/rtc0/wakealarm", "w").write("0") - open("/sys/class/rtc/rtc0/wakealarm", "w").write(str(secondsSinceEpoch)) - - time.sleep(0.250) - -subprocess.Popen(__stop__, shell=True, close_fds=True) - diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Dutch/strings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Dutch/strings.xml deleted file mode 100644 index 491c00149a..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Dutch/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd-Suite - Gebruikers instellingen - Gebruikersnaam - Wachtwoord - Netwerk instellingen - Toegestane IP adressen - - diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml deleted file mode 100644 index 7bd7d0e8f8..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - SABnzbd-Suite - User Settings - Username - Password - Enable SABnzbd - Enable Sickbeard - Enable Couchpotato - Enable Headphones - Network Settings - Allowed IP addresses - Sleep - Keep awake while downloading - Wake up periodically - Wake up at - Restart on suspend / resume - - diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/French/strings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/French/strings.xml deleted file mode 100644 index ac318084fd..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/French/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd-Suite - Préférences utilisateur - Nom d'utilisateur - Mot de passe - Préférences réseau - Adresses IP autorisées - - diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/German/strings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/German/strings.xml deleted file mode 100644 index 0ff4656c37..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/German/strings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - SABnzbd-Suite - Benutzer Einstellungen - Benutzername - Passwort - Netzwerk Einstellungen - Erlaubte IP Adressen - Ruhezustand - Verhindere Ruhezustand wenn aktiv - Periodisch aufwachen - Aufwachen um - - diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Norwegian/strings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Norwegian/strings.xml deleted file mode 100644 index 8e5b0adc9a..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Norwegian/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd-Suite - Bruker Instillinger - Brukernavn - Passord - Nettverksinstillinger - Tilatte IP addresser - - diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Turkish/strings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Turkish/strings.xml deleted file mode 100644 index ae24ad356e..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Turkish/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - SABnzbd-Suite - Kullanıcı Ayarları - Kullanıcı adı - Parola - SABnzbd'yi EtkinleÅŸtir - Sickbeard'ı EtkinleÅŸtir - Couchpotato'yu EtkinleÅŸtir - Headphones'u EtkinleÅŸtir - AÄŸ Ayarları - Ä°zin verilen IP adresleri - Uyku - Ä°ndirilirken uyanık tut - Düzenli olarak uyandır - Uyandırma zamanı - - diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml deleted file mode 100644 index cf20410a95..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/sleep.d/SABnzbd-Suite.power b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/sleep.d/SABnzbd-Suite.power deleted file mode 100644 index b1674a064e..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/sleep.d/SABnzbd-Suite.power +++ /dev/null @@ -1,51 +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 -################################################################################ - -. /etc/profile - -ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite" -ADDON_SETTINGS="$ADDON_HOME/settings.xml" -RESTART_ON_RESUME=`grep RESTART_ON_RESUME $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` - -LOCKFILE="/var/lock/SABnzbd-Suite.sleep" - -if [ "$RESTART_ON_RESUME" == "true" ] ; then - case "$1" in - hibernate|suspend) - if [ ! -z "`ps | grep -E 'python.*service.downloadmanager.SABnzbd-Suite' | awk '{print $1}'`" ] ; then - progress "Shutting down SABnzbd-Suite for suspending..." - SABnzbd-Suite.stop - touch $LOCKFILE - fi - ;; - - thaw|resume) - progress "Restarting SABnzbd-Suite for wakeup..." - if [ -f "$LOCKFILE" ] ; then - rm -rf "$LOCKFILE" - python $HOME/.xbmc/addons/service.downloadmanager.SABnzbd-Suite/bin/SABnzbd-Suite.py - fi - ;; - *) exit $NA - ;; - esac -fi diff --git a/packages/addons/service/downloadmanager/pyload/addon b/packages/addons/service/downloadmanager/pyload/addon deleted file mode 100755 index 3003a7237d..0000000000 --- a/packages/addons/service/downloadmanager/pyload/addon +++ /dev/null @@ -1,32 +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 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib - cp -R $BUILD/pycurl*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pyload - cp -PR $PKG_BUILD/pyload/* $ADDON_BUILD/$PKG_ADDON_ID/pyload diff --git a/packages/addons/service/downloadmanager/pyload/changelog.txt b/packages/addons/service/downloadmanager/pyload/changelog.txt deleted file mode 100644 index fcec956f24..0000000000 --- a/packages/addons/service/downloadmanager/pyload/changelog.txt +++ /dev/null @@ -1,17 +0,0 @@ -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.2 -- pycrypto is installed per default now - -3.0.1 -- bump addon version - -2.1.1 -- update to addon version 2.1 - -2.0.1 -- update to pyload-0.4.9 - -0.99.1 -- initial version pyload-0.4.7 diff --git a/packages/addons/service/downloadmanager/pyload/icon/icon.png b/packages/addons/service/downloadmanager/pyload/icon/icon.png deleted file mode 100644 index 72a95b740b..0000000000 Binary files a/packages/addons/service/downloadmanager/pyload/icon/icon.png and /dev/null differ diff --git a/packages/addons/service/downloadmanager/pyload/meta b/packages/addons/service/downloadmanager/pyload/meta deleted file mode 100644 index 72d754a2ea..0000000000 --- a/packages/addons/service/downloadmanager/pyload/meta +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="pyload" -PKG_VERSION="0.4.9" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://pyload.org/" -PKG_URL="http://download.pyload.org/$PKG_NAME-src-v$PKG_VERSION.zip" -PKG_DEPENDS="Python" -PKG_BUILD_DEPENDS="toolchain Python pycurl pycrypto unrar" -PKG_PRIORITY="optional" -PKG_SECTION="service/downloadmanager" -PKG_SHORTDESC="pyLoad is a fast, lightweight and full featured download manager" -PKG_LONGDESC="pyLoad is a fast, lightweight and full featured download manager for many One-Click-Hoster, container formats like DLC, video sites or just plain http/ftp links. It aims for low hardware requirements and platform independence to be runnable on all kind of systems (desktop pc, netbook, NAS, router)." - -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.service" - -PKG_AUTORECONF="no" diff --git a/packages/addons/service/downloadmanager/pyload/source/bin/pyload.service b/packages/addons/service/downloadmanager/pyload/source/bin/pyload.service deleted file mode 100755 index 76e749fcbb..0000000000 --- a/packages/addons/service/downloadmanager/pyload/source/bin/pyload.service +++ /dev/null @@ -1,32 +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 -################################################################################ - -# Addon settings - ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.pyload" - ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.pyload" - - export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib" - -################################################################################ -# start pyload -################################################################################ - python $ADDON_DIR/pyload/pyLoadCore.py --daemon --configdir=$ADDON_HOME diff --git a/packages/addons/service/downloadmanager/pyload/source/default.py b/packages/addons/service/downloadmanager/pyload/source/default.py deleted file mode 100644 index 46d8a10009..0000000000 --- a/packages/addons/service/downloadmanager/pyload/source/default.py +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -import xbmc, time, os, subprocess - -subprocess.Popen("pyload.service", shell=True, close_fds=True) \ No newline at end of file diff --git a/packages/addons/service/downloadmanager/pyload/unpack b/packages/addons/service/downloadmanager/pyload/unpack deleted file mode 100755 index a7df66721b..0000000000 --- a/packages/addons/service/downloadmanager/pyload/unpack +++ /dev/null @@ -1,30 +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 - -ZIP_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`" - -mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION} - -# unzip main archive - unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1 diff --git a/packages/addons/service/downloadmanager/transmission/addon b/packages/addons/service/downloadmanager/transmission/addon deleted file mode 100755 index 8a1d44ff5a..0000000000 --- a/packages/addons/service/downloadmanager/transmission/addon +++ /dev/null @@ -1,32 +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 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_BUILD/daemon/transmission-daemon $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_BUILD/daemon/transmission-remote $ADDON_BUILD/$PKG_ADDON_ID/bin - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/web - cp -R $PKG_BUILD/web/* $ADDON_BUILD/$PKG_ADDON_ID/web - find $ADDON_BUILD/$PKG_ADDON_ID/web -name "Makefile*" -exec rm -rf {} ";" - rm -rf $ADDON_BUILD/$PKG_ADDON_ID/web/LICENSE diff --git a/packages/addons/service/downloadmanager/transmission/build b/packages/addons/service/downloadmanager/transmission/build deleted file mode 100755 index 170f27ba72..0000000000 --- a/packages/addons/service/downloadmanager/transmission/build +++ /dev/null @@ -1,42 +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 $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - --enable-utp \ - --enable-largefile \ - --disable-nls \ - --disable-cli \ - --disable-mac \ - --enable-lightweight \ - --enable-daemon \ - --with-gnu-ld \ - -make V=1 diff --git a/packages/addons/service/downloadmanager/transmission/changelog.txt b/packages/addons/service/downloadmanager/transmission/changelog.txt deleted file mode 100644 index 7468a705d3..0000000000 --- a/packages/addons/service/downloadmanager/transmission/changelog.txt +++ /dev/null @@ -1,95 +0,0 @@ -3.1.2 -- update to transmission-2.80 - -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.5 -- config cleanup (peer limits) - -3.0.4 -- update to transmission-2.77 - -3.0.3 -- update to transmission-2.76 -- update libevent to libevent-2.0.21-stable - -3.0.2 -- update to transmission-2.74 - -3.0.1 -- bump addon version -- update to transmission-2.73 - -2.1.7 -- update to transmission-2.72 - -2.1.6 -- update to transmission-2.71 - -2.1.5 -- update to transmission-2.61 -- update libevent to libevent-2.0.19-stable - -2.1.4 -- update to transmission-2.52 - -2.1.3 -- update to transmission-2.51 -- added option to specify download directory - -2.1.2 -- update to addon version 2.1 - -2.0.4 -- update to transmission-2.50 - -2.0.3 -- rebuild for libiconv changes - -2.0.2 -- update libevent to libevent-2.0.16-stable - -2.0.1 -- fix service script - -2.0.0 -- prepare for OpenELEC-2.0 release - -1.90.2 -- depends on xbmc.python API 2.0 - -1.90.1 -- update to transmission-2.42 - -1.90.0 -- prepare for OpenELEC-1.90 release - -1.0.0 -- update to transmission-2.41 -- prepare for OpenELEC-1.0 release - -0.99.8 -- update to transmission-2.33 -- add libevent to addon - -0.99.7 -- change icon - -0.99.6 -- rebuild for openssl downgrade - -0.99.5 -- simplyfing start scripts - -0.99.4 -- fix paths - -0.99.3 -- prepare for release - -0.99.2 -- update to transmission-2.31 - -0.99.1 -- initial version transmission-2.20 diff --git a/packages/addons/service/downloadmanager/transmission/icon/icon.png b/packages/addons/service/downloadmanager/transmission/icon/icon.png deleted file mode 100644 index 02e077365f..0000000000 Binary files a/packages/addons/service/downloadmanager/transmission/icon/icon.png and /dev/null differ diff --git a/packages/addons/service/downloadmanager/transmission/meta b/packages/addons/service/downloadmanager/transmission/meta deleted file mode 100644 index cb158c40e3..0000000000 --- a/packages/addons/service/downloadmanager/transmission/meta +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="transmission" -PKG_VERSION="2.80" -PKG_REV="2" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.transmissionbt.com/" -PKG_URL="http://download.transmissionbt.com/files/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="zlib openssl curl libevent" -PKG_BUILD_DEPENDS="toolchain zlib openssl curl libevent" -PKG_PRIORITY="optional" -PKG_SECTION="service/downloadmanager" -PKG_SHORTDESC="transmission: a fast, easy and free BitTorrent client" -PKG_LONGDESC="transmission is a fast, easy and free BitTorrent client" - -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.service" - -PKG_AUTORECONF="yes" diff --git a/packages/addons/service/downloadmanager/transmission/patches/transmission-2.77-automake-1.13.patch b/packages/addons/service/downloadmanager/transmission/patches/transmission-2.77-automake-1.13.patch deleted file mode 100644 index 64a441b6b6..0000000000 --- a/packages/addons/service/downloadmanager/transmission/patches/transmission-2.77-automake-1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur transmission-2.76/configure.ac transmission-2.76.patch/configure.ac ---- transmission-2.76/configure.ac 2013-01-09 03:32:09.534138180 +0200 -+++ transmission-2.76.patch/configure.ac 2013-01-12 22:44:37.881897688 +0200 -@@ -14,7 +14,7 @@ - - AC_CONFIG_MACRO_DIR([m4]) - --dnl AM_CONFIG_HEADER(config.h) -+dnl AC_CONFIG_HEADERS(config.h) - AC_CONFIG_SRCDIR(libtransmission/transmission.h) - AM_INIT_AUTOMAKE([1.9 tar-pax]) - LT_INIT diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start deleted file mode 100755 index 7cd72f023f..0000000000 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ /dev/null @@ -1,82 +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 -################################################################################ - -. /etc/profile - -ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.transmission" -ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.transmission" -LOG_FILE="$ADDON_HOME/service.log" - -LOCKDIR="/var/lock/" -LOCKFILE="transmission.disabled" - -export TRANSMISSION_WEB_HOME="$ADDON_DIR/web" - -mkdir -p $ADDON_HOME -ADDON_SETTINGS="$ADDON_HOME/settings.xml" - -if [ ! -f "$ADDON_SETTINGS" ]; then - cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS -fi - -mkdir -p /var/config -cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/transmission.conf.default -cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/transmission.conf -. /var/config/transmission.conf.default -. /var/config/transmission.conf - -mkdir -p "$TRANSMISSION_DL_DIR" -mkdir -p "$TRANSMISSION_DL_DIR/incoming" -mkdir -p "$TRANSMISSION_DL_DIR/watch" - -if [ -z "$TRANSMISSION_IP" ]; then - TRANSMISSION_IP="*.*.*.*" -fi - -TRANSMISSION_ARG="$TRANSMISSION_ARG -w \"$TRANSMISSION_DL_DIR\"" -TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir \"$TRANSMISSION_DL_DIR/incoming\"" -TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir \"$TRANSMISSION_DL_DIR/watch\"" -TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log" -TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission" - -TRANSMISSION_ARG="$TRANSMISSION_ARG -a '$TRANSMISSION_IP'" - -if [ "$TRANSMISSION_AUTH" = "true" ]; then - TRANSMISSION_ARG="$TRANSMISSION_ARG -t" - TRANSMISSION_ARG="$TRANSMISSION_ARG -u $TRANSMISSION_USER" - TRANSMISSION_ARG="$TRANSMISSION_ARG -v $TRANSMISSION_PWD" -else - TRANSMISSION_ARG="$TRANSMISSION_ARG -T" -fi - -if [ ! "$(pidof transmission-daemon)" ];then - if [ -f "$LOCKDIR/$LOCKFILE" ] ; then - rm -rf "$LOCKDIR/$LOCKFILE" - fi - while [ true ] ; do - if [ -f "$LOCKDIR/$LOCKFILE" ] ; then - break - fi - EVENT_NOEPOLL=1 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" eval transmission-daemon -f $TRANSMISSION_ARG &>$LOG_FILE - sleep 1 - done & -fi diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop deleted file mode 100755 index 282f21faa9..0000000000 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop +++ /dev/null @@ -1,33 +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 -################################################################################ - -. /etc/profile - -LOCKDIR="/var/lock/" -LOCKFILE="transmission.disabled" - -mkdir -p "$LOCKDIR" -touch "$LOCKDIR/$LOCKFILE" - -if [ "$(pidof transmission-daemon)" ];then - killall transmission-daemon -fi diff --git a/packages/addons/service/downloadmanager/transmission/source/default.py b/packages/addons/service/downloadmanager/transmission/source/default.py deleted file mode 100644 index 25e184d622..0000000000 --- a/packages/addons/service/downloadmanager/transmission/source/default.py +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -import os -import sys -import xbmcaddon -import time -import subprocess - -__scriptname__ = "Transmission BT Client" -__author__ = "OpenELEC" -__url__ = "http://www.openelec.tv" -__settings__ = xbmcaddon.Addon(id='service.downloadmanager.transmission') -__cwd__ = __settings__.getAddonInfo('path') -__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "transmission.start") ) -__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "transmission.stop") ) - -#make binary files executable in adson bin folder -subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True) - -subprocess.Popen(__start__, shell=True, close_fds=True) - -while (not xbmc.abortRequested): - time.sleep(0.250) - -subprocess.Popen(__stop__, shell=True, close_fds=True) - diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/language/Dutch/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/Dutch/strings.xml deleted file mode 100644 index fa0aa99153..0000000000 --- a/packages/addons/service/downloadmanager/transmission/source/resources/language/Dutch/strings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - Transmission - Gebruikers instellingen - Gebruik verificatie - Gebruikersnaam - Wachtwoord - Netwerk instellingen - Toegestane IP adressen (gescheiden met een ',') - - diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml deleted file mode 100644 index 13aa9d6139..0000000000 --- a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Transmission - User Settings - Use authentification - Username - Password - Network Settings - Allowed IP addresses (comma-delimited) - - Other - Download Directory - - diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/language/French/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/French/strings.xml deleted file mode 100644 index 2abe85fd7a..0000000000 --- a/packages/addons/service/downloadmanager/transmission/source/resources/language/French/strings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - Transmission - Préférences utilisateur - Utiliser une authentification - Nom d'utilisateur - Mot de passe - Préférences réseau - Adresses IP autorisées (séparées par des virgules) - - diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/language/German/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/German/strings.xml deleted file mode 100644 index 542f5757d1..0000000000 --- a/packages/addons/service/downloadmanager/transmission/source/resources/language/German/strings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - Transmission - Benutzer Einstellungen - Authentifizierung verwenden - Benutzername - Passwort - Netzwerk Einstellungen - Erlaubte IP Adressen (durch Komma getrennt) - - diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/language/Norwegian/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/Norwegian/strings.xml deleted file mode 100644 index 24538d14c1..0000000000 --- a/packages/addons/service/downloadmanager/transmission/source/resources/language/Norwegian/strings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - Transmission - Bruker Instillinger - Bruk inlogging - Brukernavn - Passord - Nettverksinstillinger - Tilatte IP addresser (komma-avgrenser) - - diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/language/Turkish/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/Turkish/strings.xml deleted file mode 100644 index 946e075687..0000000000 --- a/packages/addons/service/downloadmanager/transmission/source/resources/language/Turkish/strings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Transmission - Kullanıcı Ayarları - Kimlik doÄŸrulama kullan - Kullanıcı adı - Parola - AÄŸ Ayarları - Ä°zin verilen IP adresleri (virgülle ayrılmış) - - DiÄŸer - Ä°ndirme Dizini - - diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml deleted file mode 100644 index 2d9120c256..0000000000 --- a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml deleted file mode 100644 index 8d3b52560a..0000000000 --- a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/packages/addons/service/softcam/oscam/addon b/packages/addons/service/softcam/oscam/addon deleted file mode 100755 index 135872f2f0..0000000000 --- a/packages/addons/service/softcam/oscam/addon +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID - cp -PR $PKG_DIR/config/settings.xml $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/build/utils/list_smargo $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf diff --git a/packages/addons/service/softcam/oscam/build b/packages/addons/service/softcam/oscam/build deleted file mode 100755 index 092142fefb..0000000000 --- a/packages/addons/service/softcam/oscam/build +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 $PKG_BUILD -mkdir -p build && cd build - -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIBUSBDIR=$SYSROOT_PREFIX/usr \ - -DWITH_SSL=0 \ - -DHAVE_LIBCRYPTO=0 \ - -DHAVE_DVBAPI=1 -DWITH_STAPI=0 \ - -DMODULE_CAMD33=1 \ - -DWEBIF=1 \ - -DWITH_DEBUG=0 \ - -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \ - -DSTATIC_LIBUSB=1 \ - .. - -make diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/packages/addons/service/softcam/oscam/changelog.txt deleted file mode 100644 index f3270c8096..0000000000 --- a/packages/addons/service/softcam/oscam/changelog.txt +++ /dev/null @@ -1,85 +0,0 @@ -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.12 -- update to oscam-8695 -- improve suspend/resume - -3.0.11 -- update to oscam-8678 - -3.0.10 -- update to oscam-8636 - -3.0.9 -- update to oscam-8568 - -3.0.8 -- update to oscam-8469 -- update to pcsc-lite-1.8.8 - -3.0.7 -- update to oscam-8357 - -3.0.6 -- update to oscam-8334 - -3.0.5 -- update to oscam-8119 -- use internal crypto functions -- disable ssl support -- disable debug support - -3.0.4 -- update to oscam-8030 -- update to pcsc-lite-1.8.7 - -3.0.3 -- update to oscam-7968 - -3.0.2 -- update to pcsc-lite-1.8.6 - -3.0.1 -- bump addon version - -2.1.7 -- add option to restart on suspend / resume - -2.1.6 -- update to oscam-7168 - -2.1.5 -- update to oscam-7038 -- start userspace DVB drivers before oscam - -2.1.4 -- update to oscam-6626 - * added bulcrypt cas support - -2.1.3 -- update to oscam-6596 - -2.1.2 -- update to oscam-6576 - -2.1.1 -- update to addon version 2.1 - -2.0.3 -- add pcsc reader support - -2.0.2 -- add possibilty to start / stop addon from addon manager with enable / disable - -2.0.1 -- enable libusb support for smartcard support - -2.0.0 -- update to oscam-6136 - -0.99.2 -- update to oscam-5386 - -0.99.1 -- initial version oscam-5377 diff --git a/packages/addons/service/softcam/oscam/config/oscam.conf b/packages/addons/service/softcam/oscam/config/oscam.conf deleted file mode 100644 index f5a0ebc151..0000000000 --- a/packages/addons/service/softcam/oscam/config/oscam.conf +++ /dev/null @@ -1,31 +0,0 @@ -# oscam.conf generated automatically by Streamboard OSCAM 1.00-unstable_svn build #0 -# Read more: http://streamboard.gmc.to/svn/oscam/trunk/Distribution/doc/txt/oscam.conf.txt - -[global] -usrfile = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/oscamuser.log -logfile = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/oscam.log -cwlogdir = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/cw -nice = -1 -saveinithistory = 1 - -[monitor] -port = 988 -aulow = 120 -hideclient_to = 15 -monlevel = 1 -appendchaninfo = 0 - -[webif] -httpport = 8888 -httpuser = oscam -httppwd = oscam -httpallowed = 0.0.0.0-255.255.255.255 - -[anticasc] -enabled = 1 -numusers = 1 -samples = 5 -penalty = 1 -aclogfile = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/aclog.log -denysamples = 4 - diff --git a/packages/addons/service/softcam/oscam/config/settings.xml b/packages/addons/service/softcam/oscam/config/settings.xml deleted file mode 100644 index 464b4519ec..0000000000 --- a/packages/addons/service/softcam/oscam/config/settings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/addons/service/softcam/oscam/icon/icon.png b/packages/addons/service/softcam/oscam/icon/icon.png deleted file mode 100644 index b936a07d69..0000000000 Binary files a/packages/addons/service/softcam/oscam/icon/icon.png and /dev/null differ diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta deleted file mode 100644 index f367cb0839..0000000000 --- a/packages/addons/service/softcam/oscam/meta +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 -################################################################################ - -PKG_NAME="oscam" -PKG_VERSION="8695" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.streamboard.tv/oscam/wiki" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain pcsc-lite" -PKG_PRIORITY="optional" -PKG_SECTION="service/softcam" -PKG_SHORTDESC="oscam: OSCam is Open Source Conditional Access Modul." -PKG_LONGDESC="OSCam is Open Source Conditional Access Modul." -PKG_DISCLAIMER="using oscam may be illegal in your country. if in doubt, do not install" - -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.service" - -PKG_AUTORECONF="no" diff --git a/packages/addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch b/packages/addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch deleted file mode 100644 index 4eeee55111..0000000000 --- a/packages/addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cd52430..b01b9fc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -530,6 +530,7 @@ if (HAVE_PCSC) - if (NOT OSCamOperatingSystem MATCHES "Mac OS X") - if (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin") - target_link_libraries (${exe_name} pcsclite) -+ target_link_libraries (${exe_name} pthread) - endif (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin") - endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") - endif (HAVE_PCSC) diff --git a/packages/addons/service/softcam/oscam/source/bin/oscam.start b/packages/addons/service/softcam/oscam/source/bin/oscam.start deleted file mode 100755 index 34ad21a1ee..0000000000 --- a/packages/addons/service/softcam/oscam/source/bin/oscam.start +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2012 Gregor Fuis (gujs@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 -################################################################################ - -. /etc/profile - -LOCKDIR="/var/lock/" -LOCKFILE="oscam.disabled" - -# Check if process is already running -# use "$(pidof)" instead of $(pidof). otherwise 'if' statement will fail -# because oscam spawns at least one 'extra' process -if [ ! "$(pidof oscam)" ]; then - - ADDON_DIR="$HOME/.xbmc/addons/service.softcam.oscam" - ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.softcam.oscam" - ADDON_LOG_DIR="$ADDON_HOME/log" - - ADDON_SETTINGS="$ADDON_HOME/settings.xml" - ADDON_CONF_DIR="$ADDON_HOME/config" - ADDON_CONF="$ADDON_CONF_DIR/oscam.conf" - ADDON_CONF_AC="$ADDON_CONF_DIR/oscam.ac" - ADDON_CONF_CERT="$ADDON_CONF_DIR/oscam.cert" - ADDON_CONF_DVBAPI="$ADDON_CONF_DIR/oscam.dvbapi" - ADDON_CONF_GUESS="$ADDON_CONF_DIR/oscam.guess" - ADDON_CONF_IRD="$ADDON_CONF_DIR/oscam.ird" - ADDON_CONF_PROVID="$ADDON_CONF_DIR/oscam.provid" - ADDON_CONF_SERVER="$ADDON_CONF_DIR/oscam.server" - ADDON_CONF_SERVICES="$ADDON_CONF_DIR/oscam.services" - ADDON_CONF_SRVID="$ADDON_CONF_DIR/oscam.srvid" - ADDON_CONF_TIERS="$ADDON_CONF_DIR/oscam.tiers" - ADDON_CONF_USER="$ADDON_CONF_DIR/oscam.user" - - OSCAM_ARG="-c $ADDON_CONF_DIR" - - mkdir -p $ADDON_HOME - mkdir -p $ADDON_CONF_DIR - mkdir -p $ADDON_LOG_DIR - - if [ ! -f "$ADDON_CONF" ]; then - cp $ADDON_DIR/oscam-default.conf $ADDON_CONF - fi - - touch $ADDON_CONF_AC - touch $ADDON_CONF_CERT - touch $ADDON_CONF_DVBAPI - touch $ADDON_CONF_GUESS - touch $ADDON_CONF_IRD - touch $ADDON_CONF_PROVID - touch $ADDON_CONF_SERVER - touch $ADDON_CONF_SERVICES - touch $ADDON_CONF_SRVID - touch $ADDON_CONF_TIERS - touch $ADDON_CONF_USER - - if [ ! -f "$ADDON_SETTINGS" ]; then - cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS - fi - -# Restart process if it terminates. - if [ -f "$LOCKDIR/$LOCKFILE" ] ; then - rm -rf "$LOCKDIR/$LOCKFILE" - fi - while [ true ] ; do - if [ -f "$LOCKDIR/$LOCKFILE" ] ; then - break - fi - # start userspace DVB driver/addon - for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do - driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}') - logger -t OSCAM "### Loading userspace DVB driver: $driver_dvb_name ###" - # use ". " because of variable export - . $driver_dvb - done - oscam $OSCAM_ARG > /dev/null 2>&1 - sleep 1 - done & -fi diff --git a/packages/addons/service/softcam/oscam/source/bin/oscam.stop b/packages/addons/service/softcam/oscam/source/bin/oscam.stop deleted file mode 100755 index b0168693b0..0000000000 --- a/packages/addons/service/softcam/oscam/source/bin/oscam.stop +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2012 Gregor Fuis (gujs@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 -################################################################################ - -. /etc/profile - -LOCKDIR="/var/lock/" -LOCKFILE="oscam.disabled" - -mkdir -p "$LOCKDIR" -touch "$LOCKDIR/$LOCKFILE" - -if [ "$(pidof oscam)" ];then - killall oscam -fi - diff --git a/packages/addons/service/softcam/oscam/source/default.py b/packages/addons/service/softcam/oscam/source/default.py deleted file mode 100644 index 301f33903e..0000000000 --- a/packages/addons/service/softcam/oscam/source/default.py +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 -################################################################################ - -import xbmc, time, os, subprocess, xbmcaddon - -__scriptname__ = "OSCAM Service" -__author__ = "OpenELEC" -__url__ = "http://www.openelec.tv" -__settings__ = xbmcaddon.Addon(id='service.softcam.oscam') -__cwd__ = __settings__.getAddonInfo('path') -__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "oscam.start") ) -__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "oscam.stop") ) - -#make binary files executable in adson bin folder -subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True) - -subprocess.Popen(__start__, shell=True, close_fds=True) - -while (not xbmc.abortRequested): - time.sleep(0.250) - -subprocess.Popen(__stop__, shell=True, close_fds=True) diff --git a/packages/addons/service/softcam/oscam/source/resources/language/English/strings.xml b/packages/addons/service/softcam/oscam/source/resources/language/English/strings.xml deleted file mode 100644 index d388c262c1..0000000000 --- a/packages/addons/service/softcam/oscam/source/resources/language/English/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - General - Restart on suspend / resume - diff --git a/packages/addons/service/softcam/oscam/source/resources/settings.xml b/packages/addons/service/softcam/oscam/source/resources/settings.xml deleted file mode 100644 index 41355ffc6b..0000000000 --- a/packages/addons/service/softcam/oscam/source/resources/settings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power b/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power deleted file mode 100644 index 1989f1fbe0..0000000000 --- a/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power +++ /dev/null @@ -1,59 +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 -################################################################################ - -. /etc/profile - -ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.softcam.oscam" -ADDON_SETTINGS="$ADDON_HOME/settings.xml" -RESTART_ON_RESUME=`grep RESTART_ON_RESUME $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` - -LOCKFILE="/var/lock/oscam.sleep" - -if [ "$RESTART_ON_RESUME" == "true" ] ; then - case "$1" in - hibernate|suspend) - if [ "$(pidof oscam)" ];then - progress "Shutting down oscam for suspending..." - oscam.stop - touch $LOCKFILE - fi - ;; - - thaw|resume) - progress "Restarting oscam for wakeup..." - if [ -f "$LOCKFILE" ] ; then - oscam.stop - for seq in `seq 1 10` ; do - if [ ! "$(pidof oscam)" ];then - break - fi - usleep 500000 - done - killall -9 oscam &>/dev/null - rm -rf "$LOCKFILE" - oscam.start - fi - ;; - *) exit $NA - ;; - esac -fi diff --git a/packages/addons/service/system/pcscd-addon/addon b/packages/addons/service/system/pcscd-addon/addon deleted file mode 100755 index 4bee6bbaa6..0000000000 --- a/packages/addons/service/system/pcscd-addon/addon +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ - - cp -Pa $BUILD/pcsc-lite-*/src/pcscd $ADDON_BUILD/$PKG_ADDON_ID/bin/pcscd.bin - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial - cp -Pa $BUILD/ccid-*/src/.libs/libccidtwin.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents/Linux/ - cp -Pa $BUILD/ccid-*/src/.libs/libccid.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents/Linux/ - cp -Pa $BUILD/ccid-*/src/Info.plist $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config - cp -Pa $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/ diff --git a/packages/addons/service/system/pcscd-addon/changelog.txt b/packages/addons/service/system/pcscd-addon/changelog.txt deleted file mode 100644 index a38067b444..0000000000 --- a/packages/addons/service/system/pcscd-addon/changelog.txt +++ /dev/null @@ -1,29 +0,0 @@ -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.5 -- update to libccid-1.4.10 - -3.0.4 -- update to pcsc-lite-1.8.8 -- update to libccid-1.4.9 - -3.0.3 -- update to pcsc-lite-1.8.7 - -3.0.2 -- update to pcsc-lite-1.8.6 -- update to ccid-1.4.8 - -3.0.1 -- bump addon version - -2.1.2 -- update to pcsc-lite-1.8.3 -- update to libccid-1.4.7 - -2.1.1 -- update to addon version 2.1 - -2.0.1 -- initial version for pcsc-lite 1.8.2 / ccid 1.4.5 diff --git a/packages/addons/service/system/pcscd-addon/config/reader.conf b/packages/addons/service/system/pcscd-addon/config/reader.conf deleted file mode 100644 index d984d4a45c..0000000000 --- a/packages/addons/service/system/pcscd-addon/config/reader.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Gemalto reader with serial communication -# - n is the serial port to use n in [0..3] -# - reader is the reader name. It is needed for multi-slot readers. -# Possible reader values are: GemPCPinPad, GemCorePOSPro, GemCoreSIMPro, -# GemPCTwin (default value) -# example: /dev/ttyS0:GemPCPinPad -#FRIENDLYNAME "GemPCTwin serial" -#DEVICENAME /dev/ttySn[:reader] -#LIBPATH /storage/.xbmc/addons/service.system.pcscd-addon/drivers/serial/libccidtwin.so -#CHANNELID n diff --git a/packages/addons/service/system/pcscd-addon/icon/icon.png b/packages/addons/service/system/pcscd-addon/icon/icon.png deleted file mode 100644 index 41cb661419..0000000000 Binary files a/packages/addons/service/system/pcscd-addon/icon/icon.png and /dev/null differ diff --git a/packages/addons/service/system/pcscd-addon/meta b/packages/addons/service/system/pcscd-addon/meta deleted file mode 100755 index 394ab12474..0000000000 --- a/packages/addons/service/system/pcscd-addon/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 -################################################################################ - -PKG_NAME="pcscd-addon" -PKG_VERSION="3.1" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.openelec.tv" -PKG_URL="" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain pcsc-lite libusb ccid" -PKG_PRIORITY="optional" -PKG_SECTION="service/system" -PKG_SHORTDESC="Middleware to access a smart card using SCard API (PC/SC)" -PKG_LONGDESC="Middleware to access a smart card using SCard API (PC/SC)" -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.service" -PKG_AUTORECONF="no" diff --git a/packages/addons/service/system/pcscd-addon/source/bin/pcscd.start b/packages/addons/service/system/pcscd-addon/source/bin/pcscd.start deleted file mode 100755 index d79015d41c..0000000000 --- a/packages/addons/service/system/pcscd-addon/source/bin/pcscd.start +++ /dev/null @@ -1,55 +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 -################################################################################ - -ADDON_NAME="service.system.pcscd-addon" -ADDON_DIR="$HOME/.xbmc/addons/$ADDON_NAME" -ADDON_HOME="$HOME/.xbmc/userdata/addon_data/$ADDON_NAME" - -ADDON_CONFIG_DIR="$ADDON_HOME/config" - -LOCKDIR="/var/lock/" -LOCKFILE="pcscd.disabled" - -mkdir -p $ADDON_HOME - -export PATH=$ADDON_DIR/bin:$PATH - -cd $ADDON_DIR/config -mkdir -p $ADDON_CONFIG_DIR -for config in `find . -type f -name "*.conf*"`; do - if [ ! -f $ADDON_CONFIG_DIR/$config ]; then - cp $config $ADDON_CONFIG_DIR/$config - fi -done - -if [ ! "$(pidof pcscd.bin)" ];then - if [ -f "$LOCKDIR/$LOCKFILE" ] ; then - rm -rf "$LOCKDIR/$LOCKFILE" - fi - while [ true ] ; do - if [ -f "$LOCKDIR/$LOCKFILE" ] ; then - break - fi - pcscd.bin --foreground -c $ADDON_CONFIG_DIR/reader.conf - sleep 1 - done & -fi diff --git a/packages/addons/service/system/pcscd-addon/source/bin/pcscd.stop b/packages/addons/service/system/pcscd-addon/source/bin/pcscd.stop deleted file mode 100755 index 02d1edd7e2..0000000000 --- a/packages/addons/service/system/pcscd-addon/source/bin/pcscd.stop +++ /dev/null @@ -1,31 +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 -################################################################################ - -LOCKDIR="/var/lock/" -LOCKFILE="pcscd.disabled" - -mkdir -p "$LOCKDIR" -touch "$LOCKDIR/$LOCKFILE" - -if [ "$(pidof pcscd.bin)" ];then - killall -9 pcscd.bin -fi diff --git a/packages/addons/service/system/pcscd-addon/source/default.py b/packages/addons/service/system/pcscd-addon/source/default.py deleted file mode 100755 index b361cbe120..0000000000 --- a/packages/addons/service/system/pcscd-addon/source/default.py +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@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 -################################################################################ - -import os -import sys -import xbmcaddon -import time -import subprocess - -__scriptname__ = "PCSC lite" -__author__ = "OpenELEC" -__url__ = "http://www.openelec.tv" -__settings__ = xbmcaddon.Addon(id='service.system.pcscd-addon') -__cwd__ = __settings__.getAddonInfo('path') -__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "pcscd.start") ) -__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "pcscd.stop") ) - -#make binary files executable in adson bin folder -subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True) - -subprocess.Popen(__start__, shell=True, close_fds=True) - -while (not xbmc.abortRequested): - time.sleep(0.250) - -subprocess.Popen(__stop__, shell=True, close_fds=True) diff --git a/packages/addons/service/web/maraschino/addon b/packages/addons/service/web/maraschino/addon deleted file mode 100755 index a1c4b96d4f..0000000000 --- a/packages/addons/service/web/maraschino/addon +++ /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 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ - cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/ diff --git a/packages/addons/service/web/maraschino/changelog.txt b/packages/addons/service/web/maraschino/changelog.txt deleted file mode 100644 index fcc726e795..0000000000 --- a/packages/addons/service/web/maraschino/changelog.txt +++ /dev/null @@ -1,20 +0,0 @@ -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.1 -- bump addon version -- update to maraschino-1681187 - -2.1.2 -- update to maraschino-40e2ce0 -- add possibilty to start / stop addon from addon manager with enable / disable - -2.1.1 -- update to addon version 2.1 -- update to maraschino-707e82c - -2.0.2 -- update to maraschino-c4e7467 - -0.99.1 -- initial version maraschino-923de4c diff --git a/packages/addons/service/web/maraschino/icon/icon.png b/packages/addons/service/web/maraschino/icon/icon.png deleted file mode 100644 index a9ef03910f..0000000000 Binary files a/packages/addons/service/web/maraschino/icon/icon.png and /dev/null differ diff --git a/packages/addons/service/web/maraschino/meta b/packages/addons/service/web/maraschino/meta deleted file mode 100644 index 9faefb7287..0000000000 --- a/packages/addons/service/web/maraschino/meta +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="maraschino" -PKG_VERSION="1681187" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.maraschinoproject.com/" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="Python" -PKG_BUILD_DEPENDS="toolchain Python CherryPy" -PKG_PRIORITY="optional" -PKG_SECTION="service/web" -PKG_SHORTDESC="Maraschino: Web interface to act as a nice overview/front page for my XBMC HTPC" -PKG_LONGDESC="Maraschino is an XBMC web interface with customisable applications module providing quick access to your web interfaces (e.g. SABnzb+, SickBeard, or whatever else you want to link to), recently added episodes module, media library browser, currently playing bar and disk space module." - -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.service" - -PKG_AUTORECONF="no" diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.start b/packages/addons/service/web/maraschino/source/bin/maraschino.start deleted file mode 100755 index 729ed0222d..0000000000 --- a/packages/addons/service/web/maraschino/source/bin/maraschino.start +++ /dev/null @@ -1,31 +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 -################################################################################ - -# Addon settings - ADDON_DIR="$HOME/.xbmc/addons/service.web.maraschino" - ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.web.maraschino" - - -################################################################################ -# start maraschino -################################################################################ - python $ADDON_DIR/Maraschino.py --datadir=$ADDON_HOME diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.stop b/packages/addons/service/web/maraschino/source/bin/maraschino.stop deleted file mode 100755 index f290a87971..0000000000 --- a/packages/addons/service/web/maraschino/source/bin/maraschino.stop +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -kill -9 `ps | grep -E 'python.*/Maraschino.py' | awk '{print $1}'` 2>/dev/null diff --git a/packages/addons/service/web/maraschino/source/default.py b/packages/addons/service/web/maraschino/source/default.py deleted file mode 100644 index e0c362a109..0000000000 --- a/packages/addons/service/web/maraschino/source/default.py +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -import xbmc, time, os, subprocess, xbmcaddon - -__scriptname__ = "maraschino service" -__author__ = "OpenELEC" -__url__ = "http://www.openelec.tv" -__settings__ = xbmcaddon.Addon(id='service.web.maraschino') -__cwd__ = __settings__.getAddonInfo('path') -__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "maraschino.start") ) -__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "maraschino.stop") ) - -#make binary files executable in addon bin folder -subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True) - -subprocess.Popen(__start__, shell=True, close_fds=True) - -while (not xbmc.abortRequested): - time.sleep(0.250) - -subprocess.Popen(__stop__, shell=True, close_fds=True) diff --git a/packages/addons/shell/console/screen/addon b/packages/addons/shell/console/screen/addon deleted file mode 100755 index 0fe488bda9..0000000000 --- a/packages/addons/shell/console/screen/addon +++ /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 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/screen $ADDON_BUILD/$PKG_ADDON_ID/bin/screen diff --git a/packages/addons/shell/console/screen/build b/packages/addons/shell/console/screen/build deleted file mode 100755 index 9ce7c093e5..0000000000 --- a/packages/addons/shell/console/screen/build +++ /dev/null @@ -1,37 +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 - -LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` -LDFLAGS="$LDFLAGS -ltinfo" - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-pam \ - --disable-locale \ - --disable-telnet - -make diff --git a/packages/addons/shell/console/screen/changelog.txt b/packages/addons/shell/console/screen/changelog.txt deleted file mode 100644 index a1383d1e90..0000000000 --- a/packages/addons/shell/console/screen/changelog.txt +++ /dev/null @@ -1,8 +0,0 @@ -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.2 -- rebuild - -3.0.1 -- initial addon based on screen-4.0.3 diff --git a/packages/addons/shell/console/screen/icon/icon.png b/packages/addons/shell/console/screen/icon/icon.png deleted file mode 100644 index bfad6784bc..0000000000 Binary files a/packages/addons/shell/console/screen/icon/icon.png and /dev/null differ diff --git a/packages/addons/shell/console/screen/meta b/packages/addons/shell/console/screen/meta deleted file mode 100644 index d7bead6d6d..0000000000 --- a/packages/addons/shell/console/screen/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="screen" -PKG_VERSION="4.0.3" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.gnu.org/software/screen/" -PKG_URL="http://ftp.gnu.org/gnu/screen/screen-${PKG_VERSION}.tar.gz" -PKG_DEPENDS="ncurses" -PKG_BUILD_DEPENDS="toolchain ncurses" -PKG_PRIORITY="optional" -PKG_SECTION="shell/console" -PKG_SHORTDESC="terminal multiplexor with VT100/ANSI terminal emulation" -PKG_LONGDESC="screen is a terminal multiplexor that runs several separate "screens" on a single physical character-based terminal. Each virtual terminal emulates a DEC VT100 plus several ANSI X3.64 and ISO 2022 functions. Screen sessions can be detached and resumed later on a different terminal." - -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.python.script" diff --git a/packages/addons/shell/console/screen/patches/screen-4.0.3-10_cross-compile.patch b/packages/addons/shell/console/screen/patches/screen-4.0.3-10_cross-compile.patch deleted file mode 100644 index 80833a6288..0000000000 --- a/packages/addons/shell/console/screen/patches/screen-4.0.3-10_cross-compile.patch +++ /dev/null @@ -1,530 +0,0 @@ -Binary files screen-4.0.2.old/.configure.swp and screen-4.0.2.dev/.configure.swp differ -diff -urN screen-4.0.2.old/configure screen-4.0.2.dev/configure ---- screen-4.0.2.old/configure 2003-12-05 14:46:53.000000000 +0100 -+++ screen-4.0.2.dev/configure 2005-05-05 12:13:03.000000000 +0200 -@@ -124,7 +124,7 @@ - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -+ } - fi - case $CONFIG_SHELL in - '') -@@ -174,7 +174,7 @@ - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -@@ -397,7 +397,7 @@ - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -+ } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; - -@@ -406,7 +406,7 @@ - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -+ } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -@@ -588,7 +588,7 @@ - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -+ } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -@@ -601,7 +601,7 @@ - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -+ } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; - -@@ -625,7 +625,7 @@ - - -*) { echo "$as_me: error: unrecognized option: $ac_option - Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ } - ;; - - *=*) -@@ -633,7 +633,7 @@ - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -+ } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; -@@ -652,7 +652,7 @@ - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ } - fi - - # Be sure to have absolute paths. -@@ -662,7 +662,7 @@ - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ };; - esac - done - -@@ -674,7 +674,7 @@ - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ };; - esac - done - -@@ -728,15 +728,15 @@ - if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -+ } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -+ } - fi - fi - (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } -+ } - srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` - ac_env_build_alias_set=${build_alias+set} - ac_env_build_alias_value=$build_alias -@@ -1243,7 +1243,7 @@ - echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 - echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - - ac_ext=c -@@ -1734,7 +1734,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - - # Provide some information about the compiler. - echo "$as_me:$LINENO:" \ -@@ -1856,7 +1856,7 @@ - echo "$as_me: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - fi - fi -@@ -1898,7 +1898,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - - rm -f conftest$ac_cv_exeext -@@ -1950,7 +1950,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext -@@ -2514,7 +2514,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - - ac_ext=c -@@ -2704,7 +2704,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -2753,7 +2753,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -2790,7 +2790,7 @@ - - { { echo "$as_me:$LINENO: error: Can't run the compiler - sorry" >&5 - echo "$as_me: error: Can't run the compiler - sorry" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -@@ -2800,7 +2800,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -2830,7 +2830,7 @@ - (exit $ac_status); }; }; then - { { echo "$as_me:$LINENO: error: Your compiler does not set the exit status - sorry" >&5 - echo "$as_me: error: Your compiler does not set the exit status - sorry" >&2;} -- { (exit 1); exit 1; }; } -+ } - else - echo "$as_me: program exited with status $ac_status" >&5 - echo "$as_me: failed program was:" >&5 -@@ -2900,7 +2900,7 @@ - if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 - echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - ac_config_guess="$SHELL $ac_aux_dir/config.guess" - ac_config_sub="$SHELL $ac_aux_dir/config.sub" -@@ -4149,7 +4149,7 @@ - - { { echo "$as_me:$LINENO: error: !!! no select - no screen" >&5 - echo "$as_me: error: !!! no select - no screen" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - -@@ -4163,7 +4163,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -4272,7 +4272,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -4365,7 +4365,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -4460,7 +4460,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -4562,7 +4562,7 @@ - else - { { echo "$as_me:$LINENO: error: you have neither usable sockets nor usable pipes -> no screen" >&5 - echo "$as_me: error: you have neither usable sockets nor usable pipes -> no screen" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - - -@@ -4573,7 +4573,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -4898,7 +4898,7 @@ - - { { echo "$as_me:$LINENO: error: !!! no tgetent - no screen" >&5 - echo "$as_me: error: !!! no tgetent - no screen" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi -@@ -4915,7 +4915,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -5359,7 +5356,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -6206,7 +6203,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -6482,7 +6479,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -7004,7 +7001,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -7056,7 +7053,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -7110,7 +7107,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -7951,7 +7948,7 @@ - See \`config.log' for more details." >&5 - echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ } - else - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -7982,7 +7979,7 @@ - ( exit $ac_status ) - { { echo "$as_me:$LINENO: error: Can't run the compiler - internal error. Sorry." >&5 - echo "$as_me: error: Can't run the compiler - internal error. Sorry." >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -@@ -8251,7 +8248,7 @@ - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 - echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi - case $CONFIG_SHELL in - '') -@@ -8302,7 +8299,7 @@ - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 - echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -+ } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -@@ -8494,7 +8491,7 @@ - Try \`$0 --help' for more information." >&5 - echo "$as_me: error: ambiguous option: $1 - Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -+ };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) -@@ -8516,7 +8513,7 @@ - Try \`$0 --help' for more information." >&5 - echo "$as_me: error: unrecognized option: $1 - Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -+ } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - -@@ -8555,7 +8552,7 @@ - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ };; - esac - done - -@@ -8750,7 +8747,7 @@ - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 - echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+ }; } - - ac_builddir=. - -@@ -8816,7 +8813,7 @@ - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -+ } - echo $f;; - *) # Relative - if test -f "$f"; then -@@ -8829,7 +8826,7 @@ - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi;; - esac - done` || { (exit 1); exit 1; } -@@ -8907,7 +8904,7 @@ - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -+ } - echo $f;; - *) # Relative - if test -f "$f"; then -@@ -8920,7 +8917,7 @@ - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi;; - esac - done` || { (exit 1); exit 1; } -@@ -9073,7 +9070,7 @@ - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 - echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+ }; } - - rm -f $ac_file - mv $tmp/config.h $ac_file -diff -urN screen-4.0.2.old/pty.c screen-4.0.2.dev/pty.c ---- screen-4.0.2.old/pty.c 2003-09-08 16:26:18.000000000 +0200 -+++ screen-4.0.2.dev/pty.c 2005-05-05 12:32:20.000000000 +0200 -@@ -34,9 +34,9 @@ - #endif - - /* for solaris 2.1, Unixware (SVR4.2) and possibly others */ --#ifdef HAVE_SVR4_PTYS --# include --#endif -+//#ifdef HAVE_SVR4_PTYS -+//# include -+//#endif - - #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL) - # include ---- screen-4.0.2/configure.old 2005-05-24 18:49:30.000000000 +0200 -+++ screen-4.0.2/configure 2005-05-24 18:49:54.000000000 +0200 -@@ -6598,8 +6598,6 @@ - LIBS="$oldlibs" - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec" --test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow" - oldlibs="$LIBS" - LIBS="$LIBS -lsun" - { echo "$as_me:$LINENO: checking IRIX sun library..." >&5 -diff -ur screen.old/sched.h screen.dev/sched.h ---- screen.old/sched.h 2002-01-08 16:42:43.000000000 +0100 -+++ screen.dev/sched.h 2007-03-02 17:03:48.475830776 +0100 -@@ -22,6 +22,11 @@ - * $Id: 100-cross_compile_fix.patch 6458 2007-03-02 16:12:30Z nbd $ FAU - */ - -+#ifndef __SCHED_H -+#define __SCHED_H -+ -+#include -+ - struct event - { - struct event *next; -@@ -41,3 +46,5 @@ - #define EV_READ 1 - #define EV_WRITE 2 - #define EV_ALWAYS 3 -+ -+#endif diff --git a/packages/addons/shell/console/screen/patches/screen-4.0.3-20_libelf-link.patch b/packages/addons/shell/console/screen/patches/screen-4.0.3-20_libelf-link.patch deleted file mode 100644 index 0c4abcd762..0000000000 --- a/packages/addons/shell/console/screen/patches/screen-4.0.3-20_libelf-link.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure b/configure -index a58ee46..69d8e56 100755 ---- a/configure -+++ b/configure -@@ -3357,7 +3357,7 @@ rm -f conftest* - - - oldlibs="$LIBS" --LIBS="$LIBS -lelf" -+LIBS="$LIBS" - { echo "$as_me:$LINENO: checking SVR4..." >&5 - echo "$as_me: checking SVR4..." >&6;} - echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -diff --git a/configure.in b/configure.in -index 34c9372..b189549 100644 ---- a/configure.in -+++ b/configure.in -@@ -196,7 +196,7 @@ AC_EGREP_CPP(yes, - ], LIBS="$LIBS -lsocket -linet";seqptx=1) - - oldlibs="$LIBS" --LIBS="$LIBS -lelf" -+LIBS="$LIBS" - AC_CHECKING(SVR4) - AC_TRY_LINK([#include - ],, diff --git a/packages/audio/alsa-lib/meta b/packages/audio/alsa-lib/meta index e97dd0392b..250e3ef235 100644 --- a/packages/audio/alsa-lib/meta +++ b/packages/audio/alsa-lib/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="alsa-lib" -PKG_VERSION="1.0.27.1" +PKG_VERSION="1.0.27.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/audio/alsa-utils/meta b/packages/audio/alsa-utils/meta index d677c6a5eb..0aa67a0ee4 100644 --- a/packages/audio/alsa-utils/meta +++ b/packages/audio/alsa-utils/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="alsa-utils" -PKG_VERSION="1.0.27.1" +PKG_VERSION="1.0.27.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/compress/unrar/build b/packages/compress/unrar/build deleted file mode 100755 index 77f3130cb4..0000000000 --- a/packages/compress/unrar/build +++ /dev/null @@ -1,32 +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/$1 -make CXX="$TARGET_CXX" \ - CXXFLAGS="$TARGET_CXXFLAGS" \ - RANLIB="$TARGET_RANLIB" \ - AR="$TARGET_AR" \ - STRIP="$TARGET_STRIP" \ - -f makefile.unix - diff --git a/packages/compress/unrar/install b/packages/compress/unrar/install deleted file mode 100755 index eef0c35df8..0000000000 --- a/packages/compress/unrar/install +++ /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 - -mkdir -p $INSTALL/usr/bin - cp $BUILD/$1/unrar $INSTALL/usr/bin - diff --git a/packages/compress/unrar/meta b/packages/compress/unrar/meta deleted file mode 100644 index ba3de9b5b5..0000000000 --- a/packages/compress/unrar/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="unrar" -PKG_VERSION="4.2.4" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="free" -PKG_SITE="http://www.rarlab.com" -PKG_URL="http://www.rarlab.com/rar/unrarsrc-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="compress" -PKG_SHORTDESC="unrar: Extract, test and view RAR archives" -PKG_LONGDESC="Unrar is a package to handle files compressed in the RAR format. Due to strange licensing issues this package can only view, test and extract files in a given archive, but not pack files. But since we have far more advanced open-source compression utils it should be enough to extract the content when you get a RAR archive." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/compress/unzip/build b/packages/compress/unzip/build deleted file mode 100755 index f5b1d0b8ef..0000000000 --- a/packages/compress/unzip/build +++ /dev/null @@ -1,32 +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/$1* - -make CC=$TARGET_CC \ - RANLIB=$TARGET_RANLIB \ - AR=$TARGET_AR \ - STRIP=$TARGET_STRIP \ - -f unix/Makefile generic - diff --git a/packages/compress/unzip/install b/packages/compress/unzip/install deleted file mode 100755 index 926410a231..0000000000 --- a/packages/compress/unzip/install +++ /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 - -mkdir -p $INSTALL/usr/bin - cp $BUILD/$1*/unzip $INSTALL/usr/bin - diff --git a/packages/compress/unzip/meta b/packages/compress/unzip/meta deleted file mode 100644 index 00b1743efd..0000000000 --- a/packages/compress/unzip/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="unzip" -PKG_VERSION="60" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.info-zip.org/pub/infozip/" -PKG_URL="http://ftp.uk.i-scream.org/sites/www.ibiblio.org/gentoo/distfiles/$PKG_NAME$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="compress" -PKG_SHORTDESC="unzip: PKUNZIP compatible compression utility" -PKG_LONGDESC="UnZip is an extraction utility for archives compressed in .zip format (also called "zipfiles"). Although highly compatible both with PKWARE's PKZIP and PKUNZIP utilities for MS-DOS and with Info-ZIP's own Zip program, the primary objectives have been portability and non-MSDOS functionality." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/debug/acpica/build b/packages/debug/acpica/build deleted file mode 100755 index 8cd99e38f5..0000000000 --- a/packages/debug/acpica/build +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -[ "$TARGET_ARCH" = "i386" ] && ACPICA_BITS="32" -[ "$TARGET_ARCH" = "x86_64" ] && ACPICA_BITS="64" - -cd $PKG_BUILD - -make PREFIX=/usr \ - CC="$TARGET_CC" \ - AR="$TARGET_AR" \ - HOST=_LINUX \ - HARDWARE_NAME=$TARGET_ARCH \ - BITS=$ACPICA_BITS \ - YACC=$ROOT/$TOOLCHAIN/bin/bison \ - CWARNINGFLAGS="-O2 $TARGET_CFLAGS" - diff --git a/packages/debug/acpica/install b/packages/debug/acpica/install deleted file mode 100755 index 827676fbd9..0000000000 --- a/packages/debug/acpica/install +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -[ "$TARGET_ARCH" = "i386" ] && ACPICA_BIN="bin32" -[ "$TARGET_ARCH" = "x86_64" ] && ACPICA_BIN="bin64" - -mkdir -p $INSTALL/usr/bin/ - cp $PKG_BUILD/generate/unix/$ACPICA_BIN/* $INSTALL/usr/bin/ diff --git a/packages/debug/acpica/meta b/packages/debug/acpica/meta deleted file mode 100644 index 894d74317d..0000000000 --- a/packages/debug/acpica/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="acpica-unix2" -PKG_VERSION="20130328" -PKG_REV="1" -PKG_ARCH="i386 x86_64" -PKG_LICENSE="GPL" -PKG_SITE="http://www.acpica.org/" -PKG_URL="https://www.acpica.org/download/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_URL="https://acpica.org/sites/acpica/files/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain flex bison" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="acpica: A set of tools to disassemble ACPI tables" -PKG_LONGDESC="acpica is a set of tools from Intel to disassemble ACPI tables." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/debug/cpuid/build b/packages/debug/cpuid/build deleted file mode 100755 index 2469835fca..0000000000 --- a/packages/debug/cpuid/build +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD -make PREFIX=/usr \ - CC="$TARGET_CC" \ - AR="$TARGET_AR" \ - CFLAGS="$TARGET_CFLAGS" \ - CPPFLAGS="$TARGET_CPPFLAGS" \ diff --git a/packages/debug/cpuid/install b/packages/debug/cpuid/install deleted file mode 100755 index b6d902c035..0000000000 --- a/packages/debug/cpuid/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/bin/ - cp $PKG_BUILD/cpuid $INSTALL/usr/bin/ diff --git a/packages/debug/cpuid/meta b/packages/debug/cpuid/meta deleted file mode 100644 index c32fb54104..0000000000 --- a/packages/debug/cpuid/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="cpuid" -PKG_VERSION="20120601" -PKG_REV="1" -PKG_ARCH="i386 x86_64" -PKG_LICENSE="GPL" -PKG_SITE="http://www.etallen.com/cpuid.html" -PKG_URL="http://www.etallen.com/cpuid/$PKG_NAME-$PKG_VERSION.src.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="cpuid: tool to dump x86 CPUID information" -PKG_LONGDESC="cpuid dumps detailed information about the CPU(s) gathered from the CPUID instruction, and also determines the exact model of CPU(s). It supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, UMC, NexGen, Rise, and SiS CPUs." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/debug/dmidecode/build b/packages/debug/dmidecode/build deleted file mode 100755 index 2469835fca..0000000000 --- a/packages/debug/dmidecode/build +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD -make PREFIX=/usr \ - CC="$TARGET_CC" \ - AR="$TARGET_AR" \ - CFLAGS="$TARGET_CFLAGS" \ - CPPFLAGS="$TARGET_CPPFLAGS" \ diff --git a/packages/debug/dmidecode/install b/packages/debug/dmidecode/install deleted file mode 100755 index 49ca3fe566..0000000000 --- a/packages/debug/dmidecode/install +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/bin/ - cp $PKG_BUILD/biosdecode $INSTALL/usr/bin/ - cp $PKG_BUILD/dmidecode $INSTALL/usr/bin/ - cp $PKG_BUILD/ownership $INSTALL/usr/bin/ - cp $PKG_BUILD/vpddecode $INSTALL/usr/bin/ diff --git a/packages/debug/dmidecode/meta b/packages/debug/dmidecode/meta deleted file mode 100644 index f231370af1..0000000000 --- a/packages/debug/dmidecode/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="dmidecode" -PKG_VERSION="2.11" -PKG_REV="1" -PKG_ARCH="i386 x86_64" -PKG_LICENSE="GPL" -PKG_SITE="http://www.nongnu.org/dmidecode/" -PKG_URL="http://download.savannah.gnu.org/releases/dmidecode/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="dmidecode: report DMI information" -PKG_LONGDESC="Dmidecode reports information about your system's hardware as described in your system BIOS according to the SMBIOS/DMI standard (see a sample output). This information typically includes system manufacturer, model name, serial number, BIOS version, asset tag as well as a lot of other details of varying level of interest and reliability depending on the manufacturer. This will often include usage status for the CPU sockets, expansion slots (e.g. AGP, PCI, ISA) and memory module slots, and the list of I/O ports (e.g. serial, parallel, USB)." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/debug/dstat/install b/packages/debug/dstat/install deleted file mode 100755 index 4a8bc9bff7..0000000000 --- a/packages/debug/dstat/install +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/bin/ -cp $PKG_BUILD/dstat $INSTALL/usr/bin/ -mkdir -p $INSTALL/usr/share/dstat/ -cp $PKG_BUILD/plugins/dstat_*.py $INSTALL/usr/share/dstat/ diff --git a/packages/debug/dstat/meta b/packages/debug/dstat/meta deleted file mode 100644 index a69df68bf0..0000000000 --- a/packages/debug/dstat/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="dstat" -PKG_VERSION="0.7.2" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://dag.wieers.com/home-made/dstat/" -PKG_URL="http://dag.wieers.com/home-made/dstat/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="Python" -PKG_BUILD_DEPENDS="toolchain Python" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="dstat: versatile resource statistics tool" -PKG_LONGDESC="Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat. Dstat overcomes some of their limitations and adds some extra features, more counters and flexibility. Dstat is handy for monitoring systems during performance tuning tests, benchmarks or troubleshooting." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/debug/evtest/build b/packages/debug/evtest/build deleted file mode 100755 index d73c7c70d5..0000000000 --- a/packages/debug/evtest/build +++ /dev/null @@ -1,30 +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 $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - -make diff --git a/packages/debug/evtest/install b/packages/debug/evtest/install deleted file mode 100755 index acdfc58967..0000000000 --- a/packages/debug/evtest/install +++ /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 - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/evtest $INSTALL/usr/bin - cp $PKG_BUILD/evtest-capture $INSTALL/usr/bin diff --git a/packages/debug/evtest/meta b/packages/debug/evtest/meta deleted file mode 100644 index e691dc9a80..0000000000 --- a/packages/debug/evtest/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="evtest" -PKG_VERSION="1.30" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://cgit.freedesktop.org/evtest/" -PKG_URL="http://cgit.freedesktop.org/evtest/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libxml2" -PKG_BUILD_DEPENDS="toolchain libxml2" -PKG_PRIORITY="optional" -PKG_SECTION="debug/tools" -PKG_SHORTDESC="evtest: Simple tool for input event debugging." -PKG_LONGDESC="evtest is a simple tool for input event debugging." - -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/debug/evtest/patches/evtest-1.30-automake_1.13.patch b/packages/debug/evtest/patches/evtest-1.30-automake_1.13.patch deleted file mode 100644 index 1a7a7de03b..0000000000 --- a/packages/debug/evtest/patches/evtest-1.30-automake_1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur evtest-1.30-old/configure.ac evtest-1.30-new/configure.ac ---- evtest-1.30-old/configure.ac 2012-04-26 15:15:32.000000000 -0700 -+++ evtest-1.30-new/configure.ac 2013-01-03 17:00:38.000000000 -0800 -@@ -2,7 +2,7 @@ - AC_INIT(evtest,[1.30], [https://bugzilla.freedesktop.org/enter_bug.cgi?product=evtest], evtest) - AM_INIT_AUTOMAKE([foreign dist-bzip2]) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_PROG_CC - AC_PROG_INSTALL - diff --git a/packages/debug/hddtemp/build b/packages/debug/hddtemp/build deleted file mode 100755 index 4746b0aaef..0000000000 --- a/packages/debug/hddtemp/build +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD - -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --bindir=/usr/bin \ - --with-db-path=/etc/hddtemp.db \ - -make diff --git a/packages/debug/hddtemp/data/hddtemp.db b/packages/debug/hddtemp/data/hddtemp.db deleted file mode 100644 index 4a061cfcb6..0000000000 --- a/packages/debug/hddtemp/data/hddtemp.db +++ /dev/null @@ -1,523 +0,0 @@ -# -# Insert a regular expression for support of the model or the serie of your hard drive. -# If you don't know what to put in the second field, put the number -# that appears most often for your brand :o) -# A value of zero meens that we know that the drive doesn't have -# a temperature sensor (you can set the unit to C or F). -# -############################################################################ -# The following list was found at (http://www.almico.com/forumharddisks.php) -# If your drive is in the list send me a mail. -# -# Manufacturer Model Size Notes -# FUJITSU FUJITSU MPF3102AH 10.0GB -# FUJITSU FUJITSU MPG3204AH E 20.0GB -# FUJITSU FUJITSU MPG3307AT 30.0GB -# FUJITSU FUJITSU MPG3409AH 40.0GB -# FUJITSU FUJITSU MPG3409AH EF 40.0GB -# HITACHI HITACHI_DK23CA-10 9.8GB -# HITACHI HITACHI_DK23CA-15 14.7GB -# SAMSUNG SAMSUNG SV3012H 29.4GB -# SEAGATE ST310210A 10.0GB -# SEAGATE ST310211A 9.8GB -# SEAGATE ST310215A 10.0GB -# SEAGATE ST315320A 14.9GB -# SEAGATE ST320410A 19.6GB -# SEAGATE ST320413A 19.6GB -# SEAGATE ST320420A 19.9GB -# SEAGATE ST330610A 29.3GB -# SEAGATE ST330620A 29.3GB -# SEAGATE ST330621A 29.3GB -# SEAGATE ST330630A 29.9GB -# SEAGATE ST340016A 39.1GB -# SEAGATE ST340810ACE 39.1GB -# SEAGATE ST380020ACE 78.2GB -# WESTERN DIGITAL WDC AC210200D 10.0GB -# WESTERN DIGITAL WDC AC29100D 8.9GB -# WESTERN DIGITAL WDC AC420400D 19.9GB -# WESTERN DIGITAL WDC WD102AA 10.0GB -# -################################################# - -######################################## -############# ExcelStor drives -######################################## -# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" -"ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)" -"ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)" -"ExcelStor Technology J680" 194 C "ExcelStor Technology J680 (80 GB)" -"ExcelStor Technology J860" 194 C "ExcelStor Technology J860 (60 GB)" -"ExcelStor Technology J880" 194 C "ExcelStor Technology J880 (80 GB)" - - - -######################################## -############# Fujitsu drives -######################################## -"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" - -"FUJITSU MHN2150AT" 194 C "Fujitsu MHN2150AT" -"FUJITSU MHN2200AT" 194 C "Fujitsu MHN2200AT" -"FUJITSU MHN2300AT" 194 C "Fujitsu MHN2300AT" - -"FUJITSU MHR2020AT" 194 C "Fujitsu MHR2020AT" -"FUJITSU MHR2030AT" 194 C "Fujitsu MHR2030AT" - -"FUJITSU MHS2030AT" 194 C "Fujitsu MHS2030AT" -"FUJITSU MHS2040AT" 194 C "Fujitsu MHS2040AT" -"FUJITSU MHS2060AT" 194 C "Fujitsu MHS2060AT (Apple PowerBook G4)" - -"FUJITSU MHT2030AC" 194 C "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)" - -"FUJITSU MHT2030AT" 194 C "Fujitsu MHT2030AT" -"FUJITSU MHT2040AH" 194 C "Fujitsu MHT2040AH" -"FUJITSU MHT2040AT" 194 C "Fujitsu MHT2040AT" -"FUJITSU MHT2060AH" 194 C "Fujitsu MHT2060AH" -"FUJITSU MHT2060AT" 194 C "Fujitsu MHT2060AT" -"FUJITSU MHT2080AH" 194 C "Fujitsu MHT2080AH" - -"FUJITSU MHU2100AT" 194 C "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)" - -"FUJITSU MHV2100AH" 194 C "FUJITSU MHV2100AH" -"FUJITSU MHV2100AT" 194 C "FUJITSU MHV2100AT" -"FUJITSU MHV2080[AB]H" 194 C "FUJITSU MHV2080AH" - -"FUJITSU MPF3204AH" 194 C "Fujitsu MPF3204AH" - -"FUJITSU MPG3204AT.*" 194 C "Fujitsu MPG3204AT" -"FUJITSU MPG3307AT" 194 C "Fujitsu MPG3307AT" -"FUJITSU MPG3409AT.*" 194 C "Fujitsu MPG3409AT E" -"FUJITSU MPG3409AH.*" 194 C "Fujitsu MPG3409AH E" -"FUJITSU MPG3204AH" 194 C "Fujitsu MPG3204AH" -"FUJITSU MPG3102AT E" 194 C "FUJITSU MPG3102AT E" - - - -######################################## -############# Hitachi drives -######################################## -"HITACHI_DK13FA-40B" 194 C "Hitachi DK13FA-40B" -"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" -"HITACHI_DK23CA-(15|20|30|30B|75)" 194 C "Hitachi DK23CA series" -"HITACHI_DK23DA-[234]0" 194 C "Hitachi DK23DA series" -"HITACHI_DK23EA-[2346]0" 194 C "Hitachi DK23EA series" -"HITACHI_DK23EB-40" 194 C "Hitachi DK23EB series" -"HITACHI_DK23FA-[468]0" 194 C "Hitachi DK23FA series" -"HITACHI_DK23FB-[46]0" 194 C "Hitachi DK23FB series" - -"HDS722516VLAT[28]0" 194 C "Hitachi Deskstar 7K250 160GB 2/8MB cache" -"HDS722525VLAT80" 194 C "Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA" -"HDS722512VLAT80" 194 C "Hitachi Deskstar 7K250 80GB" -"HDS722540VLAT20" 194 C "Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache" -"HDS722580VLAT20" 194 C "Deskstar 7K250 60GB" -"HDS724040KLSA80" 194 C "Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA" -"HDS728080PLAT20" 194 C "Hitachi Deskstar 7K80 80GB" - -"HDS722525VLSA80" 194 C "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA" -"HDS722516VLSA80" 194 C "Hitachi Deskstar 7K250 160GB 8Mo cache SATA" -"HDS722580VLSA80" 194 C "Hitachi Deskstar 7K250 80GB SATA" -"HDS728040PLAT20" 194 C "Hitachi Deskstar 7K80 40GB" - -"HDS724040KLAT80" 194 C "Hitachi Deskstar 7K400 400GB 8Mo cache PATA" - -"HDT7225(16|25)DLAT80" 194 C "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA" -"HDT722516DLA380 V43O" 194 C "Hitachi T7K250 SATA" -"HDT722525DLA380" 194 C "Hitachi Deskstar T7K250 250GB 8Mo cache SATAII" -"HDT725050VLA360" 194 C "Hitachi Deskstar T7K500 500GB, 7200RPM, 16MB, SATA II" - -"HTE721010G9AT00" 194 C "Hitachi Travelstar 100GB (7200RPM)" -"HTE726060M9AT00" 194 C "Hitachi Travelstar 60GB (7200RPM)" -"HTS424030M9AT00" 194 C "Hitachi Travelstar 30GB (4200RPM)" -"HTS424040M9AT00" 194 C "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)" -"HTS541010G9SA00" 194 C "Hitachi Travelstar 100GB SATA" -"HTS541040G9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" -"HTS541080G9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" -"HTS548020M9AT00" 194 C "Hitachi Travelstar 20GB (5400RPM)" -"HTS548030M9AT00" 194 C "Hitachi Travelstar 30GB (5400RPM)" -"HTS548040M9AT00" 194 C "Hitachi Travelstar 40GB (5400RPM)" -"HTS548060M9AT00" 194 C "Hitachi Travelstar 60GB (5400RPM)" -"HTS548080M9AT00" 194 C "Hitachi Travelstar 80GB (5400RPM)" -"HTS721080G9AT00" 194 C "Hitachi Travelstar 7K100 80GB (7200RPM)" -"HTS726060M9AT00" 194 C "Hitachi Travelstar 60GB" - - -######################################## -############# IBM drives -######################################## - -# DJSA serie is using F0h command to report temperature and also have -# SMART capabilties but it was reported not to work. -# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" - -"IBM-DARA-212000" 0 C "IBM Travelstar 12GN" -"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" - -# according to specifications they do not seems to have sensor -# but I prefer waiting for a report -#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" - -"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" -"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" -"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" -"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" -"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" -"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" -"IBM-DTLA-30[57]0[123467][05]" 194 C "IBM Deskstar 40GV & 75GXP series" -"IC25N0[1234]0ATCS04-0" 194 C "IBM Travelstar 40GN serie" -"IC25N0[24]0ATC[SX]05-0" 194 C "IBM Travelstar 40GNX serie" -"IC25N0(10|15|20|30)ATDA04-0" 194 C "IBM Travelstar 30GN serie" -"IC25N0[23468]0ATMR04*" 194 C "Hitachi Travelstar 80GN" -"IC25T048ATDA05-0" 194 C "IBM Travelstar 48GH serie" -"IC25T060ATC[SX]05-0" 194 C "IBM Travelstar 60GH serie" -"IC35L0[12346]0AVER07" 194 C "IBM Deskstar 60GXP serie" -"IC35L[01][02468]0AVV[AN]07*" 194 C "IBM Deskstar 120GXP serie" -"IC35L[01][23689]0AVV207*" 194 C "IBM Deskstar 180GXP serie" - -######################################## -############# Maxtor drives -######################################## -#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" -"Maxtor 2F0[234]0[LJ]0" 194 C "Maxtor Fireball 3" -# which one must I trust ? -#"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" -#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" -#"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" -#"Maxtor 4D060H3" 12 C "Maxtor DiamondMax D540X-4D" -#"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" -"MAXTOR 4K0[468]0H[234]" 194 C "Maxtor DiamondMax D540X serie" -"MAXTOR 4K020H1" 194 C "Maxtor 4K020H1" -"Maxtor 4A300J0" 194 C "Maxtor MaxLine II 300GB 5400RPM" -"Maxtor 4[RA](25|16|12|08|06)0[LJ]0" 194 C "Maxtor DiamondMax 16" -"Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)" 0 C "Maxtor DiamondMax Plus 40" -"Maxtor 5A250J0" 194 C "Maxtor MaXline II 250GB 5400RPM" -"Maxtor 5A300J0" 194 C "Maxtor 5A300J0" -"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -"Maxtor 6E0[234]0L0" 194 C "Maxtor DiamondMax Plus 8" -"MAXTOR 6L0[2468]0[LJ][1234]" 194 C "Maxtor DiamondMax Plus D740X family" -"Maxtor 6V320F0" 194 C "Maxtor Diamond Max 10 SATA II 320 GB" -"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0" 194 C "Maxtor DiamondMax Plus 9" -"Maxtor 7L300[RS]0" 194 C "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm" -"Maxtor 7Y250[PM]0" 194 C "Maxtor MaXLine Plus II 250GB 7200RPM" -"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" - -#"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0" 194 C "Maxtor DiamondMax Plus 10" -"Maxtor 6B080M0" 194 C "Maxtor DiamondMax 10 80GB 8MB SATA" -"Maxtor 6B120M0" 194 C "Maxtor DiamondMax 10 120GB 8MB SATA" -"Maxtor 6B160M0" 194 C "Maxtor DiamondMax 10 160GB 8MB SATA" -"Maxtor 6B160P0" 194 C "Maxtor DiamondMax 10 160GB 8MB ATA/133" -"Maxtor 6B200M0" 194 C "Maxtor DiamondMax 10 200GB 8MB SATA" -"Maxtor 6B200P0" 194 C "Maxtor DiamondMax 10 200GB 8MB ATA/133" -"Maxtor 6B250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB ATA/133" -"Maxtor 6B250S0" 194 C "Maxtor DiamondMax 10 250GB 16MB SATA" -"Maxtor 6B300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB ATA/133" -"Maxtor 6B300S0" 194 C "Maxtor DiamondMax 10 300GB 16MB SATA" -"Maxtor 6L080L0" 194 C "Maxtor DiamondMax 10 80GB 2MB ATA/133 RoHS" -"Maxtor 6L080M0" 194 C "Maxtor DiamondMax 10 80GB 8MB SATA RoHS" -"Maxtor 6L080P0" 194 C "Maxtor DiamondMax 10 80GB 8MB ATA/133 RoHS" -"Maxtor 6L120M0" 194 C "Maxtor DiamondMax 10 120GB 8MB SATA RoHS" -"Maxtor 6L120P0" 194 C "Maxtor DiamondMax 10 120GB 8MB ATA/133 RoHS" -"Maxtor 6L160M0" 194 C "Maxtor DiamondMax 10 160GB 8MB SATA RoHS" -"Maxtor 6L160P0" 194 C "Maxtor DiamondMax 10 160GB 8MB ATA/133 RoHS" -"Maxtor 6L200M0" 194 C "Maxtor DiamondMax 10 200GB 8MB SATA RoHS" -"Maxtor 6L200P0" 194 C "Maxtor DiamondMax 10 200GB 8MB ATA/133 RoHS" -"Maxtor 6L250R0" 194 C "Maxtor DiamondMax 10 250GB 16MB ATA/133 RoHS" -"Maxtor 6L250S0" 194 C "Maxtor DiamondMax 10 250GB 16MB SATA RoHS" -"Maxtor 6L300R0" 194 C "Maxtor DiamondMax 10 300GB 16MB ATA/133 RoHS" -"Maxtor 6L300S0" 194 C "Maxtor DiamondMax 10 300GB 16MB SATA RoHS" -"Maxtor 6V080E0" 194 C "Maxtor DiamondMax 10 80GB 8MB SATAII RoHS" -"Maxtor 6V160E0" 194 C "Maxtor DiamondMax 10 160GB 8MB SATAII RoHS" -"Maxtor 6V200E0" 194 C "Maxtor DiamondMax 10 200GB 8MB SATAII RoHS" -"Maxtor 6V250F0" 194 C "Maxtor DiamondMax 10 250GB 16MB SATAII RoHS" -"Maxtor 6V300F0" 194 C "Maxtor DiamondMax 10 300GB 16MB SATAII RoHS" - - - -######################################## -############# Quantum drives -######################################## -"QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" -"QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" -#"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" -# I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... -# "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" - - - -######################################## -############# Samsung drives -######################################## -# somenone reported a problem with the SP8004H which reports a temperature -# 10°C below the ambient temperature -"SAMSUNG HA(200|250)JC" 194 C "Samsung SpinPoint V120CE series" -"SAMSUNG HD160JJ" 194 C "Samsung 160GB, 7200RPM, 8MB cache, SATA" -"SAMSUNG HD160JJ/P" 194 C "Samsung SpinPoint P80 SD 160GB (7200RPM, 8MB cache)" -"SAMSUNG HD[30|32|40][01]L[DJ]" 194 C "Samsung SpinPoint T133 series (300-400MB)" -"SAMSUNG HD250KD" 194 C "Samsung SpinPoint T133 series (250 MB PATA)" -"SAMSUNG HD321KJ" 194 C "Samsung Spinpoint T166 (7200RPM, 16MB cache) - SATA" -"SAMSUNG HD501LJ" 194 C "Samsung HD501LJ" -"SAMSUNG MP0(302|402|603|804)H" 194 C "Samsung SpinPoint M40 2.5inch" -"SAMSUNG SW0434A" 0 C "Samsung SW0434A" -"SAMSUNG SP(2001|4002|6003|8004|40A2)H" 194 C "Samsung SpinPoint P40 serie" -"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N" 194 C "Samsung SpinPoint P80 serie" -"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C" 194 C "Samsung SpinPoint P80 series - SATA" -"SAMSUNG SP0411N" 194 C "Samsung SpinPoint PL40 serie" -"SAMSUNG SP0822N" 194 C "Samsung SP0822N" -"SAMSUNG SP(0812|1213|1614)C" 194 C "Samsung Spinpoint 160G SATA" -"SAMSUNG SP2[05]14N" 194 C "Samsung SpinPoint P120 series (7200RPM, 8MB cache)" -"SAMSUNG SP2[05]04C" 194 C "Samsung SpinPoint P120 series - SATA" -"SAMSUNG SV0432A" 0 C "Samsung SV0432A" -"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" -"SAMSUNG SV(2001|4002|4012|6003|8004)H" 194 C "Samsung SpinPoint V40 serie" -#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" -#"SAMSUNG SV1204H" 194 C "Samsung 120G" -"SAMSUNG SV(0401|0802|1203|1604)N" 194 C "Samsung SpinPoint V80 serie" -"SAMSUNG SV4012H" 194 C "Samsung 40GB, 5400RPM, 2MB cache" - -######################################## -############# Seagate drives -######################################## -"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" -"ST3412A" 0 C "Seagate ST3412A" -"ST38641A" 0 C "Seagate ST38641A" -"ST310014A" 194 C "Seagate ST310014A" -"ST310210A" 0 C "Seagate ST310210A" -"ST310211A" 194 C "Seagate ST310211A" -"ST310220A" 0 C "Seagate ST310220A" -# SEAGATE ST313021A 13.0GB -"ST313021A" 0 C "Seagate U8 ST313021A" -"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" -"ST315320A" 194 C "Seagate ST315320A" -"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" -"ST320011A" 194 C "Seagate ST320011A" -"ST320014A" 194 C "Seagate ST320014A (5400 rpm, 20Gb)" -"ST320410A" 194 C "Seagate ST320410A" -"ST320413A" 194 C "Seagate ST320413A" -"ST320414A" 194 C "Seagate ST320414A" -"ST320420A" 194 C "Seagate Barracuda II ST320420A" -"ST330013A" 194 C "Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm" -"ST330620A" 194 C "Seagate ST330620A" -"ST330621A" 194 C "Seagate ST330621A" -"ST330630A" 194 C "Seagate Barracuda ST330630A" -"ST340014A" 194 C "Seagate Barracuda 7200.7 40Gb" -"ST340015A" 194 C "Seagate Barracuda 5400.1 40GB" -"ST340016A" 194 C "Seagate ST340016A" -"ST340810A" 194 C "Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)" -"ST340823A" 194 C "Seagate U Series 5 40823" -"ST340824A" 194 C "Seagate Barracuda III" -"ST360015A" 194 C "Seagate Barracuda V ST360015A" -"ST360020A" 194 C "Seagate U Series 60020" -"ST360021A" 194 C "Seagate Barracuda IV ST360021A" -"ST380011A" 194 C "Seagate Barracuda 7200.7 80GB" -"ST380012A" 194 C "Seagate ST380012A 80GB" -"ST380013A" 194 C "Seagate Barracuda 7200.7 80GB" -"ST380013AS" 194 C "Seagate Barracuda 7200.7 80GB (Serial ATA)" -"ST380020A" 194 C "Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)" -"ST380021A" 194 C "Seagate Barracuda IV ST380021A" -"ST380022A" 194 C "Seagate Barracuda U7 80022, Ultra ATA/100" -"ST380023A" 194 C "Seagate Barracuda V ST380023A" -"ST380817AS" 194 C "Seagate Barracuda 7200.7 80GB - SATA" -"ST39111A" 194 C "Seagate ST39111A (from Sun Ultra)" -"ST3120020A" 194 C "Seagate ST3120020A" -"ST3120022A" 194 C "Seagate Baraccuda 7200.7 120GB" -"ST3120023A" 194 C "Seagate Barracuda V ST3120023A" -"ST3120024A" 194 C "Seagate Barracuda V ST3120024A" -"ST3120025ACE" 194 C "Seagate Barracuda V ST3120025ACE" -"ST3120026A" 194 C "Seagate Barracuda V ST3120026A" -"ST3160021A" 194 C "Seagate Barracuda 7200.7 - ST3160021A" -"ST3160023(A|AS)" 194 C "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)" -"ST3160827AS" 194 C "Seagate Barracuda 7200.7 160GB (Serial ATA)" -"ST3200021A" 194 C "Seagate Barracuda 7200.7 Plus 200GB" -"ST3200822(A|AS)" 194 C "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)" -"ST3200826A" 194 C "Seagate Barracuda 7200.8 200Gb" -"ST3250623A" 194 C "Seagate Barracuda 7200.16 250GB" -"ST3250823A" 194 C "Seagate Barracuda 7200.8 250GB" -"ST3250823A" 194 C "Seagate Barracuda 7200.7 Plus 250GB" -"ST3250823NS" 194 C "Seagate NL35 SATA (RAID-Edition) 7200 250GB" -"ST3300831A" 194 C "Seagate 300GB ST3300831A" -"ST3400832A" 194 C "Seagate Barracuda 7200.8 Plus 400GB" -"ST3400633(A|AS)" 194 C "Seagate Barracuda 7200.7 400 GB" -"ST3500630NS" 194 C "Seagate" -"ST3400632NS" 194 C "Seagate" -"ST3320620AS" 194 C "Seagate Barracuda 7200.7 320 GB" -"ST3500630AS" 194 C "Seagate Barracuda 7200.7 500 GB" -"ST3802110A" 194 C "Seagate Barracuda 7200.9 80 GB" -"ST910021A" 194 C "Seagate Momentus 7200.1 100GB" -"ST910082[35]A" 194 C "Seagate Momentus 5400.2 100GB" -"ST9120821A" 194 C "Seagate Momentus 5400.2 120GB" -"ST94019A" 194 C "Seagate ST94019A" -"ST94813A" 194 C "Seagate Momentus 5400.2 40GB" -"ST94[08]11A" 194 C "Seagate ST94011A" -"ST960821A" 194 C "Seagate ST960821A" -"ST960822A" 194 C "Seagate Momentus 5400.2 60GB" -"ST96812AS" 194 C "Seagate Momentus 5400.2 60GB SATA" -"ST9808211A" 194 C "Seagate Momentus 5400.2 80GB" - -######################################## -############# TOSHIBA Laptops -######################################## -"MK4313MAT" 220 C "Toshiba MK4313MAT" -"TOSHIBA MK1032GAX" 194 C "Toshiba MK1032GAX" -"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" -"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" -"TOSHIBA MK2023GAS" 194 C "Toshiba MK2023GAS" - -"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" -"TOSHIBA MK3021GAS" 194 C "Toshiba MK3021GAS" -"TOSHIBA MK3025GAS" 194 C "Toshiba MK3025GAS" - -#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" -"TOSHIBA MK4021GAS" 194 C "Toshiba MK4021GAS" -"TOSHIBA MK4025GAS" 194 C "Toshiba MK4025GAS 40 Go" -"TOSHIBA MK4026GAS" 194 C "Toshiba MK4026GAS 40 Go" -"TOSHIBA MK4032GAX" 194 C "Toshiba MK4032GAX" - -"TOSHIBA MK6021GAS" 194 C "Toshiba MK6021GAS" -"TOSHIBA MK6022GAX" 194 C "Toshiba MK6022GAX" -"TOSHIBA MK6025GAS" 194 C "Toshiba MK6025GAS" -"TOSHIBA MK6026GAX" 194 C "Toshiba MK6026GAX" -"TOSHIBA MK8025GAS" 194 C "Toshiba MK8025GAS" -"TOSHIBA MK8026GAX" 194 C "Toshiba MK8026GAX" - -"MK4025GAS" 194 C "Toshiba MK4025GAS" - - -######################################## -############# Western Digital drives -######################################## -# WDC AC310100B and WDC AC2850F are reported not working -# no more informations were given -"WDC AC22000L" 0 C "Western Digital Caviar AC22000" -"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" -"WDC AC418000D" 231 C "Western Digital AC418000D" -"WDC WD135BA" 231 C "Western Digital WD135BA" - -"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" -"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" -#"WDC WD200BB-60DGA0" 0 C "Western Digital Caviar WD200BB" -"WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB" -"WDC WD360GD-00FNA0" 194 C "Western Digital SATA Raptor 36.7GB" -"WDC WD400BB-00CAA0" 0 C "Western Digital 400BB-00CAA0" -"WDC WD400BB-00J[KH]A0" 194 C "Western Digital Caviar WD400BB" -"WDC WD400BB-23JHC0" 194 C "Western Digital 23JHC0" -#"WDC WD400BB-00GFA0" 0 C "" -"WDC WD400BB-55HEA0" 194 C "Western Digital Caviar WD400BB" -"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" -"WDC WD400BB-75FJA1" 194 C "Western Digital Caviar WD400BB" -"WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" -"WDC WD400JB-00(JJ|FM|FS)A0" 194 C "Western Digital Caviar 40GB Special Edition 8MB" -"WDC WD400JB-00ETA0" 194 C "Western Digital 400JB-00ETA0" -"WDC WD400JB-00JJC0" 194 C "Western Digital 400JB-00JJC0 40GB" -"WDC WD400LB-00DNA0" 194 C "Western Digital 400LB-00DNA0" -"WDC WD400UE-22HCT0" 194 C "Western Digital 40GB Notebook HDD" -"WDC WD400VE-75HDT1" 194 C "Western Digital Scorpio 40GB" -"WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" -"WDC WD600JB-00ETA0" 194 C "Western Digital 600JB-00ETA0" -"WDC WD600LB-00DNA0" 194 C "Western Digital 60GB" -"WDC WD600VE-75HDT0" 194 C "Western Digital 600VE-75HDT0" -"WDC WD600VE-00HDT0" 194 C "Western Digital 600VE-00HDT0" -"WDC WD740GD-00FL21.0" 194 C "Western Digital SATA Raptor" -"WDC WD740GD-([05]0FL[AC]0|75FLA1)" 194 C "Western Digital SATA Raptor 74GB 8MB" -"WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" -"WDC WD800BB-(00|22)DKA0" 194 C "Western Digital WD800BB 80 Go" -"WDC WD800BB-32CCB0" 194 C "Western Digital 800BB-32CCB0" -"WDC WD800BB-55HEA0" 194 C "Western Digital 800BB-55HEA0" -"WDC WD800BB-00JHA0" 194 C "Western Digital 800BB-00JHA0" -"WDC WD800BB-00JKA0" 194 C "Western Digital 800BB-00JKA0" -"WDC WD800BB-55JKA0" 194 C "Western Digital 800BB-55JKA0" -"WDC WD800BB-75FRA0" 194 C "Western Digital Caviar WD800BB" -"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" -"WDC WD800JB-00(ET|FM|FS)A0" 194 C "Western Digital Caviar 80GB Special Edition 8MB" -"WDC WD800JB-00JJ[AC]0" 194 C "Western Digital WD800JB" -"WDC WD800JD-(00|55)(HK|JR)A0" 194 C "Western Digital SATA 80GB, 8MB Cache" -"WDC WD800JD-00(HK|JN)A0" 194 C "Western Digital SATA 80GB, 8MB Cache" -"WDC WD800LB-(00|55)DNA0" 194 C "Western Digital Caviar WD800LB 80 Go ATA-100" -"WDC WD800VE-07HDT0" 194 C "Western Digital 800VE-07HDT0" -"WDC WD1200BB-00(FTA|GUA)0" 194 C "Western Digital Caviar EIDE 2MB Cache" -"WDC WD1200JB-00(EV|FU|GV)A0" 194 C "Western Digital Caviar 120GB Special Edition 8MB" -"WDC WD1200JB-22GVA0" 194 C "Western Digital Caviar 120GB" -"WDC WD1200JD-00(GBB|HBC)0" 194 C "Western Digital WD1200JD" -"WDC WD1200LB-55EDA0" 194 C "Western Digital WD1220LB" -"WDC WD1200SB-01KB[AC]0" 194 C "Western Digital Caviar RE (Raid Edition) 120 GB" -"WDC WD1600BB-00DWA0" 194 C "Western Digital Caviar WD1600BB" -"WDC WD1600JB-(00EV|00FU|00GV|22GV|75GV)A0" 194 C "Western Digital Caviar 160GB Special Edition 8MB" -"WDC WD2000BB-00FTA0" 194 C "Western Digital WD2000BB" -"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0" 194 C "Western Digital Caviar 200GB Special Edition 8MB" -"WDC WD2000JB-00GVC0" 194 C "Western Digital WD2000JB" -"WDC WD2000JS-00MHB1" 194 C "Western Digital SATA 200GB" -"WDC WD2500JB-(00RE|00EV|00FU|32FU|00GV|55GV)A0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" -"WDC WD2500JB-00GVC0" 194 C "Western Digital 250GB" -"WDC WD2500JD-(00G|32H)BB0" 194 C "Western Digital SATA Caviar 250GB Special Edition 8MB" -"WDC WD2500JD-40HBC0" 194 C "Western Digital WD2500JD-40HBC0" -"WDC WD2500PB-98FBA0" 194 C "Western Digital Caviar 250GB Special Edition 8MB" -"WDC WD2500PD-00FZB1" 194 C "Western Digital WD2500PD-00FZB1" -"WDC WD2500SD-01KCB0" 194 C "Western Digital Caviar RE 250GB 8MB" -"WDC WD3000JB-00KFA0" 194 C "Western Digital WD3000JB" -"WDC WD3200JB-00KFA0" 194 C "Western Digital Caviar 320GB 8MB" -"WDC WD4000KD-00NAB0" 194 C "Western Digital Caviar SE16 400GB 16MB" -"WDC WD4000YR-01PLB0" 194 C "Western Digital Caviar RE2 400GB 16MB" -"WD4000YS-01MPB0" 194 C "Western Digital RE2 7200 SATA II 400 GB" - -# not sure for next -# "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" -# "WDC WD273BA" 9 C "Western Digital WD273BA" - - - - -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## -######################################################################################################################## - -"ST3750640AS" 194 C "Seagate Barracuda 7200.10 SATA 750GB" -"ST3750840AS" 194 C "Seagate Barracuda 7200.10 SATA 750GB" -"ST3500630AS" 194 C "Seagate Barracuda 7200.10 SATA 500GB" -"ST3500830AS" 194 C "Seagate Barracuda 7200.10 SATA 500GB" -"ST3400620AS" 194 C "Seagate Barracuda 7200.10 SATA 400GB" -"ST3400620A" 194 C "Seagate Barracuda 7200.10 400GB" -"ST3400820AS" 194 C "Seagate Barracuda 7200.10 SATA 400GB" -"ST3320620AS" 194 C "Seagate Barracuda 7200.10 SATA 320GB" -"ST3320820AS" 194 C "Seagate Barracuda 7200.10 SATA 320GB" -"ST3300620AS" 194 C "Seagate Barracuda 7200.10 SATA 300GB" -"ST3300820AS" 194 C "Seagate Barracuda 7200.10 SATA 300GB" -"ST3250620AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB" -"ST3250820AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB" -"ST3250410AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB" -"ST3250310AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB" -"ST3200820AS" 194 C "Seagate Barracuda 7200.10 SATA 200GB" -"ST3160815AS" 194 C "Seagate Barracuda 7200.10 SATA 160GB" -"ST3160215AS" 194 C "Seagate Barracuda 7200.10 SATA 160GB" -"ST3120815AS" 194 C "Seagate Barracuda 7200.10 SATA 120GB" -"ST3120215AS" 194 C "Seagate Barracuda 7200.10 SATA 120GB" -"ST380815AS" 194 C "Seagate Barracuda 7200.10 SATA 80GB" -"ST380215AS" 194 C "Seagate Barracuda 7200.10 SATA 80GB" -"ST340815AS" 194 C "Seagate Barracuda 7200.10 SATA 40GB" -"ST340215AS" 194 C "Seagate Barracuda 7200.10 SATA 40GB" -"ST3300622AS" 194 C "Seagate Barracuda 7200.9 SATA2.5 300GB" -"ST3300831A" 194 C "Seagate Barracuda 7200.8 PATA 300GB" - -"Maxtor 7(L|V)250(F|R|S)0" 194 C "Maxtor MaXLine III 250GB 7200rpm" -"Maxtor 7(L|V)300(F|R|S)0" 194 C "Maxtor MaXLine III 300GB 7200rpm" -"MAXTOR STM3320620AS" 194 C "" - -"WDC WD1500ADFD-00NLR1" 194 C "Western Digital Raptor 150GB" -"WDC WD1600JS-00NCB1" 194 C "Western Digital Caviar 1600JS 160GB Sata" -"WDC WD1600SD-01KCC0" 194 C "Western Digital Caviar RE Serial ATA series" -"WDC WD2500JD-57HBC0" 194 C "Western Digital Caviar SE (Serial ATA) 250 GB" -"WDC WD2500JS" 194 C "Western Digital WD2500JS" -"WDC WD2500JS-41MVB1" 194 C "Western Digital SATAII Caviar 250GB Special Edition 8MB" -"WDC WD2500JD-00HBB0" 194 C "Western Digital SATA 250GB" -"WDC WD2500KS-00MJB0" 194 C "Western Digital SATA-II Caviar 250GB Special Edition 16MB" -"WDC WD3000JS-00PDB0" 194 C "Western Digital WD3000JS" -"WDC WD3200KS-00PFB0" 194 C "" -"WDC WD3200JD-22KLB0" 194 C "Western Digital Caviar SE 320GB 8MB" diff --git a/packages/debug/hddtemp/install b/packages/debug/hddtemp/install deleted file mode 100755 index 09e361fe30..0000000000 --- a/packages/debug/hddtemp/install +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/etc/ -cp $PKG_DIR/data/hddtemp.db $INSTALL/etc/ -mkdir -p $INSTALL/usr/bin/ -cp $PKG_BUILD/src/hddtemp $INSTALL/usr/bin/ - diff --git a/packages/debug/hddtemp/meta b/packages/debug/hddtemp/meta deleted file mode 100644 index 26afbbefd6..0000000000 --- a/packages/debug/hddtemp/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="hddtemp" -PKG_VERSION="0.3-beta15" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.guzu.net/linux/hddtemp.php" -PKG_URL="http://download.savannah.gnu.org/releases/hddtemp/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="hddtemp: tool that reports hard drive temperature" -PKG_LONGDESC="hddtemp is a small utility (daemonizable) that gives you the temperature of your hard drive by reading S.M.A.R.T. informations (for drives that support this feature)." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/debug/hddtemp/patches/hddtemp_0.3-beta15-52.diff b/packages/debug/hddtemp/patches/hddtemp_0.3-beta15-52.diff deleted file mode 100644 index 9397c86b67..0000000000 --- a/packages/debug/hddtemp/patches/hddtemp_0.3-beta15-52.diff +++ /dev/null @@ -1,7539 +0,0 @@ ---- hddtemp-0.3-beta15.orig/README -+++ hddtemp-0.3-beta15/README -@@ -28,10 +28,7 @@ - INFORMATION - =========== - hddtemp accesses to the SATA disks via ATA pass-through commands (defined in --T10/04-262r7). At the time of writing (kernel 2.6.11-rc5 has just been --released), kernels doesn't have support for ATA pass-through. You have to --update the libata driver with a newer version that could be found on: --http://www.kernel.org/pub/linux/kernel/people/jgarzik/libata/ -+T10/04-262r7). Only kernel >= 2.6.16 have this support. - - In daemon mode, hddtemp doesn't allow too much query at a time. If the interval - between two query is inferior to 1 minute, hddtemp will give the previous value ---- hddtemp-0.3-beta15.orig/debian/rules -+++ hddtemp-0.3-beta15/debian/rules -@@ -0,0 +1,110 @@ -+#!/usr/bin/make -f -+# Sample debian/rules that uses debhelper. -+# GNU copyright 1997 to 1999 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+# These are used for cross-compiling and for saving the configure script -+# from having to guess our platform (since we know it already) -+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -+ -+# Get flags from dpkg-buildflags -+CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -+ -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+ INSTALL_PROGRAM += -s -+endif -+ -+config.status: configure -+ dh_testdir -+ -+ -test -r /usr/share/misc/config.sub && \ -+ cp -f /usr/share/misc/config.sub config.sub -+ -test -r /usr/share/misc/config.guess && \ -+ cp -f /usr/share/misc/config.guess config.guess -+ -+ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -+ ./configure --host=$(DEB_HOST_GNU_TYPE) \ -+ --build=$(DEB_BUILD_GNU_TYPE) \ -+ --prefix=/usr \ -+ --mandir=\$${prefix}/share/man \ -+ --infodir=\$${prefix}/share/info \ -+ --with-db-path=/etc/hddtemp.db -+ -+build: build-arch build-indep -+ -+build-arch: build-arch-stamp -+build-arch-stamp: config.status -+ dh_testdir -+ $(MAKE) -+ touch build-stamp -+ -+build-indep: -+ -+clean: debian-clean -+ dh_clean -+ -+debian-clean: -+ dh_testdir -+ dh_testroot -+ [ ! -f Makefile ] || $(MAKE) distclean -+ rm -f po/*.gmo po/stamp-po -+ -rm -f *-stamp -+ -rm -f config.sub config.guess -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ # Add here commands to install the package into debian/hddtemp. -+ $(MAKE) install DESTDIR=$(CURDIR)/debian/hddtemp -+ -+ install -p -o root -g root -m 644 $(CURDIR)/debian/hddtemp.db \ -+ $(CURDIR)/debian/hddtemp/etc/hddtemp.db -+ -+ cp -a $(CURDIR)/contribs $(CURDIR)/debian/hddtemp/usr/share/doc/hddtemp -+ rm -f $(CURDIR)/debian/hddtemp/usr/share/doc/hddtemp/Makefile* -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+ dh_testdir -+ dh_testroot -+ dh_installdebconf -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+ dh_installlogcheck -+# dh_installlogrotate -+# dh_installemacsen -+# dh_installpam -+# dh_installmime -+ dh_installinit -+ dh_installcron -+ dh_installman -+ dh_installinfo -+ dh_installchangelogs ChangeLog -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+# dh_makeshlibs -+ dh_installdeb -+# dh_perl -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install -+ ---- hddtemp-0.3-beta15.orig/debian/docs -+++ hddtemp-0.3-beta15/debian/docs -@@ -0,0 +1,2 @@ -+README -+TODO ---- hddtemp-0.3-beta15.orig/debian/postrm -+++ hddtemp-0.3-beta15/debian/postrm -@@ -0,0 +1,28 @@ -+#! /bin/sh -+# postrm script for hddtemp -+set -e -+ -+conffile="/etc/default/hddtemp" -+ -+case "$1" in -+ purge) -+ rm -f $conffile -+ ;; -+ remove) -+ rm -f /usr/bin/hddtemp -+ rm -f /usr/share/man/man1/hddtemp.1.gz -+ ;; -+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) -+ ;; -+ *) -+ echo "postrm called with unknown argument \`$1'" >&2 -+ exit 1 -+ ;; -+esac -+ -+# dh_installdeb will replace this with shell code automatically -+# generated by other debhelper scripts. -+ -+#DEBHELPER# -+ -+exit 0 ---- hddtemp-0.3-beta15.orig/debian/changelog -+++ hddtemp-0.3-beta15/debian/changelog -@@ -0,0 +1,1289 @@ -+hddtemp (0.3-beta15-52) unstable; urgency=low -+ -+ * Decrease hddtemp/daemon priority to medium from high (closes: -+ bug#680877). -+ * Bumped Standards-Version to 3.9.3. -+ -+ -- Aurelien Jarno Mon, 09 Jul 2012 08:12:30 +0200 -+ -+hddtemp (0.3-beta15-51) unstable; urgency=low -+ -+ * init script: also probe for double letter drives (closes: bug#646724). -+ -+ -- Aurelien Jarno Sun, 30 Oct 2011 20:21:06 +0100 -+ -+hddtemp (0.3-beta15-50) unstable; urgency=low -+ -+ * Convert hddtemp.db to UTF-8 (closes: bug#640899). -+ * Don't restart on reload in init.d (closes: bug#643610). -+ * Add a status option in init.d (closes: bug#643611). -+ -+ -- Aurelien Jarno Sun, 09 Oct 2011 20:16:06 +0200 -+ -+hddtemp (0.3-beta15-49) unstable; urgency=low -+ -+ * Added Slovak debconf templates. Thanks to Slavko (closes: bug#634519). -+ * Fix a few typo in translation and enable German translation. Thanks to -+ Ville Skyttä for tha patch. -+ * Add build-arch and build-indep targets. -+ -+ -- Aurelien Jarno Tue, 30 Aug 2011 16:32:45 +0200 -+ -+hddtemp (0.3-beta15-48) unstable; urgency=low -+ -+ * Fix backtrace support on i386. -+ * Add backtrace support on amd64. -+ -+ -- Aurelien Jarno Sun, 05 Jun 2011 00:18:46 +0200 -+ -+hddtemp (0.3-beta15-47) unstable; urgency=low -+ -+ * Fix reading model on SATA big-endian (closes: #602307). -+ * Updated Arabic debconf templates, thanks to Ossama Khaya (closes: -+ bug#596177). -+ * Updated Swedish debconf template, thanks to Joe Hansen (closes: -+ bug#603109). -+ * Update Dutch debconf translation, thanks to Jeroen Schot (closes: -+ bug#628757). -+ * Bumped Standards-Version to 3.9.2 (no changes). -+ -+ -- Aurelien Jarno Sat, 04 Jun 2011 21:36:32 +0200 -+ -+hddtemp (0.3-beta15-46) unstable; urgency=low -+ -+ * Don't probe /dev/sg? by default (closes: bug#531849). -+ * Add initial German translation, by Helge Kreutzmann (closes: #503710). -+ * Fix a typo in the help message (closes: #503711). -+ * Correctly zero-terminate long product ID strings (closes: #517981). -+ * Bumped Standards-Version to 3.8.4 (no changes). -+ -+ -- Aurelien Jarno Sun, 07 Feb 2010 20:24:49 +0100 -+ -+hddtemp (0.3-beta15-45) unstable; urgency=low -+ -+ * Updated Swedish debconf templates. Thanks to Martin Bagge (closes: -+ bug#491768). -+ * Improve init script, by Cristian Ionescu-Idbohrn (closes: bug#486235). -+ * Mention /etc/init.d/hddtemp and /etc/default/hddtemp in README.Debian -+ (closes: bug#482982). -+ * Bumped Standards-Version to 3.8.0 (no changes). -+ -+ -- Aurelien Jarno Sun, 27 Jul 2008 09:44:06 +0200 -+ -+hddtemp (0.3-beta15-44) unstable; urgency=low -+ -+ * Updated Japanese debconf templates. Thanks to Kenshi Muto (closes: -+ bug#483504). -+ -+ -- Aurelien Jarno Mon, 02 Jun 2008 10:30:58 +0200 -+ -+hddtemp (0.3-beta15-43) unstable; urgency=low -+ -+ * Don't wake up SATA drives if not asked (closes: #479840). -+ -+ -- Aurelien Jarno Sat, 10 May 2008 13:24:18 +0200 -+ -+hddtemp (0.3-beta15-42) unstable; urgency=low -+ -+ * Use minus instead of hyphenin manpage. -+ -+ -- Aurelien Jarno Sun, 02 Mar 2008 19:14:14 +0100 -+ -+hddtemp (0.3-beta15-41) unstable; urgency=low -+ -+ * Fixed LSB header in init script (closes: bug#466281). -+ -+ -- Aurelien Jarno Sun, 17 Feb 2008 18:22:21 +0100 -+ -+hddtemp (0.3-beta15-40) unstable; urgency=low -+ -+ * Added Basque debconf templates. Thanks to Piarres Beobide (closes: -+ bug#465731). -+ -+ -- Aurelien Jarno Fri, 15 Feb 2008 21:59:07 +0100 -+ -+hddtemp (0.3-beta15-39) unstable; urgency=low -+ -+ [ Aurelien Jarno ] -+ * Bumped Standards-Version to 3.7.3 (no changes). -+ -+ [ Christian Perrier ] -+ * Debconf templates and debian/control reviewed by the debian-l10n- -+ english team as part of the Smith review project. Closes: #462483 -+ * [Debconf translation updates] -+ * Norwegian BokmÃ¥l. Closes: #462799 -+ * German. Closes: #462843 -+ * Galician. Closes: #462988 -+ * Spanish. Closes: #463898 -+ * Finnish. Closes: #463943 -+ * Czech. Closes: #464224 -+ * Russian. Closes: #464566 -+ * Italian. Closes: #465069 -+ * Portuguese. Closes: #465135 -+ * Vietnamese. Closes: #465534 -+ * French. Closes: #465650 -+ -+ -- Aurelien Jarno Wed, 13 Feb 2008 23:43:53 +0100 -+ -+hddtemp (0.3-beta15-38) unstable; urgency=low -+ -+ * Fix typo in hddtemp manpage (closes: bug#444242). -+ -+ -- Aurelien Jarno Tue, 11 Dec 2007 15:17:16 +0100 -+ -+hddtemp (0.3-beta15-37) unstable; urgency=low -+ -+ * Updated Czech debconf templates. Thanks to Miroslav Kure (closes: -+ bug#413322). -+ * Added Galician debconf templates. Thanks to Jacobo Tarrio (closes: -+ bug#412198). -+ * Clean po/stamp-po to make sure the .gmo files are regenerated (closes: -+ bug#441708). -+ * Updated Portuguese translation, thanks to Rui Branco (closes: -+ bug#418281). -+ * Updated Vietnamese debconf translation. Thanks to Clytie Siddall (closes: -+ bug#427039). -+ * Fixed man page formatting error (closes: bug#439074). -+ * Fix a segfault when using --unit and --numeric (closes: bug#412368). -+ * Exit with error code != 0 in case of error (closes: bug#423509). -+ -+ -- Aurelien Jarno Wed, 12 Sep 2007 11:36:05 +0200 -+ -+hddtemp (0.3-beta15-36) unstable; urgency=low -+ -+ * Fix the init script, trying to kill not running daemon on shutdown -+ (closes: #411645). -+ -+ -- Aurelien Jarno Tue, 20 Feb 2007 22:04:01 +0100 -+ -+hddtemp (0.3-beta15-35) unstable; urgency=low -+ -+ * Updated Portuguese translation, thanks to Miguel Figueire (closes: -+ bug#409491). -+ -+ -- Aurelien Jarno Tue, 20 Feb 2007 08:22:22 +0100 -+ -+hddtemp (0.3-beta15-34) unstable; urgency=low -+ -+ * Relax SATA magic checkings (closes: #404310) -+ * Updated Swedish debconf template. Thanks to Daniel Nylander (closes: -+ bug#398788). -+ * /etc/default/hddtemp: changed SYSLOG into RUN_SYSLOG and fixed the -+ comments (closes: bug#401978). -+ -+ -- Aurelien Jarno Fri, 19 Jan 2007 00:38:27 +0100 -+ -+hddtemp (0.3-beta15-33) unstable; urgency=medium -+ -+ * Update the description (closes: #401428). -+ -+ -- Aurelien Jarno Mon, 4 Dec 2006 06:04:38 +0100 -+ -+hddtemp (0.3-beta15-32) unstable; urgency=low -+ -+ * Updated German debconf template. Thanks to Erik Schanze (closes: -+ bug#397209). -+ -+ -- Aurelien Jarno Mon, 27 Nov 2006 14:42:32 +0100 -+ -+hddtemp (0.3-beta15-31) unstable; urgency=low -+ -+ * Remove the suggest on gkrellm-hddtemp (closes: bug#398938). -+ * Updated Swedish debconf template. Thanks to Daniel Nylander (closes: -+ bug#398788). -+ * Added Swedish translation. Thanks to Daniel Nylander (closes: -+ bug#398787). -+ * Added and LSB header to the init script. -+ -+ -- Aurelien Jarno Mon, 27 Nov 2006 12:14:49 +0100 -+ -+hddtemp (0.3-beta15-30) unstable; urgency=medium -+ -+ * Remove a space in the printed temperature when a disk is not present -+ in hddtemp.db. -+ -+ -- Aurelien Jarno Thu, 19 Oct 2006 14:50:09 +0200 -+ -+hddtemp (0.3-beta15-29) unstable; urgency=medium -+ -+ * Also consider field 194 as a temperature in Celsius if the disk -+ is not present in hddtemp.db in daemon mode (closes: bug#391870). -+ -+ -- Aurelien Jarno Mon, 9 Oct 2006 16:42:47 +0200 -+ -+hddtemp (0.3-beta15-28) unstable; urgency=medium -+ -+ * Always consider field 194 as a temperature in Celsius if the disk -+ is not present in hddtemp.db (closes: bug#387102, #386943, #389290, -+ #387403, #389309, #387544) -+ * Updated Czech debconf template. Thanks to Miroslav Jezbera (closes: -+ bug#389244). -+ * Set urgency to medium as I really want to get this version in etch -+ (and not bother with roughly one bug report per week). -+ -+ -- Aurelien Jarno Wed, 4 Oct 2006 01:53:51 +0200 -+ -+hddtemp (0.3-beta15-27) unstable; urgency=low -+ -+ * Depends on lsb-base (>= 3.0-3) (closes: bug#386859). -+ * Added support for Western Digital WD2000JD (closes: bug#385604). -+ * Added support for Seagate NL35 SATA (closes: bug#385187). -+ * Added support for ST3160811AS (closes: bug#385335). -+ * Added support for WD400BB-00DKA0 (closes: bug#386857). -+ -+ -- Aurelien Jarno Mon, 11 Sep 2006 00:13:15 +0200 -+ -+hddtemp (0.3-beta15-26) unstable; urgency=low -+ -+ * Added support for SAMSUNG HD160JJ. -+ -+ -- Aurelien Jarno Sat, 26 Aug 2006 22:29:13 +0200 -+ -+hddtemp (0.3-beta15-25) unstable; urgency=low -+ -+ * Added support for WD1200JD-00FYB0 (closes: bug#383692). -+ -+ -- Aurelien Jarno Sun, 20 Aug 2006 15:00:15 +0200 -+ -+hddtemp (0.3-beta15-24) unstable; urgency=low -+ -+ * Updated Spanish debconf template. Thanks to Carlos Valdivia Yagüe (closes: -+ bug#383374:). -+ -+ -- Aurelien Jarno Thu, 17 Aug 2006 10:25:43 +0200 -+ -+hddtemp (0.3-beta15-23) unstable; urgency=low -+ -+ * Added support for WDC WD3200SD-01KNB0 (closes: bug#382449). -+ * Added support for ST3400633 (closes: bug#382546). -+ * Added various Seagate 7200.10 drives, patch by Petr Vandrovec (closes: -+ bug#382490). -+ -+ -- Aurelien Jarno Fri, 11 Aug 2006 21:46:40 +0200 -+ -+hddtemp (0.3-beta15-22) unstable; urgency=low -+ -+ * Added support for ST3320620AS (closes: bug#382300). -+ -+ -- Aurelien Jarno Thu, 10 Aug 2006 11:24:58 +0200 -+ -+hddtemp (0.3-beta15-21) unstable; urgency=low -+ -+ * Added support for Toshiba MK1032GSX (closes: bug#382130). -+ -+ -- Aurelien Jarno Wed, 9 Aug 2006 19:27:36 +0200 -+ -+hddtemp (0.3-beta15-20) unstable; urgency=low -+ -+ * Added support for Maxtor 6V300F0 (closes: bug#382071). -+ * Added support for Seagate ST98823AS (closes: bug#382009). -+ -+ -- Aurelien Jarno Tue, 8 Aug 2006 18:28:24 +0200 -+ -+hddtemp (0.3-beta15-19) unstable; urgency=low -+ -+ * Added support for ST3250624AS (closes: bug#381837). -+ * Added support for WDC WD3200KS-00PFB0 (closes: bug#381837). -+ -+ -- Aurelien Jarno Mon, 7 Aug 2006 23:38:39 +0200 -+ -+hddtemp (0.3-beta15-18) unstable; urgency=low -+ -+ * Added support for MHV2060AH. -+ -+ -- Aurelien Jarno Sat, 5 Aug 2006 21:19:56 +0200 -+ -+hddtemp (0.3-beta15-17) unstable; urgency=low -+ -+ * Added support for WDC WD1500ADFD-00NLR0 (closes: bug#381403). -+ -+ -- Aurelien Jarno Sat, 5 Aug 2006 17:00:30 +0200 -+ -+hddtemp (0.3-beta15-16) unstable; urgency=low -+ -+ * Updated Japanese debconf template. Thanks to Kenshi Muto (closes: -+ bug#379945). -+ * Added support for ST3808110AS and ST3160812AS (closes: bug#380478). -+ * Added support for ST3160812A (closes: bug#379701). -+ -+ -- Aurelien Jarno Sun, 30 Jul 2006 22:54:13 +0200 -+ -+hddtemp (0.3-beta15-15) unstable; urgency=low -+ -+ * Added support for WDC WD2500JD-75HBB0 (closes: bug#379024). -+ -+ -- Aurelien Jarno Thu, 20 Jul 2006 21:47:04 +0200 -+ -+hddtemp (0.3-beta15-14) unstable; urgency=low -+ -+ * Use lsb init-functions in init script. Thanks to Benjamin Leipold for the -+ patch (closes: bug#378118). -+ -+ -- Aurelien Jarno Fri, 14 Jul 2006 15:08:39 +0200 -+ -+hddtemp (0.3-beta15-13) unstable; urgency=low -+ -+ * Added support for Toshiba MK8032GSX (Closes: #375486). -+ * Update the minimum kernel version (2.6.16) necessary to support -+ SATA in README. -+ * Print all warning/messages to stderr. -+ * Applied patch by Andras Korn (Closes: #374796) to allow the hddtemp -+ daemon to stay in the foreground. -+ -+ -- Aurelien Jarno Thu, 29 Jun 2006 15:11:47 +0200 -+ -+hddtemp (0.3-beta15-12) unstable; urgency=low -+ -+ * Added Dutch debconf translation, thanks to Kurt De Bree (closes: -+ bug#370072). -+ -+ -- Aurelien Jarno Sat, 3 Jun 2006 19:45:21 +0200 -+ -+hddtemp (0.3-beta15-11) unstable; urgency=low -+ -+ * Updated Danish debconf template. Thanks to Claus Hindsgaul (closes: -+ bug#368045). -+ -+ -- Aurelien Jarno Fri, 19 May 2006 17:25:32 +0000 -+ -+hddtemp (0.3-beta15-10) unstable; urgency=low -+ -+ * Updated French debconf translation, thanks to Jean-Luc Coulon (closes: -+ bug#367540). -+ -+ -- Aurelien Jarno Tue, 16 May 2006 21:42:39 +0200 -+ -+hddtemp (0.3-beta15-9) unstable; urgency=low -+ -+ * debian/templates: Changed How often into in interval. (closes: bug#367382). -+ * debian/templates: fixed the templates to make lintian happy. -+ -+ -- Aurelien Jarno Mon, 15 May 2006 20:21:49 +0200 -+ -+hddtemp (0.3-beta15-8) unstable; urgency=low -+ -+ * Added support for SAMSUNG HD300LJ (closes: bug#367250). -+ -+ -- Aurelien Jarno Sun, 14 May 2006 20:08:31 +0200 -+ -+hddtemp (0.3-beta15-7) unstable; urgency=low -+ -+ * Added support for HDS722516VLSA80 (closes: bug#366742). -+ -+ -- Aurelien Jarno Thu, 11 May 2006 05:46:24 +0200 -+ -+hddtemp (0.3-beta15-6) unstable; urgency=low -+ -+ * Added support for FUJITSU MHV2100BH (closes: bug#366388). -+ -+ -- Aurelien Jarno Wed, 10 May 2006 06:29:54 +0200 -+ -+hddtemp (0.3-beta15-5) unstable; urgency=low -+ -+ * Added support for WDC WD740GD-00FLA1 (closes: bug#366021). -+ * Bumped Standards-Version to 3.7.2 (no changes). -+ -+ -- Aurelien Jarno Thu, 4 May 2006 18:38:15 +0200 -+ -+hddtemp (0.3-beta15-4) unstable; urgency=low -+ -+ * Fix a crash in daemon (syslog) mode when the hard disk is not known -+ (closes: bug#365605). -+ * Added support for WD1200JB-00REA0. -+ -+ -- Aurelien Jarno Wed, 3 May 2006 20:27:11 +0200 -+ -+hddtemp (0.3-beta15-3) unstable; urgency=low -+ -+ * Added support for WDC WD800JD-75JNC0 (closes: bug#365359). -+ * Added support for WDC WD2500KS and WDC WD2500YD. -+ -+ -- Aurelien Jarno Tue, 2 May 2006 21:49:37 +0200 -+ -+hddtemp (0.3-beta15-2) unstable; urgency=low -+ -+ * Updated database for Maxtors MaxLineIII series drives (closes: -+ bug#365011). -+ -+ -- Aurelien Jarno Thu, 27 Apr 2006 14:45:22 +0200 -+ -+hddtemp (0.3-beta15-1) unstable; urgency=low -+ -+ * New upstream version. -+ -+ -- Aurelien Jarno Thu, 27 Apr 2006 05:25:06 +0200 -+ -+hddtemp (0.3-beta14-12) unstable; urgency=low -+ -+ * Added Portuguese translation, thanks to Miguel Figueire (closes: -+ bug#361505). -+ -+ -- Aurelien Jarno Tue, 11 Apr 2006 00:38:51 +0200 -+ -+hddtemp (0.3-beta14-11) unstable; urgency=low -+ -+ * Added support for WDC WD2500PD-00FZB1, WDC WD2500SD-01KCB0, WDC -+ WD1200JD-00HBC0 and WDC WD4000YR-01PLB0 (closes: bug#357804). -+ -+ -- Aurelien Jarno Sat, 25 Mar 2006 20:29:42 +0100 -+ -+hddtemp (0.3-beta14-10) unstable; urgency=low -+ -+ * Use F for fahrenheit. -+ * Added support for Hitachi DK23EA-20B (closes: bug#355763). -+ -+ -- Aurelien Jarno Sat, 18 Mar 2006 11:39:20 +0100 -+ -+hddtemp (0.3-beta14-9) unstable; urgency=low -+ -+ * Update hddtemp.db (closes: bug#355469). -+ -+ -- Aurelien Jarno Mon, 6 Mar 2006 00:40:35 +0100 -+ -+hddtemp (0.3-beta14-8) unstable; urgency=low -+ -+ * Don't flood syslog if the system clock wraps (closes: bug#354260). -+ -+ -- Aurelien Jarno Fri, 24 Feb 2006 21:32:36 +0100 -+ -+hddtemp (0.3-beta14-7) unstable; urgency=low -+ -+ * Correctly initialize the structure dsk. -+ -+ -- Aurelien Jarno Sat, 4 Feb 2006 22:01:07 +0100 -+ -+hddtemp (0.3-beta14-6) unstable; urgency=low -+ -+ * Added support for TOSHIBA MK4026GAX. -+ -+ -- Aurelien Jarno Sun, 11 Dec 2005 21:13:06 +0100 -+ -+hddtemp (0.3-beta14-5) unstable; urgency=low -+ -+ * Added Swedish translation of hddtemp. Thanks to Daniel Nylander (close: -+ bug#337117). -+ -+ -- Aurelien Jarno Thu, 3 Nov 2005 01:56:26 +0100 -+ -+hddtemp (0.3-beta14-4) unstable; urgency=low -+ -+ * Fixed the package device patch. -+ -+ -- Aurelien Jarno Thu, 27 Oct 2005 03:18:43 +0200 -+ -+hddtemp (0.3-beta14-3) unstable; urgency=low -+ -+ * Don't try to read temperature from packet devices drives (closes: -+ bug#316750, bug#335571). -+ * Verify the response length when calling modesense (closes: -+ bug#278345). -+ -+ -- Aurelien Jarno Thu, 27 Oct 2005 01:02:21 +0200 -+ -+hddtemp (0.3-beta14-2) unstable; urgency=low -+ -+ * Added Swedish debconf translation. Thanks to Daniel Nylander (closes: -+ bug#333713). -+ -+ -- Aurelien Jarno Fri, 14 Oct 2005 11:22:05 +0200 -+ -+hddtemp (0.3-beta14-1) unstable; urgency=low -+ -+ * New upstream version. -+ -+ -- Aurelien Jarno Wed, 21 Sep 2005 14:48:43 +0200 -+ -+hddtemp (0.3-beta13-23) unstable; urgency=low -+ -+ * Added SAMSUNG SP2014N disk to the database. -+ -+ -- Aurelien Jarno Wed, 14 Sep 2005 11:27:22 +0200 -+ -+hddtemp (0.3-beta13-22) unstable; urgency=low -+ -+ * Updated hddtemp.db (closes: bug#326180, bug#326181). -+ -+ -- Aurelien Jarno Tue, 6 Sep 2005 03:51:29 +0200 -+ -+hddtemp (0.3-beta13-21) unstable; urgency=low -+ -+ * Added TOSHIBA MK4026GAX disk to the database (closes: bug#325702). -+ -+ -- Aurelien Jarno Wed, 31 Aug 2005 11:16:55 +0200 -+ -+hddtemp (0.3-beta13-20) unstable; urgency=low -+ -+ * Added Arabic debconf translation. Thanks to Mohammed Adnène Trojette -+ (closes: bug#320766). -+ -+ -- Aurelien Jarno Mon, 1 Aug 2005 15:40:56 +0200 -+ -+hddtemp (0.3-beta13-19) unstable; urgency=low -+ -+ * Fixed DISKS_NOPROBE when no other disks are detected. -+ * Added a logcheck rule to ignore sleeping drives (closes: bug#316613). -+ * Bumped Standards-Version to 3.6.2 (no changes). -+ -+ -- Aurelien Jarno Wed, 6 Jul 2005 19:15:16 +0200 -+ -+hddtemp (0.3-beta13-18) unstable; urgency=low -+ -+ * Added DISKS_NOPROBE option to the /etc/default/hddtemp (closes: -+ bug#316270). -+ -+ -- Aurelien Jarno Wed, 29 Jun 2005 22:13:53 +0200 -+ -+hddtemp (0.3-beta13-17) unstable; urgency=low -+ -+ * Updated database. -+ * Added support for Western Digital Caviar WD800BB (closes: bug#312247). -+ -+ -- Aurelien Jarno Thu, 9 Jun 2005 23:16:25 +0200 -+ -+hddtemp (0.3-beta13-16) unstable; urgency=low -+ -+ * Updated Vietnamese debconf translation. Thanks to Clytie Siddall (closes: -+ bug#311893). -+ * Fixed a typo in the debconf template. Thanks to Clytie Siddall (closes: -+ bug#311894). -+ -+ -- Aurelien Jarno Sat, 4 Jun 2005 17:03:31 +0200 -+ -+hddtemp (0.3-beta13-15) unstable; urgency=low -+ -+ * Updated German debconf translation. Thanks to Erik Schanze (closes: -+ bug#311716). -+ -+ -- Aurelien Jarno Fri, 3 Jun 2005 00:41:00 +0200 -+ -+hddtemp (0.3-beta13-14) unstable; urgency=low -+ -+ * Added SV4012H to the database. -+ -+ -- Aurelien Jarno Tue, 24 May 2005 00:54:01 +0200 -+ -+hddtemp (0.3-beta13-13) unstable; urgency=low -+ -+ * Added WD800BB-00JHA0 to the database (closes: bug#310301). -+ -+ -- Aurelien Jarno Mon, 23 May 2005 01:08:43 +0200 -+ -+hddtemp (0.3-beta13-12) unstable; urgency=low -+ -+ * Added HDS722512VLAT80 to the database (closes: bug#309011). -+ * Added Vietnamese debconf translation. Thanks to Clytie Siddall (closes: -+ bug#309451). -+ -+ -- Aurelien Jarno Mon, 16 May 2005 16:58:00 +0200 -+ -+hddtemp (0.3-beta13-11) unstable; urgency=low -+ -+ * Added WD2500JB-55GVA0 to the database (closes: bug#307673). -+ -+ -- Aurelien Jarno Wed, 4 May 2005 23:47:12 +0200 -+ -+hddtemp (0.3-beta13-10) unstable; urgency=high -+ -+ * Daemonization fixed (closes: bug#307113). -+ * Added HDS722525VLSA80 to the database (closes: bug#306691). -+ -+ -- Aurelien Jarno Mon, 2 May 2005 01:01:54 +0200 -+ -+hddtemp (0.3-beta13-9) unstable; urgency=low -+ -+ * Remove /etc/logcheck.ignore.workstation/hddtemp in postinst. -+ -+ -- Aurelien Jarno Fri, 22 Apr 2005 18:35:58 +0200 -+ -+hddtemp (0.3-beta13-8) unstable; urgency=low -+ -+ * Really applied Danish debconf template (closes: bug#302353). -+ * Updated Czech debconf template. Thanks to Miroslav Jezbera (closes: -+ bug#304716). -+ * Updated French debconf template. Thanks to Jean-Luc Coulon (closes: -+ bug#303061). -+ * Added WD2000JB-32EVA0 to hddtemp.deb (closes: bug#302760). -+ * Fixed logcheck ignore files (closes: bug#304110). -+ -+ -- Aurelien Jarno Fri, 15 Apr 2005 06:26:34 +0200 -+ -+hddtemp (0.3-beta13-7) unstable; urgency=low -+ -+ * Updated Danish debconf template. Thanks to Claus Hindsgaul (closes: -+ bug#302353). -+ -+ -- Aurelien Jarno Fri, 15 Apr 2005 06:15:19 +0200 -+ -+hddtemp (0.3-beta13-6) unstable; urgency=low -+ -+ * Updated Japanese debconf template. Thanks to Kenshi Muto (closes: -+ bug#302322). -+ -+ -- Aurelien Jarno Thu, 31 Mar 2005 12:26:56 +0200 -+ -+hddtemp (0.3-beta13-5) unstable; urgency=low -+ -+ * Fixed French debconf template. -+ -+ -- Aurelien Jarno Wed, 30 Mar 2005 22:59:34 +0200 -+ -+hddtemp (0.3-beta13-4) unstable; urgency=low -+ -+ * debian/templates: s/gkrellm-hdtemp/gkrellm/g (closes: bug#302178). -+ -+ -- Aurelien Jarno Wed, 30 Mar 2005 15:21:10 +0200 -+ -+hddtemp (0.3-beta13-3) unstable; urgency=medium -+ -+ * Don't listen on socket if only syslog is choosen in debconf. Thanks to -+ Mario Holbe for the patch (closes: bug#302065). -+ -+ -- Aurelien Jarno Wed, 30 Mar 2005 01:25:04 +0200 -+ -+hddtemp (0.3-beta13-2) unstable; urgency=medium -+ -+ * Try to detect cdrom drives using the ide-scsi driver (closes: -+ bug#302061). -+ -+ -- Aurelien Jarno Wed, 30 Mar 2005 00:38:49 +0200 -+ -+hddtemp (0.3-beta13-1) unstable; urgency=medium -+ -+ * New upstream version which contains the same code as in the previous -+ Debian package. -+ * Use SG_IO only when available (closes: bug#300679). -+ * Added syslog option in debconf (closes: bug#300332). -+ * Fixed the manpage (closes: bug#300332). -+ * Only disable SCSI exceptions if they are already enabled (closes: -+ bug#278345). -+ -+ -- Aurelien Jarno Tue, 29 Mar 2005 15:56:03 +0200 -+ -+hddtemp (0.3-beta12-16) unstable; urgency=low -+ -+ * Verify SATA magics in the ATA pass through subroutine. -+ -+ -- Aurelien Jarno Sun, 27 Feb 2005 16:51:48 +0100 -+ -+hddtemp (0.3-beta12-15) unstable; urgency=low -+ -+ * Change the way SATA disks are detected, so that there is no more -+ SCSI errors with SCSI disks. -+ * Print SCSI disks name in a smarter way. -+ * Updated database. -+ -+ -- Aurelien Jarno Fri, 25 Feb 2005 22:59:36 +0100 -+ -+hddtemp (0.3-beta12-14) unstable; urgency=low -+ -+ * Converted SCSI subroutines to SG_IO (closes: bug#235422, bug#275612, -+ bug#292205). -+ * Added support for SATA (closes: bug#227409). A kernel patch for -+ SATA is still need (see /usr/share/doc/hddtemp/README). -+ -+ -- Aurelien Jarno Fri, 25 Feb 2005 02:16:57 +0100 -+ -+hddtemp (0.3-beta12-13) unstable; urgency=low -+ -+ * Don't display an error message if /proc/sys/dev/cdrom/info doesn't -+ exist (systems without CDROM drives) (closes: bug#295814). -+ -+ -- Aurelien Jarno Fri, 18 Feb 2005 12:42:18 +0100 -+ -+hddtemp (0.3-beta12-12) unstable; urgency=low -+ -+ * Added Hitachi Deskstar 7K80 40G and 80GB disks. -+ -+ -- Aurelien Jarno Sun, 6 Feb 2005 17:49:15 +0100 -+ -+hddtemp (0.3-beta12-11) unstable; urgency=low -+ -+ * Uses /proc/sys/dev/cdrom/info instead of hardcoded paths to detect CDROM -+ drives (closes: bug#293542). -+ -+ -- Aurelien Jarno Fri, 4 Feb 2005 11:15:37 +0100 -+ -+hddtemp (0.3-beta12-10) unstable; urgency=low -+ -+ * Added a README.Debian to explain why the init script could not found -+ some disks. -+ -+ -- Aurelien Jarno Tue, 25 Jan 2005 16:46:53 +0100 -+ -+hddtemp (0.3-beta12-9) unstable; urgency=low -+ -+ * Updated Brasilian translation. Thanks to Tiago Bortoletto Vaz (closes: -+ bug#283832). -+ -+ -- Aurelien Jarno Wed, 1 Dec 2004 21:40:42 +0100 -+ -+hddtemp (0.3-beta12-8) unstable; urgency=low -+ -+ * Updated hddtemp.db. -+ * Added MHT2060AH drive (closes: bug#280805). -+ -+ -- Aurelien Jarno Wed, 1 Dec 2004 19:19:37 +0100 -+ -+hddtemp (0.3-beta12-7) unstable; urgency=low -+ -+ * Updated German debconf translation. Thanks to Erik Schanze (closes: -+ bug#282280). -+ -+ -- Aurelien Jarno Sun, 21 Nov 2004 16:22:41 +0100 -+ -+hddtemp (0.3-beta12-6) unstable; urgency=low -+ -+ * Don't abord the script if /dev/cdrom doesn't exists. -+ -+ -- Aurelien Jarno Mon, 25 Oct 2004 14:46:42 +0000 -+ -+hddtemp (0.3-beta12-5) unstable; urgency=low -+ -+ * Added a patch to allow temperatures to be logged to syslog (closes: -+ bug#271508). -+ * Added hddtemp-all.sh to contribs. Thanks to Javier Fernández-Sanguino -+ Peña (closes: bug#276444). -+ * /etc/init.d/hddtemp: skip CD and DVD drives. -+ -+ -- Aurelien Jarno Sun, 24 Oct 2004 17:30:34 +0200 -+ -+hddtemp (0.3-beta12-4) unstable; urgency=low -+ -+ * Print "done." in the init script when stopping hddtemp (closes: -+ bug#275952). -+ * Updated hddtemp.db with the latest available version. -+ -+ -- Aurelien Jarno Tue, 12 Oct 2004 10:10:01 +0100 -+ -+hddtemp (0.3-beta12-3) unstable; urgency=medium -+ -+ * Added support for WDC 200GB SE (closes: bug#275105). -+ -+ -- Aurelien Jarno Thu, 7 Oct 2004 21:01:15 +0200 -+ -+hddtemp (0.3-beta12-2) unstable; urgency=low -+ -+ * Added support for Maxtor MaXLine Plus II 250GB (closes: bug#274596). -+ * Added support for Travelstar 5K80 series (closes: bug#274671). -+ * Removed init message when the daemon is disabled. -+ -+ -- Aurelien Jarno Sun, 3 Oct 2004 19:40:23 +0200 -+ -+hddtemp (0.3-beta12-1) unstable; urgency=low -+ -+ * New upstream version. -+ -+ -- Aurelien Jarno Sat, 2 Oct 2004 01:47:19 +0200 -+ -+hddtemp (0.3-beta11-17) unstable; urgency=low -+ -+ * Detect sleeping drives in the init script (closes: bug#269462). -+ -+ -- Aurelien Jarno Wed, 1 Sep 2004 18:49:35 +0200 -+ -+hddtemp (0.3-beta11-16) unstable; urgency=low -+ -+ * Added support for Samsung SpinPoint PL40 serie. -+ * Added support for Western Digital 250GB Special Edition 8MB (closes: -+ bug#269342). -+ * Added support for Maxtor DiamondMax Plus 40 drives (closes: -+ bug#269346). -+ -+ -- Aurelien Jarno Wed, 1 Sep 2004 11:29:55 +0200 -+ -+hddtemp (0.3-beta11-15) unstable; urgency=low -+ -+ * Added Danish debconf translation. Thanks to Claus Hindsgaul (closes: -+ bug#267551). -+ * Added support for Western Digital 160GB Special Edition 8MB (closes: -+ bug#267492). -+ -+ -- Aurelien Jarno Tue, 31 Aug 2004 11:23:43 +0200 -+ -+hddtemp (0.3-beta11-14) unstable; urgency=medium -+ -+ * Let the kernel decide if we can access the device or not (closes: -+ bug#262742). -+ * Added an option to wake-up the driver if need (closes: #255308). -+ * Added IPv6 support. -+ -+ -- Aurelien Jarno Mon, 16 Aug 2004 15:36:00 +0200 -+ -+hddtemp (0.3-beta11-13) unstable; urgency=low -+ -+ * Added Czech debconf translation. Thanks to Miroslav Jezbera (closes: -+ bug#261284). -+ -+ -- Aurelien Jarno Sat, 31 Jul 2004 16:18:17 +0200 -+ -+hddtemp (0.3-beta11-12) unstable; urgency=low -+ -+ * Fixed manpage installation (closes: bug#258048, #258101). -+ -+ -- Aurelien Jarno Thu, 8 Jul 2004 02:08:00 +0200 -+ -+hddtemp (0.3-beta11-11) unstable; urgency=low -+ -+ * Print WARNING messages on stderr (closes: bug#254940). -+ -+ -- Aurelien Jarno Fri, 18 Jun 2004 00:17:08 +0200 -+ -+hddtemp (0.3-beta11-10) unstable; urgency=low -+ -+ * If a debconf answer is empty, ignore it (closes: bug#247026). -+ -+ -- Aurelien Jarno Tue, 4 May 2004 01:48:26 +0200 -+ -+hddtemp (0.3-beta11-9) unstable; urgency=low -+ -+ * The "Welcome to the 10 new EU members" release. -+ * Added --retry parameter when calling start-stop-daemon (closes: -+ bug#246028). -+ -+ -- Aurelien Jarno Sat, 1 May 2004 00:49:45 +0200 -+ -+hddtemp (0.3-beta11-8) unstable; urgency=low -+ -+ * Added support for Samsung P80 SATA drives (closes: bug#243464). -+ -+ -- Aurelien Jarno Tue, 13 Apr 2004 17:34:30 +0200 -+ -+hddtemp (0.3-beta11-7) unstable; urgency=low -+ -+ * Added support for Hitachi Deskstar 7K250 (closes: bug#241493). -+ -+ -- Aurelien Jarno Sun, 11 Apr 2004 16:37:51 +0200 -+ -+hddtemp (0.3-beta11-6) unstable; urgency=low -+ -+ * Added support for Western Digital WD1600JB-00FUA0 disk (closes: -+ bug#237983). -+ -+ -- Aurelien Jarno Tue, 16 Mar 2004 13:14:19 +0100 -+ -+hddtemp (0.3-beta11-5) unstable; urgency=low -+ -+ * Minor changes to debian/postinst script. -+ -+ -- Aurelien Jarno Sun, 8 Feb 2004 00:27:59 +0100 -+ -+hddtemp (0.3-beta11-4) unstable; urgency=low -+ -+ * Updated description (closes: bug#230507). -+ -+ -- Aurelien Jarno Sun, 1 Feb 2004 17:37:58 +0100 -+ -+hddtemp (0.3-beta11-3) unstable; urgency=low -+ -+ * Don't include asm headers on architectures that don't support -+ backtracing. -+ -+ -- Aurelien Jarno Sun, 25 Jan 2004 21:57:49 +0100 -+ -+hddtemp (0.3-beta11-2) unstable; urgency=low -+ -+ * Included upstream ChangeLog (closes: bug#226329). -+ -+ -- Aurelien Jarno Tue, 6 Jan 2004 03:16:37 +0100 -+ -+hddtemp (0.3-beta11-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Updated the database to version 03C. -+ -+ -- Aurelien Jarno Fri, 2 Jan 2004 10:05:21 +0100 -+ -+hddtemp (0.3-beta10-2) unstable; urgency=low -+ -+ * Disable backtracing on non-i386 architectures. -+ -+ -- Aurelien Jarno Mon, 15 Dec 2003 09:19:48 +0100 -+ -+hddtemp (0.3-beta10-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Updated debian/copyright. -+ -+ -- Aurelien Jarno Mon, 15 Dec 2003 08:24:37 +0100 -+ -+hddtemp (0.3-beta9-2) unstable; urgency=low -+ -+ * Moved ja.po in the right directory. -+ -+ -- Aurelien Jarno Fri, 12 Dec 2003 09:31:19 +0100 -+ -+hddtemp (0.3-beta9-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Updated the database to version 03B. -+ -+ -- Aurelien Jarno Fri, 12 Dec 2003 09:21:16 +0100 -+ -+hddtemp (0.3-beta8-7) unstable; urgency=low -+ -+ * Added po debconf translations. Thanks to Kenshi Muto. (closes: -+ bug#211954) -+ -+ -- Aurelien Jarno Sun, 21 Sep 2003 14:03:19 +0200 -+ -+hddtemp (0.3-beta8-6) unstable; urgency=low -+ -+ * Remove the link to /usr/sbin/hddtemp in /usr/bin when removing the -+ package (closes: bug#210609). -+ * Updated Policy standard compliance to 3.6.1 (no changes). -+ -+ -- Aurelien Jarno Fri, 12 Sep 2003 16:06:56 +0200 -+ -+hddtemp (0.3-beta8-5) unstable; urgency=low -+ -+ * Removed the single-quoting around the -s parameter in the init script -+ (closes: bug#208542). -+ -+ -- Aurelien Jarno Wed, 3 Sep 2003 19:02:24 +0200 -+ -+hddtemp (0.3-beta8-4) unstable; urgency=medium -+ -+ * Don't modify the config file in the config script (closes: bug#203583). -+ * Urgency set to medium as the bug breaks upgrade. -+ * The init script also stop manually started daemons. -+ * Added a small patch to make sure hddtemp could not be started in daemon -+ mode by a normal user even if it is SUID root. -+ -+ -- Aurelien Jarno Tue, 2 Sep 2003 14:52:03 +0200 -+ -+hddtemp (0.3-beta8-3) unstable; urgency=low -+ -+ * Don't strip the comments from the config file when installing the -+ package. -+ -+ -- Aurelien Jarno Mon, 1 Sep 2003 18:51:33 +0200 -+ -+hddtemp (0.3-beta8-2) unstable; urgency=low -+ -+ * Fixed a typo in the manpage. Thanks to Carlos Valdivia Yagüe. (Closes: -+ bug#205947). -+ -+ -- Aurelien Jarno Tue, 19 Aug 2003 09:19:04 +0200 -+ -+hddtemp (0.3-beta8-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Recoded the changelog in UTF-8. -+ -+ -- Aurelien Jarno Tue, 12 Aug 2003 01:14:19 +0200 -+ -+hddtemp (0.3-beta7-6) unstable; urgency=low -+ -+ * Fixed config and postinst scripts (closes: bug#203583). -+ -+ -- Aurelien Jarno Tue, 5 Aug 2003 09:16:11 +0200 -+ -+hddtemp (0.3-beta7-5) unstable; urgency=low -+ -+ * Fixed a typo in /etc/init.d/hddtemp (closes: bug#203441). -+ -+ -- Aurelien Jarno Wed, 30 Jul 2003 06:29:45 +0200 -+ -+hddtemp (0.3-beta7-4) unstable; urgency=low -+ -+ * Changed the DAEMON parameter in /etc/default/hddtemp to RUN_DAEMON -+ (closes: bug#203107). -+ * Updated the database to version 036. -+ * Updated Policy standard compliance to 3.6.0. -+ -+ -- Aurelien Jarno Mon, 28 Jul 2003 02:32:00 +0200 -+ -+hddtemp (0.3-beta7-3) unstable; urgency=low -+ -+ * Updated es debconf translations. Thanks to Carlos Valdivia Yagüe. -+ (closes: bug#198450). -+ * Updated the database to version 033. -+ -+ -- Aurelien Jarno Tue, 24 Jun 2003 01:12:00 +0200 -+ -+hddtemp (0.3-beta7-2) unstable; urgency=low -+ -+ * Updated fr debconf translations. Thanks to Michel Grentzin. -+ (closes: bug#198155) -+ * Added pt_BR debconf translations. Thanks to Andre Luis Lopes. -+ (closes: bug#198350) -+ -+ -- Aurelien Jarno Sun, 22 Jun 2003 02:55:59 +0200 -+ -+hddtemp (0.3-beta7-1) unstable; urgency=low -+ -+ * New upstream version with i18n support. -+ -+ -- Aurelien Jarno Mon, 16 Jun 2003 22:54:25 +0200 -+ -+hddtemp (0.3-beta6-9) unstable; urgency=low -+ -+ * Updated the database to version 032. -+ * Unmark some untranslatable strings in the master templates file. (closes: -+ bug#197642). -+ -+ -- Aurelien Jarno Mon, 16 Jun 2003 19:32:07 +0200 -+ -+hddtemp (0.3-beta6-8) unstable; urgency=low -+ -+ * Updated the database to version 030. -+ * Updated fr debconf translations. Thanks to Michel Grentzin. -+ (closes: bug#196765) -+ -+ -- Aurelien Jarno Mon, 9 Jun 2003 20:37:46 +0200 -+ -+hddtemp (0.3-beta6-7) unstable; urgency=low -+ -+ * Changed priority for debconf questions to more reasonable values. -+ * Updated the database to version 02F. -+ * Updated Policy standard compliance to 3.5.10. -+ -+ -- Aurelien Jarno Thu, 22 May 2003 23:43:24 +0200 -+ -+hddtemp (0.3-beta6-6) unstable; urgency=low -+ -+ * Don't mark /etc/default/hddtemp as a conffile, handle it entirely -+ in maintainer scripts (closes: bug#193466). -+ * Pass --ok-nodo argument to start-stop-daemon in init script when -+ stopping hddtemp (closes: bug#193622). -+ -+ -- Aurelien Jarno Sun, 18 May 2003 13:09:48 +0200 -+ -+hddtemp (0.3-beta6-5) unstable; urgency=low -+ -+ * Updated the database to version 02E. -+ * Don't save the fact that the daemon is running or not in debconf, but -+ rather in /etc/default/hddemp. -+ -+ -- Aurelien Jarno Sun, 11 May 2003 15:06:47 +0200 -+ -+hddtemp (0.3-beta6-4) unstable; urgency=low -+ -+ * Updated the upstream project homepage in debian/copyright (closes: -+ bug#190960). -+ -+ -- Aurelien Jarno Sun, 27 Apr 2003 17:46:53 +0200 -+ -+hddtemp (0.3-beta6-3) unstable; urgency=low -+ -+ * Updated the upstream project homepage in the description (closes: -+ bug#190929). -+ * Updated the database to version 02B. -+ -+ -- Aurelien Jarno Sun, 27 Apr 2003 11:40:14 +0200 -+ -+hddtemp (0.3-beta6-2) unstable; urgency=low -+ -+ * Added port and separator options to /etc/default/hddtemp. -+ * Added -l option to the manpage. -+ -+ -- Aurelien Jarno Thu, 3 Apr 2003 09:44:58 +0200 -+ -+hddtemp (0.3-beta6-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Updated database. -+ * Updated Policy standard compliance to 3.5.9. -+ -+ -- Aurelien Jarno Wed, 2 Apr 2003 22:54:01 +0200 -+ -+hddtemp (0.3-beta5-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Updated database. -+ * Added an option to listen on a specific interface (closes: bug#186062). -+ * Changed name displayed by /etc/init.d/hddtemp (closes: bug#187041). -+ -+ -- Aurelien Jarno Tue, 1 Apr 2003 02:24:53 +0200 -+ -+hddtemp (0.3-beta4-2) unstable; urgency=low -+ -+ * The "I have uploaded the wrong version" release. -+ * Fixed a bug in i18n.c. (closes: bug#185328). -+ -+ -- Aurelien Jarno Tue, 18 Mar 2003 20:32:03 +0100 -+ -+hddtemp (0.3-beta4-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Updated database. -+ * Improved /etc/init.d/hddtemp and added a config file in -+ /etc/default (Closes: bug#183843). Thanks to Greg Miller. -+ * Fixed a bug in i18n.c. -+ * Added homepage and author to the description. -+ * Debconf templates are now managed with po-debconf. -+ * Uses debian/compat instead of DH_COMPAT. -+ -+ -- Aurelien Jarno Mon, 17 Mar 2003 00:29:12 +0100 -+ -+hddtemp (0.3-beta3-3) unstable; urgency=low -+ -+ * Added patch to allow local port reuse in TIME_WAIT. -+ -+ -- Aurelien Jarno Sat, 25 Jan 2003 01:43:21 +0100 -+ -+hddtemp (0.3-beta3-2) unstable; urgency=low -+ -+ * Don't fail at postinst stage if daemon failed to start. (closes: -+ bug#177660) -+ -+ -- Aurelien Jarno Fri, 24 Jan 2003 21:21:41 +0100 -+ -+hddtemp (0.3-beta3-1) unstable; urgency=low -+ -+ * New upstream version including all the previous patches plus some fixes. -+ * Updated database. -+ -+ -- Aurelien Jarno Sun, 19 Jan 2003 21:27:30 +0100 -+ -+hddtemp (0.3-beta2-4) unstable; urgency=low -+ -+ * Added patch from Julien Blache to fix a lot of spelling mistakes. -+ Thanks ! -+ -+ -- Aurelien Jarno Sun, 19 Jan 2003 09:55:47 +0100 -+ -+hddtemp (0.3-beta2-3) unstable; urgency=low -+ -+ * Added an option to print only the temperature. Thanks to Julien Blache -+ for the patch. (closes: bug#176395) -+ * Fixed some warnings introduced by gcc-3.2. -+ -+ -- Aurelien Jarno Sun, 12 Jan 2003 12:30:49 +0100 -+ -+hddtemp (0.3-beta2-2) unstable; urgency=low -+ -+ * Merged hddtemp and hddtemp-daemon and added a debconf question -+ because the package was refused by the ftpmaster. -+ -+ -- Aurelien Jarno Wed, 8 Jan 2003 21:48:09 +0100 -+ -+hddtemp (0.3-beta2-1) unstable; urgency=low -+ -+ * New beta version. -+ * Added daemon mode init script to the new package hddtemp-daemon. -+ * Updated Policy standard compliance to 3.5.8. -+ -+ -- Aurelien Jarno Sat, 4 Jan 2003 10:04:16 +0100 -+ -+hddtemp (0.2-18) unstable; urgency=low -+ -+ * Updated database (version 021). -+ -+ -- Aurelien Jarno Sat, 28 Dec 2002 16:59:39 -0500 -+ -+hddtemp (0.2-17) unstable; urgency=low -+ -+ * Fixed copyright file. -+ * Removed debian/conffiles, this is handled by dh_installdeb automatically ; -+ otherwise we end up with each conffile being listed twice... -+ -+ -- Aurelien Jarno Tue, 17 Dec 2002 01:39:02 +0100 -+ -+hddtemp (0.2-16) unstable; urgency=low -+ -+ * Updated database (version 01f). -+ -+ -- Aurelien Jarno Tue, 17 Dec 2002 00:40:07 +0100 -+ -+hddtemp (0.2-15) unstable; urgency=low -+ -+ * Updated database (version 01D). -+ * Added disk model IC35L040AVVN07-0 (closes: bug#172117). Thanks to Henrique -+ de Moraes Holschuh. -+ -+ -- Aurelien Jarno Sat, 7 Dec 2002 16:47:41 +0100 -+ -+hddtemp (0.2-14) unstable; urgency=low -+ -+ * Corrected a bug affecting the display of the degree sign. -+ -+ -- Aurelien Jarno Thu, 26 Sep 2002 01:29:10 +0200 -+ -+hddtemp (0.2-13) unstable; urgency=low -+ -+ * Added support for other encodings than iso-8859-1. (closes:bug#158106) -+ * debian/hddtemp.1: corrected description of -f option. -+ -+ -- Aurelien Jarno Wed, 25 Sep 2002 14:26:20 +0200 -+ -+hddtemp (0.2-12) unstable; urgency=low -+ -+ * Updated database. -+ * Updated Policy standard compliance to 3.5.7 -+ -+ -- Aurelien Jarno Wed, 11 Sep 2002 14:21:49 +0200 -+ -+hddtemp (0.2-11) unstable; urgency=low -+ -+ * Updated database. -+ -+ -- Aurelien Jarno Wed, 14 Aug 2002 23:01:31 +0200 -+ -+hddtemp (0.2-10) unstable; urgency=low -+ -+ * Updated database. (closes: bug#149313) -+ -+ -- Aurelien Jarno Sat, 15 Jun 2002 00:00:48 +0200 -+ -+hddtemp (0.2-9) unstable; urgency=low -+ -+ * Corrected a bug affecting the display of the degree sign on some systems. -+ (closes: bug#147136, #147138) -+ -+ -- Aurelien Jarno Tue, 11 Jun 2002 19:34:03 +0200 -+ -+hddtemp (0.2-8) unstable; urgency=low -+ -+ * Corrected debconf template. (closes: bug#148146) -+ * Updated HDD database. -+ -+ -- Aurelien Jarno Sat, 25 May 2002 17:11:16 +0200 -+ -+hddtemp (0.2-7) unstable; urgency=low -+ -+ * Corrected the man page. -+ -+ -- Aurelien Jarno Sun, 19 May 2002 23:54:39 +0200 -+ -+hddtemp (0.2-6) unstable; urgency=low -+ -+ * Updated HDD database. -+ -+ -- Aurelien Jarno Sat, 18 May 2002 13:33:02 +0200 -+ -+hddtemp (0.2-5) unstable; urgency=low -+ -+ * Updated HDD database. -+ * Updated the man page. -+ -+ -- Aurelien Jarno Mon, 13 May 2002 06:40:08 +0200 -+ -+hddtemp (0.2-4) unstable; urgency=low -+ -+ * Moved /usr/share/hddtemp/hddtemp.db to /etc/hddtemp.db as conffile. -+ (closes: bug#146738) -+ -+ -- Aurelien Jarno Sun, 12 May 2002 19:50:23 +0200 -+ -+hddtemp (0.2-3) unstable; urgency=low -+ -+ * Added de debconf translations. -+ * Updated HDD database. -+ -+ -- Aurelien Jarno Sun, 12 May 2002 17:15:28 +0200 -+ -+hddtemp (0.2-2) unstable; urgency=low -+ -+ * Fixed typos and erroneous statement in description. (closes: bug#146551) -+ * Fixed manpage. (closes: bug#146554) -+ * A symlink to /usr/bin is made when installing hddtemp SUID root. -+ -+ -- Aurelien Jarno Sat, 11 May 2002 15:54:42 +0200 -+ -+hddtemp (0.2-1) unstable; urgency=low -+ -+ * Initial Release. (closes: bug#145611) -+ -+ -- Aurelien Jarno Thu, 9 May 2002 14:50:35 +0200 -+ ---- hddtemp-0.3-beta15.orig/debian/templates -+++ hddtemp-0.3-beta15/debian/templates -@@ -0,0 +1,63 @@ -+# These templates have been reviewed by the debian-l10n-english -+# team -+# -+# If modifications/additions/rewording are needed, please ask -+# debian-l10n-english@lists.debian.org for advice. -+# -+# Even minor modifications require translation updates and such -+# changes should be coordinated with translators and reviewers. -+ -+Template: hddtemp/SUID_bit -+Type: boolean -+Default: false -+_Description: Should /usr/sbin/hddtemp be installed SUID root? -+ You have the option of installing hddtemp with the SUID bit set, -+ allowing it to be run (reporting hard drive temperatures) by regular -+ users and not only the superuser. -+ . -+ This could potentially allow hddtemp to be used during an attack -+ against the computer's security. If in doubt, do not choose this option. -+ . -+ This setting can be modified later by running 'dpkg-reconfigure hddtemp'. -+ -+Template: hddtemp/syslog -+Type: string -+Default: 0 -+_Description: Interval between hard drive temperature checks: -+ The temperature of the hard drive(s) can be logged by hddtemp via -+ the generic system logging interface. -+ . -+ Please enter a value in seconds corresponding to the interval between -+ two checks. To disable this feature, enter 0. -+ -+Template: hddtemp/daemon -+Type: boolean -+Default: false -+_Description: Should the hddtemp daemon be started at boot? -+ The hddtemp program can be run as a daemon, listening on port 7634 -+ for incoming connections. It is used by some software such as gkrellm to get -+ the temperature of hard drives. -+ . -+ You have the option of starting the hddtemp daemon automatically on -+ system boot. If in doubt, it is suggested to not start it -+ automatically on boot. -+ . -+ This setting can be modified later by running 'dpkg-reconfigure hddtemp'. -+ -+Template: hddtemp/interface -+Type: string -+Default: 127.0.0.1 -+_Description: Interface to listen on: -+ The hddtemp program can listen for incoming connections on a specific -+ interface, or on all interfaces. -+ . -+ To listen on a specific interface, enter the IP address of that interface -+ (choosing 127.0.0.1 will accept local connections only). To listen on all interfaces, -+ enter 0.0.0.0. -+ -+Template: hddtemp/port -+Type: string -+Default: 7634 -+_Description: Port to listen on: -+ By default, hddtemp listens for incoming connections on port 7634. This -+ can be changed for another port number. ---- hddtemp-0.3-beta15.orig/debian/dirs -+++ hddtemp-0.3-beta15/debian/dirs -@@ -0,0 +1,3 @@ -+etc/init.d -+etc/default -+usr/share/doc/hddtemp ---- hddtemp-0.3-beta15.orig/debian/copyright -+++ hddtemp-0.3-beta15/debian/copyright -@@ -0,0 +1,26 @@ -+This package was debianized by Aurelien Jarno on -+Wed, 8 May 2002 01:40:30 +0200. -+ -+It was downloaded from http://www.guzu.net/linux/hddtemp.php -+ -+Upstream Author: Emmanuel Varagnat -+ -+Copyright: 2002, 2003 Emmanuel Varagnat -+ -+ 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 of the License, 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 with -+ the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; -+ if not, write to the Free Software Foundation, Inc., 51 Franklin St, -+ Fifth Floor, Boston, MA 02110-1301 USA -+ -+ On Debian systems, the complete text of the GNU General Public -+ License, version 2, can be found in /usr/share/common-licenses/GPL-2. ---- hddtemp-0.3-beta15.orig/debian/logcheck.ignore.server -+++ hddtemp-0.3-beta15/debian/logcheck.ignore.server -@@ -0,0 +1,2 @@ -+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ hddtemp\[[0-9]+\]: /dev/([hs]d[a-z]|sg[0-9]): .*: [0-9]+ [CF]$ -+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ hddtemp\[[0-9]+\]: /dev/([hs]d[a-z]|sg[0-9]): .*: drive is sleeping$ ---- hddtemp-0.3-beta15.orig/debian/config -+++ hddtemp-0.3-beta15/debian/config -@@ -0,0 +1,51 @@ -+#!/bin/sh -+# hddtemp package configuration script -+ -+set -e -+ -+conffile="/etc/default/hddtemp" -+ -+get_config_file() -+{ -+ config_field=$1 -+ db_field=$2 -+ -+ if [ -f "$conffile" ] ; then -+ VALUE="$(grep "^[ ]*$config_field" $conffile | sed -e "s/^$config_field *= *\"\(.*\)\"/\1/g")" -+ if [ -n "$VALUE" ] ; then -+ db_set $db_field "$VALUE" -+ fi -+ fi -+} -+ -+# Source debconf library -- we have a Depends line -+# to make sure it is there... -+. /usr/share/debconf/confmodule -+db_version 2.0 -+ -+if [ "$1" = configure -o "$1" = reconfigure ] ; then -+ db_input medium hddtemp/SUID_bit || true -+ -+ get_config_file SYSLOG hddtemp/syslog -+ db_input medium hddtemp/syslog || true -+ -+ get_config_file DAEMON hddtemp/daemon -+ get_config_file RUN_DAEMON hddtemp/daemon -+ db_input medium hddtemp/daemon || true -+ -+ db_go -+ -+ db_get hddtemp/daemon -+ -+ if [ "$RET" = "true" ] ; then -+ get_config_file INTERFACE hddtemp/interface -+ db_input medium hddtemp/interface || true -+ -+ get_config_file PORT hddtemp/port -+ db_input medium hddtemp/port || true -+ -+ db_go -+ fi -+fi -+ -+exit 0 ---- hddtemp-0.3-beta15.orig/debian/postinst -+++ hddtemp-0.3-beta15/debian/postinst -@@ -0,0 +1,146 @@ -+#!/bin/sh -+# postinst script for hddtemp -+set -e -+ -+conffile="/etc/default/hddtemp" -+ -+update_config_file() -+{ -+ db_field=$1 -+ config_field=$2 -+ -+ RET=false -+ db_get $db_field -+ if [ -n "$RET" ] ; then -+ if grep -q "^$config_field" $conffile ; then -+ # keep any admin changes, while replacing the variable content -+ sed "s/^[ ]*$config_field=\".*\"/$config_field=\"$RET\"/" < $conffile > $conffile.new && -+ mv $conffile.new $conffile -+ else -+ echo "$config_field=\"$RET\"" >> $conffile -+ fi -+ fi -+} -+ -+# Source debconf library -- we have a Depends line -+# to make sure it is there... -+. /usr/share/debconf/confmodule -+db_version 2.0 -+ -+case "$1" in -+ configure) -+ if [ -f $conffile ] ; then -+ sed -i -e 's/^[ ]*DAEMON/RUN_DAEMON/g' \ -+ -e 's/^[ ]*SYSLOG/RUN_SYSLOG/g' \ -+ -e 's/^# Master system-wide hddtemp switch.*/# hddtemp network daemon switch. If set to true, hddtemp will listen/' \ -+ -e 's/^# set to true. STOP THE SERVICE.*/# for incoming connections./' \ -+ -e 's/^# Logging period.*temperatures.$/# Logging period (in seconds) for the temperatures. If set to a value\n# different than 0, hddtemp will run as a daemon periodically logging\n# the temperatures through syslog/' \ -+ $conffile -+ if ! grep -q RUN_SYSLOG $conffile ; then -+ cat << EOF >> $conffile -+ -+# Logging period (in seconds) for the temperatures. If set to a value -+# different than 0, hddtemp will run as a daemon periodically logging -+# the temperatures through syslog -+RUN_SYSLOG="0" -+EOF -+ fi -+ if ! grep -q OPTIONS $conffile ; then -+ cat << EOF >> $conffile -+ -+# Other options to pass to hddtemp -+OPTIONS="" -+EOF -+ fi -+ if ! grep -q DISKS_NOPROBE $conffile ; then -+ cat << EOF >> $conffile -+ -+# List of devices you want to use with hddtemp, but that would not be -+# probed for a working sensor. -+DISKS_NOPROBE="" -+EOF -+ fi -+ else -+ cat << EOF > $conffile -+# Defaults for hddtemp initscript (/etc/init.d/hddtemp) -+# This is a POSIX shell fragment -+ -+# [automatically edited by postinst, do not change line format ] -+ -+# hddtemp network daemon switch. If set to true, hddtemp will listen -+# for incoming connections. -+RUN_DAEMON="true" -+ -+# List of devices you want to use with hddtemp. If none specified, -+# hddtemp will probe standard devices. -+#DISKS="/dev/hda" -+ -+# List of devices you want to use with hddtemp, but that would not be -+# probed for a working sensor. -+DISKS_NOPROBE="" -+ -+# IP address of the interface on which you want hddtemp to be bound -+# on. If none specified, goes to 127.0.0.1. Use 0.0.0.0 to bind hddtemp -+# on all interfaces. -+INTERFACE="127.0.0.1" -+ -+# Port number on which you want hddtemp to listen on. If none specified, -+# the port 7634 is used. -+PORT="7634" -+ -+# Database file to use. If none specified, /etc/hddtemp.db is used. -+#DATABASE="/etc/hddtemp.db" -+ -+# Separator to use between fields. The default separator is '|'. -+#SEPARATOR="|" -+ -+# Logging period (in seconds) for the temperatures. If set to a value -+# different than 0, hddtemp will run as a daemon periodically logging -+# the temperatures through syslog -+RUN_SYSLOG="0" -+ -+# Other options to pass to hddtemp -+OPTIONS="" -+EOF -+ fi -+ -+ update_config_file hddtemp/daemon RUN_DAEMON -+ update_config_file hddtemp/syslog RUN_SYSLOG -+ update_config_file hddtemp/interface INTERFACE -+ update_config_file hddtemp/port PORT -+ -+ if ! dpkg-statoverride --list /usr/sbin/hddtemp 1>/dev/null 2>&1; then -+ # check if we are installing suid or not -+ RET=false -+ db_get hddtemp/SUID_bit -+ if [ "$RET" = "true" ]; then -+ chmod 4755 /usr/sbin/hddtemp -+ ln -sf /usr/sbin/hddtemp /usr/bin/hddtemp -+ ln -sf ../man8/hddtemp.8.gz /usr/share/man/man1/hddtemp.1.gz -+ else -+ chmod 0755 /usr/sbin/hddtemp -+ rm -f /usr/bin/hddtemp -+ rm -f /usr/share/man/man8/hddtemp.1.gz -+ fi -+ fi -+ -+ db_stop -+ -+ rm -f /etc/logcheck/ignore.d.workstation/hddtemp -+ ;; -+ abort-upgrade|abort-remove|abort-deconfigure) -+ ;; -+ -+ *) -+ echo "postinst called with unknown argument \`$1'" >&2 -+ exit 1 -+ ;; -+esac -+ -+ -+# dh_installdeb will replace this with shell code automatically -+# generated by other debhelper scripts. -+ -+#DEBHELPER# -+ -+exit 0 ---- hddtemp-0.3-beta15.orig/debian/control -+++ hddtemp-0.3-beta15/debian/control -@@ -0,0 +1,17 @@ -+Source: hddtemp -+Section: utils -+Priority: extra -+Maintainer: Aurelien Jarno -+Build-Depends: debhelper (>> 5), autotools-dev, gettext (>> 0.10.1) -+Standards-Version: 3.9.3 -+Homepage: http://www.guzu.net/linux/hddtemp.php -+ -+Package: hddtemp -+Architecture: any -+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-3) -+Suggests: ksensors -+Conflicts: ksensors (<< 0.7-8), gkrellm-hddtemp (<< 0.1-9) -+Description: hard drive temperature monitoring utility -+ The hddtemp program monitors and reports the temperature of PATA, SATA -+ or SCSI hard drives by reading Self-Monitoring Analysis and Reporting -+ Technology (S.M.A.R.T.) information on drives that support this feature. ---- hddtemp-0.3-beta15.orig/debian/init -+++ hddtemp-0.3-beta15/debian/init -@@ -0,0 +1,100 @@ -+#!/bin/sh -+# -+# skeleton example file to build /etc/init.d/ scripts. -+# This file should be used to construct scripts for /etc/init.d. -+# -+# Written by Miquel van Smoorenburg . -+# Modified for Debian GNU/Linux -+# by Ian Murdock . -+# -+# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl -+# -+ -+### BEGIN INIT INFO -+# Provides: hddtemp -+# Required-Start: $remote_fs $syslog $network -+# Required-Stop: $remote_fs $syslog $network -+# Default-Start: 2 3 4 5 -+# Default-Stop: 0 1 6 -+# Short-Description: disk temperature monitoring daemon -+# Description: hddtemp is a disk temperature monitoring daemon -+### END INIT INFO -+ -+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -+NAME=hddtemp -+DAEMON=/usr/sbin/$NAME -+DESC="disk temperature monitoring daemon" -+ -+DISKS="/dev/hd[a-z] /dev/hd[a-z][a-z]" -+DISKS="$DISKS /dev/sd[a-z] /dev/sd[a-z][a-z]" -+DISKS="$DISKS /dev/sr[a-z] /dev/sr[a-z][a-z]" -+INTERFACE="0.0.0.0" -+PORT="7634" -+SEPARATOR="|" -+RUN_SYSLOG="0" -+ -+# Reads config file (will override defaults above) -+[ -r /etc/default/hddtemp ] && . /etc/default/hddtemp -+ -+if [ -n "$RUN_SYSLOG" ] && [ "$RUN_SYSLOG" != "0" ] ; then -+ SYSLOG_ARG="-S $RUN_SYSLOG" -+fi -+ -+if [ "$RUN_DAEMON" = "true" ] || [ "$RUN_DAEMON" = "yes" ] ; then -+ DAEMON_ARG="-d -l $INTERFACE -p $PORT -s $SEPARATOR" -+fi -+ -+[ -x "$DAEMON" ] || exit 0 -+ -+. /lib/lsb/init-functions -+ -+case "$1" in -+ start) -+ # master switch -+ if [ -n "$DAEMON_ARG" ] || [ -n "$SYSLOG_ARG" ] ; then -+ log_daemon_msg "Starting $DESC" "$NAME:" -+ CDROMS_LIST=$(sed -ne 's/^drive name:\t\+\(.*\)$/ \/dev\/\1/p' /proc/sys/dev/cdrom/info 2>/dev/null) || : -+ CDROMS_LIST="$CDROMS_LIST $(grep -sl '^ide-scsi ' /proc/ide/hd*/driver | awk -F / '{ print "/dev/"$4 }')" -+ for disk in $DISKS ; do -+ echo $CDROMS_LIST | grep -wq $disk && continue -+ echo $DISKS_NOPROBE | grep -wq $disk && continue -+ if $DAEMON -wn $OPTIONS $disk 2>/dev/null | grep -q '^[0-9]\+$' ; then -+ DISKS_LIST="$DISKS_LIST $disk"; -+ fi -+ done -+ if [ -n "$DISKS_LIST" ] || [ -n "$DISKS_NOPROBE" ] ; then -+ start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_ARG $SYSLOG_ARG $OPTIONS $DISKS_NOPROBE $DISKS_LIST -+ ret=$? -+ log_progress_msg "$DISKS_NOPROBE$DISKS_LIST" -+ log_end_msg $ret -+ else -+ log_progress_msg "no disks with monitoring capability were found." -+ log_end_msg 0 -+ fi -+ fi -+ ;; -+ stop) -+ # master switch -+ if [ "$RUN_DAEMON" = "true" ] || [ "$RUN_DAEMON" = "yes" ] || [ "$RUN_SYSLOG" != "0" ] ; then -+ log_daemon_msg "Stopping $DESC" "$NAME" -+ start-stop-daemon --stop --oknodo --exec $DAEMON --retry 30 -+ log_end_msg $? -+ fi -+ ;; -+ force-reload|reload) -+ exit 3 -+ ;; -+ restart) -+ $0 stop && $0 start -+ ;; -+ status) -+ status_of_proc $DAEMON $NAME -+ exit $? -+ ;; -+ *) -+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|status}" >&2 -+ exit 1 -+ ;; -+esac -+ -+exit 0 ---- hddtemp-0.3-beta15.orig/debian/compat -+++ hddtemp-0.3-beta15/debian/compat -@@ -0,0 +1 @@ -+5 ---- hddtemp-0.3-beta15.orig/debian/README.Debian -+++ hddtemp-0.3-beta15/debian/README.Debian -@@ -0,0 +1,14 @@ -+README.Debian for hddtemp -+------------------------- -+ -+This package include an init script (/etc/init.d/hddtemp) to run hddtemp -+in daemon mode. To enable and configure it, either use -+'dpkg-reconfigure hddtemp' or edit /etc/default/hddtemp. -+ -+By default and when enable, the init script tries to find all disk that -+support SMART. If you get an error such as 'no disks with monitoring -+capability were found' or if an hard disk is not monitored, try to run -+'hddtemp /dev/xxx', with /dev/xxx being you hard disk device. You will -+see an explanation about why it fails. -+ -+ -- Aurelien Jarno Sun, 27 Jul 2008 09:34:39 +0200 ---- hddtemp-0.3-beta15.orig/debian/hddtemp.db -+++ hddtemp-0.3-beta15/debian/hddtemp.db -@@ -0,0 +1,169 @@ -+# -+# Insert a regular expression for support of the model or the serie of your hard drive. -+# If you don't know what to put in the second field, put the number -+# that appears most often for your brand :o) -+# A value of zero meens that we know that the drive doesn't have -+# a temperature sensor (you can set the unit to C or F). -+# -+############################################################################ -+# The following list was found at (http://www.almico.com/forumharddisks.php) -+# If your drive is in the list send me a mail. -+# -+# Manufacturer Model Size Notes -+# FUJITSU FUJITSU MPF3102AH 10.0GB -+# FUJITSU FUJITSU MPG3204AH E 20.0GB -+# FUJITSU FUJITSU MPG3307AT 30.0GB -+# FUJITSU FUJITSU MPG3409AH 40.0GB -+# FUJITSU FUJITSU MPG3409AH EF 40.0GB -+# HITACHI HITACHI_DK23CA-10 9.8GB -+# HITACHI HITACHI_DK23CA-15 14.7GB -+# SAMSUNG SAMSUNG SV3012H 29.4GB -+# SEAGATE ST310210A 10.0GB -+# SEAGATE ST310211A 9.8GB -+# SEAGATE ST310215A 10.0GB -+# SEAGATE ST315320A 14.9GB -+# SEAGATE ST320410A 19.6GB -+# SEAGATE ST320413A 19.6GB -+# SEAGATE ST320420A 19.9GB -+# SEAGATE ST330610A 29.3GB -+# SEAGATE ST330620A 29.3GB -+# SEAGATE ST330621A 29.3GB -+# SEAGATE ST330630A 29.9GB -+# SEAGATE ST340016A 39.1GB -+# SEAGATE ST340810ACE 39.1GB -+# SEAGATE ST380020ACE 78.2GB -+# WESTERN DIGITAL WDC AC210200D 10.0GB -+# WESTERN DIGITAL WDC AC29100D 8.9GB -+# WESTERN DIGITAL WDC AC420400D 19.9GB -+# WESTERN DIGITAL WDC WD102AA 10.0GB -+# -+################################################# -+ -+######################################## -+############# ExcelStor drives -+######################################## -+# "ExcelStor Technology CT215" ??? ? "ExcelStor CT215" -+ -+ -+######################################## -+############# Fujitsu drives -+######################################## -+"FUJITSU MHM2100AT" 0 C "Fujitsu MHM2100AT" -+ -+ -+######################################## -+############# Hitachi drives -+######################################## -+"HITACHI_DK228A-65" 0 C "Hitachi DK228A-65" -+ -+ -+######################################## -+############# IBM drives -+######################################## -+ -+# DJSA serie is using F0h command to report temperature and also have -+# SMART capabilties but it was reported not to work. -+# "DJSA-2(30|32|10|20|05)" 0 C "IBM Travelstar 20GN, 32GH, 30GT series" -+ -+"IBM-DARA-212000" 0 C "IBM Travelstar 12GN" -+"IBM-DTTA-35*" 0 C "IBM Deskstar 16GP serie" -+ -+# according to specifications they do not seems to have sensor -+# but I prefer waiting for a report -+#"IBM-DTTA-37*" 0 C "IBM Deskstar 14GXP serie" -+ -+"IBM-DJNA-35.*" 231 C "IBM Deskstar 25 GP serie" -+"IBM-DJNA-37.*" 231 C "IBM Deskstar 22 GXP serie" -+"IBM-DHEA-(34330|36480)" 0 C "IBM Deskstar 5 serie" -+"IBM-DHEA-(34331|36481|38451)" 0 C "IBM Deskstar 8 serie" -+"IBM-DPTA-37.*" 231 C "IBM Deskstar 34GXP serie" -+"IBM-DPTA-35.*" 231 C "IBM Deskstar 37GP serie" -+ -+ -+######################################## -+############# Maxtor drives -+######################################## -+#"Maxtor 2B0[012][04568]H1" ??? C "Maxtor Fireball 541DX" -+# which one must I trust ? -+#"Maxtor 4D040H2" 9 C "Maxtor DiamondMax D540X-4D" -+#"Maxtor 4D040H2" 0 C "Maxtor 4D040H2" -+#"Maxtor 4D080H4" 12 C "Maxtor DiamondMax D540X-4D" -+#"Maxtor 4D060H3" 12 C "Maxtor DiamondMax D540X-4D" -+#"Maxtor 4D080H4" 9 C "Maxtor DiamondMax D540X-4D" -+"Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)" 0 C "Maxtor DiamondMax Plus 40" -+"Maxtor 5T0[24]0H[24]" 0 C "Maxtor DiamondMax Plus 60" -+"Maxtor 94098U8" 11 C "Maxtor DiamondMax 40 94098U8" -+ -+ -+######################################## -+############# Quantum drives -+######################################## -+"QUANTUM FIREBALLP AS40.0" 0 C "Quantum Fireball AS40" -+"QUANTUM FIREBALL CX10.2A" 0 C "Quantum Fireball CX10.2A" -+#"QUANTUM FIREBALLlct10 20" 4 C "Quantum Fireball CT10 20GB" -+# I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9... -+# "QUANTUM FIREBALL_TM2110A" 9 C "Quantum Fireball TM2110A" -+ -+ -+######################################## -+############# Samsung drives -+######################################## -+# somenone reported a problem with the SP8004H which reports a temperature -+# 10°C below the ambient temperature -+"SAMSUNG SW0434A" 0 C "Samsung SW0434A" -+"SAMSUNG SV0432A" 0 C "Samsung SV0432A" -+"SAMSUNG SV3002H" 0 C "Samsung SpinPoint V30 serie" -+#"SAMSUNG SV(0221|0602|0813|1204)H" 9 C "Samsung SpinPoint V60 serie" -+ -+ -+######################################## -+############# Seagate drives -+######################################## -+"Seagate Technology 1275MB - ST31276A" 0 C "Seagate ST31276A" -+"ST3412A" 0 C "Seagate ST3412A" -+"ST38641A" 0 C "Seagate ST38641A" -+"ST310210A" 0 C "Seagate ST310210A" -+"ST310220A" 0 C "Seagate ST310220A" -+# SEAGATE ST313021A 13.0GB -+"ST313021A" 0 C "Seagate U8 ST313021A" -+"ST310240A" 0 C "Seagate Medalist 10240 Ultra ATA-3" -+"ST320423A" 0 C "Seagate U10 20423, Ultra ATA/66" -+ -+ -+######################################## -+############# TOSHIBA Laptops -+######################################## -+"MK4313MAT" 220 C "Toshiba MK4313MAT" -+"TOSHIBA MK1517GAP" 0 C "Toshiba MK1517GAP" -+"TOSHIBA MK2018GAS" 226 F "Toshiba MK2018GAS" -+ -+"TOSHIBA MK3017GAP" 0 C "Toshiba MK3017GAP" -+ -+#"TOSHIBA MK4019GAX" 222 C "Toshiba MK4019GAX" -+ -+ -+######################################## -+############# Western Digital drives -+######################################## -+# WDC AC310100B and WDC AC2850F are reported not working -+# no more informations were given -+"WDC AC22000L" 0 C "Western Digital Caviar AC22000" -+"WDC AC420400D" 231 C "Western Digital Caviar AC420400D" -+"WDC AC418000D" 231 C "Western Digital AC418000D" -+"WDC WD135BA" 231 C "Western Digital WD135BA" -+ -+"WDC WD100EB-00BHF0" 0 C "Western Digital 100EB-00BHF0" -+"WDC WD200BB-00AUA1" 0 C "Western Digital Caviar WD200BB" -+#"WDC WD200BB-60DGA0" 0 C "Western Digital Caviar WD200BB" -+"WDC WD300BB-00CAA0" 0 C "Western Digital WD300BB" -+"WDC WD400BB-00CAA0" 0 C "Western Digital 400BB-00CAA0" -+#"WDC WD400BB-00GFA0" 0 C "" -+"WDC WD400BB-(18CA|00DE)A0" 0 C "Western Digital Caviar WD400BB" -+"WDC WD400EB-00CPF0" 0 C "Western Digital 400EB-00CPF0" -+"WDC WD600BB-32BSA0" 0 C "Western Digital 600BB-32BSA0" -+"WDC WD800BB-00CAA1" 0 C "Western Digital WD800BB-00CAA1" -+"WDC WD800JB-00CRA1" 0 C "Western Digital Caviar WD800JB" -+ -+# not sure for next -+# "WDC WD1200JB-00CRA1" 9 C "Western Digital 1200JB-00CRA1" -+# "WDC WD273BA" 9 C "Western Digital WD273BA" ---- hddtemp-0.3-beta15.orig/debian/po/cs.po -+++ hddtemp-0.3-beta15/debian/po/cs.po -@@ -0,0 +1,159 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-02-05 21:54+0100\n" -+"Last-Translator: Miroslav Kure \n" -+"Language-Team: Czech \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Má se /usr/sbin/hddtemp nainstalovat jako SUID root?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Máte možnost nainstalovat hddtemp s nastaveným SUID bitem, což znamená, že " -+"jej kromÄ› správce budou moci spouÅ¡tÄ›t i běžní uživatelé (a zjiÅ¡Å¥ovat teplotu " -+"pevného disku)." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Takto nastavený hddtemp může být potenciálnÄ› využit ke kompromitování " -+"poÄítaÄe. Pokud si nejste jisti, pak je lepší tuto možnost zamítnout." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "ZmÄ›níte-li pozdÄ›ji názor, staÄí spustit „dpkg-reconfigure hddtemp“." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Interval mezi kontrolami teploty pevného disku:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"hddtemp může zaznamenávat teplotu pevného disku (pevných disků) pÅ™es obecné " -+"logovací rozhraní systému." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Zadejte poÄet sekund odpovídající dobÄ› mezi po sobÄ› jdoucími měřeními. Pro " -+"zakázání této vlastnosti jednoduÅ¡e zadejte 0." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Má se daemon hddtemp spouÅ¡tÄ›t pÅ™i startu poÄítaÄe?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"Program hddtemp může běžet jako daemon a Äekat na portu 7634 na příchozí " -+"spojení. Takto může být využíván programy typu gkrellm pro zjiÅ¡tÄ›ní aktuální " -+"teploty pevných disků." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Máte možnost spouÅ¡tÄ›t daemona hddtemp automaticky pÅ™i startu systému. Pokud " -+"si nejste jisti, pak jej radÄ›ji pÅ™i startu systému nespouÅ¡tÄ›jte." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Rozhraní, na kterém naslouchat:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"Program hddtemp může oÄekávat příchozí spojení na konkrétním rozhraní nebo " -+"na vÅ¡ech rozhraních." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Aby poslouchal na konkrétním rozhraní, zadejte IP adresu daného rozhraní " -+"(127.0.0.1 znamená, že bude pÅ™ijímat pouze lokální spojení). Pokud chcete, " -+"aby poslouchal na vÅ¡ech rozhraních, zadejte 0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Port, na kterém naslouchat:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"hddtemp standardnÄ› oÄekává příchozí spojení na portu 7634. Pokud vám tento " -+"port nevyhovuje, můžete zadat jiný." ---- hddtemp-0.3-beta15.orig/debian/po/fr.po -+++ hddtemp-0.3-beta15/debian/po/fr.po -@@ -0,0 +1,159 @@ -+# Translation of hddtemp debconf templates to French -+# Copyright (C) 2008 Christian Perrier -+# This file is distributed under the same license as the hddtemp package. -+# -+# Michel Grentzinger , 2003. -+# Jean-Luc Coulon (f5ibh) -+# Christian Perrier , 2008. -+msgid "" -+msgstr "" -+"Project-Id-Version: \n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-02-10 12:20+0100\n" -+"Last-Translator: Christian Perrier \n" -+"Language-Team: French \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Faut-il exécuter hddtemp avec les privilèges du superutilisateur ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Il est possible d'installer hddtemp avec le bit « setuid » positionné, ce qui " -+"lui permet d'être exécuté (et donc d'indiquer la température des disques " -+"durs) par les utilisateurs non privilégiés et pas seulement le " -+"superutilisateur." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Cela peut théoriquement permettre d'utiliser hddtemp pour une attaque visant " -+"à compromettre la sécurité du système. Dans le doute, il est conseillé ne de " -+"pas activer cette option." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"Ce choix peut être modifié ultérieurement avec la commande « dpkg-reconfigure " -+"hddtemp »." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Intervalle entre deux contrôles de température :" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"La température des disques durs peut être enregistrée par hddtemp et " -+"restituée par l'interface standard de journalisation du système." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Veuillez choisir l'intervalle en secondes entre deux mesures. Indiquez 0 " -+"pour désactiver cette fonctionnalité." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Faut-il lancer automatiquement le démon hddtemp au démarrage ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"Le programme hddtemp peut être lancé en tant que démon, à l'écoute sur le " -+"port 7634. Ce démon est utilisé par certains logiciels tel que gkrellm pour " -+"obtenir la température des disques durs." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Ce démon peut être lancé automatiquement au démarrage de l'ordinateur. Dans " -+"le doute, il est suggéré de ne pas activer cette option." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Interface où hddtemp sera à l'écoute :" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"Le programme hddtemp peut être à l'écoute de connexions entrantes sur une " -+"interface spécifique ou sur toutes les interfaces." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Pour écouter sur une interface spécifique, indiquez l'adresse IP de cette " -+"interface (en choisissant 127.0.0.1, seules les connexions locales seront " -+"acceptées). Pour écouter sur toutes les interfaces, saisissez simplement " -+"0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Port sur lequel hddtemp sera à l'écoute :" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Par défaut, hddtemp attend les connexions entrantes sur le port 7634. Ce " -+"port peut être modifié si nécessaire." ---- hddtemp-0.3-beta15.orig/debian/po/vi.po -+++ hddtemp-0.3-beta15/debian/po/vi.po -@@ -0,0 +1,154 @@ -+# Vietnamese Translation for hddtemp. -+# Copyright © 2008 Free Software Foundation, Inc. -+# Clytie Siddall , 2005-2008. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp_0.3-beta15-36\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-02-13 21:06+1030\n" -+"Last-Translator: Clytie Siddall \n" -+"Language-Team: Vietnamese \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=1; plural=0;\n" -+"X-Generator: LocFactoryEditor 1.7b3\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Có nên cài đặt SUID root « /usr/sbin/hddtemp » không?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Bạn có tùy chá»n cài đặt phần má»m hddtemp vá»›i bit SUID đã đặt, do đó cho phép " -+"nó được chạy bởi các ngÆ°á»i dùng bình thÆ°á»ng, không phải chỉ siêu ngÆ°á»i dùng." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Tuy nhiên, đặt bit SUID cÅ©ng có thể cho phép ngÆ°á»i hiểm Ä‘á»™c dùng hddtemp khi " -+"tấn công bảo mật của máy tính này. Vì vậy nếu bạn chÆ°a chắc chắn, đừng bật " -+"tùy chá»n này." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"CÅ©ng có thể sá»­a đổi thiết lập này vá» sau, bằng cách chạy lệnh cấu hình lại « " -+"dpkg-reconfigure hddtemp »." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Khoảng giữa hai lần kiểm tra nhiệt Ä‘á»™ của Ä‘Ä©a cứng:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"Nhiệt Ä‘á»™ của những Ä‘Ä©a cứng có thể được ghi lÆ°u bởi hddtemp thông qua giao " -+"diện ghi lÆ°u hệ thống chung." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Hãy nhập má»™t giá trị theo giây mà tÆ°Æ¡ng ứng vá»›i khoảng thá»i gian giữa hai " -+"lần kiểm tra. Äể tắt tính năng này, chỉ Ä‘Æ¡n giản nhập số 0 ở đây." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Có nên khởi chạy trình ná»n hddtemp khi khởi Ä‘á»™ng hệ thống không?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"ChÆ°Æ¡ng trình hddtemp cÅ©ng có thể chạy dÆ°á»›i dạng trình ná»n (daemon), lắng " -+"nghe trên cổng 7634 tìm kết nối gá»­i đến. Trình ná»n này được dùng bởi má»™t số " -+"phần má»m (v.d. gkrellm) để lấy nhiệt Ä‘á»™ của các Ä‘Ä©a cứng." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Tùy chá»n bạn có thể tá»± Ä‘á»™ng khởi chạy trình ná»n hddtemp khi khởi Ä‘á»™ng hệ " -+"thống. ChÆ°a chắc chắc thì khuyên bạn không bật tùy chá»n này." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Giao diện trên đó cần lắng nghe:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"ChÆ°Æ¡ng trình hddtemp có thể lắng nghe kết nối gá»­i đến trên má»™t giao diện dứt " -+"khoát, hoặc trên má»i giao diện." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Äể lắng nghe trên má»™t giao diện cụ thể, hãy nhập địa chỉ IP của giao diện đó " -+"(giá trị « 127.0.0.0 » sẽ chỉ chấp nhận kết nối cục bá»™). Äể lắng nghe trên " -+"má»i giao diện, chỉ Ä‘Æ¡n giản hãy nhập địa chỉ « 0.0.0.0 »." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Cổng trên đó cần lắng nghe:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Mặc định là hddtemp lắng nghe kết nối gá»­i đến trên cổng 7634. CÅ©ng có thể " -+"thay đổi nó thành má»™t cổng khác." ---- hddtemp-0.3-beta15.orig/debian/po/pt_BR.po -+++ hddtemp-0.3-beta15/debian/po/pt_BR.po -@@ -0,0 +1,205 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp_0.3-beta7-1\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2007-12-11 15:33+0100\n" -+"Last-Translator: Tiago Bortoletto Vaz \n" -+"Language-Team: Debian-BR Project \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=ISO-8859-1\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+#, fuzzy -+#| msgid "Do you want /usr/sbin/hddtemp to be installed SUID root?" -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Deseja que o /usr/sbin/hddtemp seja instalado SUID root ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+#, fuzzy -+#| msgid "Do you want to start the hddtemp daemon on startup?" -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Deseja iniciar o daemon hddtemp na inicialização do sistema ?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+#, fuzzy -+#| msgid "" -+#| "hddtemp can be run as a daemon, listening on port 7634 for incoming " -+#| "connections. It is used some by software such as gkrellm to get the " -+#| "temperature of the hard drives." -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"O hddtemp pode ser executado com um daemon, ouvindo na porta 7634 por " -+"conexões entrantes. O mesmo é usado por alguns softwares como o gkrellm-" -+"hddtemp para obter a temperatura dos discos rígidos." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+#, fuzzy -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Você tem a opção de iniciar o daemon hddtemp automaticamente na " -+"inicialização de seu computador. Caso esteja em dúvida, é sugerido que você " -+"não inicie o hddtemp automaticamente na inicialização de seu computador. " -+"Caso você mude de idéia posteriormente você poderá executar o comando 'dpkg-" -+"reconfigure hddtemp' para mudar essa configuração." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+#, fuzzy -+#| msgid "" -+#| "hddtemp can listen for incoming connections on a specific interface, or " -+#| "on all interfaces." -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"O hddtemp pode ouvir por conexões entrantes em uma interface específica ou " -+"em todas as interfaces." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+#, fuzzy -+#| msgid "" -+#| "To listen on a specific interface, enter the IP address of that " -+#| "interface (127.0.0.1 which is the default value corresponds to the lo " -+#| "interface). To listen on all interfaces, simply enter 0.0.0.0." -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Para ouvir em uma interface específica, informe o endereço IP da interface " -+"em questão (o endereço padrão 127.0.0.1 corresponde a interface lo). Para " -+"ouvir e todas as interfaces, simplesmente informe o endereço 0.0.0.0 ." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+#, fuzzy -+#| msgid "" -+#| "By default, hddtemp listen for incoming connections on port 7634. However " -+#| "if you don't find this port appropriate, you can enter an other one." -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Por padrão, o hddtemp escuta por conexões entrantes na porta 7634. Porém " -+"caso você ache que essa não seja a porta apropriada, você pode informar uma " -+"outra porta." -+ -+#~ msgid "You have the option of installing hddtemp with the SUID bit set." -+#~ msgstr "Você tem a opção de instalar o hddtemp com o bit de SUID ligado." -+ -+#~ msgid "" -+#~ "If you make hddtemp SUID, unprivileged users of your systems will be able " -+#~ "to run it. This could, however, potentially allow hddtemp to be used " -+#~ "during a security attack on your computer. If in doubt, it is suggested " -+#~ "to install it without SUID. If you later change your mind, you can run: " -+#~ "'dpkg-reconfigure hddtemp'." -+#~ msgstr "" -+#~ "Caso você permita que o hdddtemp seja instalado com o bit de SUID ligado, " -+#~ "usuários não privilegiados de seu sistema serão capazes de executá-lo. " -+#~ "Isso pode, porém, potencialmente permitir que o hddtemp seja usado " -+#~ "durante um ataque contra a segurança de seu computador. Caso esteja em " -+#~ "dúvida, é sugerido que vcê instale o hddtemp sem o bit de SUID ligado. " -+#~ "Caso você mude de idéia posteriormente, você poderá executar o comando " -+#~ "'dpkg-reconfigure hddtemp' para mudar essa suaconfiguração." -+ -+#, fuzzy -+#~ msgid "At which interval do you want to log the temperatures?" -+#~ msgstr "Em qual interface você deseja que o hddtemp escute ?" -+ -+#~ msgid "On which interface do you want hddtemp to listen on?" -+#~ msgstr "Em qual interface você deseja que o hddtemp escute ?" -+ -+#~ msgid "On which port do you want hddtemp to listen on?" -+#~ msgstr "Em qual porta você deseja que o hddtemp escute ?" ---- hddtemp-0.3-beta15.orig/debian/po/ru.po -+++ hddtemp-0.3-beta15/debian/po/ru.po -@@ -0,0 +1,156 @@ -+# translation of ru.po to Russian -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# -+# Yuri Kozlov , 2008. -+msgid "" -+msgstr "" -+"Project-Id-Version: 0.3-beta15-39\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-01-27 19:15+0300\n" -+"Last-Translator: Yuri Kozlov \n" -+"Language-Team: Russian \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "УÑтановить /usr/sbin/hddtemp как SUID root?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Ð’Ñ‹ можете выбрать уÑтановку hddtemp Ñ Ð²ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ñ‹Ð¼ SUID битом, чтобы её можно " -+"было запуÑкать проÑтым пользователÑм (Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñ‚ÐµÐ¼Ð¿ÐµÑ€Ð°Ñ‚ÑƒÑ€ жёÑтких " -+"диÑков), а не только Ñуперпользователю." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Потенциально, Ñто может позволить иÑпользовать hddtemp Ð´Ð»Ñ Ð½Ð°Ñ€ÑƒÑˆÐµÐ½Ð¸Ñ " -+"компьютерной безопаÑноÑти. ЕÑли не уверены, ответьте отрицательно." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"Эту наÑтройку можно позже изменить запуÑтив 'dpkg-reconfigure hddtemp'." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Интервал между проверками температуры жёÑткого диÑка:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"Температура жёÑткого диÑка(ов) может быть протоколироватьÑÑ hddtemp Ñ " -+"помощью Ñтандартного ÑиÑтемного интерфейÑа протоколированиÑ." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Введите значение интервала в Ñекундах между проверками. Ð”Ð»Ñ Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ " -+"проверок введите 0." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "ЗапуÑкать ÑÐµÑ€Ð²Ð¸Ñ hddtemp при Ñтарте компьютера?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"Программа hddtemp может работать в виде ÑервиÑа, Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑÑ‹ на порту " -+"7634. Это иÑпользуетÑÑ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ ПО, например gkrellm, Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ " -+"температуры жёÑтких диÑков." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð²Ñ‹ можете включить автоматичеÑкий запуÑк ÑервиÑа hddtemp во Ð²Ñ€ÐµÐ¼Ñ " -+"загрузки ÑиÑтемы. ЕÑли не уверены, выберите не запуÑкать Ñту программу во " -+"Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¿Ñ€Ð¸Ñ‘Ð¼Ð° запроÑов:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"Программа hddtemp может принимать входÑщие запроÑÑ‹ на определённом " -+"интерфейÑе или Ñо вÑех интерфейÑов." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Ð”Ð»Ñ Ð¿Ñ€Ð¸Ñ‘Ð¼Ð° на конкретном интерфейÑа введите IP-Ð°Ð´Ñ€ÐµÑ Ñтого интерфейÑа (ввод " -+"127.0.0.1 обеÑпечит приём только локальных запроÑов). Ð”Ð»Ñ Ð¿Ñ€Ð¸Ñ‘Ð¼Ð° запроÑов Ñо " -+"вÑех интерфейÑов, введите 0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Порт приёма запроÑов:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"По умолчанию, hddtemp принимает входÑщие запроÑÑ‹ Ñ Ð¿Ð¾Ñ€Ñ‚Ð° 7634. ЗдеÑÑŒ можно " -+"задать другой номер порта." ---- hddtemp-0.3-beta15.orig/debian/po/sv.po -+++ hddtemp-0.3-beta15/debian/po/sv.po -@@ -0,0 +1,127 @@ -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# Developers do not need to manually edit POT or PO files. -+# , fuzzy -+# -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp 0.3-beta14-1\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-07-27 09:49+0200\n" -+"Last-Translator: Martin Bagge \n" -+"Language-Team: Swedish \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=iso-8859-1\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Vill du att /usr/sbin/hddtemp ska installeras som SUID root?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "You have the option of installing hddtemp with the SUID bit set, allowing it to be run (reporting hard drive temperatures) by regular users and not only the superuser." -+msgstr "Du kan installera hddtemp med SUID, då kan programmet köras av vanliga användare och inte bara superanvändare." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "This could potentially allow hddtemp to be used during an attack against the computer's security. If in doubt, do not choose this option." -+msgstr "Detta kan bidra till att intrång kan genomföras om det skulle finnas fel i hddtemp som någon nyttjar för att skaffa otillåten åtkomst. Om du är minsta osäker ska du inte aktivera detta alternativ." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+#: ../templates:4001 -+msgid "This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "Denna inställning kan ändras senare genom att köra 'dpkg-reconfige hddtemp'" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Intervall mellan temperaturmätningar:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "The temperature of the hard drive(s) can be logged by hddtemp via the generic system logging interface." -+msgstr "Temperaturen för hårddisken/hårddiskarna kan loggas i det vanliga loggningssystemet." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Please enter a value in seconds corresponding to the interval between two checks. To disable this feature, enter 0." -+msgstr "Ange ett värde i sekunder som anger intervallen mellan två mätningar. För att inaktivera den här funktionen, ange 0 som värde." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Vill du starta hddtemp-tjänsten när systemet startas upp?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "The hddtemp program can be run as a daemon, listening on port 7634 for incoming connections. It is used by some software such as gkrellm to get the temperature of hard drives." -+msgstr "hddtemp kan köras som en tjänst som lyssnar på port 7634 efter inkommande anslutningar. Den används av programvara såsom gkrellm för att läsa av temperaturen på hårddiskarna." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "You have the option of starting the hddtemp daemon automatically on system boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "Du har alternativet att starta hddtemp-tjänsten automatiskt när datorn startas upp. Om du är osäker föreslår jag att du inte startar den automatiskt vid uppstarten." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Gränssnitt att lyssna på:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "The hddtemp program can listen for incoming connections on a specific interface, or on all interfaces." -+msgstr "hddtemp kan lyssna efter inkommande anslutningar på specifika nätverksgränssnitt eller på gränssnitt." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"För att lyssna på ett specifik nätverkgränssnitt, ange IP-adressen på det " -+"gränssnittet (127.0.0.1, vilket är standardvärdet för gränssnittet lo). För " -+"att lyssna på alla, ange 0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Port att lyssna på:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Som standard lyssnar hddtemp efter inkommande anslutningar på port 7634. Om " -+"du anser att denna port inte är lämplig kan du ange en annan port här." -+ ---- hddtemp-0.3-beta15.orig/debian/po/da.po -+++ hddtemp-0.3-beta15/debian/po/da.po -@@ -0,0 +1,158 @@ -+# Danish translation hddtemp. -+# Copyright (C) 2010 hddtemp & nedenstÃ¥ende oversættere. -+# This file is distributed under the same license as the hddtemp package. -+# Claus Hindsgaul , 2004, 2005. -+# Claus Hindsgaul , 2006. -+# Joe Hansen (joedalton2@yahoo.dk), 2010. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2010-11-10 12:42+0000\n" -+"Last-Translator: Joe Hansen \n" -+"Language-Team: Danish \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Skal /usr/sbin/hddtemp installeres SUID root?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Du har muligheden for at installere hddtemp med sættet SUID bit, og tillade " -+"den at blive kørt (rapportering af temperaturer for harddiske) af normale " -+"brugere og ikke kun superbrugeren." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Dette kan potentielt tillade hddtemp at blive brugt under et angreb mod " -+"computerens sikkerhed. Hvis du er i tvivl, sÃ¥ vælg ikke denne indstilling." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"Denne indstilling kan ændres senere ved at køre »dpkg-reconfigure hddtemp«." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Tidsrum mellem to tjek af temperaturen pÃ¥ harddisken:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"Temperaturen pÃ¥ harddiskene kan logges af hddtemp via den generiske " -+"grænseflade til systemlogning." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Indtast venligst en værdi i sekunder, der angiver intervallet mellem to tjek. " -+"Du kan deaktivere denne funktion ved at skrive 0." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Skal hddtemp-dæmonen igangsættes ved opstart?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"Programmet hddtemp kan køres som en dæmon, der lytter pÃ¥ port 7634 efter " -+"indkommende forbindelser. Programmet bruges af bestemte programmer sÃ¥som " -+"gkrellm til at hente harddiskenes temperaturer." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Du har mulighed for at igangsætte hddtemp-dæmonen automatisk under opstart. " -+"Hvis du er i tvivl, foreslÃ¥s det, at du ikke igangsætter den automatisk under " -+"opstarten." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Netkort, der skal lyttes pÃ¥:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"Programmet hddtemp kan lytte efter indkommende forbindelser pÃ¥ et bestemt " -+"netkort eller pÃ¥ alle netkort." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"For at lytte til et bestemt netkort, skal du angive IP-adressen pÃ¥ dette " -+"(valg af 127.0.0.1 vil kun acceptere lokale forbindelser). For at " -+"lytte pÃ¥ alle netkort indtastes 0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Port, der skal lyttes pÃ¥:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Som udgangspunkt vil hddtemp lytte efter indkommende forbindelser pÃ¥ port " -+"7634. Dette kan ændres til et andet nummer." -+ -+ ---- hddtemp-0.3-beta15.orig/debian/po/pt.po -+++ hddtemp-0.3-beta15/debian/po/pt.po -@@ -0,0 +1,158 @@ -+# translation of pt.po to portugues -+# Portuguese translation for hddtemp -+# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. -+# This file is distributed under the same license as the hddtemp package. -+# -+# Miguel Figueiredo , 2006, 2007. -+# Bruno Queiros , 2007. -+# Bruno Queiros , 2008. -+msgid "" -+msgstr "" -+"Project-Id-Version: pt\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-02-10 19:48+0000\n" -+"Last-Translator: Bruno Queiros \n" -+"Language-Team: portugues \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Deve o /usr/sbin/hddtemp ser instalado com SUID root?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Você tem a opção de instalar o hddtemp com o SUID, permitindo-o ser " -+"executado (relatar temperaturas do disco rigido) por utilizadores normais e " -+"não apenas pelo super utilizador." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Isto pode potencialmente permitir que o hddtemp seja utilizado num ataque " -+"contra a segurança do computador. Em caso de dúvida, não escolha esta opção." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"Esta opção pode ser modificada mais tarde executando 'dpkg-reconfigure " -+"hddtemp'." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Intervalo entre verificações da temperatura do disco rigido:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"A temperatura do(s) disco(s) rígido(s) podem ser guardados pelo hddtemp " -+"através da interface genérica do sistema para guardar registos." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Por favor introduza um valor em segundos correspondendo ao intervalo entre " -+"duas verificações. Para desactivar esta opção, introduza 0." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Deseja iniciar o daemon hddtemp no arranque?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"O programa hddtemp pode ser executado como um daemon, à escuta na porta " -+"7634. É utilizada por alguns programas como o gkrellm para obter a " -+"temperatura dos discos rígidos." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Você tem a opção de executar o daemon hddtemp automaticamente no arranque do " -+"sistema. Se estiver em dúvida, é sugerido que não o inicie automaticamente " -+"no arranque." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Interface para utilizar na escuta:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"O programa hddtemp pode escutar por ligações de entrada numa interface " -+"específica, ou em todas as interfaces." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Para escutar numa interface específica, introduza o endereço IP dessa " -+"interface (escolhendo 127.0.0.1 irá aceitar apenas ligações locais). Para " -+"escutar em todas as interfaces, introduza 0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Porta a utilizar na escuta:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"O hddtemp escuta por ligações de entrada na porta 7634 por pré-definição. " -+"Isto pode ser alterado para outra porta." ---- hddtemp-0.3-beta15.orig/debian/po/eu.po -+++ hddtemp-0.3-beta15/debian/po/eu.po -@@ -0,0 +1,111 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# Piarres Beobide , 2008. -+ -+ -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp-debconf\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-02-14 12:11+0100\n" -+"Last-Translator: Piarres Beobide \n" -+"Language-Team: Euskara \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "/usr/sbin/hddtemp SUID bit-a gaiturik duela instalatu behar da?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "You have the option of installing hddtemp with the SUID bit set, allowing it to be run (reporting hard drive temperatures) by regular users and not only the superuser." -+msgstr "Zuk hddtemp SUID bit-a ezarria duela instalatzeko aukera duzu supererabiltzaileak bakarrik beharrean erabiltzaile arrunti exekutatzeko (disko gogor tenperaturak erreportatzeko) baimena emanez." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "This could potentially allow hddtemp to be used during an attack against the computer's security. If in doubt, do not choose this option." -+msgstr "Honek ordenagailuari eraso batetan hddtemp erabiltzeko aukera ematen du. Zalantzarik baduzu ez hautatu aukera hau." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+#: ../templates:4001 -+msgid "This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "Ezarpen hau beranduago aldatu daiteke 'dpkg-reconfigure hddtemp' abiaraziz." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Disko gogor tenperatura arakatzeen arteko denbora tartea:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "The temperature of the hard drive(s) can be logged by hddtemp via the generic system logging interface." -+msgstr "Hddtemp-ek disko gorren tenperatura sistemako erregistro interfaze orokorraren bidez erregistratu dezake." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Please enter a value in seconds corresponding to the interval between two checks. To disable this feature, enter 0." -+msgstr "Mesedez idatzi bi arakatzeen arteko denbora tartea segunduetan. Ezaugarri hau ezgaitzeko 0 ezarri." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Hddtemp deabrua sistema abiaraztean abiarazi behar al da?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "The hddtemp program can be run as a daemon, listening on port 7634 for incoming connections. It is used by some software such as gkrellm to get the temperature of hard drives." -+msgstr "Hddtemp programa deabru bat bezala erabili daiteke, sarrera konexioak 7624 atakan entzungo ditu. Hau gkrellm bezalako zenbait softwarek disko gogorren tenperatura eskuratzeko erabiltzen dute." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "You have the option of starting the hddtemp daemon automatically on system boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "Zuk hddtemp deabrua sistema abiaraztean automatikoki abiarazteko aukera duzu. Zalantzarik baduzu abioan ez automatikoki abiaraztea gomendatzen da." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Entzungo den interfazea:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "The hddtemp program can listen for incoming connections on a specific interface, or on all interfaces." -+msgstr "Hddtemp programak sarrera konexioak interfaze zehatz batetan bakarrik edo guztietan entzuteko aukera du." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "To listen on a specific interface, enter the IP address of that interface (choosing 127.0.0.1 will accept local connections only). To listen on all interfaces, enter 0.0.0.0." -+msgstr "Interfaze zehatz batetan entzuteko, idatzi interfaze horren IP helbidea (127.0.0.1 ipiniaz konexioa lokalak bakarrik onartuko dira). Interfaze guztietan entzuteko , 0.0.0.0 idatzi." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Entzuteko ataka:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "By default, hddtemp listens for incoming connections on port 7634. This can be changed for another port number." -+msgstr "Lehenetspen modura hddtemp-ek sarrera konexioak 7634 atakan entzungo ditu. Auker ahonen bidez betste ataka bat ezartzeko auekra dago." -+ ---- hddtemp-0.3-beta15.orig/debian/po/it.po -+++ hddtemp-0.3-beta15/debian/po/it.po -@@ -0,0 +1,155 @@ -+# Italian translation of the hddtemp debconf template -+# This file is distributed under the same license as the hddtemp package -+# Copyright (C) 2008 Free Software Foundation, Inc. -+# Luca Monducci , 2008. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp 0.3\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-02-09 21:52+0100\n" -+"Last-Translator: Luca Monducci \n" -+"Language-Team: Italian \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Installare /usr/sbin/hddtemp con il SUID root?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"È possibile installare hddtemp con il bit SUID attivo, questo consente a un " -+"utente normale, e non solo al superuser, di eseguire il programma " -+"(riportando le temperature dei dischi)." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Questo potrebbe permettere l'uso di hddtemp durante un attacco alla " -+"sicurezza del sistema. In caso di dubbi, non attivare questa opzione." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"In seguito, per modificare questa impostazione si può usare \"dpkg-" -+"reconfigure hddtemp\"." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Intervallo fra due controlli della temperatura dei dischi:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"La temperatura dei dischi può essere registrata da hddtemp tramite " -+"l'interfaccia generica offerta dal log di sistema." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Inserire il valore in secondi corrispondente all'intervallo fra due " -+"controlli. Per non utilizzare questa funzionalità inserire 0." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Far partire il demone hddtemp all'avvio del sistema?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"Il programma hddtemp può essere avviato come un demone in ascolto di " -+"connessioni in arrivo sulla porta 7634. Viene usato da programmi come " -+"gkrellm per recuperare la temperatura dei dischi fissi." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"È possibile far partire automaticamente il demone hddtemp all'avvio del " -+"sistema. In caso di dubbi, si suggerisce di non far partire il demone " -+"all'avvio." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Interfaccia su cui ascoltare:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"Il programma hddtemp può mettersi in ascolto di connessioni in arrivo su una " -+"particolare interfaccia oppure su tutte." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Per ascoltare su una specifica interfaccia, inserire l'indirizzo IP di tale " -+"interfaccia (con 127.0.0.1 saranno accettate solo connesioni locali). Per " -+"ascoltare su tutte le interfacce inserire 0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Porta su cui ascoltare:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Con la configurazione predefinita hddtemp si mette in ascolto di connessioni " -+"in arrivo sulla porta 7634. È possibile cambiare questo valore con un altro " -+"numero di porta." ---- hddtemp-0.3-beta15.orig/debian/po/de.po -+++ hddtemp-0.3-beta15/debian/po/de.po -@@ -0,0 +1,164 @@ -+# translation of hddtemp_0.3-beta15-39_de.po to German -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -+# Developers do not need to manually edit POT or PO files. -+# -+# Erik Schanze , 2004-2008. -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp_0.3-beta15-39_de\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-01-27 21:18+0100\n" -+"Last-Translator: Erik Schanze \n" -+"Language-Team: German \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Soll /usr/sbin/hddtemp mit Root-Rechten ausgestattet werden?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Sie haben die Möglichkeit, Hddtemp bei der Installation mit Root-Rechten " -+"auszustatten. Damit kann es von jedem normalen Benutzer (und nicht nur von " -+"Root) gestartet werden, um die Festplattentemperatur zu melden." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Dadurch könnte es aber möglich sein, die Sicherheit des Rechners " -+"anzugreifen. Wenn Sie sich nicht sicher sind, lehnen Sie hier ab." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"Diese Einstellung kann später durch den Befehl 'dpkg-reconfigure hddtemp' " -+"geändert werden." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Zeitraum zwischen den Ãœberprüfungen der Festplattentemperatur:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"Die Temperatur der Festplatte(n) kann von Hddtemp mittels der allgemeinen " -+"System-Protokollierschnittstelle fortlaufend gespeichert werden." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Bitte geben Sie die Zeitspanne zwischen zwei Ãœberprüfungen in Sekunden ein. " -+"Um diese Funktion abzuschalten, geben Sie 0 ein." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Den Hddtemp-Dienst beim Hochfahren des Systems starten?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"Hddtemp kann als Dienst betrieben werden und wartet am Port 7634 auf " -+"ankommende Verbindungen. Das wird von einigen Programmen wie Gkrellm " -+"genutzt, um die Temperatur der Festplatten abzufragen." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Sie haben die Möglichkeit, den Dienst Hddtemp beim Hochfahren des Systems " -+"automatisch zu starten. Wenn Sie sich nicht sicher sind, starten Sie den " -+"Dienst nicht automatisch beim Hochfahren." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Schnittstelle, an der auf Anfragen gewartet wird:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"Hddtemp kann an einer speziellen oder an allen Schnittstelle auf ankommende " -+"Verbindungen warten." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Um an einer einzelnen Schnittstelle auf Anfragen zu warten, geben Sie deren " -+"IP-Adresse ein (Falls Sie 127.0.0.1 wählen, sind nur lokale Verbindungen " -+"erlaubt). Um alle Schnittstellen zu verwenden, geben Sie 0.0.0.0 ein." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Port, an dem auf Anfragen gewartet wird:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Normalerweise wartet Hddtemp am Port 7634 auf ankommende Verbindungen. Sie " -+"können auch eine andere Port-Nummer eingeben." ---- hddtemp-0.3-beta15.orig/debian/po/gl.po -+++ hddtemp-0.3-beta15/debian/po/gl.po -@@ -0,0 +1,176 @@ -+# Galician translation of hddtemp's debconf templates -+# This file is distributed under the same license as the hddtemp package. -+# Jacobo Tarrio , 2007, 2008. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-01-28 19:08+0000\n" -+"Last-Translator: Jacobo Tarrio \n" -+"Language-Team: Galician \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "¿Quere instalar /usr/sbin/hddtemp con \"setuid\" root?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Ten a posibilidade de instalar hddtemp co bit SUID establecido, o que o " -+"permite executar (para que informe da temperatura dos discos duros) por " -+"parte de usuarios normais, e non só o administrador." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Con isto é posible que se empregue hddtemp durante un ataque contra a " -+"seguridade do ordenador. Se non está seguro, non escolla esta opción." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"Esta elección pódese cambiar a posteriori executando \"dpkg-reconfigure " -+"hddtemp\"." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Intervalo entre comprobacións da temperatura do disco duro:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"O programa hddtemp pode manter un rexistro da temperatura do(s) disco(s) duro" -+"(s) empregando a interface xenérica de rexistro do sistema." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Introduza un valor en segundos correspondente ao intervalo entre " -+"comprobacións. Para desactivar esta característica, introduza un 0." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "¿Quere iniciar o servizo de hddtemp co sistema?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"Pódese executar o programa hddtemp coma un servizo que espera conexións " -+"entrantes no porto 7634. Emprégao algún software coma gkrellm para obter a " -+"temperatura dos discos duros." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Ten a posibilidade de arrincar o servizo hddtemp automaticamente ao iniciar " -+"o sistema. Se ten dúbidas, suxírese que non o arrinque automaticamente ao " -+"iniciar o sistema." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Interface na que escoitar:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"O programa hddtemp pode esperar conexións entrantes nunha interface " -+"determinada ou en tódalas interfaces." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Para escoitar nunha interface determinada, introduza o enderezo IP desa " -+"interface (se escolle 127.0.0.1 hanse aceptar só conexións locais). Para " -+"escoitar en tódalas interfaces, introduza 0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Porto no que escoitar:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Por defecto, hddtemp espera conexións entrantes no porto 7634. Pódese " -+"cambiar por outro porto." -+ -+#~ msgid "You have the option of installing hddtemp with the SUID bit set." -+#~ msgstr "Ten a posibilidade de instalar hddtemp co bit SUID activado." -+ -+#~ msgid "" -+#~ "If you make hddtemp SUID, unprivileged users of your systems will be able " -+#~ "to run it. This could, however, potentially allow hddtemp to be used " -+#~ "during a security attack on your computer. If in doubt, it is suggested " -+#~ "to install it without SUID. If you later change your mind, you can run: " -+#~ "'dpkg-reconfigure hddtemp'." -+#~ msgstr "" -+#~ "Se lle pon o bit SUID a hddtemp, os usuarios sen privilexios dos seus " -+#~ "sistemas han poder executalo. Nembargantes, isto pode permitir que se " -+#~ "empregue hddtemp durante un ataque á seguridade do seu ordenador. Se ten " -+#~ "dúbidas, é mellor que o instale sen SUID. Se cambia de opinión máis " -+#~ "adiante, pode executar \"dpkg-reconfigure hddtemp\"." -+ -+#~ msgid "" -+#~ "hddtemp can periodically log the temperature of the hard drive(s) via the " -+#~ "SYSLOG interface." -+#~ msgstr "" -+#~ "hddtemp pode rexistrar periodicamente a temperatura das unidades de disco " -+#~ "mediante a interface SYSLOG." ---- hddtemp-0.3-beta15.orig/debian/po/ar.po -+++ hddtemp-0.3-beta15/debian/po/ar.po -@@ -0,0 +1,209 @@ -+# translation of ar.po to -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -+# Developers do not need to manually edit POT or PO files. -+# -+# Ossama M. Khayat, 2005. -+# Ossama M. Khayat , 2010. -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp_0.3-beta13-19\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2010-09-09 04:48+0300\n" -+"Last-Translator: Ossama M. Khayat \n" -+"Language-Team: Arabic \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: Lokalize 1.0\n" -+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " -+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+#| msgid "Do you want /usr/sbin/hddtemp to be installed SUID root?" -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "هل يجب تثبيت /usr/sbin/hddtemp مع صلاحية SUID للمستخدم rootØŸ" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"لديك خيار تثبيت hddtemp مع صلاحية SUIDØŒ مما يسمح" -+"للمستخدمين العاديين تشغيله (تقرير درجات حرارة القرص الصلب) وليس Ùقط " -+"المستخدم الخارق." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"قد يتسبب هذا باستخدام hddtemp أثناء الهجوم على" -+"أمن الجهاز. إن كنت ÙÙŠ شك، لا تنتق هذا الخيار." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "يمكن تعديل هذا الإعداد لاحقاً بتنÙيذ الأمر 'dpkg-reconfigure hddtemp'." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "الÙاصل الزمني للتحقق من حرارة القرص الصلب:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"يستطيع hddtemp تسجيل حرارة الأقراص الصلبة عبر " -+"واجهة سجلات النظام الاعتيادية." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+#| msgid "" -+#| "Please enter a value in seconds corresponding to the interval between two " -+#| "checks. To disable this feature, simply enter 0." -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"الرجاء إدخال قيمة بالثواني تحدد الÙاصل الزمني بين كل " -+"عملية. لتعطيل هذه الميزة، أدخل 0." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+#| msgid "Do you want to start the hddtemp daemon on startup?" -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "هل تريد تشغيل عÙريت hddtemp عند الإقلاع؟" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+#| msgid "" -+#| "hddtemp can be run as a daemon, listening on port 7634 for incoming " -+#| "connections. It is used some by software such as gkrellm to get the " -+#| "temperature of the hard drives." -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"يمكن تشغيل برنامج hddtemp كعÙريت، ÙŠÙصغي للمنÙØ° 7634 لأي" -+"اتصالات واردة. ÙŠÙستخدم البرنامج من قبل بعض البرامج الأخرى مثل gkrellm " -+"لمراقبة " -+"درجة حرارة الأقراص الصلبة." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+#| msgid "" -+#| "You have the option of starting the hddtemp daemon automatically on the " -+#| "computer startup. If in doubt, it is suggested to not start it " -+#| "automatically on startup. If you later change your mind, you can run: " -+#| "'dpkg-reconfigure hddtemp'." -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"لديك خيار تشغيل عÙريت hddtemp آلياً عند إقلاع " -+"النظام. إن كنت ÙÙŠ شك، يقترح عدم تشغيله آلياً عند الإقلاع." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "الواجهة التي يصغي إليها:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+#| msgid "" -+#| "hddtemp can listen for incoming connections on a specific interface, or " -+#| "on all interfaces." -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"يستطيع برنامج hddtemp الإصغاء للاتصالات الواردة على واجهة " -+"محددة، أو جميع الواجهات." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+#| msgid "" -+#| "To listen on a specific interface, enter the IP address of that " -+#| "interface (127.0.0.1 which is the default value corresponds to the lo " -+#| "interface). To listen on all interfaces, simply enter 0.0.0.0." -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"للإصغاء إلى واجهة محددة، أدخل عنوان IP لتلك الواجهة " -+"(اختيار 127.0.0.1 سو٠يستقبل الاتصالات المحلية Ùقط). للإصغاء لجميع " -+"الواجهات، أدخل القيمة 0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "المنÙØ° الذي يصغي إليه:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+#| msgid "" -+#| "By default, hddtemp listen for incoming connections on port 7634. However " -+#| "if you don't find this port appropriate, you can enter an other one." -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"بشكل اÙتراضي، يستمع hddtemp للاتصالات الواردة على المنÙØ° 7634. ويمكن" -+"تغيير هذا الرقم إلى آخر." -+ -+#~ msgid "You have the option of installing hddtemp with the SUID bit set." -+#~ msgstr "لديك خيار تثبيت hddtemp بتعيين بت SUID." -+ -+#~ msgid "" -+#~ "If you make hddtemp SUID, unprivileged users of your systems will be able " -+#~ "to run it. This could, however, potentially allow hddtemp to be used " -+#~ "during a security attack on your computer. If in doubt, it is suggested " -+#~ "to install it without SUID. If you later change your mind, you can run: " -+#~ "'dpkg-reconfigure hddtemp'." -+#~ msgstr "" -+#~ "إن قمت بتعيين hddtemp SUIDØŒ Ùسيستطيع المستخدمين الغير مخولين لنظامك " -+#~ "تشغيله. قد يتسبب هذا على أي حال بالسماح باستخدام hddtemp أثناء الهجوم " -+#~ "الأمني على حاسبك. إن كنت ÙÙŠ شك، أقترح تثبيته دون تعيين SUID. إن بدلت رأيك " -+#~ "لاحقاً، يمكنك تشغيل: 'dpkg-reconfigure hddtemp'." -+ -+#~ msgid "" -+#~ "hddtemp can periodically log the temperature of the hard drive(s) via the " -+#~ "SYSLOG interface." -+#~ msgstr "" -+#~ "يستطيع hddtemp تسجيل حرارة الأقراص الصلبة بشكل دوري عبر واجهة SYSLOG." ---- hddtemp-0.3-beta15.orig/debian/po/ja.po -+++ hddtemp-0.3-beta15/debian/po/ja.po -@@ -0,0 +1,138 @@ -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-05-29 13:50+0900\n" -+"Last-Translator: Kenshi Muto \n" -+"Language-Team: Japanese \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "/usr/sbin/hddtemp ã‚’ SUID root ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¾ã™ã‹?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "SUID ビットを設定ã—㦠hddtemp をインストールã™ã‚‹ã‹ã©ã†ã‹ã‚’é¸æŠžã—ã¾ã™ã€‚ã“ã‚Œã¯ã€ã‚¹ãƒ¼ãƒ‘ーユーザã ã‘ã§ãªã一般ユーザã§ã‚‚ (ãƒãƒ¼ãƒ‰ãƒ‰ãƒ©ã‚¤ãƒ–ã®æ¸©åº¦ã®å ±å‘Šã‚’) 実行ã™ã‚‹ã“ã¨ã‚’許å¯ã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "ã“ã‚Œã¯æ½œåœ¨çš„ã«ã¯ã‚³ãƒ³ãƒ”ュータã®ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ã«å¯¾ã™ã‚‹æ”»æ’ƒã«ä½¿ã‚れるå¯èƒ½æ€§ã‚’ hddtemp ã«è¨±ã™ã“ã¨ã«ãªã‚Šã¾ã™ã€‚ç–‘ã‚ã—ã‘ã‚Œã°ã€ã€Œã„ã„ãˆã€ã¨ç­”ãˆã¦ãã ã•ã„。" -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "ã“ã®è¨­å®šã¯ã‚ã¨ã§ 'dpkg-reconfigure hddtemp' を実行ã™ã‚‹ã“ã¨ã§å¤‰æ›´ã§ãã¾ã™ã€‚" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "ãƒãƒ¼ãƒ‰ãƒ‰ãƒ©ã‚¤ãƒ–ã®æ¸©åº¦ãƒã‚§ãƒƒã‚¯ã®é–“隔インターãƒãƒ«:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "hddtemp ã§ãƒãƒ¼ãƒ‰ãƒ‰ãƒ©ã‚¤ãƒ–ã®æ¸©åº¦ã‚’一般的ãªã‚·ã‚¹ãƒ†ãƒ ãƒ­ã‚®ãƒ³ã‚°ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã‚’通ã—ã¦è¨˜éŒ²ã§ãã¾ã™ã€‚" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "2ã¤ã®ãƒã‚§ãƒƒã‚¯ã®é–“ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒ«ã«ç›¸å½“ã™ã‚‹ç§’数を入力ã—ã¦ãã ã•ã„。ã“ã®æ©Ÿèƒ½ã‚’無効ã«ã™ã‚‹ã«ã¯ã€0 ã¨å…¥åŠ›ã—ã¦ãã ã•ã„。" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "起動時㫠hddtemp デーモンを開始ã—ã¾ã™ã‹?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "hddtemp プログラムã¯ã€å…¥åŠ›æŽ¥ç¶šã®ãŸã‚ã®ãƒãƒ¼ãƒˆ 7634 をリスンã™ã‚‹ãƒ‡ãƒ¼ãƒ¢ãƒ³ã¨ã—ã¦å®Ÿè¡Œã§ãã¾ã™ã€‚ãƒãƒ¼ãƒ‰ãƒ‰ãƒ©ã‚¤ãƒ–ã®æ¸©åº¦ã‚’å¾—ã‚‹ãŸã‚ã«ã€gkrellm ã®ã‚ˆã†ãªã„ãã¤ã‹ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã«ã‚ˆã£ã¦ä½¿ã‚ã‚Œã¾ã™ã€‚" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "コンピュータã®èµ·å‹•æ™‚ã« hddtemp デーモンを自動的ã«é–‹å§‹ã™ã‚‹é¸æŠžè‚¢ã§ã™ã€‚ç–‘ã‚ã—ã„ã®ã§ã‚ã‚Œã°ã€èµ·å‹•æ™‚ã«è‡ªå‹•çš„ã«ã¯é–‹å§‹ã—ãªã„ã“ã¨ã‚’æ案ã—ã¾ã™ã€‚" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "リスンã™ã‚‹ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "hddtemp プログラムã¯ã€ç‰¹å®šã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã¾ãŸã¯ã™ã¹ã¦ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã®å…¥åŠ›æŽ¥ç¶šã‚’リスンã§ãã¾ã™ã€‚" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "特定ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã‚’リスンã™ã‚‹ã«ã¯ã€ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã® IP アドレスを入力ã—ã¦ãã ã•ã„ (127.0.0.1 ã‚’é¸ã¶ã¨ã€ãƒ­ãƒ¼ã‚«ãƒ«ã®æŽ¥ç¶šã®ã¿ã‚’許å¯ã™ã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™)。ã™ã¹ã¦ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã‚’リスンã™ã‚‹ã«ã¯ã€0.0.0.0 ã¨å…¥åŠ›ã—ã¦ãã ã•ã„。" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "リスンã™ã‚‹ãƒãƒ¼ãƒˆ:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "デフォルトã§ã¯ã€hddtemp ã¯ãƒãƒ¼ãƒˆ 7634 ã§å…¥åŠ›æŽ¥ç¶šã‚’リスンã—ã¾ã™ã€‚ã“ã‚Œã¯åˆ¥ã®ãƒãƒ¼ãƒˆç•ªå·ã«å¤‰æ›´ã§ãã¾ã™ã€‚" ---- hddtemp-0.3-beta15.orig/debian/po/fi.po -+++ hddtemp-0.3-beta15/debian/po/fi.po -@@ -0,0 +1,151 @@ -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-02-04 12:18+0200\n" -+"Last-Translator: Esko Arajärvi \n" -+"Language-Team: Finnish \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Poedit-Language: Finnish\n" -+"X-Poedit-Country: FINLAND\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Tulisiko /usr/sbin/hddtemp asentaa asetuksella SUID root?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Ohjelma hddtemp voidaan asentaa SUID-bitti asetettuna, jolloin pääkäyttäjien " -+"lisäksi myös tavalliset käyttäjät voivat ajaa ohjelman (saaden tietää " -+"kovalevyjen lämpötilat)." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Tämä saattaa mahdollistaa hddtempin käytön tietoturvahyökkäyksessä konetta " -+"vastaan. Jos olet epävarma, älä valitse tätä vaihtoehtoa." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"Tätä asetusta voidaan myöhemmin muuttaa ajamalla komento â€dpkg-reconfigure " -+"hddtempâ€." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Aikaväli kovalevyjen lämpötilojen tarkistusten välillä:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"Kovalevyjen lämpötilat voidaan kirjoittaa yleiseen järjestelmälokiin " -+"hddtempin toimesta." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Anna tarkistusten välinen aika sekunneissa. Syötä 0 poistaaksesi tämän " -+"ominaisuuden käytöstä." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Tulisiko hddtemp-taustaohjelma käynnistää käynnistettäessä tietokone?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"Ohjelma hddtemp voidaan ajaa taustaohjelmana, joka kuuntelee yhteydenottoja " -+"portissa 7634. Jotkin ohjelmat, kuten gkrellm, käyttävät tätä hakeakseen " -+"kovalevyjen lämpötilat." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"hddtemp-taustaohjelma voidaan käynnistää automaattisesti käynnistettäessä " -+"järjestelmä. Jos olet epävarma, ohjelmaa ei suositella käynnistettäväksi " -+"automaattisesti." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Kuunneltavat liitynnät:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"Ohjelma hddtemp voi kuunnella yhteydenottoja tietystä liitynnästä tai " -+"kaikista liitynnöistä." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Voit määrittää tietyn liitynnän antamalla sen IP-osoitteen (asetus 127.0.0.1 " -+"hyväksyy vain paikalliset yhteydet). Kaikki liitynnät määritetään " -+"asetuksella 0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Kuunneltava portti:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Oletuksena hddtemp kuuntelee yhteydenottoja portissa 7634. Tämä portin " -+"numero voidaan vaihtaa." ---- hddtemp-0.3-beta15.orig/debian/po/templates.pot -+++ hddtemp-0.3-beta15/debian/po/templates.pot -@@ -0,0 +1,131 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: FULL NAME \n" -+"Language-Team: LANGUAGE \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=CHARSET\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" ---- hddtemp-0.3-beta15.orig/debian/po/es.po -+++ hddtemp-0.3-beta15/debian/po/es.po -@@ -0,0 +1,172 @@ -+# hddtemp debconf translation to spanish -+# Copyright (C) 2003, 2006, 2008 Software in the Public Interest -+# This file is distributed under the same license as the hddtemp package. -+# -+# Changes: -+# - Initial translation -+# Carlos Valdivia Yagüe , 2003 -+# - Revisions: -+# Carlos Valdivia Yagüe , 2006, 2008 -+# -+# Translators, if you are not familiar with the PO format, gettext -+# documentation is worth reading, especially sections dedicated to -+# this format, e.g. by running: -+# info -n '(gettext)PO Files' -+# info -n '(gettext)Header Entry' -+# -+# Some information specific to po-debconf are available at -+# /usr/share/doc/po-debconf/README-trans -+# or http://www.debian.org/intl/l10n/po-debconf/README-trans -+# -+# Developers do not need to manually edit POT or PO files. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp 0.3-beta15-39:\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-01-31 16:50+0100\n" -+"Last-Translator: Carlos Valdivia Yagüe \n" -+"Language-Team: Debian L10n Spanish \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "¿Desea instalar «/usr/sbin/hddtemp» con el bit SUID root?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Puede instalar hddtemp con el bit SUID activado, permitiendo así su " -+"ejecución (informando de la temperatura de los discos duros) por parte de " -+"usuarios normales y no sólo del superusuario." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Esto podría permitir que se utilizara hddtemp para comprometer la seguridad " -+"del sistema durante un ataque. Si está en duda, se recomienda que no active " -+"el bit SUID." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"Esta elección puede modificarse posteriormente ejecutando «dpkg-reconfigure " -+"hddtemp»." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Período entre dos comprobaciones de temperatura:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"La temperatura del disco o discos duros puede ser registrada por hddtemp " -+"mediante la interfaz de registro genérica del sistema." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Introduzca un valor en segundos para el período entre dos comprobaciones " -+"sucesivas. Para desactivar esta característica, introduzca 0." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "¿Desea iniciar el demonio de hddtemp en el arranque del sistema?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"hddtemp puede ejecutarse en modo demonio, escuchando conexiones entrantes en " -+"el puerto 7634. Algunos programas, como gkrellm, lo utilizan para obtener la " -+"temperatura de los discos duros." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Puede iniciar el demonio de hddtemp automáticamente cada vez que arranque el " -+"sistema. Si está en duda, se recomienda que no lo inicie automáticamente al " -+"arrancar." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Interfaz en la que escuchar:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"hddtemp puede escuchar conexiones entrantes en una interfaz concreta, o bien " -+"en todas." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Para escuchar en una interfaz determinada, introduzca la dirección IP de " -+"dicha interfaz (si elige 127.0.0.1 sólo se aceptarán conexiones locales). " -+"Para escuchar en todas las interfaces, introduzca 0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Puerto en el que escuchar:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"De manera predeterminada hddtemp escucha en el puerto 7634, pero puede " -+"cambiarlo por otro." ---- hddtemp-0.3-beta15.orig/debian/po/sk.po -+++ hddtemp-0.3-beta15/debian/po/sk.po -@@ -0,0 +1,155 @@ -+# Slovak translations for hddtemp package -+# Slovenské preklady pre balík hddtemp. -+# Copyright (C) 2011 THE hddtemp'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the hddtemp package. -+# Automatically generated, 2011. -+# Slavko , 2011. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp 0.3-beta15-48\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2011-08-30 16:30+0200\n" -+"Last-Translator: Slavko \n" -+"Language-Team: Slovak \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Language: sk\n" -+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Má byÅ¥ /usr/sbin/hddtemp nainÅ¡talovaný s SUID root?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Môžete si zvoliÅ¥ inÅ¡taláciu hddtemp s nastaveným bitom SUID, ktorý dovoľuje " -+"jeho spustenie (hlásenie stavu teploty pevných diskov) obyÄajným " -+"používateľom a nie len super-používateľovi." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Toto môže potenciálne umožniÅ¥, aby bol hddtemp použitý poÄas útoku na " -+"bezpeÄnosÅ¥ poÄítaÄa. Ak si nie ste istý, nevyberajte túto možnosÅ¥." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "Môžete to zmeniÅ¥ aj neskôr, spustením „dpkg-reconfigure hddtempâ€." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Interval medzi kontrolami teploty pevného disku:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"Teplota pevného disko(ov) môže hddtemp zaznamenávaÅ¥ pomocou spoloÄného " -+"rozhrania systémových záznamov." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Prosím, zadajte hodnotu v sekundách, ktorá zodpovedá intervalu medzi dvomi " -+"meraniami. Na zakázanie tejto funkcie zadajte 0." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Má byÅ¥ démon hddtemp spustený pri zavedení systému?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"Program hddtemp môže byÅ¥ spustený ako démon, naÄúvajúci príchodzím spojeniam " -+"na porte 7634. Je to používané niektorými programami, napr. gkrellm, na " -+"získanie teploty pevných diskov." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Môžete si zvoliÅ¥ automatické spúšťanie démona hddtemp pri zavedení systému. " -+"Ak si nie ste istý, odporúÄame nespúšťaÅ¥ ho automaticky pri azvedení." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Rozhranie, na ktorom naÄúvaÅ¥:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"Program hddtemp môže oÄakávaÅ¥ príchodzie spojenia na zadanom rozhraní alebo " -+"na vÅ¡etkých rozhraniach." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Aby naÄúval na zadanom rozhraní, zadajte IP adresu daného rozhrania (zadaním " -+"127.0.0.1 budú prijímané len lokálne spojenia). Na naÄúvanie na vÅ¡etkých " -+"rozhraniach, zadajte 0.0.0.0." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Port, na ktorom naÄúvaÅ¥:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Predvolene hddtemp oÄakáva príchodzie spojenia na porte 7634. Môžete to " -+"zmeniÅ¥ na akékoľvek iné Äíslo portu." ---- hddtemp-0.3-beta15.orig/debian/po/POTFILES.in -+++ hddtemp-0.3-beta15/debian/po/POTFILES.in -@@ -0,0 +1 @@ -+[type: gettext/rfc822deb] templates ---- hddtemp-0.3-beta15.orig/debian/po/nl.po -+++ hddtemp-0.3-beta15/debian/po/nl.po -@@ -0,0 +1,159 @@ -+# Dutch translation of hddtemp debconf templates. -+# Copyright (C) 2006-2011 THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the hddtemp package. -+# Kurt De Bree , 2006. -+# Jeroen Schot , 2011. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp 3.3-beta15-46\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2011-06-01 08:31+0200\n" -+"Last-Translator: Jeroen Schot \n" -+"Language-Team: Debian l10n Dutch \n" -+"Language: nl\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Wilt u /usr/sbin/hddtemp als SUID root installeren?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"U heeft de keuze om hddtemp te installeren met de SUID-bit ingesteld. Dit " -+"zorgt ervoor dat het kan worden uitgevoerd (en hardeschijf-temperatuur " -+"meldt) door gewone gebruikers en niet enkel de beheerder." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Hierdoor zou hddtemp mogelijk gebruikt kunnen worden bij aan aanval om de " -+"beveiling van de computer te omzeilen. Als u twijfelt, kies dan niet voor " -+"deze optie." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"Deze instelling kan later worden gewijzigd door 'dpkg-reconfigure hddtemp' " -+"uit te voeren." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Interval tussen controles van de hardeschijf-temperatuur:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"De temperatuur van de harde schijven kan worden bijgehouden via de algemene " -+"systeemloginterface." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Geef een waarde (in seconden) overeenkomend met de interval tussen twee " -+"controles. '0' schakelt deze functie uit." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "" -+"Wilt u dat hddtemp-achtergronddienst wordt gestart bij de systeemstart?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"Het hddtemp-programma kan worden uitgevoerd als achtergronddienst, " -+"luisterend naar inkomende verbindingen op poort 7634. Dit wordt gebruikt " -+"door sommige toepassingen zoals gkrellm om de temperatuur van de harde " -+"schijven op te halen." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"U heeft de optie om de hddtemp-achtergronddienst automatisch op te starten " -+"bij de systeemstart. Bij twijfel wordt aangeraden om de dienst niet " -+"automatisch op te starten." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "De interface waarop hddtemp moet luisteren:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"Het hddtemp-programma kan naar inkomende verbindingen luisteren op één " -+"specifieke interface, of op alle interfaces." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Om op één specifieke interface te luisteren, voer het IP-addres van deze " -+"interface in (als u 127.0.0.1 kiest zullen alleen lokale verbindingen worden " -+"geaccepeert). Om op alle interfaces te luisteren, voer 0.0.0.0. in." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "De poort waarop hddtemp moet luisteren:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Standaard luistert hddtemp naar inkomende verbindingen op poort 7634. Dit " -+"kan veranderd worden in een ander poortnummer." ---- hddtemp-0.3-beta15.orig/debian/po/nb.po -+++ hddtemp-0.3-beta15/debian/po/nb.po -@@ -0,0 +1,152 @@ -+# translation of hddtemp_nb.po to Norwegian BokmÃ¥l -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# -+# Bjørn Steensrud , 2008. -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp_nb\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2008-01-25 22:35+0100\n" -+"PO-Revision-Date: 2008-01-27 17:39+0100\n" -+"Last-Translator: Bjørn Steensrud \n" -+"Language-Team: Norwegian BokmÃ¥l \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "Should /usr/sbin/hddtemp be installed SUID root?" -+msgstr "Skal /usr/sbin/hddtemp installeres med SUID root?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"You have the option of installing hddtemp with the SUID bit set, allowing it " -+"to be run (reporting hard drive temperatures) by regular users and not only " -+"the superuser." -+msgstr "" -+"Du kan installere hddtemp med SUID-biten satt, slik at vanlige brukere og " -+"ikke bare superbrukeren kan kjøre det for Ã¥ undersøke temperatur pÃ¥ " -+"harddisken(e)." -+ -+#. Type: boolean -+#. Description -+#: ../templates:2001 -+msgid "" -+"This could potentially allow hddtemp to be used during an attack against the " -+"computer's security. If in doubt, do not choose this option." -+msgstr "" -+"Dette kan kanskje tillate at hddtemp blir brukt i et angrep mot systemets " -+"sikkerhet. Er du i tvil, sÃ¥ ikke velg dette." -+ -+#. Type: boolean -+#. Description -+#. Type: boolean -+#. Description -+#: ../templates:2001 ../templates:4001 -+msgid "" -+"This setting can be modified later by running 'dpkg-reconfigure hddtemp'." -+msgstr "" -+"Denne innstillingen kan endres senere ved Ã¥ kjøre «dpkg-reconfigure hddtemp»." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "Interval between hard drive temperature checks:" -+msgstr "Intervall mellom sjekker pÃ¥ disktemperaturen:" -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"The temperature of the hard drive(s) can be logged by hddtemp via the " -+"generic system logging interface." -+msgstr "" -+"hddtemp kan logge disken(e)s temperatur via systemets eget log-grensesnitt." -+ -+#. Type: string -+#. Description -+#: ../templates:3001 -+msgid "" -+"Please enter a value in seconds corresponding to the interval between two " -+"checks. To disable this feature, enter 0." -+msgstr "" -+"Oppgi en verdi i sekunder som tilsvarer intervallet mellom to sjekker. Dette " -+"blir slÃ¥tt av hvis verdien er 0." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "Should the hddtemp daemon be started at boot?" -+msgstr "Skal hddtemp-daemonen startes ved oppstart?" -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"The hddtemp program can be run as a daemon, listening on port 7634 for " -+"incoming connections. It is used by some software such as gkrellm to get the " -+"temperature of hard drives." -+msgstr "" -+"hddtemp-programmet kan kjøres som en daemon som lytter pÃ¥ port 7634. Dette " -+"brukes av noen programmer slik som gkrellm for Ã¥ finne temperaturen pÃ¥ " -+"harddisker." -+ -+#. Type: boolean -+#. Description -+#: ../templates:4001 -+msgid "" -+"You have the option of starting the hddtemp daemon automatically on system " -+"boot. If in doubt, it is suggested to not start it automatically on boot." -+msgstr "" -+"Du kan velge Ã¥ starte hddtemp-daemonen automatisk nÃ¥r systemet starter opp. " -+"Er du i tvil, foreslÃ¥r vi at den ikke startes automatisk ved oppstart." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "Interface to listen on:" -+msgstr "Grensesnitt det skal lyttes pÃ¥:" -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"The hddtemp program can listen for incoming connections on a specific " -+"interface, or on all interfaces." -+msgstr "" -+"hddtemp-programmet kan lytte etter inkommende tilkoblinger pÃ¥ et bestemt " -+"grensesnitt, eller alle grensesnitt." -+ -+#. Type: string -+#. Description -+#: ../templates:5001 -+msgid "" -+"To listen on a specific interface, enter the IP address of that interface " -+"(choosing 127.0.0.1 will accept local connections only). To listen on all " -+"interfaces, enter 0.0.0.0." -+msgstr "" -+"Oppgi grensesnittets IP-adresse for Ã¥ lytte pÃ¥ det grensesnittet. (127.0.0.1 " -+"godtar bare lokale tilkoblinger). Oppgi 0.0.0.0 for Ã¥ lytte pÃ¥ alle " -+"grensesnitt." -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "Port to listen on:" -+msgstr "Port Ã¥ lytte pÃ¥:" -+ -+#. Type: string -+#. Description -+#: ../templates:6001 -+msgid "" -+"By default, hddtemp listens for incoming connections on port 7634. This can " -+"be changed for another port number." -+msgstr "" -+"Standardporten der hddtemp lytter etter innkommende tilkoblinger er port " -+"7634. Dette kan endres til et annet portnummer." ---- hddtemp-0.3-beta15.orig/doc/hddtemp.8 -+++ hddtemp-0.3-beta15/doc/hddtemp.8 -@@ -58,6 +58,10 @@ - .B \-f, \-\-file=\fIfile\fI - Specify the database file to use. - .TP -+.B \-F, \-\-foreground -+Don't fork into the background even in daemon mode. This is useful -+when running under a process supervisor. -+.TP - .B \-l, \-\-listen=\fIaddr\fR - Listen on a specific address. \fIaddr\fR is a string containing a - host name or a numeric host address string. The numeric host address -@@ -80,6 +84,9 @@ - .B \-q, \-\-quiet - Don't check if the drive is supported. - .TP -+.B \-u, \-\-unit=\fIC|F\fR -+Force output temperature either in Celsius or Fahrenheit. -+.TP - .B \-v, \-\-version - Display hddtemp version number. - .TP -@@ -96,7 +103,7 @@ - .SH "DRIVE DATABASE" - If you know your drive has a temperature sensor but it is being - reported unsupported, tell me which model and which manufacturer it --is, and/or just add a new entry in /usr/share/misc/hddtemp.db. Each -+is, and/or just add a new entry in /etc/hddtemp.db. Each - line of hddtemp.db is either a comment, a blank line or a line - containing: - .TP -@@ -112,7 +119,7 @@ - Feedback is welcome (see the REPORT section below). - - .SH "TCP/IP DAEMON MODE" --Exemple of type forcing: -+Example of type forcing: - .PP - # hddtemp SATA:/dev/sda PATA:/dev/hda - .PP -@@ -120,7 +127,7 @@ - .B hddtemp - in daemon mode, start it like this: - .PP --# hddtemp -d /dev/hd[abcd] -+# hddtemp \-d /dev/hd[abcd] - .PP - .PP - and use -@@ -165,8 +172,8 @@ - investigation they do not. But fields 194 (which is the standard - field for temperature) and 231 are good candidates. - .PP --Then, you can send me a report with outputs from `hddtemp --debug ...', --`smartctl' or `hdparm -i ...', and/or add an entry in hddtemp.db -+Then, you can send me a report with outputs from `hddtemp \-\-debug ...', -+`smartctl' or `hdparm \-i ...', and/or add an entry in hddtemp.db - yourself. - - .SH "BUGS" -@@ -183,5 +190,5 @@ - .PP - Emmanuel Varagnat (hddtemp@guzu.net). - .PP --This manual page was originaly written by Aurelien Jarno , -+This manual page was originally written by Aurelien Jarno , - for the Debian GNU/Linux system (but may be used by others). ---- hddtemp-0.3-beta15.orig/po/fr.po -+++ hddtemp-0.3-beta15/po/fr.po -@@ -7,9 +7,9 @@ - msgid "" - msgstr "" - "Project-Id-Version: fr\n" --"Report-Msgid-Bugs-To: hddtemp@guzu.net\n" --"POT-Creation-Date: 2005-02-25 22:43+0100\n" --"PO-Revision-Date: 2003-06-03 00:58GMT+1\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-06-29 16:24+0200\n" -+"PO-Revision-Date: 2011-08-30 16:38+0200\n" - "Last-Translator: Aurelien Jarno \n" - "Language-Team: FRANCAIS \n" - "MIME-Version: 1.0\n" -@@ -17,23 +17,7 @@ - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: KBabel 1.0.1\n" - --#: src/hddtemp.c:112 --#, c-format --msgid "" --"\n" --"Regexp%s| Value | Description\n" --"------%s---------------------\n" --msgstr "" --"\n" --"Regexp%s| Valeur | Description\n" --"------%s----------------------\n" -- --#: src/hddtemp.c:118 --#, c-format --msgid "%s%s| %5d | %s\n" --msgstr "%s%s| %5d | %s\n" -- --#: src/hddtemp.c:161 -+#: src/hddtemp.c:156 - #, c-format - msgid "" - "\n" -@@ -46,7 +30,7 @@ - "Modèle: %s\n" - "\n" - --#: src/hddtemp.c:188 -+#: src/hddtemp.c:189 - #, c-format - msgid "" - "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -60,75 +44,60 @@ - "net).\n" - "ATTENTION : Voir les options --help, --debug et --drivebase.\n" - --#: src/hddtemp.c:192 -+#: src/hddtemp.c:197 - #, c-format - msgid "%s: %s: no sensor\n" - msgstr "%s: %s : pas de capteur\n" - --#: src/hddtemp.c:197 --#, c-format --msgid "" --"WARNING: Drive %s doesn't appear in the database of supported drives\n" --"WARNING: But using a common value, it reports something.\n" --"WARNING: Note that the temperature shown could be wrong.\n" --"WARNING: See --help, --debug and --drivebase options.\n" --"WARNING: And don't forget you can add your drive to hddtemp.db\n" --msgstr "" --"ATTENTION : Le lecteur %s n'apparait pas dans la base de données des " --"lecteurs supportés\n" --"ATTENTION : Mais en utilisant une valeur courante, il renvoie quelque " --"chose.\n" --"ATTENTION : Notez que la température renvoyée peut être erronée.\n" --"ATTENTION : Voir les options --help, --debug et --drivebase.\n" --"ATTENTION : Et n'oubliez pas d'ajouter votre lecteur au fichier hddtemp.db\n" -- --#: src/hddtemp.c:202 -+#: src/hddtemp.c:211 - #, c-format - msgid "%s: %s: %d%sC or %sF\n" - msgstr "%s: %s : %d%sC ou %sF\n" - --#: src/hddtemp.c:214 -+#: src/hddtemp.c:235 - #, c-format - msgid "%s: %s: drive is sleeping\n" - msgstr "%s: %s : le lecteur est en veille\n" - --#: src/hddtemp.c:217 -+#: src/hddtemp.c:242 - #, c-format --msgid "%s: %s: known drive, but it doesn't have a temperature sensor.\n" -+msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" - msgstr "" - "%s: %s: lecteur connu, mais il ne possède pas de capteur de température.\n" - --#: src/hddtemp.c:220 -+#: src/hddtemp.c:246 - #, c-format - msgid "ERROR: %s: %s: unknown returned status\n" - msgstr "ERREUR : %s : %s : status inconnu\n" - --#: src/hddtemp.c:235 -+#: src/hddtemp.c:261 - #, c-format - msgid "" - "\n" - "If one of the field value seems to match the temperature, be sure to read\n" --"the hddtemp man page before sending me a report (section REPORT). Thanks.\n" -+"the hddtemp man page before sending a report (section REPORT). Thanks.\n" - msgstr "" - --#: src/hddtemp.c:308 -+#: src/hddtemp.c:338 - #, c-format - msgid "ERROR: invalid separator.\n" - msgstr "ERREUR : séparateur invalide.\n" - --#: src/hddtemp.c:319 -+#: src/hddtemp.c:349 - #, c-format - msgid "ERROR: invalid port number.\n" - msgstr "ERREUR : numéro de port invalide.\n" - --#: src/hddtemp.c:329 --#, fuzzy, c-format -+#: src/hddtemp.c:371 -+#, c-format - msgid "" --" Usage: hddtemp [OPTIONS] DISK1 [DISK2]...\n" -+" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" - "\n" - " hddtemp displays the temperature of drives supplied in argument.\n" - " Drives must support S.M.A.R.T.\n" - "\n" -+" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" -+"\n" - " -b --drivebase : display database file content that allow hddtemp to\n" - " recognize supported drives.\n" - " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -138,6 +107,7 @@ - " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " - "default.)\n" - " -f --file=FILE : specify database file to use.\n" -+" -F --foreground : don't daemonize, stay in foreground.\n" - " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " - "mode).\n" - " -n --numeric : print only the temperature.\n" -@@ -145,6 +115,8 @@ - " -s --separator=C : separator to use between fields (in TCP/IP daemon " - "mode).\n" - " -S --syslog=s : log temperature to syslog every s seconds.\n" -+" -u --unit=[C|F] : force output temperature either in Celsius or " -+"Fahrenheit.\n" - " -q --quiet : do not check if the drive is supported.\n" - " -v --version : display hddtemp version number.\n" - " -w --wake-up : wake-up the drive if need.\n" -@@ -153,11 +125,14 @@ - "\n" - "Report bugs or new drives to .\n" - msgstr "" --" Utilisation: hddtemp [OPTIONS] DISQUE1 [DISQUE2]...\n" -+" Utilisation: hddtemp [OPTIONS] [TYPE:]DISQUE1 [[TYPE:]DISQUE2]...\n" - "\n" - " hddtemp affiche la température des lecteurs passés en argument.\n" - " Les lecteurs doivent avoir le support S.M.A.R.T.\n" - "\n" -+" TYPE peut être SATA, PATA ou SCSI. Si le type est omis, hddtemp essaiera\n" -+" de le deviner.\n" -+"\n" - " -b --drivebase : affiche le contenu du fichier de base de donnée " - "qui \n" - " permet à hddtemp de reconnaître les lecteurs " -@@ -172,6 +147,7 @@ - "défaut).\n" - " -f --file=FILE : specifie le fichier à utiliser comme base de " - "données.\n" -+" -F --foreground : ne pas démoniser, rester au premier plan.\n" - " -l --listen=addr : écoute sur une interface spécifique (en mode démon " - "TCP/IP).\n" - " -n --numeric : affiche seulement la température.\n" -@@ -180,6 +156,8 @@ - "démon TCP/IP).\n" - " -S --syslog=s : enregistre la température dans syslog tous les s " - "secondes.\n" -+" -u --unit=[C|F] : affiche la température en degrés Celsius ou " -+"Fahrenheit.\n" - " -q --quiet : ne vérifie pas si le lecteur est supporté.\n" - " -v --version : affiche la version de hddtemp.\n" - " -w --wake-up : réveiller le lecteur si nécessaire.\n" -@@ -188,62 +166,95 @@ - "\n" - "Report bugs or new drives to .\n" - --#: src/hddtemp.c:522 -+#: src/hddtemp.c:402 - #, c-format - msgid "hddtemp version %s\n" - msgstr "hddtemp version %s\n" - --#: src/hddtemp.c:547 -+#: src/hddtemp.c:418 - #, c-format - msgid "ERROR: invalid interval.\n" - msgstr "ERREUR : intervalle invalide.\n" - --#: src/hddtemp.c:547 -+#: src/hddtemp.c:438 -+#, c-format - msgid "Too few arguments: you must specify one drive, at least.\n" - msgstr "Trop peu d'arguments : vous devez spécifier au moins un lecteur.\n" - --#: src/hddtemp.c:557 -+#: src/hddtemp.c:448 -+#, c-format - msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" - msgstr "" - "ERREUR: impossible d'utiliser les options --debug et --daemon ou --syslog en " - "même temps.\n" - --#: src/hddtemp.c:583 -+#: src/hddtemp.c:505 - #, c-format - msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" - msgstr "" - "ERREUR: %s: impossible de déterminer le type de bus (ou ce type de bus est " - "inconnu)\n" - --#: src/ata.c:66 src/scsi.c:68 -+#: src/ata.c:66 src/scsi.c:64 - msgid "unknown" - msgstr "inconnu" - --#: src/ata.c:98 -+#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 - #, c-format --msgid "field(%d)\t = %d\n" --msgstr "champ(%d)\t = %d\n" -- --#: src/ata.c:167 - msgid "S.M.A.R.T. not available" - msgstr "S.M.A.R.T. non disponible" - --#: src/db.c:180 -+#: src/db.c:115 -+#, c-format -+msgid "" -+"\n" -+"Regexp%s| Value | Description\n" -+"------%s---------------------\n" -+msgstr "" -+"\n" -+"Regexp%s| Valeur | Description\n" -+"------%s----------------------\n" -+ -+#: src/db.c:121 -+#, c-format -+msgid "%s%s| %5d | %s\n" -+msgstr "%s%s| %5d | %s\n" -+ -+#: src/db.c:236 - #, c-format - msgid "hddtemp: can't open %1$s: %2$s\n" - msgstr "hddtemp: ne peut ouvrir %1$s: %2$s\n" - --#: src/db.c:194 -+#: src/db.c:250 - #, c-format - msgid "ERROR: syntax error at line %1$d in %2$s\n" - msgstr "ERREUR: erreur de syntaxe à la ligne %1$d: %2$s\n" - --#: src/db.c:201 -+#: src/db.c:257 - #, c-format - msgid " ERROR: line exceed %1$d characters in %2$s.\n" - msgstr " ERREUR: ligne exécdant %1$d caractères dans %2$s.\n" - --#: src/scsi.c:112 src/scsi.c:130 -+#: src/scsi.c:111 src/scsi.c:129 - #, c-format - msgid "log sense failed : %s" - msgstr "echec de 'log sense' : %s " -+ -+#~ msgid "" -+#~ "WARNING: Drive %s doesn't appear in the database of supported drives\n" -+#~ "WARNING: But using a common value, it reports something.\n" -+#~ "WARNING: Note that the temperature shown could be wrong.\n" -+#~ "WARNING: See --help, --debug and --drivebase options.\n" -+#~ "WARNING: And don't forget you can add your drive to hddtemp.db\n" -+#~ msgstr "" -+#~ "ATTENTION : Le lecteur %s n'apparait pas dans la base de données des " -+#~ "lecteurs supportés\n" -+#~ "ATTENTION : Mais en utilisant une valeur courante, il renvoie quelque " -+#~ "chose.\n" -+#~ "ATTENTION : Notez que la température renvoyée peut être erronée.\n" -+#~ "ATTENTION : Voir les options --help, --debug et --drivebase.\n" -+#~ "ATTENTION : Et n'oubliez pas d'ajouter votre lecteur au fichier hddtemp." -+#~ "db\n" -+ -+#~ msgid "field(%d)\t = %d\n" -+#~ msgstr "champ(%d)\t = %d\n" ---- hddtemp-0.3-beta15.orig/po/ru.po -+++ hddtemp-0.3-beta15/po/ru.po -@@ -6,8 +6,8 @@ - msgid "" - msgstr "" - "Project-Id-Version: hddtemp 0.3-beta3\n" --"Report-Msgid-Bugs-To: hddtemp@guzu.net\n" --"POT-Creation-Date: 2005-02-25 22:43+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-06-29 16:24+0200\n" - "PO-Revision-Date: 2003-03-08 16:42+0300\n" - "Last-Translator: Michael Shigorin \n" - "Language-Team: Russian \n" -@@ -15,23 +15,7 @@ - "Content-Type: text/plain; charset=koi8-r\n" - "Content-Transfer-Encoding: 8bit\n" - --#: src/hddtemp.c:112 --#, c-format --msgid "" --"\n" --"Regexp%s| Value | Description\n" --"------%s---------------------\n" --msgstr "" --"\n" --"òÅÇÜËÓ%s| úÎÁÞ. | ïÐÉÓÁÎÉÅ \n" --"------%s---------------------\n" -- --#: src/hddtemp.c:118 --#, c-format --msgid "%s%s| %5d | %s\n" --msgstr "" -- --#: src/hddtemp.c:161 -+#: src/hddtemp.c:156 - #, c-format - msgid "" - "\n" -@@ -40,7 +24,7 @@ - "\n" - msgstr "" - --#: src/hddtemp.c:188 -+#: src/hddtemp.c:189 - #, c-format - msgid "" - "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -53,72 +37,59 @@ - "÷îéíáîéå: åÓÌÉ ×Ù ÔÏÞÎÏ ÚÎÁÅÔÅ, ÞÔÏ ÄÁÔÞÉË ÅÓÔØ, ÎÁÐÉÛÉÔÅ hddtemp@guzu.net\n" - "÷îéíáîéå: (ÓÍ. ÏÐÃÉÉ --help, --debug É --drivebase).\n" - --#: src/hddtemp.c:192 -+#: src/hddtemp.c:197 - #, c-format - msgid "%s: %s: no sensor\n" - msgstr "%s: %s: ÎÅÔ ÄÁÔÞÉËÁ\n" - --#: src/hddtemp.c:197 --#, c-format --msgid "" --"WARNING: Drive %s doesn't appear in the database of supported drives\n" --"WARNING: But using a common value, it reports something.\n" --"WARNING: Note that the temperature shown could be wrong.\n" --"WARNING: See --help, --debug and --drivebase options.\n" --"WARNING: And don't forget you can add your drive to hddtemp.db\n" --msgstr "" --"÷îéíáîéå: äÉÓË %s ÎÅ ×ËÌÀÞÅÎ × ÂÁÚÕ ÄÁÎÎÙÈ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÐÒÉ×ÏÄÏ×.\n" --"÷îéíáîéå: îÏ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÒÁÓÐÒÏÓÔÒÁÎÅÎÎÙÈ ÐÁÒÁÍÅÔÒÏ× ÏÎ ÞÔÏ-ÔÏ ×ÙÄÁÅÔ.\n" --"÷îéíáîéå: úÁÍÅÔØÔÅ, ÞÔÏ ÐÏËÁÚÁÎÎÁÑ ÔÅÍÐÅÒÁÔÕÒÁ ÍÏÖÅÔ ÔÁËÏ×ÏÊ ÎÅ Ñ×ÌÑÔØÓÑ.\n" --"÷îéíáîéå: óÍ. ÏÐÃÉÉ --help, --debug É --drivebase.\n" --"÷îéíáîéå: é ÎÅ ÚÁÂÕÄØÔÅ, ÞÔÏ ÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÐÒÉ×ÏÄ × hddtemp.db\n" -- --#: src/hddtemp.c:202 -+#: src/hddtemp.c:211 - #, c-format - msgid "%s: %s: %d%sC or %sF\n" - msgstr "%s: %s: %d%sC ÉÌÉ %sF\n" - --#: src/hddtemp.c:214 -+#: src/hddtemp.c:235 - #, c-format - msgid "%s: %s: drive is sleeping\n" - msgstr "%s: %s: ÎÅÔ ÄÁÔÞÉËÁ\n" - --#: src/hddtemp.c:217 --#, c-format --msgid "%s: %s: known drive, but it doesn't have a temperature sensor.\n" -+#: src/hddtemp.c:242 -+#, fuzzy, c-format -+msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" - msgstr "%s: %s: ÉÚ×ÅÓÔÎÙÊ ÄÉÓË, ÎÅ ÓÏÄÅÒÖÁÝÉÊ ÄÁÔÞÉËÁ ÔÅÍÐÅÒÁÔÕÒÙ.\n" - --#: src/hddtemp.c:220 -+#: src/hddtemp.c:246 - #, c-format - msgid "ERROR: %s: %s: unknown returned status\n" - msgstr "ïûéâëá: %s: %s: ÎÅÉÚ×ÅÓÔÎÙÊ ÓÔÁÔÕÓ ×ÏÚ×ÒÁÔÁ\n" - --#: src/hddtemp.c:235 -+#: src/hddtemp.c:261 - #, c-format - msgid "" - "\n" - "If one of the field value seems to match the temperature, be sure to read\n" --"the hddtemp man page before sending me a report (section REPORT). Thanks.\n" -+"the hddtemp man page before sending a report (section REPORT). Thanks.\n" - msgstr "" - --#: src/hddtemp.c:308 -+#: src/hddtemp.c:338 - #, c-format - msgid "ERROR: invalid separator.\n" - msgstr "ïûéâëá: ÎÅ×ÅÒÎÙÊ ÒÁÚÄÅÌÉÔÅÌØ.\n" - --#: src/hddtemp.c:319 -+#: src/hddtemp.c:349 - #, c-format - msgid "ERROR: invalid port number.\n" - msgstr "ïýéâëá: ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÏÒÔÁ.\n" - --#: src/hddtemp.c:329 -+#: src/hddtemp.c:371 - #, fuzzy, c-format - msgid "" --" Usage: hddtemp [OPTIONS] DISK1 [DISK2]...\n" -+" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" - "\n" - " hddtemp displays the temperature of drives supplied in argument.\n" - " Drives must support S.M.A.R.T.\n" - "\n" -+" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" -+"\n" - " -b --drivebase : display database file content that allow hddtemp to\n" - " recognize supported drives.\n" - " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -128,6 +99,7 @@ - " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " - "default.)\n" - " -f --file=FILE : specify database file to use.\n" -+" -F --foreground : don't daemonize, stay in foreground.\n" - " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " - "mode).\n" - " -n --numeric : print only the temperature.\n" -@@ -135,6 +107,8 @@ - " -s --separator=C : separator to use between fields (in TCP/IP daemon " - "mode).\n" - " -S --syslog=s : log temperature to syslog every s seconds.\n" -+" -u --unit=[C|F] : force output temperature either in Celsius or " -+"Fahrenheit.\n" - " -q --quiet : do not check if the drive is supported.\n" - " -v --version : display hddtemp version number.\n" - " -w --wake-up : wake-up the drive if need.\n" -@@ -168,59 +142,90 @@ - "\n" - "óÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ É ÄÁÎÎÙÅ ÄÌÑ ÄÉÓËÏ× ÏÔÐÒÁ×ÌÑÊÔÅ ÎÁ .\n" - --#: src/hddtemp.c:522 -+#: src/hddtemp.c:402 - #, c-format - msgid "hddtemp version %s\n" - msgstr "÷ÅÒÓÉÑ hddtemp: %s\n" - --#: src/hddtemp.c:547 -+#: src/hddtemp.c:418 - #, fuzzy, c-format - msgid "ERROR: invalid interval.\n" - msgstr "ïûéâëá: ÎÅ×ÅÒÎÙÊ ÒÁÚÄÅÌÉÔÅÌØ.\n" - --#: src/hddtemp.c:547 -+#: src/hddtemp.c:438 -+#, c-format - msgid "Too few arguments: you must specify one drive, at least.\n" - msgstr "" - --#: src/hddtemp.c:557 --#, fuzzy -+#: src/hddtemp.c:448 -+#, fuzzy, c-format - msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" - msgstr "ïûéâëá: ÏÄÎÏ×ÒÅÍÅÎÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ --debug É --daemon ÎÅÄÏÐÕÓÔÉÍÏ.\n" - --#: src/hddtemp.c:583 -+#: src/hddtemp.c:505 - #, c-format - msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" - msgstr "ïûéâëá: %s: ÎÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÔÉÐ ÛÉÎÙ\n" - --#: src/ata.c:66 src/scsi.c:68 -+#: src/ata.c:66 src/scsi.c:64 - msgid "unknown" - msgstr "ÎÅÉÚ×." - --#: src/ata.c:98 -+#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 - #, c-format --msgid "field(%d)\t = %d\n" --msgstr "ÐÏÌÅ(%d)\t = %d\n" -- --#: src/ata.c:167 - msgid "S.M.A.R.T. not available" - msgstr "S.M.A.R.T. ÎÅÄÏÓÔÕÐÅÎ" - --#: src/db.c:180 -+#: src/db.c:115 -+#, c-format -+msgid "" -+"\n" -+"Regexp%s| Value | Description\n" -+"------%s---------------------\n" -+msgstr "" -+"\n" -+"òÅÇÜËÓ%s| úÎÁÞ. | ïÐÉÓÁÎÉÅ \n" -+"------%s---------------------\n" -+ -+#: src/db.c:121 -+#, c-format -+msgid "%s%s| %5d | %s\n" -+msgstr "" -+ -+#: src/db.c:236 - #, c-format - msgid "hddtemp: can't open %1$s: %2$s\n" - msgstr "hddtemp: ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %1$s: %2$s\n" - --#: src/db.c:194 -+#: src/db.c:250 - #, c-format - msgid "ERROR: syntax error at line %1$d in %2$s\n" - msgstr "óÉÎÔÁËÓÉÞÅÓËÁÑ ïûéâëá × ÓÔÒÏËÅ %1$d ÆÁÊÌÁ %2$s\n" - --#: src/db.c:201 -+#: src/db.c:257 - #, c-format - msgid " ERROR: line exceed %1$d characters in %2$s.\n" - msgstr "ïûéâëá: ÓÔÒÏËÁ ÄÌÉÎÎÅÅ %1$d ÓÉÍ×ÏÌÏ× × %2$s.\n" - --#: src/scsi.c:112 src/scsi.c:130 -+#: src/scsi.c:111 src/scsi.c:129 - #, c-format - msgid "log sense failed : %s" - msgstr "" -+ -+#~ msgid "" -+#~ "WARNING: Drive %s doesn't appear in the database of supported drives\n" -+#~ "WARNING: But using a common value, it reports something.\n" -+#~ "WARNING: Note that the temperature shown could be wrong.\n" -+#~ "WARNING: See --help, --debug and --drivebase options.\n" -+#~ "WARNING: And don't forget you can add your drive to hddtemp.db\n" -+#~ msgstr "" -+#~ "÷îéíáîéå: äÉÓË %s ÎÅ ×ËÌÀÞÅÎ × ÂÁÚÕ ÄÁÎÎÙÈ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÐÒÉ×ÏÄÏ×.\n" -+#~ "÷îéíáîéå: îÏ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÒÁÓÐÒÏÓÔÒÁÎÅÎÎÙÈ ÐÁÒÁÍÅÔÒÏ× ÏÎ ÞÔÏ-ÔÏ " -+#~ "×ÙÄÁÅÔ.\n" -+#~ "÷îéíáîéå: úÁÍÅÔØÔÅ, ÞÔÏ ÐÏËÁÚÁÎÎÁÑ ÔÅÍÐÅÒÁÔÕÒÁ ÍÏÖÅÔ ÔÁËÏ×ÏÊ ÎÅ " -+#~ "Ñ×ÌÑÔØÓÑ.\n" -+#~ "÷îéíáîéå: óÍ. ÏÐÃÉÉ --help, --debug É --drivebase.\n" -+#~ "÷îéíáîéå: é ÎÅ ÚÁÂÕÄØÔÅ, ÞÔÏ ÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÐÒÉ×ÏÄ × hddtemp.db\n" -+ -+#~ msgid "field(%d)\t = %d\n" -+#~ msgstr "ÐÏÌÅ(%d)\t = %d\n" ---- hddtemp-0.3-beta15.orig/po/sv.po -+++ hddtemp-0.3-beta15/po/sv.po -@@ -6,8 +6,8 @@ - msgid "" - msgstr "" - "Project-Id-Version: hddtemp 0.3-beta14-4\n" --"Report-Msgid-Bugs-To: hddtemp@guzu.net\n" --"POT-Creation-Date: 2005-02-25 22:43+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-06-29 16:24+0200\n" - "PO-Revision-Date: 2005-11-02 19:03+0100\n" - "Last-Translator: Daniel Nylander \n" - "Language-Team: Swedish \n" -@@ -17,23 +17,7 @@ - "X-Poedit-Language: swe\n" - "X-Poedit-Country: swe\n" - --#: src/hddtemp.c:112 --#, c-format --msgid "" --"\n" --"Regexp%s| Value | Description\n" --"------%s---------------------\n" --msgstr "" --"\n" --"Regexp%s| Värde | Beskrivning\n" --"------%s---------------------\n" -- --#: src/hddtemp.c:118 --#, c-format --msgid "%s%s| %5d | %s\n" --msgstr "%s%s| %5d | %s\n" -- --#: src/hddtemp.c:161 -+#: src/hddtemp.c:156 - #, c-format - msgid "" - "\n" -@@ -46,7 +30,7 @@ - "Modell: %s\n" - "\n" - --#: src/hddtemp.c:188 -+#: src/hddtemp.c:189 - #, c-format - msgid "" - "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -60,76 +44,63 @@ - "net).\n" - "VARNING: Se --help, --debug och --drivebase flaggorna.\n" - --#: src/hddtemp.c:192 -+#: src/hddtemp.c:197 - #, c-format - msgid "%s: %s: no sensor\n" - msgstr "%s: %s: ingen sensor\n" - --#: src/hddtemp.c:197 --#, c-format --msgid "" --"WARNING: Drive %s doesn't appear in the database of supported drives\n" --"WARNING: But using a common value, it reports something.\n" --"WARNING: Note that the temperature shown could be wrong.\n" --"WARNING: See --help, --debug and --drivebase options.\n" --"WARNING: And don't forget you can add your drive to hddtemp.db\n" --msgstr "" --"VARNING: Disken %s verkar inte finnas i databasen över diskar som stöds\n" --"VARNING: Men använder man ett vanligt värde rapporterar den något.\n" --"VARNING: Notera att temperaturen som visas kan vara felaktig.\n" --"VARNING: Se --help, --debug och --drivebase flaggorna.\n" --"VARNING: Och glöm inte att du kan lägga till din disk till hddtemp.db\n" -- --#: src/hddtemp.c:202 -+#: src/hddtemp.c:211 - #, c-format - msgid "%s: %s: %d%sC or %sF\n" - msgstr "%s: %s: %d%sC eller %sF\n" - --#: src/hddtemp.c:214 -+#: src/hddtemp.c:235 - #, c-format - msgid "%s: %s: drive is sleeping\n" - msgstr "%s: %s: disken sover\n" - --#: src/hddtemp.c:217 --#, c-format --msgid "%s: %s: known drive, but it doesn't have a temperature sensor.\n" -+#: src/hddtemp.c:242 -+#, fuzzy, c-format -+msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" - msgstr "%s: %s: känd disk men den har ingen temperatursensor.\n" - --#: src/hddtemp.c:220 -+#: src/hddtemp.c:246 - #, c-format - msgid "ERROR: %s: %s: unknown returned status\n" - msgstr "FEL: %s: %s: okänd returnerad status\n" - --#: src/hddtemp.c:235 --#, c-format -+#: src/hddtemp.c:261 -+#, fuzzy, c-format - msgid "" - "\n" - "If one of the field value seems to match the temperature, be sure to read\n" --"the hddtemp man page before sending me a report (section REPORT). Thanks.\n" -+"the hddtemp man page before sending a report (section REPORT). Thanks.\n" - msgstr "" - "\n" - "Om ett av fältvärdena verkar matcha temperaturen, var säker på att du\n" - "läst manualsidan för hddtemp före du skickar en rapport till mig (sektionen\n" - "REPORT). Tack.\n" - --#: src/hddtemp.c:308 -+#: src/hddtemp.c:338 - #, c-format - msgid "ERROR: invalid separator.\n" - msgstr "FEL: ogiltig separator.\n" - --#: src/hddtemp.c:319 -+#: src/hddtemp.c:349 - #, c-format - msgid "ERROR: invalid port number.\n" - msgstr "FEL: ogiltigt portnummer.\n" - --#: src/hddtemp.c:329 --#, c-format -+#: src/hddtemp.c:371 -+#, fuzzy, c-format - msgid "" --" Usage: hddtemp [OPTIONS] DISK1 [DISK2]...\n" -+" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" - "\n" - " hddtemp displays the temperature of drives supplied in argument.\n" - " Drives must support S.M.A.R.T.\n" - "\n" -+" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" -+"\n" - " -b --drivebase : display database file content that allow hddtemp to\n" - " recognize supported drives.\n" - " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -139,6 +110,7 @@ - " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " - "default.)\n" - " -f --file=FILE : specify database file to use.\n" -+" -F --foreground : don't daemonize, stay in foreground.\n" - " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " - "mode).\n" - " -n --numeric : print only the temperature.\n" -@@ -146,6 +118,8 @@ - " -s --separator=C : separator to use between fields (in TCP/IP daemon " - "mode).\n" - " -S --syslog=s : log temperature to syslog every s seconds.\n" -+" -u --unit=[C|F] : force output temperature either in Celsius or " -+"Fahrenheit.\n" - " -q --quiet : do not check if the drive is supported.\n" - " -v --version : display hddtemp version number.\n" - " -w --wake-up : wake-up the drive if need.\n" -@@ -184,61 +158,91 @@ - "\n" - "Rapportera buggar eller nya hårddiskar till .\n" - --#: src/hddtemp.c:522 -+#: src/hddtemp.c:402 - #, c-format - msgid "hddtemp version %s\n" - msgstr "hddtemp version %s\n" - --#: src/hddtemp.c:547 -+#: src/hddtemp.c:418 - #, c-format - msgid "ERROR: invalid interval.\n" - msgstr "FEL: ogiltigt intervall.\n" - --#: src/hddtemp.c:547 -+#: src/hddtemp.c:438 -+#, c-format - msgid "Too few arguments: you must specify one drive, at least.\n" - msgstr "För få argument: du måste specificera åtminstone en disk.\n" - --#: src/hddtemp.c:557 -+#: src/hddtemp.c:448 -+#, c-format - msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" - msgstr "" - "FEL: kan inte använda --debug och --daemon eller --syslog flaggorna " - "tillsammans.\n" - --#: src/hddtemp.c:583 -+#: src/hddtemp.c:505 - #, c-format - msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" - msgstr "" - "FEL: %s: kan inte fastställa busstyp (eller så är denna busstyp okänd)\n" - --#: src/ata.c:66 src/scsi.c:68 -+#: src/ata.c:66 src/scsi.c:64 - msgid "unknown" - msgstr "okänd" - --#: src/ata.c:98 -+#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 - #, c-format --msgid "field(%d)\t = %d\n" --msgstr "fält(%d)\t = %d\n" -- --#: src/ata.c:167 - msgid "S.M.A.R.T. not available" - msgstr "S.M.A.R.T. är inte tillgänglig" - --#: src/db.c:180 -+#: src/db.c:115 -+#, c-format -+msgid "" -+"\n" -+"Regexp%s| Value | Description\n" -+"------%s---------------------\n" -+msgstr "" -+"\n" -+"Regexp%s| Värde | Beskrivning\n" -+"------%s---------------------\n" -+ -+#: src/db.c:121 -+#, c-format -+msgid "%s%s| %5d | %s\n" -+msgstr "%s%s| %5d | %s\n" -+ -+#: src/db.c:236 - #, c-format - msgid "hddtemp: can't open %1$s: %2$s\n" - msgstr "hddtemp: kan inte öppna %1$s: %2$s\n" - --#: src/db.c:194 -+#: src/db.c:250 - #, c-format - msgid "ERROR: syntax error at line %1$d in %2$s\n" - msgstr "FEL: syntaxfel på rad %1$d i %2$s\n" - --#: src/db.c:201 -+#: src/db.c:257 - #, c-format - msgid " ERROR: line exceed %1$d characters in %2$s.\n" - msgstr " FEL: raden överstiger %1$d tecken i %2$s.\n" - --#: src/scsi.c:112 src/scsi.c:130 -+#: src/scsi.c:111 src/scsi.c:129 - #, c-format - msgid "log sense failed : %s" - msgstr "igenkänning av logg misslyckades : %s" -+ -+#~ msgid "" -+#~ "WARNING: Drive %s doesn't appear in the database of supported drives\n" -+#~ "WARNING: But using a common value, it reports something.\n" -+#~ "WARNING: Note that the temperature shown could be wrong.\n" -+#~ "WARNING: See --help, --debug and --drivebase options.\n" -+#~ "WARNING: And don't forget you can add your drive to hddtemp.db\n" -+#~ msgstr "" -+#~ "VARNING: Disken %s verkar inte finnas i databasen över diskar som stöds\n" -+#~ "VARNING: Men använder man ett vanligt värde rapporterar den något.\n" -+#~ "VARNING: Notera att temperaturen som visas kan vara felaktig.\n" -+#~ "VARNING: Se --help, --debug och --drivebase flaggorna.\n" -+#~ "VARNING: Och glöm inte att du kan lägga till din disk till hddtemp.db\n" -+ -+#~ msgid "field(%d)\t = %d\n" -+#~ msgstr "fält(%d)\t = %d\n" ---- hddtemp-0.3-beta15.orig/po/pt.po -+++ hddtemp-0.3-beta15/po/pt.po -@@ -7,7 +7,7 @@ - msgstr "" - "Project-Id-Version: hddtemp 0.3-beta14\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2005-02-25 22:43+0100\n" -+"POT-Creation-Date: 2006-06-29 16:24+0200\n" - "PO-Revision-Date: 2006-03-29 23:22+0000\n" - "Last-Translator: Miguel Figueiredo \n" - "Language-Team: Portuguese \n" -@@ -15,23 +15,7 @@ - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - --#: src/hddtemp.c:112 --#, c-format --msgid "" --"\n" --"Regexp%s| Value | Description\n" --"------%s---------------------\n" --msgstr "" --"\n" --"Regexp%s| Valor | Descrição\n" --"------%s-------------------\n" -- --#: src/hddtemp.c:118 --#, c-format --msgid "%s%s| %5d | %s\n" --msgstr "%s%s| %5d | %s\n" -- --#: src/hddtemp.c:161 -+#: src/hddtemp.c:156 - #, c-format - msgid "" - "\n" -@@ -44,7 +28,7 @@ - "Modelo: %s\n" - "\n" - --#: src/hddtemp.c:188 -+#: src/hddtemp.c:189 - #, c-format - msgid "" - "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -54,79 +38,68 @@ - msgstr "" - "AVISO: O disco %s não parece ter um sensor de temperatura.\n" - "AVISO: Isto não significa que não tem nenhum.\n" --"AVISO: Se tem a certeza que tem um, por favor contacte-me (hddtemp@guzu.net).\n" -+"AVISO: Se tem a certeza que tem um, por favor contacte-me (hddtemp@guzu." -+"net).\n" - "AVISO: Veja as opções --help, --debug e --drivebase.\n" - --#: src/hddtemp.c:192 -+#: src/hddtemp.c:197 - #, c-format - msgid "%s: %s: no sensor\n" - msgstr "%s: %s: sem sensor\n" - --#: src/hddtemp.c:197 --#, c-format --msgid "" --"WARNING: Drive %s doesn't appear in the database of supported drives\n" --"WARNING: But using a common value, it reports something.\n" --"WARNING: Note that the temperature shown could be wrong.\n" --"WARNING: See --help, --debug and --drivebase options.\n" --"WARNING: And don't forget you can add your drive to hddtemp.db\n" --msgstr "" --"AVISO: O disco %s não parece estar na base de dados de discos suportados\n" --"AVISO: Mas ao utilizar um valor usual, relata alguma coisa.\n" --"AVISO: Note que a temperatura mostrada pode estar errada.\n" --"AVISO: Veja as opções --help, --debug e --frivebase.\n" --"AVISO: E não se esqueça de adicionar o seu disco a hddtemp.db\n" -- --#: src/hddtemp.c:202 -+#: src/hddtemp.c:211 - #, c-format - msgid "%s: %s: %d%sC or %sF\n" - msgstr "%s: %s: %d%sC ou %sF\n" - --#: src/hddtemp.c:214 -+#: src/hddtemp.c:235 - #, c-format - msgid "%s: %s: drive is sleeping\n" - msgstr "%s: %s: o disco está adormecido\n" - --#: src/hddtemp.c:217 --#, c-format --msgid "%s: %s: known drive, but it doesn't have a temperature sensor.\n" -+#: src/hddtemp.c:242 -+#, fuzzy, c-format -+msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" - msgstr "%s: %s: disco conhecido, mas não tem um sensor de temperatura.\n" - --#: src/hddtemp.c:220 -+#: src/hddtemp.c:246 - #, c-format - msgid "ERROR: %s: %s: unknown returned status\n" - msgstr "ERRO: %s: %s: estado devolvido desconhecido\n" - --#: src/hddtemp.c:235 --#, c-format -+#: src/hddtemp.c:261 -+#, fuzzy, c-format - msgid "" - "\n" - "If one of the field value seems to match the temperature, be sure to read\n" --"the hddtemp man page before sending me a report (section REPORT). Thanks.\n" -+"the hddtemp man page before sending a report (section REPORT). Thanks.\n" - msgstr "" - "\n" --"Se um dos campos de valores parecer coincidir com a temperatura, assegure-se\n" -+"Se um dos campos de valores parecer coincidir com a temperatura, assegure-" -+"se\n" - "que lê a página do manual hddtemp antes de me enviar um relatório (secção\n" - "REPORT). Obrigado.\n" - --#: src/hddtemp.c:308 -+#: src/hddtemp.c:338 - #, c-format - msgid "ERROR: invalid separator.\n" - msgstr "ERRO: separador inválido.\n" - --#: src/hddtemp.c:319 -+#: src/hddtemp.c:349 - #, c-format - msgid "ERROR: invalid port number.\n" - msgstr "ERRO: número de port inválido\n" - --#: src/hddtemp.c:329 --#, c-format -+#: src/hddtemp.c:371 -+#, fuzzy, c-format - msgid "" --" Usage: hddtemp [OPTIONS] DISK1 [DISK2]...\n" -+" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" - "\n" - " hddtemp displays the temperature of drives supplied in argument.\n" - " Drives must support S.M.A.R.T.\n" - "\n" -+" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" -+"\n" - " -b --drivebase : display database file content that allow hddtemp to\n" - " recognize supported drives.\n" - " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -136,6 +109,7 @@ - " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " - "default.)\n" - " -f --file=FILE : specify database file to use.\n" -+" -F --foreground : don't daemonize, stay in foreground.\n" - " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " - "mode).\n" - " -n --numeric : print only the temperature.\n" -@@ -143,6 +117,8 @@ - " -s --separator=C : separator to use between fields (in TCP/IP daemon " - "mode).\n" - " -S --syslog=s : log temperature to syslog every s seconds.\n" -+" -u --unit=[C|F] : force output temperature either in Celsius or " -+"Fahrenheit.\n" - " -q --quiet : do not check if the drive is supported.\n" - " -v --version : display hddtemp version number.\n" - " -w --wake-up : wake-up the drive if need.\n" -@@ -156,19 +132,23 @@ - " hddtemp mostra a temperatura dos discos indicados no argumento.\n" - " Os discos têm de suportar S.M.A.R.T.\n" - "\n" --" -b --drivebase : mostrar o conteúdo do ficheiro de base de dados que\n" -+" -b\t --drivebase : mostrar o conteúdo do ficheiro de base de dados que\n" - " permite ao hddtemp reconhecer os discos suportados.\n" --" -D --debug : mostrar vários campos S.M.A.R.T. e os seus valores.\n" --" Útil para encontrar um valor que pareça coincidir com " --" a temperatura e/ou para me enviar um relatório.\n" -+" -D\t --debug : mostrar vários campos S.M.A.R.T. e os seus valores.\n" -+" Útil para encontrar um valor que pareça coincidir " -+"com a temperatura e/ou para me enviar um relatório.\n" - " (feito para cada disco indicado).\n" --" -d --daemon : correr o hddtemp no modo daemon TCP/IP\n (porto %d por omissão.)\n" -+" -d --daemon : correr o hddtemp no modo daemon TCP/IP\n" -+" (porto %d por omissão.)\n" - " -f --file=FILE : especificar o ficheiro de base de dados a utilizar.\n" --" -l --listen=addr : escutar um interface específico (no modo daemon TCP/IP).\n" -+" -l --listen=addr : escutar um interface específico (no modo daemon TCP/" -+"IP).\n" - " -n --numeric : escrever apenas a temperatura.\n" - " -p --port=# : port para escutar (no modo daemon TCP/IP).\n" --" -s --separator=C : separador a utilizar entre campos (no modo daemon TCP/IP).\n" --" -S --syslog=s : registar a temperatura para o syslog a cada s segundos.\n" -+" -s --separator=C : separador a utilizar entre campos (no modo daemon " -+"TCP/IP).\n" -+" -S --syslog=s : registar a temperatura para o syslog a cada s " -+"segundos.\n" - " -q --quiet : não verificar se o disco é suportado.\n" - " -v --version : mostrar o número da versão do hddtemp.\n" - " -w --wake-up : acordar o disco se necessário.\n" -@@ -177,58 +157,93 @@ - "\n" - "Relatar bugs ou novos discos para .\n" - --#: src/hddtemp.c:522 -+#: src/hddtemp.c:402 - #, c-format - msgid "hddtemp version %s\n" - msgstr "hddtemp versão %s\n" - --#: src/hddtemp.c:547 -+#: src/hddtemp.c:418 - #, c-format - msgid "ERROR: invalid interval.\n" - msgstr "ERRO: intervalo inválido.\n" - --#: src/hddtemp.c:547 -+#: src/hddtemp.c:438 -+#, c-format - msgid "Too few arguments: you must specify one drive, at least.\n" --msgstr "Número de argumentos insuficiente: tem de especificar pelo menos um disco.\n" -+msgstr "" -+"Número de argumentos insuficiente: tem de especificar pelo menos um disco.\n" - --#: src/hddtemp.c:557 -+#: src/hddtemp.c:448 -+#, c-format - msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" --msgstr "ERRO: não pode utilizar em conjunto as opções --debug e --daemon ou --syslog.\n" -+msgstr "" -+"ERRO: não pode utilizar em conjunto as opções --debug e --daemon ou --" -+"syslog.\n" - --#: src/hddtemp.c:583 -+#: src/hddtemp.c:505 - #, c-format - msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" --msgstr "ERRO: %s: não é possível determinar o tipo do bus (ou este tipo de bus é desconhecido)\n" -+msgstr "" -+"ERRO: %s: não é possível determinar o tipo do bus (ou este tipo de bus é " -+"desconhecido)\n" - --#: src/ata.c:66 src/scsi.c:68 -+#: src/ata.c:66 src/scsi.c:64 - msgid "unknown" - msgstr "desconhecido" - --#: src/ata.c:98 -+#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 - #, c-format --msgid "field(%d)\t = %d\n" --msgstr "campo(%d)\t = %d\n" -- --#: src/ata.c:167 - msgid "S.M.A.R.T. not available" - msgstr "S.M.A.R.T. não está disponível" - --#: src/db.c:180 -+#: src/db.c:115 -+#, c-format -+msgid "" -+"\n" -+"Regexp%s| Value | Description\n" -+"------%s---------------------\n" -+msgstr "" -+"\n" -+"Regexp%s| Valor | Descrição\n" -+"------%s-------------------\n" -+ -+#: src/db.c:121 -+#, c-format -+msgid "%s%s| %5d | %s\n" -+msgstr "%s%s| %5d | %s\n" -+ -+#: src/db.c:236 - #, c-format - msgid "hddtemp: can't open %1$s: %2$s\n" - msgstr "hddtemp: não pode abrir %1$s: %2$s\n" - --#: src/db.c:194 -+#: src/db.c:250 - #, c-format - msgid "ERROR: syntax error at line %1$d in %2$s\n" - msgstr "ERRO: erro de sintaxe na linha %1$d em %2$s\n" - --#: src/db.c:201 -+#: src/db.c:257 - #, c-format - msgid " ERROR: line exceed %1$d characters in %2$s.\n" - msgstr " ERRO: a linha execedeu %1$d caracteres em %2$s.\n" - --#: src/scsi.c:112 src/scsi.c:130 -+#: src/scsi.c:111 src/scsi.c:129 - #, c-format - msgid "log sense failed : %s" - msgstr "detecção de log falhou: %s" -+ -+#~ msgid "" -+#~ "WARNING: Drive %s doesn't appear in the database of supported drives\n" -+#~ "WARNING: But using a common value, it reports something.\n" -+#~ "WARNING: Note that the temperature shown could be wrong.\n" -+#~ "WARNING: See --help, --debug and --drivebase options.\n" -+#~ "WARNING: And don't forget you can add your drive to hddtemp.db\n" -+#~ msgstr "" -+#~ "AVISO: O disco %s não parece estar na base de dados de discos suportados\n" -+#~ "AVISO: Mas ao utilizar um valor usual, relata alguma coisa.\n" -+#~ "AVISO: Note que a temperatura mostrada pode estar errada.\n" -+#~ "AVISO: Veja as opções --help, --debug e --frivebase.\n" -+#~ "AVISO: E não se esqueça de adicionar o seu disco a hddtemp.db\n" -+ -+#~ msgid "field(%d)\t = %d\n" -+#~ msgstr "campo(%d)\t = %d\n" ---- hddtemp-0.3-beta15.orig/po/de.po -+++ hddtemp-0.3-beta15/po/de.po -@@ -0,0 +1,250 @@ -+# German translation of hddtemp. -+# Copyright (C) 2008 Free Software Foundation, Inc. -+# This file is distributed under the same license as the hddtemp package. -+# Vinzenz Vietzke , 2008. -+# , -+# -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: hddtemp 0.3-beta15-44\n" -+"Report-Msgid-Bugs-To: hddtemp@packages.debian.org\n" -+"POT-Creation-Date: 2006-06-29 16:24+0200\n" -+"PO-Revision-Date: 2011-08-30 16:40+0200\n" -+"Last-Translator: Vinzenz Vietzke \n" -+"Language-Team: \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit" -+ -+#: src/hddtemp.c:156 -+#, c-format -+msgid "" -+"\n" -+"================= hddtemp %s ==================\n" -+"Model: %s\n" -+"\n" -+msgstr "" -+"\n" -+"================= hddtemp %s ==================\n" -+"Modell: %s\n" -+"\n" -+ -+#: src/hddtemp.c:189 -+#, c-format -+msgid "" -+"WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -+"WARNING: This doesn't mean it hasn't got one.\n" -+"WARNING: If you are sure it has one, please contact me (hddtemp@guzu." -+"net).\n" -+"WARNING: See --help, --debug and --drivebase options.\n" -+msgstr "" -+"WARNUNG: Laufwerk %s scheint keinen Temperatur-Sensor zu haben.\n" -+"WARNUNG: Das bedeutet nicht, dass es keinen besitzt.\n" -+"WARNUNG: Falls Sie sicher sind, dass es einen besitzt, kontaktieren Sie " -+"mich bitte (hddtemp@guzu.net).\n" -+"WARNUNG: Siehe Optionen --help, --debug und --drivebase.\n" -+ -+#: src/hddtemp.c:197 -+#, c-format -+msgid "%s: %s: no sensor\n" -+msgstr "%s: %s: kein Sensor\n" -+ -+#: src/hddtemp.c:211 -+#, c-format -+msgid "%s: %s: %d%sC or %sF\n" -+msgstr "%s: %s: %d%s°C oder %s°F\n" -+ -+#: src/hddtemp.c:235 -+#, c-format -+msgid "%s: %s: drive is sleeping\n" -+msgstr "%s: %s: Laufwerk schläft\n" -+ -+#: src/hddtemp.c:242 -+#, c-format -+msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" -+msgstr "" -+"%s: %s: Laufwerk unterstützt, aber es hat keinen Temperatur-Sensor.\n" -+ -+#: src/hddtemp.c:246 -+#, c-format -+msgid "ERROR: %s: %s: unknown returned status\n" -+msgstr "FEHLER: %s: %s: zurückgegebener Status unbekannt\n" -+ -+#: src/hddtemp.c:261 -+#, c-format -+msgid "" -+"\n" -+"If one of the field value seems to match the temperature, be sure to read\n" -+"the hddtemp man page before sending a report (section REPORT). Thanks.\n" -+msgstr "" -+"\n" -+"Falls einer der Feldwerte der Temperatur zu entsprechen scheint, stellen " -+"Sie\n" -+"sicher, die hddtemp-Handbuchseite gelesen zu haben, bevor Sie einen " -+"Bericht\n" -+"senden (Abschnitt BERICHT). Danke.\n" -+ -+#: src/hddtemp.c:338 -+#, c-format -+msgid "ERROR: invalid separator.\n" -+msgstr "FEHLER: ungültiges Trennzeichen.\n" -+ -+#: src/hddtemp.c:349 -+#, c-format -+msgid "ERROR: invalid port number.\n" -+msgstr "FEHLER: ungültige Portnummer.\n" -+ -+#: src/hddtemp.c:371 -+#, c-format -+msgid "" -+" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" -+"\n" -+" hddtemp displays the temperature of drives supplied in argument.\n" -+" Drives must support S.M.A.R.T.\n" -+"\n" -+" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" -+"\n" -+" -b --drivebase : display database file content that allow hddtemp " -+"to\n" -+" recognize supported drives.\n" -+" -D --debug : display various S.M.A.R.T. fields and their " -+"values.\n" -+" Useful to find a value that seems to match the\n" -+" temperature and/or to send me a report.\n" -+" (done for every drive supplied).\n" -+" -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " -+"default.)\n" -+" -f --file=FILE : specify database file to use.\n" -+" -F --foreground : don't daemonize, stay in foreground.\n" -+" -l --listen=addr : listen on a specific interface (in TCP/IP daemon " -+"mode).\n" -+" -n --numeric : print only the temperature.\n" -+" -p --port=# : port to listen to (in TCP/IP daemon mode).\n" -+" -s --separator=C : separator to use between fields (in TCP/IP daemon " -+"mode).\n" -+" -S --syslog=s : log temperature to syslog every s seconds.\n" -+" -u --unit=[C|F] : force output temperature either in Celsius or " -+"Fahrenheit.\n" -+" -q --quiet : do not check if the drive is supported.\n" -+" -v --version : display hddtemp version number.\n" -+" -w --wake-up : wake-up the drive if need.\n" -+" -4 : listen on IPv4 sockets only.\n" -+" -6 : listen on IPv6 sockets only.\n" -+"\n" -+"Report bugs or new drives to .\n" -+msgstr "" -+" Verwendung: hddtemp [OPTIONEN] [TYP:]LAUFWERK1 [[TYP:]LAUFWERK2]...\n" -+"\n" -+" hddtemp zeigt die Temperatur der via Argument angegeben Laufwerke.\n" -+" Laufwerke müssen S.M.A.R.T. unterstützen.\n" -+"\n" -+" TYP kann SATA, PATA oder SCSI sein. Falls ausgelassen, wird hddtemp \n" -+" versuchen, diesen zu erraten.\n" -+"\n" -+" -b --drivebase : Datenbank-Datei-Inhalt anzeigen, der hddtemp " -+"erlaubt\n" -+" unterstützte Laufwerke zu erkennen.\n" -+" -D --debug : verschiedene S.M.A.R.T.-Felder und deren Werte " -+"anzeigen.\n" -+" Nützlich, um Werte zu finden, die der Temperatur " -+"entsprechen\n" -+" und/oder um mir einen Bericht zu senden.\n" -+" (bereits erledigt für jedes bereitgestellte " -+"Laufwerk).\n" -+" -d --daemon : hddtemp im TCP/IP-Daemon-Modus ausführen " -+"(Standardmäßig Port %d)\n" -+" -f --file=DATEI : zu verwendende Datenbank-Datei festlegen.\n" -+" -F --foreground : nicht daemonisieren, im Vordergrund bleiben.\n" -+" -l --listen=addr : auf einer bestimmten Schnittstelle auf Anfragen " -+"warten (im TCP/IP-Daemon-Modus).\n" -+" -n --numeric : nur die Temperatur ausgeben.\n" -+" -p --port=# : Port, auf dem auf Anfragen gewartet werden soll " -+"(im TCP/IP-Daemon-Modus).\n" -+" -s --separator=C : Trennzeichen zur Verwendung zwischen Feldern (im " -+"TCP/IP-Daemon-Modus).\n" -+" -S --syslog=s : Temperatur alle s Sekunden in das syslog " -+"eintragen.\n" -+" -u --unit=[C|F] : Ausgabe der Temperatur entweder in Celsius oder " -+"Fahrenheit erzwingen.\n" -+" -q --quiet : nicht prüfen, ob das Laufwerk unterstützt wird.\n" -+" -v --version : Versionsnummer von hddtemp anzeigen.\n" -+" -w --wake-up : Laufwerk bei Bedarf aufwecken.\n" -+" -4 : nur auf IPv4-Sockets auf Anfragen warten.\n" -+" -6 : nur auf IPv6-Sockets auf Anfragen warten.\n" -+"\n" -+"Fehler oder neue Laufwerke an melden.\n" -+ -+#: src/hddtemp.c:402 -+#, c-format -+msgid "hddtemp version %s\n" -+msgstr "hddtemp Version %s\n" -+ -+#: src/hddtemp.c:418 -+#, c-format -+msgid "ERROR: invalid interval.\n" -+msgstr "FEHLER: ungültiges Intervall.\n" -+ -+#: src/hddtemp.c:438 -+#, c-format -+msgid "Too few arguments: you must specify one drive, at least.\n" -+msgstr "Zu wenige Argumente: Sie müssen mindestens ein Laufwerk angeben.\n" -+ -+#: src/hddtemp.c:448 -+#, c-format -+msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" -+msgstr "" -+"FEHLER: kann Optionen --debug und --daemon oder --syslog nicht zusammen " -+"verwenden.\n" -+ -+#: src/hddtemp.c:505 -+#, c-format -+msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" -+msgstr "" -+"FEHLER: %s: kann Bus-Typ nicht ermitteln (oder dieser Bus-Typ ist " -+"unbekannt)\n" -+ -+#: src/ata.c:66 src/scsi.c:64 -+msgid "unknown" -+msgstr "unbekannt" -+ -+#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 -+#, c-format -+msgid "S.M.A.R.T. not available" -+msgstr "S.M.A.R.T. nicht verfügbar" -+ -+#: src/db.c:115 -+#, c-format -+msgid "" -+"\n" -+"Regexp%s| Value | Description\n" -+"------%s---------------------\n" -+msgstr "" -+"\n" -+"Regexp%s| Wert | Beschreibung\n" -+"------%s---------------------\n" -+ -+#: src/db.c:121 -+#, c-format -+msgid "%s%s| %5d | %s\n" -+msgstr "%s%s| %5d | %s\n" -+ -+#: src/db.c:236 -+#, c-format -+msgid "hddtemp: can't open %1$s: %2$s\n" -+msgstr "hddtemp: kann %1$s nicht öffnen: %2$s\n" -+ -+#: src/db.c:250 -+#, c-format -+msgid "ERROR: syntax error at line %1$d in %2$s\n" -+msgstr "FEHLER: Syntaxfehler in Zeile %1$d in %2$s\n" -+ -+#: src/db.c:257 -+#, c-format -+msgid " ERROR: line exceed %1$d characters in %2$s.\n" -+msgstr " FEHLER: Zeile überschreitet %1$d Zeichen in %2$s.\n" -+ -+#: src/scsi.c:111 src/scsi.c:129 -+#, c-format -+msgid "log sense failed : %s" -+msgstr "Protokoll-Erkennung fehlgeschlagen : %s" ---- hddtemp-0.3-beta15.orig/po/LINGUAS -+++ hddtemp-0.3-beta15/po/LINGUAS -@@ -1,2 +1,2 @@ - # Set of available languages. --fr pt ru sv -+de fr pt ru sv ---- hddtemp-0.3-beta15.orig/po/hddtemp.pot -+++ hddtemp-0.3-beta15/po/hddtemp.pot -@@ -1,35 +1,22 @@ -- --# Copyright (C) 2006 Free Software Foundation, Inc. --# This file is distributed under the same license as the 'hddtemp' package. --# Emmanuel VARAGNAT , 2006. -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR Free Software Foundation, Inc. -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. - # - #, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" --"Report-Msgid-Bugs-To: hddtemp@guzu.net\n" --"POT-Creation-Date: 2005-02-25 22:43+0100\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-06-29 16:24+0200\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" --"Last-Translator: Emmanuel Varagnat \n" -+"Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=CHARSET\n" - "Content-Transfer-Encoding: 8bit\n" - --#: src/hddtemp.c:112 --#, c-format --msgid "" --"\n" --"Regexp%s| Value | Description\n" --"------%s---------------------\n" --msgstr "" -- --#: src/hddtemp.c:118 --#, c-format --msgid "%s%s| %5d | %s\n" --msgstr "" -- --#: src/hddtemp.c:161 -+#: src/hddtemp.c:156 - #, c-format - msgid "" - "\n" -@@ -38,7 +25,7 @@ - "\n" - msgstr "" - --#: src/hddtemp.c:188 -+#: src/hddtemp.c:189 - #, c-format - msgid "" - "WARNING: Drive %s doesn't seem to have a temperature sensor.\n" -@@ -47,67 +34,59 @@ - "WARNING: See --help, --debug and --drivebase options.\n" - msgstr "" - --#: src/hddtemp.c:192 --#, c-format --msgid "%s: %s: no sensor\n" --msgstr "" -- - #: src/hddtemp.c:197 - #, c-format --msgid "" --"WARNING: Drive %s doesn't appear in the database of supported drives\n" --"WARNING: But using a common value, it reports something.\n" --"WARNING: Note that the temperature shown could be wrong.\n" --"WARNING: See --help, --debug and --drivebase options.\n" --"WARNING: And don't forget you can add your drive to hddtemp.db\n" -+msgid "%s: %s: no sensor\n" - msgstr "" - --#: src/hddtemp.c:202 -+#: src/hddtemp.c:211 - #, c-format - msgid "%s: %s: %d%sC or %sF\n" - msgstr "" - --#: src/hddtemp.c:214 -+#: src/hddtemp.c:235 - #, c-format - msgid "%s: %s: drive is sleeping\n" - msgstr "" - --#: src/hddtemp.c:217 -+#: src/hddtemp.c:242 - #, c-format --msgid "%s: %s: known drive, but it doesn't have a temperature sensor.\n" -+msgid "%s: %s: drive supported, but it doesn't have a temperature sensor.\n" - msgstr "" - --#: src/hddtemp.c:220 -+#: src/hddtemp.c:246 - #, c-format - msgid "ERROR: %s: %s: unknown returned status\n" - msgstr "" - --#: src/hddtemp.c:235 -+#: src/hddtemp.c:261 - #, c-format - msgid "" - "\n" - "If one of the field value seems to match the temperature, be sure to read\n" --"the hddtemp man page before sending me a report (section REPORT). Thanks.\n" -+"the hddtemp man page before sending a report (section REPORT). Thanks.\n" - msgstr "" - --#: src/hddtemp.c:308 -+#: src/hddtemp.c:338 - #, c-format - msgid "ERROR: invalid separator.\n" - msgstr "" - --#: src/hddtemp.c:319 -+#: src/hddtemp.c:349 - #, c-format - msgid "ERROR: invalid port number.\n" - msgstr "" - --#: src/hddtemp.c:329 -+#: src/hddtemp.c:371 - #, c-format - msgid "" --" Usage: hddtemp [OPTIONS] DISK1 [DISK2]...\n" -+" Usage: hddtemp [OPTIONS] [TYPE:]DISK1 [[TYPE:]DISK2]...\n" - "\n" - " hddtemp displays the temperature of drives supplied in argument.\n" - " Drives must support S.M.A.R.T.\n" - "\n" -+" TYPE could be SATA, PATA or SCSI. If omitted hddtemp will try to guess.\n" -+"\n" - " -b --drivebase : display database file content that allow hddtemp to\n" - " recognize supported drives.\n" - " -D --debug : display various S.M.A.R.T. fields and their values.\n" -@@ -117,6 +96,7 @@ - " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by " - "default.)\n" - " -f --file=FILE : specify database file to use.\n" -+" -F --foreground : don't daemonize, stay in foreground.\n" - " -l --listen=addr : listen on a specific interface (in TCP/IP daemon " - "mode).\n" - " -n --numeric : print only the temperature.\n" -@@ -124,6 +104,8 @@ - " -s --separator=C : separator to use between fields (in TCP/IP daemon " - "mode).\n" - " -S --syslog=s : log temperature to syslog every s seconds.\n" -+" -u --unit=[C|F] : force output temperature either in Celsius or " -+"Fahrenheit.\n" - " -q --quiet : do not check if the drive is supported.\n" - " -v --version : display hddtemp version number.\n" - " -w --wake-up : wake-up the drive if need.\n" -@@ -133,58 +115,69 @@ - "Report bugs or new drives to .\n" - msgstr "" - --#: src/hddtemp.c:522 -+#: src/hddtemp.c:402 - #, c-format - msgid "hddtemp version %s\n" - msgstr "" - --#: src/hddtemp.c:547 -+#: src/hddtemp.c:418 - #, c-format - msgid "ERROR: invalid interval.\n" - msgstr "" - --#: src/hddtemp.c:547 -+#: src/hddtemp.c:438 -+#, c-format - msgid "Too few arguments: you must specify one drive, at least.\n" - msgstr "" - --#: src/hddtemp.c:557 -+#: src/hddtemp.c:448 -+#, c-format - msgid "ERROR: can't use --debug and --daemon or --syslog options together.\n" - msgstr "" - --#: src/hddtemp.c:583 -+#: src/hddtemp.c:505 - #, c-format - msgid "ERROR: %s: can't determine bus type (or this bus type is unknown)\n" - msgstr "" - --#: src/ata.c:66 src/scsi.c:68 -+#: src/ata.c:66 src/scsi.c:64 - msgid "unknown" - msgstr "" - --#: src/ata.c:98 -+#: src/ata.c:85 src/ata.c:104 src/scsi.c:91 - #, c-format --msgid "field(%d)\t = %d\n" -+msgid "S.M.A.R.T. not available" - msgstr "" - --#: src/ata.c:167 --msgid "S.M.A.R.T. not available" -+#: src/db.c:115 -+#, c-format -+msgid "" -+"\n" -+"Regexp%s| Value | Description\n" -+"------%s---------------------\n" -+msgstr "" -+ -+#: src/db.c:121 -+#, c-format -+msgid "%s%s| %5d | %s\n" - msgstr "" - --#: src/db.c:180 -+#: src/db.c:236 - #, c-format - msgid "hddtemp: can't open %1$s: %2$s\n" - msgstr "" - --#: src/db.c:194 -+#: src/db.c:250 - #, c-format - msgid "ERROR: syntax error at line %1$d in %2$s\n" - msgstr "" - --#: src/db.c:201 -+#: src/db.c:257 - #, c-format - msgid " ERROR: line exceed %1$d characters in %2$s.\n" - msgstr "" - --#: src/scsi.c:112 src/scsi.c:130 -+#: src/scsi.c:111 src/scsi.c:129 - #, c-format - msgid "log sense failed : %s" - msgstr "" ---- hddtemp-0.3-beta15.orig/src/sata.c -+++ hddtemp-0.3-beta15/src/sata.c -@@ -118,11 +118,22 @@ - int i; - u16 * p; - -- if(dsk->db_entry && dsk->db_entry->attribute_id == 0) { -+ if(dsk->db_entry->attribute_id == 0) { - close(dsk->fd); - dsk->fd = -1; - return GETTEMP_NOSENSOR; - } -+ -+ switch(ata_get_powermode(dsk->fd)) { -+ case PWM_STANDBY: -+ case PWM_SLEEPING: -+ if (!wakeup) -+ return GETTEMP_DRIVE_SLEEP; -+ case PWM_UNKNOWN: -+ case PWM_ACTIVE: /* active or idle */ -+ default: -+ break; -+ } - - /* get SMART values */ - if(sata_enable_smart(dsk->fd) != 0) { -@@ -154,24 +165,15 @@ - } - - /* temperature */ -- if(dsk->db_entry && dsk->db_entry->attribute_id > 0) -- field = sata_search_temperature(values, dsk->db_entry->attribute_id); -- else -- field = sata_search_temperature(values, DEFAULT_ATTRIBUTE_ID); -+ field = sata_search_temperature(values, dsk->db_entry->attribute_id); - - if(field) - dsk->value = *(field+3); - - if(dsk->db_entry && dsk->value != -1) - return GETTEMP_KNOWN; -- else { -- if(dsk->value != -1) { -- return GETTEMP_GUESS; -- } -- else { -- return GETTEMP_UNKNOWN; -- } -- } -+ else -+ return GETTEMP_UNKNOWN; - - /* never reached */ - } ---- hddtemp-0.3-beta15.orig/src/satacmds.c -+++ hddtemp-0.3-beta15/src/satacmds.c -@@ -39,7 +39,7 @@ - #include - #include - #include --#include -+#include - - // Application specific includes - #include "satacmds.h" -@@ -80,8 +80,8 @@ - - ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction); - -- /* Verify SATA magics */ -- if (sense[0] != 0x72 || sense[7] != 0x0e || sense[9] != 0x0e || sense[10] != 0x00) -+ /* Verify SATA magic */ -+ if (sense[0] != 0x72) - return 1; - else - return ret; -@@ -95,10 +95,10 @@ - p = s; - end = &s[bytecount & ~1]; /* bytecount must be even */ - -- /* convert from big-endian to host byte order */ -+ /* convert from big-endian to string order */ - for (p = end ; p != s;) { - unsigned short *pp = (unsigned short *) (p -= 2); -- *pp = ntohs(*pp); -+ *pp = bswap_16(*pp); - } - - /* strip leading blanks */ ---- hddtemp-0.3-beta15.orig/src/backtrace.c -+++ hddtemp-0.3-beta15/src/backtrace.c -@@ -16,9 +16,10 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#define _GNU_SOURCE - #include - --#if defined(__i386__) && defined(__GLIBC__) -+#if (defined(__i386__) || defined(__x86_64__)) && defined(__GLIBC__) - - #include - -@@ -31,8 +32,12 @@ - #include - #include - --#define __USE_GNU - #include -+#if defined(__i386__) -+# define REG_IP REG_EIP -+#elif defined(__x86_64__) -+# define REG_IP REG_RIP -+#endif - - #define MAX_BTSIZE 64 - -@@ -42,7 +47,6 @@ - static char **messages = NULL; - static size_t btsize = 0; - static size_t i; -- static unsigned int old_eip, old_ebp; - static char *strerr = "???"; - static FILE *fstrm; - -@@ -61,10 +65,10 @@ - SIC_CASE(SEGV_MAPERR); - SIC_CASE(SEGV_ACCERR); - } -- fprintf(fstrm, "=== SEGFAULT (%s) : invalid access to %p, in 0x%08x\n", -+ fprintf(fstrm, "=== SEGFAULT (%s) : invalid access to %p, in %p\n", - strerr, - ist->si_addr, -- puc->uc_mcontext.gregs[REG_EIP]); -+ (void*)puc->uc_mcontext.gregs[REG_IP]); - break; - case SIGILL: - switch(ist->si_code) { -@@ -77,10 +81,10 @@ - SIC_CASE(ILL_COPROC); - SIC_CASE(ILL_BADSTK); - } -- fprintf(fstrm, "=== ILLEGAL INSTR (%s) : invalid access to %p, in 0x%08x\n", -+ fprintf(fstrm, "=== ILLEGAL INSTR (%s) : invalid access to %p, in %p\n", - strerr, - ist->si_addr, -- puc->uc_mcontext.gregs[REG_EIP]); -+ (void*)puc->uc_mcontext.gregs[REG_IP]); - break; - case SIGBUS: - switch(ist->si_code) { -@@ -88,10 +92,10 @@ - SIC_CASE(BUS_ADRERR); - SIC_CASE(BUS_OBJERR); - } -- fprintf(fstrm, "=== BUS ERROR (%p) : invalid access to %p, in 0x%08x\n", -+ fprintf(fstrm, "=== BUS ERROR (%p) : invalid access to %p, in %p\n", - strerr, - ist->si_addr, -- puc->uc_mcontext.gregs[REG_EIP]); -+ (void*)puc->uc_mcontext.gregs[REG_IP]); - break; - } - fflush(fstrm); -@@ -101,7 +105,7 @@ - /* - old_eip = *(unsigned int*)((void*)&n-4); - old_ebp = *(unsigned int*)((void*)&n-8); -- *(unsigned int*)((void*)&n-4) = puc->uc_mcontext.gregs[REG_EIP]; -+ *(unsigned int*)((void*)&n-4) = puc->uc_mcontext.gregs[REG_IP]; - *(unsigned int*)((void*)&n-8) = puc->uc_mcontext.gregs[REG_EBP]; - - btsize = backtrace(btinfo, MAX_BTSIZE); -@@ -111,14 +115,14 @@ - */ - - btsize = backtrace(btinfo, MAX_BTSIZE); -- btinfo[1] = (void*) puc->uc_mcontext.gregs[REG_EIP]; -+ btinfo[1] = (void*) puc->uc_mcontext.gregs[REG_IP]; - - messages = backtrace_symbols(btinfo, btsize); - - for(i = 1; - i < btsize; - i++) -- fprintf(fstrm, "[%d] #%d: %s\n", getpid(), i, messages[i]); -+ fprintf(fstrm, "[%d] #%zu: %s\n", getpid(), i, messages[i]); - fflush(fstrm); - fclose(fstrm); - ---- hddtemp-0.3-beta15.orig/src/daemon.c -+++ hddtemp-0.3-beta15/src/daemon.c -@@ -163,19 +163,16 @@ - - switch(dsk->ret) { - case GETTEMP_NOT_APPLICABLE: -- n = snprintf(msg, sizeof(msg), "%s%c%s%c%s%c%c", -+ n = snprintf(msg, sizeof(msg), "%s%c%s%cNA%c*", - dsk->drive, separator, - dsk->model, separator, -- "NA", separator, -- '*'); -+ separator); - break; -- case GETTEMP_GUESS: - case GETTEMP_UNKNOWN: -- n = snprintf(msg, sizeof(msg), "%s%c%s%c%s%c%c", -+ n = snprintf(msg, sizeof(msg), "%s%c%s%cUNK%c*", - dsk->drive, separator, -- dsk->model, separator, -- "UNK", separator, -- '*'); -+ dsk->model, separator, -+ separator); - break; - case GETTEMP_KNOWN: - n = snprintf(msg, sizeof(msg), "%s%c%s%c%d%c%c", -@@ -185,26 +182,23 @@ - get_unit(dsk)); - break; - case GETTEMP_NOSENSOR: -- n = snprintf(msg, sizeof(msg), "%s%c%s%c%s%c%c", -+ n = snprintf(msg, sizeof(msg), "%s%c%s%cNOS%c*", - dsk->drive, separator, - dsk->model, separator, -- "NOS", separator, -- '*'); -+ separator); - break; - case GETTEMP_DRIVE_SLEEP: -- n = snprintf(msg, sizeof(msg), "%s%c%s%c%s%c%c", -+ n = snprintf(msg, sizeof(msg), "%s%c%s%cSLP%c*", - dsk->drive, separator, - dsk->model, separator, -- "SLP", separator, -- '*'); -+ separator); - break; - case GETTEMP_ERROR: - default: -- n = snprintf(msg, sizeof(msg), "%s%c%s%c%s%c%c", -+ n = snprintf(msg, sizeof(msg), "%s%c%s%cERR%c*", - dsk->drive, separator, - (dsk->model) ? dsk->model : "???", separator, -- "ERR", separator, -- '*'); -+ separator); - break; - } - write(cfd,&separator, 1); -@@ -222,14 +216,11 @@ - for(dsk = ldisks; dsk; dsk = dsk->next) { - switch(dsk->ret) { - case GETTEMP_KNOWN: -- case GETTEMP_GUESS: -- value_to_unit(dsk); -- - syslog(LOG_INFO, "%s: %s: %d %c", - dsk->drive, - dsk->model, -- dsk->value, -- dsk->db_entry->unit); -+ value_to_unit(dsk), -+ get_unit(dsk)); - break; - case GETTEMP_DRIVE_SLEEP: - syslog(LOG_WARNING, _("%s: %s: drive is sleeping"), -@@ -270,28 +261,30 @@ - fd_set deffds; - time_t next_time; - -- switch(fork()) { -- case -1: -- perror("fork"); -- exit(2); -- break; -- case 0: -- break; -- default: -- exit(0); -- } -- -- setsid(); -- -- switch(fork()) { -- case -1: -- perror("fork"); -- exit(2); -- break; -- case 0: -- break; -- default: -- exit(0); -+if (!foreground) { -+ switch(fork()) { -+ case -1: -+ perror("fork"); -+ exit(2); -+ break; -+ case 0: -+ break; -+ default: -+ exit(0); -+ } -+ -+ setsid(); -+ -+ switch(fork()) { -+ case -1: -+ perror("fork"); -+ exit(2); -+ break; -+ case 0: -+ break; -+ default: -+ exit(0); -+ } - } - chdir("/"); - umask(0); ---- hddtemp-0.3-beta15.orig/src/hddtemp.c -+++ hddtemp-0.3-beta15/src/hddtemp.c -@@ -75,7 +75,7 @@ - char separator = SEPARATOR; - - struct bustype * bus[BUS_TYPE_MAX]; --int tcp_daemon, debug, quiet, numeric, wakeup, af_hint; -+int tcp_daemon, debug, quiet, numeric, wakeup, foreground, af_hint; - - static enum { DEFAULT, CELSIUS, FAHRENHEIT } unit; - -@@ -194,23 +194,7 @@ - if (numeric && quiet) - printf("0\n"); - else -- printf(_("%s: %s: no sensor\n"), dsk->drive, dsk->model); -- -- break; -- case GETTEMP_GUESS: -- -- if(!quiet) -- fprintf(stderr, -- _("WARNING: Drive %s doesn't appear in the database of supported drives\n" -- "WARNING: But using a common value, it reports something.\n" -- "WARNING: Note that the temperature shown could be wrong.\n" -- "WARNING: See --help, --debug and --drivebase options.\n" -- "WARNING: And don't forget you can add your drive to hddtemp.db\n"), dsk->drive); -- -- if (! numeric) -- printf(_("%s: %s: %d%sC or %sF\n"), dsk->drive, dsk->model, dsk->value, degree, degree); -- else -- printf("%d\n", value_to_unit(dsk)); -+ fprintf(stderr, _("%s: %s: no sensor\n"), dsk->drive, dsk->model); - - break; - case GETTEMP_KNOWN: -@@ -232,14 +216,14 @@ - if (numeric && quiet) - printf("0\n"); - else -- printf(_("%s: %s: drive is sleeping\n"), dsk->drive, dsk->model); -+ fprintf(stderr, _("%s: %s: drive is sleeping\n"), dsk->drive, dsk->model); - - break; - case GETTEMP_NOSENSOR: - if (numeric && quiet) - printf("0\n"); - else -- printf(_("%s: %s: drive supported, but it doesn't have a temperature sensor.\n"), dsk->drive, dsk->model); -+ fprintf(stderr, _("%s: %s: drive supported, but it doesn't have a temperature sensor.\n"), dsk->drive, dsk->model); - - break; - default: -@@ -268,8 +252,9 @@ - - int main(int argc, char* argv[]) { - int i, c, lindex = 0, db_loaded = 0; -+ int ret = 0; - int show_db; -- struct disk * ldisks; -+ struct disk * ldisks; - - backtrace_sigsegv(); - backtrace_sigill(); -@@ -279,7 +264,7 @@ - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - -- show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = 0; -+ show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = foreground = 0; - unit = DEFAULT; - portnum = PORT_NUMBER; - listen_addr = NULL; -@@ -294,6 +279,7 @@ - {"drivebase", 0, NULL, 'b'}, - {"debug", 0, NULL, 'D'}, - {"file", 1, NULL, 'f'}, -+ {"foreground", 0, NULL, 'F'}, - {"listen", 1, NULL, 'l'}, - {"version", 0, NULL, 'v'}, - {"port", 1, NULL, 'p'}, -@@ -305,7 +291,7 @@ - {0, 0, 0, 0} - }; - -- c = getopt_long (argc, argv, "bDdf:l:hp:qs:u:vnw46S:", long_options, &lindex); -+ c = getopt_long (argc, argv, "bDdf:l:hp:qs:u:vnw46FS:", long_options, &lindex); - if (c == -1) - break; - -@@ -382,12 +368,13 @@ - " (done for every drive supplied).\n" - " -d --daemon : run hddtemp in TCP/IP daemon mode (port %d by default.)\n" - " -f --file=FILE : specify database file to use.\n" -+ " -F --foreground : don't daemonize, stay in foreground.\n" - " -l --listen=addr : listen on a specific interface (in TCP/IP daemon mode).\n" - " -n --numeric : print only the temperature.\n" - " -p --port=# : port to listen to (in TCP/IP daemon mode).\n" - " -s --separator=C : separator to use between fields (in TCP/IP daemon mode).\n" - " -S --syslog=s : log temperature to syslog every s seconds.\n" -- " -u --unit=[C|F] : force output temperature either in Celius or Fahrenheit.\n" -+ " -u --unit=[C|F] : force output temperature either in Celsius or Fahrenheit.\n" - " -q --quiet : do not check if the drive is supported.\n" - " -v --version : display hddtemp version number.\n" - " -w --wake-up : wake-up the drive if need.\n" -@@ -418,6 +405,9 @@ - } - } - break; -+ case 'F': -+ foreground = 1; -+ break; - default: - exit(1); - } -@@ -489,6 +479,7 @@ - if( (dsk->fd = open(dsk->drive, O_RDONLY | O_NONBLOCK)) < 0) { - snprintf(dsk->errormsg, MAX_ERRORMSG_SIZE, "open: %s\n", strerror(errno)); - dsk->type = ERROR; -+ ret = 1; - continue; - } - -@@ -501,6 +492,7 @@ - - ldisks = dsk->next; - free(dsk); -+ ret = 1; - continue; - } - -@@ -514,11 +506,17 @@ - db_loaded = 1; - } - -+ dsk->db_entry = (struct harddrive_entry *)malloc(sizeof(struct harddrive_entry)); - dbe = is_a_supported_drive(dsk->model); -- if(dbe) { -- dsk->db_entry = (struct harddrive_entry *)malloc(sizeof(struct harddrive_entry)); -+ if(dbe) - memcpy(dsk->db_entry, dbe, sizeof(struct harddrive_entry)); -- } -+ else { -+ dsk->db_entry->regexp = ""; -+ dsk->db_entry->description = ""; -+ dsk->db_entry->attribute_id = DEFAULT_ATTRIBUTE_ID; -+ dsk->db_entry->unit = 'C'; -+ dsk->db_entry->next = NULL; -+ } - } - } - -@@ -530,5 +528,5 @@ - do_direct_mode(ldisks); - } - -- return 0; -+ return ret; - } ---- hddtemp-0.3-beta15.orig/src/ata.c -+++ hddtemp-0.3-beta15/src/ata.c -@@ -75,7 +75,7 @@ - int i; - u16 * p; - -- if(dsk->db_entry && dsk->db_entry->attribute_id == 0) { -+ if(dsk->db_entry->attribute_id == 0) { - close(dsk->fd); - dsk->fd = -1; - return GETTEMP_NOSENSOR; -@@ -140,24 +140,15 @@ - */ - - /* temperature */ -- if(dsk->db_entry && dsk->db_entry->attribute_id > 0) -- field = ata_search_temperature(values, dsk->db_entry->attribute_id); -- else -- field = ata_search_temperature(values, DEFAULT_ATTRIBUTE_ID); -+ field = ata_search_temperature(values, dsk->db_entry->attribute_id); - - if(field) - dsk->value = *(field+3); - -- if(dsk->db_entry && dsk->value != -1) -+ if(dsk->value != -1) - return GETTEMP_KNOWN; -- else { -- if(dsk->value != -1) { -- return GETTEMP_GUESS; -- } -- else { -- return GETTEMP_UNKNOWN; -- } -- } -+ else -+ return GETTEMP_UNKNOWN; - - /* never reached */ - } ---- hddtemp-0.3-beta15.orig/src/hddtemp.h -+++ hddtemp-0.3-beta15/src/hddtemp.h -@@ -39,8 +39,6 @@ - GETTEMP_ERROR, /* Error */ - GETTEMP_NOT_APPLICABLE, /* */ - GETTEMP_UNKNOWN, /* Drive is not in database */ -- GETTEMP_GUESS, /* Not in database, but something was guessed, user must -- check that the temperature returned is correct */ - GETTEMP_KNOWN, /* Drive appear in database */ - GETTEMP_NOSENSOR, /* Drive appear in database but is known to have no sensor */ - GETTEMP_DRIVE_SLEEP /* Drive is sleeping */ -@@ -78,7 +76,7 @@ - - extern struct bustype * bus[BUS_TYPE_MAX]; - extern char errormsg[MAX_ERRORMSG_SIZE]; --extern int tcp_daemon, debug, quiet, wakeup, af_hint; -+extern int tcp_daemon, debug, quiet, wakeup, af_hint, foreground; - extern char separator; - extern long portnum, syslog_interval; - extern char * listen_addr; ---- hddtemp-0.3-beta15.orig/src/scsicmds.c -+++ hddtemp-0.3-beta15/src/scsicmds.c -@@ -147,6 +147,7 @@ - return 1; - else { - scsi_fixstring(buffer + 8, 24); -+ buffer[32] = 0; - return 0; - } - } diff --git a/packages/debug/hddtemp/unpack b/packages/debug/hddtemp/unpack deleted file mode 100755 index 4349589f74..0000000000 --- a/packages/debug/hddtemp/unpack +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -echo "### Applying upstream patches ###" - -for patch in `ls $PKG_DIR/patches/*.diff`; do - cat $patch | patch -d \ - `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1 -done \ No newline at end of file diff --git a/packages/debug/htop/build b/packages/debug/htop/build deleted file mode 100755 index 047ff25c14..0000000000 --- a/packages/debug/htop/build +++ /dev/null @@ -1,42 +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 - -LDFLAGS="$LDFLAGS -ltinfo" - -cd $PKG_BUILD -ac_cv_func_malloc_0_nonnull=yes \ -ac_cv_func_realloc_0_nonnull=yes \ -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-cgroup \ - --disable-vserver \ - --disable-unicode \ - --disable-native-affinity \ - --disable-hwloc \ - --with-gnu-ld - -make diff --git a/packages/debug/htop/install b/packages/debug/htop/install deleted file mode 100755 index bdada00f1e..0000000000 --- a/packages/debug/htop/install +++ /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 - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/htop $INSTALL/usr/bin diff --git a/packages/debug/htop/meta b/packages/debug/htop/meta deleted file mode 100644 index aae01fba2f..0000000000 --- a/packages/debug/htop/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="htop" -PKG_VERSION="1.0.2" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://htop.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="ncurses" -PKG_BUILD_DEPENDS="toolchain ncurses" -PKG_PRIORITY="optional" -PKG_SECTION="debug/tools" -PKG_SHORTDESC="htop: Htop is an ncurses based interactive process viewer for Linux." -PKG_LONGDESC="Htop is an ncurses based interactive process viewer for Linux." - -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/debug/i2c-tools/build b/packages/debug/i2c-tools/build deleted file mode 100755 index 2469835fca..0000000000 --- a/packages/debug/i2c-tools/build +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD -make PREFIX=/usr \ - CC="$TARGET_CC" \ - AR="$TARGET_AR" \ - CFLAGS="$TARGET_CFLAGS" \ - CPPFLAGS="$TARGET_CPPFLAGS" \ diff --git a/packages/debug/i2c-tools/install b/packages/debug/i2c-tools/install deleted file mode 100755 index 724e139a02..0000000000 --- a/packages/debug/i2c-tools/install +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/bin/ - cp $PKG_BUILD/tools/i2cdetect $INSTALL/usr/bin/ - cp $PKG_BUILD/tools/i2cdump $INSTALL/usr/bin/ - cp $PKG_BUILD/tools/i2cget $INSTALL/usr/bin/ - cp $PKG_BUILD/tools/i2cset $INSTALL/usr/bin/ - cp $PKG_BUILD/stub/i2c-stub-from-dump $INSTALL/usr/bin/ diff --git a/packages/debug/i2c-tools/meta b/packages/debug/i2c-tools/meta deleted file mode 100644 index f0e780b64b..0000000000 --- a/packages/debug/i2c-tools/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="i2c-tools" -PKG_VERSION="3.1.0" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.lm-sensors.org/wiki/I2CTools" -PKG_URL="http://dl.lm-sensors.org/i2c-tools/releases/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="i2c-tools: bus probing tool, eeprom decoding/programming and SMBus python interface" -PKG_LONGDESC="The i2c-tools package contains a heterogeneous set of I2C tools for Linux: a bus probing tool, a chip dumper, register-level SMBus access helpers, EEPROM decoding scripts, EEPROM programming tools, and a python module for SMBus access." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/debug/iftop/build b/packages/debug/iftop/build deleted file mode 100755 index 18c8890abf..0000000000 --- a/packages/debug/iftop/build +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -#strip_lto - -export LIBS="-lpthread -ltinfo" - -cd $PKG_BUILD - -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - -make diff --git a/packages/debug/iftop/install b/packages/debug/iftop/install deleted file mode 100755 index 23ae6b0c38..0000000000 --- a/packages/debug/iftop/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/bin/ - cp $PKG_BUILD/iftop $INSTALL/usr/bin/ diff --git a/packages/debug/iftop/meta b/packages/debug/iftop/meta deleted file mode 100644 index eb58ca6b48..0000000000 --- a/packages/debug/iftop/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="iftop" -PKG_VERSION="1.0pre2" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://htop.sourceforge.net/" -PKG_URL="http://www.ex-parrot.com/pdw/iftop/download/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="ncurses" -PKG_BUILD_DEPENDS="toolchain ncurses libpcap" -PKG_PRIORITY="optional" -PKG_SECTION="debug/tools" -PKG_SHORTDESC="iftop: display bandwidth usage on an interface" -PKG_LONGDESC="iftop does for network usage what top(1) does for CPU usage. It listens to network traffic on a named interface and displays a table of current bandwidth usage by pairs of hosts. Handy for answering the question 'why is our ADSL link so slow?'." - -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/debug/iftop/patches/iftop-automake-1.13.patch b/packages/debug/iftop/patches/iftop-automake-1.13.patch deleted file mode 100644 index 9997f7998b..0000000000 --- a/packages/debug/iftop/patches/iftop-automake-1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur iftop-1.0pre2/configure.in iftop-1.0pre2.patch/configure.in ---- iftop-1.0pre2/configure.in 2011-10-03 23:55:33.000000000 +0200 -+++ iftop-1.0pre2.patch/configure.in 2013-03-05 11:17:10.423257608 +0100 -@@ -28,7 +28,7 @@ - - AC_CANONICAL_SYSTEM - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE(iftop, "1.0pre2") - - AC_DEFINE_UNQUOTED(IFTOP_VERSION, "$VERSION", [The iftop version number]) diff --git a/packages/debug/meta b/packages/debug/meta index 89e78eaf05..e9078465a3 100644 --- a/packages/debug/meta +++ b/packages/debug/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS="acpica cpuid dmidecode dstat evtest gdb hddtemp htop i2c-tools iftop pmtools powertop smem strace wireless_tools tcpdump" +PKG_DEPENDS="gdb strace" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" PKG_SECTION="debug" diff --git a/packages/debug/pmtools/build b/packages/debug/pmtools/build deleted file mode 100755 index 779f013d2f..0000000000 --- a/packages/debug/pmtools/build +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD -make CC="$TARGET_CC" \ - CFLAGS="$TARGET_CFLAGS -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I../include" \ - -C acpidump acpidump - -make CC="$TARGET_CC" \ - CFLAGS="$TARGET_CFLAGS -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I../include" \ - -C acpixtract acpixtract - -make CC="$TARGET_CC" \ - CFLAGS="$TARGET_CFLAGS -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I../include" \ - -C madt madt - diff --git a/packages/debug/pmtools/install b/packages/debug/pmtools/install deleted file mode 100755 index 382020d6e3..0000000000 --- a/packages/debug/pmtools/install +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/bin/ - cp $PKG_BUILD/acpidump/acpidump $INSTALL/usr/bin/ - cp $PKG_BUILD/acpixtract/acpixtract $INSTALL/usr/bin/ - cp $PKG_BUILD/madt/madt $INSTALL/usr/bin/ diff --git a/packages/debug/pmtools/meta b/packages/debug/pmtools/meta deleted file mode 100644 index 7b3c771c90..0000000000 --- a/packages/debug/pmtools/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="pmtools" -PKG_VERSION="20110323" -PKG_REV="1" -PKG_ARCH="i386 x86_64" -PKG_LICENSE="GPL" -PKG_SITE="https://lesswatts.org/projects/acpi/utilities.php" -PKG_URL="http://mirror.linux.org.au/linux/kernel/people/lenb/acpi/utils/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="pmtools: ACPI debugging utilities" -PKG_LONGDESC="The pmtools package contains tools to debug ACPI DSDT tables" -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/debug/pmtools/patches/pmtools-madt.patch b/packages/debug/pmtools/patches/pmtools-madt.patch deleted file mode 100644 index 4dd3dfadc8..0000000000 --- a/packages/debug/pmtools/patches/pmtools-madt.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur pmtools/madt/Makefile pmtools.patch/madt/Makefile ---- pmtools/madt/Makefile 2005-11-11 18:07:04.000000000 +0100 -+++ pmtools.patch/madt/Makefile 2007-11-16 19:48:56.000000000 +0100 -@@ -1,6 +1,16 @@ -+PROG= madt -+SRCS= madt.c -+ -+all: madt -+$(PROG) : $(SRCS) -+ $(CC) $(CFLAGS) $(SRCS) -o $(PROG) -+ - test: madt -- ./madt < APIC --madt: madt.c acpi.h tables.c -- cc -o madt madt.c --clean: -- rm madt -+ ./madt < example.APIC.dat -+ ./madt < example.APIC.bad.dat -+ -+CLEANFILES= $(PROG) -+ -+clean : -+ rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS)) *~ -+ diff --git a/packages/debug/powertop/build b/packages/debug/powertop/build deleted file mode 100755 index 34a10c8a5c..0000000000 --- a/packages/debug/powertop/build +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -export CXXFLAGS="$CXXFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses" -export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses" -export LIBS="-ltinfo" -export LDFLAGS="$LDFLAGS -ltinfo" - -cd $PKG_BUILD - -ac_cv_func_malloc_0_nonnull=yes \ -ac_cv_func_realloc_0_nonnull=yes \ -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --bindir=/usr/bin \ - -make V=1 CC="$HOST_CC" \ - CFLAGS="$HOST_CFLAGS" \ - LDFLAGS="$HOST_LDFLAGS" \ - LIBS="" \ - AM_LDFLAGS="" \ - -C src csstoh - -make V=1 diff --git a/packages/debug/powertop/install b/packages/debug/powertop/install deleted file mode 100755 index c62c9c95a2..0000000000 --- a/packages/debug/powertop/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/bin/ - cp $PKG_BUILD/src/powertop $INSTALL/usr/bin/ diff --git a/packages/debug/powertop/meta b/packages/debug/powertop/meta deleted file mode 100644 index 7b5f8444ef..0000000000 --- a/packages/debug/powertop/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="powertop" -PKG_VERSION="2.2" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="https://01.org/powertop/" -PKG_URL="https://01.org/powertop/sites/default/files/downloads/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="ncurses pciutils" -PKG_BUILD_DEPENDS="toolchain ncurses pciutils libnl" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="powertop: tool to diagnose issues with power consumption and power management" -PKG_LONGDESC="PowerTOP is a Linux tool to diagnose issues with power consumption and power management. In addition to being a diagnostic tool, PowerTOP also has an interactive mode where the user can experiment various power management settings for cases where the Linux distribution has not enabled these settings." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/debug/smem/install b/packages/debug/smem/install deleted file mode 100755 index a647fc3aaa..0000000000 --- a/packages/debug/smem/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/bin/ - cp $PKG_BUILD/smem $INSTALL/usr/bin/ diff --git a/packages/debug/smem/meta b/packages/debug/smem/meta deleted file mode 100644 index 70c1f9ddd4..0000000000 --- a/packages/debug/smem/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="smem" -PKG_VERSION="1.3" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.selenic.com/smem/" -PKG_URL="http://www.selenic.com/smem/download/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python" -PKG_BUILD_DEPENDS="toolchain Python" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="smem: memory reporting tool" -PKG_LONGDESC="smem is a tool that can give numerous reports on memory usage on Linux systems. Unlike existing tools, smem can report proportional set size (PSS), which is a more meaningful representation of the amount of memory used by libraries and applications in a virtual memory system." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/debug/wireless_tools/build b/packages/debug/wireless_tools/build deleted file mode 100755 index fb56a3af74..0000000000 --- a/packages/debug/wireless_tools/build +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -# wireless_tools fails to build on some systems with LTO enabled - strip_lto - -cd $PKG_BUILD - -make PREFIX=/usr CC="$CC" AR="$AR" \ - CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" iwmulticall diff --git a/packages/debug/wireless_tools/install b/packages/debug/wireless_tools/install deleted file mode 100755 index 3fe217399a..0000000000 --- a/packages/debug/wireless_tools/install +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/bin/ - cp $PKG_BUILD/iwmulticall $INSTALL/usr/bin/iwconfig - ln -sf iwconfig $INSTALL/usr/bin/iwgetid - ln -sf iwconfig $INSTALL/usr/bin/iwlist - ln -sf iwconfig $INSTALL/usr/bin/iwspy - ln -sf iwconfig $INSTALL/usr/bin/iwpriv diff --git a/packages/debug/wireless_tools/meta b/packages/debug/wireless_tools/meta deleted file mode 100644 index 40ce84acb7..0000000000 --- a/packages/debug/wireless_tools/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="wireless_tools" -PKG_VERSION="29" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" -PKG_URL="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$PKG_NAME.$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="wireless-tools: tools allowing to manipulate the Wireless Extensions" -PKG_LONGDESC="The Wireless Tools (WT) is a set of tools allowing to manipulate the Wireless Extensions. They use a textual interface and are rather crude, but aim to support the full Wireless Extension. There are many other tools you can use with Wireless Extensions, however Wireless Tools is the reference implementation." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/devel/libevent/build b/packages/devel/libevent/build deleted file mode 100755 index 277e5cd879..0000000000 --- a/packages/devel/libevent/build +++ /dev/null @@ -1,38 +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 $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --disable-shared \ - --enable-static \ - --enable-openssl - -make - -$MAKEINSTALL diff --git a/packages/devel/libevent/meta b/packages/devel/libevent/meta deleted file mode 100644 index cc469168b3..0000000000 --- a/packages/devel/libevent/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="libevent" -PKG_VERSION="2.0.21-stable" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="BSD" -PKG_SITE="http://libevent.org/" -PKG_URL="https://github.com/downloads/libevent/libevent/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="openssl zlib" -PKG_BUILD_DEPENDS="toolchain openssl zlib" -PKG_PRIORITY="optional" -PKG_SECTION="devel" -PKG_SHORTDESC="libevent: A library for asynchronous event notification" -PKG_LONGDESC="The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. It is meant to replace the asynchronous event loop found in event-driven network servers." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/devel/libevent/patches/libevent-2.0.21-stable-automake-1.13.patch b/packages/devel/libevent/patches/libevent-2.0.21-stable-automake-1.13.patch deleted file mode 100644 index 20be348621..0000000000 --- a/packages/devel/libevent/patches/libevent-2.0.21-stable-automake-1.13.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/configure.in b/configure.in -index 18165f3..97007b5 100644 ---- a/configure.in -+++ b/configure.in -@@ -7,12 +7,13 @@ dnl - dnl Original version Dug Song - - AC_PREREQ(2.59c) --AC_INIT(event.c) -+AC_INIT([libevent], [2.0.21-stable]) -+AC_CONFIG_SRCDIR([event.c]) - - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE(libevent,2.0.21-stable) --AM_CONFIG_HEADER(config.h) -+AM_INIT_AUTOMAKE -+AC_CONFIG_HEADERS(config.h) - AC_DEFINE(NUMERIC_VERSION, 0x02001500, [Numeric representation of the version]) - - dnl Initialize prefix. -diff --git a/test/Makefile.am b/test/Makefile.am -index b10c41a..53e00e4 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -19,8 +19,6 @@ endif - EXTRA_PROGRAMS = regress - noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h - --TESTS = $(top_srcdir)/test/test.sh -- - BUILT_SOURCES = - if BUILD_REGRESS - BUILT_SOURCES += regress.gen.c regress.gen.h -diff --git a/test/Makefile.in b/test/Makefile.in -index 451bd3c..939ad57 100644 ---- a/test/Makefile.in -+++ b/test/Makefile.in -@@ -315,7 +315,6 @@ AUTOMAKE_OPTIONS = foreign - AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include -DTINYTEST_LOCAL - EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c rpcgen_wrapper.sh test.sh - noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h --TESTS = $(top_srcdir)/test/test.sh - BUILT_SOURCES = $(am__append_2) - test_init_SOURCES = test-init.c - test_init_LDADD = ../libevent_core.la diff --git a/packages/graphics/cairo/build b/packages/graphics/cairo/build deleted file mode 100755 index b2372c6f86..0000000000 --- a/packages/graphics/cairo/build +++ /dev/null @@ -1,88 +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 $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --x-includes="$SYSROOT_PREFIX/usr/include" \ - --x-libraries="$SYSROOT_PREFIX/usr/lib" \ - --disable-silent-rules \ - --enable-shared \ - --disable-static \ - --disable-gtk-doc \ - --enable-largefile \ - --enable-atomic \ - --disable-gcov \ - --disable-valgrind \ - --enable-xlib \ - --enable-xlib-xrender \ - --disable-xcb \ - --disable-xlib-xcb \ - --disable-xcb-shm \ - --disable-qt \ - --disable-quartz \ - --disable-quartz-font \ - --disable-quartz-image \ - --disable-win32 \ - --disable-win32-font \ - --disable-skia \ - --disable-os2 \ - --disable-beos \ - --disable-glesv2 \ - --disable-cogl \ - --disable-drm \ - --disable-drm-xr \ - --disable-gallium \ - --disable-xcb-drm \ - --enable-png \ - --enable-gl \ - --disable-directfb \ - --disable-vg \ - --disable-egl \ - --enable-glx \ - --disable-wgl \ - --disable-script \ - --enable-ft \ - --enable-fc \ - --enable-ps \ - --enable-pdf \ - --enable-svg \ - --disable-test-surfaces \ - --disable-tee \ - --disable-xml \ - --enable-pthread \ - --disable-gobject \ - --disable-full-testing \ - --disable-trace \ - --enable-interpreter \ - --disable-symbol-lookup \ - --enable-some-floating-point \ - --with-gnu-ld \ - --with-x - -make -$MAKEINSTALL diff --git a/packages/graphics/cairo/install b/packages/graphics/cairo/install deleted file mode 100755 index 032e093c58..0000000000 --- a/packages/graphics/cairo/install +++ /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 - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/src/.libs/libcairo.so* $INSTALL/usr/lib diff --git a/packages/graphics/cairo/meta b/packages/graphics/cairo/meta deleted file mode 100644 index a6315e65fd..0000000000 --- a/packages/graphics/cairo/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="cairo" -PKG_VERSION="1.12.8" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="LGPL" -PKG_SITE="http://cairographics.org/" -PKG_URL="http://cairographics.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="zlib freetype fontconfig pixman libXrender libX11 Mesa glu" -PKG_BUILD_DEPENDS="toolchain zlib freetype fontconfig libpng pixman libXrender libX11 Mesa glu" -PKG_PRIORITY="optional" -PKG_SECTION="graphics" -PKG_SHORTDESC="cairo: Multi-platform 2D graphics library" -PKG_LONGDESC="Cairo is a vector graphics library with cross-device output support. Currently supported output targets include the X Window System and in-memory image buffers. PostScript and PDF file output is planned. Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" # ToDo diff --git a/packages/lang/php/build b/packages/lang/php/build deleted file mode 100755 index 280a09dbe8..0000000000 --- a/packages/lang/php/build +++ /dev/null @@ -1,74 +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 $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --disable-static \ - --enable-shared \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --disable-all \ - --without-pear \ - --with-config-file-path=/etc \ - --localstatedir=/var \ - --disable-cli \ - --enable-cgi \ - --enable-fastcgi \ - --disable-sockets \ - --disable-posix \ - --disable-spl \ - --disable-session \ - --without-openssl \ - --disable-libxml \ - --disable-xml \ - --disable-xmlreader \ - --disable-xmlwriter \ - --disable-simplexml \ - --with-zlib=$SYSROOT_PREFIX/usr \ - --disable-exif \ - --disable-ftp \ - --without-gettext \ - --without-gmp \ - --disable-json \ - --without-readline \ - --without-ncurses \ - --disable-pcntl \ - --disable-sysvmsg \ - --disable-sysvsem \ - --disable-sysvshm \ - --disable-zip \ - --disable-filter \ - --disable-calendar \ - --with-curl=$SYSROOT_PREFIX/usr \ - --with-pcre-regex \ - --without-sqlite \ - --with-sqlite3=$SYSROOT_PREFIX/usr \ - --enable-sqlite-utf8 \ - --disable-pdo \ - --without-pdo-sqlite \ - --without-pdo-mysql \ - -make diff --git a/packages/lang/php/install b/packages/lang/php/install deleted file mode 100755 index 4c29a98cae..0000000000 --- a/packages/lang/php/install +++ /dev/null @@ -1,37 +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 - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/sapi/cgi/php-cgi $INSTALL/usr/bin - -mkdir -p $INSTALL/etc - cp $PKG_BUILD/php.ini-production $INSTALL/etc/php.ini - sed -e "s|^doc_root[[:space:]]*=.*$|doc_root = /usr/www|" \ - -e "s|^.cgi.force_redirect[[:space:]]*=.*$|cgi.force_redirect = 0|" \ - -i $INSTALL/etc/php.ini - -mkdir -p $INSTALL/usr/www - echo " $INSTALL/usr/www/test.php - echo "phpinfo();" >> $INSTALL/usr/www/test.php - echo "?>" >> $INSTALL/usr/www/test.php diff --git a/packages/lang/php/meta b/packages/lang/php/meta deleted file mode 100644 index b6d317fad5..0000000000 --- a/packages/lang/php/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="php" -PKG_VERSION="5.4.10" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OpenSource" -PKG_SITE="http://www.php.net" -PKG_URL="http://www.php.net/distributions/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="zlib curl" -PKG_BUILD_DEPENDS="toolchain zlib pcre sqlite curl" -PKG_PRIORITY="optional" -PKG_SECTION="web" -PKG_SHORTDESC="php: Scripting language especially suited for Web development" -PKG_LONGDESC="PHP is a widely-used general-purpose scripting language that is especially suited for Web development and can be embedded into HTML." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/linux-drivers/tbs-linux-drivers/patches.upstream/tbs-linux-drivers-01-kernel-3.10.patch b/packages/linux-drivers/tbs-linux-drivers/patches.upstream/tbs-linux-drivers-01-kernel-3.10.patch new file mode 100644 index 0000000000..21596b4c35 --- /dev/null +++ b/packages/linux-drivers/tbs-linux-drivers/patches.upstream/tbs-linux-drivers-01-kernel-3.10.patch @@ -0,0 +1,312 @@ +diff -urN tbs/linux-tbs-drivers.org/linux/drivers/media/common/saa716x/saa716x_i2c.c tbs/linux-tbs-drivers/linux/drivers/media/common/saa716x/saa716x_i2c.c +--- tbs/linux-tbs-drivers.org/linux/drivers/media/common/saa716x/saa716x_i2c.c 2013-03-18 20:40:05.000000000 +0100 ++++ tbs/linux-tbs-drivers/linux/drivers/media/common/saa716x/saa716x_i2c.c 2013-07-09 15:36:44.271340994 +0200 +@@ -569,7 +569,7 @@ + saa716x_i2c_hwdeinit(i2c, SAA716x_I2C_BUS(i)); + dprintk(SAA716x_DEBUG, 1, "Removing adapter (%d) %s", i, adapter->name); + +- err = i2c_del_adapter(adapter); ++ //err = i2c_del_adapter(adapter); + if (err < 0) { + dprintk(SAA716x_ERROR, 1, "Adapter (%d) %s remove failed", i, adapter->name); + goto exit; +diff -urN tbs/linux-tbs-drivers.org/linux/drivers/media/dvb/mantis/mantis_i2c.c tbs/linux-tbs-drivers/linux/drivers/media/dvb/mantis/mantis_i2c.c +--- tbs/linux-tbs-drivers.org/linux/drivers/media/dvb/mantis/mantis_i2c.c 2013-03-18 20:40:05.000000000 +0100 ++++ tbs/linux-tbs-drivers/linux/drivers/media/dvb/mantis/mantis_i2c.c 2013-07-09 15:35:32.375339760 +0200 +@@ -217,11 +217,7 @@ + .functionality = mantis_i2c_func, + }; + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) +-int __devinit mantis_i2c_init(struct mantis_pci *mantis) +-#else + int mantis_i2c_init(struct mantis_pci *mantis) +-#endif + { + u32 intstat, intmask; + struct i2c_adapter *i2c_adapter = &mantis->adapter; +@@ -265,6 +261,8 @@ + mmwrite((intmask & ~MANTIS_INT_I2CDONE), MANTIS_INT_MASK); + + dprintk(MANTIS_DEBUG, 1, "Removing I2C adapter"); +- return i2c_del_adapter(&mantis->adapter); ++ i2c_del_adapter(&mantis->adapter); ++ ++ return 0; + } + EXPORT_SYMBOL_GPL(mantis_i2c_exit); +diff -urN tbs/linux-tbs-drivers.org/linux/drivers/media/dvb/ttpci/av7110_ir.c tbs/linux-tbs-drivers/linux/drivers/media/dvb/ttpci/av7110_ir.c +--- tbs/linux-tbs-drivers.org/linux/drivers/media/dvb/ttpci/av7110_ir.c 2013-03-18 20:40:05.000000000 +0100 ++++ tbs/linux-tbs-drivers/linux/drivers/media/dvb/ttpci/av7110_ir.c 2013-07-09 15:34:31.631338719 +0200 +@@ -324,11 +324,7 @@ + } + + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) +-int __devinit av7110_ir_init(struct av7110 *av7110) +-#else + int av7110_ir_init(struct av7110 *av7110) +-#endif + { + struct input_dev *input_dev; + static struct proc_dir_entry *e; +@@ -379,7 +375,7 @@ + if (av_cnt == 1) { + e = proc_create("av7110_ir", S_IWUSR, NULL, &av7110_ir_proc_fops); + if (e) +- e->size = 4 + 256 * sizeof(u16); ++ proc_set_size(e, 4 + 256 * sizeof(u16)); + } + + tasklet_init(&av7110->ir.ir_tasklet, av7110_emit_key, (unsigned long) &av7110->ir); +@@ -389,11 +385,7 @@ + } + + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) +-void __devexit av7110_ir_exit(struct av7110 *av7110) +-#else + void av7110_ir_exit(struct av7110 *av7110) +-#endif + { + int i; + +diff -urN tbs/linux-tbs-drivers.org/linux/drivers/media/video/bt8xx/bttv-input.c tbs/linux-tbs-drivers/linux/drivers/media/video/bt8xx/bttv-input.c +--- tbs/linux-tbs-drivers.org/linux/drivers/media/video/bt8xx/bttv-input.c 2013-03-18 20:40:05.000000000 +0100 ++++ tbs/linux-tbs-drivers/linux/drivers/media/video/bt8xx/bttv-input.c 2013-07-09 15:33:30.527337668 +0200 +@@ -18,6 +18,8 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt ++ + #include + #include + #include +@@ -36,9 +38,10 @@ + module_param(ir_rc5_remote_gap, int, 0644); + + #undef dprintk +-#define dprintk(arg...) do { \ +- if (ir_debug >= 1) \ +- printk(arg); \ ++#define dprintk(fmt, ...) \ ++do { \ ++ if (ir_debug >= 1) \ ++ pr_info(fmt, ##__VA_ARGS__); \ + } while (0) + + #define DEVNAME "bttv-input" +@@ -62,7 +65,7 @@ + + /* extract data */ + data = ir_extract_bits(gpio, ir->mask_keycode); +- dprintk(KERN_INFO DEVNAME ": irq gpio=0x%x code=%d | %s%s%s\n", ++ dprintk("irq gpio=0x%x code=%d | %s%s%s\n", + gpio, data, + ir->polling ? "poll" : "irq", + (gpio & ir->mask_keydown) ? " down" : "", +@@ -96,7 +99,7 @@ + keyup = (gpio & ir->mask_keyup) ? 1 << 31 : 0; + + if ((ir->last_gpio & 0x7f) != data) { +- dprintk(KERN_INFO DEVNAME ": gpio=0x%x code=%d | %s\n", ++ dprintk("gpio=0x%x code=%d | %s\n", + gpio, data, + (gpio & ir->mask_keyup) ? " up" : "up/down"); + +@@ -107,7 +110,7 @@ + if ((ir->last_gpio & 1 << 31) == keyup) + return; + +- dprintk(KERN_INFO DEVNAME ":(cnt) gpio=0x%x code=%d | %s\n", ++ dprintk("(cnt) gpio=0x%x code=%d | %s\n", + gpio, data, + (gpio & ir->mask_keyup) ? " up" : "down"); + +@@ -177,13 +180,12 @@ + rc5 |= 1; + break; + case 3: +- dprintk(KERN_INFO DEVNAME ":rc5_decode(%x) bad code\n", ++ dprintk("rc5_decode(%x) bad code\n", + org_code); + return 0; + } + } +- dprintk(KERN_INFO DEVNAME ":" +- "code=%x, rc5=%x, start=%x, toggle=%x, address=%x, " ++ dprintk("code=%x, rc5=%x, start=%x, toggle=%x, address=%x, " + "instr=%x\n", rc5, org_code, RC5_START(rc5), + RC5_TOGGLE(rc5), RC5_ADDR(rc5), RC5_INSTR(rc5)); + return rc5; +@@ -212,20 +214,20 @@ + + /* Allow some timer jitter (RC5 is ~24ms anyway so this is ok) */ + if (gap < 28000) { +- dprintk(KERN_INFO DEVNAME ": spurious timer_end\n"); ++ dprintk("spurious timer_end\n"); + return; + } + + if (ir->last_bit < 20) { + /* ignore spurious codes (caused by light/other remotes) */ +- dprintk(KERN_INFO DEVNAME ": short code: %x\n", ir->code); ++ dprintk("short code: %x\n", ir->code); + } else { + ir->code = (ir->code << ir->shift_by) | 1; + rc5 = bttv_rc5_decode(ir->code); + + /* two start bits? */ + if (RC5_START(rc5) != ir->start) { +- printk(KERN_INFO DEVNAME ":" ++ pr_info(DEVNAME ":" + " rc5 start bits invalid: %u\n", RC5_START(rc5)); + + /* right address? */ +@@ -235,8 +237,7 @@ + + /* Good code */ + rc_keydown(ir->dev, instr, toggle); +- dprintk(KERN_INFO DEVNAME ":" +- " instruction %x, toggle %x\n", ++ dprintk("instruction %x, toggle %x\n", + instr, toggle); + } + } +@@ -265,7 +266,7 @@ + tv.tv_usec - ir->base_time.tv_usec; + } + +- dprintk(KERN_INFO DEVNAME ": RC5 IRQ: gap %d us for %s\n", ++ dprintk("RC5 IRQ: gap %d us for %s\n", + gap, (gpio & 0x20) ? "mark" : "space"); + + /* remote IRQ? */ +@@ -340,14 +341,14 @@ + + /* poll IR chip */ + if (1 != i2c_master_recv(ir->c, &b, 1)) { +- dprintk(KERN_INFO DEVNAME ": read error\n"); ++ dprintk("read error\n"); + return -EIO; + } + + /* ignore 0xaa */ + if (b==0xaa) + return 0; +- dprintk(KERN_INFO DEVNAME ": key %02x\n", b); ++ dprintk("key %02x\n", b); + + /* + * NOTE: +@@ -367,17 +368,14 @@ + } + + /* Instantiate the I2C IR receiver device, if present */ +-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) +-void __devinit init_bttv_i2c_ir(struct bttv *btv) +-#else + void init_bttv_i2c_ir(struct bttv *btv) +-#endif + { + const unsigned short addr_list[] = { + 0x1a, 0x18, 0x64, 0x30, 0x71, + I2C_CLIENT_END + }; + struct i2c_board_info info; ++ struct i2c_client *i2c_dev; + + if (0 != btv->i2c_rc) + return; +@@ -393,7 +391,12 @@ + btv->init_data.ir_codes = RC_MAP_PV951; + info.addr = 0x4b; + break; +- default: ++ } ++ ++ if (btv->init_data.name) { ++ info.platform_data = &btv->init_data; ++ i2c_dev = i2c_new_device(&btv->c.i2c_adap, &info); ++ } else { + /* + * The external IR receiver is at i2c address 0x34 (0x35 for + * reads). Future Hauppauge cards will have an internal +@@ -402,33 +405,14 @@ + * internal. + * That's why we probe 0x1a (~0x34) first. CB + */ +- +-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35) +- i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list); +-#else +- i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list, NULL); +-#endif +- +- return; ++ i2c_dev = i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list, NULL); + } ++ if (NULL == i2c_dev) ++ return; + +- if (btv->init_data.name) +- info.platform_data = &btv->init_data; +- i2c_new_device(&btv->c.i2c_adap, &info); +- +- return; +-} +- +-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) +-int __devexit fini_bttv_i2c(struct bttv *btv) +-#else +-int fini_bttv_i2c(struct bttv *btv) ++#if defined(CONFIG_MODULES) && defined(MODULE) ++ request_module("ir-kbd-i2c"); + #endif +-{ +- if (0 != btv->i2c_rc) +- return 0; +- +- return i2c_del_adapter(&btv->c.i2c_adap); + } + + int bttv_input_init(struct bttv *btv) +@@ -530,7 +514,7 @@ + break; + } + if (NULL == ir_codes) { +- dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type); ++ dprintk("Ooops: IR config error [card=%d]\n", btv->c.type); + err = -ENODEV; + goto err_out_free; + } +diff -urN tbs/linux-tbs-drivers.org/linux/drivers/media/video/zoran/zoran_procfs.c tbs/linux-tbs-drivers/linux/drivers/media/video/zoran/zoran_procfs.c +--- tbs/linux-tbs-drivers.org/linux/drivers/media/video/zoran/zoran_procfs.c 2010-07-03 23:22:08.000000000 +0200 ++++ tbs/linux-tbs-drivers/linux/drivers/media/video/zoran/zoran_procfs.c 2013-07-09 15:37:31.083341796 +0200 +@@ -130,14 +130,14 @@ + + static int zoran_open(struct inode *inode, struct file *file) + { +- struct zoran *data = PDE(inode)->data; ++ struct zoran *data = PDE_DATA(inode); + return single_open(file, zoran_show, data); + } + + static ssize_t zoran_write(struct file *file, const char __user *buffer, + size_t count, loff_t *ppos) + { +- struct zoran *zr = PDE(file->f_path.dentry->d_inode)->data; ++ struct zoran *zr = PDE_DATA(file_inode(file)); + char *string, *sp; + char *line, *ldelim, *varname, *svar, *tdelim; + +@@ -201,7 +201,7 @@ + dprintk(2, + KERN_INFO + "%s: procfs entry /proc/%s allocated. data=%p\n", +- ZR_DEVNAME(zr), name, zr->zoran_proc->data); ++ ZR_DEVNAME(zr), name, zr); + } else { + dprintk(1, KERN_ERR "%s: Unable to initialise /proc/%s\n", + ZR_DEVNAME(zr), name); diff --git a/packages/linux-drivers/tbs-linux-drivers/unpack b/packages/linux-drivers/tbs-linux-drivers/unpack index e91a5bc4c5..f71a6e1868 100755 --- a/packages/linux-drivers/tbs-linux-drivers/unpack +++ b/packages/linux-drivers/tbs-linux-drivers/unpack @@ -33,3 +33,8 @@ tar xjf $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers.tar.bz2 -C $BUILD/${ # fix permissions chmod -R u+rwX $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/* +for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do + cat $patch | patch -d \ + `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1 +done + diff --git a/packages/linux/meta b/packages/linux/meta index 50a8a17bb2..ccd2c667f9 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -34,7 +34,7 @@ case "$LINUX" in PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" ;; *) - PKG_VERSION="3.10" + PKG_VERSION="3.10.1" PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" ;; esac diff --git a/packages/linux/patches/3.10/linux-003-no_dev_console.patch b/packages/linux/patches/3.10.1/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/3.10/linux-003-no_dev_console.patch rename to packages/linux/patches/3.10.1/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/3.10/linux-010-perf_crosscompiling.patch b/packages/linux/patches/3.10.1/linux-010-perf_crosscompiling.patch similarity index 100% rename from packages/linux/patches/3.10/linux-010-perf_crosscompiling.patch rename to packages/linux/patches/3.10.1/linux-010-perf_crosscompiling.patch diff --git a/packages/linux/patches/3.10/linux-052-XBOX_remote_support.patch b/packages/linux/patches/3.10.1/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/3.10/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/3.10.1/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/3.10/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/3.10.1/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/3.10/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/3.10.1/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/3.10/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/3.10.1/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/3.10/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/3.10.1/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/3.10/linux-055-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.10.1/linux-055-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.10/linux-055-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.10.1/linux-055-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.10/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.10.1/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.10/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.10.1/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.10/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/3.10.1/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/3.10/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/3.10.1/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/3.10/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/3.10.1/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.10/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/3.10.1/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.10/linux-058.01-HID-Sony-upstream_patches.patch b/packages/linux/patches/3.10.1/linux-058.01-HID-Sony-upstream_patches.patch similarity index 100% rename from packages/linux/patches/3.10/linux-058.01-HID-Sony-upstream_patches.patch rename to packages/linux/patches/3.10.1/linux-058.01-HID-Sony-upstream_patches.patch diff --git a/packages/linux/patches/3.10/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/3.10.1/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch similarity index 100% rename from packages/linux/patches/3.10/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch rename to packages/linux/patches/3.10.1/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch diff --git a/packages/linux/patches/3.10/linux-059-remove_some_xpad_pids-0.2.patch b/packages/linux/patches/3.10.1/linux-059-remove_some_xpad_pids-0.2.patch similarity index 100% rename from packages/linux/patches/3.10/linux-059-remove_some_xpad_pids-0.2.patch rename to packages/linux/patches/3.10.1/linux-059-remove_some_xpad_pids-0.2.patch diff --git a/packages/linux/patches/3.10/linux-060-add_AUGUST_DVB-T205.patch b/packages/linux/patches/3.10.1/linux-060-add_AUGUST_DVB-T205.patch similarity index 100% rename from packages/linux/patches/3.10/linux-060-add_AUGUST_DVB-T205.patch rename to packages/linux/patches/3.10.1/linux-060-add_AUGUST_DVB-T205.patch diff --git a/packages/linux/patches/3.10/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.10.1/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/3.10/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/3.10.1/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/3.10/linux-210-dvbsky.patch b/packages/linux/patches/3.10.1/linux-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/3.10/linux-210-dvbsky.patch rename to packages/linux/patches/3.10.1/linux-210-dvbsky.patch diff --git a/packages/linux/patches/3.10/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.10.1/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/3.10/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/3.10.1/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/3.10/linux-221-ngene-octopus.patch b/packages/linux/patches/3.10.1/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/3.10/linux-221-ngene-octopus.patch rename to packages/linux/patches/3.10.1/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/3.10/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.10.1/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/3.10/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/3.10.1/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/3.10/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/3.10.1/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/3.10/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/3.10.1/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/3.10/linux-700-jmicron_1_0_8_5.patch b/packages/linux/patches/3.10.1/linux-700-jmicron_1_0_8_5.patch similarity index 100% rename from packages/linux/patches/3.10/linux-700-jmicron_1_0_8_5.patch rename to packages/linux/patches/3.10.1/linux-700-jmicron_1_0_8_5.patch diff --git a/packages/linux/patches/3.10/linux-900-hide_tsc_error.patch b/packages/linux/patches/3.10.1/linux-900-hide_tsc_error.patch similarity index 100% rename from packages/linux/patches/3.10/linux-900-hide_tsc_error.patch rename to packages/linux/patches/3.10.1/linux-900-hide_tsc_error.patch diff --git a/packages/linux/patches/3.10/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.10.1/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/3.10/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/3.10.1/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/3.10/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/3.10.1/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/3.10/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/3.10.1/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/3.10/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/3.10.1/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/3.10/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/3.10.1/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/3.10/linux-996-macmini2012-ethernet.patch b/packages/linux/patches/3.10.1/linux-996-macmini2012-ethernet.patch similarity index 100% rename from packages/linux/patches/3.10/linux-996-macmini2012-ethernet.patch rename to packages/linux/patches/3.10.1/linux-996-macmini2012-ethernet.patch diff --git a/packages/linux/patches/3.10/linux-997-disable-rc6-on-sandybridge-gt1.patch b/packages/linux/patches/3.10.1/linux-997-disable-rc6-on-sandybridge-gt1.patch similarity index 100% rename from packages/linux/patches/3.10/linux-997-disable-rc6-on-sandybridge-gt1.patch rename to packages/linux/patches/3.10.1/linux-997-disable-rc6-on-sandybridge-gt1.patch diff --git a/packages/linux/patches/3.10.1/linux-999.01-Support-for-cheap-Ralink-3070-WiFi-plug.patch b/packages/linux/patches/3.10.1/linux-999.01-Support-for-cheap-Ralink-3070-WiFi-plug.patch new file mode 100644 index 0000000000..dba087cd57 --- /dev/null +++ b/packages/linux/patches/3.10.1/linux-999.01-Support-for-cheap-Ralink-3070-WiFi-plug.patch @@ -0,0 +1,72 @@ +commit 073af93346306a0e079c161e3ed8dd263fef0b20 +Author: Stefan Saraev +Date: Sat Jul 13 19:31:03 2013 +0300 + + Support for cheap Ralink 3070 WiFi plug + + source: http://www.geekamole.com/2013/rt2800usb-fix-for-ralinkmediatek-3070-gentoo-linux/ + +diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h +index a7630d5..9504d45 100644 +--- a/drivers/net/wireless/rt2x00/rt2800.h ++++ b/drivers/net/wireless/rt2x00/rt2800.h +@@ -69,6 +69,7 @@ + #define RF3320 0x000b + #define RF3322 0x000c + #define RF3053 0x000d ++#define RF3070 0x3070 + #define RF5592 0x000f + #define RF3290 0x3290 + #define RF5360 0x5360 +diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c +index 72f32e5..3e18df4 100644 +--- a/drivers/net/wireless/rt2x00/rt2800lib.c ++++ b/drivers/net/wireless/rt2x00/rt2800lib.c +@@ -2599,6 +2599,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, + break; + case RF5360: + case RF5370: ++ case RF3070: + case RF5372: + case RF5390: + case RF5392: +@@ -2615,6 +2616,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, + rt2x00_rf(rt2x00dev, RF3322) || + rt2x00_rf(rt2x00dev, RF5360) || + rt2x00_rf(rt2x00dev, RF5370) || ++ rt2x00_rf(rt2x00dev, RF3070) || + rt2x00_rf(rt2x00dev, RF5372) || + rt2x00_rf(rt2x00dev, RF5390) || + rt2x00_rf(rt2x00dev, RF5392)) { +@@ -3199,6 +3201,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) + case RF3290: + case RF5360: + case RF5370: ++ case RF3070: + case RF5372: + case RF5390: + case RF5392: +@@ -5515,6 +5518,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) + case RF3322: + case RF5360: + case RF5370: ++ case RF3070: + case RF5372: + case RF5390: + case RF5392: +@@ -5969,6 +5973,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) + rt2x00_rf(rt2x00dev, RF3322) || + rt2x00_rf(rt2x00dev, RF5360) || + rt2x00_rf(rt2x00dev, RF5370) || ++ rt2x00_rf(rt2x00dev, RF3070) || + rt2x00_rf(rt2x00dev, RF5372) || + rt2x00_rf(rt2x00dev, RF5390) || + rt2x00_rf(rt2x00dev, RF5392)) { +@@ -6071,6 +6076,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) + case RF3290: + case RF5360: + case RF5370: ++ case RF3070: + case RF5372: + case RF5390: + case RF5392: diff --git a/packages/mediacenter/service.openelec.settings/meta b/packages/mediacenter/service.openelec.settings/meta index 5c62e707c9..69acd8c7a7 100644 --- a/packages/mediacenter/service.openelec.settings/meta +++ b/packages/mediacenter/service.openelec.settings/meta @@ -26,7 +26,7 @@ PKG_LICENSE="prop." PKG_SITE="http://www.openelec.tv" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip" PKG_DEPENDS="connman hd-idle" -PKG_BUILD_DEPENDS="toolchain python" +PKG_BUILD_DEPENDS="toolchain Python" PKG_PRIORITY="optional" PKG_SECTION="" PKG_SHORTDESC="service.openelec.settings: Settings dialog for OpenELEC" diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 77bdd4fba4..92b89db7de 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -21,7 +21,7 @@ PKG_NAME="xbmc-theme-Confluence" PKG_VERSION="12.2.0" if [ "$XBMC" = "master" ]; then - PKG_VERSION="6aa6247" + PKG_VERSION="a1265f1" elif [ "$XBMC" = "xbmc-aml" ]; then PKG_VERSION="aml-frodo-d9119f2" fi diff --git a/packages/mediacenter/xbmc/init.d/92_setup-xbmc b/packages/mediacenter/xbmc/init.d/92_setup-xbmc index 2af3d091c5..597d370dc2 100644 --- a/packages/mediacenter/xbmc/init.d/92_setup-xbmc +++ b/packages/mediacenter/xbmc/init.d/92_setup-xbmc @@ -25,20 +25,8 @@ progress "setup XBMC" # -# add some default settings +# setup XBMC sources # - mkdir -p $HOME/.xbmc/userdata - -# -# setup directories for XBMC sources -# - - [ ! -d "$HOME/music" ] && mkdir -p $HOME/music - [ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures - [ ! -d "$HOME/tvshows" ] && mkdir -p $HOME/tvshows - [ ! -d "$HOME/videos" ] && mkdir -p $HOME/videos - - mkdir -p $HOME/.xbmc/userdata if [ ! -f $HOME/.xbmc/userdata/sources.xml ]; then if [ -f /usr/share/xbmc/config/sources.xml ]; then @@ -81,10 +69,6 @@ EOF # common setup guisettings # - mkdir -p $HOME/.xbmc/userdata - - [ ! -d "$HOME/screenshots" ] && mkdir -p $HOME/screenshots - if [ ! -f $HOME/.xbmc/userdata/guisettings.xml ] ; then echo "" > $HOME/.xbmc/userdata/guisettings.xml diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 5c08ada228..22f6053ba7 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -21,7 +21,7 @@ PKG_NAME="xbmc" PKG_VERSION="12.2.0" if [ "$XBMC" = "master" ]; then - PKG_VERSION="6aa6247" + PKG_VERSION="a1265f1" elif [ "$XBMC" = "xbmc-aml" ]; then PKG_VERSION="aml-frodo-d9119f2" fi diff --git a/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.26.03-PR2890.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.26.03-PR2890.patch new file mode 100644 index 0000000000..8bca4acf61 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.26.03-PR2890.patch @@ -0,0 +1,68 @@ +From 94817e6fa85e2e0b39d1f0f96795435a4256fe7b Mon Sep 17 00:00:00 2001 +From: arnova +Date: Sun, 7 Jul 2013 12:27:08 +0200 +Subject: [PATCH] fixed: MusicInfoTag loader locked up after + 9752e490e40e69d53e9dbb10a972dff533192570 + +--- + xbmc/BackgroundInfoLoader.cpp | 6 +++++- + xbmc/BackgroundInfoLoader.h | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/xbmc/BackgroundInfoLoader.cpp b/xbmc/BackgroundInfoLoader.cpp +index 8e488d0..1cd6e62 100644 +--- a/xbmc/BackgroundInfoLoader.cpp ++++ b/xbmc/BackgroundInfoLoader.cpp +@@ -32,6 +32,7 @@ + m_pObserver=NULL; + m_pProgressCallback=NULL; + m_pVecItems = NULL; ++ m_bIsLoading = false; + } + + CBackgroundInfoLoader::~CBackgroundInfoLoader() +@@ -88,6 +89,7 @@ void CBackgroundInfoLoader::Run() + } + } + ++ m_bIsLoading = false; + OnLoaderFinish(); + } + catch (...) +@@ -110,6 +112,7 @@ void CBackgroundInfoLoader::Load(CFileItemList& items) + + m_pVecItems = &items; + m_bStop = false; ++ m_bIsLoading = true; + + m_thread = new CThread(this, "BackgroundLoader"); + m_thread->Create(); +@@ -136,11 +139,12 @@ void CBackgroundInfoLoader::StopThread() + } + m_vecItems.clear(); + m_pVecItems = NULL; ++ m_bIsLoading = false; + } + + bool CBackgroundInfoLoader::IsLoading() + { +- return m_thread != NULL; ++ return m_bIsLoading; + } + + void CBackgroundInfoLoader::SetObserver(IBackgroundLoaderObserver* pObserver) +diff --git a/xbmc/BackgroundInfoLoader.h b/xbmc/BackgroundInfoLoader.h +index 3a214a3..3cf28db 100644 +--- a/xbmc/BackgroundInfoLoader.h ++++ b/xbmc/BackgroundInfoLoader.h +@@ -63,6 +63,7 @@ class CBackgroundInfoLoader : public IRunnable + std::vector m_vecItems; // FileItemList would delete the items and we only want to keep a reference. + CCriticalSection m_lock; + ++ volatile bool m_bIsLoading; + volatile bool m_bStop; + CThread *m_thread; + +-- +1.8.1.6 + diff --git a/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.26.04-PR2890.patch b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.26.04-PR2890.patch new file mode 100644 index 0000000000..7b47dc3bf7 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/12.2.0/xbmc-990.26.04-PR2890.patch @@ -0,0 +1,31 @@ +From fe1856c912e47a86081d08e25d95b2efcc3e14ac Mon Sep 17 00:00:00 2001 +From: arnova +Date: Mon, 8 Jul 2013 08:29:37 +0200 +Subject: [PATCH] fixed: Little fixup for + 94817e6fa85e2e0b39d1f0f96795435a4256fe7b (thanks JM) + +--- + xbmc/BackgroundInfoLoader.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/xbmc/BackgroundInfoLoader.cpp b/xbmc/BackgroundInfoLoader.cpp +index 1cd6e62..43dfb49 100644 +--- a/xbmc/BackgroundInfoLoader.cpp ++++ b/xbmc/BackgroundInfoLoader.cpp +@@ -89,11 +89,12 @@ void CBackgroundInfoLoader::Run() + } + } + +- m_bIsLoading = false; + OnLoaderFinish(); ++ m_bIsLoading = false; + } + catch (...) + { ++ m_bIsLoading = false; + CLog::Log(LOGERROR, "%s - Unhandled exception", __FUNCTION__); + } + } +-- +1.8.1.6 + diff --git a/packages/mediacenter/xbmc/patches/6aa6247/xbmc-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/a1265f1/xbmc-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/6aa6247/xbmc-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc/patches/a1265f1/xbmc-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc/patches/6aa6247/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/a1265f1/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/6aa6247/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/a1265f1/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/6aa6247/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/a1265f1/xbmc-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/6aa6247/xbmc-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/a1265f1/xbmc-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/6aa6247/xbmc-602-add_as.xml_busy_dialog_delay_control.patch b/packages/mediacenter/xbmc/patches/a1265f1/xbmc-602-add_as.xml_busy_dialog_delay_control.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/6aa6247/xbmc-602-add_as.xml_busy_dialog_delay_control.patch rename to packages/mediacenter/xbmc/patches/a1265f1/xbmc-602-add_as.xml_busy_dialog_delay_control.patch diff --git a/packages/mediacenter/xbmc/patches/6aa6247/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch b/packages/mediacenter/xbmc/patches/a1265f1/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/6aa6247/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch rename to packages/mediacenter/xbmc/patches/a1265f1/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch diff --git a/packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.01-xvba_support-c30c705.patch b/packages/mediacenter/xbmc/patches/a1265f1/xbmc-995.01-xvba_support-4b0d4c0.patch similarity index 93% rename from packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.01-xvba_support-c30c705.patch rename to packages/mediacenter/xbmc/patches/a1265f1/xbmc-995.01-xvba_support-4b0d4c0.patch index 8678c87c2c..acc5f886b5 100644 --- a/packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.01-xvba_support-c30c705.patch +++ b/packages/mediacenter/xbmc/patches/a1265f1/xbmc-995.01-xvba_support-4b0d4c0.patch @@ -1,825 +1,7 @@ -From e7ae857c25650217610157054c5b98dbec651181 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Sat, 18 May 2013 20:17:57 +0200 -Subject: [PATCH 001/108] renderer: replace render buffer indices with queues - ---- - xbmc/cores/VideoRenderers/RenderManager.cpp | 101 +++++++++++++++++----------- - xbmc/cores/VideoRenderers/RenderManager.h | 17 ++--- - 2 files changed, 68 insertions(+), 50 deletions(-) - -diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index a7788d1..afc7223 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.cpp -+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp -@@ -95,7 +95,7 @@ class CRetakeLock - m_presenttime = 0; - m_presentstep = PRESENT_IDLE; - m_rendermethod = 0; -- m_presentsource = 0; -+ m_presentsource = -1; - m_presentmethod = PRESENT_METHOD_SINGLE; - m_bReconfigured = false; - m_hasCaptures = false; -@@ -105,8 +105,6 @@ class CRetakeLock - memset(&m_errorbuff, 0, ERRORBUFFSIZE); - m_errorindex = 0; - m_QueueSize = 2; -- m_QueueRender = 0; -- m_QueueOutput = 0; - m_QueueSkip = 0; - } - -@@ -287,8 +285,13 @@ bool CXBMCRenderManager::Configure(unsigned int width, unsigned int height, unsi - - m_pRenderer->SetBufferSize(m_QueueSize); - m_pRenderer->Update(); -- m_QueueRender = 0; -- m_QueueOutput = 0; -+ -+ m_queued.clear(); -+ m_discard.clear(); -+ m_free.clear(); -+ m_presentsource = -1; -+ for (int i=0; iReleaseBuffer(m_QueueRender); -- m_overlays.Release(m_QueueRender); -- m_QueueRender = (m_QueueRender + 1) % m_QueueSize; -- count++; -- } -- -- if(count > 1) -- m_QueueSkip += count - 1; -- - m_pRenderer->FlipPage(m_presentsource); - m_presentstep = PRESENT_FRAME; - m_presentevent.notifyAll(); - } -+ -+ /* release all previous */ -+ std::deque::iterator it = m_discard.begin(); -+ while(it != m_discard.end()) -+ { -+ // TODO check for fence -+ int idx = *it; -+ it = m_discard.erase(it); -+ m_free.push_back(idx); -+ m_pRenderer->ReleaseBuffer(idx); -+ m_overlays.Release(idx); -+ } - } - } - -@@ -433,8 +435,6 @@ unsigned int CXBMCRenderManager::PreInit() - UpdateDisplayLatency(); - - m_QueueSize = 2; -- m_QueueRender = 0; -- m_QueueOutput = 0; - m_QueueSkip = 0; - - return m_pRenderer->PreInit(); -@@ -696,7 +696,8 @@ void CXBMCRenderManager::FlipPage(volatile bool& bStop, double timestamp /* = 0L - m_Queue[source].timestamp = timestamp; - m_Queue[source].presentfield = sync; - m_Queue[source].presentmethod = presentmethod; -- m_QueueOutput = source; -+ m_free.pop_front(); -+ m_queued.push_back(source); - - /* signal to any waiters to check state */ - if(m_presentstep == PRESENT_IDLE) -@@ -763,7 +764,8 @@ void CXBMCRenderManager::Render(bool clear, DWORD flags, DWORD alpha) - else - PresentSingle(clear, flags, alpha); - -- m_overlays.Render(m_presentsource); -+ if (m_presentsource >= 0) -+ m_overlays.Render(m_presentsource); - } - - /* simple present method */ -@@ -993,23 +995,23 @@ int CXBMCRenderManager::WaitForBuffer(volatile bool& bStop, int timeout) - m_overlays.Release(GetNextDecode()); - - // return buffer level -- return (m_QueueOutput - m_QueueRender + m_QueueSize) % m_QueueSize; -+ return m_queued.size() + m_discard.size();; - } - - int CXBMCRenderManager::GetNextRender() - { -- if (m_QueueOutput == m_QueueRender) -+ if (m_queued.empty()) - return -1; -- return (m_QueueRender + 1) % m_QueueSize; -+ else -+ return m_queued.front(); - } - - int CXBMCRenderManager::GetNextDecode() - { -- int outputPlus1 = (m_QueueOutput + 1) % m_QueueSize; -- if (outputPlus1 == m_QueueRender) -+ if (m_free.empty()) - return -1; - else -- return outputPlus1; -+ return m_free.front(); - } - - void CXBMCRenderManager::PrepareNextRender() -@@ -1029,16 +1031,19 @@ void CXBMCRenderManager::PrepareNextRender() - double frametime = 1.0 / GetMaximumFPS(); - - /* see if any future queued frames are already due */ -- int prv; -- int idx = m_QueueOutput; -- while(idx != nxt) -+ std::deque::reverse_iterator curr, prev; -+ int idx; -+ curr = prev = m_queued.rbegin(); -+ ++prev; -+ while (prev != m_queued.rend()) - { -- prv = (idx + m_QueueSize - 1) % m_QueueSize; -- if(clocktime > m_Queue[prv].timestamp /* previous frame is late */ -- && clocktime > m_Queue[idx].timestamp - frametime) /* selected frame is close to it's display time */ -+ if(clocktime > m_Queue[*prev].timestamp /* previous frame is late */ -+ && clocktime > m_Queue[*curr].timestamp - frametime) /* selected frame is close to it's display time */ - break; -- idx = prv; -+ ++curr; -+ ++prev; - } -+ idx = *curr; - - /* in fullscreen we will block after render, but only for MAXPRESENTDELAY */ - bool next; -@@ -1049,11 +1054,23 @@ void CXBMCRenderManager::PrepareNextRender() - - if (next) - { -+ /* skip late frames */ -+ int skip; -+ while((skip = m_queued.front()) != idx) -+ { -+ m_queued.pop_front(); -+ m_discard.push_back(skip); -+ m_QueueSkip++; -+ } -+ - m_presenttime = m_Queue[idx].timestamp; - m_presentmethod = m_Queue[idx].presentmethod; - m_presentfield = m_Queue[idx].presentfield; - m_presentstep = PRESENT_FLIP; -+ if(m_presentsource >= 0) -+ m_discard.push_back(m_presentsource); - m_presentsource = idx; -+ m_queued.pop_front(); - m_presentevent.notifyAll(); - } - } -@@ -1062,11 +1079,17 @@ void CXBMCRenderManager::DiscardBuffer() - { - CSharedLock lock(m_sharedSection); - CSingleLock lock2(m_presentlock); -- while(m_QueueOutput != m_QueueRender) -+ -+ while(!m_queued.empty()) -+ { -+ int idx = m_queued.front(); -+ m_queued.pop_front(); -+ m_discard.push_back(idx); -+ } -+ if (m_presentsource >= 0) - { -- m_pRenderer->ReleaseBuffer(m_QueueOutput); -- m_overlays.Release(m_QueueOutput); -- m_QueueOutput = (m_QueueOutput + m_QueueSize - 1) % m_QueueSize; -+ m_discard.push_back(m_presentsource); -+ m_presentsource = -1; - } - if(m_presentstep == PRESENT_READY) - m_presentstep = PRESENT_IDLE; -diff --git a/xbmc/cores/VideoRenderers/RenderManager.h b/xbmc/cores/VideoRenderers/RenderManager.h -index d947e9e..03c5ab9 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.h -+++ b/xbmc/cores/VideoRenderers/RenderManager.h -@@ -29,6 +29,7 @@ - #include "threads/Thread.h" - #include "settings/VideoSettings.h" - #include "OverlayRenderer.h" -+#include - - class CRenderCapture; - -@@ -107,7 +108,7 @@ class CXBMCRenderManager - void AddOverlay(CDVDOverlay* o, double pts) - { - CSharedLock lock(m_sharedSection); -- m_overlays.AddOverlay(o, pts, (m_QueueOutput + 1) % m_QueueSize); -+ m_overlays.AddOverlay(o, pts, m_free.front()); - } - - void AddCleanup(OVERLAY::COverlay* o) -@@ -218,16 +219,6 @@ class CXBMCRenderManager - double m_displayLatency; - void UpdateDisplayLatency(); - -- // Render Buffer State Description: -- // -- // Output: is the buffer about to or having its texture prepared for render (ie from output thread). -- // Cannot go past the "Displayed" buffer (otherwise we will probably overwrite buffers not yet -- // displayed or even rendered). -- // Render: is the current buffer being or having been submitted for render to back buffer. -- // Cannot go past "Output" buffer (else it would be rendering old output). -- -- int m_QueueRender; -- int m_QueueOutput; - int m_QueueSize; - int m_QueueSkip; - -@@ -238,6 +229,10 @@ class CXBMCRenderManager - EPRESENTMETHOD presentmethod; - } m_Queue[NUM_BUFFERS]; - -+ std::deque m_free; -+ std::deque m_queued; -+ std::deque m_discard; -+ - double m_presenttime; - double m_presentcorr; - double m_presenterr; --- -1.8.1.6 - - -From af0696a005f386f577f62b065ff33280ac5e73d1 Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Thu, 13 Jun 2013 23:29:45 +0200 -Subject: [PATCH 002/108] renderer: simplify code by always maintaining one - front buffer - ---- - xbmc/cores/VideoRenderers/RenderManager.cpp | 49 ++++++++++++----------------- - 1 file changed, 20 insertions(+), 29 deletions(-) - -diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index afc7223..5be41ab 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.cpp -+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp -@@ -86,6 +86,12 @@ class CRetakeLock - CCriticalSection &m_owned; - }; - -+static void requeue(std::deque &trg, std::deque &src) -+{ -+ trg.push_back(src.front()); -+ src.pop_front(); -+} -+ - CXBMCRenderManager::CXBMCRenderManager() - { - m_pRenderer = NULL; -@@ -95,7 +101,7 @@ class CRetakeLock - m_presenttime = 0; - m_presentstep = PRESENT_IDLE; - m_rendermethod = 0; -- m_presentsource = -1; -+ m_presentsource = 0; - m_presentmethod = PRESENT_METHOD_SINGLE; - m_bReconfigured = false; - m_hasCaptures = false; -@@ -289,8 +295,8 @@ bool CXBMCRenderManager::Configure(unsigned int width, unsigned int height, unsi - m_queued.clear(); - m_discard.clear(); - m_free.clear(); -- m_presentsource = -1; -- for (int i=0; i::iterator it = m_discard.begin(); -- while(it != m_discard.end()) -+ for(std::deque::iterator it = m_discard.begin(); it != m_discard.end(); ) - { - // TODO check for fence -- int idx = *it; -+ m_pRenderer->ReleaseBuffer(*it); -+ m_overlays.Release(*it); -+ m_free.push_back(*it); - it = m_discard.erase(it); -- m_free.push_back(idx); -- m_pRenderer->ReleaseBuffer(idx); -- m_overlays.Release(idx); - } - } - } -@@ -696,8 +700,7 @@ void CXBMCRenderManager::FlipPage(volatile bool& bStop, double timestamp /* = 0L - m_Queue[source].timestamp = timestamp; - m_Queue[source].presentfield = sync; - m_Queue[source].presentmethod = presentmethod; -- m_free.pop_front(); -- m_queued.push_back(source); -+ requeue(m_queued, m_free); - - /* signal to any waiters to check state */ - if(m_presentstep == PRESENT_IDLE) -@@ -764,8 +767,7 @@ void CXBMCRenderManager::Render(bool clear, DWORD flags, DWORD alpha) - else - PresentSingle(clear, flags, alpha); - -- if (m_presentsource >= 0) -- m_overlays.Render(m_presentsource); -+ m_overlays.Render(m_presentsource); - } - - /* simple present method */ -@@ -1055,11 +1057,9 @@ void CXBMCRenderManager::PrepareNextRender() - if (next) - { - /* skip late frames */ -- int skip; -- while((skip = m_queued.front()) != idx) -+ while(m_queued.front() != idx) - { -- m_queued.pop_front(); -- m_discard.push_back(skip); -+ requeue(m_discard, m_queued); - m_QueueSkip++; - } - -@@ -1067,8 +1067,7 @@ void CXBMCRenderManager::PrepareNextRender() - m_presentmethod = m_Queue[idx].presentmethod; - m_presentfield = m_Queue[idx].presentfield; - m_presentstep = PRESENT_FLIP; -- if(m_presentsource >= 0) -- m_discard.push_back(m_presentsource); -+ m_discard.push_back(m_presentsource); - m_presentsource = idx; - m_queued.pop_front(); - m_presentevent.notifyAll(); -@@ -1081,16 +1080,8 @@ void CXBMCRenderManager::DiscardBuffer() - CSingleLock lock2(m_presentlock); - - while(!m_queued.empty()) -- { -- int idx = m_queued.front(); -- m_queued.pop_front(); -- m_discard.push_back(idx); -- } -- if (m_presentsource >= 0) -- { -- m_discard.push_back(m_presentsource); -- m_presentsource = -1; -- } -+ requeue(m_discard, m_queued); -+ - if(m_presentstep == PRESENT_READY) - m_presentstep = PRESENT_IDLE; - m_presentevent.notifyAll(); --- -1.8.1.6 - - -From ff674ec726f52e97f1b1baa75fd63ffc1108fa30 Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Thu, 13 Jun 2013 23:39:55 +0200 -Subject: [PATCH 003/108] renderer: remove now pointless GetNext(Decode/Render) - function - ---- - xbmc/cores/VideoRenderers/RenderManager.cpp | 39 +++++++++-------------------- - xbmc/cores/VideoRenderers/RenderManager.h | 2 -- - 2 files changed, 12 insertions(+), 29 deletions(-) - -diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index 5be41ab..6e5f0cb 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.cpp -+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp -@@ -349,11 +349,10 @@ void CXBMCRenderManager::FrameMove() - - if (m_presentstep == PRESENT_FRAME2) - { -- int idx = GetNextRender(); -- if(idx >= 0) -+ if(!m_queued.empty()) - { - double timestamp = GetPresentTime(); -- if(timestamp > m_presenttime + (m_Queue[idx].timestamp - m_presenttime) * 0.5) -+ if(timestamp > m_presenttime + (m_Queue[m_queued.front()].timestamp - m_presenttime) * 0.5) - { - m_presentstep = PRESENT_READY; - m_presentevent.notifyAll(); -@@ -405,7 +404,7 @@ void CXBMCRenderManager::FrameFinish() - - if(m_presentstep == PRESENT_IDLE) - { -- if(GetNextRender() >= 0) -+ if(!m_queued.empty()) - m_presentstep = PRESENT_READY; - } - -@@ -694,8 +693,11 @@ void CXBMCRenderManager::FlipPage(volatile bool& bStop, double timestamp /* = 0L - - CSingleLock lock2(m_presentlock); - -+ if(m_free.empty()) -+ return; -+ - if(source < 0) -- source = GetNextDecode(); -+ source = m_free.front(); - - m_Queue[source].timestamp = timestamp; - m_Queue[source].presentfield = sync; -@@ -870,9 +872,9 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic) - if (!m_pRenderer) - return -1; - -- int index = GetNextDecode(); -- if(index < 0) -+ if(m_free.empty()) - return -1; -+ int index = m_free.front(); - - if(m_pRenderer->AddVideoPicture(&pic, index)) - return 1; -@@ -982,7 +984,7 @@ int CXBMCRenderManager::WaitForBuffer(volatile bool& bStop, int timeout) - CSingleLock lock2(m_presentlock); - - XbmcThreads::EndTime endtime(timeout); -- while(GetNextDecode() < 0) -+ while(m_free.empty()) - { - m_presentevent.wait(lock2, std::min(50, timeout)); - if(endtime.IsTimePast() || bStop) -@@ -994,34 +996,17 @@ int CXBMCRenderManager::WaitForBuffer(volatile bool& bStop, int timeout) - } - - // make sure overlay buffer is released, this won't happen on AddOverlay -- m_overlays.Release(GetNextDecode()); -+ m_overlays.Release(m_free.front()); - - // return buffer level - return m_queued.size() + m_discard.size();; - } - --int CXBMCRenderManager::GetNextRender() --{ -- if (m_queued.empty()) -- return -1; -- else -- return m_queued.front(); --} -- --int CXBMCRenderManager::GetNextDecode() --{ -- if (m_free.empty()) -- return -1; -- else -- return m_free.front(); --} -- - void CXBMCRenderManager::PrepareNextRender() - { - CSingleLock lock(m_presentlock); - -- int nxt = GetNextRender(); -- if (nxt < 0) -+ if (m_queued.empty()) - { - CLog::Log(LOGERROR, "CRenderManager::PrepareNextRender - asked to prepare with nothing available"); - m_presentstep = PRESENT_IDLE; -diff --git a/xbmc/cores/VideoRenderers/RenderManager.h b/xbmc/cores/VideoRenderers/RenderManager.h -index 03c5ab9..f693d80 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.h -+++ b/xbmc/cores/VideoRenderers/RenderManager.h -@@ -185,8 +185,6 @@ class CXBMCRenderManager - void PresentFields(bool clear, DWORD flags, DWORD alpha); - void PresentBlend(bool clear, DWORD flags, DWORD alpha); - -- int GetNextRender(); -- int GetNextDecode(); - void PrepareNextRender(); - - EINTERLACEMETHOD AutoInterlaceMethodInternal(EINTERLACEMETHOD mInt); --- -1.8.1.6 - - -From a32759de68323854edb12bea577ebf58a69718c2 Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Fri, 14 Jun 2013 00:25:37 +0200 -Subject: [PATCH 004/108] renderer: name present buffer structure to be able to - reference it - ---- - xbmc/cores/VideoRenderers/RenderManager.cpp | 7 ++++--- - xbmc/cores/VideoRenderers/RenderManager.h | 2 +- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index 6e5f0cb..179f753 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.cpp -+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp -@@ -699,9 +699,10 @@ void CXBMCRenderManager::FlipPage(volatile bool& bStop, double timestamp /* = 0L - if(source < 0) - source = m_free.front(); - -- m_Queue[source].timestamp = timestamp; -- m_Queue[source].presentfield = sync; -- m_Queue[source].presentmethod = presentmethod; -+ SPresent& m = m_Queue[source]; -+ m.timestamp = timestamp; -+ m.presentfield = sync; -+ m.presentmethod = presentmethod; - requeue(m_queued, m_free); - - /* signal to any waiters to check state */ -diff --git a/xbmc/cores/VideoRenderers/RenderManager.h b/xbmc/cores/VideoRenderers/RenderManager.h -index f693d80..6dc2629 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.h -+++ b/xbmc/cores/VideoRenderers/RenderManager.h -@@ -220,7 +220,7 @@ class CXBMCRenderManager - int m_QueueSize; - int m_QueueSkip; - -- struct -+ struct SPresent - { - double timestamp; - EFIELDSYNC presentfield; --- -1.8.1.6 - - -From 8454f822388d1f2f44cd1a91df186d11fe75f74f Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Fri, 14 Jun 2013 00:29:39 +0200 -Subject: [PATCH 005/108] renderer: store bypass format in rendermanager - instead - -The present method will be overwritten on each flippage ---- - xbmc/cores/VideoRenderers/RenderManager.cpp | 5 ++--- - xbmc/cores/VideoRenderers/RenderManager.h | 2 +- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index 179f753..0a40f57 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.cpp -+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp -@@ -272,8 +272,7 @@ bool CXBMCRenderManager::Configure(unsigned int width, unsigned int height, unsi - lock.Enter(); - } - lock2.Enter(); -- if( format & RENDER_FMT_BYPASS ) -- m_presentmethod = PRESENT_METHOD_BYPASS; -+ m_format = format; - - int processor = m_pRenderer->GetProcessorSize(); - if(processor) -@@ -312,7 +311,7 @@ bool CXBMCRenderManager::Configure(unsigned int width, unsigned int height, unsi - - bool CXBMCRenderManager::RendererHandlesPresent() const - { -- return IsConfigured() && m_presentmethod != PRESENT_METHOD_BYPASS; -+ return IsConfigured() && m_format != RENDER_FMT_BYPASS; - } - - bool CXBMCRenderManager::IsConfigured() const -diff --git a/xbmc/cores/VideoRenderers/RenderManager.h b/xbmc/cores/VideoRenderers/RenderManager.h -index 6dc2629..1be4e2f 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.h -+++ b/xbmc/cores/VideoRenderers/RenderManager.h -@@ -211,7 +211,6 @@ class CXBMCRenderManager - PRESENT_METHOD_BLEND, - PRESENT_METHOD_WEAVE, - PRESENT_METHOD_BOB, -- PRESENT_METHOD_BYPASS, - }; - - double m_displayLatency; -@@ -231,6 +230,7 @@ class CXBMCRenderManager - std::deque m_queued; - std::deque m_discard; - -+ ERenderFormat m_format; - double m_presenttime; - double m_presentcorr; - double m_presenterr; --- -1.8.1.6 - - -From 258e28c9fb1b151822a398291d32dc3f1bc9cd75 Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Fri, 14 Jun 2013 00:31:58 +0200 -Subject: [PATCH 006/108] renderer: drop copies of variables, use queue data - directly - ---- - xbmc/cores/VideoRenderers/RenderManager.cpp | 35 ++++++++++++++++------------- - xbmc/cores/VideoRenderers/RenderManager.h | 4 +--- - 2 files changed, 20 insertions(+), 19 deletions(-) - -diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index 0a40f57..255f108 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.cpp -+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp -@@ -97,12 +97,9 @@ static void requeue(std::deque &trg, std::deque &src) - m_pRenderer = NULL; - m_bIsStarted = false; - -- m_presentfield = FS_NONE; -- m_presenttime = 0; - m_presentstep = PRESENT_IDLE; - m_rendermethod = 0; - m_presentsource = 0; -- m_presentmethod = PRESENT_METHOD_SINGLE; - m_bReconfigured = false; - m_hasCaptures = false; - m_displayLatency = 0.0f; -@@ -112,6 +109,7 @@ static void requeue(std::deque &trg, std::deque &src) - m_errorindex = 0; - m_QueueSize = 2; - m_QueueSkip = 0; -+ m_format = RENDER_FMT_NONE; - } - - CXBMCRenderManager::~CXBMCRenderManager() -@@ -351,7 +349,9 @@ void CXBMCRenderManager::FrameMove() - if(!m_queued.empty()) - { - double timestamp = GetPresentTime(); -- if(timestamp > m_presenttime + (m_Queue[m_queued.front()].timestamp - m_presenttime) * 0.5) -+ SPresent& m = m_Queue[m_presentsource]; -+ SPresent& q = m_Queue[m_queued.front()]; -+ if(timestamp > m.timestamp + (q.timestamp - m.timestamp) * 0.5) - { - m_presentstep = PRESENT_READY; - m_presentevent.notifyAll(); -@@ -384,15 +384,17 @@ void CXBMCRenderManager::FrameMove() - void CXBMCRenderManager::FrameFinish() - { - /* wait for this present to be valid */ -+ SPresent& m = m_Queue[m_presentsource]; -+ - if(g_graphicsContext.IsFullScreenVideo()) -- WaitPresentTime(m_presenttime); -+ WaitPresentTime(m.timestamp); - - { CSingleLock lock(m_presentlock); - - if(m_presentstep == PRESENT_FRAME) - { -- if( m_presentmethod == PRESENT_METHOD_BOB -- || m_presentmethod == PRESENT_METHOD_WEAVE) -+ if( m.presentmethod == PRESENT_METHOD_BOB -+ || m.presentmethod == PRESENT_METHOD_WEAVE) - m_presentstep = PRESENT_FRAME2; - else - m_presentstep = PRESENT_IDLE; -@@ -760,11 +762,13 @@ void CXBMCRenderManager::Render(bool clear, DWORD flags, DWORD alpha) - { - CSharedLock lock(m_sharedSection); - -- if( m_presentmethod == PRESENT_METHOD_BOB ) -+ SPresent& m = m_Queue[m_presentsource]; -+ -+ if( m.presentmethod == PRESENT_METHOD_BOB ) - PresentFields(clear, flags, alpha); -- else if( m_presentmethod == PRESENT_METHOD_WEAVE ) -+ else if( m.presentmethod == PRESENT_METHOD_WEAVE ) - PresentFields(clear, flags | RENDER_FLAG_WEAVE, alpha); -- else if( m_presentmethod == PRESENT_METHOD_BLEND ) -+ else if( m.presentmethod == PRESENT_METHOD_BLEND ) - PresentBlend(clear, flags, alpha); - else - PresentSingle(clear, flags, alpha); -@@ -785,17 +789,18 @@ void CXBMCRenderManager::PresentSingle(bool clear, DWORD flags, DWORD alpha) - void CXBMCRenderManager::PresentFields(bool clear, DWORD flags, DWORD alpha) - { - CSingleLock lock(g_graphicsContext); -+ SPresent& m = m_Queue[m_presentsource]; - - if(m_presentstep == PRESENT_FRAME) - { -- if( m_presentfield == FS_BOT) -+ if( m.presentfield == FS_BOT) - m_pRenderer->RenderUpdate(clear, flags | RENDER_FLAG_BOT | RENDER_FLAG_FIELD0, alpha); - else - m_pRenderer->RenderUpdate(clear, flags | RENDER_FLAG_TOP | RENDER_FLAG_FIELD0, alpha); - } - else - { -- if( m_presentfield == FS_TOP) -+ if( m.presentfield == FS_TOP) - m_pRenderer->RenderUpdate(clear, flags | RENDER_FLAG_BOT | RENDER_FLAG_FIELD1, alpha); - else - m_pRenderer->RenderUpdate(clear, flags | RENDER_FLAG_TOP | RENDER_FLAG_FIELD1, alpha); -@@ -805,8 +810,9 @@ void CXBMCRenderManager::PresentFields(bool clear, DWORD flags, DWORD alpha) - void CXBMCRenderManager::PresentBlend(bool clear, DWORD flags, DWORD alpha) - { - CSingleLock lock(g_graphicsContext); -+ SPresent& m = m_Queue[m_presentsource]; - -- if( m_presentfield == FS_BOT ) -+ if( m.presentfield == FS_BOT ) - { - m_pRenderer->RenderUpdate(clear, flags | RENDER_FLAG_BOT | RENDER_FLAG_NOOSD, alpha); - m_pRenderer->RenderUpdate(false, flags | RENDER_FLAG_TOP, alpha / 2); -@@ -1048,9 +1054,6 @@ void CXBMCRenderManager::PrepareNextRender() - m_QueueSkip++; - } - -- m_presenttime = m_Queue[idx].timestamp; -- m_presentmethod = m_Queue[idx].presentmethod; -- m_presentfield = m_Queue[idx].presentfield; - m_presentstep = PRESENT_FLIP; - m_discard.push_back(m_presentsource); - m_presentsource = idx; -diff --git a/xbmc/cores/VideoRenderers/RenderManager.h b/xbmc/cores/VideoRenderers/RenderManager.h -index 1be4e2f..83dc50a 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.h -+++ b/xbmc/cores/VideoRenderers/RenderManager.h -@@ -231,13 +231,11 @@ class CXBMCRenderManager - std::deque m_discard; - - ERenderFormat m_format; -- double m_presenttime; -+ - double m_presentcorr; - double m_presenterr; - double m_errorbuff[ERRORBUFFSIZE]; - int m_errorindex; -- EFIELDSYNC m_presentfield; -- EPRESENTMETHOD m_presentmethod; - EPRESENTSTEP m_presentstep; - int m_presentsource; - XbmcThreads::ConditionVariable m_presentevent; --- -1.8.1.6 - - -From be1c14e77a0cd9c69b664a45afd9ac97ba7a46ea Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Fri, 14 Jun 2013 16:56:41 +0200 -Subject: [PATCH 007/108] renderer: grab presentlock in AddVideoPicture - ---- - xbmc/cores/VideoRenderers/RenderManager.cpp | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index 255f108..bff4b3c 100644 ---- a/xbmc/cores/VideoRenderers/RenderManager.cpp -+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp -@@ -878,9 +878,13 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic) - if (!m_pRenderer) - return -1; - -- if(m_free.empty()) -- return -1; -- int index = m_free.front(); -+ int index; -+ { -+ CSingleLock lock(m_presentlock); -+ if (m_free.empty()) -+ return -1; -+ index = m_free.front(); -+ } - - if(m_pRenderer->AddVideoPicture(&pic, index)) - return 1; --- -1.8.1.6 - - -From f34b42237b7770b0dd174b583c6aa39797364021 Mon Sep 17 00:00:00 2001 +From 3f425f9680eeebd5b1bca7d8466b64d84325acad Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 30 May 2013 10:56:06 +0200 -Subject: [PATCH 008/108] renderer: use fence for determination when a buffer +Subject: [PATCH 001/102] renderer: use fence for determination when a buffer is ready for reuse --- @@ -926,10 +108,10 @@ index 96b752b..e239b92 100644 #ifdef HAVE_LIBVDPAU CVDPAU* vdpau; diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index bff4b3c..5cd3f06 100644 +index 28201a2..595ed8b 100644 --- a/xbmc/cores/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoRenderers/RenderManager.cpp -@@ -372,11 +372,16 @@ void CXBMCRenderManager::FrameMove() +@@ -374,11 +374,16 @@ void CXBMCRenderManager::FrameMove() /* release all previous */ for(std::deque::iterator it = m_discard.begin(); it != m_discard.end(); ) { @@ -951,10 +133,10 @@ index bff4b3c..5cd3f06 100644 1.8.1.6 -From f981905cbb74326bc1b58bec6b5fd2ee5ce3dbd8 Mon Sep 17 00:00:00 2001 +From 695d323854adbc1fef8c6b0f965a08b842877587 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 009/108] videoplayer: adapt lateness detection and dropping to +Subject: [PATCH 002/102] videoplayer: adapt lateness detection and dropping to buffering --- @@ -968,7 +150,7 @@ Subject: [PATCH 009/108] videoplayer: adapt lateness detection and dropping to 7 files changed, 260 insertions(+), 38 deletions(-) diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index 5cd3f06..318a7fd 100644 +index 595ed8b..44124a3 100644 --- a/xbmc/cores/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoRenderers/RenderManager.cpp @@ -299,6 +299,8 @@ bool CXBMCRenderManager::Configure(unsigned int width, unsigned int height, unsi @@ -979,8 +161,8 @@ index 5cd3f06..318a7fd 100644 + m_sleeptime = 1.0; m_presentevent.notifyAll(); - CLog::Log(LOGDEBUG, "CXBMCRenderManager::Configure - %d", m_QueueSize); -@@ -643,7 +645,7 @@ void CXBMCRenderManager::SetViewMode(int iViewMode) + m_firstFlipPage = false; // tempfix +@@ -645,7 +647,7 @@ void CXBMCRenderManager::SetViewMode(int iViewMode) m_pRenderer->SetViewMode(iViewMode); } @@ -989,7 +171,7 @@ index 5cd3f06..318a7fd 100644 { { CSharedLock lock(m_sharedSection); -@@ -709,6 +711,7 @@ void CXBMCRenderManager::FlipPage(volatile bool& bStop, double timestamp /* = 0L +@@ -713,6 +715,7 @@ void CXBMCRenderManager::FlipPage(volatile bool& bStop, double timestamp /* = 0L m.timestamp = timestamp; m.presentfield = sync; m.presentmethod = presentmethod; @@ -997,7 +179,7 @@ index 5cd3f06..318a7fd 100644 requeue(m_queued, m_free); /* signal to any waiters to check state */ -@@ -1067,6 +1070,8 @@ void CXBMCRenderManager::PrepareNextRender() +@@ -1071,6 +1074,8 @@ void CXBMCRenderManager::PrepareNextRender() m_discard.push_back(m_presentsource); m_presentsource = idx; m_queued.pop_front(); @@ -1006,7 +188,7 @@ index 5cd3f06..318a7fd 100644 m_presentevent.notifyAll(); } } -@@ -1083,3 +1088,12 @@ void CXBMCRenderManager::DiscardBuffer() +@@ -1087,3 +1092,12 @@ void CXBMCRenderManager::DiscardBuffer() m_presentstep = PRESENT_IDLE; m_presentevent.notifyAll(); } @@ -1020,7 +202,7 @@ index 5cd3f06..318a7fd 100644 + return true; +} diff --git a/xbmc/cores/VideoRenderers/RenderManager.h b/xbmc/cores/VideoRenderers/RenderManager.h -index 83dc50a..c387796 100644 +index 764ba07..1d9116e 100644 --- a/xbmc/cores/VideoRenderers/RenderManager.h +++ b/xbmc/cores/VideoRenderers/RenderManager.h @@ -97,10 +97,11 @@ class CXBMCRenderManager @@ -1110,7 +292,7 @@ index 5704704..ee943a0 100644 + virtual void SetCodecControl(int flags) {} }; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 7881e58..b197ec8 100644 +index 0591b1f..f789785 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -163,6 +163,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx @@ -1471,10 +653,10 @@ index 749195f..4c1e9dd 100644 + m_totalGain += frametime; +} diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.h b/xbmc/cores/dvdplayer/DVDPlayerVideo.h -index bf484ea..3669cc1 100644 +index 5f763c0..9be23fb 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.h +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.h -@@ -37,6 +37,25 @@ +@@ -36,6 +36,25 @@ #define VIDEO_PICTURE_QUEUE_SIZE 1 @@ -1500,7 +682,7 @@ index bf484ea..3669cc1 100644 class CDVDPlayerVideo : public CThread { public: -@@ -104,6 +123,7 @@ class CDVDPlayerVideo : public CThread +@@ -103,6 +122,7 @@ class CDVDPlayerVideo : public CThread #define EOS_ABORT 1 #define EOS_DROPPED 2 #define EOS_VERYLATE 4 @@ -1508,7 +690,7 @@ index bf484ea..3669cc1 100644 void AutoCrop(DVDVideoPicture* pPicture); void AutoCrop(DVDVideoPicture *pPicture, RECT &crop); -@@ -129,6 +149,7 @@ class CDVDPlayerVideo : public CThread +@@ -128,6 +148,7 @@ class CDVDPlayerVideo : public CThread void ResetFrameRateCalc(); void CalcFrameRate(); @@ -1516,7 +698,7 @@ index bf484ea..3669cc1 100644 double m_fFrameRate; //framerate of the video currently playing bool m_bCalcFrameRate; //if we should calculate the framerate from the timestamps -@@ -181,5 +202,7 @@ class CDVDPlayerVideo : public CThread +@@ -180,5 +201,7 @@ class CDVDPlayerVideo : public CThread CPullupCorrection m_pullupCorrection; std::list m_packets; @@ -1528,10 +710,10 @@ index bf484ea..3669cc1 100644 1.8.1.6 -From 8fa151760a5382a1bdf438b0df6a62445e01b1b8 Mon Sep 17 00:00:00 2001 +From dc0f743e412bd0332671be8ff6b62975f321dded Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 010/108] video player: present correct pts to user for a/v +Subject: [PATCH 003/102] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -1583,10 +765,10 @@ index 4c1e9dd..ba99804 100644 && bNewFrame && m_bAllowDrop diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.h b/xbmc/cores/dvdplayer/DVDPlayerVideo.h -index 3669cc1..9477a6b 100644 +index 9be23fb..3c3e007 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.h +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.h -@@ -101,7 +101,7 @@ class CDVDPlayerVideo : public CThread +@@ -100,7 +100,7 @@ class CDVDPlayerVideo : public CThread bool InitializedOutputDevice(); @@ -1599,10 +781,10 @@ index 3669cc1..9477a6b 100644 1.8.1.6 -From 3c87489ae25fea52d93b1e29bd061137fbcbe5e3 Mon Sep 17 00:00:00 2001 +From 801f5ce03ba677ecfeed4b899ec3cfef62d189c1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 -Subject: [PATCH 011/108] videoplayer: some rework and documentation +Subject: [PATCH 004/102] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++++-- @@ -1662,7 +844,7 @@ index ee943a0..7abbd7e 100644 virtual void SetCodecControl(int flags) {} }; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index b197ec8..547ede9 100644 +index f789785..43c133c 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -907,6 +907,17 @@ unsigned CDVDVideoCodecFFmpeg::GetAllowedReferences() @@ -1713,10 +895,10 @@ index ba99804..56b32b9 100644 1.8.1.6 -From dc043a7bd54bdf787cca999103fa8ceb6252e3c0 Mon Sep 17 00:00:00 2001 +From cb666920ca7b008a2f0ed56df9f0229c254be4fe Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 7 Apr 2012 09:19:00 +0200 -Subject: [PATCH 012/108] vdpau: redesign +Subject: [PATCH 005/102] vdpau: redesign --- language/English/strings.po | 12 +- @@ -1746,10 +928,10 @@ Subject: [PATCH 012/108] vdpau: redesign create mode 100644 xbmc/utils/ActorProtocol.h diff --git a/language/English/strings.po b/language/English/strings.po -index 86210a7..e6c87e9 100644 +index e051b4d..b386d1f 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -5771,7 +5771,15 @@ msgctxt "#13435" +@@ -5767,7 +5767,15 @@ msgctxt "#13435" msgid "Enable HQ Scalers for scalings above" msgstr "" @@ -1766,7 +948,7 @@ index 86210a7..e6c87e9 100644 #: system/settings/settings.xml msgctxt "#13500" -@@ -6846,7 +6854,7 @@ msgid "Software Blend" +@@ -6842,7 +6850,7 @@ msgid "Software Blend" msgstr "" msgctxt "#16325" @@ -2203,10 +1385,10 @@ index 4e8d7e9..6ed62be 100644 RENDER_FMT_UYVY422, RENDER_FMT_YUYV422, diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index 318a7fd..0ad88ce 100644 +index 44124a3..a59ee4d 100644 --- a/xbmc/cores/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoRenderers/RenderManager.cpp -@@ -921,7 +921,8 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic) +@@ -925,7 +925,8 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic) CDVDCodecUtils::CopyDXVA2Picture(&image, &pic); } #ifdef HAVE_LIBVDPAU @@ -2217,7 +1399,7 @@ index 318a7fd..0ad88ce 100644 #endif #ifdef HAVE_LIBOPENMAX diff --git a/xbmc/cores/VideoRenderers/RenderManager.h b/xbmc/cores/VideoRenderers/RenderManager.h -index c387796..2c5ccf4 100644 +index 1d9116e..7a3a530 100644 --- a/xbmc/cores/VideoRenderers/RenderManager.h +++ b/xbmc/cores/VideoRenderers/RenderManager.h @@ -35,7 +35,7 @@ @@ -2265,7 +1447,7 @@ index 7abbd7e..13a2648 100644 struct { VAAPI::CHolder* vaapi; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 547ede9..6569d9c 100644 +index 43c133c..ec93844 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -75,11 +75,11 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx @@ -2296,7 +1478,7 @@ index 81b9af9..fd8b863 100644 class CDVDVideoCodecFFmpeg : public CDVDVideoCodec diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 03d40f2..000d2cb 100644 +index 4e00208..89ac10e 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -33,11 +33,16 @@ @@ -2477,7 +1659,7 @@ index 03d40f2..000d2cb 100644 + m_vdpauConfig.numRenderBuffers = surfaces; + m_decoderThread = CThread::GetCurrentThreadId(); - if ((avctx->codec_id == CODEC_ID_MPEG4) && !g_advancedSettings.m_videoAllowMpeg4VDPAU) + if ((avctx->codec_id == AV_CODEC_ID_MPEG4) && !g_advancedSettings.m_videoAllowMpeg4VDPAU) return false; @@ -198,8 +123,6 @@ bool CVDPAU::Open(AVCodecContext* avctx, const enum PixelFormat, unsigned int su error = "dlerror() returned NULL"; @@ -7414,7 +6596,7 @@ index 56b32b9..3c30d0b 100644 case RENDER_FMT_VAAPI: return "VAAPI"; case RENDER_FMT_OMXEGL: return "OMXEGL"; diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 3189ad9..d3206e5 100644 +index de3a418..c156b90 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -161,7 +161,7 @@ void CAdvancedSettings::Initialize() @@ -7435,7 +6617,7 @@ index 3189ad9..d3206e5 100644 m_DXVACheckCompatibility = false; m_DXVACheckCompatibilityPresent = false; m_DXVAForceProcessorRenderer = true; -@@ -573,7 +575,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) +@@ -572,7 +574,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) XMLUtils::GetString(pElement,"cleandatetime", m_videoCleanDateTimeRegExp); XMLUtils::GetString(pElement,"ppffmpegdeinterlacing",m_videoPPFFmpegDeint); XMLUtils::GetString(pElement,"ppffmpegpostprocessing",m_videoPPFFmpegPostProc); @@ -7444,7 +6626,7 @@ index 3189ad9..d3206e5 100644 XMLUtils::GetFloat(pElement, "nonlinearstretchratio", m_videoNonLinStretchRatio, 0.01f, 1.0f); XMLUtils::GetBoolean(pElement,"enablehighqualityhwscalers", m_videoEnableHighQualityHwScalers); XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f); -@@ -582,6 +584,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) +@@ -581,6 +583,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI); XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace); XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1); @@ -7454,7 +6636,7 @@ index 3189ad9..d3206e5 100644 TiXmlElement* pAdjustRefreshrate = pElement->FirstChildElement("adjustrefreshrate"); if (pAdjustRefreshrate) diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index dc0c854..d41cbcf 100644 +index 084fe8b..3a52878 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -147,6 +147,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler @@ -7868,10 +7050,10 @@ index e425327..3dae22c 100644 1.8.1.6 -From 287801ccf67d851f1f30e3033596b099e6d507b7 Mon Sep 17 00:00:00 2001 +From 940e0c007c1819a0433db73152d34e79bfe3a478 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 09:52:17 +0100 -Subject: [PATCH 013/108] vdpau: make interop gl default and remove setting, +Subject: [PATCH 006/102] vdpau: make interop gl default and remove setting, rename and intvert interop yuv --- @@ -7880,10 +7062,10 @@ Subject: [PATCH 013/108] vdpau: make interop gl default and remove setting, 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index e6c87e9..d18e34f 100644 +index b386d1f..2938ce0 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -5772,14 +5772,10 @@ msgid "Enable HQ Scalers for scalings above" +@@ -5768,14 +5768,10 @@ msgid "Enable HQ Scalers for scalings above" msgstr "" msgctxt "#13436" @@ -7901,7 +7083,7 @@ index e6c87e9..d18e34f 100644 #: system/settings/settings.xml msgctxt "#13500" diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 000d2cb..63a462d 100644 +index 89ac10e..c4d1a53 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -384,12 +384,15 @@ bool CDecoder::Supports(EINTERLACEMETHOD method) @@ -7976,10 +7158,10 @@ index 000d2cb..63a462d 100644 1.8.1.6 -From 2dea64df4a436a2a41e80d97fa4d58806fae7bfd Mon Sep 17 00:00:00 2001 +From a8c82958a62758ceed52249f3a4ac8bcbfa3490c Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 18:34:47 +0100 -Subject: [PATCH 014/108] vdpau: drop studio level conversion +Subject: [PATCH 007/102] vdpau: drop studio level conversion --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 4 +- @@ -8009,7 +7191,7 @@ index 88c7e5f..a904572 100644 if (m_renderMethod & RENDER_VAAPI) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 63a462d..2a6d64d 100644 +index c4d1a53..399da83 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -58,15 +58,6 @@ @@ -8131,10 +7313,10 @@ index 63a462d..2a6d64d 100644 1.8.1.6 -From 9b0ab0f30a9f31d9e758c86535a834b5967c97e5 Mon Sep 17 00:00:00 2001 +From 26de8bf477aaea18e9a5f21b5b924a96fdefbaa0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 20:28:49 +0100 -Subject: [PATCH 015/108] vdpau: observe ffmpeg tags for color space +Subject: [PATCH 008/102] vdpau: observe ffmpeg tags for color space --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 38 ++++++++++++++++++-------- @@ -8142,7 +7324,7 @@ Subject: [PATCH 015/108] vdpau: observe ffmpeg tags for color space 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 2a6d64d..b565e4a 100644 +index 399da83..4b2b4e8 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -929,6 +929,7 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame) @@ -8238,17 +7420,17 @@ index 5bee48b..ef99383 100644 1.8.1.6 -From c4582331f3afcf3b7880a59ec60e2e52a9878eef Mon Sep 17 00:00:00 2001 +From 3ba7c9a1d77d84a0dd35646e2c7bec1fb6a58aae Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 27 Jan 2013 12:10:19 +0100 -Subject: [PATCH 016/108] vdpau: switch off de-interlacing on ff +Subject: [PATCH 009/102] vdpau: switch off de-interlacing on ff --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index b565e4a..a21d436 100644 +index 4b2b4e8..c56dc9c 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -2065,8 +2065,9 @@ void CMixer::InitCycle() @@ -8267,10 +7449,10 @@ index b565e4a..a21d436 100644 1.8.1.6 -From fb76ae7ed0bc6ffd55cc701efc850efb075aaa3e Mon Sep 17 00:00:00 2001 +From 4af0c59b7e16604f3fd3096574f8696ffeae4ed8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Feb 2013 13:17:09 +0100 -Subject: [PATCH 017/108] vdpau: fix mp4 part2 decoding, activate by default +Subject: [PATCH 010/102] vdpau: fix mp4 part2 decoding, activate by default --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 3 +-- @@ -8278,15 +7460,15 @@ Subject: [PATCH 017/108] vdpau: fix mp4 part2 decoding, activate by default 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index a21d436..fe00c40 100644 +index c56dc9c..4ffeeb5 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -131,10 +131,9 @@ bool CDecoder::Open(AVCodecContext* avctx, const enum PixelFormat, unsigned int VdpDecoderProfile profile = 0; - if(avctx->codec_id == CODEC_ID_H264) + if(avctx->codec_id == AV_CODEC_ID_H264) profile = VDP_DECODER_PROFILE_H264_HIGH; -#ifdef VDP_DECODER_PROFILE_MPEG4_PART2_ASP - else if(avctx->codec_id == CODEC_ID_MPEG4) + else if(avctx->codec_id == AV_CODEC_ID_MPEG4) profile = VDP_DECODER_PROFILE_MPEG4_PART2_ASP; -#endif + @@ -8294,7 +7476,7 @@ index a21d436..fe00c40 100644 { if (!CDVDCodecUtils::IsVP3CompatibleWidth(avctx->coded_width)) diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index d3206e5..55c1b49 100644 +index c156b90..bd08884 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -165,7 +165,7 @@ void CAdvancedSettings::Initialize() @@ -8310,10 +7492,10 @@ index d3206e5..55c1b49 100644 1.8.1.6 -From 517b2b55f69be205c2b73f460d6a001b7e34e833 Mon Sep 17 00:00:00 2001 +From 80eda1fde90bf826e4128d95438e40c39e453daa Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Mar 2013 15:19:19 +0100 -Subject: [PATCH 018/108] vdpau: re-add limited range conversion +Subject: [PATCH 011/102] vdpau: re-add limited range conversion --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 4 +- @@ -8343,7 +7525,7 @@ index a904572..88c7e5f 100644 if (m_renderMethod & RENDER_VAAPI) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index fe00c40..1c32ecb 100644 +index 4ffeeb5..f913a97 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -71,6 +71,9 @@ @@ -8457,10 +7639,10 @@ index fe00c40..1c32ecb 100644 1.8.1.6 -From dd41a59d732d8aa884c957f6e69f4ebad542d6fe Mon Sep 17 00:00:00 2001 +From c2fb9cd7c4975a93111d536926e812567bdff76a Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 12:14:15 +0200 -Subject: [PATCH 019/108] linuxrenderer: drop method RenderMultiPass +Subject: [PATCH 012/102] linuxrenderer: drop method RenderMultiPass --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 9 ++------- @@ -8510,10 +7692,10 @@ index d72eb64..6b9046d 100644 1.8.1.6 -From 94cad26332b6fa92b69de5c7b83e59eb8d141398 Mon Sep 17 00:00:00 2001 +From 433a0dea19b9513ecd048255bc0ed56bf300e2fa Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 13:20:47 +0200 -Subject: [PATCH 020/108] linuxrenderer: implement progressive weave for vdpau +Subject: [PATCH 013/102] linuxrenderer: implement progressive weave for vdpau --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 55 +++++++++++++++++++-------- @@ -8641,17 +7823,17 @@ index 6b9046d..4494eca 100644 1.8.1.6 -From 0a06017adf0bdd04c970f1cf9617642033b36269 Mon Sep 17 00:00:00 2001 +From 52c5ba4d05a90cb44702ee38954397e3f61fe01d Mon Sep 17 00:00:00 2001 From: fritsch Date: Thu, 28 Mar 2013 10:38:37 +0100 -Subject: [PATCH 021/108] VDPAU: silence compiler warnings +Subject: [PATCH 014/102] VDPAU: silence compiler warnings --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 1c32ecb..d651be9 100644 +index f913a97..e9ec3d2 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -252,7 +252,7 @@ long CDecoder::Release() @@ -8740,10 +7922,10 @@ index 1c32ecb..d651be9 100644 1.8.1.6 -From 7fdbd9299f1fc81d5ae3942fcc779006e5abbd68 Mon Sep 17 00:00:00 2001 +From c6f5ff01df8481993302a56215bf8b8f7cbd45de Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 25 Feb 2013 08:47:10 +0100 -Subject: [PATCH 022/108] vdpau: release more resources on pre-cleanup +Subject: [PATCH 015/102] vdpau: release more resources on pre-cleanup --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 72 +++++++++++++++++++++++--- @@ -8751,7 +7933,7 @@ Subject: [PATCH 022/108] vdpau: release more resources on pre-cleanup 2 files changed, 68 insertions(+), 6 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index d651be9..624d4aa 100644 +index e9ec3d2..9850cf0 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -1170,6 +1170,11 @@ void CMixer::Dispose() @@ -8881,10 +8063,10 @@ index ef99383..39047b5 100644 1.8.1.6 -From 982f9760fe5f54bfecb67613732f3a24b312ab74 Mon Sep 17 00:00:00 2001 +From 9f1211ca3d1cbdc2e0eebacc54b0ea026c9462e5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 6 Mar 2013 07:35:10 +0100 -Subject: [PATCH 023/108] vdpau: set deinterlacing method to auto, if default +Subject: [PATCH 016/102] vdpau: set deinterlacing method to auto, if default method not supported --- @@ -8892,7 +8074,7 @@ Subject: [PATCH 023/108] vdpau: set deinterlacing method to auto, if default 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 624d4aa..e20a36d 100644 +index 9850cf0..0a6a1dc 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -2195,13 +2195,15 @@ void CMixer::InitCycle() @@ -8916,10 +8098,10 @@ index 624d4aa..e20a36d 100644 1.8.1.6 -From 0d5f6528fd65351078d0106c15f4cea4b7df9e20 Mon Sep 17 00:00:00 2001 +From 4b15b8414a6e20a01828a666216fe31e5d45787c Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 21 Apr 2013 09:19:34 +0200 -Subject: [PATCH 024/108] vdpau: fix deadlock if decoder is closed while +Subject: [PATCH 017/102] vdpau: fix deadlock if decoder is closed while refresh rate changes --- @@ -8927,7 +8109,7 @@ Subject: [PATCH 024/108] vdpau: fix deadlock if decoder is closed while 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index e20a36d..bb3cfb8 100644 +index 0a6a1dc..4b4b3c3 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -183,6 +183,8 @@ void CDecoder::Close() @@ -8957,10 +8139,10 @@ index e20a36d..bb3cfb8 100644 1.8.1.6 -From 992adc2a595c04add7f07d1ff874513be12463a3 Mon Sep 17 00:00:00 2001 +From 2eea278d0c8c8f6158e6676d21a26ee9a092d7fe Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 -Subject: [PATCH 025/108] renderer: bump buffers to 5 +Subject: [PATCH 018/102] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -8983,60 +8165,10 @@ index fe1f577..527ecf1 100644 1.8.1.6 -From 464bdd159494350142e6ec6dbf10b2ab5f8c4e1b Mon Sep 17 00:00:00 2001 -From: wsnipex -Date: Sun, 4 Nov 2012 14:05:52 +0100 -Subject: [PATCH 026/108] configure: add --enable-pvraddons-with-dependencies - switch for intree building of PVR Addons - ---- - configure.in | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/configure.in b/configure.in -index e6658b6..ccf6399 100644 ---- a/configure.in -+++ b/configure.in -@@ -548,6 +548,14 @@ AC_ARG_ENABLE([external-ffmpeg], - [use_external_ffmpeg=$use_external_libraries]) - - ### End of external library options -+### PVR addons specific -+AC_ARG_ENABLE([pvraddons-with-dependencies], -+ [AS_HELP_STRING([--enable-pvraddons-with-dependencies], -+ [enable build of pvr addons with dependencies (default is no) 'Linux only'])], -+ [use_pvraddons_with_deps=$enableval], -+ [use_pvraddons_with_deps=no]) -+ -+### End PVR addons specific - - if test "x$host_vendor" != "xapple"; then - DEFAULT_COMPILE_FLAGS="-fPIC -DPIC -D_REENTRANT" -@@ -2780,12 +2788,16 @@ XB_CONFIG_MODULE([pvr-addons], [ - if test "$USE_EXTERNAL_FFMPEG" = 1; then - PVR_EXT_FFMPEG="--enable-external-ffmpeg" - fi -+ if test "$use_pvraddons_with_deps" = "yes"; then -+ ADDONS_WITH_DEPS="--enable-addons-with-dependencies" -+ fi - ./configure \ - --prefix="${prefix}" \ - --host=$host_alias \ - --build=$build_alias \ - --target=$target_alias \ - $PVR_EXT_FFMPEG \ -+ $ADDONS_WITH_DEPS \ - CC="$CC" \ - CXX="$CXX" \ - CFLAGS="$CFLAGS" \ --- -1.8.1.6 - - -From 4783367b2b0039ea04f5cbe049dcfe3111ca7b70 Mon Sep 17 00:00:00 2001 +From 912d0c67dfeaa6f6e578d22ebba47bce120b3510 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 027/108] videoplayer: update frametime, it might change due to +Subject: [PATCH 019/102] videoplayer: update frametime, it might change due to fps detection --- @@ -9060,10 +8192,10 @@ index 3c30d0b..347e888 100644 1.8.1.6 -From 2e3f102f6bafffcab8e10bfb80967622864280fc Mon Sep 17 00:00:00 2001 +From fccd6c931508b24549481be5506edfa75c453cf6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 028/108] videoplayer: give streams with invalid fps a chance +Subject: [PATCH 020/102] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -9087,10 +8219,10 @@ index 347e888..1a17145 100644 1.8.1.6 -From 6f163a35345945c740ec8d3e93e7402c05478e3b Mon Sep 17 00:00:00 2001 +From a81d65436a5f17fa4f2a603202226f9e03559da3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 029/108] dvdplayer: allow rewinding at end of stream, do a +Subject: [PATCH 021/102] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -9127,10 +8259,10 @@ index c944164..d2c164d 100644 1.8.1.6 -From 2c81cdc7e8984651edcda1a8385075ccf12c2a1c Mon Sep 17 00:00:00 2001 +From 032fcb7f890213fc98c6e4b87aa01b72cef00ed6 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 030/108] X11: ditch SDL for video and window events +Subject: [PATCH 022/102] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -9146,10 +8278,10 @@ Subject: [PATCH 030/108] X11: ditch SDL for video and window events create mode 100644 xbmc/windowing/WinEventsX11.h diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index d4932d3..7dec8e2 100644 +index 3937ce8..a5603a2 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -828,7 +828,7 @@ bool CApplication::CreateGUI() +@@ -833,7 +833,7 @@ bool CApplication::CreateGUI() uint32_t sdlFlags = 0; @@ -9159,7 +8291,7 @@ index d4932d3..7dec8e2 100644 #endif diff --git a/xbmc/system.h b/xbmc/system.h -index 3fadcc4..bf7d378 100644 +index 7ccda52..bb6b72e 100644 --- a/xbmc/system.h +++ b/xbmc/system.h @@ -171,16 +171,21 @@ @@ -10614,10 +9746,10 @@ index 3dae22c..25faaef 100644 1.8.1.6 -From c50ee0cb261b755753cc287a31b3fed67fa3dac7 Mon Sep 17 00:00:00 2001 +From d0df3b13fea9db9398a735d7e62521792a979b47 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 031/108] X11: Add xbmc icon +Subject: [PATCH 023/102] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -10806,10 +9938,10 @@ index 25faaef..c1e6cf1 100644 1.8.1.6 -From 9e9a8f20ad945284ac3a0455eb5cf2a0106caf05 Mon Sep 17 00:00:00 2001 +From 65aebb38fe69e318e24f97463f36844f25df403d Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 032/108] X11: add SDL joystick until we have a better solution +Subject: [PATCH 024/102] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -10863,10 +9995,10 @@ index 5a8bbb8..5bc1de0 100644 1.8.1.6 -From 2d85f6a2114ddb9d723a568bec916cf31c0d6b3d Mon Sep 17 00:00:00 2001 +From fbf03404e591bded3b44f15c37361d1d8c5be329 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 033/108] X11: factor out code handling device reset +Subject: [PATCH 025/102] X11: factor out code handling device reset notification --- @@ -10930,10 +10062,10 @@ index c1e6cf1..041ea55 100644 1.8.1.6 -From 79f7e14ac628831289b6391e32b2271ff553ff8e Mon Sep 17 00:00:00 2001 +From 0014004481658c3d6005125469b60e7bc72d327a Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 034/108] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 026/102] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -11077,10 +10209,10 @@ index fd51dc0..d495443 100644 1.8.1.6 -From 7eab3afa072ded005ce14c63015e5a04cd7f5ec5 Mon Sep 17 00:00:00 2001 +From 3ec9e9375843ab73c4ff0004ba1a49080fa2ffde Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 035/108] xrandr: remove method RestoreState +Subject: [PATCH 027/102] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -11159,10 +10291,10 @@ index e3450fe..cf22fbf 100644 1.8.1.6 -From 6b3e1abe885b9cd26478a346e230f1c60ae96b1c Mon Sep 17 00:00:00 2001 +From 3d946dacebecf4196f61ceed7818b0f600cf2596 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 036/108] xrandr: observe orientation +Subject: [PATCH 028/102] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -11377,10 +10509,10 @@ index cf22fbf..71ffab4 100644 1.8.1.6 -From 8dff8b91dcb92e4c670da2be641ec695f975bd47 Mon Sep 17 00:00:00 2001 +From b8e3cbb4018cb32cdfebf704259f314863ee368f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 037/108] xrandr: allow getting info for multiple screen's +Subject: [PATCH 029/102] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -11555,10 +10687,10 @@ index 71ffab4..26c2653 100644 1.8.1.6 -From 565dbaa5a216e99fe991c96154dc26f01a80ffd5 Mon Sep 17 00:00:00 2001 +From b49cf34b5fce8e4e81b373bb001ccda853431686 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 038/108] X11: fix multi-head setups +Subject: [PATCH 030/102] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -11573,10 +10705,10 @@ Subject: [PATCH 038/108] X11: fix multi-head setups 9 files changed, 229 insertions(+), 116 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index d18e34f..3029d7e 100644 +index 2938ce0..f080947 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -1000,7 +1000,9 @@ msgctxt "#245" +@@ -999,7 +999,9 @@ msgctxt "#245" msgid "Sizing: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixels: %2.2f:1) (VShift: %2.2f)" msgstr "" @@ -11636,7 +10768,7 @@ index 5c7a288..f3fd4fb 100644 virtual void SetViewPort(CRect& viewPort); virtual void GetViewPort(CRect& viewPort); diff --git a/xbmc/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp -index 7b77337..6d1c6b1 100644 +index 49b50f4..203c0f1 100644 --- a/xbmc/settings/DisplaySettings.cpp +++ b/xbmc/settings/DisplaySettings.cpp @@ -198,13 +198,19 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) @@ -11722,7 +10854,7 @@ index 7b77337..6d1c6b1 100644 + } +} diff --git a/xbmc/settings/DisplaySettings.h b/xbmc/settings/DisplaySettings.h -index 446e6a0..30ce344 100644 +index 056fc07..fe91a74 100644 --- a/xbmc/settings/DisplaySettings.h +++ b/xbmc/settings/DisplaySettings.h @@ -78,6 +78,7 @@ class CDisplaySettings : public ISettingCallback, public ISubSettings, @@ -11742,7 +10874,7 @@ index 446e6a0..30ce344 100644 protected: CDisplaySettings(); diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 3c8ff5e..fdbc34e 100644 +index 7c15049..aaa291b 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -365,6 +365,7 @@ void CSettings::Uninitialize() @@ -12327,10 +11459,10 @@ index 0d4436b..0336b3b 100644 1.8.1.6 -From 901e1013dc9e99f1c01be6ad98ff2aef0dac4468 Mon Sep 17 00:00:00 2001 +From 57735c23ecfa91303458320a1bfcecdf4378698a Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 039/108] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 031/102] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -12398,10 +11530,10 @@ index 1bea366..cc39720 100644 1.8.1.6 -From 21759dcbc20b24b7210a70270a2084559bdb7627 Mon Sep 17 00:00:00 2001 +From 4f0e81c218442618f3ece62c2e9149d425e13edf Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 040/108] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 032/102] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -12473,10 +11605,10 @@ index ca239cf..687e3ff 100644 1.8.1.6 -From 17bc1a357b38eba067bf5052e0a076980a3af194 Mon Sep 17 00:00:00 2001 +From c6fbd6d50781e1cd1ddda0df66788c6ff650455e Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 041/108] X11: recreate gl context after output has changed +Subject: [PATCH 033/102] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -12627,10 +11759,10 @@ index cc39720..dda7b14 100644 1.8.1.6 -From fff1a8590ae02a1a0472384a6ecf77c6d9fec1b1 Mon Sep 17 00:00:00 2001 +From bd831cf16e33dd24ea12f17608480d0ed1210ebe Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 042/108] X11: hook video reference clock in windowing +Subject: [PATCH 034/102] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- @@ -12835,10 +11967,10 @@ index 1791570..bcabc9f 100644 1.8.1.6 -From 1137fceec8d5bb6596a025103b672fb703587b7a Mon Sep 17 00:00:00 2001 +From 68bcd2002f60f3af647976647ffa93f106fbfd12 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 043/108] X11: fix video calibrations +Subject: [PATCH 035/102] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -12930,10 +12062,10 @@ index 2227320..630c0e2 100644 1.8.1.6 -From e2cabb596594a2fa9b4cb6bebd2ae589b7c9a169 Mon Sep 17 00:00:00 2001 +From f61b681ff6d899f400c7a81dedd5a84df5c22339 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 044/108] X11: deactivate screen saver on startup +Subject: [PATCH 036/102] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -13003,10 +12135,10 @@ index 630c0e2..f78f613 100644 1.8.1.6 -From 6ef08980a7963a66d8be88d95bf8d9a5aedd5fb8 Mon Sep 17 00:00:00 2001 +From 4ae10748b188af4b958f6d7cf4026eb8392d93cf Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 045/108] X11: change method of going full-screen +Subject: [PATCH 037/102] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -13050,10 +12182,10 @@ index c643177..e1e1096 100644 1.8.1.6 -From 56556b596712acb7c4a09362adb0b8401b49048a Mon Sep 17 00:00:00 2001 +From 15fd7c225a1fedeeb0df0efa8c32d644e2ac1f7c Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 046/108] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 038/102] X11: reset key repeat and key modifier on focus lost and gain --- @@ -13085,10 +12217,10 @@ index c58067b..c9f8a20 100644 1.8.1.6 -From 37100804752375a14ae6a14ba79ff103d874e23e Mon Sep 17 00:00:00 2001 +From e2cf3d4f4abc2e9ca108f0ab351e02499a384483 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 047/108] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 039/102] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -13305,10 +12437,10 @@ index 6100933..72955ad 100644 1.8.1.6 -From fe5c3055858b6dba9149623404c7c98c46fafcd9 Mon Sep 17 00:00:00 2001 +From fc75a6126c42b073f2f2aeb20518b8140be08de2 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 048/108] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 040/102] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -13372,10 +12504,10 @@ index 72955ad..102a076 100644 1.8.1.6 -From 1376a1adb5b37ccb5c19d25297db6262d411dad6 Mon Sep 17 00:00:00 2001 +From 47d1862cc17ce789e27765e619ff301eb796c4bd Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 049/108] add missing keys to xbmc keytable +Subject: [PATCH 041/102] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ @@ -13398,10 +12530,10 @@ index f18e9b1..066cd77 100644 1.8.1.6 -From 8f3f92e8b62fad1658134e71f4f784bf291c6525 Mon Sep 17 00:00:00 2001 +From 598a41f55d9931cfd96bb27c54640b1c7b057cb8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 050/108] videorefclock: temp deactivate of nv settings +Subject: [PATCH 042/102] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -13424,10 +12556,10 @@ index 4287e8f..21f59b8 100644 1.8.1.6 -From e3bae97ddd7285bdd073ebf7088610d827b4a6cf Mon Sep 17 00:00:00 2001 +From 99e6d6d6e5f08851f5dea4d4b1977f21303bd6c9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 051/108] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 043/102] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -13458,10 +12590,10 @@ index 21f59b8..0156b2c 100644 1.8.1.6 -From a2bd30bc2c5cede7aac4059db39eba3a2f363cdf Mon Sep 17 00:00:00 2001 +From 93948feffd07f438b759d62de16e6b60cca92efb Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 052/108] X11: fix icon texture after +Subject: [PATCH 044/102] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -13569,10 +12701,10 @@ index e1e1096..ace57ff 100644 1.8.1.6 -From d9720f2ad750c17466fed718b1c246e4af6f6797 Mon Sep 17 00:00:00 2001 +From 392ae0d8960a9323557f73ceff9a7cf633426a1e Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 053/108] X11: check for window manager +Subject: [PATCH 045/102] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -13693,10 +12825,10 @@ index f78f613..f479c27 100644 1.8.1.6 -From 658e79229d4831c816f6512507a15f8a7cea7d6e Mon Sep 17 00:00:00 2001 +From 9d1ff8a5de5c0446fb56a139c47ffcbe5aedadc7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 054/108] X11: dont set window on xrandr if no mode available +Subject: [PATCH 046/102] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -13733,10 +12865,10 @@ index 188864b..076ed82 100644 1.8.1.6 -From feb73eb6c73b7ce8eb0e543232a04b738c621f37 Mon Sep 17 00:00:00 2001 +From 53f160f7ae0e7cfb7ec2f31d8e5ccfd1f64307eb Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 055/108] X11: fix crash after a resolution change on startup +Subject: [PATCH 047/102] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -13760,10 +12892,10 @@ index 076ed82..ee339d9 100644 1.8.1.6 -From 02e236f99eedcbc73c42b2bb094a530ed46b551f Mon Sep 17 00:00:00 2001 +From 97565ca19a795be538d8c934314d13558db1d0ce Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 056/108] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 048/102] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -13786,10 +12918,10 @@ index ee339d9..d2dcccd 100644 1.8.1.6 -From 9ca7e258c30c1b5b5192a9c56e67805653e35204 Mon Sep 17 00:00:00 2001 +From cf66f5804bbb06de20978de888b2a976899d4938 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 8 Oct 2011 16:45:13 +0200 -Subject: [PATCH 057/108] ffmpeg: add xvba hwaccel +Subject: [PATCH 049/102] ffmpeg: add xvba hwaccel --- lib/ffmpeg/configure | 11 ++ @@ -14638,10 +13770,10 @@ index 1c00ac4..6437e29 100644 1.8.1.6 -From 2b4c4e39e72458e3170c70a8f8149714384a3a25 Mon Sep 17 00:00:00 2001 +From 96300b1dd6757bdfa825d67691edd73473f6f310 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Apr 2012 12:09:31 +0200 -Subject: [PATCH 058/108] xvba: add decoder +Subject: [PATCH 050/102] xvba: add decoder --- configure.in | 47 + @@ -14664,7 +13796,7 @@ Subject: [PATCH 058/108] xvba: add decoder create mode 100644 xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h diff --git a/configure.in b/configure.in -index ccf6399..f8ee40b 100644 +index bd2934d..94f6455 100644 --- a/configure.in +++ b/configure.in @@ -143,6 +143,8 @@ vaapi_not_found="== Could not find libva. VAAPI support disabled. ==" @@ -14689,7 +13821,7 @@ index ccf6399..f8ee40b 100644 AC_ARG_ENABLE([vtbdecoder], [AS_HELP_STRING([--enable-vtbdecoder], -@@ -1788,6 +1796,37 @@ else +@@ -1780,6 +1788,37 @@ else USE_CRYSTALHD=0 fi @@ -14727,7 +13859,7 @@ index ccf6399..f8ee40b 100644 # VTBDecoder if test "x$use_vtbdecoder" != "xno"; then if test "$host_vendor" = "apple" ; then -@@ -1985,6 +2024,12 @@ else +@@ -1977,6 +2016,12 @@ else final_message="$final_message\n CrystalHD:\tNo" fi @@ -14740,7 +13872,7 @@ index ccf6399..f8ee40b 100644 if test "x$use_vtbdecoder" != "xno"; then final_message="$final_message\n VTBDecoder:\tYes" else -@@ -2454,6 +2499,7 @@ AC_SUBST(USE_OPENGLES) +@@ -2447,6 +2492,7 @@ AC_SUBST(USE_OPENGLES) AC_SUBST(USE_VDPAU) AC_SUBST(USE_VAAPI) AC_SUBST(USE_CRYSTALHD) @@ -14748,7 +13880,7 @@ index ccf6399..f8ee40b 100644 AC_SUBST(USE_LIBSMBCLIENT) AC_SUBST(USE_LIBNFS) AC_SUBST(USE_LIBAFPCLIENT) -@@ -2635,6 +2681,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [ +@@ -2631,6 +2677,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [ `if test "x$use_vdpau" != "xno"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \ `if test "x$use_vaapi" != "xno"; then echo --enable-vaapi; else echo --disable-vaapi; fi` \ `if test "$use_optimizations" != "no"; then echo --enable-optimizations; else echo --disable-optimizations; fi` \ @@ -14757,10 +13889,10 @@ index ccf6399..f8ee40b 100644 --enable-pthreads \ --enable-runtime-cpudetect \ diff --git a/language/English/strings.po b/language/English/strings.po -index 3029d7e..8ffd225 100644 +index f080947..62f7138 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -5777,7 +5777,11 @@ msgctxt "#13436" +@@ -5773,7 +5773,11 @@ msgctxt "#13436" msgid "Prefer VDPAU Video Mixer" msgstr "" @@ -14773,7 +13905,7 @@ index 3029d7e..8ffd225 100644 #: system/settings/settings.xml msgctxt "#13500" -@@ -6855,7 +6859,11 @@ msgctxt "#16325" +@@ -6851,7 +6855,11 @@ msgctxt "#16325" msgid "VDPAU - Bob" msgstr "" @@ -15206,10 +14338,10 @@ index 6ed62be..70ae9bf 100644 #endif diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index 0ad88ce..2834708 100644 +index a59ee4d..f94760c 100644 --- a/xbmc/cores/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoRenderers/RenderManager.cpp -@@ -937,6 +937,10 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic) +@@ -941,6 +941,10 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic) else if(pic.format == RENDER_FMT_VAAPI) m_pRenderer->AddProcessor(*pic.vaapi, index); #endif @@ -15243,7 +14375,7 @@ index 13a2648..347f09b 100644 struct { COpenMax *openMax; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 6569d9c..6f7565a 100644 +index ec93844..9d4a6b4 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -60,6 +60,9 @@ @@ -18093,10 +17225,10 @@ index 40d8c61..9cb1c5c 100644 1.8.1.6 -From 19dd3a7cd6b6c47d19f6369991612b22e033cb3a Mon Sep 17 00:00:00 2001 +From 84cf3a0d4507c9fa23f9d5d03892ad61bae52518 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sun, 4 Nov 2012 16:24:10 +0100 -Subject: [PATCH 059/108] xvba: add string for available decoders - we are +Subject: [PATCH 051/102] xvba: add string for available decoders - we are important so make sure we are there --- @@ -18104,7 +17236,7 @@ Subject: [PATCH 059/108] xvba: add string for available decoders - we are 1 file changed, 5 insertions(+) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp -index 9ad29f9..95cdb31 100644 +index 1477264..37a5994 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp @@ -177,6 +177,11 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, unsigne @@ -18123,17 +17255,17 @@ index 9ad29f9..95cdb31 100644 1.8.1.6 -From 19113c6773bc804f41db5865f9048806988c8083 Mon Sep 17 00:00:00 2001 +From a058ad8b964fc01b94843936bd8cf97fc6fed8a9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Jun 2012 12:46:30 +0200 -Subject: [PATCH 060/108] xvba: do not use vaapi if xvba is present +Subject: [PATCH 052/102] xvba: do not use vaapi if xvba is present --- xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -index dd96ce8..3943d52 100644 +index 2343b11..f102cba 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp @@ -261,6 +261,15 @@ void CDecoder::Close() @@ -18156,20 +17288,20 @@ index dd96ce8..3943d52 100644 1.8.1.6 -From cc88864ed74d42552ad637d9a7709928716ca739 Mon Sep 17 00:00:00 2001 +From fe378ad535ca96e1e25d777ca3c8c1c766ac8f2a Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 -Subject: [PATCH 061/108] ffmpeg: add av_find_default_stream_index to interface +Subject: [PATCH 053/102] ffmpeg: add av_find_default_stream_index to interface --- lib/DllAvFormat.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h -index c3029db..4bccc8d 100644 +index ee41fa8..56605cb 100644 --- a/lib/DllAvFormat.h +++ b/lib/DllAvFormat.h -@@ -99,6 +99,7 @@ class DllAvFormatInterface +@@ -100,6 +100,7 @@ class DllAvFormatInterface virtual int avformat_write_header (AVFormatContext *s, AVDictionary **options)=0; virtual int av_write_trailer(AVFormatContext *s)=0; virtual int av_write_frame (AVFormatContext *s, AVPacket *pkt)=0; @@ -18177,7 +17309,7 @@ index c3029db..4bccc8d 100644 }; #if (defined USE_EXTERNAL_FFMPEG) || (defined TARGET_DARWIN) -@@ -155,6 +156,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface +@@ -157,6 +158,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface virtual int avformat_write_header (AVFormatContext *s, AVDictionary **options) { return ::avformat_write_header (s, options); } virtual int av_write_trailer(AVFormatContext *s) { return ::av_write_trailer(s); } virtual int av_write_frame (AVFormatContext *s, AVPacket *pkt) { return ::av_write_frame(s, pkt); } @@ -18185,7 +17317,7 @@ index c3029db..4bccc8d 100644 // DLL faking. virtual bool ResolveExports() { return true; } -@@ -222,6 +224,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface +@@ -225,6 +227,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface DEFINE_METHOD2(int, avformat_write_header , (AVFormatContext *p1, AVDictionary **p2)) DEFINE_METHOD1(int, av_write_trailer, (AVFormatContext *p1)) DEFINE_METHOD2(int, av_write_frame , (AVFormatContext *p1, AVPacket *p2)) @@ -18193,7 +17325,7 @@ index c3029db..4bccc8d 100644 BEGIN_METHOD_RESOLVE() RESOLVE_METHOD_RENAME(av_register_all, av_register_all_dont_call) RESOLVE_METHOD_RENAME(avformat_network_init, avformat_network_init_dont_call) -@@ -257,6 +260,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface +@@ -261,6 +264,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface RESOLVE_METHOD(avformat_write_header) RESOLVE_METHOD(av_write_trailer) RESOLVE_METHOD(av_write_frame) @@ -18205,10 +17337,10 @@ index c3029db..4bccc8d 100644 1.8.1.6 -From 1223a2838c174e96f6415b624b1bc3dd187ec992 Mon Sep 17 00:00:00 2001 +From 7729acdc63484a032d20da5b609bdea88373d3f2 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 13 Apr 2013 11:30:39 +0200 -Subject: [PATCH 062/108] XVBA: revisit draw functions +Subject: [PATCH 054/102] XVBA: revisit draw functions --- lib/ffmpeg/libavcodec/xvba_h264.c | 2 +- @@ -18245,10 +17377,10 @@ index bf3d9c2..ff35a28 100644 1.8.1.6 -From a003efc4db7ac847791e4363757df7a8fc756a1c Mon Sep 17 00:00:00 2001 +From d9f4c8ca5a991f2edc6d2c2ae779c6cbb9f77d42 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 13 Apr 2013 12:06:02 +0200 -Subject: [PATCH 063/108] (ffmpeg): Make XVBA codec available +Subject: [PATCH 055/102] (ffmpeg): Make XVBA codec available --- lib/ffmpeg/libavcodec/vc1dec.c | 3 +++ @@ -18272,10 +17404,10 @@ index 2130c74..4d611f9 100644 1.8.1.6 -From 8cee691d35019c077ba92a0166349faf020a9569 Mon Sep 17 00:00:00 2001 +From 1cdb4ff2620c3b51a0f59431cfe033726213d3cb Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 13 Apr 2013 16:38:50 +0200 -Subject: [PATCH 064/108] ffmpeg: XVBA-VC1 use v->second_field instead of +Subject: [PATCH 056/102] ffmpeg: XVBA-VC1 use v->second_field instead of !s->first_field to make VC1 interlaced working --- @@ -18299,10 +17431,10 @@ index ff35a28..04e7983 100644 1.8.1.6 -From 47a427729d9b087d13fb868c25126e9b678a1359 Mon Sep 17 00:00:00 2001 +From ecf87ec391f752b8ce43656e86fdf4c70f551937 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 27 Apr 2013 17:36:15 +0200 -Subject: [PATCH 065/108] XVBA: Only set second_field when we are interlaced +Subject: [PATCH 057/102] XVBA: Only set second_field when we are interlaced and an interlaced field --- @@ -18326,10 +17458,10 @@ index 04e7983..eb90c12 100644 1.8.1.6 -From d29e61bd85fc5de04551db8945b206a123345f31 Mon Sep 17 00:00:00 2001 +From 765db9affdc0b8d9655db4a6dde877fe23fc74d2 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 27 Apr 2013 22:08:50 +0200 -Subject: [PATCH 066/108] xvba: translate picture_structure to a value xvba +Subject: [PATCH 058/102] xvba: translate picture_structure to a value xvba understands --- @@ -18412,10 +17544,10 @@ index eb90c12..c98dba5 100644 1.8.1.6 -From 4e6d7a038570b0c9f5e6ecadbbfd2c0489d7c74a Mon Sep 17 00:00:00 2001 +From 3e3febf9599946020ec1ad3043118cf8882dfbd4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 30 Apr 2013 21:18:55 +0200 -Subject: [PATCH 067/108] ffmpeg xvba: fix vc1 field interlace +Subject: [PATCH 059/102] ffmpeg xvba: fix vc1 field interlace --- lib/ffmpeg/libavcodec/xvba.c | 4 ++-- @@ -18467,10 +17599,10 @@ index c98dba5..e7a85a7 100644 1.8.1.6 -From 1222b33bb0662eb0e8766b930d6ece71d97b06bb Mon Sep 17 00:00:00 2001 +From 27694118feee9548df40b712500cc0fbae770b47 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 30 Apr 2013 21:19:07 +0200 -Subject: [PATCH 068/108] xvba: fix vc1 field interlace +Subject: [PATCH 060/102] xvba: fix vc1 field interlace --- xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp | 3 +++ @@ -18494,10 +17626,10 @@ index 43a331f..568632f 100644 1.8.1.6 -From eb79bf151d602b8c84ac1b0539fc7baf7ea6fb7a Mon Sep 17 00:00:00 2001 +From 5cb9feb3d378f9c46b51581452ccbc481ce6ce14 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 30 Apr 2013 21:40:55 +0200 -Subject: [PATCH 069/108] xvba: vc1 - honor psf +Subject: [PATCH 061/102] xvba: vc1 - honor psf --- xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp | 3 +++ @@ -18528,17 +17660,17 @@ index 568632f..1db9363 100644 1.8.1.6 -From 13199aba1642585a76c70753f0a5dde73fd602cd Mon Sep 17 00:00:00 2001 +From 34cdb5c0db63df84dc601a8b5b57d6316c62a056 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 4 May 2013 10:31:32 +0200 -Subject: [PATCH 070/108] xvba: squash me, settings +Subject: [PATCH 062/102] xvba: squash me, settings --- xbmc/settings/Settings.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index fdbc34e..efdde63 100644 +index aaa291b..bca003a 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -738,6 +738,9 @@ void CSettings::InitializeConditions() @@ -18555,10 +17687,10 @@ index fdbc34e..efdde63 100644 1.8.1.6 -From 128a48ae2c438f287f0890cf0d417d190beed436 Mon Sep 17 00:00:00 2001 +From 4529fa75c62e7a91d93bd8ef38abad7da8a5415b Mon Sep 17 00:00:00 2001 From: fritsch Date: Fri, 24 May 2013 12:02:02 +0200 -Subject: [PATCH 071/108] XVBA: Limit video to 2048x1152 as this is the max all +Subject: [PATCH 063/102] XVBA: Limit video to 2048x1152 as this is the max all blocks can handle --- @@ -18588,10 +17720,10 @@ index 1db9363..54d7aea 100644 1.8.1.6 -From 66dd4ead4323eaab122c7b28d78a694712ebfb51 Mon Sep 17 00:00:00 2001 +From 8524cebfcfde67b40e6aec08d6e5f37952a3f070 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 072/108] dvdplayer: observe pts counter overflow +Subject: [PATCH 064/102] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- @@ -18599,7 +17731,7 @@ Subject: [PATCH 072/108] dvdplayer: observe pts counter overflow 2 files changed, 201 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 098e6e2..fb8fa02 100644 +index 18c1c4b..0e25041 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -18,7 +18,6 @@ @@ -18878,10 +18010,10 @@ index b78094e..17d2f7a 100644 1.8.1.6 -From bbb0ee3ef49936ff4c0e5bd8921813f85f835002 Mon Sep 17 00:00:00 2001 +From f7bba8195ee608d1d37323fb621e18c6faef5e4b Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 073/108] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 065/102] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -18914,10 +18046,10 @@ index 41e64a5..74b4391 100644 1.8.1.6 -From a24004ba055ccdff661bea0d6e7c24d8468f57a6 Mon Sep 17 00:00:00 2001 +From 194e21ab35ded27f327ae0837da7014dd68dfb1e Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 074/108] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 066/102] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -18926,7 +18058,7 @@ Subject: [PATCH 074/108] vdpau: advanced settings for auto deinterlacing 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index bb3cfb8..1aeef6a 100644 +index 4b4b3c3..fc4c030 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -1800,10 +1800,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */) @@ -18945,7 +18077,7 @@ index bb3cfb8..1aeef6a 100644 if (deint != -1) { diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 55c1b49..f0afc74 100644 +index bd08884..a7a7233 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -169,6 +169,8 @@ void CAdvancedSettings::Initialize() @@ -18957,7 +18089,7 @@ index 55c1b49..f0afc74 100644 m_videoVDPAUtelecine = false; m_videoVDPAUdeintSkipChromaHD = false; m_DXVACheckCompatibility = false; -@@ -584,6 +586,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) +@@ -583,6 +585,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI); XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace); XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1); @@ -18967,7 +18099,7 @@ index 55c1b49..f0afc74 100644 XMLUtils::GetBoolean(pElement,"vdpauHDdeintSkipChroma",m_videoVDPAUdeintSkipChromaHD); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index d41cbcf..10adbb9 100644 +index 3a52878..3e6901b 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -147,6 +147,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler @@ -18983,10 +18115,10 @@ index d41cbcf..10adbb9 100644 1.8.1.6 -From 600eb385f152725667354b11027f15ac91cad675 Mon Sep 17 00:00:00 2001 +From 39b24d311dc59492752635899d73f2e404f74fac Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 075/108] player: fix rewind +Subject: [PATCH 067/102] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -19186,10 +18318,10 @@ index 74b4391..11e0b26 100644 if (!m_pVideoCodec->GetCodecStats(iDecoderPts, iSkippedDeint, interlaced)) iDecoderPts = pts; diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.h b/xbmc/cores/dvdplayer/DVDPlayerVideo.h -index 9477a6b..41e72c8 100644 +index 3c3e007..6ae3860 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.h +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.h -@@ -51,6 +51,7 @@ class CDroppingStats +@@ -50,6 +50,7 @@ class CDroppingStats double m_totalGain; double m_lastDecoderPts; double m_lastRenderPts; @@ -19201,10 +18333,10 @@ index 9477a6b..41e72c8 100644 1.8.1.6 -From 7400869def01734e52f829376f6057720819c0ae Mon Sep 17 00:00:00 2001 +From 54cf251b01804dbb4484b08911aca11d3dc78a6b Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 076/108] xrandr: fix query for multiple screens +Subject: [PATCH 068/102] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -19245,10 +18377,10 @@ index 97b1e32..a3d3543 100644 1.8.1.6 -From 799f6fee0638091c18d992e0903d2dbb4c8256ba Mon Sep 17 00:00:00 2001 +From 8ab34a11535ed7ed9b7cda38e09c0ca147387c88 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 077/108] X11: add debug log to print out refresh after xrr +Subject: [PATCH 069/102] X11: add debug log to print out refresh after xrr event --- @@ -19276,10 +18408,10 @@ index d2dcccd..7403785 100644 1.8.1.6 -From 47f804211c71e7700b14b3ac6936abbc9b377c17 Mon Sep 17 00:00:00 2001 +From dc8c7fbe173848a3007caf3a9c85469669051c7d Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 078/108] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 070/102] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -19304,10 +18436,10 @@ index 7403785..0e39867 100644 1.8.1.6 -From 5e1de3a0d53d3456f4fbad541c162fb8c68ac378 Mon Sep 17 00:00:00 2001 +From 69111a8676eeae2fd7dd727ff430e8f72de10dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Coutant?= Date: Wed, 12 Dec 2012 19:49:47 +0100 -Subject: [PATCH 079/108] x11: support for multiple x screens +Subject: [PATCH 071/102] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -19330,10 +18462,10 @@ index a3d3543..8846bc6 100644 1.8.1.6 -From 391502eea2356a8f4ee2cc4242240102e4c1367f Mon Sep 17 00:00:00 2001 +From c114410550cf702e040405a9a81b3877bb71f296 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 080/108] pvr: increase changes counter of stream on stream +Subject: [PATCH 072/102] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- @@ -19341,7 +18473,7 @@ Subject: [PATCH 080/108] pvr: increase changes counter of stream on stream 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp -index 2c10a7b..6ea1f23 100644 +index 305ba07..3ad9792 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp @@ -339,9 +339,7 @@ void CDVDDemuxPVRClient::RequestStreams() @@ -19349,9 +18481,9 @@ index 2c10a7b..6ea1f23 100644 { st = dynamic_cast(stm); - if (!st -- || (st->codec != (CodecID)props.stream[i].iCodecId) +- || (st->codec != (AVCodecID)props.stream[i].iCodecId) - || (st->iChannels != props.stream[i].iChannels)) -+ if (!st || (st->codec != (CodecID)props.stream[i].iCodecId)) ++ if (!st || (st->codec != (AVCodecID)props.stream[i].iCodecId)) DisposeStream(i); } if (!m_streams[i]) @@ -19367,10 +18499,10 @@ index 2c10a7b..6ea1f23 100644 1.8.1.6 -From f81e13d79d5975935746c0b3c525c86c20bc1fbc Mon Sep 17 00:00:00 2001 +From 4539f4f93769d87840bfffbc7455f721db55b38e Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH 081/108] X11: add keymapping for XF86XK_Sleep +Subject: [PATCH 073/102] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -19392,10 +18524,10 @@ index 4a5aab4..da5d412 100644 1.8.1.6 -From 5b3918272a92652b6c0ba46686e7195e2d31334a Mon Sep 17 00:00:00 2001 +From d9b9f8e39cae0b5b42018427b1a84a507fb767c6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 -Subject: [PATCH 082/108] X11: remove toggle full screen after resume +Subject: [PATCH 074/102] X11: remove toggle full screen after resume --- xbmc/powermanagement/PowerManager.cpp | 5 ----- @@ -19421,10 +18553,10 @@ index f2a063f..f1e3c4f 100644 1.8.1.6 -From cd0e6cad21502e0d64092fc2be76c44fa59cf68b Mon Sep 17 00:00:00 2001 +From c629d743d0a700476937cb730a343528153426ea Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 -Subject: [PATCH 083/108] xrandr: set screen on mode change command +Subject: [PATCH 075/102] xrandr: set screen on mode change command --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -19447,10 +18579,10 @@ index 8846bc6..e6d6240 100644 1.8.1.6 -From 5e6561e728d658a845ef4ab7961ce074ee5f5b4a Mon Sep 17 00:00:00 2001 +From 8eb507a19cb21901d21814d8b9ab30ae7feac834 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 -Subject: [PATCH 084/108] X11: recreate glx context when output changes +Subject: [PATCH 076/102] X11: recreate glx context when output changes --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -19501,10 +18633,10 @@ index f479c27..7345c06 100644 1.8.1.6 -From 856ef0fe858f030613c4a37f5ea2e2b4574fe7c5 Mon Sep 17 00:00:00 2001 +From fc9e0ef3ca01feafe62d318e00fae4597c5d2d3d Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 -Subject: [PATCH 085/108] pvr: do not show selection dialog for a single menu +Subject: [PATCH 077/102] pvr: do not show selection dialog for a single menu hook --- @@ -19547,10 +18679,10 @@ index 2b43bcb..d07f23d 100644 1.8.1.6 -From 47da3eb6168e3b7fa1202f61b01c89c8a02709af Mon Sep 17 00:00:00 2001 +From 2a6c00739b48f743b7250c2cfd085df783b2471e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 -Subject: [PATCH 086/108] X11: use default screen parameters if no output +Subject: [PATCH 078/102] X11: use default screen parameters if no output connected --- @@ -19654,10 +18786,10 @@ index d865cd7..97975dd 100644 1.8.1.6 -From 4b962c36c4c65f26ef30a0f1be911d17be0e2aa5 Mon Sep 17 00:00:00 2001 +From bdb23df225dd086438cc163dc2341b6d8b7017a3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 -Subject: [PATCH 087/108] X11: create parent window +Subject: [PATCH 079/102] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -19923,10 +19055,10 @@ index 7345c06..770ae84 100644 1.8.1.6 -From fa91d1013c5431f19e166eba1553174698215133 Mon Sep 17 00:00:00 2001 +From 93252a9917eefbe02f3013e340d5cea7c44b2ecd Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 -Subject: [PATCH 088/108] X11: use system key repeat rate instead of hardcoded +Subject: [PATCH 080/102] X11: use system key repeat rate instead of hardcoded one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441 --- @@ -20128,10 +19260,10 @@ index 102a076..5b1f3fa 100644 1.8.1.6 -From 78fe3057ca88dfe4b77659dc90c817c4f4417b60 Mon Sep 17 00:00:00 2001 +From 3ce0aabd6142f413046d6a91e10a1fd8bd67f418 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 -Subject: [PATCH 089/108] linux: use CLOCK_MONOTONIC_RAW as this is not subject +Subject: [PATCH 081/102] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -20169,20 +19301,20 @@ index 8304ef6..ba27257 100644 1.8.1.6 -From 91015d3bcbf56dc5b1f930787e5544cfa3b2164c Mon Sep 17 00:00:00 2001 +From 24d4e5ee8c9bf1054f2313853b39a430d82f63e1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 -Subject: [PATCH 090/108] OMXPlayer: some caching fixes for pvr +Subject: [PATCH 082/102] OMXPlayer: some caching fixes for pvr --- xbmc/cores/omxplayer/OMXPlayer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index 882c660..d9998c6 100644 +index 70a2405..db17114 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -2353,7 +2353,8 @@ void COMXPlayer::HandleMessages() +@@ -2432,7 +2432,8 @@ void COMXPlayer::HandleMessages() // 1. disable audio // 2. skip frames and adjust their pts or the clock m_playSpeed = speed; @@ -20196,20 +19328,20 @@ index 882c660..d9998c6 100644 1.8.1.6 -From 463805b26a8a59cbdc0a347e71265aa869ac1203 Mon Sep 17 00:00:00 2001 +From 9eccfb9b772f299a6f2d1f1c16d76a4334a72efd Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 -Subject: [PATCH 091/108] fix incorrect display of fps when dr kicks in +Subject: [PATCH 083/102] fix incorrect display of fps when dr kicks in --- xbmc/Application.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 7dec8e2..ed4683e 100644 +index a5603a2..ce0a147 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2139,10 +2139,11 @@ void CApplication::Render() +@@ -2142,10 +2142,11 @@ void CApplication::Render() if (frameTime < singleFrameTime) Sleep(singleFrameTime - frameTime); } @@ -20226,10 +19358,10 @@ index 7dec8e2..ed4683e 100644 1.8.1.6 -From 7d5d30570dbd925f7838612eeaa5eac9610c3ec5 Mon Sep 17 00:00:00 2001 +From 2527c2473f8b22eb9ab3280ce69ed7043d46cf93 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 8 Apr 2013 11:18:31 +0200 -Subject: [PATCH 092/108] squash to dropping control +Subject: [PATCH 084/102] squash to dropping control --- xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 1 + @@ -20251,10 +19383,10 @@ index 11e0b26..3f915ce 100644 1.8.1.6 -From 463e9e53e836e1cd63bc8ab5d2fe7dbb7cbda597 Mon Sep 17 00:00:00 2001 +From b1a241c4a8b0ba0b4c0710794920edd2f438b433 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Apr 2013 12:33:46 +0200 -Subject: [PATCH 093/108] pvr: try SwtichChannel when selecting a channel via +Subject: [PATCH 085/102] pvr: try SwtichChannel when selecting a channel via EPG --- @@ -20289,10 +19421,10 @@ index 6b999e4..256a295 100644 1.8.1.6 -From ae7f612abb8e6c9d63d729fee30490b962fd7619 Mon Sep 17 00:00:00 2001 +From d74da440e8141c711135d5810dc6e742ced82918 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 -Subject: [PATCH 094/108] X11: fix mouse coverage +Subject: [PATCH 086/102] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -20358,10 +19490,10 @@ index 770ae84..084f546 100644 1.8.1.6 -From 97483917d15d4e5cd151e75964b294231c28e7c6 Mon Sep 17 00:00:00 2001 +From ace8c4151e897275851377fca74251d17fa02692 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 -Subject: [PATCH 095/108] X11: fix incorrectly used screen num in desktop +Subject: [PATCH 087/102] X11: fix incorrectly used screen num in desktop resolution --- @@ -20396,10 +19528,10 @@ index bf95bc7..0221036 100644 1.8.1.6 -From d0ae3aa55578b48d86b5baea3105a8650eb30995 Mon Sep 17 00:00:00 2001 +From c1da087395588fde44631f5604bc5f1585f5d3e2 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 -Subject: [PATCH 096/108] X11: do not overwrite user selected monitor with +Subject: [PATCH 088/102] X11: do not overwrite user selected monitor with fallback --- @@ -20524,10 +19656,10 @@ index 084f546..30f5fa0 100644 1.8.1.6 -From 42c1bb44fea136828be5c99a122695cd0d108bce Mon Sep 17 00:00:00 2001 +From e18371b675ec3020107c0553ebdac80093d9d315 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 -Subject: [PATCH 097/108] xrandr: add turn on/off to wrapper +Subject: [PATCH 089/102] xrandr: add turn on/off to wrapper --- xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++---- @@ -20693,10 +19825,10 @@ index 26c2653..2741879 100644 1.8.1.6 -From 47edb63e9aad15a900a6b7335c6a58aa9c905b9b Mon Sep 17 00:00:00 2001 +From b67090cc0554fbbcc35bfa48da95b076d69e05e3 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 -Subject: [PATCH 098/108] xrandr: add GetPreferredMode to wrapper +Subject: [PATCH 090/102] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -20753,10 +19885,10 @@ index 2741879..24ad1d0 100644 1.8.1.6 -From 8d67da3e905815a4540487de31eeaa5dd05300a7 Mon Sep 17 00:00:00 2001 +From 0ba1f1c3aa0d2550ef6fcf16d89302e3c1f47f02 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 -Subject: [PATCH 099/108] X11: multi-head improvement - poll for desired output +Subject: [PATCH 091/102] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- @@ -20771,10 +19903,10 @@ Subject: [PATCH 099/108] X11: multi-head improvement - poll for desired output 8 files changed, 105 insertions(+), 12 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 8ffd225..9e847a1 100644 +index 62f7138..7f21f0d 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6236,7 +6236,7 @@ msgctxt "#14071" +@@ -6232,7 +6232,7 @@ msgctxt "#14071" msgid "Allow file renaming and deletion" msgstr "" @@ -20783,7 +19915,7 @@ index 8ffd225..9e847a1 100644 msgctxt "#14074" msgid "Set timezone" -@@ -6368,7 +6368,12 @@ msgctxt "#14100" +@@ -6364,7 +6364,12 @@ msgctxt "#14100" msgid "Stop ripping CD" msgstr "" @@ -20822,7 +19954,7 @@ index a863dae..1102691 100644 false diff --git a/xbmc/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp -index 6d1c6b1..9185982 100644 +index 203c0f1..dfc1ab8 100644 --- a/xbmc/settings/DisplaySettings.cpp +++ b/xbmc/settings/DisplaySettings.cpp @@ -244,6 +244,10 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting) @@ -21037,10 +20169,10 @@ index 380a194..650a6ef 100644 1.8.1.6 -From 9b0e0365197809889bce839067e8282823d4ac4f Mon Sep 17 00:00:00 2001 +From 4670ba070193b0253bbc388bf0dd86eac420356c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 -Subject: [PATCH 100/108] X11: ignore mouse move event form other windows +Subject: [PATCH 092/102] X11: ignore mouse move event form other windows --- xbmc/windowing/WinEventsX11.cpp | 4 +++- @@ -21072,17 +20204,17 @@ index 879d8f2..2ec9b6f 100644 1.8.1.6 -From 09fa23a499bcabeb4d36cf198d30b2af536a0991 Mon Sep 17 00:00:00 2001 +From cd3d022a43a9466cc70c988379d4106b1936609c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 2 Jun 2013 14:53:45 +0200 -Subject: [PATCH 101/108] vdpau: fix segfault caused by uninitialized member +Subject: [PATCH 093/102] vdpau: fix segfault caused by uninitialized member --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 1aeef6a..4543d3e 100644 +index fc4c030..9bafdd7 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -90,6 +90,7 @@ @@ -21097,17 +20229,17 @@ index 1aeef6a..4543d3e 100644 1.8.1.6 -From b11e45603a6319ac2878ff2416340a5fd0d23746 Mon Sep 17 00:00:00 2001 +From 75584696969c243c39300c7ea9cf1b44b70497dc Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:13:45 +0200 -Subject: [PATCH 102/108] vdpau: sync video mixer +Subject: [PATCH 094/102] vdpau: sync video mixer --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 4543d3e..93c1782 100644 +index 9bafdd7..55ef4dc 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -2350,6 +2350,21 @@ void CMixer::ProcessPicture() @@ -21136,10 +20268,10 @@ index 4543d3e..93c1782 100644 1.8.1.6 -From aae365a830c5a00ab398d9805a300b386d1fdc2a Mon Sep 17 00:00:00 2001 +From f8df3a87c129a16af99cb16c2dab475362bd2b7a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 -Subject: [PATCH 103/108] renderer: allow some lateness within vblank interval +Subject: [PATCH 095/102] renderer: allow some lateness within vblank interval --- xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++-- @@ -21147,10 +20279,10 @@ Subject: [PATCH 103/108] renderer: allow some lateness within vblank interval 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp -index 2834708..3ea7240 100644 +index f94760c..83a824a 100644 --- a/xbmc/cores/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoRenderers/RenderManager.cpp -@@ -396,6 +396,8 @@ void CXBMCRenderManager::FrameFinish() +@@ -398,6 +398,8 @@ void CXBMCRenderManager::FrameFinish() if(g_graphicsContext.IsFullScreenVideo()) WaitPresentTime(m.timestamp); @@ -21159,7 +20291,7 @@ index 2834708..3ea7240 100644 { CSingleLock lock(m_presentlock); if(m_presentstep == PRESENT_FRAME) -@@ -1039,6 +1041,12 @@ void CXBMCRenderManager::PrepareNextRender() +@@ -1043,6 +1045,12 @@ void CXBMCRenderManager::PrepareNextRender() double clocktime = GetPresentTime(); double frametime = 1.0 / GetMaximumFPS(); @@ -21172,7 +20304,7 @@ index 2834708..3ea7240 100644 /* see if any future queued frames are already due */ std::deque::reverse_iterator curr, prev; -@@ -1047,8 +1055,8 @@ void CXBMCRenderManager::PrepareNextRender() +@@ -1051,8 +1059,8 @@ void CXBMCRenderManager::PrepareNextRender() ++prev; while (prev != m_queued.rend()) { @@ -21184,7 +20316,7 @@ index 2834708..3ea7240 100644 ++curr; ++prev; diff --git a/xbmc/cores/VideoRenderers/RenderManager.h b/xbmc/cores/VideoRenderers/RenderManager.h -index 2c5ccf4..90f8af9 100644 +index 7a3a530..480e4dc 100644 --- a/xbmc/cores/VideoRenderers/RenderManager.h +++ b/xbmc/cores/VideoRenderers/RenderManager.h @@ -251,6 +251,7 @@ class CXBMCRenderManager @@ -21199,10 +20331,10 @@ index 2c5ccf4..90f8af9 100644 1.8.1.6 -From 1c240ea16b0ad99c01e5267eb22465e5df14bfa3 Mon Sep 17 00:00:00 2001 +From a1d3e46f8441b352d02844593fe603be2a782866 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 14 Jun 2013 09:23:22 +0200 -Subject: [PATCH 104/108] vdpau: calculate timestamp of second field when doing +Subject: [PATCH 096/102] vdpau: calculate timestamp of second field when doing deinterlacing --- @@ -21210,7 +20342,7 @@ Subject: [PATCH 104/108] vdpau: calculate timestamp of second field when doing 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 93c1782..ace5d49 100644 +index 55ef4dc..27d63f5 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -2314,7 +2314,9 @@ void CMixer::ProcessPicture() @@ -21228,17 +20360,17 @@ index 93c1782..ace5d49 100644 1.8.1.6 -From ded355fc11f401021177b074b2ae6234212595cb Mon Sep 17 00:00:00 2001 +From a0edf31c4f4ab9385c56bd64fdb3e81096b20f38 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 14 Jun 2013 10:46:58 +0200 -Subject: [PATCH 105/108] vdpau: comment debug log: long decoding time +Subject: [PATCH 097/102] vdpau: comment debug log: long decoding time --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index ace5d49..0c4b4d0 100644 +index 27d63f5..593f96c 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -874,7 +874,7 @@ void CDecoder::FFDrawSlice(struct AVCodecContext *s, @@ -21267,10 +20399,10 @@ index ace5d49..0c4b4d0 100644 1.8.1.6 -From 0392770b4a091859fd7150a86e27ce10c4c10abb Mon Sep 17 00:00:00 2001 +From 9eec193ac47dc3a84c6869e2c739d42bbfbf83c5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 -Subject: [PATCH 106/108] X11: another fix for mouse coverage +Subject: [PATCH 098/102] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -21303,10 +20435,10 @@ index 2ec9b6f..4ed978c 100644 1.8.1.6 -From 9fb2fac7ec44e7a2d6259c9f2253a04e159de49d Mon Sep 17 00:00:00 2001 +From 9022c37f0ee8b4a5e2403fcd38af9fefa8afe6cd Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:23:19 +0200 -Subject: [PATCH 107/108] renderer: delete fence on uninit +Subject: [PATCH 099/102] renderer: delete fence on uninit --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 5 +++++ @@ -21333,10 +20465,10 @@ index c663423..858d39d 100644 1.8.1.6 -From c30c705ea7199cb94c4709d41f0500f60d0c7345 Mon Sep 17 00:00:00 2001 +From 81d711412c2d5806a0e5c60582eace93c324b5a9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 16 Jun 2013 14:28:01 +0200 -Subject: [PATCH 108/108] renderer: limit fence to vdpau +Subject: [PATCH 100/102] renderer: limit fence to vdpau --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 15 +++++++++------ @@ -21373,3 +20505,126 @@ index 858d39d..bb198f3 100644 -- 1.8.1.6 + +From f8464c54c772bb888d6b0a4ecc6dcd88d2f937bd Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Thu, 4 Jul 2013 16:38:26 +0200 +Subject: [PATCH 101/102] XVBA: replace CODEC_IS with AV_CODEC_ID + +--- + xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp +index 54d7aea..5845dbf 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp +@@ -389,7 +389,7 @@ bool CDecoder::Open(AVCodecContext* avctx, const enum PixelFormat fmt, unsigned + } + + int match = -1; +- if (avctx->codec_id == CODEC_ID_H264) ++ if (avctx->codec_id == AV_CODEC_ID_H264) + { + // search for profile high + for (unsigned int i = 0; i < capOutput->num_of_decodecaps; ++i) +@@ -406,7 +406,7 @@ bool CDecoder::Open(AVCodecContext* avctx, const enum PixelFormat fmt, unsigned + CLog::Log(LOGNOTICE, "(XVBA::Open) - profile XVBA_H264_HIGH not found"); + } + } +- else if (avctx->codec_id == CODEC_ID_VC1) ++ else if (avctx->codec_id == AV_CODEC_ID_VC1) + { + // search for profile advanced + for (unsigned int i = 0; i < capOutput->num_of_decodecaps; ++i) +@@ -423,7 +423,7 @@ bool CDecoder::Open(AVCodecContext* avctx, const enum PixelFormat fmt, unsigned + CLog::Log(LOGNOTICE, "(XVBA::Open) - profile XVBA_VC1_ADVANCED not found"); + } + } +- else if (avctx->codec_id == CODEC_ID_MPEG2VIDEO) ++ else if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO) + { + // search for profile high + for (unsigned int i = 0; i < capOutput->num_of_decodecaps; ++i) +@@ -440,7 +440,7 @@ bool CDecoder::Open(AVCodecContext* avctx, const enum PixelFormat fmt, unsigned + CLog::Log(LOGNOTICE, "(XVBA::Open) - profile XVBA_MPEG2_VLD not found"); + } + } +- else if (avctx->codec_id == CODEC_ID_WMV3) ++ else if (avctx->codec_id == AV_CODEC_ID_WMV3) + { + // search for profile high + for (unsigned int i = 0; i < capOutput->num_of_decodecaps; ++i) +@@ -967,7 +967,7 @@ void CDecoder::FFDrawSlice(struct AVCodecContext *avctx, + picInput.buffer_list = list; + list[0] = xvba->m_xvbaBufferPool.picture_descriptor_buffer; + picInput.num_of_buffers_in_list = 1; +- if (avctx->codec_id == CODEC_ID_H264) ++ if (avctx->codec_id == AV_CODEC_ID_H264) + { + list[1] = xvba->m_xvbaBufferPool.iq_matrix_buffer; + picInput.num_of_buffers_in_list = 2; +@@ -991,13 +991,13 @@ void CDecoder::FFDrawSlice(struct AVCodecContext *avctx, + { + int startCodeSize = 0; + uint8_t startCode[] = {0x00,0x00,0x01}; +- if (avctx->codec_id == CODEC_ID_H264) ++ if (avctx->codec_id == AV_CODEC_ID_H264) + { + startCodeSize = 3; + memcpy((uint8_t*)xvba->m_xvbaBufferPool.data_buffer->bufferXVBA+location, + startCode, 3); + } +- else if (avctx->codec_id == CODEC_ID_VC1 && ++ else if (avctx->codec_id == AV_CODEC_ID_VC1 && + (memcmp(render->buffers[j].buffer, startCode, 3) != 0)) + { + startCodeSize = 4; +-- +1.8.1.6 + + +From 4b0d4c0e721d260a0bee963d460eb17420050b89 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Fri, 5 Jul 2013 12:14:00 +0200 +Subject: [PATCH 102/102] X11: set windows class name + +--- + xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp +index 6b1ed87..30eff67 100644 +--- a/xbmc/windowing/X11/WinSystemX11.cpp ++++ b/xbmc/windowing/X11/WinSystemX11.cpp +@@ -980,8 +980,10 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const CStd + { + CreateIconPixmap(); + XWMHints *wm_hints; ++ XClassHint *class_hints; + XTextProperty windowName, iconName; + std::string titleString = "XBMC Media Center"; ++ std::string classString = "xbmc.bin"; + char *title = (char*)titleString.c_str(); + + XStringListToTextProperty(&title, 1, &windowName); +@@ -992,10 +994,15 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const CStd + wm_hints->icon_pixmap = m_icon; + wm_hints->flags = StateHint | IconPixmapHint; + ++ class_hints = XAllocClassHint(); ++ class_hints->res_class = (char*)classString.c_str(); ++ class_hints->res_name = (char*)classString.c_str(); ++ + XSync(m_dpy,False); + XSetWMProperties(m_dpy, m_mainWindow, &windowName, &iconName, + NULL, 0, NULL, wm_hints, +- NULL); ++ class_hints); ++ XFree(class_hints); + XFree(wm_hints); + + // register interest in the delete window message +-- +1.8.1.6 + diff --git a/packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.10-disable-alt-tab.patch b/packages/mediacenter/xbmc/patches/a1265f1/xbmc-995.10-disable-alt-tab.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.10-disable-alt-tab.patch rename to packages/mediacenter/xbmc/patches/a1265f1/xbmc-995.10-disable-alt-tab.patch diff --git a/packages/mediacenter/xbmc/patches/6aa6247/xbmc-999.01-automake-1.13.patch b/packages/mediacenter/xbmc/patches/a1265f1/xbmc-999.01-automake-1.13.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/6aa6247/xbmc-999.01-automake-1.13.patch rename to packages/mediacenter/xbmc/patches/a1265f1/xbmc-999.01-automake-1.13.patch diff --git a/packages/3rdparty/web/pycurl/build b/packages/mediacenter/xbmc/tmpfiles.d/92_xbmc_user_dirs.conf old mode 100755 new mode 100644 similarity index 76% rename from packages/3rdparty/web/pycurl/build rename to packages/mediacenter/xbmc/tmpfiles.d/92_xbmc_user_dirs.conf index 4490958bc2..9b362b5ca3 --- a/packages/3rdparty/web/pycurl/build +++ b/packages/mediacenter/xbmc/tmpfiles.d/92_xbmc_user_dirs.conf @@ -1,5 +1,3 @@ -#!/bin/sh - ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) @@ -20,14 +18,9 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 - -export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" -export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" - -cd $PKG_BUILD - -python setup.py build --cross-compile -python setup.py install -O0 --no-compile --prefix /usr --root .install - -rm -rf .install/usr/bin +d /storage/.xbmc/userdata 0755 root root - - +d /storage/music 0755 root root - - +d /storage/pictures 0755 root root - - +d /storage/tvshows 0755 root root - - +d /storage/videos 0755 root root - - +d /storage/screenshots 0755 root root - - diff --git a/packages/network/bluez/build b/packages/network/bluez/build index c709316ba4..e91eec2ab7 100755 --- a/packages/network/bluez/build +++ b/packages/network/bluez/build @@ -57,6 +57,7 @@ cd $PKG_BUILD --with-gnu-ld \ $DEBUG_CONFIG \ $DEVTOOLS_CONFIG \ + storagedir=/storage/.cache/bluetooth make $MAKEINSTALL diff --git a/packages/network/bluez/patches/bluez-storagedir.patch b/packages/network/bluez/patches/bluez-storagedir.patch new file mode 100644 index 0000000000..6bad3b146f --- /dev/null +++ b/packages/network/bluez/patches/bluez-storagedir.patch @@ -0,0 +1,21 @@ +diff -Naur bluez-5.7/configure.ac bluez-5.7.patch/configure.ac +--- bluez-5.7/configure.ac 2013-06-26 18:17:07.000000000 +0200 ++++ bluez-5.7.patch/configure.ac 2013-07-12 20:21:17.000000000 +0200 +@@ -238,10 +238,13 @@ + prefix="${ac_default_prefix}" + fi + +-if (test "$localstatedir" = '${prefix}/var'); then +- storagedir="${prefix}/var/lib/bluetooth" +-else +- storagedir="${localstatedir}/lib/bluetooth" ++ ++if (test "x$storagedir" = 'x'); then ++ if (test "$localstatedir" = '${prefix}/var'); then ++ storagedir="${prefix}/var/lib/bluetooth" ++ else ++ storagedir="${localstatedir}/lib/bluetooth" ++ fi + fi + AC_DEFINE_UNQUOTED(STORAGEDIR, "${storagedir}", + [Directory for the storage files]) diff --git a/packages/network/bluez/tmpfiles.d/81_bluez.conf b/packages/network/bluez/tmpfiles.d/81_bluez.conf new file mode 100644 index 0000000000..ec88ba899f --- /dev/null +++ b/packages/network/bluez/tmpfiles.d/81_bluez.conf @@ -0,0 +1,21 @@ +################################################################################ +# 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 +################################################################################ + +d /storage/.cache/bluetooth 0755 root root - - diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network index d03509951d..71ce6d9709 100644 --- a/packages/network/connman/init.d/21_network +++ b/packages/network/connman/init.d/21_network @@ -22,10 +22,6 @@ # # runlevels: openelec, textmode -mkdir -p $CONFIG_CACHE/connman -mkdir -p /storage/.config/vpn-config -mkdir -p /run/connman - if [ -f $HOME/.config/debug.connman ]; then CONNMAN_DEBUG="-d" fi diff --git a/packages/network/connman/meta b/packages/network/connman/meta index 7757ebfe38..6e722aa2ed 100644 --- a/packages/network/connman/meta +++ b/packages/network/connman/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="df37290" +PKG_VERSION="8b952da" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/connman/patches/connman-03-init-nat-after-tethering.patch b/packages/network/connman/patches/connman-03-init-nat-after-tethering.patch index 06dd222a55..a769f2499b 100644 --- a/packages/network/connman/patches/connman-03-init-nat-after-tethering.patch +++ b/packages/network/connman/patches/connman-03-init-nat-after-tethering.patch @@ -1,16 +1,16 @@ -commit 0f41818097e3ada58c21a3a84af86ec3762294ce +commit f5f3c66721ca595976def1a43195d6a64525e6ed Author: Stefan Saraev -Date: Thu Jul 4 18:42:29 2013 +0300 +Date: Tue Jul 9 19:06:36 2013 +0300 do not touch nat table before enabling tethering TODO: remove when upstream does a better fix diff --git a/src/connman.h b/src/connman.h -index 96f8466..c94d854 100644 +index 6846b92..6cd24e2 100644 --- a/src/connman.h +++ b/src/connman.h -@@ -910,6 +910,8 @@ int __connman_nat_enable(const char *name, const char *address, +@@ -912,6 +912,8 @@ int __connman_nat_enable(const char *name, const char *address, unsigned char prefixlen); void __connman_nat_disable(const char *name); @@ -34,15 +34,15 @@ index c235d86..1e7dfa9 100644 int __connman_firewall_init(void) diff --git a/src/nat.c b/src/nat.c -index 5447eb7..d5ceffd 100644 +index 9308059..b198cf5 100644 --- a/src/nat.c +++ b/src/nat.c -@@ -78,6 +78,8 @@ static int enable_nat(struct connman_nat *nat) +@@ -81,6 +81,8 @@ static int enable_nat(struct connman_nat *nat) if (err < 0) return err; + nat_enabled = TRUE; + - return __connman_iptables_commit("nat"); + return __connman_firewall_enable(nat->fw); } diff --git a/packages/3rdparty/web/pycurl/install b/packages/network/connman/tmpfiles.d/21_connman.conf old mode 100755 new mode 100644 similarity index 86% rename from packages/3rdparty/web/pycurl/install rename to packages/network/connman/tmpfiles.d/21_connman.conf index 85a37ef61d..7383b3da93 --- a/packages/3rdparty/web/pycurl/install +++ b/packages/network/connman/tmpfiles.d/21_connman.conf @@ -1,5 +1,3 @@ -#!/bin/sh - ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) @@ -20,6 +18,6 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 - -cp -PR $PKG_BUILD/.install/* $INSTALL +d /run/connman 0755 root root 10d - +d /storage/.cache/connman 0755 root root 10d - +d /storage/.config/vpn-config 0755 root root 10d - diff --git a/packages/network/openssh/init.d/51_sshd b/packages/network/openssh/init.d/51_sshd index f2a5d02d0e..9903a6fbd1 100644 --- a/packages/network/openssh/init.d/51_sshd +++ b/packages/network/openssh/init.d/51_sshd @@ -42,16 +42,12 @@ KEYGEN="/usr/bin/ssh-keygen" SSHD="/usr/sbin/sshd" - HOME="/storage" - ( if [ "$SSH" = "yes" -o "$SSHD_START" = "true" ]; then # Check for the SSH1 RSA key if [ ! -s $RSA1_KEY ] ; then progress "SSH: generating SSH1 RSA key" - - mkdir -p $CONFIG_CACHE/ssh $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null chmod 600 $RSA1_KEY fi @@ -59,8 +55,6 @@ # Check for the SSH2 RSA key if [ ! -s $RSA2_KEY ] ; then progress "SSH: generating SSH2 RSA key" - - mkdir -p $CONFIG_CACHE/ssh $KEYGEN -q -t rsa -f $RSA2_KEY -C '' -N '' >&/dev/null chmod 600 $RSA2_KEY fi @@ -68,28 +62,17 @@ # Check for the SSH2 DSA key if [ ! -s $DSA2_KEY ] ; then progress "SSH: generating SSH2 DSA key" - - mkdir -p $CONFIG_CACHE/ssh $KEYGEN -q -t dsa -f $DSA2_KEY -C '' -N '' >&/dev/null chmod 600 $DSA2_KEY fi - # ensure that $HOME/.ssh exists, is root-owned and not world-readable - mkdir -p $HOME/.ssh - chown root:root $HOME/.ssh - chmod 0700 $HOME/.ssh - # Check for predefined known hosts file if [ -f /etc/ssh/known_hosts -a ! -f $HOME/.ssh/known_hosts ] ; then progress "SSH: setup predefined known hosts" - - cp /etc/ssh/known_hosts $HOME/.ssh + cp /etc/ssh/known_hosts $HOME/.ssh fi progress "Starting SSH Server" - - mkdir -p /var/empty - chmod -R 600 /var/empty - eval $SSHD $OPTIONS + eval $SSHD $OPTIONS fi )& diff --git a/packages/accessibility/atk/install b/packages/network/openssh/tmpfiles.d/51_sshd.conf old mode 100755 new mode 100644 similarity index 87% rename from packages/accessibility/atk/install rename to packages/network/openssh/tmpfiles.d/51_sshd.conf index 374df097ce..22664d4584 --- a/packages/accessibility/atk/install +++ b/packages/network/openssh/tmpfiles.d/51_sshd.conf @@ -1,5 +1,3 @@ -#!/bin/sh - ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) @@ -20,7 +18,6 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/$1/.libs/libatk*.so* $INSTALL/usr/lib +d /var/empty 0600 root root 10d - +d /storage/.cache/ssh 0755 root root - - +d /storage/.ssh 0700 root root - - diff --git a/packages/network/tcpdump/build b/packages/network/tcpdump/build deleted file mode 100755 index 83ac32aff1..0000000000 --- a/packages/network/tcpdump/build +++ /dev/null @@ -1,42 +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 $PKG_BUILD - -# When cross-compiling, configure can't set linux version -# forcing it -sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' configure - -./configure \ - --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --with-pcap=linux \ - --with-crypto=no \ - --disable-ipv6 - - -# discard native system includes -sed -i "s%-I/usr/include%%g" Makefile - -$MAKE diff --git a/packages/network/tcpdump/install b/packages/network/tcpdump/install deleted file mode 100755 index 677d4d5435..0000000000 --- a/packages/network/tcpdump/install +++ /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 - -mkdir -p $INSTALL/usr/sbin - cp -P $PKG_BUILD/tcpdump $INSTALL/usr/sbin - diff --git a/packages/network/tcpdump/meta b/packages/network/tcpdump/meta deleted file mode 100644 index ff8e396fe9..0000000000 --- a/packages/network/tcpdump/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="tcpdump" -PKG_VERSION="4.3.0" -PKG_REV="1" -PKG_SITE="http://www.tcpdump.org/" -PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain libpcap" -PKG_PRIORITY=optional -PKG_SECTION="network" -PKG_SHORTDESC="powerful tool for network monitoring and data acquisition" -PKG_LONGDESC="This program allows you to dump the traffic on a network. tcpdump is able to examine IPv4, ICMPv4, IPv6, ICMPv6, UDP, TCP, SNMP, AFS BGP, RIP, PIM, DVMRP, IGMP, SMB, OSPF, NFS and many other packet types." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/python/devel/Cheetah/build b/packages/python/devel/Cheetah/build deleted file mode 100755 index 854cad3db2..0000000000 --- a/packages/python/devel/Cheetah/build +++ /dev/null @@ -1,34 +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 - -export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" -export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" - -cd $PKG_BUILD - -python setup.py build --cross-compile -python setup.py install --root=./.install --prefix=/usr - -rm -rf .install/usr/bin -find .install/usr/lib/python*/site-packages/ -name "*.py" -exec rm -rf {} ";" diff --git a/packages/python/devel/Cheetah/install b/packages/python/devel/Cheetah/install deleted file mode 100755 index 85a37ef61d..0000000000 --- a/packages/python/devel/Cheetah/install +++ /dev/null @@ -1,25 +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 - -cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/python/devel/Cheetah/meta b/packages/python/devel/Cheetah/meta deleted file mode 100644 index 9a4d34a11c..0000000000 --- a/packages/python/devel/Cheetah/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="Cheetah" -PKG_VERSION="2.4.4" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.cheetahtemplate.org/" -PKG_URL="http://pypi.python.org/packages/source/C/Cheetah/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python" -PKG_BUILD_DEPENDS="toolchain Python distutilscross" -PKG_PRIORITY="optional" -PKG_SECTION="python/devel" -PKG_SHORTDESC="cheetah: Python-powered template engine and code generator" -PKG_LONGDESC="Cheetah is a Python-powered template engine and code generator. It can be used as a standalone utility or it can be combined with other tools. Cheetah has many potential uses, but web developers looking for a viable alternative to ASP, JSP, PHP and PSP are expected to be its principle user group." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/python/system/yenc/build b/packages/python/system/yenc/build deleted file mode 100755 index 07a62bda96..0000000000 --- a/packages/python/system/yenc/build +++ /dev/null @@ -1,34 +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 - -export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" -export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" - -cd $PKG_BUILD - -python setup.py build --cross-compile -python setup.py install --root=./.install --prefix=/usr - -rm -rf .install/usr/bin -rm -rf .install/usr/lib/python*/site-packages/*.py diff --git a/packages/python/system/yenc/install b/packages/python/system/yenc/install deleted file mode 100755 index 85a37ef61d..0000000000 --- a/packages/python/system/yenc/install +++ /dev/null @@ -1,25 +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 - -cp -PR $PKG_BUILD/.install/* $INSTALL diff --git a/packages/python/system/yenc/meta b/packages/python/system/yenc/meta deleted file mode 100644 index 8c2372b92c..0000000000 --- a/packages/python/system/yenc/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="yenc" -PKG_VERSION="0.4.0" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.golug.it/yenc.html" -PKG_URL="http://www.golug.it/pub/yenc/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python" -PKG_BUILD_DEPENDS="toolchain Python distutilscross" -PKG_PRIORITY="optional" -PKG_SECTION="python/system" -PKG_SHORTDESC="yenc: a fairly simple module, it provide only raw yEnc encoding/decoding with builitin crc32 calculation." -PKG_LONGDESC="This a fairly simple module, it provide only raw yEnc encoding/decoding with builitin crc32 calculation. Header parsing, checkings and yenc formatting are left to you (see examples directory for possible implementations). The interface is similar to the uu module from python standard library." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/python/system/yenc/patches/yenc-0.4.0-setuptools.patch b/packages/python/system/yenc/patches/yenc-0.4.0-setuptools.patch deleted file mode 100644 index 63ffb1677f..0000000000 --- a/packages/python/system/yenc/patches/yenc-0.4.0-setuptools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur yenc-0.4.0/setup.py yenc-0.4.0.patch/setup.py ---- yenc-0.4.0/setup.py 2011-09-06 09:04:33.000000000 +0200 -+++ yenc-0.4.0.patch/setup.py 2012-11-06 20:15:14.369125798 +0100 -@@ -21,7 +21,7 @@ - # - ##============================================================================= - --from distutils.core import setup, Extension -+from setuptools import setup, Extension - - setup( - name = "yenc", diff --git a/packages/3rdparty/system/pcsc-lite/build b/packages/security/polkit/tmpfiles.d/34_polkit.conf old mode 100755 new mode 100644 similarity index 70% rename from packages/3rdparty/system/pcsc-lite/build rename to packages/security/polkit/tmpfiles.d/34_polkit.conf index c67fb28d98..127a9bcb83 --- a/packages/3rdparty/system/pcsc-lite/build +++ b/packages/security/polkit/tmpfiles.d/34_polkit.conf @@ -1,5 +1,3 @@ -#!/bin/sh - ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) @@ -20,20 +18,9 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 - -cd $PKG_BUILD - -PCSCD_ADDON_DIR="/storage/.xbmc/addons/service.system.pcscd-addon" - -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-shared \ - --enable-static \ - --disable-libudev \ - --enable-libusb \ - --enable-usbdropdir=$PCSCD_ADDON_DIR/drivers - -$MAKEINSTALL +d /var/lib/polkit-1 0700 root root 10d - +d /var/lib/polkit-1/localauthority/10-vendor.d 0755 root root 10d - +d /var/lib/polkit-1/localauthority/20-org.d 0755 root root 10d - +d /var/lib/polkit-1/localauthority/30-site.d 0755 root root 10d - +d /var/lib/polkit-1/localauthority/50-local.d 0755 root root 10d - +d /var/lib/polkit-1/localauthority/90-mandatory.d 0755 root root 10d - diff --git a/packages/sysutils/busybox/init.d/01_mount-filesystem b/packages/sysutils/busybox/init.d/01_mount-filesystem index 0e95388875..2808c45191 100644 --- a/packages/sysutils/busybox/init.d/01_mount-filesystem +++ b/packages/sysutils/busybox/init.d/01_mount-filesystem @@ -32,3 +32,11 @@ progress "mounting needed filesystems" mount -n -t tmpfs -o size=10m tmpfs /var mount -n -t debugfs debugfs /sys/kernel/debug + + if [ ! "$RUNLEVEL" = "installer" -a "$DEBUG" = "yes" ]; then + mkdir -p $HOME/log + ln -sf $HOME/log /var/log + else + mkdir -p /var/log + fi + diff --git a/packages/sysutils/busybox/init.d/02_make-directories b/packages/sysutils/busybox/init.d/02_make-directories deleted file mode 100644 index 70c93b066b..0000000000 --- a/packages/sysutils/busybox/init.d/02_make-directories +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -# -# make variable directory structure -# -# runlevels: openelec, installer, textmode - -progress "make variable directory structure" - mkdir -p /var/cache \ - /var/lib \ - /var/lock \ - /var/media \ - /var/run \ - /var/tmp \ - /var/run/sepermit \ - /var/run/lirc - - chmod 1777 /var/run /var/tmp - - touch /var/run/utmp - chmod 1777 /var/run/utmp - -progress "make logging directory structure" - if [ ! "$RUNLEVEL" = "installer" -a "$DEBUG" = "yes" ]; then - mkdir -p $HOME/log - ln -sf $HOME/log /var/log - else - mkdir -p /var/log - fi - - touch /var/log/wtmp - chmod 1777 /var/log/wtmp - -if [ ! "$RUNLEVEL" = "installer" ]; then - progress "make runtime directory structure" - ln -sf /storage/.config/modprobe.d /run/modprobe.d - - progress "make variable library directory structure" - # others: - mkdir -p /var/lib/polkit-1 - chmod 700 /var/lib/polkit-1 - mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d - mkdir -p /var/lib/polkit-1/localauthority/20-org.d - mkdir -p /var/lib/polkit-1/localauthority/30-site.d - mkdir -p /var/lib/polkit-1/localauthority/50-local.d - mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d - - mkdir -p /var/lib/udisks - mkdir -p /var/lib/upower - - progress "make caching directory structure" - mkdir -p $HOME/.cache/bluetooth - ln -sf $HOME/.cache/bluetooth /var/lib/bluetooth -fi diff --git a/packages/sysutils/busybox/profile.d/02-systemid.conf b/packages/sysutils/busybox/init.d/03_systemid similarity index 77% rename from packages/sysutils/busybox/profile.d/02-systemid.conf rename to packages/sysutils/busybox/init.d/03_systemid index 0e72138c15..9a9b680f0d 100644 --- a/packages/sysutils/busybox/profile.d/02-systemid.conf +++ b/packages/sysutils/busybox/init.d/03_systemid @@ -17,13 +17,13 @@ # the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. # http://www.gnu.org/copyleft/gpl.html ################################################################################ -# Attempts to generate a unique system ID based on one local MAC address -# SystemID SHOULD be the same between upgrades/reinstalls -# MAC is hashed so that it cant be reversed making it anonymous -# Used to help with global usage statistics -################################################################################ -SYSTEMID="00000000000000000000000000000000" +# Attempts to generate a unique machine ID based on one local MAC address +# MACHINEID SHOULD be the same between upgrades/reinstalls +# MAC is hashed so that it cant be reversed making it anonymous +# Used to help with global usage statistics, also used for dbus and systemd +# +# runlevels: openelec, installer, textmode if [ -e "/sys/class/net/eth0/address" ]; then MAC_ADRESS=`cat /sys/class/net/eth0/address` @@ -32,7 +32,9 @@ elif [ -e "/sys/class/net/wlan0/address" ]; then fi if [ -n "$MAC_ADRESS" ]; then - SYSTEMID=`echo $MAC_ADRESS | md5sum | cut -f1 -d" "` + MACHINEID=`echo $MAC_ADRESS | md5sum | cut -f1 -d" "` +else + MACHINEID="00000000000000000000000000000000" fi -export SYSTEMID +echo "$MACHINEID" > /run/machine-id diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index df3e60754f..85f22b8a2b 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -59,6 +59,9 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`" # /etc/fstab is needed by... touch $INSTALL/etc/fstab + # /etc/machine-id, needed by systemd and dbus + ln -sf /run/machine-id $INSTALL/etc/machine-id + # /etc/hosts must be writeable ln -sf /var/cache/hosts $INSTALL/etc/hosts diff --git a/packages/3rdparty/lib/ccid/build b/packages/sysutils/busybox/tmpfiles.d/02_busybox.conf old mode 100755 new mode 100644 similarity index 76% rename from packages/3rdparty/lib/ccid/build rename to packages/sysutils/busybox/tmpfiles.d/02_busybox.conf index e1194bb3ac..2d1b051c58 --- a/packages/3rdparty/lib/ccid/build +++ b/packages/sysutils/busybox/tmpfiles.d/02_busybox.conf @@ -1,5 +1,3 @@ -#!/bin/sh - ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) @@ -20,17 +18,12 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 +d /var/cache 0755 root root 10d - +d /var/lib 0755 root root 10d - +d /var/lock 0755 root root 10d - +d /var/media 0755 root root 10d - +d /var/run 1777 root root 10d - +d /var/tmp 1777 root root 10d - -cd $PKG_BUILD - -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --enable-shared \ - --enable-static \ - --enable-twinserial - -make -make -C src/ Info.plist -$MAKEINSTALL +f /var/run/utmp 1777 root root 10d - +f /var/log/wtmp 1777 root root 10d - diff --git a/packages/sysutils/dbus/init.d/14_dbus b/packages/sysutils/dbus/init.d/14_dbus index 569fe651a4..c2442b487a 100644 --- a/packages/sysutils/dbus/init.d/14_dbus +++ b/packages/sysutils/dbus/init.d/14_dbus @@ -25,9 +25,6 @@ ( progress "Starting D-BUS" - - mkdir -p /var/lib/dbus /var/run/dbus - dbus-uuidgen --ensure while true; do dbus-daemon --system --nofork &>/dev/null rm /var/run/dbus/pid &>/dev/null diff --git a/packages/addons/multimedia/makemkv/build b/packages/sysutils/dbus/tmpfiles.d/14_dbus.conf old mode 100755 new mode 100644 similarity index 86% rename from packages/addons/multimedia/makemkv/build rename to packages/sysutils/dbus/tmpfiles.d/14_dbus.conf index ec80a0a5ec..3a620aec44 --- a/packages/addons/multimedia/makemkv/build +++ b/packages/sysutils/dbus/tmpfiles.d/14_dbus.conf @@ -1,5 +1,3 @@ -#!/bin/sh - ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) @@ -20,8 +18,7 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 +d /var/lib/dbus 0755 root root 10d - +d /var/run/dbus 0755 root root 10d - -cd $PKG_BUILD/lib - -make GCC=$CC -f makefile.linux +L /var/lib/dbus/machine-id - - - - /etc/machine-id diff --git a/packages/sysutils/par2cmdline/build b/packages/sysutils/par2cmdline/build deleted file mode 100755 index d73c7c70d5..0000000000 --- a/packages/sysutils/par2cmdline/build +++ /dev/null @@ -1,30 +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 $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - -make diff --git a/packages/sysutils/par2cmdline/install b/packages/sysutils/par2cmdline/install deleted file mode 100755 index 4a9c99535a..0000000000 --- a/packages/sysutils/par2cmdline/install +++ /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 - -mkdir -p $INSTALL/usr/bin - cp -P $PKG_BUILD/par2 $INSTALL/usr/bin diff --git a/packages/sysutils/par2cmdline/meta b/packages/sysutils/par2cmdline/meta deleted file mode 100644 index 21f126264e..0000000000 --- a/packages/sysutils/par2cmdline/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="par2cmdline" -PKG_VERSION="0.4" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.chuchusoft.com/par2_tbb/index.html" -PKG_URL="$SOURCEFORGE_SRC/parchive/par2cmdline/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="par2cmdline: a utility to create and repair data files using Reed Solomon coding." -PKG_LONGDESC="This is a concurrent (multithreaded) version of par2cmdline, a utility to create and repair data files using Reed Solomon coding. par2 parity archives are commonly used on Usenet postings to allow corrupted postings to be repaired instead of needing the original poster to repost the corrupted file(s)." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/sysutils/par2cmdline/patches/par2cmdline-0.4-automake-1.13.patch b/packages/sysutils/par2cmdline/patches/par2cmdline-0.4-automake-1.13.patch deleted file mode 100644 index f0dafb7da3..0000000000 --- a/packages/sysutils/par2cmdline/patches/par2cmdline-0.4-automake-1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur par2cmdline-0.4/configure.ac par2cmdline-0.4.patch/configure.ac ---- par2cmdline-0.4/configure.ac 2004-04-12 18:42:39.000000000 +0200 -+++ par2cmdline-0.4.patch/configure.ac 2013-01-12 19:09:03.358940253 +0100 -@@ -25,7 +25,7 @@ - - AC_CANONICAL_HOST - --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AM_INIT_AUTOMAKE - - diff --git a/packages/sysutils/par2cmdline/patches/par2cmdline-0.4-gcc4.patch b/packages/sysutils/par2cmdline/patches/par2cmdline-0.4-gcc4.patch deleted file mode 100644 index c6da26789e..0000000000 --- a/packages/sysutils/par2cmdline/patches/par2cmdline-0.4-gcc4.patch +++ /dev/null @@ -1,62 +0,0 @@ -Fix compilation with gcc-4. - -Patch by Dirk-Jan Heijs. - -http://bugs.gentoo.org/102391 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=287904 - ---- par2cmdline-0.4/reedsolomon.cpp -+++ par2cmdline-0.4/reedsolomon.cpp -@@ -51,7 +51,7 @@ - } - } - --bool ReedSolomon::SetInput(const vector &present) -+template <> bool ReedSolomon::SetInput(const vector &present) - { - inputcount = (u32)present.size(); - -@@ -80,7 +80,7 @@ - return true; - } - --bool ReedSolomon::SetInput(u32 count) -+template <> bool ReedSolomon::SetInput(u32 count) - { - inputcount = count; - -@@ -101,7 +101,7 @@ - return true; - } - --bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) -+template <> bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) - { - // Look up the appropriate element in the RS matrix - Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex]; -@@ -189,7 +189,7 @@ - - // Set which of the source files are present and which are missing - // and compute the base values to use for the vandermonde matrix. --bool ReedSolomon::SetInput(const vector &present) -+template <> bool ReedSolomon::SetInput(const vector &present) - { - inputcount = (u32)present.size(); - -@@ -233,7 +233,7 @@ - - // Record that the specified number of source files are all present - // and compute the base values to use for the vandermonde matrix. --bool ReedSolomon::SetInput(u32 count) -+template <> bool ReedSolomon::SetInput(u32 count) - { - inputcount = count; - -@@ -267,7 +267,7 @@ - return true; - } - --bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) -+template <> bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) - { - // Look up the appropriate element in the RS matrix diff --git a/packages/sysutils/remote/atvclient/init.d/63_atvclient b/packages/sysutils/remote/atvclient/init.d/63_atvclient index 07f22742e2..7db38f1b05 100644 --- a/packages/sysutils/remote/atvclient/init.d/63_atvclient +++ b/packages/sysutils/remote/atvclient/init.d/63_atvclient @@ -24,6 +24,5 @@ ( progress "starting ATVclient" - mkdir -p /storage/.cache exec atvclient -m > /dev/null 2>&1 -)& \ No newline at end of file +)& diff --git a/packages/addons/multimedia/makemkv/source/default.py b/packages/sysutils/remote/atvclient/tmpfiles.d/63_atvclient.conf similarity index 95% rename from packages/addons/multimedia/makemkv/source/default.py rename to packages/sysutils/remote/atvclient/tmpfiles.d/63_atvclient.conf index 8d4c5e9e96..66ef20dd4a 100644 --- a/packages/addons/multimedia/makemkv/source/default.py +++ b/packages/sysutils/remote/atvclient/tmpfiles.d/63_atvclient.conf @@ -18,6 +18,4 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -import os -import sys -import xbmcaddon +d /storage/.cache 0755 root root 10d - diff --git a/packages/sysutils/remote/eventlircd/init.d/62_eventlircd b/packages/sysutils/remote/eventlircd/init.d/62_eventlircd index 41ac6123ac..0ab20592b9 100644 --- a/packages/sysutils/remote/eventlircd/init.d/62_eventlircd +++ b/packages/sysutils/remote/eventlircd/init.d/62_eventlircd @@ -24,6 +24,5 @@ ( progress "starting eventlircd" - mkdir -p /var/run/lirc eventlircd --evmap=/etc/eventlircd.d --socket=/var/run/lirc/lircd --release=_UP )& \ No newline at end of file diff --git a/packages/addons/networking/backup/rsync/source/default.py b/packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf similarity index 95% rename from packages/addons/networking/backup/rsync/source/default.py rename to packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf index 8d4c5e9e96..f857190c06 100644 --- a/packages/addons/networking/backup/rsync/source/default.py +++ b/packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf @@ -18,6 +18,4 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -import os -import sys -import xbmcaddon +d /var/run/lirc 0755 root root 10d - diff --git a/packages/sysutils/remote/irserver/init.d/61_irserver b/packages/sysutils/remote/irserver/init.d/61_irserver index ffa429bffb..c4e8130a7e 100644 --- a/packages/sysutils/remote/irserver/init.d/61_irserver +++ b/packages/sysutils/remote/irserver/init.d/61_irserver @@ -29,8 +29,6 @@ if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then progress "Starting IRtrans daemon" - mkdir -p /var/run/lirc - [ "$DEBUG" = "yes" ] && \ IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode diff --git a/packages/addons/networking/testing/iperf/source/default.py b/packages/sysutils/remote/irserver/tmpfiles.d/63_irserver.conf similarity index 95% rename from packages/addons/networking/testing/iperf/source/default.py rename to packages/sysutils/remote/irserver/tmpfiles.d/63_irserver.conf index 8d4c5e9e96..f857190c06 100644 --- a/packages/addons/networking/testing/iperf/source/default.py +++ b/packages/sysutils/remote/irserver/tmpfiles.d/63_irserver.conf @@ -18,6 +18,4 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -import os -import sys -import xbmcaddon +d /var/run/lirc 0755 root root 10d - diff --git a/packages/addons/shell/console/screen/source/default.py b/packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf similarity index 95% rename from packages/addons/shell/console/screen/source/default.py rename to packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf index 8d4c5e9e96..f857190c06 100644 --- a/packages/addons/shell/console/screen/source/default.py +++ b/packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf @@ -18,6 +18,4 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -import os -import sys -import xbmcaddon +d /var/run/lirc 0755 root root 10d - diff --git a/packages/debug/pmtools/unpack b/packages/sysutils/systemd/init.d/02_tmpfiles old mode 100755 new mode 100644 similarity index 82% rename from packages/debug/pmtools/unpack rename to packages/sysutils/systemd/init.d/02_tmpfiles index c9f8adddd7..4c30605ac1 --- a/packages/debug/pmtools/unpack +++ b/packages/sysutils/systemd/init.d/02_tmpfiles @@ -1,8 +1,6 @@ -#!/bin/sh - ################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2013 Dag Wieers (dag@wieers.com) +# Copyright (C) 2009-2010 OpenELEC.tv +# http://www.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 @@ -20,6 +18,10 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -. config/options $1 +# +# creating tmpfiles +# +# runlevels: openelec, installer, textmode -mv $BUILD/$PKG_NAME $BUILD/$PKG_NAME-$PKG_VERSION +progress "creating tmpfiles" + systemd-tmpfiles --create \ No newline at end of file diff --git a/packages/sysutils/systemd/init.d/12_udev-monitor b/packages/sysutils/systemd/init.d/12_udev-monitor index 77d3d77b0b..7a8a152288 100644 --- a/packages/sysutils/systemd/init.d/12_udev-monitor +++ b/packages/sysutils/systemd/init.d/12_udev-monitor @@ -23,7 +23,9 @@ # # runlevels: openelec, installer, textmode -( - progress "monitoring udev events" - exec udevadm monitor -e > /dev/udev.log -)& +if [ "$DEBUG" = "yes" ]; then + ( + progress "monitoring udev events" + exec udevadm monitor -e > /var/log/udev.log + )& +fi diff --git a/packages/sysutils/systemd/install b/packages/sysutils/systemd/install index f49cac4f6c..3d11752b74 100755 --- a/packages/sysutils/systemd/install +++ b/packages/sysutils/systemd/install @@ -81,3 +81,5 @@ mkdir -p $INSTALL/usr/config # reserved for installing systemd +mkdir -p $INSTALL/bin + cp $PKG_BUILD/systemd-tmpfiles $INSTALL/bin diff --git a/packages/sysutils/systemd/meta b/packages/sysutils/systemd/meta index cc7c6449de..0f9aa2682d 100644 --- a/packages/sysutils/systemd/meta +++ b/packages/sysutils/systemd/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="systemd" -PKG_VERSION="204" +PKG_VERSION="205" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/systemd/tmpfiles.d/11_udev.conf b/packages/sysutils/systemd/tmpfiles.d/11_udev.conf new file mode 100644 index 0000000000..92ec709e2a --- /dev/null +++ b/packages/sysutils/systemd/tmpfiles.d/11_udev.conf @@ -0,0 +1,21 @@ +################################################################################ +# 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 +################################################################################ + +L /run/modprobe.d - - - - /storage/.config/modprobe.d diff --git a/packages/sysutils/udisks/tmpfiles.d/31_udisks.conf b/packages/sysutils/udisks/tmpfiles.d/31_udisks.conf new file mode 100644 index 0000000000..9178325697 --- /dev/null +++ b/packages/sysutils/udisks/tmpfiles.d/31_udisks.conf @@ -0,0 +1,21 @@ +################################################################################ +# 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 +################################################################################ + +d /var/lib/udisks 0755 root root 10d - diff --git a/packages/sysutils/upower/tmpfiles.d/32_upower.conf b/packages/sysutils/upower/tmpfiles.d/32_upower.conf new file mode 100644 index 0000000000..a9d84fdf9e --- /dev/null +++ b/packages/sysutils/upower/tmpfiles.d/32_upower.conf @@ -0,0 +1,21 @@ +################################################################################ +# 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 +################################################################################ + +d /var/lib/upower 0755 root root 10d - diff --git a/packages/sysutils/usbutils/meta b/packages/sysutils/usbutils/meta index 0929195045..441b2a928a 100644 --- a/packages/sysutils/usbutils/meta +++ b/packages/sysutils/usbutils/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="usbutils" -PKG_VERSION="006" +PKG_VERSION="007" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/util-linux/scripts/32_swapfile b/packages/sysutils/util-linux/scripts/32_swapfile index bc3f4030df..f5ac377db2 100644 --- a/packages/sysutils/util-linux/scripts/32_swapfile +++ b/packages/sysutils/util-linux/scripts/32_swapfile @@ -38,6 +38,7 @@ fi echo "creating Swapfile ..." mkdir -p `dirname $SWAPFILE` dd if=/dev/zero of=$SWAPFILE bs=1M count=$SWAPFILESIZE 2>&1 > /dev/null + chmod 0600 $SWAPFILE 2>&1 > /dev/null mkswap $SWAPFILE 2>&1 > /dev/null fi diff --git a/packages/3rdparty/lib/ccid/meta b/packages/toolchain/archivers/lzo-host/meta similarity index 74% rename from packages/3rdparty/lib/ccid/meta rename to packages/toolchain/archivers/lzo-host/meta index b574bbbb85..68c17713de 100644 --- a/packages/3rdparty/lib/ccid/meta +++ b/packages/toolchain/archivers/lzo-host/meta @@ -18,18 +18,19 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="ccid" -PKG_VERSION="1.4.10" +PKG_NAME="lzo-host" +PKG_VERSION="" PKG_REV="1" PKG_ARCH="any" -PKG_LICENSE="LGPL" -PKG_SITE="http://pcsclite.alioth.debian.org/ccid.html" -PKG_URL="https://alioth.debian.org/frs/download.php/3897/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_LICENSE="GPL" +PKG_SITE="http://www.oberhumer.com/opensource/lzo" +PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain pcsc-lite" +PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" -PKG_SECTION="driver" -PKG_SHORTDESC="CCID free software driver" -PKG_LONGDESC="CCID free software driver" +PKG_SECTION="compress" +PKG_SHORTDESC="LZO data compressor" +PKG_LONGDESC="LZO is a data compression library which is suitable for data de-/compression in real-time. This means it favours speed over compression ratio." PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" + +PKG_AUTORECONF="no" diff --git a/packages/toolchain/devel/autotools/gettext/meta b/packages/toolchain/devel/autotools/gettext/meta index 9d472b64be..637d22f1bf 100644 --- a/packages/toolchain/devel/autotools/gettext/meta +++ b/packages/toolchain/devel/autotools/gettext/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="gettext" -PKG_VERSION="0.18.2.1" +PKG_VERSION="0.18.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/toolchain/devel/cmake/meta b/packages/toolchain/devel/cmake/meta index 209f8f0f75..4fd4456fd3 100644 --- a/packages/toolchain/devel/cmake/meta +++ b/packages/toolchain/devel/cmake/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="cmake" -PKG_VERSION="2.8.11.1" +PKG_VERSION="2.8.11.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="BSD" diff --git a/packages/unofficial b/packages/unofficial new file mode 160000 index 0000000000..d251ddd5d6 --- /dev/null +++ b/packages/unofficial @@ -0,0 +1 @@ +Subproject commit d251ddd5d62edbf8dc5e7313b1e762fdb4cc73b7 diff --git a/packages/x11/app/setxkbmap/init.d/72_keyboard b/packages/x11/app/setxkbmap/init.d/72_keyboard deleted file mode 100644 index b1431b4b75..0000000000 --- a/packages/x11/app/setxkbmap/init.d/72_keyboard +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -# setup keyboard layout -# -# runlevels: openelec - -( - if [ -f $CONFIG_CACHE/xkb/layout ]; then - . $CONFIG_CACHE/xkb/layout - - progress "setup keyboard layout" - - # waiting for Xorg to start - wait_for_xorg - - # setup keymap - setxkbmap -display $DISPLAY -layout "$XKBLAYOUT" -model "$XKBMODEL" -option "grp:alt_shift_toggle"; - fi -)& diff --git a/packages/x11/driver/xf86-input-evdev/meta b/packages/x11/driver/xf86-input-evdev/meta index 7b5d66089f..57fafb86e4 100644 --- a/packages/x11/driver/xf86-input-evdev/meta +++ b/packages/x11/driver/xf86-input-evdev/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-input-evdev" -PKG_VERSION="2.8.0" +PKG_VERSION="2.8.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/x11/toolkits/gdk-pixbuf/build b/packages/x11/toolkits/gdk-pixbuf/build deleted file mode 100755 index 908af969f8..0000000000 --- a/packages/x11/toolkits/gdk-pixbuf/build +++ /dev/null @@ -1,45 +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 $PKG_BUILD -gio_can_sniff=yes \ -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-man \ - --with-libpng \ - --with-libjpeg \ - --with-libtiff \ - --with-libjasper \ - -make - -$MAKEINSTALL diff --git a/packages/x11/toolkits/gdk-pixbuf/config/gdk-pixbuf.loaders b/packages/x11/toolkits/gdk-pixbuf/config/gdk-pixbuf.loaders deleted file mode 100644 index 87a9bb58a6..0000000000 --- a/packages/x11/toolkits/gdk-pixbuf/config/gdk-pixbuf.loaders +++ /dev/null @@ -1,132 +0,0 @@ -# GdkPixbuf Image Loader Modules file -# Automatically generated file, do not edit -# Created by gdk-pixbuf-query-loaders from gdk-pixbuf-2.21.5 -# -# LoaderDir = /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders -# -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so" -"ani" 4 "gdk-pixbuf" "The ANI image format" "LGPL" -"application/x-navi-animation" "" -"ani" "" -"RIFF ACON" " xxxx " 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so" -"bmp" 5 "gdk-pixbuf" "The BMP image format" "LGPL" -"image/bmp" "image/x-bmp" "image/x-MS-bmp" "" -"bmp" "" -"BM" "" 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so" -"gif" 4 "gdk-pixbuf" "The GIF image format" "LGPL" -"image/gif" "" -"gif" "" -"GIF8" "" 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so" -"icns" 4 "gdk-pixbuf" "The ICNS image format" "GPL" -"image/x-icns" "" -"icns" "" -"icns" "" 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so" -"ico" 5 "gdk-pixbuf" "The ICO image format" "LGPL" -"image/x-icon" "image/x-ico" "image/x-win-bitmap" "" -"ico" "cur" "" -" \001 " "zz znz" 100 -" \002 " "zz znz" 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jasper.so" -"jpeg2000" 4 "gdk-pixbuf" "The JPEG 2000 image format" "LGPL" -"image/jp2" "image/jpeg2000" "image/jpx" "" -"jp2" "jpc" "jpx" "j2k" "jpf" "" -" jP" "!!!! " 100 -"\377O\377Q" "" 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so" -"jpeg" 5 "gdk-pixbuf" "The JPEG image format" "LGPL" -"image/jpeg" "" -"jpeg" "jpe" "jpg" "" -"\377\330" "" 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.so" -"pcx" 4 "gdk-pixbuf" "The PCX image format" "LGPL" -"image/x-pcx" "" -"pcx" "" -"\n \001" "" 100 -"\n\002\001" "" 100 -"\n\003\001" "" 100 -"\n\004\001" "" 100 -"\n\005\001" "" 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so" -"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL" -"image/png" "" -"png" "" -"\211PNG\r\n\032\n" "" 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so" -"pnm" 4 "gdk-pixbuf" "The PNM/PBM/PGM/PPM image format family" "LGPL" -"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" "" -"pnm" "pbm" "pgm" "ppm" "" -"P1" "" 100 -"P2" "" 100 -"P3" "" 100 -"P4" "" 100 -"P5" "" 100 -"P6" "" 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so" -"qtif" 4 "gdk-pixbuf" "The QTIF image format" "LGPL" -"image/x-quicktime" "image/qtif" "" -"qtif" "qif" "" -"abcdidsc" "xxxx " 100 -"abcdidat" "xxxx " 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.so" -"ras" 4 "gdk-pixbuf" "The Sun raster image format" "LGPL" -"image/x-cmu-raster" "image/x-sun-raster" "" -"ras" "" -"Y\246j\225" "" 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so" -"tga" 4 "gdk-pixbuf" "The Targa image format" "LGPL" -"image/x-tga" "" -"tga" "targa" "" -" \001\001" "x " 100 -" \001\t" "x " 100 -" \002" "xz " 99 -" \003" "xz " 100 -" \n" "xz " 100 -" \013" "xz " 100 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so" -"tiff" 1 "gdk-pixbuf" "The TIFF image format" "LGPL" -"image/tiff" "" -"tiff" "tif" "" -"MM *" " z " 100 -"II* " " z" 100 -"II* \020 CR\002 " " z zzz z" 0 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.so" -"wbmp" 4 "gdk-pixbuf" "The WBMP image format" "LGPL" -"image/vnd.wap.wbmp" "" -"wbmp" "" -" " "zz" 1 -" `" "z " 1 -" @" "z " 1 -" " "z " 1 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so" -"xbm" 4 "gdk-pixbuf" "The XBM image format" "LGPL" -"image/x-xbitmap" "" -"xbm" "" -"#define " "" 100 -"/*" "" 50 - -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so" -"xpm" 4 "gdk-pixbuf" "The XPM image format" "LGPL" -"image/x-xpixmap" "" -"xpm" "" -"/* XPM */" "" 100 - - diff --git a/packages/x11/toolkits/gdk-pixbuf/install b/packages/x11/toolkits/gdk-pixbuf/install deleted file mode 100755 index 0ca0833587..0000000000 --- a/packages/x11/toolkits/gdk-pixbuf/install +++ /dev/null @@ -1,40 +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 - -GDK_BINARY_VERSION=`pkg-config gdk-pixbuf-2.0 --variable=gdk_pixbuf_binary_version` -GDK_LIB_DIR="gdk-pixbuf-2.0/$GDK_BINARY_VERSION" - -mkdir -p $INSTALL/etc/gdk_pixbuf-2.0 - cp $PKG_DIR/config/gdk-pixbuf.loaders $INSTALL/etc/gdk_pixbuf-2.0 - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/gdk-pixbuf/.libs/gdk-pixbuf-query-loaders $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib*.so* $INSTALL/usr/lib - rm -rf $INSTALL/usr/lib/libgdk_pixbuf_xlib*.so*T - cp -P $PKG_BUILD/gdk-pixbuf/.libs/libgdk_pixbuf*.so* $INSTALL/usr/lib - -mkdir -p $INSTALL/usr/lib/$GDK_LIB_DIR/loaders - cp -P $PKG_BUILD/gdk-pixbuf/.libs/libpixbufloader*.so $INSTALL/usr/lib/$GDK_LIB_DIR/loaders diff --git a/packages/x11/toolkits/gdk-pixbuf/meta b/packages/x11/toolkits/gdk-pixbuf/meta deleted file mode 100644 index 2c7a7ed907..0000000000 --- a/packages/x11/toolkits/gdk-pixbuf/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="gdk-pixbuf" -PKG_VERSION="2.26.4" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.gtk.org/" -PKG_URL="http://ftp.acc.umu.se/pub/gnome/sources/gdk-pixbuf/2.26/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="glib" -PKG_BUILD_DEPENDS="toolchain glib libjpeg-turbo libpng jasper" -PKG_PRIORITY="optional" -PKG_SECTION="x11/toolkits" -PKG_SHORTDESC="gdk-pixbuf: a GNOME library for image loading and manipulation." -PKG_LONGDESC="gdk-pixbuf (GdkPixbuf) is a GNOME library for image loading and manipulation. The GdkPixbuf documentation contains both the programmer's guide and the API reference." -PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" diff --git a/packages/x11/toolkits/gtk+/build b/packages/x11/toolkits/gtk+/build deleted file mode 100755 index f522ef8a4c..0000000000 --- a/packages/x11/toolkits/gtk+/build +++ /dev/null @@ -1,47 +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 $PKG_BUILD -ac_cv_path_GLIB_GENMARSHAL=$ROOT/$TOOLCHAIN/bin/glib-genmarshal \ -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - --disable-glibtest \ - --enable-modules \ - --enable-explicit-deps=no \ - --disable-debug \ - --enable-shm \ - --disable-cups \ - --disable-papi \ - --enable-xkb \ - --disable-xinerama \ - --with-xinput - -make SRC_SUBDIRS="gdk gtk modules" - -$MAKEINSTALL SRC_SUBDIRS="gdk gtk modules" diff --git a/packages/x11/toolkits/gtk+/install b/packages/x11/toolkits/gtk+/install deleted file mode 100755 index 9d0c6bed52..0000000000 --- a/packages/x11/toolkits/gtk+/install +++ /dev/null @@ -1,50 +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 - -GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` -GTK_LIB_DIR="gtk-2.0/$GTK_BINARY_VERSION" - -mkdir -p $INSTALL/etc/gtk-2.0 - cp $PKG_BUILD/modules/input/im-multipress.conf $INSTALL/etc/gtk-2.0 - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/gtk/.libs/gtk-query-immodules-2.0 $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/gtk/.libs/*.so* $INSTALL/usr/lib - rm -rf $INSTALL/usr/lib/libgtk*.so*T - cp -P $PKG_BUILD/gdk/.libs/*.so* $INSTALL/usr/lib - rm -rf $INSTALL/usr/lib/libgdk*.so*T - cp -P $PKG_BUILD/modules/other/gail/libgail-util/.libs/*.so* $INSTALL/usr/lib - rm -rf $INSTALL/usr/lib/libgailutil.so*T - -mkdir -p $INSTALL/usr/lib/$GTK_LIB_DIR/engines - cp -P $PKG_BUILD/modules/engines/pixbuf/.libs/*.so $INSTALL/usr/lib/$GTK_LIB_DIR/engines -mkdir -p $INSTALL/usr/lib/$GTK_LIB_DIR/immodules - cp -P $PKG_BUILD/modules/input/.libs/*.so $INSTALL/usr/lib/$GTK_LIB_DIR/immodules -mkdir -p $INSTALL/usr/lib/$GTK_LIB_DIR/printbackends - cp -P $PKG_BUILD/modules/printbackends/*/.libs/*.so $INSTALL/usr/lib/$GTK_LIB_DIR/printbackends -mkdir -p $INSTALL/usr/lib/gtk-2.0/modules - cp -P $PKG_BUILD/modules/other/gail/.libs/*.so $INSTALL/usr/lib/gtk-2.0/modules - cp -P $PKG_BUILD/modules/other/gail/tests/.libs/*.so $INSTALL/usr/lib/gtk-2.0/modules diff --git a/packages/x11/toolkits/gtk+/meta b/packages/x11/toolkits/gtk+/meta deleted file mode 100644 index 4df101177d..0000000000 --- a/packages/x11/toolkits/gtk+/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="gtk+" -PKG_VERSION="2.24.14" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.gtk.org/" -PKG_URL="http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="atk libX11 libXrandr libXi glib pango cairo gdk-pixbuf" -PKG_BUILD_DEPENDS="toolchain atk libX11 libXrandr libXi glib pango cairo gdk-pixbuf" -PKG_PRIORITY="optional" -PKG_SECTION="x11/toolkits" -PKG_SHORTDESC="gtk+: The Gimp ToolKit (GTK)" -PKG_LONGDESC="This is GTK+. GTK+, which stands for the Gimp ToolKit, is a library for creating graphical user interfaces for the X Window System. It is designed to be small, efficient, and flexible. GTK+ is written in C with a very object-oriented approach." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/packages/x11/toolkits/gtk+/patches/gtk+-2.24.14-automake-1.13.patch b/packages/x11/toolkits/gtk+/patches/gtk+-2.24.14-automake-1.13.patch deleted file mode 100644 index fe4d42a610..0000000000 --- a/packages/x11/toolkits/gtk+/patches/gtk+-2.24.14-automake-1.13.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur gtk+-2.24.14/configure.in gtk+-2.24.14.patch/configure.in ---- gtk+-2.24.14/configure.in 2012-12-06 04:46:07.000000000 +0100 -+++ gtk+-2.24.14.patch/configure.in 2013-01-12 18:32:33.863798129 +0100 -@@ -51,7 +51,7 @@ - cflags_set=${CFLAGS+set} - - AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - # Support silent build rules, requires at least automake-1.11. Enable - # by either passing --enable-silent-rules to configure or passing V=0 -@@ -300,7 +300,6 @@ - - # Checks for programs. - AC_ISC_POSIX --AM_PROG_CC_STDC - AM_PROG_CC_C_O - AC_PROG_INSTALL - AC_PROG_MAKE_SET diff --git a/packages/x11/toolkits/harfbuzz/build b/packages/x11/toolkits/harfbuzz/build deleted file mode 100755 index 2580de406c..0000000000 --- a/packages/x11/toolkits/harfbuzz/build +++ /dev/null @@ -1,34 +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 $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - --enable-shared \ - -make -$MAKEINSTALL diff --git a/packages/x11/toolkits/harfbuzz/install b/packages/x11/toolkits/harfbuzz/install deleted file mode 100755 index dce0bc6356..0000000000 --- a/packages/x11/toolkits/harfbuzz/install +++ /dev/null @@ -1,35 +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 - -MODULE_VERSION=`pkg-config pango --variable=pango_module_version` - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/src/.libs/libharfbuzz.so* $INSTALL/usr/lib - rm -rf $INSTALL/usr/lib/libharfbuzz.so*T - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/util/.libs/hb-ot-shape-closure $INSTALL/usr/bin - cp $PKG_BUILD/util/.libs/hb-shape $INSTALL/usr/bin - cp $PKG_BUILD/util/.libs/hb-view $INSTALL/usr/bin - diff --git a/packages/x11/toolkits/harfbuzz/meta b/packages/x11/toolkits/harfbuzz/meta deleted file mode 100644 index 893ff2fdcf..0000000000 --- a/packages/x11/toolkits/harfbuzz/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="harfbuzz" -PKG_VERSION="0.9.11" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" -PKG_URL="http://www.freedesktop.org/software/harfbuzz/release/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="glib freetype cairo" -PKG_BUILD_DEPENDS="toolchain glib freetype cairo" -PKG_PRIORITY="optional" -PKG_SECTION="x11/toolkits" -PKG_SHORTDESC="harfbuzz: an OpenType text shaping engine." -PKG_LONGDESC="HarfBuzz is an OpenType text shaping engine." -PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" diff --git a/packages/x11/toolkits/pango/build b/packages/x11/toolkits/pango/build deleted file mode 100755 index fc6d4d1707..0000000000 --- a/packages/x11/toolkits/pango/build +++ /dev/null @@ -1,37 +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 $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - --enable-shared \ - --disable-doc-cross-references \ - --enable-debug=no \ - --with-xft - -make -$MAKEINSTALL diff --git a/packages/x11/toolkits/pango/config/pango.modules b/packages/x11/toolkits/pango/config/pango.modules deleted file mode 100644 index 2494e6cc12..0000000000 --- a/packages/x11/toolkits/pango/config/pango.modules +++ /dev/null @@ -1,18 +0,0 @@ -# Pango Modules file -# Automatically generated file, do not edit -# -# ModulesPath = /usr/lib/pango/1.8.0/modules -# -/usr/lib/pango/1.8.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* -/usr/lib/pango/1.8.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc common: -/usr/lib/pango/1.8.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* -/usr/lib/pango/1.8.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* -/usr/lib/pango/1.8.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* -/usr/lib/pango/1.8.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* -/usr/lib/pango/1.8.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* -/usr/lib/pango/1.8.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* -/usr/lib/pango/1.8.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* -/usr/lib/pango/1.8.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* -/usr/lib/pango/1.8.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* -/usr/lib/pango/1.8.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* - diff --git a/packages/x11/toolkits/pango/config/pangorc b/packages/x11/toolkits/pango/config/pangorc deleted file mode 100644 index d37ff990ad..0000000000 --- a/packages/x11/toolkits/pango/config/pangorc +++ /dev/null @@ -1,6 +0,0 @@ -[Pango] -ModuleFiles = /etc/pango/pango.modules -ModulesPath = /usr/lib/pango/1.8.0/modules - -[PangoX] -AliasFiles = /etc/pango/pangox.aliases diff --git a/packages/x11/toolkits/pango/install b/packages/x11/toolkits/pango/install deleted file mode 100755 index ba5198988e..0000000000 --- a/packages/x11/toolkits/pango/install +++ /dev/null @@ -1,41 +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 - -MODULE_VERSION=`pkg-config pango --variable=pango_module_version` - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/$1/.libs/libpango*.so* $INSTALL/usr/lib - rm -rf $INSTALL/usr/lib/libpango*.so*T - -mkdir -p $INSTALL/usr/lib/pango/$MODULE_VERSION/modules - cp -P $PKG_BUILD/modules/*/.libs/*.so \ - $INSTALL/usr/lib/pango/$MODULE_VERSION/modules - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/$1/.libs/pango-querymodules $INSTALL/usr/bin - -mkdir -p $INSTALL/etc/pango -# cp $PKG_BUILD/$1/pangox.aliases $INSTALL/etc/pango - cp $PKG_DIR/config/pango.modules $INSTALL/etc/pango - cp $PKG_DIR/config/pangorc $INSTALL/etc/pango diff --git a/packages/x11/toolkits/pango/meta b/packages/x11/toolkits/pango/meta deleted file mode 100644 index 9e8934d6a2..0000000000 --- a/packages/x11/toolkits/pango/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="pango" -PKG_VERSION="1.32.6" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.pango.org/" -PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.32/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="glib cairo freetype fontconfig libX11 libXft harfbuzz" -PKG_BUILD_DEPENDS="toolchain glib cairo freetype fontconfig libX11 libXft harfbuzz" -PKG_PRIORITY="optional" -PKG_SECTION="x11/toolkits" -PKG_SHORTDESC="pango: Library for layout and rendering of internationalized text" -PKG_LONGDESC="The goal of the Pango project is to provide an open-source framework for the layout and rendering of internationalized text. Pango is an offshoot of the GTK+ and GNOME projects, and the initial focus is operation in those environments, however there is nothing fundamentally GTK+ or GNOME specific about Pango. Pango uses Unicode for all of its encoding, and will eventually support output in all the worlds major languages." -PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index 4d6727f309..bf600d9547 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -105,9 +105,7 @@ CONFIG_HIGH_RES_TIMERS=y # CPU/Task time and stats accounting # CONFIG_VIRT_CPU_ACCOUNTING=y -# CONFIG_TICK_CPU_ACCOUNTING is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set @@ -406,7 +404,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -497,7 +495,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # x86 CPU frequency scaling drivers # -CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_PSTATE is not set # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -509,7 +507,7 @@ CONFIG_X86_P4_CLOCKMOD=y # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 0354a845ba..1d4a0700f3 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -131,11 +131,6 @@ # install extra subtitle Fonts for XBMC (yes / no) XBMC_EXTRA_FONTS="yes" -# Plugins for XBMC to install (SABnzbd) -# Space separated list is supported, -# e.g. XBMC_PLUGINS="SABnzbd" - XBMC_PLUGINS="" - # build and install 'RSXS' Screensaver (yes / no) XBMC_SCR_RSXS="yes" diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index fbcee0ff3c..7fb6b2859b 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -409,7 +409,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 # CONFIG_ARCH_RANDOM is not set # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y # CONFIG_CC_STACKPROTECTOR is not set # CONFIG_HZ_100 is not set diff --git a/projects/ATV/options b/projects/ATV/options index e2a64d04cf..b3e0b0c596 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -131,11 +131,6 @@ # install extra subtitle Fonts for XBMC (yes / no) XBMC_EXTRA_FONTS="yes" -# Plugins for XBMC to install (SABnzbd) -# Space separated list is supported, -# e.g. XBMC_PLUGINS="SABnzbd" - XBMC_PLUGINS="" - # build and install 'RSXS' Screensaver (yes / no) XBMC_SCR_RSXS="yes" diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 9b016d15fc..f62efed3a5 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -410,7 +410,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y # CONFIG_ARCH_RANDOM is not set # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 4a52821d5e..faad957d28 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -390,7 +390,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y # CONFIG_ARCH_RANDOM is not set # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -1165,7 +1165,7 @@ CONFIG_NET_VENDOR_ATHEROS=y # CONFIG_ATL1 is not set # CONFIG_ATL1E is not set CONFIG_ATL1C=y -# CONFIG_ALX is not set +CONFIG_ALX=y # CONFIG_NET_CADENCE is not set CONFIG_NET_VENDOR_BROADCOM=y # CONFIG_B44 is not set @@ -2579,7 +2579,7 @@ CONFIG_SND_OXYGEN_LIB=m # CONFIG_SND_LAYLA20 is not set # CONFIG_SND_DARLA24 is not set # CONFIG_SND_GINA24 is not set -# CONFIG_SND_LAYLA24 is not set +CONFIG_SND_LAYLA24=m # CONFIG_SND_MONA is not set # CONFIG_SND_MIA is not set # CONFIG_SND_ECHO3G is not set diff --git a/projects/Fusion/options b/projects/Fusion/options index 072d5a9c64..acc73e5e1c 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -131,11 +131,6 @@ # install extra subtitle Fonts for XBMC (yes / no) XBMC_EXTRA_FONTS="yes" -# Plugins for XBMC to install (SABnzbd) -# Space separated list is supported, -# e.g. XBMC_PLUGINS="SABnzbd" - XBMC_PLUGINS="" - # build and install 'RSXS' Screensaver (yes / no) XBMC_SCR_RSXS="yes" diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 6ebe4b26ab..569ead3cb8 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -416,7 +416,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -506,7 +506,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # x86 CPU frequency scaling drivers # -CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_PSTATE is not set # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -527,7 +527,7 @@ CONFIG_X86_P4_CLOCKMOD=y # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y @@ -1213,7 +1213,7 @@ CONFIG_ATL2=y CONFIG_ATL1=y CONFIG_ATL1E=y CONFIG_ATL1C=y -# CONFIG_ALX is not set +CONFIG_ALX=y # CONFIG_NET_CADENCE is not set CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=y @@ -2749,7 +2749,7 @@ CONFIG_SND_CTXFI=m # CONFIG_SND_LAYLA20 is not set # CONFIG_SND_DARLA24 is not set # CONFIG_SND_GINA24 is not set -# CONFIG_SND_LAYLA24 is not set +CONFIG_SND_LAYLA24=m # CONFIG_SND_MONA is not set # CONFIG_SND_MIA is not set # CONFIG_SND_ECHO3G is not set diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index a1137a9d95..988171ee47 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -105,9 +105,7 @@ CONFIG_HIGH_RES_TIMERS=y # CPU/Task time and stats accounting # CONFIG_VIRT_CPU_ACCOUNTING=y -# CONFIG_TICK_CPU_ACCOUNTING is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set @@ -406,7 +404,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -497,7 +495,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # x86 CPU frequency scaling drivers # -CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_PSTATE is not set # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -509,7 +507,7 @@ CONFIG_X86_P4_CLOCKMOD=y # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y @@ -1196,7 +1194,7 @@ CONFIG_ATL2=y CONFIG_ATL1=y CONFIG_ATL1E=y CONFIG_ATL1C=y -# CONFIG_ALX is not set +CONFIG_ALX=y # CONFIG_NET_CADENCE is not set CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=y @@ -2719,7 +2717,7 @@ CONFIG_SND_CTXFI=m # CONFIG_SND_LAYLA20 is not set # CONFIG_SND_DARLA24 is not set # CONFIG_SND_GINA24 is not set -# CONFIG_SND_LAYLA24 is not set +CONFIG_SND_LAYLA24=m # CONFIG_SND_MONA is not set # CONFIG_SND_MIA is not set # CONFIG_SND_ECHO3G is not set diff --git a/projects/Generic/options b/projects/Generic/options index 78898fe200..0439fcace4 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -131,11 +131,6 @@ # install extra subtitle Fonts for XBMC (yes / no) XBMC_EXTRA_FONTS="yes" -# Plugins for XBMC to install (SABnzbd) -# Space separated list is supported, -# e.g. XBMC_PLUGINS="SABnzbd" - XBMC_PLUGINS="" - # build and install 'RSXS' Screensaver (yes / no) XBMC_SCR_RSXS="yes" diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 7d56b79cea..3e74b4c0e3 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -416,7 +416,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -506,7 +506,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # x86 CPU frequency scaling drivers # -CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_PSTATE is not set # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -527,7 +527,7 @@ CONFIG_X86_P4_CLOCKMOD=y # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y @@ -1213,7 +1213,7 @@ CONFIG_ATL2=y CONFIG_ATL1=y CONFIG_ATL1E=y CONFIG_ATL1C=y -# CONFIG_ALX is not set +CONFIG_ALX=y # CONFIG_NET_CADENCE is not set CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=y @@ -2752,7 +2752,7 @@ CONFIG_SND_CTXFI=m # CONFIG_SND_LAYLA20 is not set # CONFIG_SND_DARLA24 is not set # CONFIG_SND_GINA24 is not set -# CONFIG_SND_LAYLA24 is not set +CONFIG_SND_LAYLA24=m # CONFIG_SND_MONA is not set # CONFIG_SND_MIA is not set # CONFIG_SND_ECHO3G is not set diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index fffa5a516f..d88c5e6dd6 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -131,11 +131,6 @@ # install extra subtitle Fonts for XBMC (yes / no) XBMC_EXTRA_FONTS="yes" -# Plugins for XBMC to install (SABnzbd) -# Space separated list is supported, -# e.g. XBMC_PLUGINS="SABnzbd" - XBMC_PLUGINS="" - # build and install 'RSXS' Screensaver (yes / no) XBMC_SCR_RSXS="yes" diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 754c42aa7f..389b29831c 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -414,7 +414,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y # CONFIG_ARCH_RANDOM is not set # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -522,7 +522,7 @@ CONFIG_X86_P4_CLOCKMOD=y # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index a70bf0d627..690f271063 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -103,9 +103,7 @@ CONFIG_HIGH_RES_TIMERS=y # CPU/Task time and stats accounting # CONFIG_VIRT_CPU_ACCOUNTING=y -# CONFIG_TICK_CPU_ACCOUNTING is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set @@ -387,7 +385,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y # CONFIG_ARCH_RANDOM is not set # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -484,7 +482,7 @@ CONFIG_X86_P4_CLOCKMOD=y # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y @@ -1154,7 +1152,7 @@ CONFIG_NET_VENDOR_ATHEROS=y # CONFIG_ATL1 is not set # CONFIG_ATL1E is not set CONFIG_ATL1C=y -# CONFIG_ALX is not set +CONFIG_ALX=y # CONFIG_NET_CADENCE is not set # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROCADE is not set @@ -2571,7 +2569,7 @@ CONFIG_SND_OXYGEN=m # CONFIG_SND_LAYLA20 is not set # CONFIG_SND_DARLA24 is not set # CONFIG_SND_GINA24 is not set -# CONFIG_SND_LAYLA24 is not set +CONFIG_SND_LAYLA24=m # CONFIG_SND_MONA is not set # CONFIG_SND_MIA is not set # CONFIG_SND_ECHO3G is not set diff --git a/projects/ION/options b/projects/ION/options index 5fd73b495c..197c1b68c1 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -131,11 +131,6 @@ # install extra subtitle Fonts for XBMC (yes / no) XBMC_EXTRA_FONTS="yes" -# Plugins for XBMC to install (SABnzbd) -# Space separated list is supported, -# e.g. XBMC_PLUGINS="SABnzbd" - XBMC_PLUGINS="" - # build and install 'RSXS' Screensaver (yes / no) XBMC_SCR_RSXS="yes" diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index b78e6335d2..5e1b290b36 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -415,7 +415,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -505,7 +505,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # x86 CPU frequency scaling drivers # -CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_PSTATE is not set # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_ACPI_CPUFREQ=y # CONFIG_X86_POWERNOW_K6 is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index a0182f570b..8d9ce91748 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -103,9 +103,7 @@ CONFIG_HIGH_RES_TIMERS=y # CPU/Task time and stats accounting # CONFIG_VIRT_CPU_ACCOUNTING=y -# CONFIG_TICK_CPU_ACCOUNTING is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set @@ -399,7 +397,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -489,7 +487,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # x86 CPU frequency scaling drivers # -CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_PSTATE is not set # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_ACPI_CPUFREQ=y # CONFIG_X86_POWERNOW_K8 is not set @@ -1169,7 +1167,7 @@ CONFIG_NET_VENDOR_ATHEROS=y # CONFIG_ATL1 is not set CONFIG_ATL1E=y CONFIG_ATL1C=y -# CONFIG_ALX is not set +CONFIG_ALX=y # CONFIG_NET_CADENCE is not set CONFIG_NET_VENDOR_BROADCOM=y # CONFIG_B44 is not set @@ -2639,7 +2637,7 @@ CONFIG_SND_OXYGEN=m # CONFIG_SND_LAYLA20 is not set # CONFIG_SND_DARLA24 is not set # CONFIG_SND_GINA24 is not set -# CONFIG_SND_LAYLA24 is not set +CONFIG_SND_LAYLA24=m # CONFIG_SND_MONA is not set # CONFIG_SND_MIA is not set # CONFIG_SND_ECHO3G is not set diff --git a/projects/Intel/options b/projects/Intel/options index d7ace6ff90..9cd723b2cf 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -131,11 +131,6 @@ # install extra subtitle Fonts for XBMC (yes / no) XBMC_EXTRA_FONTS="yes" -# Plugins for XBMC to install (SABnzbd) -# Space separated list is supported, -# e.g. XBMC_PLUGINS="SABnzbd" - XBMC_PLUGINS="" - # build and install 'RSXS' Screensaver (yes / no) XBMC_SCR_RSXS="yes" diff --git a/projects/RPi/options b/projects/RPi/options index adf2ff9724..c381d3bb3a 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -131,11 +131,6 @@ # install extra subtitle Fonts for XBMC (yes / no) XBMC_EXTRA_FONTS="yes" -# Plugins for XBMC to install (SABnzbd) -# Space separated list is supported, -# e.g. XBMC_PLUGINS="SABnzbd" - XBMC_PLUGINS="" - # build and install 'RSXS' Screensaver (yes / no) XBMC_SCR_RSXS="no" diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index fac877af21..007b35cdf6 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -103,9 +103,7 @@ CONFIG_HIGH_RES_TIMERS=y # CPU/Task time and stats accounting # CONFIG_VIRT_CPU_ACCOUNTING=y -# CONFIG_TICK_CPU_ACCOUNTING is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set @@ -387,7 +385,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y # CONFIG_ARCH_RANDOM is not set # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -484,7 +482,7 @@ CONFIG_X86_P4_CLOCKMOD=y # # shared options # -# CONFIG_X86_SPEEDSTEP_LIB is not set +CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y diff --git a/projects/Ultra/options b/projects/Ultra/options index e4f9e6d949..8980bd4780 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -131,11 +131,6 @@ # install extra subtitle Fonts for XBMC (yes / no) XBMC_EXTRA_FONTS="yes" -# Plugins for XBMC to install (SABnzbd) -# Space separated list is supported, -# e.g. XBMC_PLUGINS="SABnzbd" - XBMC_PLUGINS="" - # build and install 'RSXS' Screensaver (yes / no) XBMC_SCR_RSXS="yes" diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index c4a0a39c15..6ee5f48413 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -416,7 +416,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -506,7 +506,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # x86 CPU frequency scaling drivers # -CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_PSTATE is not set # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -527,7 +527,7 @@ CONFIG_X86_P4_CLOCKMOD=y # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 4d6727f309..bf600d9547 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -105,9 +105,7 @@ CONFIG_HIGH_RES_TIMERS=y # CPU/Task time and stats accounting # CONFIG_VIRT_CPU_ACCOUNTING=y -# CONFIG_TICK_CPU_ACCOUNTING is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set @@ -406,7 +404,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y # CONFIG_X86_SMAP is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set @@ -497,7 +495,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # x86 CPU frequency scaling drivers # -CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_INTEL_PSTATE is not set # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -509,7 +507,7 @@ CONFIG_X86_P4_CLOCKMOD=y # # shared options # -CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y diff --git a/projects/Virtual/options b/projects/Virtual/options index a6251569c9..d62fd29709 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -126,11 +126,6 @@ # install extra subtitle Fonts for XBMC (yes / no) XBMC_EXTRA_FONTS="yes" -# Plugins for XBMC to install (SABnzbd) -# Space separated list is supported, -# e.g. XBMC_PLUGINS="SABnzbd" - XBMC_PLUGINS="" - # build and install 'RSXS' Screensaver (yes / no) XBMC_SCR_RSXS="yes" diff --git a/scripts/create_addon b/scripts/create_addon index 0f82bf8df1..88035ba73e 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -56,6 +56,10 @@ if [ -f $PKG_DIR/addon ]; then if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID CUST_ADDON_VERSION="$ADDON_VERSION.$PKG_REV" + PROVIDER_NAME="openelec.tv" + if [ ! -z "$PKG_MAINTAINER" ] ; then + PROVIDER_NAME="$PKG_MAINTAINER" + fi $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \ -e "s|@PKG_NAME@|$PKG_NAME|g" \ -e "s|@ADDON_VERSION@|$CUST_ADDON_VERSION|g" \ @@ -65,6 +69,7 @@ if [ -f $PKG_DIR/addon ]; then -e "s|@OS_VERSION@|$OS_VERSION|g" \ -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \ -e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \ + -e "s|@PROVIDER_NAME@|$PROVIDER_NAME|g" \ -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml else CUST_ADDON_VERSION="$PKG_VERSION" diff --git a/scripts/install b/scripts/install index 19c93fdccc..30dc72dbae 100755 --- a/scripts/install +++ b/scripts/install @@ -30,6 +30,10 @@ if [ -z "$1" ]; then exit 1 fi +if [ -z "$INSTALL" ] ; then + echo "error: '\$INSTALL' not set! this script is not intended to be run manually" + exit 1 +fi mkdir -p $STAMPS_INSTALL/$1 if [ -f $STAMP -a $PKG_DIR/install -nt $STAMP ]; then @@ -53,6 +57,11 @@ if [ -d $PKG_DIR/profile.d ]; then cp $PKG_DIR/profile.d/*.conf $INSTALL/etc/profile.d/ fi +if [ -d $PKG_DIR/tmpfiles.d ]; then + mkdir -p $INSTALL/usr/lib/tmpfiles.d + cp $PKG_DIR/tmpfiles.d/*.conf $INSTALL/usr/lib/tmpfiles.d +fi + if [ -d $PKG_DIR/udev.d ]; then mkdir -p $INSTALL/lib/udev/rules.d cp $PKG_DIR/udev.d/*.rules $INSTALL/lib/udev/rules.d diff --git a/tools/mkpkg/mkpkg_couchpotatoserver b/tools/mkpkg/mkpkg_couchpotatoserver deleted file mode 100755 index 4f4c7c8d03..0000000000 --- a/tools/mkpkg/mkpkg_couchpotatoserver +++ /dev/null @@ -1,43 +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 -################################################################################ - -echo "getting sources..." - if [ ! -d CouchPotatoServer.git ]; then - git clone git://github.com/RuudBurger/CouchPotatoServer.git CouchPotatoServer.git - fi - - cd CouchPotatoServer.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf CouchPotatoServer-$GIT_REV - cp -R CouchPotatoServer.git CouchPotatoServer-$GIT_REV - -echo "cleaning sources..." - rm -rf CouchPotatoServer-$GIT_REV/.git - -echo "packing sources..." - tar cvJf CouchPotatoServer-$GIT_REV.tar.xz CouchPotatoServer-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf CouchPotatoServer-$GIT_REV diff --git a/tools/mkpkg/mkpkg_headphones b/tools/mkpkg/mkpkg_headphones deleted file mode 100755 index 4d215f44fd..0000000000 --- a/tools/mkpkg/mkpkg_headphones +++ /dev/null @@ -1,43 +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 -################################################################################ - -echo "getting sources..." - if [ ! -d Headphones.git ]; then - git clone git://github.com/rembo10/headphones.git Headphones.git - fi - - cd Headphones.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf Headphones-$GIT_REV - cp -R Headphones.git Headphones-$GIT_REV - -echo "cleaning sources..." - rm -rf Headphones-$GIT_REV/.git - -echo "packing sources..." - tar cvJf Headphones-$GIT_REV.tar.xz Headphones-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf Headphones-$GIT_REV diff --git a/tools/mkpkg/mkpkg_oscam b/tools/mkpkg/mkpkg_oscam deleted file mode 100755 index 6611e428e1..0000000000 --- a/tools/mkpkg/mkpkg_oscam +++ /dev/null @@ -1,45 +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 -################################################################################ - - -echo "getting sources..." - svn checkout http://streamboard.de.vu/svn/oscam/trunk oscam-latest - -echo "getting version..." - cd oscam-latest - SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'` - echo $SVN_REV - cd .. - -echo "copying sources..." - rm -rf oscam-$SVN_REV - cp -R oscam-latest oscam-$SVN_REV - -# webif needs versioning info -#echo "cleaning sources..." -# find oscam-$SVN_REV -name .svn -exec rm -rf {} ";" - -echo "packing sources..." - tar cvjf oscam-$SVN_REV.tar.bz2 oscam-$SVN_REV - -echo "remove temporary sourcedir..." - rm -rf oscam-$SVN_REV diff --git a/tools/mkpkg/mkpkg_sickbeard b/tools/mkpkg/mkpkg_sickbeard deleted file mode 100755 index 57059c0786..0000000000 --- a/tools/mkpkg/mkpkg_sickbeard +++ /dev/null @@ -1,43 +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 -################################################################################ - -echo "getting sources..." - if [ ! -d SickBeard.git ]; then - git clone git://github.com/midgetspy/Sick-Beard.git SickBeard.git - fi - - cd SickBeard.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. - -echo "copying sources..." - rm -rf SickBeard-$GIT_REV - cp -R SickBeard.git SickBeard-$GIT_REV - -echo "cleaning sources..." - rm -rf SickBeard-$GIT_REV/.git - -echo "packing sources..." - tar cvJf SickBeard-$GIT_REV.tar.xz SickBeard-$GIT_REV - -echo "remove temporary sourcedir..." - rm -rf SickBeard-$GIT_REV