]> git.pld-linux.org Git - packages/xbmc.git/commitdiff
- Removed unneeded files. auto/th/xbmc-13.2-1
authorLukasz Masko <lmasko@pld-linux.org>
Sat, 4 Oct 2014 12:26:07 +0000 (14:26 +0200)
committerLukasz Masko <lmasko@pld-linux.org>
Sat, 4 Oct 2014 12:26:07 +0000 (14:26 +0200)
ffmpeg2.2.patch [deleted file]
ffmpeg2.patch [deleted file]
smbclient.patch [deleted file]
xbmc-vdpau.patch [deleted file]

diff --git a/ffmpeg2.2.patch b/ffmpeg2.2.patch
deleted file mode 100644 (file)
index d880e17..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 632475b20822b010cf18255ce41530ac490cd118 Mon Sep 17 00:00:00 2001
-From: Georgi Chorbadzhiyski <gf@unixsol.org>
-Date: Fri, 20 Dec 2013 00:25:34 +0200
-Subject: [PATCH] Fix compilation error related to removed structure field by
- ffmpeg.
-
-ffmpeg removed reference_dts field in struct AVStream.
-
-Related ffmpeg commit:
-  http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=2ba68dd044ca8fc591139c05563840f546a9c0c0
----
- lib/xbmc-dll-symbols/DllAvFormat.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/xbmc-dll-symbols/DllAvFormat.c b/lib/xbmc-dll-symbols/DllAvFormat.c
-index 4b09663..a592a1f 100644
---- a/lib/xbmc-dll-symbols/DllAvFormat.c
-+++ b/lib/xbmc-dll-symbols/DllAvFormat.c
-@@ -112,7 +112,9 @@ void xbmc_read_frame_flush(AVFormatContext *s)
- #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 */
-+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(55,0,0)
-         st->reference_dts = AV_NOPTS_VALUE;
-+#endif
-         st->probe_packets = MAX_PROBE_PACKETS;
- #endif
--- 
-1.8.5.5
-
diff --git a/ffmpeg2.patch b/ffmpeg2.patch
deleted file mode 100644 (file)
index f9bf269..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-From 9f24c9a44aa625277e5c5f1d251cff262d0bc259 Mon Sep 17 00:00:00 2001\r
-From: FlyingRat <flyingrat@outlook.com>\r
-Date: Mon, 29 Apr 2013 10:49:06 +0200\r
-Subject: [PATCH] xbmc adjustments for ffmpeg master head, rev b691bc4,\r
- 2013-04-29\r
-\r
----\r
- lib/DllAvCodec.h                                   |  8 +++\r
- lib/DllAvFilter.h                                  | 15 ++++--\r
- xbmc/cores/dvdplayer/DVDAudio.h                    |  5 ++\r
- .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp        |  2 +\r
- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h        |  5 ++\r
- 6 files changed, 94 insertions(+), 3 deletions(-)\r
- create mode 100755 lib/ffmpeg/build_xbmc_win32.sh\r
-\r
-diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h\r
-index 2b4ee22..5114a65 100644\r
---- a/lib/DllAvCodec.h\r
-+++ b/lib/DllAvCodec.h\r
-@@ -41,6 +41,14 @@\r
- #ifndef __GNUC__\r
- #pragma warning(disable:4244)\r
- #endif\r
-+    \r
-+#if !defined(CodecID)                         // @FFMPEGHEAD TODO: CodecID decrepated and autodef removed, define/rename AVCodecID globaly?\r
-+#define CodecID AVCodecID\r
-+#endif\r
-+\r
-+#if !defined(AVCODEC_MAX_AUDIO_FRAME_SIZE)    // @FFMPEGHEAD TODO: stick with this or check for possible other solution?\r
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000   // 1 second of 48khz 32bit audio (defintion orginated from ffmpeg)\r
-+#endif\r
\r
- #if (defined USE_EXTERNAL_FFMPEG)\r
-   #if (defined HAVE_LIBAVCODEC_AVCODEC_H)\r
-diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h\r
-index d44b918..5082618 100644\r
---- a/lib/DllAvFilter.h\r
-+++ b/lib/DllAvFilter.h\r
-@@ -20,6 +20,9 @@\r
-  *\r
-  */\r
\r
-+// #define av_buffersrc_add_frame(ctx,frame) av_buffersrc_add_frame_flags(ctx, frame, 0);\r
-+\r
-+\r
- #if (defined HAVE_CONFIG_H) && (!defined WIN32)\r
-   #include "config.h"\r
- #endif\r
-@@ -56,6 +59,9 @@\r
-   #include "libavfilter/buffersink.h"\r
-   #include "libavfilter/avcodec.h"\r
- #endif\r
-+\r
-+#include "libavfilter/buffersrc.h"  // @FFMPEGHEAD temp hack\r
-+    \r
- }\r
\r
- #if LIBAVFILTER_VERSION_MICRO >= 100\r
-@@ -146,9 +153,9 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface\r
-     return ::avfilter_graph_config(graphctx, log_ctx);\r
-   }\r
- #if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,0,0)\r
--  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); }\r
-+  virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame_flags(buffer_filter, frame, flags); }\r
- #else\r
--  virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame* frame, int flags) { return ::av_buffersrc_add_frame(buffer_filter, frame, flags); }\r
-+  virtual int av_buffersrc_add_frame(AVFilterContext *buffer_filter, AVFrame* frame, int flags) { return ::av_buffersrc_add_frame_flags(buffer_filter, frame, flags); }\r
- #endif\r
-   virtual void avfilter_unref_buffer(AVFilterBufferRef *ref) { ::avfilter_unref_buffer(ref); }\r
-   virtual int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad) { return ::avfilter_link(src, srcpad, dst, dstpad); }\r
-diff --git a/xbmc/cores/dvdplayer/DVDAudio.h b/xbmc/cores/dvdplayer/DVDAudio.h\r
-index e76d443..1a1b840 100644\r
---- a/xbmc/cores/dvdplayer/DVDAudio.h\r
-+++ b/xbmc/cores/dvdplayer/DVDAudio.h\r
-@@ -42,6 +43,10 @@\r
- #endif\r
- }\r
- #endif\r
-+#if !defined (CodecID)\r
-+#define CodecID AVCodecID       //@FFMPEGHEAD TODO: CodecID decrepated and autodef removed, possible rename to AVCodecID globaly?\r
-+#endif\r
-+\r
- typedef struct stDVDAudioFrame DVDAudioFrame;\r
\r
- class CPTSOutputQueue\r
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp\r
-index eb45f9a..33c9da0 100644\r
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp\r
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp\r
-@@ -18,6 +18,8 @@\r
-  *\r
-  */\r
\r
-+#define FF_API_AVFILTERBUFFER 1               // @FFMPEGHEAD enable av_buffersrc_buffer & co. TODO: check for alt sol.\r
-+\r
- #include "system.h"\r
- #if (defined HAVE_CONFIG_H) && (!defined WIN32)\r
-   #include "config.h"\r
-diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h\r
-index bdad65b..8db5d7b 100644\r
---- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h\r
-+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h\r
-@@ -51,6 +52,10 @@\r
- }\r
- #endif\r
\r
-+#if !defined (CodecID)\r
-+#define CodecID AVCodecID       //@FFMPEGHEAD TODO: CodecID decrepated and autodef removed, possible rename to AVCodecID glob\r
-+#endif\r
-+\r
- #ifndef __GNUC__\r
- #pragma warning(pop)\r
- #endif\r
--- \r
-1.8.1.6\r
---- xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp~        2013-05-03 07:57:41.000000000 +0200\r
-+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp 2013-08-29 17:52:04.730897230 +0200\r
-@@ -60,7 +60,7 @@\r
-   m_pCodecContext->debug_mv = 0;\r
-   m_pCodecContext->debug = 0;\r
-   m_pCodecContext->workaround_bugs = FF_BUG_AUTODETECT;\r
--  m_pCodecContext->sub_id = hints.identifier;\r
-+//  m_pCodecContext->sub_id = hints.identifier;\r
-   m_pCodecContext->codec_tag = hints.codec_tag;\r
-   m_pCodecContext->time_base.num = 1;\r
-   m_pCodecContext->time_base.den = DVD_TIME_BASE;\r
---- xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp~     2013-05-03 07:57:41.000000000 +0200\r
-+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp      2013-08-29 17:53:46.268749616 +0200\r
-@@ -1043,7 +1043,7 @@\r
-         {\r
-           CDemuxStreamSubtitleFFmpeg* st = new CDemuxStreamSubtitleFFmpeg(this, pStream);\r
-           m_streams[iId] = st;\r
--          st->identifier = pStream->codec->sub_id;\r
-+//          st->identifier = pStream->codec->sub_id;\r
-           \r
-           if(m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0))\r
-             st->m_description = m_dllAvUtil.av_dict_get(pStream->metadata, "title", NULL, 0)->value;\r
---- xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp~    2013-08-29 17:38:17.554580558 +0200\r
-+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp     2013-08-29 17:58:10.471835362 +0200\r
-@@ -275,7 +275,7 @@\r
-   }\r
\r
-   // set acceleration\r
--  m_pCodecContext->dsp_mask = 0;//FF_MM_FORCE | FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE;\r
-+//  m_pCodecContext->dsp_mask = 0;//FF_MM_FORCE | FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE;\r
\r
-   // advanced setting override for skip loop filter (see avcodec.h for valid options)\r
-   // TODO: allow per video setting?\r
diff --git a/smbclient.patch b/smbclient.patch
deleted file mode 100644 (file)
index b19e187..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- xbmc-12.3-Frodo/configure.in~      2014-01-21 12:39:13.709404239 +0100
-+++ xbmc-12.3-Frodo/configure.in       2014-01-21 12:44:02.928731740 +0100
-@@ -1309,7 +1309,8 @@
- # samba
- if test "x$use_samba" != "xno"; then
--  AC_CHECK_LIB([smbclient], [main],,
-+  PKG_CHECK_MODULES([LIBSMBCLIENT],    [smbclient],
-+  [INCLUDES="$INCLUDES $LIBSMBCLIENT_CFLAGS"; LIBS="$LIBS $LIBSMBCLIENT_LIBS"],
-     use_samba=no;AC_MSG_ERROR($missing_library))
-     USE_LIBSMBCLIENT=0
- else
diff --git a/xbmc-vdpau.patch b/xbmc-vdpau.patch
deleted file mode 100644 (file)
index 621bcd8..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
---- xbmc-12.3-Frodo/configure.in.orig  2013-12-12 22:47:49.000000000 +0100
-+++ xbmc-12.3-Frodo/configure.in       2014-01-03 22:57:57.000000000 +0100
-@@ -1573,15 +1573,6 @@
-   USE_EXTERNAL_FFMPEG=1
-   AC_DEFINE([USE_EXTERNAL_FFMPEG], [1], [Whether to use external FFmpeg libraries.])
--  # Disable vdpau support if external libavcodec doesn't have it
--  AC_CHECK_LIB([avcodec], [ff_vdpau_vc1_decode_picture],,
--    [if test "x$use_vdpau" = "xyes"; then
--      AC_MSG_ERROR($ffmpeg_vdpau_not_supported)
--    else
--      use_vdpau=no
--      AC_MSG_RESULT($ffmpeg_vdpau_not_supported)
--    fi])
--
-   # Check for 'PIX_FMT_VDPAU_MPEG4' from libavutil
-   if test "x$use_vdpau" != "xno"; then
-     AC_LANG_PUSH([C++])
-@@ -2539,7 +2530,7 @@
-     # extra-cflags must be passed alone or it gets expanded wrong by the ffmpeg configure
-     FFMPEG_EXTRACFLAGS="$CFLAGS $FFMPEG_EXTRACFLAGS -w -D_DARWIN_C_SOURCE -Dattribute_deprecated="
--    ./configure --extra-cflags="$FFMPEG_EXTRACFLAGS" $ffmpg_config --as="$AS"
-+    LDFLAGS="$LDFLAGS" ./configure --extra-cflags="$FFMPEG_EXTRACFLAGS" $ffmpg_config --as="$AS"
-     # if using llvm-gcc-4.2 as assembler, -MMD is not enough to generate
-     # dependency files in the right place, replace it with something that works
This page took 0.050047 seconds and 5 git commands to generate.