diff options
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_CHECKING([for Python include path]) - if test -z "$PYTHON_CPPFLAGS"; then -- python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc ());"` -+ python_path=`python2-config --includes` - if test -n "${python_path}"; then -- python_path="-I$python_path" -+ python_path="$python_path" - fi - PYTHON_CPPFLAGS=$python_path - fi -@@ -267,17 +266,6 @@ EOD` - AC_MSG_RESULT([$PYTHON_SITE_PKG]) - AC_SUBST([PYTHON_SITE_PKG]) - -- # -- # libraries which must be linked in when embedding -- # -- AC_MSG_CHECKING(python extra libraries) -- if test -z "$PYTHON_EXTRA_LIBS"; then -- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ -- conf = distutils.sysconfig.get_config_var; \ -- print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"` -- fi -- AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) -- AC_SUBST(PYTHON_EXTRA_LIBS) - - # - # linking flags needed when embedding +--- xbmc-13.0rc1.orig/m4/ax_python_devel.m4 2014-04-30 15:43:58.000000000 +0200 ++++ xbmc-13.0rc1/m4/ax_python_devel.m4 2014-05-02 08:03:10.000000000 +0200 +@@ -298,7 +298,7 @@ EOD` + # save current global flags + ac_save_LIBS="$LIBS" + ac_save_CPPFLAGS="$CPPFLAGS" +- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS" ++ LIBS="$ac_save_LIBS $PYTHON_LDFLAGS" + CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" + AC_LANG_PUSH([C]) + AC_LINK_IFELSE([ diff --git a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in index 9b670449b..f430c5af9 100644 --- a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in +++ b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in @@ -1,15 +1,61 @@ ---- xbmc-12.3-Frodo.orig/tools/Linux/xbmc.sh.in 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/tools/Linux/xbmc.sh.in 2014-01-14 09:55:27.409527526 +0100 -@@ -52,7 +52,7 @@ single_stacktrace() +--- xbmc-24032014.orig/tools/Linux/xbmc.sh.in 2014-03-24 15:52:52.000000000 +0100 ++++ xbmc-24032014/tools/Linux/xbmc.sh.in 2014-03-27 11:42:33.985822969 +0100 +@@ -23,7 +23,7 @@ prefix="@prefix@" + exec_prefix="@exec_prefix@" + datarootdir="@datarootdir@" + LIBDIR="@libdir@" +-CRASHLOG_DIR=${CRASHLOG_DIR:-$HOME} ++CRASHLOG_DIR=/tmp/xbmc - print_crash_report() + # Check for some options used by this script + while [ "$#" -gt "0" ] +@@ -42,7 +42,7 @@ done + single_stacktrace() { -- FILE="$HOME/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log" -+ FILE="/tmp/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log" - echo "############## XBMC CRASH LOG ###############" >> $FILE + # core filename is either "core.$PID" or "core" +- find "$1" -maxdepth $2 -name 'core*' | while read core; do ++ find "$1" -name 'core*' | while read core; do + LC_ALL=C gdb --core="$core" --batch 2> /dev/null | grep -q "^Core was generated by \`$LIBDIR/xbmc/xbmc.bin" || continue + echo "=====> Core file: "$core" ($(stat -c%y "$core"))" >> $FILE + echo " =========================================" >> $FILE +@@ -64,33 +64,14 @@ print_crash_report() + uname -m >> $FILE + echo -n " Kernel: " >> $FILE + uname -rvs >> $FILE +- echo -n " Release: " >> $FILE +- if [ -f /etc/os-release ]; then +- . /etc/os-release +- echo $NAME $VERSION >> $FILE +- elif which lsb_release > /dev/null; then +- echo >> $FILE +- lsb_release -a 2> /dev/null | sed -e 's/^/ /' >> $FILE +- else +- echo "lsb_release not available" >> $FILE +- fi + echo "############## END SYSTEM INFO ##############" >> $FILE echo >> $FILE - echo "################ SYSTEM INFO ################" >> $FILE -@@ -91,9 +91,9 @@ print_crash_report() + echo "############### STACK TRACE #################" >> $FILE + if which gdb >/dev/null 2>&1; then +- if which systemd-coredumpctl &> /dev/null; then +- systemd-coredumpctl dump -o core xbmc.bin &> /dev/null +- fi +- single_stacktrace "$PWD" 1 ++ single_stacktrace "$PWD" + # Find in plugins directories +- if [ $XBMC_HOME ]; then +- BASEDIR=$XBMC_HOME +- else +- BASEDIR="$LIBDIR/xbmc/" +- fi +- single_stacktrace "$BASEDIR" 5 +- # find in user xbmc dir +- single_stacktrace $HOME/.xbmc/ 5 ++ BASEDIR="$LIBDIR/xbmc/" ++ single_stacktrace "$BASEDIR" + else + echo "gdb not installed, can't get stack trace." >> $FILE + fi +@@ -98,9 +79,9 @@ print_crash_report() echo >> $FILE echo "################# LOG FILE ##################" >> $FILE echo >> $FILE @@ -21,7 +67,7 @@ echo >> $FILE else echo "Logfile not found in the usual place." >> $FILE -@@ -107,12 +107,6 @@ print_crash_report() +@@ -114,12 +95,6 @@ print_crash_report() echo "Crash report available at $FILE" } diff --git a/package/xbmc/patches/patch-tools_TexturePacker_XBMCTex_cpp b/package/xbmc/patches/patch-tools_TexturePacker_XBMCTex_cpp deleted file mode 100644 index 81b0b931d..000000000 --- a/package/xbmc/patches/patch-tools_TexturePacker_XBMCTex_cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- xbmc-12.2.orig/tools/TexturePacker/XBMCTex.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/tools/TexturePacker/XBMCTex.cpp 2013-08-01 16:12:13.000000000 +0200 -@@ -35,12 +35,12 @@ - #include <SDL/SDL_image.h> - #undef main - --#include "guilib/XBTF.h" -+#include "../../xbmc/guilib/XBTF.h" - #include "XBTFWriter.h" - #include "md5.h" - #include "SDL_anigif.h" - #include "cmdlineargs.h" --#include "libsquish/squish.h" -+#include "../../lib/libsquish/squish.h" - - #ifdef _WIN32 - #define strncasecmp strnicmp diff --git a/package/xbmc/patches/patch-tools_TexturePacker_XBTFWriter_cpp b/package/xbmc/patches/patch-tools_TexturePacker_XBTFWriter_cpp deleted file mode 100644 index 91be356a7..000000000 --- a/package/xbmc/patches/patch-tools_TexturePacker_XBTFWriter_cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- xbmc-12.2.orig/tools/TexturePacker/XBTFWriter.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/tools/TexturePacker/XBTFWriter.cpp 2013-08-01 13:50:44.000000000 +0200 -@@ -22,8 +22,8 @@ - #include "XBTFWriter.h" - #define __STDC_FORMAT_MACROS - #include <inttypes.h> --#include "guilib/XBTF.h" --#include "utils/EndianSwap.h" -+#include "../../xbmc/guilib/XBTF.h" -+#include "../../xbmc/utils/EndianSwap.h" - #if defined(__FreeBSD__) - #include <stdlib.h> - #elif !defined(__APPLE__) diff --git a/package/xbmc/patches/patch-tools_TexturePacker_cmdlineargs_h b/package/xbmc/patches/patch-tools_TexturePacker_cmdlineargs_h deleted file mode 100644 index efded26b5..000000000 --- a/package/xbmc/patches/patch-tools_TexturePacker_cmdlineargs_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/tools/TexturePacker/cmdlineargs.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/tools/TexturePacker/cmdlineargs.h 2013-08-01 14:37:40.000000000 +0200 -@@ -23,7 +23,7 @@ - */ - - #ifdef _LINUX --#include "PlatformDefs.h" -+#include "../../xbmc/linux/PlatformDefs.h" - #include "xwinapi.h" - typedef LPSTR PSZ; - #define _snprintf snprintf diff --git a/package/xbmc/patches/patch-tools_TexturePacker_xwinapi_h b/package/xbmc/patches/patch-tools_TexturePacker_xwinapi_h deleted file mode 100644 index 1cc7efdc1..000000000 --- a/package/xbmc/patches/patch-tools_TexturePacker_xwinapi_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/tools/TexturePacker/xwinapi.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/tools/TexturePacker/xwinapi.h 2013-08-01 15:51:48.000000000 +0200 -@@ -22,7 +22,7 @@ - * - */ - --#include "PlatformDefs.h" -+#include "../../xbmc/linux/PlatformDefs.h" - - LPTSTR GetCommandLine(); - DWORD GetCurrentDirectory(DWORD nBufferLength, LPTSTR lpBuffer); diff --git a/package/xbmc/patches/patch-tools_buildsteps_rbpi_configure-depends b/package/xbmc/patches/patch-tools_buildsteps_rbpi_configure-depends new file mode 100644 index 000000000..db1aa7aab --- /dev/null +++ b/package/xbmc/patches/patch-tools_buildsteps_rbpi_configure-depends @@ -0,0 +1,31 @@ +--- xbmc-24032014.orig/tools/buildsteps/rbpi/configure-depends 2014-03-24 15:52:53.000000000 +0100 ++++ xbmc-24032014/tools/buildsteps/rbpi/configure-depends 2014-03-26 17:01:29.544260826 +0100 +@@ -7,13 +7,13 @@ then + cd $WORKSPACE/tools/depends; + + PATH="$PATH:$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin" \ +- CFLAGS="-pipe -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard \ +- -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \ ++ CFLAGS="\ ++ -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \ + -Wno-deprecated-declarations -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include \ + -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vcos/pthreads \ + -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vmcs_host/linux" \ +- CXXFLAGS="-pipe -mcpu=arm1176jzf-s -mtune=arm1176jzf-s \ +- -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux -Wno-psabi \ ++ CXXFLAGS="\ ++ -mabi=aapcs-linux -Wno-psabi \ + -Wa,-mno-warn-deprecated -Wno-deprecated-declarations \ + -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include \ + -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vcos/pthreads \ +@@ -23,8 +23,8 @@ then + ./configure --host=arm-linux-gnueabihf --prefix=$XBMC_DEPENDS_ROOT --with-tarballs=$TARBALLS \ + --with-toolchain=$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/sysroot \ + --build=i686-linux \ +- CFLAGS="-pipe -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard \ +- -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \ ++ CFLAGS="\ ++ -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \ + -Wno-deprecated-declarations -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include \ + -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vcos/pthreads \ + -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vmcs_host/linux" diff --git a/package/xbmc/patches/patch-xbmc_Application_cpp b/package/xbmc/patches/patch-xbmc_Application_cpp index 26d7d800e..3ecf6cb25 100644 --- a/package/xbmc/patches/patch-xbmc_Application_cpp +++ b/package/xbmc/patches/patch-xbmc_Application_cpp @@ -1,15 +1,15 @@ ---- xbmc-12.2.orig/xbmc/Application.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/Application.cpp 2013-10-10 18:43:17.000000000 +0200 -@@ -615,7 +615,7 @@ bool CApplication::Create() +--- xbmc-20140401.orig/xbmc/Application.cpp 2014-03-24 15:52:54.000000000 +0100 ++++ xbmc-20140401/xbmc/Application.cpp 2014-04-01 21:05:39.113975490 +0200 +@@ -682,7 +682,7 @@ bool CApplication::Create() - if (!CLog::Init(CSpecialProtocol::TranslatePath(g_settings.m_logFolder).c_str())) + if (!CLog::Init(CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str())) { - fprintf(stderr,"Could not init logging classes. Permission errors on ~/.xbmc (%s)\n", + fprintf(stderr,"Could not init logging classes. Permission errors on %s\n", - CSpecialProtocol::TranslatePath(g_settings.m_logFolder).c_str()); + CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str()); return false; } -@@ -966,10 +966,13 @@ bool CApplication::InitDirectoriesLinux( +@@ -1085,10 +1085,13 @@ bool CApplication::InitDirectoriesLinux( userName = "root"; CStdString userHome; @@ -23,7 +23,7 @@ CStdString xbmcBinPath, xbmcPath; CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME"); -@@ -1001,11 +1004,11 @@ bool CApplication::InitDirectoriesLinux( +@@ -1120,11 +1123,11 @@ bool CApplication::InitDirectoriesLinux( // map our special drives CSpecialProtocol::SetXBMCBinPath(xbmcBinPath); CSpecialProtocol::SetXBMCPath(xbmcPath); diff --git a/package/xbmc/patches/patch-xbmc_cdrip_EncoderFFmpeg_h b/package/xbmc/patches/patch-xbmc_cdrip_EncoderFFmpeg_h deleted file mode 100644 index 080fc7d2c..000000000 --- a/package/xbmc/patches/patch-xbmc_cdrip_EncoderFFmpeg_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cdrip/EncoderFFmpeg.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cdrip/EncoderFFmpeg.h 2013-07-31 12:34:15.000000000 +0200 -@@ -26,6 +26,8 @@ - #include "DllAvCodec.h" - #include "DllAvUtil.h" - -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+ - class CEncoderFFmpeg : public CEncoder - { - public: diff --git a/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_cpp b/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_cpp deleted file mode 100644 index aeabd9a4f..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp 2013-07-31 12:56:28.000000000 +0200 -@@ -226,7 +226,7 @@ unsigned int CAEEncoderFFmpeg::GetBitRat - return m_BitRate; - } - --CodecID CAEEncoderFFmpeg::GetCodecID() -+AVCodecID CAEEncoderFFmpeg::GetCodecID() - { - return m_CodecID; - } diff --git a/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_h b/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_h deleted file mode 100644 index 6926ff5dc..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Encoders_AEEncoderFFmpeg_h +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h 2013-07-31 12:47:10.000000000 +0200 -@@ -39,7 +39,7 @@ public: - virtual void Reset(); - - virtual unsigned int GetBitRate (); -- virtual CodecID GetCodecID (); -+ virtual AVCodecID GetCodecID (); - virtual unsigned int GetFrames (); - - virtual int Encode (float *data, unsigned int frames); -@@ -51,7 +51,7 @@ private: - DllAvUtil m_dllAvUtil; - - std::string m_CodecName; -- CodecID m_CodecID; -+ AVCodecID m_CodecID; - unsigned int m_BitRate; - CAEPackIEC61937::PackFunc m_PackFunc; - diff --git a/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Interfaces_AEEncoder_h b/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Interfaces_AEEncoder_h deleted file mode 100644 index 1559ae28b..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_AudioEngine_Interfaces_AEEncoder_h +++ /dev/null @@ -1,15 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h 2013-07-31 12:50:47.000000000 +0200 -@@ -64,10 +64,10 @@ public: - virtual unsigned int GetBitRate() = 0; - - /** -- * Returns the CodecID of the encoder -+ * Returns the AVCodecID of the encoder - * @return the ffmpeg codec id - */ -- virtual CodecID GetCodecID() = 0; -+ virtual AVCodecID GetCodecID() = 0; - - /** - * Return the number of frames needed to encode diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp deleted file mode 100644 index a4702f82c..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDAudio.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDAudio.cpp 2013-07-31 13:31:59.000000000 +0200 -@@ -116,7 +116,7 @@ CDVDAudio::~CDVDAudio() - free(m_pBuffer); - } - --bool CDVDAudio::Create(const DVDAudioFrame &audioframe, CodecID codec, bool needresampler) -+bool CDVDAudio::Create(const DVDAudioFrame &audioframe, AVCodecID codec, bool needresampler) - { - CLog::Log(LOGNOTICE, - "Creating audio stream (codec id: %i, channels: %i, sample rate: %i, %s)", diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h deleted file mode 100644 index 6e1e9e018..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDAudio.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDAudio.h 2013-07-31 13:29:46.000000000 +0200 -@@ -31,7 +31,7 @@ - class IAEStream; - - #ifndef _LINUX --enum CodecID; -+enum AVCodecID; - #else - extern "C" { - #if (defined USE_EXTERNAL_FFMPEG) -@@ -80,7 +80,7 @@ public: - float GetCurrentAttenuation(); - void Pause(); - void Resume(); -- bool Create(const DVDAudioFrame &audioframe, CodecID codec, bool needresampler); -+ bool Create(const DVDAudioFrame &audioframe, AVCodecID codec, bool needresampler); - bool IsValidFormat(const DVDAudioFrame &audioframe); - void Destroy(); - DWORD AddPackets(const DVDAudioFrame &audioframe); diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecFFmpeg_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecFFmpeg_cpp deleted file mode 100644 index 7d0f6f63c..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecFFmpeg_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp 2013-08-01 16:38:47.000000000 +0200 -@@ -26,6 +26,8 @@ - #include "utils/log.h" - #include "settings/GUISettings.h" - -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+ - CDVDAudioCodecFFmpeg::CDVDAudioCodecFFmpeg() : CDVDAudioCodec() - { - m_iBufferSize1 = 0; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecLPcm_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecLPcm_h deleted file mode 100644 index f33663dd0..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecLPcm_h +++ /dev/null @@ -1,17 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.h 2013-08-01 16:40:52.000000000 +0200 -@@ -24,6 +24,7 @@ - #include "DVDCodecs/DVDCodecs.h" - #include "DVDAudioCodecPcm.h" - -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 - #define LPCM_BUFFER_SIZE (AVCODEC_MAX_AUDIO_FRAME_SIZE / 2) - - class CDVDAudioCodecLPcm : public CDVDAudioCodecPcm -@@ -40,5 +41,5 @@ protected: - int m_bufferSize; - BYTE m_buffer[LPCM_BUFFER_SIZE]; - -- CodecID m_codecID; -+ AVCodecID m_codecID; - }; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPassthroughFFmpeg_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPassthroughFFmpeg_h deleted file mode 100644 index 1399c9b6f..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPassthroughFFmpeg_h +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.h 2013-08-01 16:41:17.000000000 +0200 -@@ -28,6 +28,8 @@ - - #include "DVDAudioCodec.h" - -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+ - class CDVDAudioCodecPassthroughFFmpeg : public CDVDAudioCodec - { - public: -@@ -94,7 +96,7 @@ private: - unsigned int m_Needed; - bool m_LostSync; - int m_SampleRate; -- CodecID m_codec; -+ AVCodecID m_codec; - - unsigned int (CDVDAudioCodecPassthroughFFmpeg::*m_pSyncFrame)(BYTE* pData, unsigned int iSize, unsigned int *fSize); - unsigned int SyncAC3(BYTE* pData, unsigned int iSize, unsigned int *fSize); diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_cpp deleted file mode 100644 index b89e92b69..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp 2013-08-01 16:40:23.000000000 +0200 -@@ -22,6 +22,8 @@ - #include "DVDStreamInfo.h" - #include "DVDCodecs/DVDCodecs.h" - -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+ - /* from g711.c by SUN microsystems (unrestricted use) */ - #define SIGN_BIT (0x80) /* Sign bit for a A-law byte. */ - #define QUANT_MASK (0xf) /* Quantization field mask. */ diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_h deleted file mode 100644 index ea08c992b..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Audio_DVDAudioCodecPcm_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h 2013-07-31 13:30:38.000000000 +0200 -@@ -44,7 +44,7 @@ protected: - short m_decodedData[131072]; // could be a bit to big - int m_decodedDataSize; - -- CodecID m_codecID; -+ AVCodecID m_codecID; - int m_iSourceSampleRate; - int m_iSourceChannels; - int m_iSourceBitrate; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecs_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecs_h deleted file mode 100644 index 6fc61ac63..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_DVDCodecs_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h 2013-07-31 13:30:54.000000000 +0200 -@@ -23,7 +23,7 @@ - #if (defined HAVE_CONFIG_H) && (!defined WIN32) - #include "config.h" - #endif --// enum CodecID -+// enum AVCodecID - - #include <string> - #include <vector> diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Overlay_DVDOverlayCodecFFmpeg_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Overlay_DVDOverlayCodecFFmpeg_cpp deleted file mode 100644 index 6f890a386..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Overlay_DVDOverlayCodecFFmpeg_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp 2013-08-01 17:02:17.000000000 +0200 -@@ -60,7 +60,7 @@ bool CDVDOverlayCodecFFmpeg::Open(CDVDSt - m_pCodecContext->debug_mv = 0; - m_pCodecContext->debug = 0; - m_pCodecContext->workaround_bugs = FF_BUG_AUTODETECT; -- m_pCodecContext->sub_id = hints.identifier; -+ //m_pCodecContext->sub_id = hints.identifier; - m_pCodecContext->codec_tag = hints.codec_tag; - m_pCodecContext->time_base.num = 1; - m_pCodecContext->time_base.den = DVD_TIME_BASE; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp deleted file mode 100644 index 70565968f..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_DVDVideoCodecFFmpeg_cpp +++ /dev/null @@ -1,28 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp 2013-08-01 17:31:00.000000000 +0200 -@@ -273,7 +273,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre - } - - // set acceleration -- m_pCodecContext->dsp_mask = 0;//FF_MM_FORCE | FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE; -+ //m_pCodecContext->dsp_mask = 0;//FF_MM_FORCE | FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE; - - // advanced setting override for skip loop filter (see avcodec.h for valid options) - // TODO: allow per video setting? -@@ -799,14 +799,14 @@ int CDVDVideoCodecFFmpeg::FilterProcess( - #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0) - result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, 0); - #else -- result = m_dllAvFilter.av_buffersrc_add_frame(m_pFilterIn, frame, 0); -+ result = m_dllAvFilter.av_buffersrc_add_frame_flags(m_pFilterIn, frame, 0); - #endif - if (result < 0) - { - #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0) - CLog::Log(LOGERROR, "CDVDVideoCodecFFmpeg::FilterProcess - av_vsrc_buffer_add_frame"); - #else -- CLog::Log(LOGERROR, "CDVDVideoCodecFFmpeg::FilterProcess - av_buffersrc_add_frame"); -+ CLog::Log(LOGERROR, "CDVDVideoCodecFFmpeg::FilterProcess - av_buffersrc_add_frame_flags"); - #endif - return VC_ERROR; - } diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp deleted file mode 100644 index c74b05e6a..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2013-08-01 17:35:11.000000000 +0200 -@@ -1043,7 +1043,7 @@ void CDVDDemuxFFmpeg::AddStream(int iId) - { - CDemuxStreamSubtitleFFmpeg* st = new CDemuxStreamSubtitleFFmpeg(this, pStream); - m_streams[iId] = st; -- st->identifier = pStream->codec->sub_id; -+ //st->identifier = pStream->codec->sub_id; - - if(m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0)) - st->m_description = m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0)->value; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxPVRClient_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxPVRClient_cpp deleted file mode 100644 index 735872732..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxPVRClient_cpp +++ /dev/null @@ -1,47 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp 2013-08-01 16:48:30.000000000 +0200 -@@ -349,7 +349,7 @@ void CDVDDemuxPVRClient::RequestStreams( - { - st = dynamic_cast<CDemuxStreamAudioPVRClient*>(stm); - if (!st -- || (st->codec != (CodecID)props.stream[i].iCodecId) -+ || (st->codec != (AVCodecID)props.stream[i].iCodecId) - || (st->iChannels != props.stream[i].iChannels)) - DisposeStream(i); - } -@@ -375,7 +375,7 @@ void CDVDDemuxPVRClient::RequestStreams( - { - st = dynamic_cast<CDemuxStreamVideoPVRClient*>(stm); - if (!st -- || (st->codec != (CodecID)props.stream[i].iCodecId) -+ || (st->codec != (AVCodecID)props.stream[i].iCodecId) - || (st->iWidth != props.stream[i].iWidth) - || (st->iHeight != props.stream[i].iHeight)) - DisposeStream(i); -@@ -399,7 +399,7 @@ void CDVDDemuxPVRClient::RequestStreams( - { - if (stm) - { -- if (stm->codec != (CodecID)props.stream[i].iCodecId) -+ if (stm->codec != (AVCodecID)props.stream[i].iCodecId) - DisposeStream(i); - } - if (!m_streams[i]) -@@ -411,7 +411,7 @@ void CDVDDemuxPVRClient::RequestStreams( - if (stm) - { - st = dynamic_cast<CDemuxStreamSubtitlePVRClient*>(stm); -- if (!st || (st->codec != (CodecID)props.stream[i].iCodecId)) -+ if (!st || (st->codec != (AVCodecID)props.stream[i].iCodecId)) - DisposeStream(i); - } - if (!m_streams[i]) -@@ -428,7 +428,7 @@ void CDVDDemuxPVRClient::RequestStreams( - m_streams[i] = new CDemuxStream(); - } - -- m_streams[i]->codec = (CodecID)props.stream[i].iCodecId; -+ m_streams[i]->codec = (AVCodecID)props.stream[i].iCodecId; - m_streams[i]->iId = i; - m_streams[i]->iPhysicalId = props.stream[i].iPhysicalId; - m_streams[i]->language[0] = props.stream[i].strLanguage[0]; diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h deleted file mode 100644 index cb849c5db..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h +++ /dev/null @@ -1,29 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h 2013-07-31 13:31:34.000000000 +0200 -@@ -35,7 +35,7 @@ class CDVDInputStream; - #include "config.h" - #endif - #ifndef _LINUX --enum CodecID; -+enum AVCodecID; - #include <libavcodec/avcodec.h> - #else - extern "C" { -@@ -88,7 +88,7 @@ public: - { - iId = 0; - iPhysicalId = 0; -- codec = (CodecID)0; // CODEC_ID_NONE -+ codec = (AVCodecID)0; // CODEC_ID_NONE - codec_fourcc = 0; - profile = FF_PROFILE_UNKNOWN; - level = 0; -@@ -118,7 +118,7 @@ public: - - int iId; // most of the time starting from 0 - int iPhysicalId; // id -- CodecID codec; -+ AVCodecID codec; - unsigned int codec_fourcc; // if available - int profile; // encoder profile of the stream reported by the decoder. used to qualify hw decoders. - int level; // encoder level of the stream reported by the decoder. used to qualify hw decoders. diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerAudio_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerAudio_h deleted file mode 100644 index c426d5c72..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerAudio_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDPlayerAudio.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDPlayerAudio.h 2013-07-31 13:31:10.000000000 +0200 -@@ -38,7 +38,7 @@ class CDVDAudioCodec; - class IAudioCallback; - class CDVDAudioCodec; - --enum CodecID; -+enum AVCodecID; - - #define DECODE_FLAG_DROP 1 - #define DECODE_FLAG_RESYNC 2 diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerVideo_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerVideo_h deleted file mode 100644 index 685535f93..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayerVideo_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDPlayerVideo.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDPlayerVideo.h 2013-07-31 13:27:19.000000000 +0200 -@@ -31,7 +31,7 @@ - #include "cores/VideoRenderers/RenderManager.h" - #endif - --enum CodecID; -+enum AVCodecID; - class CDemuxStreamVideo; - class CDVDOverlayCodecCC; - diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp deleted file mode 100644 index a8f2af5d8..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDPlayer_cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- xbmc-12.3-Frodo.orig/xbmc/cores/dvdplayer/DVDPlayer.cpp 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/xbmc/cores/dvdplayer/DVDPlayer.cpp 2014-01-31 17:45:02.259066528 +0100 -@@ -2897,6 +2897,14 @@ bool CDVDPlayer::OpenVideoStream(int iSt - if(m_CurrentVideo.id < 0 - || m_CurrentVideo.hint != hint) - { -+ // For audio files, don't open (M)JPEG artwork as video -+ if (m_pInputStream->GetContent().substr(0, 6) == "audio/" && hint.codec == AV_CODEC_ID_MJPEG || hint.codec == AV_CODEC_ID_MJPEGB || hint.codec == AV_CODEC_ID_PNG) -+ { -+ CLog::Log(LOGINFO, "%s - Ignoring video (art) in audio file %s", __FUNCTION__, m_filename.c_str()); -+ pStream->disabled = true; -+ pStream->SetDiscard(AVDISCARD_ALL); -+ return false; -+ } - if (!m_dvdPlayerVideo.OpenStream(hint)) - { - /* mark stream as disabled, to disallaw further attempts */ diff --git a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h b/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h deleted file mode 100644 index f1e08e7fc..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDStreamInfo.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDStreamInfo.h 2013-07-31 13:29:19.000000000 +0200 -@@ -25,7 +25,7 @@ - #endif - #ifndef _LINUX - enum StreamType; --enum CodecID; -+enum AVCodecID; - #else - #include "DVDDemuxers/DVDDemux.h" - extern "C" { -@@ -59,7 +59,7 @@ public: - void Assign(const CDVDStreamInfo &right, bool withextradata); - void Assign(const CDemuxStream &right, bool withextradata); - -- CodecID codec; -+ AVCodecID codec; - StreamType type; - bool software; //force software decoding - diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudioCodecOMX_cpp b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudioCodecOMX_cpp deleted file mode 100644 index e5238a67c..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudioCodecOMX_cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp 2013-08-01 11:16:43.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include "cores/AudioEngine/Utils/AEUtil.h" - -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 - #define MAX_AUDIO_FRAME_SIZE (AVCODEC_MAX_AUDIO_FRAME_SIZE*2) - - template <class AudioDataType> diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_cpp b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_cpp deleted file mode 100644 index 5fa0096d1..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/omxplayer/OMXAudio.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/omxplayer/OMXAudio.cpp 2013-07-31 13:42:40.000000000 +0200 -@@ -1225,7 +1225,7 @@ void COMXAudio::SetCodingType(AEDataForm - } - } - --bool COMXAudio::CanHWDecode(CodecID codec) -+bool COMXAudio::CanHWDecode(AVCodecID codec) - { - bool ret = false; - switch(codec) diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_h b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_h deleted file mode 100644 index 9f59c81cf..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXAudio_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/omxplayer/OMXAudio.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/omxplayer/OMXAudio.h 2013-07-31 13:21:40.000000000 +0200 -@@ -85,7 +85,7 @@ public: - void Process(); - - void SetCodingType(AEDataFormat dataFormat); -- static bool CanHWDecode(CodecID codec); -+ static bool CanHWDecode(AVCodecID codec); - - void PrintChannels(OMX_AUDIO_CHANNELTYPE eChannelMapping[]); - void PrintPCM(OMX_AUDIO_PARAM_PCMMODETYPE *pcm, std::string direction); diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp deleted file mode 100644 index c519df088..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXPlayer_cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- xbmc-12.3-Frodo.orig/xbmc/cores/omxplayer/OMXPlayer.cpp 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/xbmc/cores/omxplayer/OMXPlayer.cpp 2014-01-31 18:05:09.353171156 +0100 -@@ -3007,7 +3007,14 @@ bool COMXPlayer::OpenVideoStream(int iSt - if(m_CurrentVideo.id < 0 - || m_CurrentVideo.hint != hint) - { -- if (!m_player_video.OpenStream(hint)) -+ // for music file, don't open artwork as video -+ bool disabled = false; -+ if (m_pInputStream->GetContent().substr(0, 6) == "audio/" && hint.codec == AV_CODEC_ID_MJPEG || hint.codec == AV_CODEC_ID_MJPEGB || hint.codec == AV_CODEC_ID_PNG) -+ { -+ CLog::Log(LOGINFO, "%s - Ignoring video in audio filetype:%s", __FUNCTION__, m_filename.c_str()); -+ disabled = true; -+ } -+ if (disabled || !m_player_video.OpenStream(hint)) - { - /* mark stream as disabled, to disallaw further attempts */ - CLog::Log(LOGWARNING, "%s - Unsupported stream %d. Stream disabled.", __FUNCTION__, iStream); diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_cpp b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_cpp deleted file mode 100644 index 8aa00f6b6..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/omxplayer/OMXVideo.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/omxplayer/OMXVideo.cpp 2013-07-31 13:32:13.000000000 +0200 -@@ -131,7 +131,7 @@ bool COMXVideo::SendDecoderConfig() - return true; - } - --bool COMXVideo::NaluFormatStartCodes(enum CodecID codec, uint8_t *in_extradata, int in_extrasize) -+bool COMXVideo::NaluFormatStartCodes(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize) - { - switch(codec) - { diff --git a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_h b/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_h deleted file mode 100644 index 270a4fe5a..000000000 --- a/package/xbmc/patches/patch-xbmc_cores_omxplayer_OMXVideo_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/cores/omxplayer/OMXVideo.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/cores/omxplayer/OMXVideo.h 2013-07-31 13:17:20.000000000 +0200 -@@ -98,7 +98,7 @@ protected: - ResolutionUpdateCallBackFn m_res_callback; - void *m_res_ctx; - bool m_submitted_eos; -- bool NaluFormatStartCodes(enum CodecID codec, uint8_t *in_extradata, int in_extrasize); -+ bool NaluFormatStartCodes(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize); - }; - - #endif diff --git a/package/xbmc/patches/patch-xbmc_powermanagement_PowerManager_cpp b/package/xbmc/patches/patch-xbmc_powermanagement_PowerManager_cpp deleted file mode 100644 index 0959e9c4e..000000000 --- a/package/xbmc/patches/patch-xbmc_powermanagement_PowerManager_cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp 2014-01-29 07:59:01.000000000 +0100 -@@ -46,6 +46,9 @@ - #include "linux/ConsoleDeviceKitPowerSyscall.h" - #include "linux/SystemdUPowerSyscall.h" - #include "linux/UPowerSyscall.h" -+#ifdef HAS_SIMPLEPM -+#include "linux/LinuxPowerSyscall.h" -+#endif - #ifdef HAS_HAL - #include "linux/HALPowerSyscall.h" - #endif -@@ -83,6 +86,10 @@ void CPowerManager::Initialize() - m_instance = new CSystemdUPowerSyscall(); - else if (CUPowerSyscall::HasUPower()) - m_instance = new CUPowerSyscall(); -+#ifdef HAS_SIMPLEPM -+ else -+ m_instance = new CLinuxPowerSyscall(); -+#endif - #ifdef HAS_HAL - else - m_instance = new CHALPowerSyscall(); diff --git a/package/xbmc/patches/patch-xbmc_powermanagement_linux_Makefile b/package/xbmc/patches/patch-xbmc_powermanagement_linux_Makefile deleted file mode 100644 index fefd93909..000000000 --- a/package/xbmc/patches/patch-xbmc_powermanagement_linux_Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile 2014-01-29 07:59:01.000000000 +0100 -@@ -2,7 +2,8 @@ SRCS=ConsoleDeviceKitPowerSyscall.cpp \ - ConsoleUPowerSyscall.cpp \ - HALPowerSyscall.cpp \ - UPowerSyscall.cpp \ -- SystemdUPowerSyscall.cpp -+ SystemdUPowerSyscall.cpp \ -+ LinuxPowerSyscall.cpp - - LIB=powermanagement_linux.a - diff --git a/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_cpp b/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_cpp deleted file mode 100644 index 64d7e0179..000000000 --- a/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/utils/BitstreamConverter.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/utils/BitstreamConverter.cpp 2013-07-31 13:28:28.000000000 +0200 -@@ -431,7 +431,7 @@ CBitstreamConverter::~CBitstreamConverte - Close(); - } - --bool CBitstreamConverter::Open(enum CodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb) -+bool CBitstreamConverter::Open(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb) - { - m_to_annexb = to_annexb; - diff --git a/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_h b/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_h deleted file mode 100644 index 1712372fb..000000000 --- a/package/xbmc/patches/patch-xbmc_utils_BitstreamConverter_h +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-12.2.orig/xbmc/utils/BitstreamConverter.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/utils/BitstreamConverter.h 2013-07-31 13:28:52.000000000 +0200 -@@ -114,7 +114,7 @@ public: - static void skip_bits( bits_reader_t *br, int nbits ); - static uint32_t get_bits( bits_reader_t *br, int nbits ); - -- bool Open(enum CodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb); -+ bool Open(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb); - void Close(void); - bool NeedConvert(void) { return m_convert_bitstream; }; - bool Convert(uint8_t *pData, int iSize); -@@ -163,7 +163,7 @@ protected: - bool m_convert_bytestream; - DllAvUtil *m_dllAvUtil; - DllAvFormat *m_dllAvFormat; -- CodecID m_codec; -+ AVCodecID m_codec; - }; - - #endif diff --git a/package/xbmc/patches/patch-xbmc_utils_CharsetConverter_cpp b/package/xbmc/patches/patch-xbmc_utils_CharsetConverter_cpp deleted file mode 100644 index 3c5753033..000000000 --- a/package/xbmc/patches/patch-xbmc_utils_CharsetConverter_cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-12.2.orig/xbmc/utils/CharsetConverter.cpp 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/utils/CharsetConverter.cpp 2013-11-05 14:10:44.000000000 +0100 -@@ -140,7 +140,7 @@ static struct SCharsetMapping - #define ICONV_PREPARE(iconv) iconv=(iconv_t)-1 - #define ICONV_SAFE_CLOSE(iconv) if (iconv!=(iconv_t)-1) { iconv_close(iconv); iconv=(iconv_t)-1; } - --size_t iconv_const (void* cd, const char** inbuf, size_t *inbytesleft, -+size_t iconv_const (iconv_t cd, const char** inbuf, size_t *inbytesleft, - char* * outbuf, size_t *outbytesleft) - { - struct iconv_param_adapter { -@@ -157,7 +157,7 @@ size_t iconv_const (void* cd, const char - const char** p; - }; - -- return iconv((iconv_t)cd, iconv_param_adapter(inbuf), inbytesleft, outbuf, outbytesleft); -+ return iconv(cd, iconv_param_adapter(inbuf), inbytesleft, outbuf, outbytesleft); - } - - template<class INPUT,class OUTPUT> diff --git a/package/xbmc/patches/patch-xbmc_utils_EndianSwap_h b/package/xbmc/patches/patch-xbmc_utils_EndianSwap_h deleted file mode 100644 index 196771daa..000000000 --- a/package/xbmc/patches/patch-xbmc_utils_EndianSwap_h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc-12.2.orig/xbmc/utils/EndianSwap.h 2013-05-03 07:57:41.000000000 +0200 -+++ xbmc-12.2/xbmc/utils/EndianSwap.h 2013-08-01 14:17:04.000000000 +0200 -@@ -26,7 +26,7 @@ - /* Include config.h to define (or not) WORDS_BIGENDIAN - File created by configure */ - #if defined(__linux__) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) --#include "config.h" -+#include "../config.h" - #include <inttypes.h> - #endif - #ifdef _WIN32 diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index b618c59b7..6df099647 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -165,6 +165,7 @@ config ADK_KPACKAGE_KMOD_SND_IMX_SOC depends on ADK_TARGET_SYSTEM_CUBOX_I select ADK_KPACKAGE_KMOD_SND select ADK_KPACKAGE_KMOD_SND_SOC + select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37 select ADK_KERNEL_SND_SOC_IMX_PCM_DMA select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA select ADK_KERNEL_SND_SOC_IMX_HDMI |