config/version: set version to 6.0.0

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

Makefile

@@ -11,12 +11,12 @@ release:
 image:
 	./scripts/image mkimage
 
-image-efi:
-	./scripts/image mkimage efi
-
 noobs:
 	./scripts/image noobs
 
+amlpkg:
+	./scripts/image amlpkg
+
 clean:
 	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps
 

README.md

@@ -2,8 +2,8 @@
 
 # OpenELEC - Open Embedded Linux Entertainment Center
 
-OpenELEC runs [XBMC](http://xbmc.org), an award-winning free and open source (GPL) software media 
-player and entertainment hub for digital media. For more info see http://xbmc.org .
+OpenELEC runs [Kodi](http://kodi.tv), an award-winning free and open source (GPL) software media 
+player and entertainment hub for digital media. For more info see http://kodi.tv .
 The base system has been designed and built from the ground up to be as 
 efficient as possible – consuming only tiny disk and memory footprints and
 providing cutting edge hardware support to deliver a set-top box experience.
@@ -16,10 +16,6 @@ providing cutting edge hardware support to deliver a set-top box experience.
 
 * Please read the instructions in our wiki (http://wiki.openelec.tv/index.php?title=Installation) on how to install.
 
-**Known issues**
-
-* Testing snapshot
-
 **License**
 
 * OpenELEC is released under [GPLv2](http://www.gnu.org/licenses/gpl-2.0.html). Please refer to the "licenses" folder and 
@@ -44,16 +40,15 @@ providing cutting edge hardware support to deliver a set-top box experience.
 
 **Features**
 
-* System size ~ 90 - 130MB
+* System size ~ 90 - 170MB
 * Minimal hardware requirements
 * Ultra fast boot
-* Optimized builds for platforms such as ION, Intel, Fusion
-* Simple configuration via XBMC itself
+* Simple configuration via Kodi itself
 * Plug and Play external storage
 
 **Software**
 
-* XBMC HTPC software – View/Manage all your media.
+* Kodi HTPC software – View/Manage all your media.
 * Samba server – File transfer from any PC client
 * SSH server – Remote console access for debugging
 * IR/Bluetooth Remote Control
@@ -68,13 +63,12 @@ providing cutting edge hardware support to deliver a set-top box experience.
   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).
 * Manual update/downgrade procedure is as follows:
-  Extract the snapshot and navigate to the 'target' directory.
-  Copy KERNEL and SYSTEM along with KERNEL.md5 and SYSTEM.md5 to the 'Update' network share (or /storage/.update) on
+  Copy the snapshot (.tar) to the 'Update' network share (or /storage/.update) on
   your openelec machine. Your system will automatically upgrade during the 
   next reboot.
 * Automatic mounting of filesystems is supported. Devices such as USB Flash 
   sticks can be plugged into a running machine and will be mounted to /media,
-  showing up in xbmc’s GUI.
+  showing up in Kodi’s GUI.
 * Comments and questions are more than welcome, help is even better and patches 
   are absolutely perfect!!
 

TODO

@@ -1,8 +0,0 @@
-ncurses-5.8/5.9:
-  - segfaults in nano and dialog -> using ncurses-5.7
-
-irserver:
-  - rework irserver/init.d for systemd
-
-settings addon:
-  - remove ps3 sleep? should be fixed in bluez 5.13/5.14

config/addon/xbmc.python.script.xml

@@ -9,7 +9,7 @@
 @REQUIRES@
   </requires>
   <extension point="xbmc.python.script" library="default.py">
-    <provides>executable</provides>
+    <provides>@PKG_ADDON_PROVIDES@</provides>
   </extension>
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>

config/addon/xbmc.service.xml

@@ -9,7 +9,7 @@
 @REQUIRES@
   </requires>
   <extension point="xbmc.service" library="default.py">
-    <provides>executable</provides>
+    <provides>@PKG_ADDON_PROVIDES@</provides>
   </extension>
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>

config/arch.arm

@@ -32,12 +32,9 @@
       SIMD_SUPPORT="no"
       ;;
     cortex-a7|cortex-a15)
-      TARGET_SUBARCH=armv7-a
+      TARGET_SUBARCH=armv7ve
       TARGET_ABI=eabi
-      # It's not currently possible to specify the exact architecture variant (-mcpu)
-      # that A7/A15 supports in the command line so use -mtune here.
-      # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57907
-      TARGET_EXTRA_FLAGS="-mtune=$TARGET_CPU"
+      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="yes"
       ;;

config/arch.i386

@@ -1,14 +0,0 @@
-# determines TARGET_CPU, if not forced by user
-  if [ -z "$TARGET_CPU" ]; then
-    TARGET_CPU=i686
-  fi
-
-# determine architecture's family
-  TARGET_SUBARCH=i686
-
-# setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=$TARGET_CPU -m32"
-  TARGET_LDFLAGS="-march=$TARGET_CPU -m32"
-
-# build with SIMD support ( yes / no )
-  SIMD_SUPPORT="yes"

config/functions

@@ -307,14 +307,13 @@ show_config() {
   config_message="$config_message\n\n Graphic configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - XORG support:\t\t\t $XORG_SUPPORT"
-  config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
-  config_message="$config_message\n - XORG Xinerama support:\t\t $XINERAMA_SUPPORT"
-  config_message="$config_message\n - SDL support:\t\t\t\t $SDL_SUPPORT"
+  if [ "$DISPLAYSERVER" = "x11" ] ; then
+    config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
+    config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
+    config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER"
+  fi
   config_message="$config_message\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)"
   config_message="$config_message\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
-  config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER"
-  config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
   config_message="$config_message\n - uvesafb support:\t\t\t $UVESAFB_SUPPORT"
 
   # Hardware decoder support
@@ -325,6 +324,7 @@ show_config() {
   config_message="$config_message\n - Kodi Player driver:\t\t\t $KODIPLAYER_DRIVER"
   config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
   config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
+  config_message="$config_message\n - DCA decoder Support:\t\t\t $DCADEC_SUPPORT"
 
   # Input device configuration
 
@@ -345,7 +345,6 @@ show_config() {
   config_message="$config_message\n - ALSA support:\t\t\t $ALSA_SUPPORT"
   config_message="$config_message\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT"
   config_message="$config_message\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT"
-  config_message="$config_message\n - Hardware Sensors support:\t\t $SENSOR_SUPPORT"
   config_message="$config_message\n - LCD drivers:\t\t\t\t $LCD_DRIVER"
 
   for config_driver in $ADDITIONAL_DRIVERS; do
@@ -370,8 +369,6 @@ show_config() {
   config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
   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 - PPTP support:\t\t\t $PPTP_SUPPORT"
-  config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
 
   # OS configuration
 
@@ -381,10 +378,10 @@ show_config() {
   config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
   config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
   config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
-if [ "$BOOTLOADER" = "u-boot" ]; then
-  config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG"
-  config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
-fi
+  if [ "$BOOTLOADER" = "u-boot" ]; then
+    config_message="$config_message\n   - U-Boot configuration:\t\t $UBOOT_CONFIG"
+    config_message="$config_message\n   - U-Boot config file:\t\t $UBOOT_CONFIGFILE"
+  fi
   config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
 
@@ -394,9 +391,9 @@ fi
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Swap Support:\t\t\t $SWAP_SUPPORT"
-if [ "$SWAP_SUPPORT" = "yes" ]; then
-  config_message="$config_message\n - Swapfile default size:\t\t $SWAPFILESIZE"
-fi
+  if [ "$SWAP_SUPPORT" = "yes" ]; then
+    config_message="$config_message\n   - Swapfile default size:\t\t $SWAPFILESIZE"
+  fi
   config_message="$config_message\n - exFAT Support (via Fuse):\t\t $EXFAT"
   config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G"
   config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"
@@ -409,8 +406,10 @@ fi
   config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
   config_message="$config_message\n - Kodi nonfree support:\t\t $KODI_NONFREE_SUPPORT"
   config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
-  config_message="$config_message\n - Bluray BD+ support:\t\t\t $BLURAY_BDPLUS_SUPPORT"
-  config_message="$config_message\n - Bluray AACS support:\t\t\t $BLURAY_AACS_SUPPORT"
+  if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
+    config_message="$config_message\n   - Bluray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT"
+    config_message="$config_message\n   - Bluray AACS support:\t\t $BLURAY_AACS_SUPPORT"
+  fi
   config_message="$config_message\n - Kodi DVDCSS support:\t\t\t $KODI_DVDCSS_SUPPORT"
   config_message="$config_message\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT"
   config_message="$config_message\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_SUPPORT"
@@ -429,9 +428,6 @@ fi
 
   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"
   config_message="$config_message\n $dashes$dashes$dashes"
@@ -439,5 +435,5 @@ fi
   config_message="$config_message\n $dashes$dashes$dashes"
   config_message="$config_message\n\n\n"
 
-  echo -e $config_message
+  echo -e "$config_message"
 }

config/graphic

@@ -1,9 +1,3 @@
-if [ "$DISPLAYSERVER" = "x11" ]; then
-  SDL_SUPPORT="yes"
-else
-  SDL_SUPPORT="no"
-fi
-
 if [ "$OPENGL" = no ]; then
   OPENGL_SUPPORT="no"
 else
@@ -16,26 +10,12 @@ else
   OPENGLES_SUPPORT="yes"
 fi
 
-if [ "$SDL_SUPPORT" = no ]; then
-  JOYSTICK_SUPPORT="no"
-fi
-
-if [ "$OPENGL_SUPPORT" = no ]; then
-  KODI_SCR_RSXS="no"
-  KODI_VIS_PROJECTM="no"
-  KODI_VIS_GOOM="no"
-fi
-
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
     GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
-    if [ "$drv" = "dove" ]; then
-      XORG_DRIVERS="$XORG_DRIVERS dove"
-    fi
-
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
@@ -50,16 +30,6 @@ get_graphicdrivers() {
       VAAPI_SUPPORT="yes"
     fi
 
-    if [ "$drv" = "nouveau" ]; then
-      # DRI_DRIVERS are only used for NV04 - NV20 (which we dont want to support anymore)
-      DRI_DRIVERS="$DRI_DRIVERS"
-      # GALLIUM_DRIVERS are used for all cards from NV30 to nvc0
-      # see also http://nouveau.freedesktop.org/wiki/MesaDrivers/
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
-      XORG_DRIVERS="$XORG_DRIVERS nouveau"
-      COMPOSITE_SUPPORT="yes"
-    fi
-
     if [ "$drv" = "nvidia" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
       VDPAU_SUPPORT="yes"

config/noobs/os.json

@@ -1,7 +1,10 @@
 {
-  "name": "@DISTRONAME@",
+  "name": "@DISTRONAME@_@PROJECT@",
   "version": "@OPENELEC_VERSION@",
   "release_date": "@RELEASE_DATE@",
   "kernel": "@KERNEL_VERSION@",
-  "description": "@DESCRIPTION@"
+  "description": "@DESCRIPTION@",
+  "username": "root",
+  "password": "@ROOT_PASSWORD@",
+  "supported_hex_revisions": "@NOOBS_HEX@"
 }

config/noobs/partition_setup.sh

@@ -40,7 +40,7 @@ md5sumCheck() {
   )
 }
 
-if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2]; then
+if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2 ]; then
   echo "error: part1, part2, id1 or id2 not specified"
   echo "actual values:"
   echo "part1:" $part1

config/noobs/partitions.json

@@ -1,7 +1,7 @@
 {
   "partitions": [
     {
-      "label":                     "@DISTRONAME@System",
+      "label":                     "@DISTRONAME@_@PROJECT@_System",
       "filesystem_type":           "FAT",
       "partition_size_nominal":    160,
       "want_maximised":            false,
@@ -9,7 +9,7 @@
       "mkfs_options":              ""
     },
     {
-      "label":                     "@DISTRONAME@Storage",
+      "label":                     "@DISTRONAME@_@PROJECT@_Storage",
       "filesystem_type":           "ext4",
       "partition_size_nominal":    864,
       "want_maximised":            true,

config/options

@@ -17,10 +17,10 @@ else
   PROJECT="$PROJECT"
 fi
 
-# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
-# default is i386
+# determines TARGET_ARCH, if not forced by user (x86_64 / arm)
+# default is x86_64
 if [ -z "$ARCH" ]; then
-  TARGET_ARCH="i386"
+  TARGET_ARCH="x86_64"
 else
   TARGET_ARCH="$ARCH"
 fi
@@ -52,6 +52,11 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # If you have ccache installed, take care that LOCAL_CC don't point to it
   LOCAL_CC=`which gcc`
 
+if [ -z "$LOCAL_CC" ] ; then
+  echo "***** Please install gcc *****"
+  exit 127
+fi
+
 # Need to point to your actual g++
 # If you have ccache installed, take care that LOCAL_CXX don't point to it
   LOCAL_CXX=`which g++`
@@ -76,9 +81,6 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # the nearest multiple of 16 kilobytes.
   CCACHE_CACHE_SIZE="30G"
 
-# forcing install of all packages (yes/no)
-  FORCE_INSTALL="no"
-
 # install devtools on development builds
   if [ "$OPENELEC_VERSION" = "devel" ]; then
     DEVTOOLS=yes

config/path

@@ -20,6 +20,10 @@ HOST_NAME=`$LOCAL_CC -dumpmachine`
 TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
 
 BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
+if [ "$OPENELEC_VERSION" = "devel" ] ; then
+  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$OPENELEC_VERSION
+fi
+
 if [ -n "$BUILD_SUFFIX" ]; then
   BUILD=$BUILD-$BUILD_SUFFIX
 fi
@@ -127,7 +131,7 @@ XORG_PATH_RGB=/usr/lib/X11/rgb
 XORG_PATH_MODULES=/usr/lib/xorg/modules
 XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 
-SSL_CERTIFICATES="/etc/pki/tls"
+SSL_CERTIFICATES="/etc/ssl"
 
 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++

config/release/Autorun.inf

@@ -1,2 +0,0 @@
-[autorun]
-icon=openelec.ico

config/version

@@ -1,9 +1,9 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="5.0.1"
+  OPENELEC_VERSION="6.0.0"
 
 # OS_VERSION: OS Version
-  OS_VERSION="5.0"
+  OS_VERSION="6.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="4.3"
+  ADDON_VERSION="6.0"
 

distributions/OpenELEC/options

@@ -2,7 +2,7 @@
   DISTRONAME="OpenELEC"
 
 # short project description
-  DESCRIPTION="OpenELEC is a fast and userfriendly Kodi Entertainment Center distribution."
+  DESCRIPTION="OpenELEC is a fast and user-friendly Kodi Entertainment Center distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
@@ -14,6 +14,9 @@
 # Root password to integrate in the target system
   ROOT_PASSWORD="openelec"
 
+# Install glibc locales to the build (yes / no)
+  GLIBC_LOCALES="yes"
+
 # Mediacenter to use (kodi / no)
   MEDIACENTER="kodi"
 
@@ -28,25 +31,6 @@
 # install extra subtitle Fonts for KODI (yes / no)
   KODI_EXTRA_FONTS="yes"
 
-# build and install 'RSXS' Screensaver (yes / no)
-  KODI_SCR_RSXS="yes"
-
-# build and install 'ProjectM' Visualization (yes / no)
-  KODI_VIS_PROJECTM="yes"
-
-# build and install 'GOOM' Visualization (yes / no)
-  KODI_VIS_GOOM="yes"
-
-# build and install 'Waveform' Visualization (yes / no)
-  KODI_VIS_WAVEFORM="yes"
-
-# build and install 'Spectrum' Visualization (yes / no)
-  KODI_VIS_SPECTRUM="yes"
-
-# build and install 'FishBMC' Visualization (yes / no)
-  # does not work on RPi
-  KODI_VIS_FISHBMC="yes"
-
 # build and install PulseAudio support (yes / no)
   PULSEAUDIO_SUPPORT="no"
 
@@ -99,11 +83,6 @@
 # build xbmc with optical drive support (yes / no)
   KODI_OPTICAL_SUPPORT="yes"
 
-# KODI Audio encoders for usage with optical drive support
-# Space separated list is supported,
-# e.g. KODI_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
-  KODI_AUDIOENCODER_ADDONS="flac lame vorbis wav"
-
 # build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
   KODI_AIRPLAY_SUPPORT="yes"
 
@@ -128,12 +107,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install PPP support (yes / no)
-  PPTP_SUPPORT="yes"
-
-# build and install OpenVPN support (yes / no)
-  OPENVPN_SUPPORT="yes"
-
 # build and install diskmounter support (udevil)
 # this service provide auto mounting support for external drives in the
 # mediacenter also automount internally drives at boottime via udev (yes / no)
@@ -151,16 +124,10 @@
 # Windowmanager to use (ratpoison / fluxbox / none)
   WINDOWMANAGER="fluxbox"
 
-# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau)
+# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
 # Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia nouveau"
-  if [ "$TARGET_ARCH" = "i386" ]; then
-    # TODO: create Legacy build with OpenELEC-4.2
-    # install legacy drivers to i386 ARCH
-    GRAPHIC_DRIVERS="r200 r300 r600 i915 i965 nvidia-legacy"
-  elif [ "$TARGET_ARCH" = "x86_64" ]; then
-    GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia"
-  fi
+# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
+  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia"
 
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"
@@ -182,7 +149,7 @@
 
 # LCD driver to Use - Possible drivers are ( Comma seperated:
 # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
-# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
+# ea65,EyeboxOne,g15,glcd,glcdlib,glk,hd44780,i2500vfd,
 # icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
 # joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
 # ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
@@ -221,9 +188,6 @@
 # cron support (yes / no)
   CRON_SUPPORT="yes"
 
-# Perf support in development builds (yes / no)
-  PERF_SUPPORT="yes"
-
 # Distribution Specific source location
   DISTRO_MIRROR="http://sources.openelec.tv/mirror"
   DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"

packages/3rdparty/web/tntnet/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="tntnet"
-PKG_VERSION="2.2"
+PKG_VERSION="2.2.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,3 +1,5 @@
+6.0.0
+  rebuild for OpenELEC-6.0
 4.3.2
   allow running scripts from addon settings
 4.3.1

packages/addons/driver/hdhomerun/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="hdhomerun"
-PKG_VERSION="4.3"
-PKG_REV="2"
+PKG_VERSION="6.0"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
@@ -31,6 +31,8 @@ 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_ADDON_PROVIDES=""
+PKG_ADDON_REPOVERSION="6.0"
 
 make_target() {
   : # nothing to do here

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

@@ -1,3 +1,6 @@
+6.0.0
+  rebuild for OpenELEC-6.0
+
 4.3.1
  fix keymaps path
 

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

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="imon-mce"
-PKG_VERSION="4.3"
-PKG_REV="1"
+PKG_VERSION="6.0"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"
@@ -31,6 +31,8 @@ PKG_LONGDESC="imon-mce is a driver to add support for MCE remotes to the imon dr
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_PROVIDES=""
+PKG_ADDON_REPOVERSION="6.0"
 
 PKG_AUTORECONF="no"
 

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

@@ -1,3 +1,7 @@
+6.0.1
+  update driver for new devices support
+6.0.0
+  rebuild for OpenELEC-6.0
 4.3.4
   fixed xbmc/kodi rebranding error
   some fixes

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

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="sundtek-mediatv"
-PKG_VERSION="4.3"
-PKG_REV="4"
+PKG_VERSION="6.0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
@@ -30,16 +30,15 @@ PKG_SHORTDESC="Sundtek USB Stick DVB userspace driver"
 PKG_LONGDESC="Driver for Sundtek MediaTV Pro (DVB-C, DVB-T, AnalogTV, Composite, S-Video, FM-Radio USB Stick) and Sundtek SkyTV Ultimate (DVB-S/S2 USB)."
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_PROVIDES=""
 PKG_AUTORECONF="no"
+PKG_ADDON_REPOVERSION="6.0"
 
 make_target() {
   mkdir -p $ROOT/$PKG_BUILD
   cd $ROOT/$PKG_BUILD
 
   case $TARGET_ARCH in
-    i386)
-      INSTALLER_URL="http://sundtek.de/media/netinst/32bit/installer.tar.gz"
-      ;;
     x86_64)
       INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz"
       ;;

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

@@ -61,8 +61,6 @@ fi
 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

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

@@ -1,3 +1,9 @@
+6.0.1
+- update repo minversion for kodi 15
+
+6.0.0
+- rebuild for OpenELEC-6.0
+
 4.3.3
 - rebuild
 

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

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="repository.unofficial.addon.pro"
-PKG_VERSION="4.3"
-PKG_REV="4"
+PKG_VERSION="6.0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://unofficial.addon.pro"
@@ -33,14 +33,14 @@ PKG_LONGDESC="Unfficial OpenELEC.tv Add-on Repository"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.addon.repository"
+PKG_ADDON_PROVIDES=""
 
 PKG_AUTORECONF="no"
 
 PKG_MAINTAINER="unofficial.addon.pro"
 
 make_target() {
-  $SED -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
-     -e "s|@PROJECT@|$PROJECT|g" \
+  $SED -e "s|@PROJECT@|$PROJECT|g" \
      -e "s|@ARCH@|$TARGET_ARCH|g" \
      -e "s|@PKG_VERSION@|$PKG_VERSION|g" \
      -e "s|@PKG_REV@|$PKG_REV|g"\

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

@@ -5,9 +5,16 @@
                 provider-name="unofficial.addon.pro">
         <extension point="xbmc.addon.repository"
                 name="Unofficial OpenELEC.tv Add-on Repository">
-                <info>http://unofficial.addon.pro/addons/@ADDON_VERSION@/@PROJECT@/@ARCH@/addons.xml</info>
-                <checksum>http://unofficial.addon.pro/addons/@ADDON_VERSION@/@PROJECT@/@ARCH@/addons.xml.md5</checksum>
-                <datadir zip="true">http://unofficial.addon.pro/addons/@ADDON_VERSION@/@PROJECT@/@ARCH@</datadir>
+                <dir minversion="14.0.0">
+                    <info>http://unofficial.addon.pro/addons/4.3/@PROJECT@/@ARCH@/addons.xml</info>
+                    <checksum>http://unofficial.addon.pro/addons/4.3/@PROJECT@/@ARCH@/addons.xml.md5</checksum>
+                    <datadir zip="true">http://unofficial.addon.pro/addons/4.3/@PROJECT@/@ARCH@</datadir>
+                </dir>
+                <dir minversion="15.0.0">
+                    <info>http://unofficial.addon.pro/addons/6.0/@PROJECT@/@ARCH@/addons.xml</info>
+                    <checksum>http://unofficial.addon.pro/addons/6.0/@PROJECT@/@ARCH@/addons.xml.md5</checksum>
+                    <datadir zip="true">http://unofficial.addon.pro/addons/6.0/@PROJECT@/@ARCH@</datadir>
+                </dir>
         </extension>
         <extension point="xbmc.addon.metadata">
                 <summary>Unofficial addon repository for OpenELEC</summary>

packages/addons/script/script.config.vdr/package.mk

@@ -0,0 +1,50 @@
+################################################################################
+#      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/>.
+################################################################################
+
+PKG_NAME="script.config.vdr"
+PKG_VERSION="1.0.8"
+PKG_REV="0"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.openelec.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET=""
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="script.config.vdr"
+PKG_LONGDESC="script.config.vdr"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="dummy"
+PKG_ADDON_PROVIDES=""
+PKG_ADDON_REPOVERSION="6.0"
+
+PKG_AUTORECONF="no"
+
+make_target() {
+  : # nothing to do here
+}
+
+makeinstall_target() {
+  : # nothing to do here
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
+  cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID
+}

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

@@ -1,3 +1,6 @@
+6.0.0
+- rebuild for OpenELEC-6.0
+
 4.3.5
 - added boblight-aml
 

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

@@ -18,7 +18,7 @@
 
 PKG_NAME="boblightd"
 PKG_VERSION="478"
-PKG_REV="5"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
@@ -31,6 +31,8 @@ PKG_LONGDESC="Boblight's main purpose is to create light effects from an externa
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_PROVIDES=""
+PKG_ADDON_REPOVERSION="6.0"
 
 PKG_AUTORECONF="yes"
 
@@ -39,7 +41,7 @@ if [ "$DISPLAYSERVER" = "x11" ] ; then
 fi
 
 if [ "$OPENGL_SUPPORT" = "yes" ] ; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Mesa glu"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mesa glu"
 fi
 
 if [ "$OPENGL" = "no" ]; then

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

@@ -1,3 +1,40 @@
+6.0.1
+- update to vdr-plugin-dvbapi-0489e01
+- update to vdr-plugin-vnsiserver-a7b0670
+- update to vdr-satip-2.2.2
+- update to vdr-iptv-2.2.1
+
+6.0.0
+- rebuild for OpenELEC-6.0
+- remove plugin 'control'
+- remove plugin 'xvdr'
+- update to vdr-plugin-vnsiserver-36e2b61
+
+4.3.11
+- update to vdr-plugin-restfulapi-0.2.1.4
+
+4.3.10
+- disable dvbapi network mode
+
+4.3.9
+- update to vdr-2.2.0
+- update to vdr-iptv-2.2.0
+- update to vdr-satip-2.2.0
+- update to vdr-plugin-dvbapi-c0c7fa2
+- update to vdr-plugin-eepg-9cd9a75
+- update to vdr-plugin-vnsiserver-9529e6d
+- update to vdr-plugin-streamdev-84c6f6b
+
+4.3.8
+- update to vdr-2.1.10
+- update to vdr-plugin-restfulapi-0.2.1.1
+- update to vdr-plugin-vnsiserver-f2175ba
+
+4.3.7
+- update to vdr-2.1.8
+- update to vdr-plugin-vnsiserver-b887bc8
+- update to vdr-wirbelscan-0.0.9
+
 4.3.6
 - update to vdr-satip-1.0.2
 - update to vdr-2.1.7

packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf

@@ -1,31 +0,0 @@
-KBD.Up         00000000001B5B41
-KBD.Down       00000000001B5B42
-KBD.Menu       000000000000006D
-KBD.Ok         000000000000000D
-KBD.Back       000000000000007F
-KBD.Left       00000000001B5B44
-KBD.Right      00000000001B5B43
-KBD.Red        000000001B5B5B41
-KBD.Green      000000001B5B5B42
-KBD.Yellow     000000001B5B5B43
-KBD.Blue       000000001B5B5B44
-KBD.0          0000000000000030
-KBD.1          0000000000000031
-KBD.2          0000000000000032
-KBD.3          0000000000000033
-KBD.4          0000000000000034
-KBD.5          0000000000000035
-KBD.6          0000000000000036
-KBD.7          0000000000000037
-KBD.8          0000000000000038
-KBD.9          0000000000000039
-KBD.Info       0000000000000069
-KBD.FastFwd    0000001B5B31377E
-KBD.FastRew    000000001B5B5B45
-KBD.Power      0000000000000070
-KBD.Volume+    0000001B5B32347E
-KBD.Volume-    0000001B5B32337E
-KBD.Mute       0000001B5B32317E
-KBD.User7      0000001B5B31387E
-KBD.User8      0000001B5B31397E
-KBD.User9      0000001B5B32307E

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

@@ -18,13 +18,13 @@
 ################################################################################
 
 PKG_NAME="vdr-addon"
-PKG_VERSION="4.3"
-PKG_REV="6"
+PKG_VERSION="6.0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip vdr-plugin-epgfixer vdr-plugin-restfulapi"
+PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip vdr-plugin-epgfixer vdr-plugin-restfulapi"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"
@@ -32,6 +32,10 @@ PKG_LONGDESC="This project describes how to build your own digital satellite rec
 PKG_AUTORECONF="no"
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_PROVIDES=""
+PKG_ADDON_REQUIRES="pvr.vdr.vnsi:0.0.0 script.config.vdr:0.0.0"
+PKG_ADDON_NAME="VDR PVR Backend"
+PKG_ADDON_REPOVERSION="6.0"
 
 make_target() {
   : # nothing to do here
@@ -44,7 +48,6 @@ makeinstall_target() {
 addon() {
   VDR_DIR="$(get_build_dir vdr)"
   VDR_LIVE_DIR="$(get_build_dir vdr-live)"
-  VDR_PLUGIN_XVDR_DIR="$(get_build_dir vdr-plugin-xvdr)"
   VDR_PLUGIN_VNSISERVER_DIR="$(get_build_dir vdr-plugin-vnsiserver)"
   VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)"
   VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)"
@@ -59,7 +62,7 @@ addon() {
   cp $VDR_DIR/sources.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $VDR_DIR/svdrphosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf
-  cp $PKG_DIR/config.plugins/remote.conf $ADDON_BUILD/$PKG_ADDON_ID/config
+
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
@@ -71,7 +74,6 @@ addon() {
   cp $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 $VDR_PLUGIN_XVDR_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_VNSISERVER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-iptv)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-wirbelscan)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
@@ -81,7 +83,6 @@ addon() {
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_LIVE_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $(get_build_dir vdr-control)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-epgsearch)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_XMLTV2VDR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-dummydevice)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
@@ -91,10 +92,6 @@ addon() {
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/eepg
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
-  cp -PR $VDR_PLUGIN_XVDR_DIR/xvdr/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
-  cp -PR $VDR_PLUGIN_XVDR_DIR/xvdr/xvdr.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
-
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
   cp -PR $VDR_PLUGIN_VNSISERVER_DIR/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
 
@@ -103,7 +100,7 @@ addon() {
   cp -P $VDR_PLUGIN_XMLTV2VDR/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -PL $(get_build_dir tntnet)/.install_pkg/usr/lib/libtntnet.so.11 $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -PL $(get_build_dir tntnet)/.install_pkg/usr/lib/libtntnet.so.12 $ADDON_BUILD/$PKG_ADDON_ID/lib
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server

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

@@ -97,9 +97,6 @@ fi
 if [ "$ENABLE_LIVE" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P 'live -i $LIVE_IP -p $LIVE_PORT'"
 fi
-if [ "$ENABLE_CONTROL" == "true" ] ; then
-  VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'"
-fi
 if [ "$ENABLE_EEPG" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P eepg"
 fi
@@ -132,21 +129,20 @@ if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then
   done
 fi
 
-if [ "$ENABLE_RESTFULAPI" == "true" ] ; then
-  RESTFULAPI_ARGS="--ip $RESTFULAPI_IP --port $RESTFULAPI_PORT"
-  if [ ! -z "$RESTFULAPI_EPGIMAGES" ]; then
-    mkdir -p "$RESTFULAPI_EPGIMAGES"
-    RESTFULAPI_ARGS="$RESTFULAPI_ARGS --epgimages=\"$RESTFULAPI_EPGIMAGES\""
-  fi
-  if [ ! -z "$RESTFULAPI_CHANNELLOGOS" ]; then
-    mkdir -p "$RESTFULAPI_CHANNELLOGOS"
-    RESTFULAPI_ARGS="$RESTFULAPI_ARGS --channellogos=\"$RESTFULAPI_CHANNELLOGOS\""
-  fi
-  VDR_ARG="$VDR_ARG -P 'restfulapi $RESTFULAPI_ARGS'"
+if [ ! -d "$ADDON_HOME/epgimages" ]; then
+  mkdir -p "$ADDON_HOME/epgimages"
+fi
+if [ ! -z "$ADDON_HOME/channellogos" ]; then
+  mkdir -p "$ADDON_HOME/channellogos"
 fi
 
-# vnsi/xvdr last
-VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"
+RESTFULAPI_ARGS="--ip $RESTFULAPI_IP --port $RESTFULAPI_PORT"
+RESTFULAPI_ARGS="$RESTFULAPI_ARGS --epgimages=\"$ADDON_HOME/epgimages\""
+RESTFULAPI_ARGS="$RESTFULAPI_ARGS --channellogos=\"$ADDON_HOME/channellogos\""
+VDR_ARG="$VDR_ARG -P 'restfulapi $RESTFULAPI_ARGS'"
+
+# vnsi last
+VDR_ARG="$VDR_ARG -P vnsiserver"
 
 cd $ADDON_DIR/config
 mkdir -p $ADDON_CONFIG_DIR

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

@@ -4,7 +4,7 @@
 	<string id="1001">Plugins</string>
 	<string id="1002">VDR</string>
 	<string id="1020">DVB Configuration</string>
-	<string id="1021">Unload DVB mudules before suspend</string>
+	<string id="1021">Unload DVB modules before suspend</string>
 	<string id="1022">Wait for frontend initialization</string>
 	<string id="1023">Number of adapters to wait for</string>
 	<string id="1024">Enable charset override</string>
@@ -17,8 +17,6 @@
 	<string id="1038">Enable plugin: live</string>
 	<string id="1039">- listen on ip</string>
 	<string id="1040">- listen on port</string>
-	<string id="1042">Enable plugin: control</string>
-	<string id="1043">- listen on port</string>
 	<string id="1044">Enable plugin: epgsearch</string>
 	<string id="1045">Enable plugin: xmltv2vdr</string>
 	<string id="1046">Enable plugin: extended EPG</string>
@@ -27,13 +25,10 @@
 	<string id="1049">Enable plugin: epgfixer</string>
 	<string id="1051">VDR Configuration</string>
 	<string id="1052">VDR Video Dir</string>
-	<string id="1053">PVR plugin</string>
         <string id="1056">Enable external recdmd</string>
         <string id="1057">External recdmd path</string>
         <string id="1058">- number of devices</string>
-	<string id="1070">Enable plugin: restfulapi</string>
+	<string id="1070">restfulapi plugin options</string>
 	<string id="1071">- listen on ip</string>
 	<string id="1072">- listen on port</string>
-	<string id="1073">- Path to the epgimages</string>
-	<string id="1074">- Path to the channellogos</string>
 </strings>

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

@@ -20,7 +20,6 @@
     <category label="1001">
 		<setting label="1030" type="lsep"/>
 		<setting type="sep" />
-		<setting id="PVR_PLUGIN" type="labelenum" label="1053" values="xvdr|vnsiserver" default="vnsiserver" />
 		<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
 		<setting id="IPTV_NUM_DEVICES" type="slider" option="int" range="1,4" label="1058" visible="!eq(-1,false)" default="1" />
 		<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
@@ -28,20 +27,16 @@
 		<setting id="ENABLE_LIVE" type="bool" label="1038" default="false" />
 		<setting id="LIVE_IP" type="ipaddress" label="1039" values="" visible="!eq(-1,false)" default="0.0.0.0"/>
 		<setting id="LIVE_PORT" type="number" label="1040" values="" visible="!eq(-2,false)"  default="8008"/>
-		<setting id="ENABLE_CONTROL" type="bool" label="1042" default="false" />
-		<setting id="CONTROL_PORT" type="number" label="1043" values="" visible="!eq(-1,false)"  default="2002"/>
 		<setting id="ENABLE_EEPG" type="bool" label="1046" default="false" />
 		<setting id="ENABLE_EPGSEARCH" type="bool" label="1044" default="false" />
 		<setting id="ENABLE_XMLTV2VDR" type="bool" label="1045" default="false" />
 		<setting id="ENABLE_DUMMYDEVICE" type="bool" label="1047" default="false" />
 		<setting id="ENABLE_SATIP" type="bool" label="1048" default="false" />
 		<setting id="ENABLE_EPGFIXER" type="bool" label="1049" default="false" />
-		<setting id="ENABLE_RESTFULAPI" type="bool" label="1070" default="false" />
-		<setting id="RESTFULAPI_IP" type="ipaddress" label="1071" values="" visible="!eq(-1,false)" default="0.0.0.0"/>
-		<setting id="RESTFULAPI_PORT" type="number" label="1072" values="" visible="!eq(-2,false)"  default="8002"/>
-		<setting id="RESTFULAPI_EPGIMAGES" type="file" label="1073" values="" visible="!eq(-3,false)"  default="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/epgimages"/>
-		<setting id="RESTFULAPI_CHANNELLOGOS" type="file" label="1074" values="" visible="!eq(-4,false)"  default="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/channellogos"/>
 		<setting type="sep" />
 		<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />
+		<setting type="lsep" label="1070" />
+		<setting id="RESTFULAPI_IP" type="ipaddress" label="1071" values="" default="127.0.0.1"/>
+		<setting id="RESTFULAPI_PORT" type="number" label="1072" values="" default="8002"/>
     </category>
 </settings>

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

@@ -3,7 +3,6 @@
     <setting id="NUM_ADAPTERS" value="1" />
     <setting id="REMOVE_MODULES" value="" />
     <setting id="VDR_VIDEO_DIR" value="/storage/videos" />
-    <setting id="PVR_PLUGIN" value="vnsiserver" />
     <setting id="ENABLE_IPTV" value="false" />
     <setting id="ENABLE_SOFTCAM" value="true" />
     <setting id="ENABLE_STREAMDEV_CLIENT" value="false" />
@@ -11,8 +10,6 @@
     <setting id="ENABLE_LIVE" value="false" />
     <setting id="LIVE_IP" value="0.0.0.0" />
     <setting id="LIVE_PORT" value="8008" />
-    <setting id="ENABLE_CONTROL" value="false" />
-    <setting id="CONTROL_PORT" value="2002" />
     <setting id="ENABLE_EEPG" value="false" />
     <setting id="ENABLE_EPGFIXER" value="false" />
     <setting id="ENABLE_EPGSEARCH" value="false" />
@@ -20,13 +17,10 @@
     <setting id="ENABLE_DUMMYDEVICE" value="false" />
     <setting id="ENABLE_SATIP" value="false" />
     <setting id="ENABLE_EXTERNAL_RECCMD" value="false" />
-    <setting id="ENABLE_RESTFULAPI" value="false" />
     <setting id="EXTERNAL_RECCMD_PATH" value="" />
     <setting id="ENABLE_CHARSET_OVERRIDE" value="false" />
     <setting id="CHARSET_OVERRIDE_STR" value="" />
     <setting id="IPTV_NUM_DEVICES" value="1" />
-    <setting id="RESTFULAPI_IP" value="0.0.0.0" />
+    <setting id="RESTFULAPI_IP" value="127.0.0.1" />
     <setting id="RESTFULAPI_PORT" value="8002" />
-    <setting id="RESTFULAPI_EPGIMAGES" value="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/epgimages" />
-    <setting id="RESTFULAPI_CHANNELLOGOS" value="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/channellogos" />
 </settings>

packages/audio/alsa-lib/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="alsa-lib"
-PKG_VERSION="1.0.28"
+PKG_VERSION="1.0.29"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/alsa-lib/patches/alsa-lib-USB_Soundblaster_HD.patch

@@ -0,0 +1,23 @@
+From 982c628f484266c8db4f70dc1e856bc7844c1873 Mon Sep 17 00:00:00 2001
+From: Patrick Rasmussen <patrickrasmussen1988@gmail.com>
+Date: Fri, 13 Mar 2015 14:52:56 +0100
+Subject: [PATCH] Add USB Sound Blaster HD
+
+---
+ src/conf/cards/USB-Audio.conf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf
+index 4cbf85e..2591d00 100644
+--- a/src/conf/cards/USB-Audio.conf
++++ b/src/conf/cards/USB-Audio.conf
+@@ -62,6 +62,7 @@ USB-Audio.pcm.iec958_device {
+ # Second iec958 device number, if any.
+ USB-Audio.pcm.iec958_2_device {
+ 	"PHIREE U2" 1  # 0 = PCM S/PDIF, 1 = non-PCM S/PDIF
++	"USB Sound Blaster HD" 1
+ }
+ 
+ 
+-- 
+2.1.4

packages/audio/alsa-lib/patches/alsa-lib-usb-audio-spdif.patch

@@ -1,69 +0,0 @@
-From 01b686cf032d523642c5ab33f455d814ef468925 Mon Sep 17 00:00:00 2001
-From: fritsch <Peter.Fruehberger@gmail.com>
-Date: Sat, 10 Jan 2015 23:47:58 +0100
-Subject: [PATCH] Support PHIREE U2 and Sound blaster F-Xi HD (done by Anssih)
-
----
- src/conf/cards/USB-Audio.conf | 41 ++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 40 insertions(+), 1 deletion(-)
-
-diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf
-index ce3ae01..107d6fa 100644
---- a/src/conf/cards/USB-Audio.conf
-+++ b/src/conf/cards/USB-Audio.conf
-@@ -52,6 +52,10 @@ USB-Audio.pcm.iec958_device {
- 	"USB Device 0x46d:0x992" 999
- }
- 
-+USB-Audio.pcm.iec958_2_device {
-+	"PHIREE U2" 1
-+	"USB Sound Blaster HD" 1
-+}
- 
- # If a device requires non-standard definitions for front, surround40,
- # surround51, surround71 or iec958, they can be defined here.
-@@ -422,4 +426,39 @@ USB-Audio.pcm.iec958.0 {
- 	}
- }
- 
--# vim: ft=alsaconf
-+USB-Audio.pcm.iec958.1 {
-+	@args [ CARD AES0 AES1 AES2 AES3 ]
-+	@args.CARD { type string }
-+	@args.AES0 { type integer }
-+	@args.AES1 { type integer }
-+	@args.AES2 { type integer }
-+	@args.AES3 { type integer }
-+	@func refer
-+	name {
-+		@func concat
-+		strings [
-+			"cards.USB-Audio."
-+			{ @func card_name card $CARD }
-+			".pcm.iec958_2:CARD=" $CARD
-+			",AES0=" $AES0 ",AES1=" $AES1 ",AES2=" $AES2 ",AES3=" $AES3
-+		]
-+	}
-+	default {
-+		# FIXME: we cannot set the AES parameters
-+		type hw
-+		card $CARD
-+		device {
-+			@func refer
-+			name {
-+				@func concat
-+				strings [
-+					"cards.USB-Audio.pcm.iec958_2_device."
-+					{ @func card_name card $CARD }
-+				]
-+			}
-+			default 999
-+		}
-+	}
-+}
-+
-+# vim: ft=alsaconf
-\ No newline at end of file
--- 
-1.9.1
-

packages/audio/alsa-utils/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="alsa-utils"
-PKG_VERSION="1.0.28"
+PKG_VERSION="1.0.29"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/dcadec/package.mk

@@ -16,28 +16,32 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="libsamplerate"
-PKG_VERSION="0.1.8"
+PKG_NAME="dcadec"
+PKG_VERSION="37d8e68"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.mega-nerd.com/SRC/"
-PKG_URL="http://www.mega-nerd.com/SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_SITE="https://github.com/foo86/dcadec"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
-PKG_SHORTDESC="libsamplerate: A Sample Rate Converter library for audio"
-PKG_LONGDESC="Libsamplerate is a Sample Rate Converter for audio. One example of where such a thing would be useful is converting audio from the CD sample rate of 44.1kHz to the 48kHz sample rate used by DAT players."
+PKG_SHORTDESC="DTS Coherent Acoustics decoder with support for HD extensions"
+PKG_LONGDESC="DTS Coherent Acoustics decoder with support for HD extensions"
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="no" # ToDo
+PKG_AUTORECONF="no"
 
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
-                           --enable-static \
-                           --datadir=/usr/share \
-                           --disable-fftw \
-                           --disable-sndfile"
+# todo: we need to build as shared library, otherwise sond dont work
+# in kodi with enabled dcadec support and we have 100% CPU usage
+# (to test disable passtrough and use a DTS-HD sample)
+PKG_MAKE_OPTS_TARGET="PREFIX=/usr BINDIR=/usr/bin LIBDIR=/usr/lib INCLUDEDIR=/usr/include PKG_CONFIG_PATH=/usr/lib/pkgconfig CONFIG_SHARED=1"
+PKG_MAKEINSTALL_OPTS_TARGET="$PKG_MAKE_OPTS_TARGET"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC -DPIC"
+  export LDFLAGS="$LDFLAGS -fPIC -DPIC"
+}
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin

packages/audio/espeak/package.mk

@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://espeak.sourceforge.net/"
-PKG_URL="http://downloads.sourceforge.net/$PKG_NAME/$PKG_NAME-$PKG_VERSION.zip"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
 PKG_SOURCE_DIR="$PKG_NAME/$PKG_NAME-$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"

packages/audio/flac/package.mk

@@ -20,8 +20,8 @@ PKG_NAME="flac"
 PKG_VERSION="1.3.1"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://flac.sourceforge.net/"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://xiph.org/flac/"
 PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libogg"
 PKG_PRIORITY="optional"
@@ -45,7 +45,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --with-ogg=$SYSROOT_PREFIX/usr \
                            --with-gnu-ld"
 
-if [ $TARGET_ARCH = "i386" -o $TARGET_ARCH = "x86_64" ]; then
+if [ $TARGET_ARCH = "x86_64" ]; then
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-sse"
 else
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-sse"

packages/audio/fluidsynth/package.mk

@@ -0,0 +1,37 @@
+################################################################################
+#      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/>.
+################################################################################
+
+PKG_NAME="fluidsynth"
+PKG_VERSION="1.1.6"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://fluidsynth.org/"
+PKG_URL="$SOURCEFORGE_SRC/project/fluidsynth/fluidsynth-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="FluidSynth: A SoundFont Synthesizer."
+PKG_LONGDESC="FluidSynth renders midi music files as raw audio data, for playing or conversion. "
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=0 -Denable-readline=0 ..
+}

packages/audio/fluidsynth/patches/fluidsynth-01-fix-libdir.patch

@@ -0,0 +1,18 @@
+--- fluidsynth-1.1.6/CMakeLists.txt.orig	2015-04-06 13:12:55.151874342 +0200
++++ fluidsynth-1.1.6/CMakeLists.txt	2015-04-06 13:14:32.931876573 +0200
+@@ -85,11 +85,11 @@
+ endif ( ${CMAKE_SYSTEM} MATCHES "OS2" )
+ 
+ # Initialize the library directory name suffix.
+-if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+-  set ( _init_lib_suffix "64" )
+-else ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
++#if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
++#  set ( _init_lib_suffix "64" )
++#else ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+   set ( _init_lib_suffix "" )
+-endif ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
++#endif ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+ set ( LIB_SUFFIX ${_init_lib_suffix} CACHE STRING
+       "library directory name suffix (32/64/nothing)" )
+ mark_as_advanced ( LIB_SUFFIX )

packages/audio/libcdio/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="libcdio"
-PKG_VERSION="0.92"
+PKG_VERSION="0.93"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.gnu.org/software/libcdio/"
-PKG_URL="http://ftp.gnu.org/gnu/libcdio/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_LICENSE="GPLv3"
+PKG_SITE="https://www.gnu.org/software/libcdio/"
+PKG_URL="https://ftp.gnu.org/gnu/libcdio/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"

packages/audio/libmad/package.mk

@@ -1,56 +0,0 @@
-################################################################################
-#      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/>.
-################################################################################
-
-PKG_NAME="libmad"
-PKG_VERSION="0.15.1b"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.mars.org/home/rob/proj/mpeg/"
-PKG_URL="$SOURCEFORGE_SRC/mad/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="audio"
-PKG_SHORTDESC="libmad: MPEG Audio Decoder"
-PKG_LONGDESC="MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 and the MPEG-2 extension to Lower Sampling Frequencies, as well as the so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II, and Layer III a.k.a. MP3) are fully implemented."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
-if [ $TARGET_ARCH == "x86_64" ] ; then
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-accuracy --enable-fpm=64bit"
-fi
-
-post_makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-  cat > $SYSROOT_PREFIX/usr/lib/pkgconfig/mad.pc << "EOF"
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: mad
-Description: MPEG audio decoder
-Requires:
-Version: 0.15.1b
-Libs: -L${libdir} -lmad
-Cflags: -I${includedir}
-EOF
-}

packages/audio/libmad/patches/libmad-0.15.1b-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur libmad-0.15.1b-old/configure.ac libmad-0.15.1b-new/configure.ac
---- libmad-0.15.1b-old/configure.ac	2004-01-23 01:41:32.000000000 -0800
-+++ libmad-0.15.1b-new/configure.ac	2012-12-30 15:14:37.000000000 -0800
-@@ -28,7 +28,7 @@
- 
- AM_INIT_AUTOMAKE
- 
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- 
- dnl System type.
- 

packages/audio/libmad/patches/libmad-0.15.1b-cflags-O2.patch

@@ -1,12 +0,0 @@
-diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac
---- libmad-0.15.1b-orig/configure.ac	2007-07-01 12:58:13.000000000 -0600
-+++ libmad-0.15.1b/configure.ac	2007-07-01 12:59:13.000000000 -0600
-@@ -105,7 +105,7 @@
- 	    shift
- 	    ;;
- 	-O2)
--	    optimize="-O"
-+	    optimize="-O2"
- 	    shift
- 	    ;;
- 	-fomit-frame-pointer)

packages/audio/libmad/patches/libmad-0.15.1b-cflags.patch

@@ -1,146 +0,0 @@
-diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac
---- libmad-0.15.1b-orig/configure.ac	2007-06-30 20:22:31.000000000 -0600
-+++ libmad-0.15.1b/configure.ac	2007-06-30 20:25:31.000000000 -0600
-@@ -122,74 +122,74 @@
-     esac
- done
- 
--if test "$GCC" = yes
--then
--    if test -z "$arch"
--    then
--	case "$host" in
--	    i386-*)           ;;
--	    i?86-*)           arch="-march=i486" ;;
--	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
--	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
--	    powerpc-*)        ;;
--	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
--	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
--	esac
--    fi
--
--    case "$optimize" in
--	-O|"-O "*)
--	    optimize="-O"
--	    optimize="$optimize -fforce-mem"
--	    optimize="$optimize -fforce-addr"
--	    : #x optimize="$optimize -finline-functions"
--	    : #- optimize="$optimize -fstrength-reduce"
--	    optimize="$optimize -fthread-jumps"
--	    optimize="$optimize -fcse-follow-jumps"
--	    optimize="$optimize -fcse-skip-blocks"
--	    : #x optimize="$optimize -frerun-cse-after-loop"
--	    : #x optimize="$optimize -frerun-loop-opt"
--	    : #x optimize="$optimize -fgcse"
--	    optimize="$optimize -fexpensive-optimizations"
--	    optimize="$optimize -fregmove"
--	    : #* optimize="$optimize -fdelayed-branch"
--	    : #x optimize="$optimize -fschedule-insns"
--	    optimize="$optimize -fschedule-insns2"
--	    : #? optimize="$optimize -ffunction-sections"
--	    : #? optimize="$optimize -fcaller-saves"
--	    : #> optimize="$optimize -funroll-loops"
--	    : #> optimize="$optimize -funroll-all-loops"
--	    : #x optimize="$optimize -fmove-all-movables"
--	    : #x optimize="$optimize -freduce-all-givs"
--	    : #? optimize="$optimize -fstrict-aliasing"
--	    : #* optimize="$optimize -fstructure-noalias"
--
--	    case "$host" in
--		arm*-*)
--		    optimize="$optimize -fstrength-reduce"
--		    ;;
--		mips*-*)
--		    optimize="$optimize -fstrength-reduce"
--		    optimize="$optimize -finline-functions"
--		    ;;
--		i?86-*)
--		    optimize="$optimize -fstrength-reduce"
--		    ;;
--		powerpc-apple-*)
--		    # this triggers an internal compiler error with gcc2
--		    : #optimize="$optimize -fstrength-reduce"
--
--		    # this is really only beneficial with gcc3
--		    : #optimize="$optimize -finline-functions"
--		    ;;
--		*)
--		    # this sometimes provokes bugs in gcc 2.95.2
--		    : #optimize="$optimize -fstrength-reduce"
--		    ;;
--	    esac
--	    ;;
--    esac
--fi
-+#if test "$GCC" = yes
-+#then
-+#    if test -z "$arch"
-+#    then
-+#	case "$host" in
-+#	    i386-*)           ;;
-+#	    i?86-*)           arch="-march=i486" ;;
-+#	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
-+#	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
-+#	    powerpc-*)        ;;
-+#	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
-+#	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
-+#	esac
-+#    fi
-+#
-+#    case "$optimize" in
-+#	-O|"-O "*)
-+#	    optimize="-O"
-+#	    optimize="$optimize -fforce-mem"
-+#	    optimize="$optimize -fforce-addr"
-+#	    : #x optimize="$optimize -finline-functions"
-+#	    : #- optimize="$optimize -fstrength-reduce"
-+#	    optimize="$optimize -fthread-jumps"
-+#	    optimize="$optimize -fcse-follow-jumps"
-+#	    optimize="$optimize -fcse-skip-blocks"
-+#	    : #x optimize="$optimize -frerun-cse-after-loop"
-+#	    : #x optimize="$optimize -frerun-loop-opt"
-+#	    : #x optimize="$optimize -fgcse"
-+#	    optimize="$optimize -fexpensive-optimizations"
-+#	    optimize="$optimize -fregmove"
-+#	    : #* optimize="$optimize -fdelayed-branch"
-+#	    : #x optimize="$optimize -fschedule-insns"
-+#	    optimize="$optimize -fschedule-insns2"
-+#	    : #? optimize="$optimize -ffunction-sections"
-+#	    : #? optimize="$optimize -fcaller-saves"
-+#	    : #> optimize="$optimize -funroll-loops"
-+#	    : #> optimize="$optimize -funroll-all-loops"
-+#	    : #x optimize="$optimize -fmove-all-movables"
-+#	    : #x optimize="$optimize -freduce-all-givs"
-+#	    : #? optimize="$optimize -fstrict-aliasing"
-+#	    : #* optimize="$optimize -fstructure-noalias"
-+#
-+#	    case "$host" in
-+#		arm*-*)
-+#		    optimize="$optimize -fstrength-reduce"
-+#		    ;;
-+#		mips*-*)
-+#		    optimize="$optimize -fstrength-reduce"
-+#		    optimize="$optimize -finline-functions"
-+#		    ;;
-+#		i?86-*)
-+#		    optimize="$optimize -fstrength-reduce"
-+#		    ;;
-+#		powerpc-apple-*)
-+#		    # this triggers an internal compiler error with gcc2
-+#		    : #optimize="$optimize -fstrength-reduce"
-+#
-+#		    # this is really only beneficial with gcc3
-+#		    : #optimize="$optimize -finline-functions"
-+#		    ;;
-+#		*)
-+#		    # this sometimes provokes bugs in gcc 2.95.2
-+#		    : #optimize="$optimize -fstrength-reduce"
-+#		    ;;
-+#	    esac
-+#	    ;;
-+#    esac
-+#fi
- 
- case "$host" in
-     mips*-agenda-*)

packages/audio/libmodplug/package.mk

@@ -31,3 +31,5 @@ PKG_LONGDESC="libmodplug renders mod music files as raw audio data, for playing
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

packages/audio/libogg/package.mk

@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="libogg"
-PKG_VERSION="1.3.1"
+PKG_VERSION="1.3.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
-PKG_SITE="http://www.xiph.org/ogg/"
+PKG_SITE="https://www.xiph.org/ogg/"
 PKG_URL="http://downloads.xiph.org/releases/ogg/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"

packages/audio/libopenmpt/package.mk

@@ -0,0 +1,35 @@
+################################################################################
+#      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/>.
+################################################################################
+
+PKG_NAME="libopenmpt"
+PKG_VERSION="0.2.4764"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="http://lib.openmpt.org/libopenmpt/"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="libopenmpt: renders mod music files as raw audio data, for playing or conversion."
+PKG_LONGDESC="libopenmpt renders mod music files as raw audio data, for playing or conversion."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

packages/audio/libvorbis/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libvorbis"
-PKG_VERSION="1.3.4"
+PKG_VERSION="1.3.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/audio/pulseaudio/config/system.pa

@@ -0,0 +1,74 @@
+#!/usr/bin/pulseaudio -nF
+#
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PulseAudio 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 Lesser General Public License
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+
+# This startup script is used only if PulseAudio is started in system
+# mode.
+
+### Automatically load driver modules depending on the hardware available
+.ifexists module-udev-detect.so
+load-module module-udev-detect
+.else
+### Use the static hardware detection module (for systems that lack udev/hal support)
+load-module module-detect
+.endif
+
+### Load several protocols
+.ifexists module-esound-protocol-unix.so
+load-module module-esound-protocol-unix
+.endif
+load-module module-native-protocol-unix
+
+### Automatically restore the volume of streams and devices
+load-module module-stream-restore
+load-module module-device-restore
+
+### Automatically restore the default sink/source when changed by the user
+### during runtime
+### NOTE: This should be loaded as early as possible so that subsequent modules
+### that look up the default sink/source get the right value
+load-module module-default-device-restore
+
+### Automatically move streams to the default sink if the sink they are
+### connected to dies, similar for sources
+load-module module-rescue-streams
+
+### Make sure we always have a sink around, even if it is a null sink.
+load-module module-always-sink
+
+### Automatically suspend sinks/sources that become idle for too long
+load-module module-suspend-on-idle
+
+### Enable positioned event sounds
+load-module module-position-event-sounds
+
+### Automatically load modules for bluetooth
+.ifexists module-bluetooth-policy.so
+ load-module module-bluetooth-policy
+.endif
+
+.ifexists module-bluetooth-discover.so
+ load-module module-bluetooth-discover
+.endif
+
+.ifexists module-zeroconf-publish.so
+  load-module module-zeroconf-publish
+  load-module module-zeroconf-discover
+.endif
+
+load-module module-native-protocol-tcp auth-anonymous=1
+load-module module-switch-on-connect
+

packages/audio/pulseaudio/package.mk

@@ -19,20 +19,22 @@
 ################################################################################
 
 PKG_NAME="pulseaudio"
-PKG_VERSION="5.0"
+PKG_VERSION="7.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pulseaudio.org/"
 PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd libressl libcap"
+PKG_DEPENDS_TARGET="toolchain libtool json-c alsa-lib libsndfile soxr dbus systemd libressl libcap"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="pulseaudio: Yet another sound server for Unix"
 PKG_LONGDESC="PulseAudio is a sound server for Linux and other Unix-like operating systems. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (esound or esd). In addition to the features esound provides, PulseAudio has an extensible plugin architecture, support for more than one sink per source, better low-latency behavior, the ability to be embedded into other software, a completely asynchronous C API, a simple command line interface for reconfiguring the daemon while running, flexible and implicit sample type conversion and resampling, and a "Zero-Copy" architecture."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+
+# broken
+PKG_AUTORECONF="no"
 
 if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET sbc"
@@ -41,6 +43,13 @@ else
   PULSEAUDIO_BLUETOOTH="--disable-bluez5"
 fi
 
+if [ "$AVAHI_DAEMON" = "yes" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi"
+  PULSEAUDIO_AVAHI="--enable-avahi"
+else
+  PULSEAUDIO_AVAHI="--disable-avahi"
+fi
+
 # package specific configure options
 PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
                            --disable-nls \
@@ -48,7 +57,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
                            --disable-rpath \
                            --disable-x11 \
                            --disable-tests \
-                           --enable-samplerate \
+                           --disable-samplerate \
                            --disable-oss-output \
                            --disable-oss-wrapper \
                            --disable-coreaudio-output \
@@ -59,7 +68,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
                            --disable-glib2 \
                            --disable-gtk3 \
                            --disable-gconf \
-                           --disable-avahi \
+                           $PULSEAUDIO_AVAHI \
                            --disable-jack \
                            --disable-asyncns \
                            --disable-tcpwrap \
@@ -67,6 +76,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
                            --enable-dbus \
                            --disable-bluez4 \
                            $PULSEAUDIO_BLUETOOTH \
+                           --disable-bluez5-ofono-headset \
+                           --disable-bluez5-native-headset \
                            --enable-udev \
                            --disable-hal-compat \
                            --enable-ipv6 \
@@ -82,25 +93,10 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
                            --with-access-group=root \
                            --without-caps \
                            --without-fftw \
-                           --with-speex \
+                           --without-speex \
+                           --with-soxr \
                            --with-module-dir=/usr/lib/pulse"
 
-pre_build_target() {
-# broken autoreconf
-  ( cd $PKG_BUILD
-    intltoolize --force
-  )
-}
-
-pre_configure_target() {
-  # pulseaudio fails to build with LTO support
-    strip_lto
-}
-
-pre_make_target() {
-  MAKEFLAGS=-j1
-}
-
 post_makeinstall_target() {
 # add_user pulse x 499 498 "PulseAudio System Daemon" "/var/run/pulse" "/bin/sh"
 # add_group pulse 498
@@ -109,9 +105,22 @@ post_makeinstall_target() {
   sed -e 's%user="pulse"%user="root"%g' -i $INSTALL/etc/dbus-1/system.d/pulseaudio-system.conf
 
   rm -rf $INSTALL/usr/bin/esdcompat
+  rm -rf $INSTALL/usr/include
   rm -rf $INSTALL/usr/lib/cmake
+  rm -rf $INSTALL/usr/lib/pkgconfig
+  rm -rf $INSTALL/usr/lib/systemd
   rm -rf $INSTALL/usr/share/vala
-  rm -rf $INSTALL/etc/bash_completion.d
+  rm -rf $INSTALL/usr/share/zsh
+  rm -rf $INSTALL/usr/share/bash-completion
+
+  cp $PKG_DIR/config/system.pa $INSTALL/etc/pulse/
+
+  # Remove unwanted symlinks
+  for file in $INSTALL/*; do
+    if [ -L "$file" ]; then
+      rm $file
+    fi
+  done
 }
 
 post_install() {

packages/audio/pulseaudio/patches/pulseaudio-0020-stream-Return-error-in-case-a-client-peeks-to-early.patch

@@ -1,64 +0,0 @@
-From david.henningsson@canonical.com  Mon Oct  1 15:06:56 2012
-Return-Path: <david.henningsson@canonical.com>
-X-Original-To: diwic@mail.canonical.com
-Delivered-To: diwic@mail.canonical.com
-Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145])
-	by grenadilla.canonical.com (Postfix) with ESMTP id A48961472160
-	for <diwic@mail.canonical.com>; Mon,  1 Oct 2012 15:06:56 +0000 (UTC)
-Received: from cluster-e.mailcontrol.com (cluster-e.mailcontrol.com [85.115.58.190])
-	by fiordland.canonical.com (Postfix) with ESMTP id 5DC1EA18423
-	for <david.henningsson@cleanmail.canonical.com>; Mon,  1 Oct 2012 15:06:56 +0000 (UTC)
-Received: from arctowski.canonical.com (arctowski.canonical.com [91.189.94.158])
-	by rly62e.srv.mailcontrol.com (MailControl) with ESMTP id q91F6t9E016745
-	for <david.henningsson@cleanmail.canonical.com>; Mon, 1 Oct 2012 16:06:55 +0100
-Received: from fiordland.canonical.com ([91.189.94.145])
-	by arctowski.canonical.com with esmtp (Exim 4.71)
-	(envelope-from <david.henningsson@canonical.com>)
-	id 1TIhaB-0002MW-HX
-	for david.henningsson@cleanmail.canonical.com; Mon, 01 Oct 2012 15:06:55 +0000
-Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112])
-	by fiordland.canonical.com (Postfix) with ESMTP id 8706DA18423
-	for <david.henningsson@canonical.com>; Mon,  1 Oct 2012 15:06:55 +0000 (UTC)
-Received: from hd9483857.selulk5.dyn.perspektivbredband.net ([217.72.56.87] helo=localhost.localdomain)
-	by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
-	(Exim 4.71)
-	(envelope-from <david.henningsson@canonical.com>)
-	id 1TIhaB-0006f2-8F; Mon, 01 Oct 2012 15:06:55 +0000
-From: David Henningsson <david.henningsson@canonical.com>
-To: pulseaudio-discuss@lists.freedesktop.org
-Cc: 1058200@bugs.launchpad.net,
-        David Henningsson <david.henningsson@canonical.com>
-Subject: [PATCH] stream: Return error in case a client peeks to early
-Date: Mon,  1 Oct 2012 17:06:55 +0200
-Message-Id: <1349104015-5924-1-git-send-email-david.henningsson@canonical.com>
-X-Mailer: git-send-email 1.7.9.5
-X-Mailcontrol-Inbound: uq3drnD2P+ps5SfEb0fvr78+NoP1DHBZwGqKpaXB2eTgNv8D6KLIxb8+NoP1DHBZ8VSaBg0k0xw=
-X-Spam-Score: -0.4
-X-Scanned-By: MailControl 9446.0 (www.mailcontrol.com) on 10.69.0.172
-
-If there is no silence memblock and no data, pa_memblockq_peek can
-return NULL. In this case, do not crash on an assertion in
-pa_memblock_acquire, but instead return a proper error to the client.
-
-BugLink: http://bugs.launchpad.net/bugs/1058200
-Signed-off-by: David Henningsson <david.henningsson@canonical.com>
----
- src/pulse/stream.c |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/pulse/stream.c b/src/pulse/stream.c
-index 2b6d306..9bb0995 100644
---- a/src/pulse/stream.c
-+++ b/src/pulse/stream.c
-@@ -1598,6 +1598,8 @@ int pa_stream_peek(pa_stream *s, const void **data, size_t *length) {
-             return 0;
-         }
- 
-+        PA_CHECK_VALIDITY(s->context, s->peek_memchunk.memblock != NULL, PA_ERR_NODATA);
-+
-         s->peek_data = pa_memblock_acquire(s->peek_memchunk.memblock);
-     }
- 
--- 
-1.7.9.5
-

packages/audio/pulseaudio/patches/pulseaudio-0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch

@@ -1,16 +0,0 @@
-Description: Avoid abort when poll descriptor is 0 (LP: #1092377)
-
-Index: pulseaudio/src/modules/alsa/alsa-mixer.c
-===================================================================
---- pulseaudio.orig/src/modules/alsa/alsa-mixer.c	2012-12-20 00:37:53.862456000 -0200
-+++ pulseaudio/src/modules/alsa/alsa-mixer.c	2012-12-20 00:39:58.631080479 -0200
-@@ -160,6 +160,9 @@
-     if (n < 0) {
-         pa_log("snd_mixer_poll_descriptors_count() failed: %s", pa_alsa_strerror(n));
-         return;
-+    } else if (n == 0) {
-+        pa_log("snd_mixer_poll_descriptors_count() equal 0");
-+        return;
-     }
-     num_fds = (unsigned) n;
- 

packages/audio/pulseaudio/patches/pulseaudio-0203-card-Add-hook-before-profile-changes.patch

@@ -1,40 +0,0 @@
-From 3e04d944626ba4caee8a4d74a683c6c967e935ca Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Tue, 13 Aug 2013 12:43:29 +0200
-Subject: [PATCH 203/204] card: Add hook before profile changes
-
-This is useful to modules that want to do things just before a
-profile becomes inactive.
----
- src/pulsecore/card.c |    2 ++
- src/pulsecore/core.h |    1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
-index 7cf45df..b58dfa7 100644
---- a/src/pulsecore/card.c
-+++ b/src/pulsecore/card.c
-@@ -272,6 +272,8 @@ int pa_card_set_profile(pa_card *c, const char *name, pa_bool_t save) {
-         return 0;
-     }
- 
-+    pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_CARD_PROFILE_CHANGING], profile);
-+
-     if ((r = c->set_profile(c, profile)) < 0)
-         return r;
- 
-diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
-index a8cff5c..904b610 100644
---- a/src/pulsecore/core.h
-+++ b/src/pulsecore/core.h
-@@ -115,6 +115,7 @@ typedef enum pa_core_hook {
-     PA_CORE_HOOK_CARD_PUT,
-     PA_CORE_HOOK_CARD_UNLINK,
-     PA_CORE_HOOK_CARD_PROFILE_CHANGED,
-+    PA_CORE_HOOK_CARD_PROFILE_CHANGING,
-     PA_CORE_HOOK_CARD_PROFILE_ADDED,
-     PA_CORE_HOOK_CARD_PROFILE_AVAILABLE_CHANGED,
-     PA_CORE_HOOK_PORT_AVAILABLE_CHANGED,
--- 
-1.7.9.5
-

packages/audio/pulseaudio/system.d/pulseaudio.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=PulseAudio Sound System
 After=syslog.target local-fs.target
+Requires=bluetooth.service
 
 [Service]
 Type=forking

packages/audio/sbc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="sbc"
-PKG_VERSION="1.1"
+PKG_VERSION="1.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/sidplay-libs/package.mk

@@ -0,0 +1,41 @@
+################################################################################
+#      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/>.
+################################################################################
+
+PKG_NAME="sidplay-libs"
+PKG_VERSION="2.1.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://sidplay2.sourceforge.net/"
+PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="sidplay-libs"
+PKG_LONGDESC="sidplay-libs"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
+
+pre_configure_target() {
+  # fails to build in subdirs
+  cd $ROOT/$PKG_BUILD
+  rm -rf .$TARGET_NAME
+}

packages/audio/sidplay-libs/patches/sidplay-libs-01-m4-tests.patch

@@ -0,0 +1,26 @@
+--- sidplay-libs-2.1.1/libsidplay/unix/my_macros.m4.orig	2004-06-14 22:08:04.000000000 +0200
++++ sidplay-libs-2.1.1/libsidplay/unix/my_macros.m4	2013-11-18 01:23:32.195297135 +0100
+@@ -80,8 +80,8 @@
+     AC_CACHE_VAL(test_cv_have_ios_binary,
+     [
+         AC_TRY_COMPILE(
+-            [#include <fstream.h>],
+-            [ifstream myTest(ios::in|ios::binary);],
++            [#include <fstream>],
++            [std::ifstream myTest(std::ios::in|std::ios::binary);],
+             [test_cv_have_ios_binary=yes],
+             [test_cv_have_ios_binary=no]
+         )
+@@ -105,9 +105,9 @@
+     AC_CACHE_VAL(test_cv_have_ios_openmode,
+     [
+         AC_TRY_COMPILE(
+-            [#include <fstream.h>
+-             #include <iomanip.h>],
+-            [ios::openmode myTest = ios::in;],
++            [#include <fstream>
++             #include <iomanip>],
++            [std::ios_base::openmode myTest = std::ios::in;],
+             [test_cv_have_ios_openmode=yes],
+             [test_cv_have_ios_openmode=no]
+         )

packages/audio/sidplay-libs/patches/sidplay-libs-02-inherited.patch

@@ -0,0 +1,26 @@
+--- sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h.old	2013-11-18 00:40:16.679173012 +0100
++++ sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h	2013-11-18 00:41:22.451176157 +0100
+@@ -211,16 +211,16 @@
+ 	{
+ 		if ( bufferLen >= 1 )
+ 		{
+-			pBufCurrent = ( bufBegin = buffer );
+-			bufEnd = bufBegin + bufferLen;
+-			bufLen = bufferLen;
+-			status = true;
++			this->pBufCurrent = ( this->bufBegin = buffer );
++			this->bufEnd = this->bufBegin + bufferLen;
++			this->bufLen = bufferLen;
++			this->status = true;
+ 		}
+ 		else
+ 		{
+-			pBufCurrent = bufBegin = bufEnd = 0;
+-			bufLen = 0;
+-			status = false;
++			this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
++			this->bufLen = 0;
++			this->status = false;
+ 		}
+ 	}
+ };

packages/audio/sidplay-libs/patches/sidplay-libs-03-operator.patch

@@ -0,0 +1,11 @@
+--- sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h.orig	2013-11-18 00:58:06.111224154 +0100
++++ sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h	2013-11-18 00:58:28.219225212 +0100
+@@ -33,7 +33,7 @@
+     uint_least16_t length;  // usage scan length
+ 
+     // Copy common parts of basic usage to extended usage.
+-    sid2_usage_t &sid2_usage_t::operator= (const sid_usage_t &usage)
++    sid2_usage_t &operator= (const sid_usage_t &usage)
+     {
+         *((sid_usage_t *) this) = usage;
+         return *this;

packages/audio/sidplay-libs/patches/sidplay-libs-04-includes.patch

@@ -0,0 +1,30 @@
+--- sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp.orig	2004-06-14 22:07:57.000000000 +0200
++++ sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp	2013-11-18 01:01:50.399234880 +0100
+@@ -55,6 +55,7 @@
+ 
+ #include "hardsid.h"
+ #include "hardsid-emu.h"
++#include <string.h>
+ 
+ 
+ #ifdef HAVE_MSWINDOWS
+--- sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp.orig	2013-11-18 01:00:07.827229975 +0100
++++ sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp	2013-11-18 01:00:21.563230632 +0100
+@@ -24,6 +24,7 @@
+ 
+ #include "resid.h"
+ #include "resid-emu.h"
++#include <string.h>
+ 
+ 
+ char ReSID::m_credit[];
+--- sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp.orig	2013-11-18 01:00:39.727231501 +0100
++++ sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp	2013-11-18 01:00:57.415232346 +0100
+@@ -45,6 +45,7 @@
+ 
+ #include "resid.h"
+ #include "resid-emu.h"
++#include <string.h>
+ 
+ // Error String(s)
+ const char *ReSIDBuilder::ERR_FILTER_DEFINITION = "RESID ERROR: Filter definition is not valid (see docs).";

packages/audio/soxr/package.mk

@@ -0,0 +1,54 @@
+################################################################################
+#      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/>.
+################################################################################
+
+PKG_NAME="soxr"
+PKG_VERSION="0.1.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://sourceforge.net/p/soxr/wiki/Home/"
+PKG_URL="$SOURCEFORGE_SRC/soxr/$PKG_NAME-$PKG_VERSION-Source.tar.xz"
+PKG_SOURCE_DIR="$PKG_NAME-$PKG_VERSION-Source"
+PKG_DEPENDS_TARGET="toolchain cmake:host"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="soxr: a library which performs one-dimensional sample-rate conversion."
+PKG_LONGDESC="The SoX Resampler library performs one-dimensional sample-rate conversion. it may be used, for example, to resample PCM-encoded audio."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+# package specific configure options
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DHAVE_WORDS_BIGENDIAN_EXITCODE=1 \
+        -DBUILD_TESTS=0 \
+        -DBUILD_EXAMPLES=1 \
+        -DBUILD_SHARED_LIBS=OFF ..
+}
+
+#post_makeinstall_target() {
+#  rm -rf $INSTALL/usr/bin
+#  # pkgconf hack
+#  $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/taglib-config
+#  $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
+#  $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
+#  $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
+#  $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
+#}

packages/audio/speex/package.mk

@@ -1,47 +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="speex"
-PKG_VERSION="1.2rc1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="BSD"
-PKG_SITE="http://www.speex.org"
-PKG_URL="http://downloads.xiph.org/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libogg"
-PKG_PRIORITY="optional"
-PKG_SECTION="audio"
-PKG_SHORTDESC="speex: A free Audio Codec optimized for speech"
-PKG_LONGDESC="Speex is a patent-free compression format designed especially for speech. It is specialized for voice communications at low bit-rates in the 2-45 kbps range. Possible applications include Voice over IP (VoIP), Internet audio streaming, audio books, and archiving of speech data (e.g. voice mail)."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static \
-                           --with-ogg=$SYSROOT_PREFIX/usr \
-                           --enable-fixed-point \
-                           --disable-oggtest \
-                           --disable-float-api \
-                           --disable-vbr"
-
-post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-}

packages/audio/speex/patches/speex-1.2rc1-001-remove_host_includes.patch

@@ -1,24 +0,0 @@
-diff -Naur speex-1.2rc1/libspeex/Makefile.am speex-1.2rc1.patch/libspeex/Makefile.am
---- speex-1.2rc1/libspeex/Makefile.am	2008-06-04 09:31:35.000000000 +0200
-+++ speex-1.2rc1.patch/libspeex/Makefile.am	2009-03-10 20:40:51.000000000 +0100
-@@ -4,7 +4,7 @@
- 
- EXTRA_DIST=echo_diagnostic.m
- 
--INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
-+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
- 
- lib_LTLIBRARIES = libspeex.la libspeexdsp.la
- 
-diff -Naur speex-1.2rc1/libspeex/Makefile.in speex-1.2rc1.patch/libspeex/Makefile.in
---- speex-1.2rc1/libspeex/Makefile.in	2008-07-21 04:17:19.000000000 +0200
-+++ speex-1.2rc1.patch/libspeex/Makefile.in	2009-03-10 20:41:25.000000000 +0100
-@@ -277,7 +277,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- EXTRA_DIST = echo_diagnostic.m
--INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
-+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
- lib_LTLIBRARIES = libspeex.la libspeexdsp.la
- 
- # Sources for compilation in the library

packages/audio/speex/patches/speex-1.2rc1-010_disable-utils.patch

@@ -1,12 +0,0 @@
-diff -Naur speex-1.2rc1/Makefile.in speex-1.2rc1a/Makefile.in
---- speex-1.2rc1/Makefile.in	2008-07-21 04:17:19.000000000 +0200
-+++ speex-1.2rc1a/Makefile.in	2010-05-18 14:31:25.229200674 +0200
-@@ -213,7 +213,7 @@
- EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
- 
- #Fools KDevelop into including all files
--SUBDIRS = libspeex include @src@ doc win32 symbian ti
-+SUBDIRS = libspeex include doc win32 symbian ti
- DIST_SUBDIRS = libspeex include src doc win32 symbian ti
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

packages/audio/speex/patches/speex-automake-1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur speex-1.2rc1/configure.ac speex-1.2rc1.patch/configure.ac
---- speex-1.2rc1/configure.ac	2008-07-21 04:17:08.000000000 +0200
-+++ speex-1.2rc1.patch/configure.ac	2013-02-01 16:50:06.747570221 +0100
-@@ -2,7 +2,7 @@
- 
- AC_INIT(libspeex/speex.c)
- 
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- 
- SPEEX_MAJOR_VERSION=1
- SPEEX_MINOR_VERSION=1

packages/compress/cpio/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="cpio"
-PKG_VERSION="2.11"
+PKG_VERSION="2.12"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/compress/cpio/patches/cpio-2.11-fgets.patch

@@ -1,14 +0,0 @@
-diff --git a/gnu/stdio.in.h b/gnu/stdio.in.h
-index 88b368b..44f1087 100644
---- a/gnu/stdio.in.h
-+++ b/gnu/stdio.in.h
-@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

packages/compress/unzip/package.mk

@@ -38,8 +38,7 @@ make_target() {
       RANLIB=$TARGET_RANLIB \
       AR=$TARGET_AR \
       STRIP=$TARGET_STRIP \
-      CFLAGS="$CFLAGS" \
-      -f unix/Makefile generic
+      -f unix/Makefile generic LOCAL_UNZIP="$CFLAGS"
 }
 
 makeinstall_target() {

packages/compress/xz/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xz"
-PKG_VERSION="5.2.0"
+PKG_VERSION="5.2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/compress/zlib/package.mk

@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.zlib.net"
-PKG_URL="http://www.zlib.net/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_MIRROR/zlib/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_HOST=""
 PKG_PRIORITY="optional"

packages/databases/sqlite/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3080801"
+PKG_VERSION="autoconf-3090000"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"
-PKG_SITE="http://www.sqlite.org/"
-PKG_URL="http://sqlite.org/2015/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_SITE="https://www.sqlite.org/"
+PKG_URL="https://www.sqlite.org/2015/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="database"
@@ -63,6 +63,10 @@ PKG_AUTORECONF="yes"
 # mmap_size pragma.
   CFLAGS="$CFLAGS -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=268435456"
 
+pre_make_target() {
+  # dont build parallel
+  MAKEFLAGS=-j1
+}
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared \
@@ -70,7 +74,3 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --enable-threadsafe \
                            --enable-dynamic-extensions \
                            --with-gnu-ld"
-
-post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-}

packages/debug/gdb/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gdb"
-PKG_VERSION="7.8.2"
+PKG_VERSION="7.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/debug/vdpauinfo/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdpauinfo"
-PKG_VERSION="0.9"
+PKG_VERSION="1.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/arm-mem/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="arm-mem"
-PKG_VERSION="2e6f275"
+PKG_VERSION="4418bb4"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
@@ -33,7 +33,17 @@ PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from s
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_MAKE_OPTS_TARGET="libarmmem.so"
+if [  "$TARGET_CPU" = "arm1176jzf-s" ]; then
+  ARMMEM_SO=libarmmem.so
+elif [  "$TARGET_CPU" = "cortex-a7" ]; then
+  ARMMEM_SO=libarmmem-a7.so
+fi
+
+PKG_MAKE_OPTS_TARGET="$ARMMEM_SO"
+
+pre_make_target() {
+  export CROSS_COMPILE=$TARGET_PREFIX
+}
 
 make_init() {
   : # reuse make_target()
@@ -41,17 +51,17 @@ make_init() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/lib
-    cp -P libarmmem.so $INSTALL/lib
+    cp -P $ARMMEM_SO $INSTALL/lib
 
   mkdir -p $INSTALL/etc
-    echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
+    echo "/lib/$ARMMEM_SO" >> $INSTALL/etc/ld.so.preload
 }
 
 makeinstall_init() {
   mkdir -p $INSTALL/lib
-    cp -P libarmmem.so $INSTALL/lib
+    cp -P $ARMMEM_SO $INSTALL/lib
 
   mkdir -p $INSTALL/etc
-    echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
+    echo "/lib/$ARMMEM_SO" >> $INSTALL/etc/ld.so.preload
 }
 

packages/devel/autoconf-archive/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="autoconf-archive"
-PKG_VERSION="2013.11.01"
+PKG_VERSION="2015.02.24"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://ftp.gnu.org/gnu/autoconf-archive"
-PKG_URL="http://ftp.gnu.org/gnu/autoconf-archive/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.gnu.org/gnu/autoconf-archive/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"

packages/devel/binutils/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="binutils"
-PKG_VERSION="2.24"
+PKG_VERSION="2.25.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"