Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4a1cd7d112de8caf0751fa9d65ef2cde47b4d886)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4a1cd7d112de8caf0751fa9d65ef2cde47b4d886)
  • Date: Fri, 25 Mar 2016 15:11:30 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog |
1
doc/asciidoc/DETAILS |
4
doc/asciidoc/HISTORY |
3
ftp/curl/DETAILS |
2
ftp/curl/HISTORY |
3
utils/acpid2/DETAILS |
4
utils/acpid2/HISTORY |
3
utils/fatrace/BUILD |
1
utils/fatrace/DETAILS |
16
utils/fatrace/HISTORY |
3
utils/fatrace/INSTALL |
1
utils/kexec-tools/DETAILS |
8
utils/kexec-tools/HISTORY |
3
video-libs/live/DETAILS |
4
video-libs/live/HISTORY |
3
video/kodi/0001-ffmpeg-Update-AVPixelFormat-and-AV_PIX_FMT_-to-compi.patch |
663 ++++++++++
video/kodi/HISTORY |
5
video/kodi/PRE_BUILD |
3
xorg-lib/libxkbcommon/DETAILS |
4
xorg-lib/libxkbcommon/HISTORY |
3
20 files changed, 723 insertions(+), 14 deletions(-)

New commits:
commit 4a1cd7d112de8caf0751fa9d65ef2cde47b4d886
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/kodi: fix build against ffmpeg 3

commit 422cc4205734a602427d0a86d5d4447a72ad2161
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

ftp/curl: version 7.48.0

commit ff519f744f03f4cde57f53e7b69241716cd8ff82
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/acpid2: version 2.0.27

commit df82f548b62671156473f562c85e222141a3089f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-lib/libxkbcommon: version 0.6.0

commit a61aeb13a5261a1050342dbca2fc10f7b63b697c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/fatrace: new spell, a file access tracer

commit 6f2b5f3a5ef16e523c2d86d9c66385fa1a7307d6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video-libs/live: version 2016.03.16

commit 7d1fc926cbfa8e14a24ed11591dc37f5fa3de266
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

doc/asciidoc: version 8.6.9

commit 14751930696ec1838123fdd440b96f6d3ef0cb03
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/kexec-tools: version 2.0.12

diff --git a/ChangeLog b/ChangeLog
index 8f09e18..88e28ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2016-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* libs/libcerf: new spell, a numeric library of error functions
+ * utils/fatrace: new spell, a file access tracer

2016-03-23 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-edu/libkdeedu: delete unneed spell
diff --git a/doc/asciidoc/DETAILS b/doc/asciidoc/DETAILS
index 607cdc0..d779a19 100755
--- a/doc/asciidoc/DETAILS
+++ b/doc/asciidoc/DETAILS
@@ -1,6 +1,6 @@
SPELL=asciidoc
- VERSION=8.6.7
-
SOURCE_HASH=sha512:16243bab9a9eb2f3e696e6d8e4ad64f5a3e6313f95a7d1c47f9ca080366b23b45bbc5bf63ff75ae58085bbed035e4ccd94b9304e67d1c2b0ebfa4f7ba72bc261
+ VERSION=8.6.9
+
SOURCE_HASH=sha512:1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"

SOURCE_URL=http://downloads.sourceforge.net/sourceforge/$SPELL/${SOURCE}
diff --git a/doc/asciidoc/HISTORY b/doc/asciidoc/HISTORY
index b78ab97..09611ed 100644
--- a/doc/asciidoc/HISTORY
+++ b/doc/asciidoc/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 8.6.9
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index b37e7a1..3ede96d 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,5 +1,5 @@
SPELL=curl
- VERSION=7.47.0
+ VERSION=7.48.0
SECURITY_PATCH=15
SOURCE=$SPELL-$VERSION.tar.lzma
SOURCE2=$SOURCE.asc
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index a9df245..7770241 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.48.0
+
2016-02-04 Treeve Jelbert <treeve AT sourcemage.org>
* UP_TRIGGERS: improve, fewer rebuilds

diff --git a/utils/acpid2/DETAILS b/utils/acpid2/DETAILS
index c040d3b..3c27eca 100755
--- a/utils/acpid2/DETAILS
+++ b/utils/acpid2/DETAILS
@@ -1,7 +1,7 @@
SPELL=acpid2
SPELLX=acpid
- VERSION=2.0.25
-
SOURCE_HASH=sha512:8a2561549aa05d1dd763a973145b37bedf935df1d73310b09bd52473b51fdc14bbb10da6e4bd1c2086962d92bd12f3a03924cfe75b2d50bf95b50ded9b67b05f
+ VERSION=2.0.27
+
SOURCE_HASH=sha512:0633f494b7f8cfd362f8baad9c69508acb650ea6545a59e6ec572aef610244341ea851084c737ede4bfcf8822431ac01e4b90f5e505cb838683296749307c22f
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/utils/acpid2/HISTORY b/utils/acpid2/HISTORY
index 25d1e7f..b284b8e 100644
--- a/utils/acpid2/HISTORY
+++ b/utils/acpid2/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.27
+
2015-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.25

diff --git a/utils/fatrace/BUILD b/utils/fatrace/BUILD
new file mode 100755
index 0000000..6dfecc1
--- /dev/null
+++ b/utils/fatrace/BUILD
@@ -0,0 +1 @@
+default_build_make
diff --git a/utils/fatrace/DETAILS b/utils/fatrace/DETAILS
new file mode 100755
index 0000000..8acb922
--- /dev/null
+++ b/utils/fatrace/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=fatrace
+ VERSION=0.11
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=https://launchpad.net/${SPELL}/trunk/${VERSION}/+download/${SOURCE}
+
SOURCE_HASH=sha512:4849f5f2aff423f915caedb63323c3888146124f856e141090bdc8eeff812b473ed194116684edd7ca0f10239c7e765740f109f0da0d364cd231430f6f5da441
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://launchpad.net/fatrace";
+ LICENSE[0]=GPL
+ ENTERED=20160325
+ SHORT="fatrace reports file access events from all running
processes"
+cat << EOF
+fatrace reports file access events from all running processes.
+
+Its main purpose is to find processes which keep waking up the disk
+unnecessarily and thus prevent some power saving.
+EOF
diff --git a/utils/fatrace/HISTORY b/utils/fatrace/HISTORY
new file mode 100644
index 0000000..4674de9
--- /dev/null
+++ b/utils/fatrace/HISTORY
@@ -0,0 +1,3 @@
+2016-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, INSTALL: spell created
+
diff --git a/utils/fatrace/INSTALL b/utils/fatrace/INSTALL
new file mode 100755
index 0000000..e0074f3
--- /dev/null
+++ b/utils/fatrace/INSTALL
@@ -0,0 +1 @@
+PREFIX=${INSTALL_ROOT}/usr default_install
diff --git a/utils/kexec-tools/DETAILS b/utils/kexec-tools/DETAILS
index 25ac209..584dbbe 100755
--- a/utils/kexec-tools/DETAILS
+++ b/utils/kexec-tools/DETAILS
@@ -1,14 +1,14 @@
SPELL=kexec-tools
- VERSION=2.0.4
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=2.0.12
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=$KERNEL_URL/pub/linux/utils/kernel/kexec/$SOURCE
-
SOURCE_HASH=sha512:8392114a6c6c101af1613ac0d1e5923f51fcff5c13c4414e37493c047b8d17bb34a934e6fa6dd83fcba063668578ab3f92da61c3303dadfe761d798cbba0e645
+
SOURCE_HASH=sha512:d192f841180daf534f7214b6c7c5dcd9de0e5616e8cb0da164c24e8b5903a2f65bb1fbe6ca29a3b9077fa6f6435cc33fda19a96584e1f393ee7a2fe56f374dab
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/kexec/
ENTERED=20050724
LICENCE=GPL2
KEYWORDS="utils"
- SHORT="set of tools for the kernels kexec feature"
+ SHORT="set of tools for the kernels kexec feature"
cat << EOF
kexec is a user space utiltity for loading another kernel
and asking the currently running kernel to do something with it.
diff --git a/utils/kexec-tools/HISTORY b/utils/kexec-tools/HISTORY
index fa924b2..bd8a6a1 100644
--- a/utils/kexec-tools/HISTORY
+++ b/utils/kexec-tools/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.12
+
2014-11-23 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Use disable_pic function to fix CFLAGS

diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index 9a79484..36928f2 100755
--- a/video-libs/live/DETAILS
+++ b/video-libs/live/DETAILS
@@ -1,7 +1,7 @@
SPELL=live
- VERSION=2015.04.16
+ VERSION=2016.03.16
SOURCE=$SPELL.$VERSION.tar.gz
-
SOURCE_HASH=sha512:22006bf4afea9e9e18235bf6892d83eb70d89a1aec4b4e8cd47f4a0e5b217fa221d32e21be779f4d0e0c7704dda03a0329dc1fc6d51ca3c66a263867b3b2e6e0
+
SOURCE_HASH=sha512:087bd44204693dd7049cb87bd984afae9a481db97b88d339b41c0e1be2aea911012cb9cfed305c62dff42f1c68291673d179375be6e83539f68cbba32ddb3bba
#SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE
diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY
index 6d5f25d..da558df 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2016.03.16
+
2015-04-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2015.04.16

diff --git
a/video/kodi/0001-ffmpeg-Update-AVPixelFormat-and-AV_PIX_FMT_-to-compi.patch
b/video/kodi/0001-ffmpeg-Update-AVPixelFormat-and-AV_PIX_FMT_-to-compi.patch
new file mode 100644
index 0000000..11b120a
--- /dev/null
+++
b/video/kodi/0001-ffmpeg-Update-AVPixelFormat-and-AV_PIX_FMT_-to-compi.patch
@@ -0,0 +1,663 @@
+From 28f2ab443d2c6b919a625865bea379241defbdb4 Mon Sep 17 00:00:00 2001
+From: Philip Langdale <philipl AT overt.org>
+Date: Mon, 21 Sep 2015 19:49:36 -0700
+Subject: [PATCH] ffmpeg: Update AVPixelFormat and AV_PIX_FMT_* to compile
with
+ master
+
+The deprecated PixelFormat and PIX_FMT_* names have been removed in
+ffmpeg master.
+---
+ xbmc/cores/FFmpeg.h | 18 -----------
+ xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 22 ++++++-------
+ xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 4 +--
+ xbmc/cores/VideoRenderers/WinRenderer.cpp | 24 +++++++--------
+ xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp | 36
+++++++++++-----------
+ .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 22 ++++++-------
+ .../DVDCodecs/Video/DVDVideoCodecFFmpeg.h | 6 ++--
+ .../dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp | 16 +++++-----
+ xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp | 6 ++--
+ xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h | 4 +--
+ xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 2 +-
+ xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h | 2 +-
+ xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp | 2 +-
+ xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h | 2 +-
+ xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 4 +--
+ xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h | 4 +--
+ .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 6 ++--
+ xbmc/cores/dvdplayer/DVDFileInfo.cpp | 2 +-
+ xbmc/pictures/Picture.cpp | 6 ++--
+ xbmc/video/FFmpegVideoDecoder.cpp | 4 +--
+ 20 files changed, 87 insertions(+), 105 deletions(-)
+
+diff --git a/xbmc/cores/FFmpeg.h b/xbmc/cores/FFmpeg.h
+index ca12b01..b920af3 100644
+--- a/xbmc/cores/FFmpeg.h
++++ b/xbmc/cores/FFmpeg.h
+@@ -24,7 +24,6 @@
+ #include "utils/CPUInfo.h"
+
+ extern "C" {
+-#include "libswscale/swscale.h"
+ #include "libavcodec/avcodec.h"
+ #include "libavformat/avformat.h"
+ #include "libavutil/avutil.h"
+@@ -33,23 +32,6 @@ extern "C" {
+ #include "libpostproc/postprocess.h"
+ }
+
+-inline int SwScaleCPUFlags()
+-{
+- unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
+- int flags = 0;
+-
+- if (cpuFeatures & CPU_FEATURE_MMX)
+- flags |= SWS_CPU_CAPS_MMX;
+- if (cpuFeatures & CPU_FEATURE_MMX2)
+- flags |= SWS_CPU_CAPS_MMX2;
+- if (cpuFeatures & CPU_FEATURE_3DNOW)
+- flags |= SWS_CPU_CAPS_3DNOW;
+- if (cpuFeatures & CPU_FEATURE_ALTIVEC)
+- flags |= SWS_CPU_CAPS_ALTIVEC;
+-
+- return flags;
+-}
+-
+ inline int PPCPUFlags()
+ {
+ unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
+diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+index cd5f2b3..47fd328 100644
+--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
++++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+@@ -2932,7 +2932,7 @@ void CLinuxRendererGL::ToRGBFrame(YV12Image* im,
unsigned flipIndexPlane, unsign
+ }
+ else if (m_format == RENDER_FMT_NV12)
+ {
+- srcFormat = PIX_FMT_NV12;
++ srcFormat = AV_PIX_FMT_NV12;
+ for (int i = 0; i < 2; i++)
+ {
+ src[i] = im->plane[i];
+@@ -2941,13 +2941,13 @@ void CLinuxRendererGL::ToRGBFrame(YV12Image* im,
unsigned flipIndexPlane, unsign
+ }
+ else if (m_format == RENDER_FMT_YUYV422)
+ {
+- srcFormat = PIX_FMT_YUYV422;
++ srcFormat = AV_PIX_FMT_YUYV422;
+ src[0] = im->plane[0];
+ srcStride[0] = im->stride[0];
+ }
+ else if (m_format == RENDER_FMT_UYVY422)
+ {
+- srcFormat = PIX_FMT_UYVY422;
++ srcFormat = AV_PIX_FMT_UYVY422;
+ src[0] = im->plane[0];
+ srcStride[0] = im->stride[0];
+ }
+@@ -2965,8 +2965,8 @@ void CLinuxRendererGL::ToRGBFrame(YV12Image* im,
unsigned flipIndexPlane, unsign
+
+ m_context = sws_getCachedContext(m_context,
+ im->width, im->height,
(AVPixelFormat)srcFormat,
+- im->width, im->height,
(AVPixelFormat)PIX_FMT_BGRA,
+- SWS_FAST_BILINEAR |
SwScaleCPUFlags(), NULL, NULL, NULL);
++ im->width, im->height,
(AVPixelFormat)AV_PIX_FMT_BGRA,
++ SWS_FAST_BILINEAR, NULL,
NULL, NULL);
+
+ uint8_t *dst[] = { m_rgbBuffer, 0, 0, 0 };
+ int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
+@@ -2995,7 +2995,7 @@ void CLinuxRendererGL::ToRGBFields(YV12Image* im,
unsigned flipIndexPlaneTop, un
+
+ if (m_format == RENDER_FMT_YUV420P)
+ {
+- srcFormat = PIX_FMT_YUV420P;
++ srcFormat = AV_PIX_FMT_YUV420P;
+ for (int i = 0; i < 3; i++)
+ {
+ srcTop[i] = im->plane[i];
+@@ -3006,7 +3006,7 @@ void CLinuxRendererGL::ToRGBFields(YV12Image* im,
unsigned flipIndexPlaneTop, un
+ }
+ else if (m_format == RENDER_FMT_NV12)
+ {
+- srcFormat = PIX_FMT_NV12;
++ srcFormat = AV_PIX_FMT_NV12;
+ for (int i = 0; i < 2; i++)
+ {
+ srcTop[i] = im->plane[i];
+@@ -3017,7 +3017,7 @@ void CLinuxRendererGL::ToRGBFields(YV12Image* im,
unsigned flipIndexPlaneTop, un
+ }
+ else if (m_format == RENDER_FMT_YUYV422)
+ {
+- srcFormat = PIX_FMT_YUYV422;
++ srcFormat = AV_PIX_FMT_YUYV422;
+ srcTop[0] = im->plane[0];
+ srcStrideTop[0] = im->stride[0] * 2;
+ srcBot[0] = im->plane[0] + im->stride[0];
+@@ -3025,7 +3025,7 @@ void CLinuxRendererGL::ToRGBFields(YV12Image* im,
unsigned flipIndexPlaneTop, un
+ }
+ else if (m_format == RENDER_FMT_UYVY422)
+ {
+- srcFormat = PIX_FMT_UYVY422;
++ srcFormat = AV_PIX_FMT_UYVY422;
+ srcTop[0] = im->plane[0];
+ srcStrideTop[0] = im->stride[0] * 2;
+ srcBot[0] = im->plane[0] + im->stride[0];
+@@ -3045,8 +3045,8 @@ void CLinuxRendererGL::ToRGBFields(YV12Image* im,
unsigned flipIndexPlaneTop, un
+
+ m_context = sws_getCachedContext(m_context,
+ im->width, im->height >>
1, (AVPixelFormat)srcFormat,
+- im->width, im->height >>
1, (AVPixelFormat)PIX_FMT_BGRA,
+- SWS_FAST_BILINEAR |
SwScaleCPUFlags(), NULL, NULL, NULL);
++ im->width, im->height >>
1, (AVPixelFormat)AV_PIX_FMT_BGRA,
++ SWS_FAST_BILINEAR, NULL,
NULL, NULL);
+ uint8_t *dstTop[] = { m_rgbBuffer, 0, 0, 0 };
+ uint8_t *dstBot[] = { m_rgbBuffer + m_sourceWidth * m_sourceHeight *
2, 0, 0, 0 };
+ int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
+diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
+index 1c4715a..873658d 100644
+--- a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
++++ b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
+@@ -2006,8 +2006,8 @@ void CLinuxRendererGLES::UploadYV12Texture(int source)
+ #endif
+ {
+ m_sw_context = sws_getCachedContext(m_sw_context,
+- im->width, im->height, PIX_FMT_YUV420P,
+- im->width, im->height, PIX_FMT_RGBA,
++ im->width, im->height, AV_PIX_FMT_YUV420P,
++ im->width, im->height, AV_PIX_FMT_RGBA,
+ SWS_FAST_BILINEAR, NULL, NULL, NULL);
+
+ uint8_t *src[] = { im->plane[0], im->plane[1], im->plane[2], 0 };
+diff --git a/xbmc/cores/VideoRenderers/WinRenderer.cpp
b/xbmc/cores/VideoRenderers/WinRenderer.cpp
+index ff85274..53b3567 100644
+--- a/xbmc/cores/VideoRenderers/WinRenderer.cpp
++++ b/xbmc/cores/VideoRenderers/WinRenderer.cpp
+@@ -94,16 +94,16 @@ CWinRenderer::~CWinRenderer()
+ UnInit();
+ }
+
+-static enum PixelFormat PixelFormatFromFormat(ERenderFormat format)
++static enum AVPixelFormat PixelFormatFromFormat(ERenderFormat format)
+ {
+- if (format == RENDER_FMT_DXVA) return PIX_FMT_NV12;
+- if (format == RENDER_FMT_YUV420P) return PIX_FMT_YUV420P;
+- if (format == RENDER_FMT_YUV420P10) return PIX_FMT_YUV420P10;
+- if (format == RENDER_FMT_YUV420P16) return PIX_FMT_YUV420P16;
+- if (format == RENDER_FMT_NV12) return PIX_FMT_NV12;
+- if (format == RENDER_FMT_UYVY422) return PIX_FMT_UYVY422;
+- if (format == RENDER_FMT_YUYV422) return PIX_FMT_YUYV422;
+- return PIX_FMT_NONE;
++ if (format == RENDER_FMT_DXVA) return AV_PIX_FMT_NV12;
++ if (format == RENDER_FMT_YUV420P) return AV_PIX_FMT_YUV420P;
++ if (format == RENDER_FMT_YUV420P10) return AV_PIX_FMT_YUV420P10;
++ if (format == RENDER_FMT_YUV420P16) return AV_PIX_FMT_YUV420P16;
++ if (format == RENDER_FMT_NV12) return AV_PIX_FMT_NV12;
++ if (format == RENDER_FMT_UYVY422) return AV_PIX_FMT_UYVY422;
++ if (format == RENDER_FMT_YUYV422) return AV_PIX_FMT_YUYV422;
++ return AV_PIX_FMT_NONE;
+ }
+
+ void CWinRenderer::ManageTextures()
+@@ -719,13 +719,13 @@ void CWinRenderer::Render(DWORD flags)
+
+ void CWinRenderer::RenderSW()
+ {
+- enum PixelFormat format = PixelFormatFromFormat(m_format);
++ enum AVPixelFormat format = PixelFormatFromFormat(m_format);
+
+ // 1. convert yuv to rgb
+ m_sw_scale_ctx = sws_getCachedContext(m_sw_scale_ctx,
+ m_sourceWidth, m_sourceHeight,
format,
+- m_sourceWidth, m_sourceHeight,
PIX_FMT_BGRA,
+- SWS_FAST_BILINEAR |
SwScaleCPUFlags(), NULL, NULL, NULL);
++ m_sourceWidth, m_sourceHeight,
AV_PIX_FMT_BGRA,
++ SWS_FAST_BILINEAR, NULL, NULL,
NULL);
+
+ YUVBuffer* buf = (YUVBuffer*)m_VideoBuffers[m_iYV12RenderBuffer];
+
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
+index e00f536..00d559f 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
+@@ -39,7 +39,7 @@ extern "C" {
+ #include "libswscale/swscale.h"
+ }
+
+-// allocate a new picture (PIX_FMT_YUV420P)
++// allocate a new picture (AV_PIX_FMT_YUV420P)
+ DVDVideoPicture* CDVDCodecUtils::AllocatePicture(int iWidth, int iHeight)
+ {
+ DVDVideoPicture* pPicture = new DVDVideoPicture;
+@@ -264,13 +264,13 @@ DVDVideoPicture*
CDVDCodecUtils::ConvertToYUV422PackedPicture(DVDVideoPicture *p
+
+ int dstformat;
+ if (format == RENDER_FMT_UYVY422)
+- dstformat = PIX_FMT_UYVY422;
++ dstformat = AV_PIX_FMT_UYVY422;
+ else
+- dstformat = PIX_FMT_YUYV422;
++ dstformat = AV_PIX_FMT_YUYV422;
+
+- struct SwsContext *ctx = sws_getContext(pSrc->iWidth,
pSrc->iHeight, PIX_FMT_YUV420P,
++ struct SwsContext *ctx = sws_getContext(pSrc->iWidth,
pSrc->iHeight, AV_PIX_FMT_YUV420P,
+
pPicture->iWidth, pPicture->iHeight, (AVPixelFormat)dstformat,
+- SWS_BILINEAR |
SwScaleCPUFlags(), NULL, NULL, NULL);
++ SWS_BILINEAR,
NULL, NULL, NULL);
+ sws_scale(ctx, src, srcStride, 0, pSrc->iHeight, dst, dstStride);
+ sws_freeContext(ctx);
+ }
+@@ -403,25 +403,25 @@ double CDVDCodecUtils::NormalizeFrameduration(double
frameduration, bool *match)
+ }
+
+ struct EFormatMap {
+- PixelFormat pix_fmt;
++ AVPixelFormat pix_fmt;
+ ERenderFormat format;
+ };
+
+ static const EFormatMap g_format_map[] = {
+- { PIX_FMT_YUV420P, RENDER_FMT_YUV420P }
+-, { PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P }
+-, { PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 }
+-, { PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 }
+-, { PIX_FMT_UYVY422, RENDER_FMT_UYVY422 }
+-, { PIX_FMT_YUYV422, RENDER_FMT_YUYV422 }
+-, { PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI }
+-, { PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA }
+-, { PIX_FMT_NONE , RENDER_FMT_NONE }
++ { AV_PIX_FMT_YUV420P, RENDER_FMT_YUV420P }
++, { AV_PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P }
++, { AV_PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 }
++, { AV_PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 }
++, { AV_PIX_FMT_UYVY422, RENDER_FMT_UYVY422 }
++, { AV_PIX_FMT_YUYV422, RENDER_FMT_YUYV422 }
++, { AV_PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI }
++, { AV_PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA }
++, { AV_PIX_FMT_NONE , RENDER_FMT_NONE }
+ };
+
+ ERenderFormat CDVDCodecUtils::EFormatFromPixfmt(int fmt)
+ {
+- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
++ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE;
++p)
+ {
+ if(p->pix_fmt == fmt)
+ return p->format;
+@@ -431,10 +431,10 @@ ERenderFormat CDVDCodecUtils::EFormatFromPixfmt(int
fmt)
+
+ int CDVDCodecUtils::PixfmtFromEFormat(ERenderFormat fmt)
+ {
+- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
++ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE;
++p)
+ {
+ if(p->format == fmt)
+ return p->pix_fmt;
+ }
+- return PIX_FMT_NONE;
++ return AV_PIX_FMT_NONE;
+ }
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+index 3498503..8cc6782 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+@@ -77,8 +77,8 @@ enum DecoderState
+ STATE_SW_MULTI
+ };
+
+-enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext *
avctx
+- , const PixelFormat * fmt )
++enum AVPixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext *
avctx
++ , const AVPixelFormat * fmt
)
+ {
+ CDVDVideoCodecFFmpeg* ctx = (CDVDVideoCodecFFmpeg*)avctx->opaque;
+
+@@ -104,8 +104,8 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct
AVCodecContext * avctx
+ avctx->hwaccel_context = 0;
+ }
+
+- const PixelFormat * cur = fmt;
+- while(*cur != PIX_FMT_NONE)
++ const AVPixelFormat * cur = fmt;
++ while(*cur != AV_PIX_FMT_NONE)
+ {
+ #ifdef HAVE_LIBVDPAU
+ if(VDPAU::CDecoder::IsVDPAUFormat(*cur) &&
CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVDPAU))
+@@ -137,7 +137,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct
AVCodecContext * avctx
+ #endif
+ #ifdef HAVE_LIBVA
+ // mpeg4 vaapi decoding is disabled
+- if(*cur == PIX_FMT_VAAPI_VLD &&
CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
++ if(*cur == AV_PIX_FMT_VAAPI_VLD &&
CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
+ {
+ VAAPI::CDecoder* dec = new VAAPI::CDecoder();
+ if(dec->Open(avctx, ctx->m_pCodecContext, *cur,
ctx->m_uSurfacesCount) == true)
+@@ -214,11 +214,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints,
CDVDCodecOptions &options
+
+ for(std::vector<ERenderFormat>::iterator it = options.m_formats.begin();
it != options.m_formats.end(); ++it)
+ {
+-
m_formats.push_back((PixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
++
m_formats.push_back((AVPixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
+ if(*it == RENDER_FMT_YUV420P)
+- m_formats.push_back(PIX_FMT_YUVJ420P);
++ m_formats.push_back(AV_PIX_FMT_YUVJ420P);
+ }
+- m_formats.push_back(PIX_FMT_NONE); /* always add none to get a terminated
list in ffmpeg world */
++ m_formats.push_back(AV_PIX_FMT_NONE); /* always add none to get a
terminated list in ffmpeg world */
+
+ pCodec = avcodec_find_decoder(hints.codec);
+
+@@ -655,7 +655,7 @@ bool
CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture)
+ pDvdVideoPicture->color_transfer = m_pCodecContext->color_trc;
+ pDvdVideoPicture->color_matrix = m_pCodecContext->colorspace;
+ if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG
+- || m_pCodecContext->pix_fmt == PIX_FMT_YUVJ420P)
++ || m_pCodecContext->pix_fmt == AV_PIX_FMT_YUVJ420P)
+ pDvdVideoPicture->color_range = 1;
+ else
+ pDvdVideoPicture->color_range = 0;
+@@ -738,8 +738,8 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DVDVideoPicture*
pDvdVideoPicture)
+ pDvdVideoPicture->iFlags |= pDvdVideoPicture->data[0] ? 0 :
DVP_FLAG_DROPPED;
+ pDvdVideoPicture->extended_format = 0;
+
+- PixelFormat pix_fmt;
+- pix_fmt = (PixelFormat)m_pFrame->format;
++ AVPixelFormat pix_fmt;
++ pix_fmt = (AVPixelFormat)m_pFrame->format;
+
+ pDvdVideoPicture->format = CDVDCodecUtils::EFormatFromPixfmt(pix_fmt);
+ return true;
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
+index 6906e79..cbd1c8f 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
+@@ -46,7 +46,7 @@ public:
+ public:
+ IHardwareDecoder() {}
+ virtual ~IHardwareDecoder() {};
+- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx,
const enum PixelFormat, unsigned int surfaces) = 0;
++ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx,
const enum AVPixelFormat, unsigned int surfaces) = 0;
+ virtual int Decode (AVCodecContext* avctx, AVFrame* frame) = 0;
+ virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame,
DVDVideoPicture* picture) = 0;
+ virtual int Check (AVCodecContext* avctx) = 0;
+@@ -77,7 +77,7 @@ public:
+ void SetHardware(IHardwareDecoder* hardware);
+
+ protected:
+- static enum PixelFormat GetFormat(struct AVCodecContext * avctx, const
PixelFormat * fmt);
++ static enum AVPixelFormat GetFormat(struct AVCodecContext * avctx, const
AVPixelFormat * fmt);
+
+ int FilterOpen(const std::string& filters, bool scale);
+ void FilterClose();
+@@ -119,7 +119,7 @@ protected:
+ int m_iLastKeyframe;
+ double m_dts;
+ bool m_started;
+- std::vector<PixelFormat> m_formats;
++ std::vector<AVPixelFormat> m_formats;
+ double m_decoderPts;
+ int m_skippedDeint;
+ bool m_requestSkipDeint;
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
+index 858e075..f271045 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
+@@ -554,11 +554,11 @@ void CDVDVideoCodecVDA::DisplayQueuePop(void)
+
+ void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t *yuv422_ptr, int
yuv422_stride, DVDVideoPicture *picture)
+ {
+- // convert PIX_FMT_UYVY422 to PIX_FMT_YUV420P.
++ // convert AV_PIX_FMT_UYVY422 to AV_PIX_FMT_YUV420P.
+ struct SwsContext *swcontext = sws_getContext(
+- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_UYVY422,
+- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P,
+- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_UYVY422,
++ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
++ SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ if (swcontext)
+ {
+ uint8_t *src[] = { yuv422_ptr, 0, 0, 0 };
+@@ -574,11 +574,11 @@ void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t
*yuv422_ptr, int yuv422_strid
+
+ void CDVDVideoCodecVDA::BGRA_to_YUV420P(uint8_t *bgra_ptr, int bgra_stride,
DVDVideoPicture *picture)
+ {
+- // convert PIX_FMT_BGRA to PIX_FMT_YUV420P.
++ // convert AV_PIX_FMT_BGRA to AV_PIX_FMT_YUV420P.
+ struct SwsContext *swcontext = sws_getContext(
+- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_BGRA,
+- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P,
+- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_BGRA,
++ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
++ SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ if (swcontext)
+ {
+ uint8_t *src[] = { bgra_ptr, 0, 0, 0 };
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
+index 1fc5061..2fd64a5 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
+@@ -886,7 +886,7 @@ static bool CheckCompatibility(AVCodecContext *avctx)
+ return true;
+ }
+
+-bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum
PixelFormat fmt, unsigned int surfaces)
++bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum
AVPixelFormat fmt, unsigned int surfaces)
+ {
+ if (!CheckCompatibility(avctx))
+ return false;
+@@ -1135,9 +1135,9 @@ bool CDecoder::OpenDecoder()
+ return true;
+ }
+
+-bool CDecoder::Supports(enum PixelFormat fmt)
++bool CDecoder::Supports(enum AVPixelFormat fmt)
+ {
+- if(fmt == PIX_FMT_DXVA2_VLD)
++ if(fmt == AV_PIX_FMT_DXVA2_VLD)
+ return true;
+ return false;
+ }
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
+index b6f42c4..5257f3a 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
+@@ -141,7 +141,7 @@ class CDecoder
+ public:
+ CDecoder();
+ ~CDecoder();
+- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx,
const enum PixelFormat, unsigned int surfaces);
++ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx,
const enum AVPixelFormat, unsigned int surfaces);
+ virtual int Decode (AVCodecContext* avctx, AVFrame* frame);
+ virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame,
DVDVideoPicture* picture);
+ virtual int Check (AVCodecContext* avctx);
+@@ -154,7 +154,7 @@ public:
+ int GetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
+ void RelBuffer(uint8_t *data);
+
+- static bool Supports(enum PixelFormat fmt);
++ static bool Supports(enum AVPixelFormat fmt);
+
+ void CloseDXVADecoder();
+
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
+index 19f05ca..95d41a6 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
+@@ -479,7 +479,7 @@ CDecoder::~CDecoder()
+ Close();
+ }
+
+-bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const
enum PixelFormat fmt, unsigned int surfaces)
++bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const
enum AVPixelFormat fmt, unsigned int surfaces)
+ {
+ // don't support broken wrappers by default
+ // nvidia cards with a vaapi to vdpau wrapper
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
+index a1a9a16..3dcc728 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
+@@ -406,7 +406,7 @@ public:
+ CDecoder();
+ virtual ~CDecoder();
+
+- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx,
const enum PixelFormat, unsigned int surfaces = 0);
++ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx,
const enum AVPixelFormat, unsigned int surfaces = 0);
+ virtual int Decode (AVCodecContext* avctx, AVFrame* frame);
+ virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame,
DVDVideoPicture* picture);
+ virtual void Reset();
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
+index e24bbce..f13a5fb 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
+@@ -186,7 +186,7 @@ void CDecoder::Close()
+ m_bitstream = NULL;
+ }
+
+-bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum
PixelFormat fmt, unsigned int surfaces)
++bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum
AVPixelFormat fmt, unsigned int surfaces)
+ {
+ Close();
+
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
+index 8311d72..3c91f2d 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
+@@ -35,7 +35,7 @@ class CDecoder
+ public:
+ CDecoder();
+ ~CDecoder();
+- virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const
enum PixelFormat, unsigned int surfaces = 0);
++ virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const
enum AVPixelFormat, unsigned int surfaces = 0);
+ virtual int Decode(AVCodecContext* avctx, AVFrame* frame);
+ virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame,
DVDVideoPicture* picture);
+ virtual int Check(AVCodecContext* avctx);
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+index 85d9295..c59c21c 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+@@ -486,7 +486,7 @@ CDecoder::CDecoder() : m_vdpauOutput(&m_inMsgEvent)
+ m_vdpauConfig.context = 0;
+ }
+
+-bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const
enum PixelFormat fmt, unsigned int surfaces)
++bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const
enum AVPixelFormat fmt, unsigned int surfaces)
+ {
+ // check if user wants to decode this format with VDPAU
+ std::string gpuvendor = g_Windowing.GetRenderVendor();
+@@ -760,7 +760,7 @@ int CDecoder::Check(AVCodecContext* avctx)
+ return 0;
+ }
+
+-bool CDecoder::IsVDPAUFormat(PixelFormat format)
++bool CDecoder::IsVDPAUFormat(AVPixelFormat format)
+ {
+ if (format == AV_PIX_FMT_VDPAU)
+ return true;
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
+index f1e78ea..f67f874 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
+@@ -556,7 +556,7 @@ public:
+ CDecoder();
+ virtual ~CDecoder();
+
+- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx,
const enum PixelFormat, unsigned int surfaces = 0);
++ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx,
const enum AVPixelFormat, unsigned int surfaces = 0);
+ virtual int Decode (AVCodecContext* avctx, AVFrame* frame);
+ virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame,
DVDVideoPicture* picture);
+ virtual void Reset();
+@@ -571,7 +571,7 @@ public:
+ bool Supports(VdpVideoMixerFeature feature);
+ bool Supports(EINTERLACEMETHOD method);
+ EINTERLACEMETHOD AutoInterlaceMethod();
+- static bool IsVDPAUFormat(PixelFormat fmt);
++ static bool IsVDPAUFormat(AVPixelFormat fmt);
+
+ static void FFReleaseBuffer(void *opaque, uint8_t *data);
+ static int FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
+diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+index 88d486b..fd23527 100644
+--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
++++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+@@ -1638,7 +1638,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPacket *pkt)
+
+ // for video we need a decoder to get desired information into codec
context
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->codec->extradata &&
+- (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE))
++ (!st->codec->width || st->codec->pix_fmt == AV_PIX_FMT_NONE))
+ {
+ // open a decoder, it will be cleared down by ffmpeg on closing the
stream
+ if (!st->codec->codec)
+@@ -1695,7 +1695,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
+ st = m_pFormatContext->streams[idx];
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ {
+- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
++ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
+ return true;
+ hasVideo = true;
+ }
+@@ -1708,7 +1708,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
+ st = m_pFormatContext->streams[i];
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ {
+- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
++ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
+ return true;
+ hasVideo = true;
+ }
+diff --git a/xbmc/cores/dvdplayer/DVDFileInfo.cpp
b/xbmc/cores/dvdplayer/DVDFileInfo.cpp
+index 83d78a2..46fb5dc 100644
+--- a/xbmc/cores/dvdplayer/DVDFileInfo.cpp
++++ b/xbmc/cores/dvdplayer/DVDFileInfo.cpp
+@@ -275,7 +275,7 @@ bool CDVDFileInfo::ExtractThumb(const std::string
&strPath,
+
+ uint8_t *pOutBuf = new uint8_t[nWidth * nHeight * 4];
+ struct SwsContext *context = sws_getContext(picture.iWidth,
picture.iHeight,
+- PIX_FMT_YUV420P, nWidth, nHeight, PIX_FMT_BGRA,
SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
++ AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA,
SWS_FAST_BILINEAR, NULL, NULL, NULL);
+
+ if (context)
+ {
+diff --git a/xbmc/pictures/Picture.cpp b/xbmc/pictures/Picture.cpp
+index a5df350..7edf580 100644
+--- a/xbmc/pictures/Picture.cpp
++++ b/xbmc/pictures/Picture.cpp
+@@ -342,9 +342,9 @@ bool CPicture::ScaleImage(uint8_t *in_pixels, unsigned
int in_width, unsigned in
+ uint8_t *out_pixels, unsigned int out_width,
unsigned int out_height, unsigned int out_pitch,
+ CPictureScalingAlgorithm::Algorithm
scalingAlgorithm /* = CPictureScalingAlgorithm::NoAlgorithm */)
+ {
+- struct SwsContext *context = sws_getContext(in_width, in_height,
PIX_FMT_BGRA,
+- out_width,
out_height, PIX_FMT_BGRA,
+-
CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm) | SwScaleCPUFlags(),
NULL, NULL, NULL);
++ struct SwsContext *context = sws_getContext(in_width, in_height,
AV_PIX_FMT_BGRA,
++ out_width,
out_height, AV_PIX_FMT_BGRA,
++
CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm), NULL, NULL, NULL);
+
+ uint8_t *src[] = { in_pixels, 0, 0, 0 };
+ int srcStride[] = { (int)in_pitch, 0, 0, 0 };
+diff --git a/xbmc/video/FFmpegVideoDecoder.cpp
b/xbmc/video/FFmpegVideoDecoder.cpp
+index 0931329..3fd8b47 100644
+--- a/xbmc/video/FFmpegVideoDecoder.cpp
++++ b/xbmc/video/FFmpegVideoDecoder.cpp
+@@ -252,7 +252,7 @@ bool FFmpegVideoDecoder::nextFrame( CBaseTexture *
texture )
+ return false;
+
+ // Due to a bug in swsscale we need to allocate one extra line of data
+- if ( avpicture_alloc( m_pFrameRGB, PIX_FMT_RGB32, m_frameRGBwidth,
m_frameRGBheight + 1 ) < 0 )
++ if ( avpicture_alloc( m_pFrameRGB, AV_PIX_FMT_RGB32, m_frameRGBwidth,
m_frameRGBheight + 1 ) < 0 )
+ return false;
+ }
+
+@@ -287,7 +287,7 @@ bool FFmpegVideoDecoder::nextFrame( CBaseTexture *
texture )
+
+ // We got the video frame, render it into the picture buffer
+ struct SwsContext * context = sws_getContext( m_pCodecCtx->width,
m_pCodecCtx->height, m_pCodecCtx->pix_fmt,
+- m_frameRGBwidth, m_frameRGBheight,
PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
++ m_frameRGBwidth, m_frameRGBheight,
AV_PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
+
+ sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0,
m_pCodecCtx->height,
+
m_pFrameRGB->data, m_pFrameRGB->linesize );
+--
+2.7.4
+
diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
index 1e6817a..c6c1229 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,3 +1,8 @@
+2016-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD,
+ 0001-ffmpeg-Update-AVPixelFormat-and-AV_PIX_FMT_-to-compi.patch:
+ fix build against ffmpeg 3
+
2016-02-21 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 16.0 Jarvis
* DEPENDS: fixed ffmpeg flags, removed codename check
diff --git a/video/kodi/PRE_BUILD b/video/kodi/PRE_BUILD
index 8d0a04a..cfb400c 100755
--- a/video/kodi/PRE_BUILD
+++ b/video/kodi/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p0 < $SPELL_DIRECTORY/kodi-15.1-texturepacker.patch &&
+patch -Np0 < "$SPELL_DIRECTORY/kodi-15.1-texturepacker.patch" &&
+patch -Np1 <
"$SPELL_DIRECTORY/0001-ffmpeg-Update-AVPixelFormat-and-AV_PIX_FMT_-to-compi.patch"
&&
./bootstrap
diff --git a/xorg-lib/libxkbcommon/DETAILS b/xorg-lib/libxkbcommon/DETAILS
index cae5e41..a682af9 100755
--- a/xorg-lib/libxkbcommon/DETAILS
+++ b/xorg-lib/libxkbcommon/DETAILS
@@ -1,6 +1,6 @@
SPELL=libxkbcommon
- VERSION=0.5.0
-SOURCE_HASH=sha512:63ef6b586743a1fbee1e4a92dd9709eedfd66d4ed1f342976534a2c818b896aaab7712ea6871abb19845439cae4b17b2e624f1ae279da151ddead53f22a48c2e
+ VERSION=0.6.0
+SOURCE_HASH=sha512:b70ff4b3b85f03cc2875622ccfa60ba6f1b86a07be90df8be73b867771dd08a85740df95fe8dfef2bacf4356a6dfc9c51523ec6ce60d197184860577b39586c4
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://xkbcommon.org/download/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/xorg-lib/libxkbcommon/HISTORY b/xorg-lib/libxkbcommon/HISTORY
index 44e627b..27660fe 100644
--- a/xorg-lib/libxkbcommon/HISTORY
+++ b/xorg-lib/libxkbcommon/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.6.0
+
2014-12-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.0




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4a1cd7d112de8caf0751fa9d65ef2cde47b4d886), Florian Franzmann, 03/25/2016

Archive powered by MHonArc 2.6.24.

Top of Page