Merge branch 'master' of git+ssh://openadk.org/git/openadk

15 files changed, 1406 insertions, 27 deletions

diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index c4e29033c..39cb0b7e7 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-lib
 PKG_VERSION:=		1.0.29
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_HASH:=		73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0
 PKG_DESCR:=		sound library
 PKG_SECTION:=		libs/audio
diff --git a/package/alsa-lib/files/imx-sgtl5000.conf b/package/alsa-lib/files/imx-sgtl5000.conf
new file mode 100644
index 000000000..40d220430
--- /dev/null
+++ b/package/alsa-lib/files/imx-sgtl5000.conf
@@ -0,0 +1,15 @@
+#
+# Configuration for iMX6 sgtl5000 analog output - /usr/share/alsa/cards/imx-sgtl5000.conf
+#
+
+<confdir:pcm/front.conf>
+
+imx-sgtl5000.pcm.front.0 {
+  @args [ CARD ]
+  @args.CARD {
+    type string
+  }
+  type hw
+  card $CARD
+  device 0
+}
diff --git a/package/alsa-lib/files/imx-vt1613-audio.conf b/package/alsa-lib/files/imx-vt1613-audio.conf
new file mode 100644
index 000000000..5f69734d8
--- /dev/null
+++ b/package/alsa-lib/files/imx-vt1613-audio.conf
@@ -0,0 +1,15 @@
+#
+# Configuration for iMX6 VT1613 analog output - /usr/share/alsa/cards/imx-vt1613-audio.conf
+#
+
+<confdir:pcm/front.conf>
+
+imx-vt1613-audio.pcm.front.0 {
+  @args [ CARD ]
+  @args.CARD {
+    type string
+  }
+  type hw
+  card $CARD
+  device 0
+}
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 8b1d8b2c6..c8013b943 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.23.2
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_HASH:=		05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a
 PKG_DESCR:=		core utilities for embedded systems
 PKG_SECTION:=		base/apps
diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index 75996525a..029998a98 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -8,4 +8,5 @@ add_rcconf syslogd NO
 add_rcconf syslogd_flags '-C32'
 add_rcconf inetd NO
 add_rcconf ntpd NO
+add_rcconf ntpdate NO
 add_rcconf ntpd_flags '-p time.fu-berlin.de'
diff --git a/package/busybox/files/ntpdate.init b/package/busybox/files/ntpdate.init
new file mode 100644
index 000000000..d812c6b47
--- /dev/null
+++ b/package/busybox/files/ntpdate.init
@@ -0,0 +1,20 @@
+#!/bin/sh
+#PKG busybox
+#INIT 55
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${ntpdate:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	/usr/sbin/ntpd -n -q $ntpd_flags
+	;;
+*)
+	echo "Usage: $0 {start}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index b244dd458..aba8f4dd7 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -7,7 +7,7 @@ include ${ADK_TOPDIR}/toolchain/gdb/Makefile.inc
 PKG_NAME:=		gdb
 PKG_DESCR:=		programm debugger
 PKG_SECTION:=		app/debug
-PKG_DEPENDS:=		libthread-db libncurses libexpat zlib
+PKG_DEPENDS:=		libncurses zlib
 PKG_BUILDDEP:=		ncurses readline expat zlib
 PKG_NOPARALLEL:=	1
 
diff --git a/package/iproute2/patches/patch-tc_tc_stab_c b/package/iproute2/patches/patch-tc_tc_stab_c
deleted file mode 100644
index cbbcf5976..000000000
--- a/package/iproute2/patches/patch-tc_tc_stab_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- iproute2-4.1.0.orig/tc/tc_stab.c	2015-06-26 21:28:25.000000000 +0200
-+++ iproute2-4.1.0/tc/tc_stab.c	2015-06-29 08:45:24.000000000 +0200
-@@ -16,6 +16,7 @@
- #include <syslog.h>
- #include <fcntl.h>
- #include <math.h>
-+#include <sys/param.h>
- #include <sys/socket.h>
- #include <sys/param.h>
- #include <netinet/in.h>
diff --git a/package/iproute2/patches/patch-tc_tc_util_c b/package/iproute2/patches/patch-tc_tc_util_c
deleted file mode 100644
index 014c2f17d..000000000
--- a/package/iproute2/patches/patch-tc_tc_util_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- iproute2-4.1.0.orig/tc/tc_util.c	2015-06-26 21:28:25.000000000 +0200
-+++ iproute2-4.1.0/tc/tc_util.c	2015-06-29 08:45:24.000000000 +0200
-@@ -15,6 +15,7 @@
- #include <unistd.h>
- #include <syslog.h>
- #include <fcntl.h>
-+#include <sys/param.h>
- #include <sys/socket.h>
- #include <sys/param.h>
- #include <netinet/in.h>
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 0a1570d69..ffb5ad811 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -10,7 +10,7 @@ PKG_HASH:=		52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0
 PKG_DESCR:=		netfilter firewalling software
 PKG_SECTION:=		net/firewall
 PKG_DEPENDS:=		libnetfilter_conntrack libmnl libnfnetlink
-PKG_BUILDDEP:=		libnetfilter_conntrack
+PKG_BUILDDEP:=		libnetfilter_conntrack pkgconf-host
 PKG_URL:=		http://www.netfilter.org/
 PKG_SITES:=		http://www.netfilter.org/projects/iptables/files/
 PKG_OPTS:=		dev
diff --git a/package/jupp/Makefile b/package/jupp/Makefile
new file mode 100644
index 000000000..b4c0961a4
--- /dev/null
+++ b/package/jupp/Makefile
@@ -0,0 +1,66 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${ADK_TOPDIR}/rules.mk
+
+PKG_NAME:=		jupp
+PKG_VERSION:=		28
+PKG_RELEASE:=		1
+PKG_HASH:=		be4d16cb44f002a3f6f5069471096c53d9c184b7366ef1a055422d2f0006851f
+PKG_DESCR:=		wordstar-inspired text editor
+PKG_SECTION:=		app/editor
+PKG_URL:=		https://www.mirbsd.org/jupp.htm
+PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/jupp/}
+DISTFILES:=		joe-3.1jupp${PKG_VERSION}.tgz
+
+WRKDIST=		${WRKDIR}/jupp
+
+PKG_FLAVOURS_JUPP:=	CURSES EXTRAS JOE
+PKGFD_CURSES:=		use ncurses for terminal control
+PKGFS_CURSES:=		libncurses
+PKGFB_CURSES:=		ncurses
+PKGFD_EXTRAS:=		add syntax highlighting, charmaps
+PKGFD_JOE:=		add jmacs, joe, jpico, jstar, rjoe
+
+include ${ADK_TOPDIR}/mk/package.mk
+$(eval $(call PKG_template,JUPP,jupp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+XAKE_FLAGS+=		sysconfjoesubdir=/jupp
+
+ifeq (${ADK_PACKAGE_JUPP_CURSES},y)
+# disable SELinux still
+CONFIGURE_ENV+=		ac_cv_search_is_selinux_enabled=no
+else
+# disable curses/termcap support, SELinux support
+CONFIGURE_ARGS+=	--disable-curses --disable-termcap --disable-search-libs
+endif
+
+# necessary workaround for GNU libc
+ifeq (${ADK_TARGET_LIB_GLIBC},y)
+CONFIGURE_ARGS+=	--disable-getpwnam
+endif
+
+# unneeded
+CONFIGURE_ARGS+=	--disable-termidx
+
+jupp-install:
+	${INSTALL_DIR} ${IDIR_JUPP}/usr/bin
+	${CP} ${WRKINST}/usr/bin/joe ${IDIR_JUPP}/usr/bin/jupp
+ifneq (${ADK_PACKAGE_JUPP_EXTRAS}${ADK_PACKAGE_JUPP_JOE},)
+	${INSTALL_DIR} ${IDIR_JUPP}/etc/jupp
+endif
+ifeq (${ADK_PACKAGE_JUPP_EXTRAS},y)
+	${CP} ${WRKINST}/etc/jupp/jupprc ${IDIR_JUPP}/etc/jupp/
+	${INSTALL_DIR} ${IDIR_JUPP}/etc/jupp/charmaps
+	${INSTALL_DIR} ${IDIR_JUPP}/etc/jupp/syntax
+	${CP} ${WRKINST}/etc/jupp/charmaps/* ${IDIR_JUPP}/etc/jupp/charmaps/
+	${CP} ${WRKINST}/etc/jupp/syntax/* ${IDIR_JUPP}/etc/jupp/syntax/
+endif
+ifeq (${ADK_PACKAGE_JUPP_JOE},y)
+	for x in jmacs joe jpico jstar rjoe; do \
+		ln -s jupp ${IDIR_JUPP}/usr/bin/$$x; \
+		${CP} ${WRKINST}/etc/jupp/$${x}rc ${IDIR_JUPP}/etc/jupp/; \
+	done
+endif
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 0b7dfe9aa..fd971e0c2 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kodi
 PKG_VERSION:=		15.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		27dba173cfe74b323f4dbaa72ae2bfe5961f76c27bddcd5210253be91cae0dff
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
diff --git a/package/kodi/patches/openelec.patch b/package/kodi/patches/openelec.patch
new file mode 100644
index 000000000..4136559ba
--- /dev/null
+++ b/package/kodi/patches/openelec.patch
@@ -0,0 +1,1279 @@
+diff -Nur xbmc-15.0-Isengard.orig/addons/resource.language.en_gb/resources/strings.po xbmc-15.0-Isengard/addons/resource.language.en_gb/resources/strings.po
+--- xbmc-15.0-Isengard.orig/addons/resource.language.en_gb/resources/strings.po	2015-07-21 13:41:29.000000000 -0500
++++ xbmc-15.0-Isengard/addons/resource.language.en_gb/resources/strings.po	2015-07-25 08:01:50.578340000 -0500
+@@ -16642,3 +16642,28 @@
+ msgctxt "#38016"
+ msgid "%d fps"
+ msgstr ""
++
++#: system/peripherals.xml
++msgctxt "#38050"
++msgid "Remote button press delay before repeating (ms)"
++msgstr ""
++
++#: system/peripherals.xml
++msgctxt "#38051"
++msgid "Remote button press repeat rate (ms)"
++msgstr ""
++
++#: system/peripherals.xml
++msgctxt "#38052"
++msgid "Remote button press release time (ms)"
++msgstr ""
++
++#: system/settings/rbp.xml system/settings/imx6.xml
++msgctxt "#38120"
++msgid "Support 8 channel DTS-HD audio decoding"
++msgstr ""
++
++#: system/settings/rbp.xml system/settings/imx6.xml
++msgctxt "#38121"
++msgid "Enables decoding of high quality DTS-HD audio streams. Note: This increases CPU load and is only available when DTS and DTS-HD audio passthrough are disabled."
++msgstr ""
+diff -Nur xbmc-15.0-Isengard.orig/docs/README.linux xbmc-15.0-Isengard/docs/README.linux
+--- xbmc-15.0-Isengard.orig/docs/README.linux	2015-07-21 13:41:29.000000000 -0500
++++ xbmc-15.0-Isengard/docs/README.linux	2015-07-25 08:01:50.586339999 -0500
+@@ -44,7 +44,7 @@
+ external libraries enabled).
+ 
+ Build-Depends: autoconf, automake, autopoint, autotools-dev, cmake, curl,
+-  debhelper (>= 7.0.50~), default-jre, gawk, gperf, libao-dev, libasound2-dev,
++  dcadec-dev, default-jre, gawk, gperf, libao-dev, libasound2-dev,
+   libass-dev (>= 0.9.8), libavahi-client-dev, libavahi-common-dev, libbluetooth-dev,
+   libbluray-dev, libboost-dev, libboost-thread-dev, libbz2-dev, libcap-dev, libcdio-dev,
+   libcec-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, libcwiid-dev,
+diff -Nur xbmc-15.0-Isengard.orig/docs/README.ubuntu xbmc-15.0-Isengard/docs/README.ubuntu
+--- xbmc-15.0-Isengard.orig/docs/README.ubuntu	2015-07-21 13:41:29.000000000 -0500
++++ xbmc-15.0-Isengard/docs/README.ubuntu	2015-07-25 08:01:50.586339999 -0500
+@@ -82,7 +82,7 @@
+ 
+ For Ubuntu (all versions >= 7.04):
+ 
+-    $ sudo apt-get install automake bison build-essential cmake curl cvs default-jre fp-compiler gawk gdc gettext git-core gperf libasound2-dev libass-dev libboost-dev libboost-thread-dev libbz2-dev libcap-dev libcdio-dev libcurl3 libcurl4-gnutls-dev libdbus-1-dev libfontconfig-dev libfreetype6-dev libfribidi-dev libgif-dev libglew-dev libiso9660-dev libjasper-dev libjpeg-dev liblzo2-dev libmicrohttpd-dev libmodplug-dev libmpeg2-4-dev libmpeg3-dev libmysqlclient-dev libnfs-dev libogg-dev libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl2-dev libsmbclient-dev libsqlite3-dev libssh-dev libssl-dev libtiff-dev libtinyxml-dev libtool libudev-dev libusb-dev libva-dev libvdpau-dev libvorbis-dev libvorbisenc2 libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxslt1-dev libxt-dev libyajl-dev mesa-utils nasm pmount python-dev python-imaging python-sqlite swig unzip yasm zip zlib1g-dev
++    $ sudo apt-get install automake bison build-essential cmake curl cvs dcadec-dev default-jre fp-compiler gawk gdc gettext git-core gperf libasound2-dev libass-dev libboost-dev libboost-thread-dev libbz2-dev libcap-dev libcdio-dev libcurl3 libcurl4-gnutls-dev libdbus-1-dev libfontconfig-dev libfreetype6-dev libfribidi-dev libgif-dev libglew-dev libiso9660-dev libjasper-dev libjpeg-dev liblzo2-dev libmicrohttpd-dev libmodplug-dev libmpeg2-4-dev libmpeg3-dev libmysqlclient-dev libnfs-dev libogg-dev libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl2-dev libsmbclient-dev libsqlite3-dev libssh-dev libssl-dev libtiff-dev libtinyxml-dev libtool libudev-dev libusb-dev libva-dev libvdpau-dev libvorbis-dev libvorbisenc2 libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxslt1-dev libxt-dev libyajl-dev mesa-utils nasm pmount python-dev python-imaging python-sqlite swig unzip yasm zip zlib1g-dev
+ 
+ For >= 10.10:
+     $ sudo apt-get install autopoint libltdl-dev
+diff -Nur xbmc-15.0-Isengard.orig/Makefile.in xbmc-15.0-Isengard/Makefile.in
+--- xbmc-15.0-Isengard.orig/Makefile.in	2015-07-21 13:41:29.000000000 -0500
++++ xbmc-15.0-Isengard/Makefile.in	2015-07-25 08:01:50.566340001 -0500
+@@ -445,7 +445,7 @@
+              @FFMPEG_LIBDIR@/libpostproc.a \
+              @FFMPEG_LIBDIR@/libswscale.a
+ DYNOBJSXBMC+= $(FFMPEGOBJS)
+-LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
++LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @DCADEC_ALL_LIBS@
+ 
+ $(FFMPEGOBJS): dvdpcodecs
+ endif
+diff -Nur xbmc-15.0-Isengard.orig/system/keyboardlayouts/english.xml xbmc-15.0-Isengard/system/keyboardlayouts/english.xml
+--- xbmc-15.0-Isengard.orig/system/keyboardlayouts/english.xml	2015-07-21 13:41:29.000000000 -0500
++++ xbmc-15.0-Isengard/system/keyboardlayouts/english.xml	2015-07-25 08:01:50.526340002 -0500
+@@ -8,14 +8,14 @@
+     <keyboard>
+       <row>1234567890</row>
+       <row>qwertyuiop</row>
+-      <row>asdfghjkl</row>
+-      <row>zxcvbnm</row>
++      <row>asdfghjkl:</row>
++      <row>zxcvbnm./@</row>
+     </keyboard>
+     <keyboard modifiers="shift">
+       <row>1234567890</row>
+       <row>QWERTYUIOP</row>
+-      <row>ASDFGHJKL</row>
+-      <row>ZXCVBNM</row>
++      <row>ASDFGHJKL:</row>
++      <row>ZXCVBNM./@</row>
+     </keyboard>
+     <keyboard modifiers="symbol,shift+symbol">
+       <row>)!@#$%^&amp;*(</row>
+diff -Nur xbmc-15.0-Isengard.orig/system/peripherals.xml xbmc-15.0-Isengard/system/peripherals.xml
+--- xbmc-15.0-Isengard.orig/system/peripherals.xml	2015-07-21 13:41:29.000000000 -0500
++++ xbmc-15.0-Isengard/system/peripherals.xml	2015-07-25 08:01:50.534339999 -0500
+@@ -30,7 +30,9 @@
+     <setting key="device_type" type="int" value="1" configurable="0" />
+     <setting key="wake_devices_advanced" type="string" value="" configurable="0" />
+     <setting key="standby_devices_advanced" type="string" value="" configurable="0" />
+-    <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" />
++    <setting key="double_tap_timeout_ms" type="int" min="50" max="1000" step="50" value="300" label="38050" order="16" />
++    <setting key="button_repeat_rate_ms" type="int" min="0" max="250" step="10" value="0" label="38051" order="17" />
++    <setting key="button_release_delay_ms" type="int" min="0" max="500" step="50" value="0" label="38052" order="18" />
+   </peripheral>
+ 
+   <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
+diff -Nur xbmc-15.0-Isengard.orig/system/settings/imx6.xml xbmc-15.0-Isengard/system/settings/imx6.xml
+--- xbmc-15.0-Isengard.orig/system/settings/imx6.xml	2015-07-21 13:41:29.000000000 -0500
++++ xbmc-15.0-Isengard/system/settings/imx6.xml	2015-07-25 08:01:50.578340000 -0500
+@@ -13,6 +13,26 @@
+         </setting>
+       </group>
+     </category>
++    <category id="audiooutput">
++      <group id="1">
++        <setting id="audiooutput.supportdtshdcpudecoding" type="boolean" label="38120" help="38121">
++          <level>2</level>
++          <default>false</default>
++          <control type="toggle" />
++          <dependencies>
++            <dependency type="enable">
++            <or>
++              <condition setting="audiooutput.passthrough" operator="is">false</condition>
++              <and>
++                <condition setting="audiooutput.dtshdpassthrough" operator="is">false</condition>
++                <condition setting="audiooutput.dtspassthrough" operator="is">false</condition>
++              </and>
++            </or>
++            </dependency>
++          </dependencies>
++        </setting>
++      </group>
++    </category>
+   </section>
+   <section id="videos">
+     <category id="videoacceleration">
+diff -Nur xbmc-15.0-Isengard.orig/system/settings/rbp2.xml xbmc-15.0-Isengard/system/settings/rbp2.xml
+--- xbmc-15.0-Isengard.orig/system/settings/rbp2.xml	2015-07-21 13:41:29.000000000 -0500
++++ xbmc-15.0-Isengard/system/settings/rbp2.xml	2015-07-25 08:01:50.578340000 -0500
+@@ -19,6 +19,11 @@
+       </group>
+     </category>
+     <category id="audiooutput">
++      <group id="1">
++        <setting id="audiooutput.supportdtshdcpudecoding">
++          <default>true</default>
++        </setting>
++      </group>
+       <group id="3">
+         <setting id="audiooutput.ac3transcode" help="36429">
+         </setting>
+diff -Nur xbmc-15.0-Isengard.orig/system/settings/rbp.xml xbmc-15.0-Isengard/system/settings/rbp.xml
+--- xbmc-15.0-Isengard.orig/system/settings/rbp.xml	2015-07-21 13:41:29.000000000 -0500
++++ xbmc-15.0-Isengard/system/settings/rbp.xml	2015-07-25 08:01:50.578340000 -0500
+@@ -76,6 +76,11 @@
+         <setting id="audiooutput.processquality">
+           <default>101</default> <!-- AE_QUALITY_GPU -->
+         </setting>
++        <setting id="audiooutput.supportdtshdcpudecoding" type="boolean" label="38120" help="38121">
++          <level>2</level>
++          <default>false</default>
++          <control type="toggle" />
++        </setting>
+       </group>
+       <group id="3">
+         <setting id="audiooutput.ac3transcode" help="37024">
+diff -Nur xbmc-15.0-Isengard.orig/tools/depends/target/ffmpeg/0001-avcodec-add-libdcadec-decoder.patch xbmc-15.0-Isengard/tools/depends/target/ffmpeg/0001-avcodec-add-libdcadec-decoder.patch
+--- xbmc-15.0-Isengard.orig/tools/depends/target/ffmpeg/0001-avcodec-add-libdcadec-decoder.patch	1969-12-31 18:00:00.000000000 -0600
++++ xbmc-15.0-Isengard/tools/depends/target/ffmpeg/0001-avcodec-add-libdcadec-decoder.patch	2015-07-25 08:01:50.570340002 -0500
+@@ -0,0 +1,280 @@
++From 519868de7d9c99876efcaf57d6a9683c22732cde Mon Sep 17 00:00:00 2001
++From: Hendrik Leppkes <h.leppkes@gmail.com>
++Date: Thu, 19 Mar 2015 23:56:22 +0100
++Subject: [PATCH] avcodec: add libdcadec decoder
++
++Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
++---
++ configure              |   4 +
++ libavcodec/Makefile    |   1 +
++ libavcodec/allcodecs.c |   1 +
++ libavcodec/libdcadec.c | 197 +++++++++++++++++++++++++++++++++++++++++++++++++
++ 4 files changed, 203 insertions(+)
++ create mode 100644 libavcodec/libdcadec.c
++
++diff --git a/configure b/configure
++index 1bf8f80..a449bc7 100755
++--- a/configure
+++++ b/configure
++@@ -210,6 +210,7 @@ External library support:
++   --enable-libcdio         enable audio CD grabbing with libcdio [no]
++   --enable-libdc1394       enable IIDC-1394 grabbing using libdc1394
++                            and libraw1394 [no]
+++  --enable-libdcadec       enable DCA decoding via libdcadec [no]
++   --enable-libfaac         enable AAC encoding via libfaac [no]
++   --enable-libfdk-aac      enable AAC de/encoding via libfdk-aac [no]
++   --enable-libflite        enable flite (voice synthesis) support via libflite [no]
++@@ -1353,6 +1354,7 @@ EXTERNAL_LIBRARY_LIST="
++     libcdio
++     libcelt
++     libdc1394
+++    libdcadec
++     libfaac
++     libfdk_aac
++     libflite
++@@ -2359,6 +2361,7 @@ vc1_parser_select="mpegvideo startcode vc1_decoder"
++ # external libraries
++ libaacplus_encoder_deps="libaacplus"
++ libcelt_decoder_deps="libcelt"
+++libdcadec_decoder_deps="libdcadec"
++ libfaac_encoder_deps="libfaac"
++ libfaac_encoder_select="audio_frame_queue"
++ libfdk_aac_decoder_deps="libfdk_aac"
++@@ -4922,6 +4925,7 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
++                              { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
++                                die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
++ enabled libcaca           && require_pkg_config caca caca.h caca_create_canvas
+++enabled libdcadec         && require libdcadec dca_context.h dcadec_context_create -ldcadec
++ enabled libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
++ enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
++ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
++diff --git a/libavcodec/Makefile b/libavcodec/Makefile
++index 4173f88..1a0c734 100644
++--- a/libavcodec/Makefile
+++++ b/libavcodec/Makefile
++@@ -732,6 +732,7 @@ OBJS-$(CONFIG_ELBG_FILTER)             += elbg.o
++ # external codec libraries
++ OBJS-$(CONFIG_LIBAACPLUS_ENCODER)         += libaacplus.o
++ OBJS-$(CONFIG_LIBCELT_DECODER)            += libcelt_dec.o
+++OBJS-$(CONFIG_LIBDCADEC_DECODER)          += libdcadec.o
++ OBJS-$(CONFIG_LIBFAAC_ENCODER)            += libfaac.o
++ OBJS-$(CONFIG_LIBFDK_AAC_DECODER)         += libfdk-aacdec.o
++ OBJS-$(CONFIG_LIBFDK_AAC_ENCODER)         += libfdk-aacenc.o
++diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
++index 5194e74..bbf70a6 100644
++--- a/libavcodec/allcodecs.c
+++++ b/libavcodec/allcodecs.c
++@@ -512,6 +512,7 @@ void avcodec_register_all(void)
++ 
++     /* external libraries */
++     REGISTER_DECODER(LIBCELT,           libcelt);
+++    REGISTER_DECODER(LIBDCADEC,         libdcadec)
++     REGISTER_ENCODER(LIBFAAC,           libfaac);
++     REGISTER_ENCDEC (LIBFDK_AAC,        libfdk_aac);
++     REGISTER_ENCDEC (LIBGSM,            libgsm);
++diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c
++new file mode 100644
++index 0000000..d060db5
++--- /dev/null
+++++ b/libavcodec/libdcadec.c
++@@ -0,0 +1,197 @@
+++/*
+++ * libdcadec decoder wrapper
+++ * Copyright (C) 2015 Hendrik Leppkes
+++ *
+++ * This file is part of FFmpeg.
+++ *
+++ * FFmpeg 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.1 of the License, or (at your option) any later version.
+++ *
+++ * FFmpeg 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
+++ * Lesser General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU Lesser General Public
+++ * License along with FFmpeg; if not, write to the Free Software
+++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+++ */
+++
+++#include <dca_context.h>
+++
+++#include "libavutil/avassert.h"
+++#include "libavutil/channel_layout.h"
+++#include "libavutil/common.h"
+++#include "libavutil/opt.h"
+++#include "avcodec.h"
+++#include "dca.h"
+++#include "dca_syncwords.h"
+++#include "internal.h"
+++
+++typedef struct DCADecContext {
+++    struct dcadec_context *ctx;
+++    uint8_t *buffer;
+++    int buffer_size;
+++} DCADecContext;
+++
+++static int dcadec_decode_frame(AVCodecContext *avctx, void *data,
+++                               int *got_frame_ptr, AVPacket *avpkt)
+++{
+++    DCADecContext *s = avctx->priv_data;
+++    AVFrame *frame = data;
+++    int ret, i, k;
+++    int **samples, nsamples, channel_mask, sample_rate, bits_per_sample, profile;
+++    uint32_t mrk;
+++    uint8_t *input = avpkt->data;
+++    int input_size = avpkt->size;
+++
+++    /* convert bytestream syntax to RAW BE format if required */
+++    mrk = AV_RB32(input);
+++    if (mrk != DCA_SYNCWORD_CORE_BE && mrk != DCA_SYNCWORD_SUBSTREAM) {
+++        s->buffer = av_fast_realloc(s->buffer, &s->buffer_size, avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
+++        if (!s->buffer)
+++            return AVERROR(ENOMEM);
+++
+++        if ((ret = avpriv_dca_convert_bitstream(avpkt->data, avpkt->size, s->buffer, s->buffer_size)) < 0)
+++            return ret;
+++
+++        input      = s->buffer;
+++        input_size = ret;
+++    }
+++
+++    if ((ret = dcadec_context_parse(s->ctx, input, input_size)) < 0) {
+++        av_log(avctx, AV_LOG_ERROR, "dcadec_context_parse() failed: %d (%s)\n", -ret, dcadec_strerror(ret));
+++        return AVERROR_EXTERNAL;
+++    }
+++    if ((ret = dcadec_context_filter(s->ctx, &samples, &nsamples, &channel_mask,
+++                                     &sample_rate, &bits_per_sample, &profile)) < 0) {
+++        av_log(avctx, AV_LOG_ERROR, "dcadec_context_filter() failed: %d (%s)\n", -ret, dcadec_strerror(ret));
+++        return AVERROR_EXTERNAL;
+++    }
+++
+++    avctx->channels       = av_get_channel_layout_nb_channels(channel_mask);
+++    avctx->channel_layout = channel_mask;
+++    avctx->sample_rate    = sample_rate;
+++
+++    av_assert0(bits_per_sample >= 16 && bits_per_sample <= 24);
+++    if (bits_per_sample == 16)
+++        avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
+++    else
+++        avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
+++
+++    avctx->bits_per_raw_sample = bits_per_sample;
+++
+++    switch (profile) {
+++    case DCADEC_PROFILE_DS:
+++        avctx->profile = FF_PROFILE_DTS;
+++        break;
+++    case DCADEC_PROFILE_DS_96_24:
+++        avctx->profile = FF_PROFILE_DTS_96_24;
+++        break;
+++    case DCADEC_PROFILE_DS_ES:
+++        avctx->profile = FF_PROFILE_DTS_ES;
+++        break;
+++    case DCADEC_PROFILE_HD_HRA:
+++        avctx->profile = FF_PROFILE_DTS_HD_HRA;
+++        break;
+++    case DCADEC_PROFILE_HD_MA:
+++        avctx->profile = FF_PROFILE_DTS_HD_MA;
+++        break;
+++    case DCADEC_PROFILE_EXPRESS:
+++        avctx->profile = FF_PROFILE_DTS_EXPRESS;
+++        break;
+++    case DCADEC_PROFILE_UNKNOWN:
+++    default:
+++        avctx->profile = FF_PROFILE_UNKNOWN;
+++        break;
+++    }
+++
+++    /* bitrate is only meaningful if there are no HD extensions, as they distort the bitrate */
+++    if (profile == DCADEC_PROFILE_DS || profile == DCADEC_PROFILE_DS_96_24 || profile == DCADEC_PROFILE_DS_ES) {
+++        struct dcadec_core_info *info = dcadec_context_get_core_info(s->ctx);
+++        avctx->bit_rate = info->bit_rate;
+++        dcadec_context_free_core_info(info);
+++    } else
+++        avctx->bit_rate = 0;
+++
+++    frame->nb_samples = nsamples;
+++    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+++        return ret;
+++
+++    for (i = 0; i < avctx->channels; i++) {
+++        if (frame->format == AV_SAMPLE_FMT_S16P) {
+++            int16_t *plane = (int16_t *)frame->extended_data[i];
+++            for (k = 0; k < nsamples; k++)
+++                plane[k] = samples[i][k];
+++        } else {
+++            int32_t *plane = (int32_t *)frame->extended_data[i];
+++            int shift = 32 - bits_per_sample;
+++            for (k = 0; k < nsamples; k++)
+++                plane[k] = samples[i][k] << shift;
+++        }
+++    }
+++
+++    *got_frame_ptr = 1;
+++
+++    return avpkt->size;
+++}
+++
+++static av_cold void dcadec_flush(AVCodecContext *avctx)
+++{
+++    DCADecContext *s = avctx->priv_data;
+++    dcadec_context_clear(s->ctx);
+++}
+++
+++static av_cold int dcadec_close(AVCodecContext *avctx)
+++{
+++    DCADecContext *s = avctx->priv_data;
+++
+++    dcadec_context_destroy(s->ctx);
+++    s->ctx = NULL;
+++
+++    av_freep(&s->buffer);
+++
+++    return 0;
+++}
+++
+++static av_cold int dcadec_init(AVCodecContext *avctx)
+++{
+++    DCADecContext *s = avctx->priv_data;
+++
+++    s->ctx = dcadec_context_create(0);
+++    if (!s->ctx)
+++        return AVERROR(ENOMEM);
+++
+++    avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
+++    avctx->bits_per_raw_sample = 24;
+++
+++    return 0;
+++}
+++
+++static const AVProfile profiles[] = {
+++    { FF_PROFILE_DTS,         "DTS"         },
+++    { FF_PROFILE_DTS_ES,      "DTS-ES"      },
+++    { FF_PROFILE_DTS_96_24,   "DTS 96/24"   },
+++    { FF_PROFILE_DTS_HD_HRA,  "DTS-HD HRA"  },
+++    { FF_PROFILE_DTS_HD_MA,   "DTS-HD MA"   },
+++    { FF_PROFILE_DTS_EXPRESS, "DTS Express" },
+++    { FF_PROFILE_UNKNOWN },
+++};
+++
+++AVCodec ff_libdcadec_decoder = {
+++    .name           = "libdcadec",
+++    .long_name      = NULL_IF_CONFIG_SMALL("dcadec DCA decoder"),
+++    .type           = AVMEDIA_TYPE_AUDIO,
+++    .id             = AV_CODEC_ID_DTS,
+++    .priv_data_size = sizeof(DCADecContext),
+++    .init           = dcadec_init,
+++    .decode         = dcadec_decode_frame,
+++    .close          = dcadec_close,
+++    .flush          = dcadec_flush,
+++    .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_CHANNEL_CONF,
+++    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_S16P,
+++                                                      AV_SAMPLE_FMT_NONE },
+++    .profiles       = NULL_IF_CONFIG_SMALL(profiles),
+++};
++-- 
++1.9.1
++
+diff -Nur xbmc-15.0-Isengard.orig/tools/depends/target/ffmpeg/0002-avcodec-Fix-libdcadec-include-dir.patch xbmc-15.0-Isengard/tools/depends/target/ffmpeg/0002-avcodec-Fix-libdcadec-include-dir.patch
+--- xbmc-15.0-Isengard.orig/tools/depends/target/ffmpeg/0002-avcodec-Fix-libdcadec-include-dir.patch	1969-12-31 18:00:00.000000000 -0600
++++ xbmc-15.0-Isengard/tools/depends/target/ffmpeg/0002-avcodec-Fix-libdcadec-include-dir.patch	2015-07-25 08:01:50.570340002 -0500
+@@ -0,0 +1,40 @@
++From 4f3c31df3f569c7171ee9e651ddf479690367b9b Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
++Date: Fri, 20 Mar 2015 01:58:25 +0100
++Subject: [PATCH] avcodec: Fix libdcadec include dir
++
++Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
++---
++ configure              | 2 +-
++ libavcodec/libdcadec.c | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/configure b/configure
++index a449bc7..1ef83e3 100755
++--- a/configure
+++++ b/configure
++@@ -4925,7 +4925,7 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
++                              { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
++                                die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
++ enabled libcaca           && require_pkg_config caca caca.h caca_create_canvas
++-enabled libdcadec         && require libdcadec dca_context.h dcadec_context_create -ldcadec
+++enabled libdcadec         && require libdcadec libdcadec/dca_context.h dcadec_context_create -ldcadec
++ enabled libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
++ enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
++ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
++diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c
++index d060db5..a28b983 100644
++--- a/libavcodec/libdcadec.c
+++++ b/libavcodec/libdcadec.c
++@@ -19,7 +19,7 @@
++  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++  */
++ 
++-#include <dca_context.h>
+++#include <libdcadec/dca_context.h>
++ 
++ #include "libavutil/avassert.h"
++ #include "libavutil/channel_layout.h"
++-- 
++1.9.1
++
+diff -Nur xbmc-15.0-Isengard.orig/tools/depends/target/ffmpeg/0003-avcodec-add-profile-define-for-DTS-Express.patch xbmc-15.0-Isengard/tools/depends/target/ffmpeg/0003-avcodec-add-profile-define-for-DTS-Express.patch
+--- xbmc-15.0-Isengard.orig/tools/depends/target/ffmpeg/0003-avcodec-add-profile-define-for-DTS-Express.patch	1969-12-31 18:00:00.000000000 -0600
++++ xbmc-15.0-Isengard/tools/depends/target/ffmpeg/0003-avcodec-add-profile-define-for-DTS-Express.patch	2015-07-25 08:01:50.570340002 -0500
+@@ -0,0 +1,25 @@
++From 11fe56c8bbf39cd0c3edbf0cd404dea400ff7e0c Mon Sep 17 00:00:00 2001
++From: Hendrik Leppkes <h.leppkes@gmail.com>
++Date: Thu, 19 Mar 2015 23:45:39 +0100
++Subject: [PATCH] avcodec: add profile define for DTS Express
++
++Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
++---
++ libavcodec/avcodec.h | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
++index cdc8aa1..48e212f 100644
++--- a/libavcodec/avcodec.h
+++++ b/libavcodec/avcodec.h
++@@ -2851,6 +2851,7 @@ typedef struct AVCodecContext {
++ #define FF_PROFILE_DTS_96_24   40
++ #define FF_PROFILE_DTS_HD_HRA  50
++ #define FF_PROFILE_DTS_HD_MA   60
+++#define FF_PROFILE_DTS_EXPRESS 70
++ 
++ #define FF_PROFILE_MPEG2_422    0
++ #define FF_PROFILE_MPEG2_HIGH   1
++-- 
++1.9.1
++
+diff -Nur xbmc-15.0-Isengard.orig/tools/depends/target/ffmpeg/autobuild.sh xbmc-15.0-Isengard/tools/depends/target/ffmpeg/autobuild.sh
+--- xbmc-15.0-Isengard.orig/tools/depends/target/ffmpeg/autobuild.sh	2015-07-21 13:41:29.000000000 -0500
++++ xbmc-15.0-Isengard/tools/depends/target/ffmpeg/autobuild.sh	2015-07-25 08:01:50.586339999 -0500
+@@ -159,6 +159,7 @@
+ 	--disable-mips32r2 \
+ 	--disable-mipsdspr1 \
+ 	--disable-mipsdspr2 \
++	--enable-libdcadec \
+         ${FLAGS}
+ 
+ make -j ${BUILDTHREADS} 
+diff -Nur xbmc-15.0-Isengard.orig/tools/depends/target/ffmpeg/Makefile xbmc-15.0-Isengard/tools/depends/target/ffmpeg/Makefile
+--- xbmc-15.0-Isengard.orig/tools/depends/target/ffmpeg/Makefile	2015-07-21 13:41:29.000000000 -0500
++++ xbmc-15.0-Isengard/tools/depends/target/ffmpeg/Makefile	2015-07-25 08:01:50.582