summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/libcec/Makefile2
-rw-r--r--package/ntfs-3g/Makefile2
-rw-r--r--package/ntfs-3g/files/ntfs3g.init13
-rw-r--r--package/swig/Makefile2
-rw-r--r--package/taglib/patches/patch-taglib_pc_cmake10
-rw-r--r--package/xbmc/Makefile16
-rw-r--r--package/xbmc/patches/patch-Makefile_in55
-rw-r--r--package/xbmc/patches/patch-Makefile_include_in12
-rw-r--r--package/xbmc/patches/patch-configure_in64
-rw-r--r--package/xbmc/patches/patch-lib_DllAvCodec_h35
-rw-r--r--package/xbmc/patches/patch-lib_DllAvFilter_h46
-rw-r--r--package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile13
-rw-r--r--package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c11
-rw-r--r--package/xbmc/patches/patch-m4_ax_python_devel_m444
-rw-r--r--package/xbmc/patches/patch-tools_Linux_xbmc_sh_in66
-rw-r--r--package/xbmc/patches/patch-tools_TexturePacker_XBMCTex_cpp17
-rw-r--r--package/xbmc/patches/patch-tools_TexturePacker_XBTFWriter_cpp13
-rw-r--r--package/xbmc/patches/patch-tools_TexturePacker_cmdlineargs_h11
-rw-r--r--package/xbmc/patches/patch-tools_TexturePacker_xwinapi_h11
-rw-r--r--package/xbmc/patches/patch-tools_buildsteps_rbpi_configure-depends31
-rw-r--r--package/xbmc/patches/patch-xbmc_Application_cpp14
-rw-r--r--package/xbmc/patches/patch-xbmc_cdrip_EncoderFFmpeg_h11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_cpp11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_h20
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_AudioEngine_Interfaces_AEEncoder_h15
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h20
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecFFmpeg_cpp11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecLPcm_h17
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPassthroughFFmpeg_h20
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_cpp11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_h11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecs_h11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Overlay_DVDOverlayCodecFFmpeg_cpp11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp28
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxPVRClient_cpp47
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h29
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerAudio_h11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerVideo_h11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp17
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h20
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudioCodecOMX_cpp10
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_cpp11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_h11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp18
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_cpp11
-rw-r--r--package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_h11
-rw-r--r--package/xbmc/patches/patch-xbmc_powermanagement_PowerManager_cpp23
-rw-r--r--package/xbmc/patches/patch-xbmc_powermanagement_linux_Makefile12
-rw-r--r--package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_cpp11
-rw-r--r--package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_h20
-rw-r--r--package/xbmc/patches/patch-xbmc_utils_CharsetConverter_cpp20
-rw-r--r--package/xbmc/patches/patch-xbmc_utils_EndianSwap_h11
-rw-r--r--target/linux/config/Config.in.audio1
55 files changed, 259 insertions, 753 deletions
diff --git a/package/libcec/Makefile b/package/libcec/Makefile
index 48b9143b4..c4ba5b30e 100644
--- a/package/libcec/Makefile
+++ b/package/libcec/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libcec
PKG_VERSION:= 2.1.4
PKG_RELEASE:= 3
-PKG_MD5SUM:= d65e52ab3295e9e4b73bf4580f3bd4f7
+PKG_MD5SUM:= faa58944f87e9beda165f615d4b46766
PKG_DESCR:= control your device with your TV remote control
PKG_SECTION:= libs
PKG_BUILDDEP:= autotool
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index a0f3502de..cbe0cef79 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ntfs-3g
PKG_VERSION:= 2014.2.15
-PKG_RELEASE:= 2
+PKG_RELEASE:= 4
PKG_MD5SUM:= f11d563816249d730a00498983485f3a
PKG_DESCR:= ntfs filesystem driver using fuse
PKG_SECTION:= fs
diff --git a/package/ntfs-3g/files/ntfs3g.init b/package/ntfs-3g/files/ntfs3g.init
new file mode 100644
index 000000000..5f9164036
--- /dev/null
+++ b/package/ntfs-3g/files/ntfs3g.init
@@ -0,0 +1,13 @@
+#!/bin/sh
+#INIT 20
+[[ $1 = autostart ]] || exit 0
+
+# mount ntfs-3g filesystems
+grep fuse /proc/filesystems >/dev/null 2>&1
+if [ $? -eq 0 ];then
+ grep -v "^#" /etc/fstab |grep ntfs-3g >/dev/null 2>&1
+ if [ $? -eq 0 ];then
+ mount -a -t ntfs-3g
+ fi
+fi
+exit 0
diff --git a/package/swig/Makefile b/package/swig/Makefile
index 6bc9f2b05..001bc10aa 100644
--- a/package/swig/Makefile
+++ b/package/swig/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= lang
PKG_URL:= http://www.swig.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=swig/}
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
PKG_ARCH_DEPENDS:= native
include $(TOPDIR)/mk/host.mk
diff --git a/package/taglib/patches/patch-taglib_pc_cmake b/package/taglib/patches/patch-taglib_pc_cmake
index fa0b43e58..2a468ba8c 100644
--- a/package/taglib/patches/patch-taglib_pc_cmake
+++ b/package/taglib/patches/patch-taglib_pc_cmake
@@ -5,9 +5,9 @@
-exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${LIB_INSTALL_DIR}
-includedir=${INCLUDE_INSTALL_DIR}
-+exec_prefix=\${prefix}
-+libdir=\${prefix}/lib
-+includedir=\${prefix}/include
++exec_prefix=$prefix
++libdir=$prefix/lib
++includedir=$prefix/include
Name: TagLib
Description: Audio meta-data library
@@ -15,5 +15,5 @@
Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
-Libs: -L${LIB_INSTALL_DIR} -ltag
-Cflags: -I${INCLUDE_INSTALL_DIR}/taglib
-+Libs: -L\${libdir} -ltag
-+Cflags: -I\${includedir}/taglib
++Libs: -ltag
++Cflags:
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 138c17e10..79be2ba04 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xbmc
-PKG_VERSION:= 12.3
-PKG_RELEASE:= 5
-PKG_MD5SUM:= 7ae385ebf8e5cfcb917393235e6efbdb
+PKG_VERSION:= 13.0rc1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= fabaf9485900647a557d33d0022674c2
PKG_DESCR:= software media player
PKG_SECTION:= multimedia
PKG_DEPENDS:= boost libffmpeg python2 libstdcxx
@@ -18,13 +18,14 @@ PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate
PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd
PKG_DEPENDS+= libbluray libgpg-error libudev python2-mod-sqlite
PKG_DEPENDS+= libssh libcec libnfs librtmp samba-lib libncurses
+PKG_DEPENDS+= libxslt libvorbisenc
PKG_BUILDDEP:= autotool boost ffmpeg python2 MesaLib libglew libass
PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug
PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl
PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype
PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd
PKG_BUILDDEP+= libssh libcec libnfs samba rtmpdump eudev
-PKG_BUILDDEP+= libgpg-error libbluray dbus
+PKG_BUILDDEP+= libgpg-error libbluray dbus libxslt libvorbis
PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host
PKG_URL:= http://xbmc.org/
PKG_SITES:= http://mirrors.xbmc.org/releases/source/
@@ -35,8 +36,6 @@ PKG_BUILDDEP_IBM_X40:= nasm-host
PKG_SYSTEM_DEPENDS:= raspberry-pi ibm-x40
PKG_LIBC_DEPENDS:= glibc
-WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-Frodo
-
DIFF_IGNOREFILES:= configure missing depcomp install-sh INSTALL \
aclocal.m4 config.h.in */Makefile.in
@@ -44,10 +43,11 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+CXXFLAGS_FOR_BUILD+= $(CPPFLAGS_FOR_BUILD)
XAKE_FLAGS+= V=1 TIXML_USE_STL=1
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \
- -DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1
+ -DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1 -DUSE_EXTERNAL_FFMPEG=1
ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/opt/vc/include \
@@ -62,6 +62,8 @@ CONFIGURE_ENV+= DESTDIR='${WRKINST}' \
CONFIGURE_ARGS+= --disable-optical-drive \
--disable-mysql \
--disable-avahi \
+ --disable-rsxs \
+ --enable-alsa \
--enable-mid \
--enable-libmp3lame \
--enable-libvorbisenc \
diff --git a/package/xbmc/patches/patch-Makefile_in b/package/xbmc/patches/patch-Makefile_in
new file mode 100644
index 000000000..8742f0f50
--- /dev/null
+++ b/package/xbmc/patches/patch-Makefile_in
@@ -0,0 +1,55 @@
+--- xbmc-13.0rc1.orig/Makefile.in 2014-04-30 15:45:06.000000000 +0200
++++ xbmc-13.0rc1/Makefile.in 2014-05-03 15:31:00.000000000 +0200
+@@ -586,25 +586,6 @@ install-arch:
+ ifeq (@USE_PVR_ADDONS@,1)
+ $(MAKE) -C pvr-addons install
+ endif
+-ifeq ($(findstring freebsd,@ARCH@), freebsd)
+- @find -E system addons -type f -not -iregex ".*svn.*" \
+- -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
+- -exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
+- -and \
+- -exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
+- -exec printf " -- %-75.75s\r" "{}" \;
+-else
+-ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
+- @find -E system addons -type f -not -iregex ".*svn.*" \
+- -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
+- -exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
+- -and \
+- -exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
+- -exec printf " -- %-75.75s\r" "{}" \;
+-else
+- @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*" -iregex ".*\.so|.*\.vis|.*\.xbs|.*\.pvr" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+-endif
+-endif
+
+ install-scripts:
+ @install -d $(DESTDIR)$(bindir)
+@@ -624,26 +605,7 @@ install-datas: install-scripts
+ @echo "Done!"
+ @echo "Copying system files to $(DESTDIR)$(datarootdir)/xbmc"
+ @install -d $(DESTDIR)$(datarootdir)/xbmc
+- @# Arch independent files
+-ifeq ($(findstring bsd,@ARCH@), bsd)
+- @find -E addons language media sounds userdata system -type f \
+- -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
+- -exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
+- -and \
+- -exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
+- -exec printf " -- %-75.75s\r" "{}" \;
+-else
+-ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
+- @find -E addons language media sounds userdata system -type f \
+- -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
+- -exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
+- -and \
+- -exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
+- -exec printf " -- %-75.75s\r" "{}" \;
+-else
+ @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pvr|$(subst ${space},|,$(INSTALL_FILTER))" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+-endif
+-endif
+ @# Icons and links
+ @install -d $(DESTDIR)$(datarootdir)/applications
+ @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
diff --git a/package/xbmc/patches/patch-Makefile_include_in b/package/xbmc/patches/patch-Makefile_include_in
index 2706f6698..6e3e10640 100644
--- a/package/xbmc/patches/patch-Makefile_include_in
+++ b/package/xbmc/patches/patch-Makefile_include_in
@@ -1,10 +1,10 @@
---- xbmc-12.2.orig/Makefile.include.in 2013-05-03 07:57:40.000000000 +0200
-+++ xbmc-12.2/Makefile.include.in 2013-07-31 11:46:19.000000000 +0200
-@@ -32,6 +32,7 @@ CC=@CC@
- CXXFLAGS+=@CXXFLAGS@
- CFLAGS+=@CFLAGS@
+--- xbmc-24032014.orig/Makefile.include.in 2014-03-24 15:52:26.000000000 +0100
++++ xbmc-24032014/Makefile.include.in 2014-03-25 10:05:01.625705714 +0100
+@@ -37,6 +37,7 @@ CFLAGS+=@CFLAGS@
+ CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@
LDFLAGS+=@LDFLAGS@
+ LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@
+INCLUDES+=@CPPFLAGS@
INCLUDES+=-I@abs_top_srcdir@/lib
INCLUDES+=-I@abs_top_srcdir@/xbmc
- INCLUDES+=$(sort @INCLUDES@)
+ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui
diff --git a/package/xbmc/patches/patch-configure_in b/package/xbmc/patches/patch-configure_in
index 502ee03c0..0f6c1689c 100644
--- a/package/xbmc/patches/patch-configure_in
+++ b/package/xbmc/patches/patch-configure_in
@@ -1,6 +1,64 @@
---- xbmc-12.2.orig/configure.in 2013-05-03 07:57:40.000000000 +0200
-+++ xbmc-12.2/configure.in 2013-12-04 11:36:43.000000000 +0100
-@@ -876,7 +876,7 @@ if test "$use_gles" = "yes"; then
+--- xbmc-13.0rc1.orig/configure.in 2014-04-30 15:45:07.000000000 +0200
++++ xbmc-13.0rc1/configure.in 2014-05-03 11:22:45.000000000 +0200
+@@ -600,7 +600,12 @@ PKG_PROG_PKG_CONFIG
+ MAKE="${MAKE:-make}"
+ OBJDUMP="${OBJDUMP:-objdump}"
+
+-use_external_ffmpeg=no
++if test "x$use_external_libraries" != no;then
++ use_external_ffmpeg=yes
++else
++ use_external_ffmpeg=no
++fi
++
+ use_static_ffmpeg=no
+
+ # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
+@@ -626,21 +631,21 @@ case $host in
+ use_x11=no
+ build_shared_lib=yes
+ ;;
+- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
++ i*86*-linux-*)
+ ARCH="i486-linux"
+ if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then
+ use_arch="x86"
+ use_cpu="i686"
+ fi
+- use_static_ffmpeg=yes
++ use_static_ffmpeg=no
+ ;;
+- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
++ x86_64-*-linux-*)
+ ARCH="x86_64-linux"
+ if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then
+ use_arch="x86_64"
+ use_cpu="x86_64"
+ fi
+- use_static_ffmpeg=yes
++ use_static_ffmpeg=no
+ ;;
+ i386-*-freebsd*)
+ ARCH="x86-freebsd"
+@@ -686,7 +691,7 @@ case $host in
+ powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
+ ARCH="powerpc64-linux"
+ ;;
+- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
++ arm*-*-linux-*)
+ ARCH="arm"
+ use_arch="arm"
+ ffmpeg_target_os=linux
+@@ -696,7 +701,7 @@ case $host in
+ use_sdl=no
+ use_x11=no
+ use_wayland=no
+- use_static_ffmpeg=yes
++ use_static_ffmpeg=no
+ ;;
+ arm*-*linux-android*)
+ target_platform=target_android
+@@ -1047,7 +1052,7 @@ if test "$use_gles" = "yes"; then
AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
diff --git a/package/xbmc/patches/patch-lib_DllAvCodec_h b/package/xbmc/patches/patch-lib_DllAvCodec_h
deleted file mode 100644
index 89b259d9c..000000000
--- a/package/xbmc/patches/patch-lib_DllAvCodec_h
+++ /dev/null
@@ -1,35 +0,0 @@
---- xbmc-12.2.orig/lib/DllAvCodec.h 2013-05-03 07:57:40.000000000 +0200
-+++ xbmc-12.2/lib/DllAvCodec.h 2013-07-31 12:23:26.000000000 +0200
-@@ -72,8 +72,8 @@ public:
- virtual void avcodec_register_all(void)=0;
- virtual void avcodec_flush_buffers(AVCodecContext *avctx)=0;
- virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)=0;
-- virtual AVCodec *avcodec_find_decoder(enum CodecID id)=0;
-- virtual AVCodec *avcodec_find_encoder(enum CodecID id)=0;
-+ virtual AVCodec *avcodec_find_decoder(enum AVCodecID id)=0;
-+ virtual AVCodec *avcodec_find_encoder(enum AVCodecID id)=0;
- virtual int avcodec_close_dont_call(AVCodecContext *avctx)=0;
- virtual AVFrame *avcodec_alloc_frame(void)=0;
- virtual int avpicture_fill(AVPicture *picture, uint8_t *ptr, PixelFormat pix_fmt, int width, int height)=0;
-@@ -129,8 +129,8 @@ public:
- }
- virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) { *(volatile int *)0x0 = 0; return 0; }
- virtual int avcodec_close_dont_call(AVCodecContext *avctx) { *(volatile int *)0x0 = 0; return 0; }
-- virtual AVCodec *avcodec_find_decoder(enum CodecID id) { return ::avcodec_find_decoder(id); }
-- virtual AVCodec *avcodec_find_encoder(enum CodecID id) { return ::avcodec_find_encoder(id); }
-+ virtual AVCodec *avcodec_find_decoder(enum AVCodecID id) { return ::avcodec_find_decoder(id); }
-+ virtual AVCodec *avcodec_find_encoder(enum AVCodecID id) { return ::avcodec_find_encoder(id); }
- virtual int avcodec_close(AVCodecContext *avctx)
- {
- CSingleLock lock(DllAvCodec::m_critSection);
-@@ -203,8 +203,8 @@ class DllAvCodec : public DllDynamic, Dl
- LOAD_SYMBOLS();
-
- DEFINE_METHOD0(void, avcodec_register_all_dont_call)
-- DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum CodecID p1))
-- DEFINE_METHOD1(AVCodec*, avcodec_find_encoder, (enum CodecID p1))
-+ DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum AVCodecID p1))
-+ DEFINE_METHOD1(AVCodec*, avcodec_find_encoder, (enum AVCodecID p1))
- DEFINE_METHOD1(int, avcodec_close_dont_call, (AVCodecContext *p1))
- DEFINE_METHOD0(AVFrame*, avcodec_alloc_frame)
- DEFINE_METHOD5(int, avpicture_fill, (AVPicture *p1, uint8_t *p2, PixelFormat p3, int p4, int p5))
diff --git a/package/xbmc/patches/patch-lib_DllAvFilter_h b/package/xbmc/patches/patch-lib_DllAvFilter_h
deleted file mode 100644
index 9f1188165..000000000
--- a/package/xbmc/patches/patch-lib_DllAvFilter_h
+++ /dev/null
@@ -1,46 +0,0 @@
---- xbmc-12.2.orig/lib/DllAvFilter.h 2013-05-03 07:57:40.000000000 +0200
-+++ xbmc-12.2/lib/DllAvFilter.h 2013-08-01 10:49:46.000000000 +0200
-@@ -45,6 +45,7 @@ extern "C" {
- #if (defined HAVE_LIBAVFILTER_AVFILTER_H)
- #include <libavfilter/avfiltergraph.h>
- #include <libavfilter/buffersink.h>
-+ #include <libavfilter/buffersrc.h>
- #include <libavfilter/avcodec.h>
- #elif (defined HAVE_FFMPEG_AVFILTER_H)
- #include <ffmpeg/avfiltergraph.h>
-@@ -77,7 +78,7 @@ public:
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
- virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
- #else
-- virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
-+ virtual int av_buffersrc_add_frame_flags(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
- #endif
- virtual void avfilter_unref_buffer(AVFilterBufferRef *ref)=0;
- virtual int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad)=0;
-@@ -137,7 +138,7 @@ public:
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
- virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); }
- #else
-- virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame* frame, int flags) { return ::av_buffersrc_add_frame(buffer_filter, frame, flags); }
-+ virtual int av_buffersrc_add_frame_flags(AVFilterContext *buffer_filter, AVFrame* frame, int flags) { return ::av_buffersrc_add_frame_flags(buffer_filter, frame, flags); }
- #endif
- virtual void avfilter_unref_buffer(AVFilterBufferRef *ref) { ::avfilter_unref_buffer(ref); }
- virtual int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad) { return ::avfilter_link(src, srcpad, dst, dstpad); }
-@@ -175,7 +176,7 @@ class DllAvFilter : public DllDynamic, D
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
- DEFINE_METHOD3(int, av_vsrc_buffer_add_frame, (AVFilterContext *p1, AVFrame *p2, int p3))
- #else
-- DEFINE_METHOD3(int, av_buffersrc_add_frame, (AVFilterContext *p1, AVFrame *p2, int p3))
-+ DEFINE_METHOD3(int, av_buffersrc_add_frame_flag, (AVFilterContext *p1, AVFrame *p2, int p3))
- #endif
- DEFINE_METHOD1(void, avfilter_unref_buffer, (AVFilterBufferRef *p1))
- DEFINE_METHOD4(int, avfilter_link, (AVFilterContext *p1, unsigned p2, AVFilterContext *p3, unsigned p4))
-@@ -198,7 +199,7 @@ class DllAvFilter : public DllDynamic, D
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)
- RESOLVE_METHOD(av_vsrc_buffer_add_frame)
- #else
-- RESOLVE_METHOD(av_buffersrc_add_frame)
-+ RESOLVE_METHOD(av_buffersrc_add_frame_flag)
- #endif
- RESOLVE_METHOD(avfilter_unref_buffer)
- RESOLVE_METHOD(avfilter_link)
diff --git a/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile b/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile
deleted file mode 100644
index 799e54eeb..000000000
--- a/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- xbmc-12.2.orig/lib/libdvd/libdvdread/Makefile 2013-05-03 07:57:40.000000000 +0200
-+++ xbmc-12.2/lib/libdvd/libdvdread/Makefile 2013-12-15 12:24:12.000000000 +0100
-@@ -131,8 +131,8 @@ distclean: clean
- dvdread-config: $(.OBJDIR)/dvdread-config
- $(.OBJDIR)/dvdread-config: $(BUILDDEPS)
- @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config
-- @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config
-- @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config
-+ @echo 'prefix='$(DESTDIR)$(PREFIX) >> $(.OBJDIR)/dvdread-config
-+ @echo 'libdir='$(DESTDIR)$(shlibdir) >> $(.OBJDIR)/dvdread-config
- @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config
- @echo >> $(.OBJDIR)/dvdread-config
- cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config
diff --git a/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c b/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c
deleted file mode 100644
index 1a93e1411..000000000
--- a/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-12.3-Frodo.orig/lib/xbmc-dll-symbols/DllAvFormat.c 2013-12-12 22:47:49.000000000 +0100
-+++ xbmc-12.3-Frodo/lib/xbmc-dll-symbols/DllAvFormat.c 2014-04-14 17:07:49.000000000 +0200
-@@ -110,7 +110,7 @@ void av_read_frame_flush(AVFormatContext
- #define RELATIVE_TS_BASE (INT64_MAX - (1LL<<48))
- if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = RELATIVE_TS_BASE;
- else st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */
-- st->reference_dts = AV_NOPTS_VALUE;
-+ //st->reference_dts = AV_NOPTS_VALUE;
-
- st->probe_packets = MAX_PROBE_PACKETS;
- #endif
diff --git a/package/xbmc/patches/patch-m4_ax_python_devel_m4 b/package/xbmc/patches/patch-m4_ax_python_devel_m4
index cdc234436..ded81dbd5 100644
--- a/package/xbmc/patches/patch-m4_ax_python_devel_m4
+++ b/package/xbmc/patches/patch-m4_ax_python_devel_m4
@@ -1,33 +1,11 @@
---- xbmc-12.3-Frodo.orig/m4/ax_python_devel.m4 2013-12-12 22:47:49.000000000 +0100
-+++ xbmc-12.3-Frodo/m4/ax_python_devel.m4 2014-01-27 18:51:28.000000000 +0100
-@@ -151,10 +151,9 @@ $ac_distutils_result])
- #
- AC_MSG_CHECK