config/version: set version to 4.1.1, set OS version to 4.2

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

README.md

@@ -64,6 +64,8 @@ providing cutting edge hardware support to deliver a set-top box experience.
   SSH allows command line access to your openelec.tv machine for configuration
   and file transfer. Linux/Mac clients can natively use SSH, while Windows
   users might want to try PuTTY for their terminal access.
+  Starting with OpenELEC 2.0, SSH is disabled by default but all that is needed
+  is an empty “ssh_enable” file to exist in /storage/.config to enable it.
 * $HOME is mounted on /storage (the second ext4 partition on the drive). 
   All data transfered to the machine will go here, the rest of the system is
   read-only with the exception of /var (containing runtime configuration data).

config/addon/addon.xml

@@ -12,7 +12,6 @@
              library="default.py">
         <provides>executable</provides>
   </extension>
-@EXTENSIONS@
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>
     <description>

config/functions

@@ -1,9 +1,12 @@
 setup_toolchain() {
+  if [ "$1" = "--optimize" ]; then
+    OPTIMIZE=yes
+    shift
+  fi
+
   if [ "$1" = target ]; then
     export DESTIMAGE="target"
 
-    unset CPP
-
     export CC=$TARGET_CC
     export CXX=$TARGET_CXX
     export LD=$TARGET_LD
@@ -28,8 +31,6 @@ setup_toolchain() {
   elif [ "$1" = host ]; then
     export DESTIMAGE="host"
 
-    unset CPP
-
     export AWK=$HOST_AWK
     export CC=$HOST_CC
     export CXX=$HOST_CXX
@@ -55,22 +56,12 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
+  . $ROOT/packages/linux/package.mk
   echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
 }
 
 kernel_version() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
+  . $ROOT/packages/linux/package.mk
   echo ${PKG_VERSION}
 }
 
@@ -82,16 +73,10 @@ get_module_dir() {
 # get package's build dir
 get_build_dir() {
   if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
-    if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
+    local _PKG_DIR=$(find $ROOT/packages -name $1)
+    if [ -d $_PKG_DIR -a -f $_PKG_DIR/package.mk ] ; then
       . $_PKG_DIR/package.mk
-    else
-      local _PKG_DIR=$(find $ROOT/packages -name $1 2>/dev/null)
-      if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-        . $_PKG_DIR/package.mk
-      fi
     fi
-
     echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
   fi
 }
@@ -185,13 +170,14 @@ do_autoreconf() {
 
 strip_lto() {
   # strip out LTO optimization from *FLAGS
-  if [ -n "$GCC_OPTIM_LTO" ] ; then
-    CFLAGS=`echo $CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
-    CXXFLAGS=`echo $CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
-  fi
-  if [ -n "$LD_OPTIM_LTO" ] ; then
-    LDFLAGS=`echo $LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"`
-  fi
+  CFLAGS=`echo $CFLAGS | sed -e "s|-flto||g"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||g"`
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||g"`
+}
+
+strip_linker_plugin() {
+  # strip out usage from linker plugin
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||g"`
 }
 
 strip_gold() {
@@ -318,7 +304,8 @@ show_config() {
   config_message="$config_message\n\n Hardware decoder configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - Kodi Player driver:\t\t\t $KODIPLAYER_DRIVER"
+  config_message="$config_message\n - Broadcom CrystalHD Decoder:\t\t $CRYSTALHD"
+  config_message="$config_message\n - XBMC Player driver:\t\t\t $XBMCPLAYER_DRIVER"
   config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI"
   config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU"
 
@@ -331,7 +318,7 @@ show_config() {
   config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT"
   config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
   config_message="$config_message\n - IRTrans support:\t\t\t $IRSERVER_SUPPORT"
-  config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
+  config_message="$config_message\n - XBMC Joystick support:\t\t $JOYSTICK_SUPPORT"
 
   # Misc. hardware configuration
 
@@ -363,13 +350,12 @@ show_config() {
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
   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 - Kodi Airplay support:\t\t $AIRPLAY_SUPPORT"
-  config_message="$config_message\n - Kodi Airtunes support:\t\t $AIRTUNES_SUPPORT"
-  config_message="$config_message\n - Kodi AFP support:\t\t\t $AFP_SUPPORT"
-  config_message="$config_message\n - Kodi NFS support:\t\t\t $NFS_SUPPORT"
-  config_message="$config_message\n - Kodi SAMBA client support:\t\t $SAMBA_SUPPORT"
-  config_message="$config_message\n - Kodi UPNP support:\t\t\t $UPNP_SUPPORT"
-  config_message="$config_message\n - Kodi Webserver support:\t\t $WEBSERVER"
+  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_message="$config_message\n - XBMC NFS support:\t\t\t $NFS_SUPPORT"
+  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_SUPPORT"
+  config_message="$config_message\n - XBMC Webserver support:\t\t $WEBSERVER"
 
   # OS configuration
 
@@ -399,24 +385,24 @@ fi
   config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G"
   config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"
 
-  # Kodi configuration
+  # XBMC configuration
 
-  config_message="$config_message\n\n Kodi configuration:"
+  config_message="$config_message\n\n XBMC configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
-  config_message="$config_message\n - Kodi nonfree support:\t\t $NONFREE_SUPPORT"
-  config_message="$config_message\n - Kodi DVDCSS support:\t\t\t $DVDCSS_SUPPORT"
+  config_message="$config_message\n - XBMC version:\t\t\t $MEDIACENTER"
+  config_message="$config_message\n - XBMC nonfree support:\t\t $NONFREE_SUPPORT"
+  config_message="$config_message\n - XBMC DVDCSS support:\t\t\t $DVDCSS_SUPPORT"
 
   for config_skin in $SKINS; do
     config_message="$config_message\n - Include Skin:\t\t\t $config_skin"
   done
 
   config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT"
-  config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
-  config_message="$config_message\n - Include RSXS Screensaver:\t\t $KODI_SCR_RSXS"
-  config_message="$config_message\n - Include ProjectM Visualization:\t $KODI_VIS_PROJECTM"
-  config_message="$config_message\n - Include Goom Visualization:\t\t $KODI_VIS_GOOM"
+  config_message="$config_message\n - Include extra fonts:\t\t\t $XBMC_EXTRA_FONTS"
+  config_message="$config_message\n - Include RSXS Screensaver:\t\t $XBMC_SCR_RSXS"
+  config_message="$config_message\n - Include ProjectM Visualization:\t $XBMC_VIS_PROJECTM"
+  config_message="$config_message\n - Include Goom Visualization:\t\t $XBMC_VIS_GOOM"
 
   config_message="$config_message\n"
   config_message="$config_message\n $dashes$dashes$dashes"

config/graphic

@@ -21,9 +21,9 @@ if [ "$SDL_SUPPORT" = no ]; then
 fi
 
 if [ "$OPENGL_SUPPORT" = no ]; then
-  KODI_SCR_RSXS="no"
-  KODI_VIS_PROJECTM="no"
-  KODI_VIS_GOOM="no"
+  XBMC_SCR_RSXS="no"
+  XBMC_VIS_PROJECTM="no"
+  XBMC_VIS_GOOM="no"
 fi
 
 get_graphicdrivers() {
@@ -40,12 +40,14 @@ get_graphicdrivers() {
       DRI_DRIVERS="$DRI_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
+      LIBVA="$LIBVA libva-intel-driver"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
+      LIBVA="$LIBVA libva-intel-driver"
     fi
 
     if [ "$drv" = "nouveau" ]; then

config/optimize

@@ -30,7 +30,7 @@ fi
 TARGET_CPPFLAGS=
 TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $GCC_OPTIM_LTO $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO $GCC_OPTIM"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 

config/options

@@ -24,20 +24,16 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # include versioning
   . config/version
 
-# read distro versioning if available
- if [ -f "$PROJECT_DIR/version.$DISTRO" ]; then
-   . $PROJECT_DIR/version.$DISTRO
- fi
-
 # read project options if available
  if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
    . $PROJECT_DIR/$PROJECT/options
  fi
 
-# read distro options if available
- if [ -f "$PROJECT_DIR/options.$DISTRO" ]; then
-   . $PROJECT_DIR/options.$DISTRO
- fi
+# Target system library C (eglibc)
+  TARGET_LIBC="eglibc"
+
+# Library strip
+  LIBSTRIP="yes"
 
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
@@ -81,10 +77,5 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
     . $HOME/.openelec/$PROJECT/options
   fi
 
-# read distro options from $HOME if available
-  if [ -f "$HOME/.openelec/options.$DISTRO" ]; then
-    . $HOME/.openelec/options.$DISTRO
-  fi
-
 . config/graphic
 . config/path $1

config/path

@@ -64,46 +64,26 @@ SED="sed -i"
   PKG_IS_ADDON="no"
 
   if [ -n "$1" ]; then
-    _PKG_ROOT_NAME=$(echo $1 | cut -d: -f1)
-    _ALL_DIRS=""
-    _FOUND=0
-    PKG_DIR=""
-
-    # first check project folder for a package
-    for DIR in $(find $ROOT/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-      if [ -r "$DIR/package.mk" ]; then
-        # found first, set $PKG_DIR
+    FOUND=0
+    for DIR in $ROOT/`find $PACKAGES -type d -name $(echo $1| awk -F : '{print $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/package.mk" ] ; then
+        FOUND=$((FOUND+1))
+        # found first. set $PKG_DIR
         PKG_DIR="$DIR"
-        # keep track of dirs with package.mk for detecting multiple folders
-        _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-        _FOUND=$((_FOUND+1))
-        if [ $_FOUND -gt 1 ]; then
-          # _FOUND more ? fail
+        if [ $FOUND -gt 1 ] ; then
+          # found more ? fail
           echo "Error - multiple package folders:"
-          echo -e "$_ALL_DIRS"
+          echo -e "$ALL_DIRS"
           exit 1
         fi
       fi
     done
-
-    # then check packages folder if not found already
-    if [ $_FOUND -eq 0 ]; then
-      for DIR in $(find $ROOT/$PACKAGES -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-        if [ -r "$DIR/package.mk" ]; then
-          # found first, set $PKG_DIR
-          PKG_DIR="$DIR"
-          # keep track of dirs with package.mk for detecting multiple folders
-          _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-          _FOUND=$((_FOUND+1))
-          if [ $_FOUND -gt 1 ]; then
-            # found more ? fail
-            echo "Error - multiple package folders:"
-            echo -e "$_ALL_DIRS"
-            exit 1
-          fi
-        fi
-      done
-    fi
   fi
 
   if [ -r $PKG_DIR/package.mk ]; then
@@ -128,8 +108,6 @@ SSL_CERTIFICATES="/etc/pki/tls"
 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
 
-unset TARGET_CPP
-
 TARGET_CC=${TARGET_PREFIX}gcc
 TARGET_CXX=${TARGET_PREFIX}g++
 TARGET_LD=${TARGET_PREFIX}ld
@@ -147,8 +125,6 @@ TARGET_PKG_CONFIG_PATH=""
 TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
 TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
 
-unset HOST_CPP
-
 HOST_AWK=gawk
 HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc
 HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++

config/version

@@ -1,9 +1,9 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="4.95.1"
+  OPENELEC_VERSION="4.1.1"
 
 # OS_VERSION: OS Version
-  OS_VERSION="5.0"
+  OS_VERSION="4.2"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="4.3"
+  ADDON_VERSION="4.1"
 

packages/3rdparty/multimedia/vdr-dummydevice/package.mk

@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.vdr-wiki.de/wiki/index.php/Dummydevice-plugin"
-PKG_URL="$DISTRO_MIRROR/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_URL="http://phivdr.dyndns.org/vdr/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz"
 PKG_SOURCE_DIR="dummydevice-${PKG_VERSION}"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"

packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="2617a7f"
+PKG_VERSION="bdcad3f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain vdr libdvbcsa"
+PKG_DEPENDS_TARGET="toolchain vdr openssl libdvbcsa"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"

packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk

@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/show/plg-streamdev"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain vdr libressl"
+PKG_DEPENDS_TARGET="toolchain vdr openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk

@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-vnsiserver"
-PKG_VERSION="a7cb405"
+PKG_VERSION="7d4aa81"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/FernetMenta/vdr-plugin-vnsiserver"
+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_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
@@ -30,6 +30,7 @@ PKG_SHORTDESC="TV"
 PKG_LONGDESC="TV"
 
 PKG_IS_ADDON="no"
+
 PKG_AUTORECONF="no"
 
 pre_configure_target() {

packages/3rdparty/multimedia/vdr/patches/vdr-02_disable_eitscan.patch

@@ -0,0 +1,12 @@
+diff -Nru vdr-1.7.15-vanilla/eitscan.c vdr-1.7.15-disable_eitscan/eitscan.c
+--- vdr-1.7.15-vanilla/eitscan.c	2010-06-06 19:11:14.000000000 +0300
++++ vdr-1.7.15-disable_eitscan/eitscan.c	2010-06-06 20:44:07.000000000 +0300
+@@ -146,7 +146,7 @@
+                if (Device) {
+                   for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
+                       const cChannel *Channel = ScanData->GetChannel();
+-                      if (Channel) {
++                      if (Channel && !cSource::IsType(Channel->Source(), 'I')) {
+                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
+                             if (Device->ProvidesTransponder(Channel)) {
+                                if (!Device->Receiving()) {

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,7 +1,3 @@
-4.3.1
-  rebuild for addon api bump
-4.3.0
-  rebuild for addon api bump
 4.1.2
   clean up
 4.1.0

packages/addons/driver/hdhomerun/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="hdhomerun"
-PKG_VERSION="4.3"
-PKG_REV="1"
+PKG_VERSION="4.1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"

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

@@ -32,8 +32,8 @@ unlock() { flock -u $HDHR_LOCKFD; flock -xn $HDHR_LOCKFD && rm -f "$HDHR_LOCKFIL
 # exclusive lock
 exlock
 
-HDHR_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.hdhomerun"
-HDHR_ADDON_HOME="$HOME/.kodi/userdata/addon_data/driver.dvb.hdhomerun"
+HDHR_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
+HDHR_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun"
 HDHR_ADDON_SETTINGS="$HDHR_ADDON_HOME/settings.xml"
 
 # modules are not automatically loaded

packages/addons/driver/hdhomerun/source/resources/lib/functions.py

@@ -24,7 +24,7 @@ import shutil
 import xmlpp
 from xml.dom import minidom
 
-__sundtek_userspace__ = '/storage/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv/'
+__sundtek_userspace__ = '/storage/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv/'
 
 ######################################################################################################
 # backup setting.xml file only if backup doesn't exist

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

@@ -1,5 +1,3 @@
-4.3.0
- rebuild for addon api bump
 4.1.0
  rebuild for addon api bump
 4.0.1

packages/addons/driver/imon-mce/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="imon-mce"
-PKG_VERSION="4.3"
+PKG_VERSION="4.1"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

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

@@ -1,9 +1,3 @@
-4.3.2
-  new addon settings option to enable to update driver from web with latest version
-4.3.1
-  update driver
-4.3.0
-  rebuild for addon api bump
 4.1.5
   dont touch /storage/.profile
 4.1.4

packages/addons/driver/sundtek-mediatv/package.mk

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="sundtek-mediatv"
-PKG_VERSION="4.3"
-PKG_REV="2"
+PKG_VERSION="4.1"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
 PKG_URL=""
-PKG_DEPENDS_TARGET=""
+PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="Sundtek USB Stick DVB userspace driver"

packages/addons/driver/sundtek-mediatv/source/bin/update-driver.sh

@@ -1,81 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. /etc/profile
-
-SUNDTEK_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
-
-logger -t Sundtek "### Starting updating driver ###"
-xbmc-send -a "Notification(Sundtek, Starting updating driver, 2000)"
-
-cd "$SUNDTEK_ADDON_DIR"
-rm -fr tmp
-mkdir tmp
-cd tmp
-
-ARCH=$(sed -n 's|.*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n')
-if [ "$ARCH" = "x86_64" ]; then
-  INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz"
-elif [ "$ARCH" = "i386" ]; then
-  INSTALLER_URL="http://sundtek.de/media/netinst/32bit/installer.tar.gz"
-elif [ "$ARCH" = "arm" ]; then
-  INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
-else
-  logger -t Sundtek "### Unsupported architecture ###"
-  xbmc-send -a "Notification(Sundtek, Unsupported architecture, 5000)"
-  cd ..
-  rm -fr tmp
-  exit 1
-fi
-
-logger -t Sundtek "### Downloading driver archive for $ARCH ###"
-xbmc-send -a "Notification(Sundtek, Downloading driver archive for $ARCH, 2000)"
-wget -O installer.tar.gz $INSTALLER_URL
-logger -t Sundtek "### Extracting archive ###"
-xbmc-send -a "Notification(Sundtek, Extracting archive, 2000)"
-tar -xzf installer.tar.gz
-if [ $? -ne 0 ]; then
-  logger -t Sundtek "### Archive damaged ###"
-  xbmc-send -a "Notification(Sundtek, Archive damaged, 5000)"
-  cd ..
-  rm -fr tmp/
-  exit 2
-fi
-
-killall -9 mediaclient.bin &>/dev/null                                          
-killall -9 mediaclient &>/dev/null                                              
-killall -9 mediasrv &>/dev/null 
-
-# we run this via wrapper
-mv opt/bin/mediaclient opt/bin/mediaclient.bin
-chmod 755 opt/bin/*
-
-cp -Pa opt/bin/* ../bin/
-cp -Pa opt/lib/* ../lib/
-
-cd ..
-rm -fr tmp
-
-logger -t Sundtek "### Driver update finished, please reboot ###"
-xbmc-send -a "Notification(Sundtek, Driver update finished, 2000)"
-xbmc-send -a "Notification(Sundtek, Please reboot, 5000)"
-exit 0

packages/addons/driver/sundtek-mediatv/source/default.py

@@ -18,7 +18,6 @@
 
 import os
 import sys
-import subprocess
 import xbmcaddon
 
 __settings__      = xbmcaddon.Addon(id = 'driver.dvb.sundtek-mediatv')
@@ -29,15 +28,9 @@ __settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'setti
 __mediaclient__   = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient.bin'))
 __ld_preload__    = xbmc.translatePath(os.path.join(__cwd__, 'lib', 'libmediaclient.so'))
 __mediaclient_e__ = 'LD_PRELOAD=' + __ld_preload__ + ' ' + __mediaclient__ + ' -e'
-__update_sh__     = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'update-driver.sh'))
 
 if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
   sys.path.append(__resources_lib__)
   from functions import refresh_sundtek_tuners
   refresh_sundtek_tuners(__settings_xml__, __mediaclient_e__)
   __settings__.openSettings()
-elif __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'update_driver':
-  proc = subprocess.Popen([__update_sh__], shell = True)
-  return_code = proc.wait()
-  print "sundtek update driver rv", return_code
-  __settings__.openSettings()

packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml

@@ -27,7 +27,4 @@
   <string id="9010">Refresh tuners... (press me)</string>
   <string id="9020">    IR protocol</string>
   <string id="9030">    keymap filename</string>
-
-  <string id="3000">Driver</string>
-  <string id="3010">Update from web... (press me)</string>
 </strings>

packages/addons/driver/sundtek-mediatv/source/resources/settings.xml

@@ -29,8 +29,4 @@
     <setting id="ENABLE_TUNER_TYPES" type="bool" label="9005" default="true" />
     <setting label="9010" option="close" type="action" action="RunScript($ID, refresh_tuners)" />
   </category>
-  <category label="3000">
-    <setting type="sep" />
-    <setting label="3010" option="close" type="action" action="RunScript($ID, update_driver)" />
-  </category>
 </settings>

packages/addons/repository/repository.unofficial.addon.pro/package.mk

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="repository.unofficial.addon.pro"
-PKG_VERSION="4.3.3"
-PKG_REV="0"
+PKG_VERSION="4.1.2"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://unofficial.addon.pro"
@@ -41,8 +41,7 @@ PKG_MAINTAINER="unofficial.addon.pro"
 make_target() {
   $SED -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
      -e "s|@PROJECT@|$PROJECT|g" \
-     -e "s|@ARCH@|$TARGET_ARCH|g" \
-     -e "s|@PKG_VERSION@|$PKG_VERSION|g" \
+     -e "s|@ARCH@|$ARCH|g" \
   -i addon.xml
 }
 

packages/addons/repository/repository.unofficial.addon.pro/sources/addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="repository.unofficial.addon.pro"
-                name="Unofficial [COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR] (@PROJECT@/@ARCH@) Add-ons"
-                version="@PKG_VERSION@"
+                name="Unofficial [COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR] Mediacenter OS Add-ons"
+                version="4.1.2"
                 provider-name="unofficial.addon.pro">
         <extension point="xbmc.addon.repository"
                 name="Unofficial OpenELEC.tv Add-on Repository">
@@ -12,10 +12,7 @@
         <extension point="xbmc.addon.metadata">
                 <summary>Unofficial addon repository for OpenELEC</summary>
                 <description>
-[COLOR red]=== BIG FAT WARNING ===[/COLOR]
-Use this repository at your own risk.
-If your house gets burned, it's your fault, not ours.
-We give no guarantee. We give no support.
+[COLOR orange]Use with care. There will be NO end user support for addons in this repository[/COLOR]
                 </description>
                 <disclaimer>This is an unofficial addon repository. please don't ask for support in openelec forum / irc channel</disclaimer>
                 <platform>all</platform>

packages/addons/repository/repository.unofficial.addon.pro/sources/changelog.txt

@@ -1,9 +1,3 @@
-4.3.3
-- rebuild
-
-4.3.2
-- rebuild for addon api bump
-
 4.1.2
 - fix typo in repository name
 

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

@@ -1,9 +1,3 @@
-4.3.4
-- update to kodi
-
-4.3.0
-- rebuild for addon api bump
-
 4.1.2
 - rebuild for xlib changes
 

packages/addons/service/multimedia/boblightd/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="boblightd"
 PKG_VERSION="478"
-PKG_REV="4"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
@@ -42,7 +42,7 @@ if [ "$OPENGL_SUPPORT" = "yes" ] ; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Mesa glu"
 fi
 
-if [ "$OPENGL" = "no" ]; then
+if [ ! "$OPENGL" = "Mesa" ]; then
   EXTRAOPTS="--without-opengl"
 fi
 

packages/addons/service/multimedia/boblightd/source/system.d/service.multimedia.boblightd.service

@@ -3,7 +3,7 @@ Description=boblightd
 After=graphical.target
 
 [Service]
-ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.multimedia.boblightd/bin/boblightd.start"
+ExecStart=/bin/sh -c "exec sh /storage/.xbmc/addons/service.multimedia.boblightd/bin/boblightd.start"
 ExecStopPost=-/bin/sh -c "pidof boblight-X11 && killall -q -9 boblight-X11"
 TimeoutStopSec=1
 Restart=always
@@ -11,4 +11,4 @@ RestartSec=10
 StartLimitInterval=0
 
 [Install]
-WantedBy=kodi.target
+WantedBy=xbmc.target

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

@@ -1,14 +1,3 @@
-4.3.2
-- update to kodi
-
-4.3.1
-- update to tvheadend-3.9.1847
-- tvheadend now has native support for hdhomerun devices
-
-4.3.0
-- rebuild for addon api bump
-- update to tvheadend-3.9.1083
-
 4.1.2
 - fix issues with "wait for frontend init". thanks @sraue
 

packages/addons/service/multimedia/tvheadend/package.mk

@@ -17,14 +17,14 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.9.1847"
+PKG_VERSION="3.9.681"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
 #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_TARGET="toolchain libressl curl"
+PKG_DEPENDS_TARGET="toolchain openssl curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 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."
@@ -36,7 +36,6 @@ PKG_AUTORECONF="no"
 pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
   cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
-  export CROSS_COMPILE=$TARGET_PREFIX
 }
 
 configure_target() {
@@ -44,18 +43,12 @@ configure_target() {
             --arch=$TARGET_ARCH \
             --cpu=$TARGET_CPU \
             --cc=$TARGET_CC \
-            --enable-hdhomerun_client \
-            --enable-hdhomerun_static \
             --enable-timeshift \
-            --disable-avahi \
             --disable-libav \
-            --enable-inotify \
-            --enable-epoll \
+            --disable-avahi \
+            --python=$ROOT/$TOOLCHAIN/bin/python \
             --disable-uriparser \
-            --enable-tvhcsa \
-            --enable-bundle \
-            --disable-dbus_1 \
-            --python=$ROOT/$TOOLCHAIN/bin/python
+            --enable-bundle
 }
 
 post_make_target() {

packages/addons/service/multimedia/tvheadend/patches/tvheadend-remove-Werror.patch

@@ -1,25 +1,12 @@
-From 67e38551bc3acadf27b3ed4922e897348a612fdb Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Wed, 15 Oct 2014 13:35:09 +0300
-Subject: [PATCH] remove werror
-
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ddcc47e..0087a6c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@ PROG    := $(BUILDDIR)/tvheadend
+diff -Naur tvheadend-3.9.1050/Makefile tvheadend-3.9.1050.patch/Makefile
+--- tvheadend-3.9.1050/Makefile	2014-07-07 21:39:24.000000000 +0200
++++ tvheadend-3.9.1050.patch/Makefile	2014-07-14 17:57:09.483454814 +0200
+@@ -28,7 +28,7 @@
  #
  
- CFLAGS  += -g -O2 -Wunused-result
+ CFLAGS  += -g -O2
 -CFLAGS  += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
 +CFLAGS  += -Wall -Wwrite-strings -Wno-deprecated-declarations
  CFLAGS  += -Wmissing-prototypes
  CFLAGS  += -fms-extensions -funsigned-char -fno-strict-aliasing
  CFLAGS  += -D_FILE_OFFSET_BITS=64
--- 
-1.7.2.5
-

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

@@ -20,7 +20,7 @@
 
 . /etc/profile
 
-ADDON_HOME="$HOME/.kodi/userdata/addon_data/service.multimedia.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

@@ -59,13 +59,13 @@ if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
 fi
 
 if [ "$DEBUG" = "yes" ]; then
-  TVHEADEND_ARG="-B -C -s -u root -g video -c $ADDON_HOME"
+  TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
 else
-  TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME"
+  TVHEADEND_ARG="-C -u root -g video -c $ADDON_HOME"
 fi
 
 # start userspace DVB driver/addon
-for driver_dvb in $(find /storage/.kodi/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
+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 Tvheadend "### Loading userspace DVB driver: $driver_dvb_name ###"
   # use ". " because of variable export

packages/addons/service/multimedia/tvheadend/source/system.d/service.multimedia.tvheadend.service

@@ -3,11 +3,11 @@ Description=TVHeadend Service
 After=graphical.target
 
 [Service]
-ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.multimedia.tvheadend/bin/tvheadend.start"
+ExecStart=/bin/sh -c "exec sh /storage/.xbmc/addons/service.multimedia.tvheadend/bin/tvheadend.start"
 TimeoutStopSec=2
 Restart=always
 RestartSec=2
 StartLimitInterval=0
 
 [Install]
-WantedBy=kodi.target
+WantedBy=xbmc.target

packages/addons/service/multimedia/tvheadend/source/timeshift-config

@@ -1,7 +1,7 @@
 {
 	"enabled": 0,
 	"ondemand": 0,
-	"path": "/storage/.kodi/userdata/addon_data/service.multimedia.tvheadend/cache/timeshift",
+	"path": "/storage/.xbmc/userdata/addon_data/service.multimedia.tvheadend/cache/timeshift",
 	"unlimited_period": 0,
 	"max_period": 3600,
 	"unlimited_size": 0,

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

@@ -1,7 +1,7 @@
 {
 	"grabbers": [
 		{
-			"path": "/storage/.kodi/addons/service.multimedia.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/.kodi/addons/service.multimedia.tvheadend/bin/tv_grab_file"
+	"current-grabber": "/storage/.xbmc/addons/service.multimedia.tvheadend/bin/tv_grab_file"
 }

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

@@ -1,13 +1,3 @@
-4.3.2
-- update to kodi
-
-4.3.1
-- update to vdr-plugin-vnsiserver-a7cb405
-- update to vdr-plugin-dvbapi-2617a7f
-
-4.3.0
-- rebuild for addon api bump
-
 4.1.7
 - add option to override epg charset
 - update to vdr-plugin-vnsiserver-7d4aa81

packages/addons/service/multimedia/vdr-addon/package.mk

@@ -18,8 +18,8 @@
 ################################################################################
 
 PKG_NAME="vdr-addon"
-PKG_VERSION="4.3"
-PKG_REV="2"
+PKG_VERSION="4.1"
+PKG_REV="7"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

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

@@ -148,7 +148,7 @@ for config in `find . -type f`; do
 done
 
 # start userspace DVB driver/addon
-for driver_dvb in $(find /storage/.kodi/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
+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 VDR "### Loading userspace DVB driver: $driver_dvb_name ###"
   # use ". " because of variable export

packages/addons/service/multimedia/vdr-addon/source/system.d/service.multimedia.vdr-addon.service

@@ -3,11 +3,11 @@ Description=vdr
 After=graphical.target
 
 [Service]
-ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.multimedia.vdr-addon/bin/vdr.start"
+ExecStart=/bin/sh -c "exec sh /storage/.xbmc/addons/service.multimedia.vdr-addon/bin/vdr.start"
 TimeoutStopSec=2
 Restart=always
 RestartSec=2
 StartLimitInterval=0
 
 [Install]
-WantedBy=kodi.target
+WantedBy=xbmc.target

packages/audio/alsa/alsa-lib/package.mk

@@ -58,6 +58,8 @@ post_configure_target() {
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
 
+  mkdir -p $INSTALL/etc/modprobe.d
+    cp -PR $PKG_DIR/config/alsa-base.conf $INSTALL/etc/modprobe.d
   mkdir -p $INSTALL/usr/config
     cp -PR $PKG_DIR/config/modprobe.d $INSTALL/usr/config
 }

packages/audio/alsa/alsa-utils/scripts/soundconfig

@@ -126,10 +126,8 @@ else
 
 # and this for various Fusion devices like Zotac ZBOX
   mixer $card 'Front',0 100% on
-
-# NVidia CK804 sound devices
-  mixer $card 'IEC958 Playback AC97-SPSA' 100%
 fi
 
 exit 0
 )&
+

packages/audio/faad2/package.mk

@@ -16,30 +16,29 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="libbdplus"
-PKG_VERSION="0.1.1"
+PKG_NAME="faad2"
+PKG_VERSION="2.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="https://www.videolan.org/developers/libbdplus.html"
-PKG_URL="ftp://ftp.videolan.org/pub/videolan/libbdplus/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain libgcrypt libgpg-error"
+PKG_SITE="http://www.audiocoding.com/"
+PKG_URL="$SOURCEFORGE_SRC/faac/faad2-src/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="libbdplus: A project to implement the BD+ System Specifications"
-PKG_LONGDESC="libbdplus is a research project to implement the BD+ System Specifications."
+PKG_SECTION="audio"
+PKG_SHORTDESC="faad: An MPEG-4 AAC decoder"
+PKG_LONGDESC="The FAAD project includes the AAC decoder FAAD2. It supports several MPEG-4 object types (LC, Main, LTP, HE AAC, PS) and file formats (ADTS AAC, raw AAC, MP4), multichannel and gapless decoding as well as MP4 metadata tags. The codecs are compatible with standard-compliant audio applications using one or more of these profiles."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
-                           --disable-extra-warnings \
-                           --disable-optimizations \
+# package specific configure options
+PKG_CONFIGURE_OPTS_TARGET="--without-xmms \
+                           --without-drm \
+                           --without-mpeg4ip \
                            --with-gnu-ld"
 
-if [ "$AACS_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libaacs"
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --with-libaacs"
-else
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --without-libaacs"
-fi
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/usr/bin
+}

packages/audio/faad2/patches/faad2-2.7-automake_1.13.patch

@@ -0,0 +1,12 @@
+diff -Naur faad2-2.7-old/configure.in faad2-2.7-new/configure.in
+--- faad2-2.7-old/configure.in	2009-02-04 16:51:03.000000000 -0800
++++ faad2-2.7-new/configure.in	2012-12-30 14:58:33.000000000 -0800
+@@ -25,7 +25,7 @@
+ AC_PROG_MAKE_SET
+ AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],
+ 	     WITHXMMS=$withval, WITHXMMS=no)

packages/audio/faad2/patches/faad2-2.7-mp4ff_shared.patch

@@ -0,0 +1,28 @@
+diff -Naur faad2-2.7-old/common/mp4ff/Makefile.am faad2-2.7-new/common/mp4ff/Makefile.am
+--- faad2-2.7-old/common/mp4ff/Makefile.am	2009-02-06 06:24:21.000000000 -0800
++++ faad2-2.7-new/common/mp4ff/Makefile.am	2009-02-11 05:36:14.000000000 -0800
+@@ -1,7 +1,7 @@
+-lib_LIBRARIES = libmp4ff.a
+-include_HEADERS = mp4ff.h mp4ffint.h
++lib_LTLIBRARIES = libmp4ff.la
++include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
+ 
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+ 
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+-		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
++                      mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
+diff -Naur faad2-2.7-old/frontend/Makefile.am faad2-2.7-new/frontend/Makefile.am
+--- faad2-2.7-old/frontend/Makefile.am	2009-02-06 08:03:37.000000000 -0800
++++ faad2-2.7-new/frontend/Makefile.am	2009-02-11 05:35:52.000000000 -0800
+@@ -5,7 +5,7 @@
+ 	   -I$(top_srcdir)/common/mp4ff
+ 
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+-	     $(top_builddir)/common/mp4ff/libmp4ff.a
++	     $(top_builddir)/common/mp4ff/libmp4ff.la
+ 
+ faad_SOURCES = main.c \
+ 	       audio.c audio.h \

packages/audio/flac/package.mk

@@ -33,9 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 # package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--enable-static \
-                           --disable-shared \
-                           --disable-rpath \
+PKG_CONFIGURE_OPTS_TARGET="--disable-rpath \
                            --disable-altivec \
                            --disable-doxygen-docs \
                            --disable-thorough-tests \

packages/audio/lame/package.mk

@@ -33,9 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 # package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--enable-static \
-                           --disable-shared \
-                           --disable-nasm \
+PKG_CONFIGURE_OPTS_TARGET="--enable-nasm \
                            --disable-rpath \
                            --disable-cpml \
                            --disable-gtktest \

packages/audio/libcdio/package.mk

@@ -44,11 +44,11 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-cxx \
                            --disable-vcd-info \
                            --without-cd-drive \
                            --without-cd-info \
+                           --with-cd-paranoia \
                            --without-cdda-player \
                            --without-cd-read \
                            --without-iso-info \
                            --without-iso-read \
-                           --without-libiconv-prefix \
                            --with-gnu-ld"
 
 pre_configure_target() {