config/version: set version to 2.95.3 (OpenELEC-3.0 Beta 3)

Signed-off-by: Stephan Raue <stephan@openelec.tv>

CHANGELOG

@@ -1,34 +1,20 @@
-OpenELEC (Version 2.0)
+OpenELEC (Version 2.1)
 
-Changelog OpenELEC-1.0 to OpenELEC-2.0
+Changelog OpenELEC-2.0 to OpenELEC-2.1
+
+Added packages:
+  - add package 'ppp'
+  - add package 'pptp'
 
 Package updates:
-  - update XBMC to XBMC-11.0 (Eden)
-  - update eglibc to eglibc-2.15
-  - update Python to Python-2.7
-  - update gcc to gcc-4.7
-  - update openssl to openssl-1.0.1
-  - update xorg-server to xorg-server-1.12
-  - update linux to Kernel 3.2
-  - update Mesa to Mesa-8.0
+  - update linux to linux-3.5
+  - update dialog to dialog-1.1-20120215
+  - update connman to connman-1.4
 
 Added functions:
-  - PXE netboot support:
-    - booting over NFS support
-    - booting over NBD support
-    - booting over iSCSI support
-  - Airplay support
-  - Airtunes support
-  - CEC support
-  - libaacs support
-  - automatic framebuffer detection
-  - exFAT filesystem support
+  - sshd can be enabled via OpenELEC Settings addon
+  - add PPTP support
 
-Changed functions
-  - changed ATV build to use Nvidia binary graphic driver (incl HDMI audio)
-  - added support for native XVBA incl. High@L5.1 support, which replaces VAAPI-XVBA support
+Changed functions:
 
 Removed functions:
-  - remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support)
-  - move PS3 controller support in a own addon
-  - move Wii controller support in a own addon

config/functions

@@ -317,6 +317,8 @@ show_config() {
   config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
   config_message="$config_message\n - SSH Guard support:\t\t\t $SSHGUARD_SUPPORT"
+  config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT"
+  config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
   config_message="$config_message\n - XBMC Airplay support:\t\t $AIRPLAY_SUPPORT"
   config_message="$config_message\n - XBMC Airtunes support:\t\t $AIRTUNES_SUPPORT"
   config_message="$config_message\n - XBMC AFP support:\t\t\t $AFP_SUPPORT"

config/graphic

@@ -74,6 +74,11 @@ get_graphicdrivers() {
       XINERAMA_SUPPORT="yes"
     fi
 
+    if [ "$drv" = "nvidia-legacy" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
+      XINERAMA_SUPPORT="yes"
+    fi
+
     if [ "$drv" = "virtualbox" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,swrast"
       XORG_DRIVERS="$XORG_DRIVERS virtualbox"

config/path

@@ -144,4 +144,4 @@ else
   exec 3>&2
   exec 4>/dev/null
 fi
-INDENT_SIZE=4
+BUILD_INDENT_SIZE=4

config/version

@@ -1,9 +1,9 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="2.95.3"
 
 # OS_VERSION: OS Version
-  OS_VERSION="2.0"
+  OS_VERSION="3.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="2.1"
+  ADDON_VERSION="3.0"
 

packages/3rdparty/driver/dvbhdhomerun/meta

@@ -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="dvbhdhomerun"
-PKG_VERSION="0.0.10"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://sourceforge.net/projects/dvbhdhomerun/"
-PKG_URL="http://downloads.sourceforge.net/project/dvbhdhomerun/${PKG_NAME}_${PKG_VERSION}.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libhdhomerun"
-PKG_PRIORITY="optional"
-PKG_SECTION="driver/dvb"
-PKG_SHORTDESC="A linux DVB driver and userspace application for the HDHomeRun TV tuner (http://www.silicondust.com)."
-PKG_LONGDESC="A linux DVB driver and userspace application for the HDHomeRun TV tuner (http://www.silicondust.com)."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/3rdparty/graphics/libpng12/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libpng"
-PKG_VERSION="1.2.49"
+PKG_VERSION="1.2.50"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/lib/ccid/meta

@@ -18,13 +18,13 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="libccid"
-PKG_VERSION="1.4.7"
+PKG_NAME="ccid"
+PKG_VERSION="1.4.8"
 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/3730/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://alioth.debian.org/frs/download.php/3768/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain pcsc-lite"
 PKG_PRIORITY="optional"

packages/3rdparty/lib/cxxtools/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="cxxtools"
-PKG_VERSION="2.1"
+PKG_VERSION="2.1.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/build

@@ -22,5 +22,8 @@
 
 . config/options $1
 
+VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
 cd $PKG_BUILD
-  LDFLAGS="" make V=1 CC=$CC KDIR=$(kernel_path)
+  make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
+

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta

@@ -18,19 +18,20 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="asix-ax887xx"
-PKG_VERSION="4.2.0"
+PKG_NAME="vdr-plugin-vnsiserver"
+PKG_VERSION="e3c185b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.asix.com.tw"
+PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons/tree/master/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain linux"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr"
 PKG_PRIORITY="optional"
-PKG_SECTION="driver"
-PKG_SHORTDESC="asix-ax887xx: ASIX AX88772B/772A/760/772/178 Linux USB LANDriver"
-PKG_LONGDESC="ASIX AX88772B/772A/760/772/178 Linux USB LANDriver"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/build

@@ -27,4 +27,5 @@ cd $PKG_BUILD
   PWD=`pwd`
   make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
   cd dist/epgdata2xmltv
-  make
+  make -j1
+

packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta

@@ -18,13 +18,13 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="vdr-xmltv2vdr"
-PKG_VERSION="0.1.1"
+PKG_NAME="vdr-plugin-xmltv2vdr"
+PKG_VERSION="8be374e781e734b44edbd6bc03cfdc1694f6617e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
-PKG_URL="http://projects.vdr-developer.org/attachments/download/946/${PKG_NAME}-${PKG_VERSION}.tgz"
+PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-xmltv2vdr.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS="vdr sqlite curl libzip libxml libxslt"
 PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml libxslt enca"
 PKG_PRIORITY="optional"

packages/3rdparty/multimedia/vdr-plugin-xvdr/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-xvdr"
-PKG_VERSION="b62ccbd"
+PKG_VERSION="c2fa08a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-xmltv2vdr/patches/vdr-xmltv2vdr-0.1.1-curl_compile-01.patch

@@ -1,11 +0,0 @@
-diff -NaurwB xmltv2vdr-0.1.1_orig/dist/epgdata2xmltv/epgdata2xmltv.h xmltv2vdr-0.1.1/dist/epgdata2xmltv/epgdata2xmltv.h
---- xmltv2vdr-0.1.1_orig/dist/epgdata2xmltv/epgdata2xmltv.h	2012-05-07 07:34:21.000000000 +0200
-+++ xmltv2vdr-0.1.1/dist/epgdata2xmltv/epgdata2xmltv.h	2012-05-07 07:34:36.000000000 +0200
-@@ -7,7 +7,6 @@
- #define __EPGDATA2XMLTV_H
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include <libxslt/transform.h>

packages/3rdparty/system/pcsc-lite/meta

@@ -20,12 +20,12 @@
 ################################################################################
 
 PKG_NAME="pcsc-lite"
-PKG_VERSION="1.8.3"
+PKG_VERSION="1.8.6"
 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/3706/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://alioth.debian.org/frs/download.php/3757/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain libusb"
 PKG_PRIORITY="optional"

packages/3rdparty/x11/lib/libXcursor/meta

@@ -24,8 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
-# PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="http://www.mirrorservice.org/sites/ftp.x.org/pub/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libXfixes libXrender libX11"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/accessibility/atk/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="atk"
-PKG_VERSION="2.3.3"
+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.3/$PKG_NAME-$PKG_VERSION.tar.xz"
+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"

packages/addons/debugging/tools/evtest/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.3
 - update to evtest-1.30
 

packages/addons/debugging/tools/evtest/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="evtest"
 PKG_VERSION="1.30"
-PKG_REV="3"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/evtest/"

packages/addons/debugging/tools/htop/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.2
 - cleanup
 

packages/addons/debugging/tools/htop/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="htop"
 PKG_VERSION="1.0.1"
-PKG_REV="2"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"

packages/addons/driver/hdhomerun/addon

@@ -24,10 +24,3 @@
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/
   cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-  cp -Pa $BUILD/dvbhdhomerun-*/userhdhomerun/build/userhdhomerun $ADDON_BUILD/$PKG_ADDON_ID/bin/
-  cp -Pa $BUILD/libhdhomerun_*/hdhomerun_config $ADDON_BUILD/$PKG_ADDON_ID/bin/
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/
-  cp -Pa $BUILD/libhdhomerun_*/libhdhomerun.so $ADDON_BUILD/$PKG_ADDON_ID/lib/

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,3 +1,8 @@
+3.0.1
+- bump addon version
+- binary files are stored with OpenELEC image
+- addon is used to start userspace program
+
 2.1.3
 - bump addon version for new kernel
 

packages/addons/driver/hdhomerun/meta

@@ -19,18 +19,20 @@
 ################################################################################
 
 PKG_NAME="hdhomerun"
-PKG_VERSION="2.0"
-PKG_REV="3"
+PKG_VERSION="3.0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libhdhomerun dvbhdhomerun"
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com)."
 PKG_LONGDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com)."
+
+PKG_AUTORECONF="no"
+
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.python.script"
-PKG_AUTORECONF="no"

packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh

@@ -54,8 +54,6 @@ if [ -z "$(pidof userhdhomerun)" ]; then
   mkdir -p /var/log/
   rm -f /var/log/dvbhdhomerun.log
   
-  export LD_LIBRARY_PATH=$ADDON_DIR/lib
-
   userhdhomerun -f
   # how much time should we wait?
   usleep 1000000

packages/addons/driver/imon-mce/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.1
 - update for addon version 2.1
 

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.4
   support for Raspberry Pi
 

packages/addons/driver/sundtek-mediatv/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="sundtek-mediatv"
-PKG_VERSION="2.0"
-PKG_REV="4"
+PKG_VERSION="3.0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

packages/addons/driver/xbmc-ps3d/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.1
 - update to addon version 2.1
 

packages/addons/driver/xbmc-ps3d/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-ps3d"
-PKG_VERSION="2.0"
+PKG_VERSION="3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/addons/driver/xbmc-wiimote/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.1
 - update to addon version 2.1
 

packages/addons/driver/xbmc-wiimote/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-wiimote"
-PKG_VERSION="2.0"
+PKG_VERSION="3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/addons/multimedia/makemkv/changelog.txt

@@ -1,3 +1,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
 

packages/addons/multimedia/makemkv/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="makemkv"
-PKG_VERSION="1.7.7"
-PKG_REV="4"
+PKG_VERSION="1.7.9"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"

packages/addons/multimedia/w_scan/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.2
 - update to w_scan-20120605
 

packages/addons/multimedia/w_scan/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="w_scan"
 PKG_VERSION="20120605"
-PKG_REV="2"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"

packages/addons/networking/analyzer/tcpdump/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.3
 - updated to tcpdump-4.3.0
 - updated to libpcap-1.3.0

packages/addons/networking/analyzer/tcpdump/meta

@@ -1,6 +1,27 @@
+################################################################################
+#      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="3"
+PKG_REV="1"
 PKG_SITE="http://www.tcpdump.org/"
 PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS=""

packages/addons/networking/backup/rsync/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.1
 - update to addon version 2.1
 

packages/addons/networking/testing/iperf/changelog.txt

@@ -1,2 +1,5 @@
+3.0.1
+- bump addon version
+
 2.1.1
 - initial addon based on iperf-2.0.5

packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.8
 - update to SABnzbd-0.7.3
 - update to CouchPotato-806bed6

packages/addons/service/downloadmanager/SABnzbd-Suite/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="SABnzbd-Suite"
-PKG_VERSION="2.1"
-PKG_REV="8"
+PKG_VERSION="3.0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"

packages/addons/service/downloadmanager/pyload/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.1
 - update to addon version 2.1
 

packages/addons/service/downloadmanager/transmission/changelog.txt

@@ -1,3 +1,10 @@
+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
 

packages/addons/service/downloadmanager/transmission/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="transmission"
-PKG_VERSION="2.71"
-PKG_REV="6"
+PKG_VERSION="2.73"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"

packages/addons/service/multimedia/boblightd/addon

@@ -30,7 +30,13 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $PKG_BUILD/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $PKG_BUILD/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin
+  if [ "$DISPLAYSERVER" = "xorg-server" ] ; then
+    cp -P $PKG_BUILD/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin
+  fi
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
-  cp -R $PKG_DIR/config/*.sample $ADDON_BUILD/$PKG_ADDON_ID/config
+  cp -R $PKG_DIR/config/boblight.conf.sample $ADDON_BUILD/$PKG_ADDON_ID/config
+  if [ "$DISPLAYSERVER" = "xorg-server" ] ; then
+    cp -R $PKG_DIR/config/boblight.X11.sample $ADDON_BUILD/$PKG_ADDON_ID/config
+  fi
+

packages/addons/service/multimedia/boblightd/build

@@ -24,9 +24,14 @@
 
 . config/options $1
 
-if [ ! "$OPENGL_SUPPORT" = "yes" ] ; then
+if [ ! "$OPENGL" = "Mesa" ]; then
   EXTRAOPTS="--without-opengl"
 fi
+
+if [ ! "$DISPLAYSERVER" = "xorg-server" ] ; then
+  EXTRAOPTS="$EXTRAOPTS --without-x11"
+fi
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \

packages/addons/service/multimedia/boblightd/changelog.txt

@@ -1,3 +1,10 @@
+3.0.2
+- depends on libGLU
+
+3.0.1
+- bump addon version
+- make OpenGL and X11 support optional
+
 2.1.3
 - update to boblightd-449
 

packages/addons/service/multimedia/boblightd/meta

@@ -20,13 +20,13 @@
 
 PKG_NAME="boblightd"
 PKG_VERSION="449"
-PKG_REV="3"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="libX11 libXext libX11 libXrender Mesa"
-PKG_BUILD_DEPENDS="toolchain libX11 libXext libXrender Mesa"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="boblightd: an ambilight controller."
@@ -36,3 +36,13 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
 
 PKG_AUTORECONF="yes"
+
+if [ "$DISPLAYSERVER" = "xorg-server" ] ; then
+  PKG_DEPENDS="$PKG_DEPENDS libX11 libXext libXrender"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext libXrender"
+fi
+
+if [ "$OPENGL_SUPPORT" = "yes" ] ; then
+  PKG_DEPENDS="$PKG_DEPENDS Mesa glu"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS Mesa glu"
+fi

packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-090-add_CH-GA-Weissenstein_muxes-0.1.patch

@@ -1,55 +0,0 @@
-diff -Naur hts-tvheadend-c88a646/src/linuxtv_muxes.h hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h
---- hts-tvheadend-c88a646/src/linuxtv_muxes.h	2011-09-26 20:18:12.000000000 +0200
-+++ hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h	2011-10-18 13:40:37.768853992 +0200
-@@ -12001,6 +12001,39 @@
- 	{ .freq = 573000000, .symrate = 5217000, .fec = 0, .constellation = 5},
- };
- 
-+static const struct mux muxes_DVBC_ch_GA_Weissenstein[] = {
-+	{ .freq = 450000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 506000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 514000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 522000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 530000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 538000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 554000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 562000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 570000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 578000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 586000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 594000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 602000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 610000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 618000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 626000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 634000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 642000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 650000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 658000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 666000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 674000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 682000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 690000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 3},
-+	{ .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 706000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 722000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 730000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+};
-+
- static const struct mux muxes_DVBC_ch_Rega_Sense[] = {
- 	{ .freq = 434000000, .symrate = 6900000, .fec = 0, .constellation = 3},
- 	{ .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 3},
-@@ -12881,6 +12914,11 @@
- 
- static const struct network networks_DVBC_ch[] = {
- 	{
-+		.name = "GA-Weissenstein",
-+		.muxes = muxes_DVBC_ch_GA_Weissenstein,
-+		.nmuxes = sizeof(muxes_DVBC_ch_GA_Weissenstein) / sizeof(struct mux),
-+	},
-+	{
- 		.name = "Rega-Sense",
- 		.muxes = muxes_DVBC_ch_Rega_Sense,
- 		.nmuxes = sizeof(muxes_DVBC_ch_Rega_Sense) / sizeof(struct mux),

packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-091-cwc-connection-attempt.patch

@@ -1,14 +0,0 @@
-diff -upr hts-tvheadend-9d775da_orig/src/cwc.c hts-tvheadend-9d775da/src/cwc.c
---- hts-tvheadend-9d775da_orig/src/cwc.c	2011-08-22 22:46:01.000000000 +0200
-+++ hts-tvheadend-9d775da/src/cwc.c	2011-08-22 22:42:29.000000000 +0200
-@@ -1098,7 +1098,9 @@ cwc_thread(void *aux)
- 	continue; // Retry immediately
-       d = 3;
-     } else {
--      d = 60;
-+      if(attempts == 1)
-+        continue; // Retry immediately
-+      d = 3;
-     }
- 
-     ts.tv_sec = time(NULL) + d;

packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-092-deliver_raw_teletext_to_clients.patch

@@ -1,146 +0,0 @@
-From 3b407aa2053b1db3316873acd05c64319676eb34 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= <jernej@jernej-ThinkCentre-M91p.(none)>
-Date: Fri, 30 Sep 2011 12:56:01 +0200
-Subject: [PATCH 1/2] Deliver raw teletext to clients that are able to display
- it (e.g. XBMC)
-
----
- src/parsers.c |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/tsdemux.c |    7 +++----
- 2 files changed, 58 insertions(+), 4 deletions(-)
-
-diff --git a/src/parsers.c b/src/parsers.c
-index 9b7337d..68c7996 100644
---- a/src/parsers.c
-+++ b/src/parsers.c
-@@ -102,6 +102,9 @@ static void parse_aac(service_t *t, elementary_stream_t *st, const uint8_t *data
- static void parse_subtitles(service_t *t, elementary_stream_t *st, 
- 			    const uint8_t *data, int len, int start);
- 
-+static void parse_teletext(service_t *t, elementary_stream_t *st, 
-+			    const uint8_t *data, int len, int start);
-+
- static int parse_mpa(service_t *t, elementary_stream_t *st, size_t len,
- 		     uint32_t next_startcode, int sc_offset);
- 
-@@ -158,6 +161,10 @@ static int parse_pes_header(service_t *t, elementary_stream_t *st,
-     parse_aac(t, st, data, len, start);
-     break;
- 
-+  case SCT_TELETEXT:
-+    parse_teletext(t, st, data, len, start);
-+    break;
-+
-   default:
-     break;
-   }
-@@ -1232,6 +1239,54 @@ static int parse_pes_header(service_t *t, elementary_stream_t *st,
-   }
- }
- 
-+/**
-+ * Teletext parser
-+ */
-+static void
-+parse_teletext(service_t *t, elementary_stream_t *st, const uint8_t *data,
-+		int len, int start)
-+{
-+  th_pkt_t *pkt;
-+  int psize, hlen;
-+  const uint8_t *buf;
-+  const uint8_t *d;
-+  if(start) {
-+    st->es_parser_state = 1;
-+    st->es_buf.sb_err = 0;
-+    st->es_parser_ptr = 0;
-+    sbuf_reset(&st->es_buf);    
-+  }
-+
-+  if(st->es_parser_state == 0)
-+    return;
-+
-+  sbuf_append(&st->es_buf, data, len);
-+
-+  if(st->es_buf.sb_ptr < 6)
-+    return;
-+  d = st->es_buf.sb_data;
-+
-+  psize = d[4] << 8 | d[5];
-+
-+  if(st->es_buf.sb_ptr != psize + 6)
-+    return;
-+
-+  st->es_parser_state = 0;
-+
-+  hlen = parse_pes_header(t, st, d + 6, st->es_buf.sb_ptr - 6);
-+  if(hlen < 0)
-+    return;
-+
-+  psize -= hlen;
-+  buf = d + 6 + hlen;
-+  
-+  if(psize >= 46) {
-+
-+      pkt = pkt_alloc(buf, psize, st->es_curpts, st->es_curdts);
-+      pkt->pkt_commercial = t->s_tt_commercial_advice;
-+      parser_deliver(t, st, pkt);
-+  }	
-+}
- 
- /**
-  *
-diff --git a/src/tsdemux.c b/src/tsdemux.c
-index 897fe1d..5fdaf8b 100644
---- a/src/tsdemux.c
-+++ b/src/tsdemux.c
-@@ -110,11 +110,10 @@
- 			   got_section, st);
-     break;
- 
--  case SCT_TELETEXT:
--    teletext_input(t, st, tsb);
--    break;
--
-   default:
-+    if(st->es_type == SCT_TELETEXT)
-+      teletext_input(t, st, tsb);
-+
-     if(off > 188)
-       break;
- 
--- 
-1.7.5.4
-
-
-From a8026cd5b412c5096b0904f060ad5ffccdb883cf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= <jernej@jernej-ThinkCentre-M91p.(none)>
-Date: Thu, 17 Nov 2011 08:25:31 +0100
-Subject: [PATCH 2/2] Disable teletext recording to prevent issues with other
- elementary streams. Temporary until a better solution
- is found.
-
----
- src/plumbing/globalheaders.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/src/plumbing/globalheaders.c b/src/plumbing/globalheaders.c
-index 703591b..7f183d4 100644
---- a/src/plumbing/globalheaders.c
-+++ b/src/plumbing/globalheaders.c
-@@ -202,6 +202,12 @@
- 						  pkt->pkt_componentindex);
-     assert(ssc != NULL);
- 
-+    if(ssc->ssc_type == SCT_TELETEXT) {
-+      free(sm);
-+      ssc->ssc_disabled = 1;
-+      break;
-+    }
-+
-     pkt = convertpkt(ssc, pkt);
- 
-     apply_header(ssc, pkt);
--- 
-1.7.5.4
-
-

packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-093-add_support_for_IPTV_radio.patch

@@ -1,257 +0,0 @@
-From bb048589ab4e09e69b2fba3f639e8287ea9cc7c3 Mon Sep 17 00:00:00 2001
-From: Tadej Novak <tadej@tano.si>
-Date: Thu, 26 Jan 2012 18:39:09 +0100
-Subject: [PATCH 1/2] IPTV Radio support
-
-Added service type for IPTV and IPTV radio for easier access in
-some software (like XBMC).
----
- src/iptv_input.c             |    6 ++++++
- src/service.c                |    9 +++++++--
- src/service.h                |    2 ++
- src/webui/extjs.c            |   10 +++++++++-
- src/webui/static/app/iptv.js |   11 +++++++++--
- 5 files changed, 33 insertions(+), 5 deletions(-)
-
-diff --git a/src/iptv_input.c b/src/iptv_input.c
-index 0bfc311..361a151 100644
---- a/src/iptv_input.c
-+++ b/src/iptv_input.c
-@@ -428,6 +428,7 @@
-     inet_ntop(AF_INET6, &t->s_iptv_group6, abuf6, sizeof(abuf6));
-     htsmsg_add_str(m, "group", abuf6);
-   }
-+  htsmsg_add_u32(m, "radio", t->s_servicetype == ST_IPTV_RADIO);
-   if(t->s_ch != NULL) {
-     htsmsg_add_str(m, "channelname", t->s_ch->ch_name);
-     htsmsg_add_u32(m, "mapped", 1);
-@@ -591,6 +592,11 @@
-     if(!htsmsg_get_u32(c, "port", &u32))
-       t->s_iptv_port = u32;
- 
-+    if(!htsmsg_get_u32(c, "radio", &u32) && u32)
-+      t->s_servicetype = ST_IPTV_RADIO;
-+    else
-+      t->s_servicetype = ST_IPTV;
-+
-     pthread_mutex_lock(&t->s_stream_mutex);
-     service_make_nicename(t);
-     psi_load_service_settings(c, t);
-diff --git a/src/service.c b/src/service.c
-index 1a405d1..6899e2e 100644
---- a/src/service.c
-+++ b/src/service.c
-@@ -732,6 +732,8 @@
-   { "HDTV",         ST_HDTV },
-   { "SDTV-AC",      ST_AC_SDTV },
-   { "HDTV-AC",      ST_AC_HDTV },
-+  { "IPTV",         ST_IPTV },
-+  { "IPTV Radio",   ST_IPTV_RADIO },
- };
- 
- const char *
-@@ -750,7 +752,8 @@
-     t->s_servicetype == ST_SDTV    ||
-     t->s_servicetype == ST_HDTV    ||
-     t->s_servicetype == ST_AC_SDTV ||
--    t->s_servicetype == ST_AC_HDTV;
-+    t->s_servicetype == ST_AC_HDTV ||
-+    t->s_servicetype == ST_IPTV;
- }
- 
- /**
-@@ -759,7 +762,9 @@
- int
- service_is_radio(service_t *t)
- {
--  return t->s_servicetype == ST_RADIO;
-+  return
-+    t->s_servicetype == ST_RADIO ||
-+    t->s_servicetype == ST_IPTV_RADIO;
- }
- 
- /**
-diff --git a/src/service.h b/src/service.h
-index 2185e42..186278d 100644
---- a/src/service.h
-+++ b/src/service.h
-@@ -318,6 +318,8 @@ typedef void (pid_section_callback_t)(struct service *t,
-     ST_HDTV       = 0x11,   /* HDTV (MPEG2) */
-     ST_AC_SDTV    = 0x16,   /* Advanced codec SDTV */
-     ST_AC_HDTV    = 0x19,   /* Advanced codec HDTV */
-+    ST_IPTV       = 0x30,   /* IPTV */
-+    ST_IPTV_RADIO = 0x31,   /* Radio over IPTV */
-   } s_servicetype;
- 
- 
-diff --git a/src/webui/extjs.c b/src/webui/extjs.c
-index 3ed9f8b..4596005 100644
---- a/src/webui/extjs.c
-+++ b/src/webui/extjs.c
-@@ -1313,7 +1313,14 @@
-       }
-       save = 1;
-     }
--    
-+    if(!htsmsg_get_u32(c, "radio", &u32)) {
-+        if(u32)
-+          t->s_servicetype = ST_IPTV_RADIO;
-+        else
-+          t->s_servicetype = ST_IPTV;
-+      save = 1;
-+    }
-+
- 
-     save |= tvh_str_update(&t->s_iptv_iface, htsmsg_get_str(c, "interface"));
-     if(save)
-@@ -1347,6 +1354,7 @@
-   }
- 
-   htsmsg_add_u32(r, "port", t->s_iptv_port);
-+  htsmsg_add_u32(r, "radio", t->s_servicetype == ST_IPTV_RADIO);
-   htsmsg_add_u32(r, "enabled", t->s_enabled);
-   return r;
- }
-diff --git a/src/webui/static/app/iptv.js b/src/webui/static/app/iptv.js
-index acdbfc0..b29e0b9 100644
---- a/src/webui/static/app/iptv.js
-+++ b/src/webui/static/app/iptv.js
-@@ -11,6 +11,12 @@ tvheadend.iptv = function(adapterId) {
-        width: 45
-     });
- 
-+    var radioColumn = new Ext.grid.CheckColumn({
-+       header: "Radio",
-+       dataIndex: 'radio',
-+       width: 45
-+    });
-+
-     var actions = new Ext.ux.grid.RowActions({
- 	header:'',
- 	dataIndex: 'actions',
-@@ -82,6 +88,7 @@ tvheadend.iptv = function(adapterId) {
- 		maxValue: 65535
- 	    })
- 	},
-+	radioColumn,
- 	{
- 	    header: "Service ID",
- 	    dataIndex: 'sid',
-@@ -105,7 +112,7 @@ tvheadend.iptv = function(adapterId) {
-     cm.defaultSortable = true;
- 
-     var rec = Ext.data.Record.create([
--	'id', 'enabled', 'channelname', 'interface', 'group', 'port',
-+    'id', 'enabled', 'channelname', 'interface', 'group', 'port', 'radio',
- 	'sid', 'pmt', 'pcr'
-     ]);
- 
-@@ -246,7 +253,7 @@ tvheadend.iptv = function(adapterId) {
- 	stripeRows: true,
- 	title: 'IPTV',
- 	iconCls: 'iptv',
--	plugins: [enabledColumn, actions],
-+	plugins: [enabledColumn, radioColumn, actions],
- 	store: store,
- 	clicksToEdit: 2,
- 	cm: cm,
--- 
-1.7.5.4
-
-
-From 18473dd11d983aecb6db6e49b454a5d6bb1a329f Mon Sep 17 00:00:00 2001
-From: Tadej Novak <tadej@tano.si>
-Date: Mon, 30 Jan 2012 16:55:25 +0100
-Subject: [PATCH 2/2] Use the same service type for all radio types
-
-Tvheadend now uses same radio type ST_RADIO for DVB and IPTV radios.
-Otherwise IPTV streams have ST_IPTV type.
----
- src/iptv_input.c  |    4 ++--
- src/service.c     |    5 +----
- src/service.h     |    1 -
- src/webui/extjs.c |    4 ++--
- 4 files changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/src/iptv_input.c b/src/iptv_input.c
-index 361a151..aeb0ab2 100644
---- a/src/iptv_input.c
-+++ b/src/iptv_input.c
-@@ -428,7 +428,7 @@
-     inet_ntop(AF_INET6, &t->s_iptv_group6, abuf6, sizeof(abuf6));
-     htsmsg_add_str(m, "group", abuf6);
-   }
--  htsmsg_add_u32(m, "radio", t->s_servicetype == ST_IPTV_RADIO);
-+  htsmsg_add_u32(m, "radio", t->s_servicetype == ST_RADIO);
-   if(t->s_ch != NULL) {
-     htsmsg_add_str(m, "channelname", t->s_ch->ch_name);
-     htsmsg_add_u32(m, "mapped", 1);
-@@ -593,7 +593,7 @@
-       t->s_iptv_port = u32;
- 
-     if(!htsmsg_get_u32(c, "radio", &u32) && u32)
--      t->s_servicetype = ST_IPTV_RADIO;
-+      t->s_servicetype = ST_RADIO;
-     else
-       t->s_servicetype = ST_IPTV;
- 
-diff --git a/src/service.c b/src/service.c
-index 6899e2e..015cd46 100644
---- a/src/service.c
-+++ b/src/service.c
-@@ -733,7 +733,6 @@
-   { "SDTV-AC",      ST_AC_SDTV },
-   { "HDTV-AC",      ST_AC_HDTV },
-   { "IPTV",         ST_IPTV },
--  { "IPTV Radio",   ST_IPTV_RADIO },
- };
- 
- const char *
-@@ -762,9 +761,7 @@
- int
- service_is_radio(service_t *t)
- {
--  return
--    t->s_servicetype == ST_RADIO ||
--    t->s_servicetype == ST_IPTV_RADIO;
-+  return t->s_servicetype == ST_RADIO;
- }
- 
- /**
-diff --git a/src/service.h b/src/service.h
-index 186278d..40d1174 100644
---- a/src/service.h
-+++ b/src/service.h
-@@ -319,7 +319,6 @@ typedef void (pid_section_callback_t)(struct service *t,
-     ST_AC_SDTV    = 0x16,   /* Advanced codec SDTV */
-     ST_AC_HDTV    = 0x19,   /* Advanced codec HDTV */
-     ST_IPTV       = 0x30,   /* IPTV */
--    ST_IPTV_RADIO = 0x31,   /* Radio over IPTV */
-   } s_servicetype;
- 
- 
-diff --git a/src/webui/extjs.c b/src/webui/extjs.c
-index 4596005..4487deb 100644
---- a/src/webui/extjs.c
-+++ b/src/webui/extjs.c
-@@ -1315,7 +1315,7 @@
-     }
-     if(!htsmsg_get_u32(c, "radio", &u32)) {
-         if(u32)
--          t->s_servicetype = ST_IPTV_RADIO;
-+          t->s_servicetype = ST_RADIO;
-         else
-           t->s_servicetype = ST_IPTV;
-       save = 1;
-@@ -1354,7 +1354,7 @@
-   }
- 
-   htsmsg_add_u32(r, "port", t->s_iptv_port);
--  htsmsg_add_u32(r, "radio", t->s_servicetype == ST_IPTV_RADIO);
-+  htsmsg_add_u32(r, "radio", t->s_servicetype == ST_RADIO);
-   htsmsg_add_u32(r, "enabled", t->s_enabled);
-   return r;
- }
--- 
-1.7.5.4
-

packages/addons/service/multimedia/hts-tvheadend/patches/hts-tvheadend-78213a0-094-gcc.4.7.1.patch

@@ -1,18 +0,0 @@
-Author: Adam Sutton <dev@adamsutton.me.uk>
-Date:   Sun Jul 29 20:37:00 2012 +0100
-
-    Fix false trigger of uninit var, detected using gcc v4.7.1 (compiling openelec tvh add-on), reported by seo.
-
-diff --git a/src/htsp.c b/src/htsp.c
-index b9fc3e1..ae5bd51 100644
---- a/src/htsp.c
-+++ b/src/htsp.c
-@@ -1160,7 +1160,7 @@ htsp_read_message(htsp_connection_t *htsp, htsmsg_t **mp, int timeout)
- static int
- htsp_read_loop(htsp_connection_t *htsp)
- {
--  htsmsg_t *m, *reply;
-+  htsmsg_t *m = NULL, *reply;
-   int r, i;
-   const char *method;
-

packages/addons/service/multimedia/tvheadend/addon

@@ -28,4 +28,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
   cp -PR $PKG_DIR/config/dvr-config $ADDON_BUILD/$PKG_ADDON_ID/dvr-config
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/build.linux/tvheadend.bundle $ADDON_BUILD/$PKG_ADDON_ID/bin/tvheadend
+  cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin

packages/addons/service/multimedia/tvheadend/build

@@ -34,7 +34,6 @@ cd $PKG_BUILD
             --arch=$TARGET_ARCH \
             --cpu=$TARGET_CPU \
             --cc=$TARGET_CC \
-            --release
+            --enable-bundle
 
 make
-make build.linux/tvheadend.bundle

packages/addons/service/multimedia/tvheadend/changelog.txt

@@ -1,3 +1,12 @@
+3.0.2
+- update to TVHeadend 3.2.18
+
+3.0.1
+- bump addon version
+- add support to install as system addon
+- update to TVHeadend 3.2, rename addon
+- add version string to addon summary
+
 2.1.5
 - add an option to wait for more than 1 adapters to appear
 

packages/addons/service/multimedia/tvheadend/config/xmltv-config

@@ -1,7 +1,7 @@
 {
 	"grabbers": [
 		{
-			"path": "/storage/.xbmc/addons/service.multimedia.hts-tvheadend/bin/tv_grab_file",
+			"path": "/storage/.xbmc/addons/service.multimedia.tvheadend/bin/tv_grab_file",
 			"description": "tv_grag_file is a simple grabber that just read the ~/.xmltv/tv_grab_file.xmltv file",
 			"version": "0.1\n",
 			"mtime": 1318774706,
@@ -10,5 +10,5 @@
 	],
 	"grab-interval": 12,
 	"grab-enabled": 1,
-	"current-grabber": "/storage/.xbmc/addons/service.multimedia.hts-tvheadend/bin/tv_grab_file"
+	"current-grabber": "/storage/.xbmc/addons/service.multimedia.tvheadend/bin/tv_grab_file"
 }

packages/addons/service/multimedia/tvheadend/meta

@@ -18,20 +18,20 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="hts-tvheadend"
-PKG_VERSION="78213a0"
-PKG_REV="5"
+PKG_NAME="tvheadend"
+PKG_VERSION="3.2.18"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
-# PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz"
-PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+#PKG_URL="https://github.com/downloads/tvheadend/tvheadend/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS="$ICONV avahi openssl"
 PKG_BUILD_DEPENDS="toolchain $ICONV avahi openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
-PKG_SHORTDESC="hts-tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
-PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes. If installing as an Addon a reboot is needed"
+PKG_SHORTDESC="tvheadend (Version: $PKG_VERSION): a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
+PKG_LONGDESC="Tvheadend (Version: $PKG_VERSION) is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes. If installing as an Addon a reboot is needed"
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_AUTORECONF="no"

packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file

@@ -22,7 +22,7 @@
 
 . /etc/profile
 
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 XMLTV_TYPE=`grep XMLTV_TYPE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 XMLTV_LOCATION_FILE=`grep XMLTV_LOCATION_FILE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`

packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start

@@ -25,8 +25,9 @@
 LOCKDIR="/var/lock/"
 LOCKFILE="tvheadend.disabled"
 
-ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.hts-tvheadend"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
+ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.tvheadend"
+ADDON_SYS_DIR="/usr/lib/xbmc/addons/service.multimedia.tvheadend"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend"
 ADDON_BIN="tvheadend"
 LOG_FILE="$ADDON_HOME/service.log"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
@@ -37,26 +38,58 @@ DVR_SETTINGS_DIR="$ADDON_HOME/dvr"
 DVR_SETTINGS_FILE="$DVR_SETTINGS_DIR/config"
 DVR_DIR="$HOME/recordings"
 
+## handle upgrade. this should be removed later
+
+# remove any old hts-tvheadend dir
+if [ -d $HOME/.xbmc/addons/service.multimedia.hts-tvheadend ] ; then
+  # stop old service if runing
+  $HOME/.xbmc/addons/service.multimedia.hts-tvheadend/bin/tvheadend.stop
+  rm -rf $HOME/.xbmc/addons/service.multimedia.hts-tvheadend
+fi
+
+# reuse old config files
+if [ -d $HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend ] ; then
+  mv $HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend $ADDON_HOME
+  sed -i 's/service.multimedia.hts-tvheadend/service.multimedia.tvheadend/g' $ADDON_HOME/xmltv/config
+fi
+##
+
 if [ ! -f "$ADDON_SETTINGS" ]; then
-  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+  if [ -f $ADDON_DIR/settings-default.xml ]; then
+    cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+  elif [ -f $ADDON_SYS_DIR/settings-default.xml ]; then
+    cp $ADDON_SYS_DIR/settings-default.xml $ADDON_SETTINGS
+  fi
 fi
 
 if [ ! -f "$XMLTV_SETTINGS_FILE" ]; then
   mkdir -p $XMLTV_SETTINGS_DIR
-  cp $ADDON_DIR/xmltv-config $XMLTV_SETTINGS_FILE
+  if [ -f $ADDON_DIR/xmltv-config ]; then
+    cp $ADDON_DIR/xmltv-config $XMLTV_SETTINGS_FILE
+  elif [ -f $ADDON_SYS_DIR/xmltv-config ]; then
+    cp $ADDON_SYS_DIR/xmltv-config $XMLTV_SETTINGS_FILE
+  fi
 fi
 
 if [ ! -f "$DVR_SETTINGS_FILE" ]; then
   mkdir -p $DVR_DIR
   mkdir -p $DVR_SETTINGS_DIR
-  cp $ADDON_DIR/dvr-config $DVR_SETTINGS_FILE
+  if [ -f $ADDON_DIR/dvr-config ]; then
+    cp $ADDON_DIR/dvr-config $DVR_SETTINGS_FILE
+  elif [ -f $ADDON_SYS_DIR/dvr-config ]; then
+    cp $ADDON_SYS_DIR/dvr-config $DVR_SETTINGS_FILE
+  fi
 fi
 
 TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
 
 mkdir -p /var/config
-cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default
-cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf
+  if [ -f $ADDON_DIR/settings-default.xml ]; then
+    cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default
+  elif [ -f $ADDON_SYS_DIR/settings-default.xml ]; then
+    cat "$ADDON_SYS_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default
+  fi
+  cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf
 
 . /var/config/tvheadend.conf.default
 . /var/config/tvheadend.conf

packages/addons/service/multimedia/tvheadend/source/default.py

@@ -20,10 +20,10 @@
 
 import xbmc, xbmcaddon, time, os, subprocess
 
-__scriptname__ = "HTS TVheadend Service"
+__scriptname__ = "TVHeadend Service"
 __author__ = "OpenELEC"
 __url__ = "http://www.openelec.tv"
-__settings__   = xbmcaddon.Addon(id='service.multimedia.hts-tvheadend')
+__settings__   = xbmcaddon.Addon(id='service.multimedia.tvheadend')
 __cwd__        = __settings__.getAddonInfo('path')
 __start__      = xbmc.translatePath( os.path.join( __cwd__, 'bin', "tvheadend.start") )
 __stop__       = xbmc.translatePath( os.path.join( __cwd__, 'bin', "tvheadend.stop") )

packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power

@@ -22,7 +22,7 @@
 
 . /etc/profile
 
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 

packages/addons/service/multimedia/vdr-addon/addon

@@ -43,10 +43,11 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
   cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv
-  cp $BUILD/vdr-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv/
+  cp $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv/
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $BUILD/vdr-plugin-vnsiserver-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-dynamite-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-iptv-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-wirbelscan-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
@@ -60,7 +61,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/rotorng-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-control-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-epgsearch*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $BUILD/vdr-xmltv2vdr*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $BUILD/vdr-plugin-xmltv2vdr*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-xineliboutput-[0-9]*/libvdr*.so.1.7.27 $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-text2skin-[0-9]*/libvdr*.so.1.7.27 $ADDON_BUILD/$PKG_ADDON_ID/plugin
 
@@ -72,9 +73,12 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
   cp -PR $BUILD/vdr-plugin-xvdr-*/xvdr/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
 
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
+  cp -PR $BUILD/vdr-plugin-vnsiserver-*/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
+
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $BUILD/vdr-[0-9]*/vdr $ADDON_BUILD/$PKG_ADDON_ID/bin/vdr.bin
-  cp -P $BUILD/vdr-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/attr-[0-9]*/libattr/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,11 @@
+3.0.2
+- update to vdr-plugin-xmltv2vdr-8be374e
+- update to vdr-plugin-xvdr-c2fa08a
+- added vdr-plugin-vnsiserver
+
+3.0.1
+- bump addon version
+
 2.1.8
 - rebuild due to some static libs in latest git
 

packages/addons/service/multimedia/vdr-addon/config/settings.xml

@@ -3,6 +3,7 @@
     <setting id="NUM_ADAPTERS" value="1" />
     <setting id="REMOVE_MODULES" value="" />
     <setting id="VDR_VIDEO_DIR" value="/storage/videos" />
+    <setting id="PVR_PLUGIN" value="xvdr" />
     <setting id="ENABLE_DYNAMITE" value="true" />
     <setting id="ENABLE_IPTV" value="false" />
     <setting id="ENABLE_SOFTCAM" value="true" />

packages/addons/service/multimedia/vdr-addon/meta

@@ -20,14 +20,14 @@
 ################################################################################
 
 PKG_NAME="vdr-addon"
-PKG_VERSION="2.1"
-PKG_REV="8"
+PKG_VERSION="3.0"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-xmltv2vdr vdr-xineliboutput vdr-text2skin vdr-skinanthra_1280_OS"
+PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-xineliboutput vdr-text2skin vdr-skinanthra_1280_OS"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -51,7 +51,7 @@ VDR_ARG="-g /tmp --no-kbd --log=3 --port=0"
 VDR_ARG="$VDR_ARG --config=$ADDON_CONFIG_DIR"
 VDR_ARG="$VDR_ARG --lib=$ADDON_PLUGIN_DIR"
 VDR_ARG="$VDR_ARG --video=\"$VDR_VIDEO_DIR\""
-VDR_ARG="$VDR_ARG -P xvdr"
+VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"
 
 if [ "$ENABLE_SOFTCAM" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P $SOFTCAM_PLUGIN"

packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml

@@ -30,4 +30,5 @@
 	<string id="1050">Enable plugin: text2skin</string>
 	<string id="1051">VDR Configuration</string>
 	<string id="1052">VDR Video Dir</string>
+	<string id="1053">PVR plugin</string>
 </strings>

packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml

@@ -15,6 +15,7 @@
     <category label="1001">
 		<setting label="1030" type="lsep"/>
 		<setting type="sep" />
+		<setting id="PVR_PLUGIN" type="labelenum" label="1053" values="xvdr|vnsiserver" default="xvdr" />
 		<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
 		<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
 		<setting id="ENABLE_STREAMDEV_SERVER" type="bool" label="1033" default="false" />

packages/addons/service/softcam/oscam/changelog.txt

@@ -1,3 +1,9 @@
+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
 

packages/addons/service/softcam/oscam/meta

@@ -21,10 +21,10 @@
 
 PKG_NAME="oscam"
 PKG_VERSION="7168"
-PKG_REV="7"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en"
+PKG_SITE="http://www.streamboard.tv/oscam/wiki"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="openssl"
 PKG_BUILD_DEPENDS="toolchain openssl pcsc-lite"

packages/addons/service/system/dcron/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.1
 - update to addon version 2.1
 

packages/addons/service/system/pcscd-addon/addon

@@ -32,11 +32,11 @@
   cp -Pa $BUILD/pcsc-lite-*/src/spy/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial
-  cp -Pa $BUILD/libccid-*/src/.libs/libccidtwin.so $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/libccid-*/src/.libs/libccid.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents/Linux/
-  cp -Pa $BUILD/libccid-*/src/Info.plist $ADDON_BUILD/$PKG_ADDON_ID/drivers/ifd-ccid.bundle/Contents
+  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/

packages/addons/service/system/pcscd-addon/changelog.txt

@@ -1,3 +1,10 @@
+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

packages/addons/service/system/pcscd-addon/meta

@@ -20,14 +20,14 @@
 ################################################################################
 
 PKG_NAME="pcscd-addon"
-PKG_VERSION="2.0"
+PKG_VERSION="3.0"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain pcsc-lite libusb libccid"
+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)"

packages/addons/service/web/maraschino/changelog.txt

@@ -1,3 +1,7 @@
+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

packages/addons/service/web/maraschino/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="maraschino"
-PKG_VERSION="40e2ce0"
-PKG_REV="2"
+PKG_VERSION="1681187"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.maraschinoproject.com/"

packages/addons/service/web/maraschino/patches/maraschino-707e82c-remote.patch

@@ -1,13 +0,0 @@
---- a/modules/remote.py
-+++ b/modules/remote.py
-@@ -13,7 +13,7 @@ connected = False
- def update_xbmc_object():
-     host = get_setting_value('server_hostname')
-     try:
--        icon = os.path.abspath('static/images/maraschino_logo.png')
-+        icon = os.path.abspath('/storage/.xbmc/addons/service.web.maraschino/static/images/maraschino_logo.png')
- 
-         if not os.path.exists(icon):
-             icon = os.path.abspath('maraschino/static/images/maraschino_logo.png')
-
-

packages/addons/shell/texteditor/nano/changelog.txt

@@ -1,3 +1,6 @@
+3.0.1
+- bump addon version
+
 2.1.2
 - cleanup
 

packages/addons/shell/texteditor/nano/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="nano"
 PKG_VERSION="2.3.1"
-PKG_REV="2"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nano-editor.org/"

packages/audio/alsa/config/asound.conf.sample/asound.conf_ZBOX-HD-ID11.sample

@@ -1,10 +0,0 @@
-# modprobe.d config for Zotac ZBOX HD-ID11
-# This file is part of OpenELEC, many thanks to 'Dampfgarten'
-#
-# XBMC config:
-# SYSTEM -> System -> Audio-Hardware
-# Audio Ausgabegerät: HDA NVidia hdmi
-# Digitales Ausgabegerät für Passthrough: HDA NVidia hdmi
-
-pcm.!default hdmi:NVidia
-pcm:iec958 hdmi:NVidia

packages/audio/alsa/config/asound.conf.sample/asound.conf_double-analog-hdmi.sample

@@ -1,68 +0,0 @@
-pcm.!default {
-        type plug
-        slave {
-                pcm "both"
-        }
-}
-
-pcm.both {
-        type route
-        slave {
-                pcm multi
-                channels 4
-        }
-        ttable.0.0 1.0
-        ttable.1.1 1.0
-        ttable.0.2 1.0
-        ttable.1.3 1.0
-}
-
-pcm.multi {
-        type multi
-        slaves.a {
-                pcm "hdmi_hw"
-                channels 2
-        }
-        slaves.b {
-                pcm "analog_hw"
-                channels 2
-        }
-        bindings.0.slave a
-        bindings.0.channel 0
-        bindings.1.slave a
-        bindings.1.channel 1
-        bindings.2.slave b
-        bindings.2.channel 0
-        bindings.3.slave b
-        bindings.3.channel 1
-}
-
-pcm.hdmi_hw {
-        type hw
-        card 1
-        device 9
-        channels 2
-}
-
-pcm.hdmi_formatted {
-        type plug
-        slave {
-                pcm hdmi_hw
-                rate 48000
-                channels 2
-        }
-}
-
-pcm.hdmi_complete {
-        type softvol
-        slave.pcm hdmi_formatted
-        control.name hdmi_volume
-        control.card 1
-}
-
-pcm.analog_hw {
-        type hw
-        card 0
-        device 0
-        channels 2
-}

packages/audio/alsa/config/asound.conf.sample/asound.conf_double-analog-hdmi_dmix.sample

@@ -1,76 +0,0 @@
-pcm.!default {
-        type plug
-        slave {
-                pcm "both"
-        }
-}
-
-pcm.both {
-        type route
-        slave {
-                pcm multi
-                channels 4
-        }
-        ttable.0.0 1.0
-        ttable.1.1 1.0
-        ttable.0.2 1.0
-        ttable.1.3 1.0
-}
-
-pcm.multi {
-        type multi
-        slaves.a {
-                pcm "hdmi_hw"
-                channels 2
-        }
-        slaves.b {
-                pcm "analog_hw"
-                channels 2
-        }
-        bindings.0.slave a
-        bindings.0.channel 0
-        bindings.1.slave a
-        bindings.1.channel 1
-        bindings.2.slave b
-        bindings.2.channel 0
-        bindings.3.slave b
-        bindings.3.channel 1
-}
-
-pcm.hdmi_hw  {
- 	type dmix
- 	ipc_key 1000
- 	slave {
-		pcm "hw:1,9"
-		period_time 0
-		period_size 512
-		buffer_size 2048
-	}
-}
-
-pcm.hdmi_formatted {
-        type plug
-        slave {
-                pcm hdmi_hw
-                rate 48000
-                channels 2
-        }
-}
-
-pcm.hdmi_complete {
-        type softvol
-        slave.pcm hdmi_formatted
-        control.name hdmi_volume
-        control.card 1
-}
-
-pcm.analog_hw  {
- 	type dmix
- 	ipc_key 1001
- 	slave {
-		pcm "hw:0,0"
-		period_time 0
-		period_size 512
-		buffer_size 2048
-	}
-}

packages/audio/alsa/config/asound.conf.sample/asound.conf_double-revo.sample

@@ -1,248 +0,0 @@
-# http://forum.xbmc.org/showpost.php?p=599791&postcount=41
-
-# ALSA configuration file
-
-##### USAGE #####
-# Save this file as "~/.asoundrc" (for user-specific sound configuration) or
-# "/etc/asound.conf" (for system-wide sound configuration) and specify ALSA
-# device names ad described in the next section.
-
-
-##### DEVICE NAMES #####
-# This configuration file defines four devices for use by the user.  Those
-# devices are "analog", "mixed-analog", "digital", and "mixed-digital".  The
-# user may also re-define "default" to be identical to one of the above-named
-# devices (i.e. to send all sound output to the digital output unless otherwise
-# specified).  Use the device names as described below:
-#  - "analog" outputs to the analog output directly and (at least on software
-#  sound cards) blocks other audio output.  After playback completes, "queued"
-#  sounds are output in sequence.
-#  - "mixed-analog" mixes audio output from multiple programs into the analog
-#  output (so you can hear beeps, alerts, and other noises while playing back
-#  an audio stream).
-#  - "digital" outputs to the digital output directly.  Since most (all?)
-#  digital outputs expect 48kHz PCM audio, this may not work for some playback
-#  (i.e. CD's--which are 44.1kHz PCM audio--or 32kHz audio streams from TV
-#  recordings, etc.).
-#  - "mixed-digital"
-
-# All other devices created within this file are used only by the configuration
-# file itself and should /not/ be used directly.  In other words, do not use
-# the devices "analog-hw", "dmix-analog", "digital-hw", or "dmix-digital".
-
-
-##### IMPORTANT #####
-# To make this ALSA configuration file work with your sound card, you will need
-# to define the appropriate card and device information for the "analog-hw" and
-# "digital-hw" devices below.  You can find the card and device information
-# using "aplay -l".
-
-# Alias for (converted) analog output on the card
-# - This is identical to the device named "default"--which always exists and
-# refers to hw:0,0 (unless overridden)
-# - Therefore, we can specify "hw:0,0", "default", or "analog" to access analog
-# output on the card
-# - Note that as of ALSA 1.0.9, "software" sound card definitions redefine
-# "default" to do mixing, meaning this device is different from "default" and
-# allows playback while blocking other sound sources (until playback
-# completes).
-pcm.analog {
-  type plug
-  slave.pcm "analog-hw"
-  hint {
-    show on
-    description "Analog Output - Use analog outputs, converting samples, format, and rate as necessary."
-  }
-}
-
-# Control device (mixer, etc.) for the card
-ctl.analog {
-  type hw
-  card 0
-}
-
-# Alias for (converted) mixed analog output on the card
-# - This will accept audio input--regardless of rate--and convert to the rate
-# required for the dmix plugin (in this case 48000Hz)
-# - Note that as of ALSA 1.0.9, "software" sound card definitions redefine
-# "default" to do mixing, meaning this device is identical to "default" for
-# "software" sound cards.
-pcm.mixed-analog {
-  type plug
-  slave.pcm "dmix-analog"
-  hint {
-    show on
-    description "Mixed Analog Output - Use analog outputs, converting samples, format, and rate as necessary. Allows mixing with system sounds."
-  }
-}
-
-# Control device (mixer, etc.) for the card
-ctl.mixed-analog {
-  type hw
-  card 0
-}
-
-# Alias for (converted) digital (HDMI) output on the card
-pcm.digital {
-  type plug
-  slave.pcm "digital-hw"
-  hint {
-    show on
-    description "Digital Output - Use digital outputs, converting samples, format, and rate as necessary."
-  }
-}
-
-# Control device (mixer, etc.) for the card
-ctl.digital {
-  type hw
-  card 0
-}
-
-# Alias for mixed (converted) digital (HDMI) output on the card
-
-pcm.mixed-digital {
-  type plug
-  slave.pcm "dmix-digital"
-  hint {
-    show on
-    description "Mixed Digital Output - Use digital outputs, converting samples, format, and rate as necessary. Allows mixing with system sounds."
-  }
-}
-
-# Control device (mixer, etc.) for the card
-ctl.mixed-digital {
-  type hw
-  card 0
-}
-
-# The following devices are not useful by themselves.  They require specific
-# rates, channels, and formats.  Therefore, you probably do not want to use
-# them directly.  Instead use of of the devices defined above.
-
-# Alias for analog output on the card
-# Do not use this directly--it requires specific rate, channels, and format
-pcm.analog-hw {
-  type hw
-  card 0
-  device 0
-}
-
-# Control device (mixer, etc.) for the card
-ctl.analog-hw {
-  type hw
-  card 0
-}
-
-# Alias for digital (HDMI) output on the card
-# Do not use this directly--it requires specific rate, channels, and format
-pcm.digital-hw {
-  type hw
-  card 0
-  device 3
-}
-
-# Control device (mixer, etc.) for the card
-ctl.digital-hw {
-  type hw
-  card 0
-}
-
-# Direct software mixing plugin for analog output on the card
-# Do not use this directly--it requires specific rate, channels, and format
-pcm.dmix-analog {
-  type dmix
-  ipc_key 1234
-  slave {
-    pcm "analog-hw"
-    period_time 0
-    period_size 1024
-    buffer_size 4096
-    rate 48000
-  }
-}
-
-# Control device (mixer, etc.) for the card
-ctl.dmix-analog {
-  type hw
-  card 0
-}
-
-# Direct software mixing plugin for digital (S/PDIF) output on the card
-# Do not use this directly--it requires specific rate, channels, and format
-pcm.dmix-digital {
-  type dmix
-  ipc_key 1235
-  slave {
-    pcm "digital-hw"
-    period_time 0
-    period_size 1024
-    buffer_size 4096
-    rate 48000
-  }
-}
-
-# Control device (mixer, etc.) for the card
-ctl.dmix-digital {
-  type hw
-  card 0
-}
-
-# Make joint analog/HDMI the default
-pcm.!default {
-  type plug
-  slave {
-    pcm multi
-    rate 48000
-  }
-  ttable.0.0 1.0
-  ttable.1.1 1.0
-  ttable.0.2 1.0
-  ttable.1.3 1.0
-}
-
-# Control device (mixer, etc.) for the card
-ctl.!default {
-  type hw
-  card 0
-}
-
-pcm.xbmc {
-  type plug
-  slave {
-    pcm multi
-    rate 48000
-    channels 4
-  }
-  ttable.0.0 1.0
-  ttable.1.1 1.0
-  ttable.0.2 1.0
-  ttable.1.3 1.0
-}
-
-
-ctl.xbmc {
-  type hw
-  card 0
-}
-
-pcm.multi {
-  type multi
-  slaves.a.pcm "analog-hw"
-  slaves.a.channels 2
-  slaves.b.pcm "digital-hw"
-  slaves.b.channels 2
-  bindings.0.slave a
-  bindings.0.channel 0
-  bindings.1.slave a
-  bindings.1.channel 1
-  bindings.2.slave b
-  bindings.2.channel 0
-  bindings.3.slave b
-  bindings.3.channel 1
-}
-
-ctl.multi {
-  type hw
-  card 0
-}
-

packages/audio/alsa/config/asound.conf.sample/asound.conf_double-xs35gt.sample

@@ -1,58 +0,0 @@
-# asound.conf for Shuttle XS35GT
-# http://forum.xbmc.org/showpost.php?p=635394&postcount=330
-# in XBMC, set "audio output device" to custom
-# insert "pcm.both" into the text box
-
-pcm.!default {
-	type plug
-	slave {
-		pcm both
-	}
-}
-
-pcm.both {
-	type route
-	slave {
-		pcm multi
-		channels 4
-	}
-	ttable.0.0 1.0
-	ttable.1.1 1.0
-	ttable.0.2 1.0
-	ttable.1.3 1.0
-}
-
-pcm.multi {
-	type multi
-	slaves.a {
-		pcm tv
-		channels 2
-	}
-	slaves.b {
-		pcm receiver
-		channels 2
-	}
-	bindings.0.slave a
-	bindings.0.channel 0
-	bindings.1.slave a
-	bindings.1.channel 1
-	bindings.2.slave b
-	bindings.2.channel 0
-	bindings.3.slave b
-	bindings.3.channel 1
-}
-
-pcm.receiver {
-	type hw
-	card 0
-	device 0
-	channels 2
-}
-
-pcm.tv {
-	type hw
-	card 1
-	device 7
-	channels 2
-}
-

packages/audio/alsa/config/asound.conf.sample/asound.conf_fusion.sample

@@ -1,9 +0,0 @@
-pcm.!default {
-  type plug
-  slave {
-#    pcm "hw:1,0" #delete the first hash for sound over analog
-#    pcm "hw:1,1" #delete the first hash for sound over optical
-#    pcm "hw:0,3" #delete the first hash for sound over hdmi
-    rate 48000
-  }
-}

packages/audio/alsa/config/asound.conf.sample/asound.conf_fusion_dmix.sample

@@ -1,96 +0,0 @@
-pcm.!default {
-        type plug
-        slave {
-                pcm "both"
-        }
-}
-
-pcm.both {
-        type route
-        slave {
-                pcm multi
-                channels 6
-        }
-        ttable.0.0 1.0
-        ttable.1.1 1.0
-        ttable.0.2 1.0
-        ttable.1.3 1.0
-        ttable.0.4 1.0
-        ttable.1.5 1.0
-}
-
-pcm.multi {
-        type multi
-        slaves.a {
-                pcm "hdmi_hw"
-                channels 2
-        }
-        slaves.b {
-                pcm "digital_hw"
-                channels 2
-        }
-        slaves.c {
-                pcm "analog_hw"
-                channels 2
-        }
-        bindings.0.slave a
-        bindings.0.channel 0
-        bindings.1.slave a
-        bindings.1.channel 1
-        bindings.2.slave b
-        bindings.2.channel 0
-        bindings.3.slave b
-        bindings.3.channel 1
-        bindings.4.slave c
-        bindings.4.channel 0
-        bindings.5.slave c
-        bindings.5.channel 1
-}
-
-pcm.hdmi_hw  {
- 	type dmix
- 	ipc_key 1000
- 	slave {
-		pcm "hw:0,3"
-		period_time 0
-		period_size 512
-		buffer_size 2048
-	}
-}
-
-        pcm.hdmi_formatted {
-        type plug
-        slave {
-                pcm hdmi_hw
-                channels 2
-        }
-}
-
-pcm.hdmi_complete {
-        type softvol
-        slave.pcm hdmi_formatted
-        control.name hdmi_volume
-        control.card 1
-}
-
-pcm.digital_hw  {
- 	type dmix
- 	ipc_key 1001
- 	slave {
-		pcm "hw:1,1"
-		period_time 0
-		period_size 512
-		buffer_size 2048
-	}
-}
-
-pcm.analog_hw  {
- 	type dmix
- 	ipc_key 1002
- 	slave {
-		pcm "hw:1,0"
-		period_time 0
-		period_size 512
-		buffer_size 2048
-	}
-}

packages/audio/alsa/config/asound.conf.sample/asound.conf_menusound.sample

@@ -1,69 +0,0 @@
-pcm.!default {
-type plug
-slave {
-pcm "both"
-}
-}
-
-pcm.both {
-type route
-slave {
-pcm multi
-channels 6
-}
-ttable.0.0 1.0
-ttable.1.1 1.0
-ttable.0.2 1.0
-ttable.1.3 1.0
-ttable.0.4 1.0
-ttable.1.5 1.0
-}
-
-pcm.multi {
-type multi
-slaves.a {
-pcm "tv"
-channels 2
-}
-slaves.b {
-pcm "receiver"
-channels 2
-}
-slaves.c {
-pcm "analog"
-channels 2
-}
-bindings.0.slave a
-bindings.0.channel 0
-bindings.1.slave a
-bindings.1.channel 1
-bindings.2.slave b
-bindings.2.channel 0
-bindings.3.slave b
-bindings.3.channel 1
-bindings.4.slave c
-bindings.4.channel 0
-bindings.5.slave c
-bindings.5.channel 1
-}
-
-pcm.tv {
-type hw
-card 0
-device 3
-channels 2
-}
-
-pcm.receiver {
-type hw
-card 0
-device 1
-channels 2
-}
-
-pcm.analog {
-type hw
-card 0
-device 0
-channels 2
-}

packages/audio/alsa/config/asound.conf.sample/asound.conf_triple.sample

@@ -1,85 +0,0 @@
-pcm.!default {
-        type plug
-        slave {
-                pcm "both"
-        }
-}
-
-pcm.both {
-        type route
-        slave {
-                pcm multi
-                channels 6
-        }
-        ttable.0.0 1.0
-        ttable.1.1 1.0
-        ttable.0.2 1.0
-        ttable.1.3 1.0
-        ttable.0.4 1.0
-        ttable.1.5 1.0
-}
-
-pcm.multi {
-        type multi
-        slaves.a {
-                pcm "hdmi_hw"
-                channels 2
-        }
-        slaves.b {
-                pcm "digital_hw"
-                channels 2
-        }
-        slaves.c {
-                pcm "analog_hw"
-                channels 2
-        }
-        bindings.0.slave a
-        bindings.0.channel 0
-        bindings.1.slave a
-        bindings.1.channel 1
-        bindings.2.slave b
-        bindings.2.channel 0
-        bindings.3.slave b
-        bindings.3.channel 1
-        bindings.4.slave c
-        bindings.4.channel 0
-        bindings.5.slave c
-        bindings.5.channel 1
-}
-
-pcm.hdmi_hw {
-        type hw
-        card 1
-        device 7
-        channels 2
-}
-
-pcm.hdmi_formatted {
-        type plug
-        slave {
-                pcm hdmi_hw
-                rate 48000
-                channels 2
-        }
-}
-
-pcm.hdmi_complete {
-        type softvol
-        slave.pcm hdmi_formatted
-        control.name hdmi_volume
-        control.card 1
-}
-
-pcm.digital_hw {
-        type hw
-        card 0
-        device 1
-        channels 2
-}
-
-pcm.analog_hw {
-        type hw
-        card 0
-        device 0
-        channels 2
-}