summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xcrypto/krb5/DETAILS6
-rw-r--r--crypto/krb5/HISTORY4
-rwxr-xr-xdoc/asciidoc/DETAILS4
-rw-r--r--doc/asciidoc/HISTORY3
-rwxr-xr-xftp/curl/DETAILS2
-rw-r--r--ftp/curl/HISTORY3
-rwxr-xr-xhttp/palemoon/DEPENDS8
-rw-r--r--http/palemoon/HISTORY5
-rwxr-xr-xhttp/palemoon/PRE_BUILD2
-rw-r--r--http/palemoon/libvpx.patch24
-rwxr-xr-xhttp/webkitgtk3/BUILD3
-rwxr-xr-xhttp/webkitgtk3/CONFIGURE9
-rwxr-xr-xhttp/webkitgtk3/DEPENDS33
-rw-r--r--http/webkitgtk3/HISTORY6
-rwxr-xr-xlibs/libcerf/DEPENDS2
-rwxr-xr-xlibs/libcerf/DETAILS15
-rw-r--r--libs/libcerf/HISTORY3
-rwxr-xr-xutils/acpid2/DETAILS4
-rw-r--r--utils/acpid2/HISTORY3
-rwxr-xr-xutils/fatrace/BUILD1
-rwxr-xr-xutils/fatrace/DETAILS16
-rw-r--r--utils/fatrace/HISTORY3
-rwxr-xr-xutils/fatrace/INSTALL1
-rw-r--r--utils/gnuplot/0001-fix-compatibility-with-lua-5.2.patch25
-rwxr-xr-xutils/gnuplot/DEPENDS9
-rwxr-xr-xutils/gnuplot/DETAILS4
-rw-r--r--utils/gnuplot/HISTORY5
-rwxr-xr-xutils/gnuplot/PRE_BUILD1
-rwxr-xr-xutils/kexec-tools/DETAILS8
-rw-r--r--utils/kexec-tools/HISTORY3
-rwxr-xr-xvideo-libs/gst-ffmpeg/BUILD5
-rwxr-xr-xvideo-libs/gst-ffmpeg/DETAILS3
-rw-r--r--video-libs/gst-ffmpeg/HISTORY4
-rwxr-xr-xvideo-libs/live/DETAILS4
-rw-r--r--video-libs/live/HISTORY3
-rw-r--r--video/kodi/0001-ffmpeg-Update-AVPixelFormat-and-AV_PIX_FMT_-to-compi.patch663
-rw-r--r--video/kodi/HISTORY5
-rwxr-xr-xvideo/kodi/PRE_BUILD3
-rwxr-xr-xxorg-lib/libxkbcommon/DETAILS4
-rw-r--r--xorg-lib/libxkbcommon/HISTORY3
41 files changed, 875 insertions, 41 deletions
diff --git a/ChangeLog b/ChangeLog
index 746f6495a7..ef0811b107 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-25 Florian Franzmann <siflfran@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@sourcemage.org>
* kde4-edu/libkdeedu: delete unneed spell
* kde4-edu/pairs: delete spell, no tarballs available
diff --git a/crypto/krb5/DETAILS b/crypto/krb5/DETAILS
index 4a132836b8..b663fd990b 100755
--- a/crypto/krb5/DETAILS
+++ b/crypto/krb5/DETAILS
@@ -1,7 +1,7 @@
SPELL=krb5
- VERSION=1.14
- SECURITY_PATCH=17
- SOURCE_HASH=sha512:b33a85b37f6038e34ba4038c9d1cc6a0df027652cbeccd24e39b323a1ed1bc16305099df04654c80ba7e6b56bd3d3c2df95758add888f9ef8535cb78443684ff
+ VERSION=1.14.1
+ SECURITY_PATCH=18
+ SOURCE_HASH=sha512:5d64bb30ecb9e267e2494cea4995d8cc314916d8f6a9318fb80067ae6389ad7468656400d996698b6dc0bdb4c1355c13701b570521a7c40008cf1f83df24847d
VX=${VERSION%.?}
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/crypto/krb5/HISTORY b/crypto/krb5/HISTORY
index ca52745d43..33b1af64e4 100644
--- a/crypto/krb5/HISTORY
+++ b/crypto/krb5/HISTORY
@@ -1,3 +1,7 @@
+2016-03.25 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.14.1
+ SECURITY_PATCH++, fixes CVE-2015-8629, CVE-2015-8630, CVE-2015-8631
+
2016-01-09 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.14
SECURITY_PATCH++, fixes CVE-2015-2695 CVE-2015-2696 CVE-2015-2698 CVE-2015-2697
diff --git a/doc/asciidoc/DETAILS b/doc/asciidoc/DETAILS
index 607cdc08e8..d779a19574 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 b78ab975a0..09611ed80a 100644
--- a/doc/asciidoc/HISTORY
+++ b/doc/asciidoc/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 8.6.9
+
2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index b37e7a1273..3ede96d844 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 a9df245053..77702412b1 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.48.0
+
2016-02-04 Treeve Jelbert <treeve@sourcemage.org>
* UP_TRIGGERS: improve, fewer rebuilds
diff --git a/http/palemoon/DEPENDS b/http/palemoon/DEPENDS
index 99e3bf6e14..853155928d 100755
--- a/http/palemoon/DEPENDS
+++ b/http/palemoon/DEPENDS
@@ -63,7 +63,13 @@ optional_depends gstreamer \
"for GStreamer support" &&
if is_depends_enabled $SPELL gstreamer; then
- depends gst-plugins-base
+ depends gst-plugins-base &&
+ # qtdemux
+ depends gst-plugins-good &&
+ # h264parse
+ depends gst-plugins-bad &&
+ # ffmpeg plugin for gstreamer
+ depends gst-ffmpeg
fi &&
optional_depends dbus \
diff --git a/http/palemoon/HISTORY b/http/palemoon/HISTORY
index 99ca6f6254..8c1b446294 100644
--- a/http/palemoon/HISTORY
+++ b/http/palemoon/HISTORY
@@ -1,3 +1,8 @@
+2016-03-24 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: added missing dependencies for H.264 support
+ * PRE_BUILD: apply patch
+ * libvpx.patch: added, to fix build with webm support
+
2016-02-27 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 26.1.1
* DEPENDS: added configure flag and comment about system nss
diff --git a/http/palemoon/PRE_BUILD b/http/palemoon/PRE_BUILD
index 4d8a31389b..4e66c2b33f 100755
--- a/http/palemoon/PRE_BUILD
+++ b/http/palemoon/PRE_BUILD
@@ -4,6 +4,8 @@ verify_file &&
7z x "${SOURCE_CACHE}/${SOURCE}" > /dev/null &&
+patch -p0 < "${SPELL_DIRECTORY}/libvpx.patch" &&
+
# resurrect permissions not stored by 7zip
find . -type d -exec chmod 755 '{}' \; &&
find . -type f -exec chmod 644 '{}' \; &&
diff --git a/http/palemoon/libvpx.patch b/http/palemoon/libvpx.patch
new file mode 100644
index 0000000000..ef853f028d
--- /dev/null
+++ b/http/palemoon/libvpx.patch
@@ -0,0 +1,24 @@
+--- media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.orig
++++ media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+@@ -178,7 +178,7 @@
+ // Creating a wrapper to the image - setting image data to NULL. Actual
+ // pointer will be set in encode. Setting align to 1, as it is meaningless
+ // (actual memory is not allocated).
+- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
++ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
+ 1, NULL);
+ // populate encoder configuration with default values
+ if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
+@@ -352,9 +352,9 @@
+ }
+ // Image in vpx_image_t format.
+ // Input image is const. VP8's raw image is not defined as const.
+- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
+- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
+- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
++ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
++ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
++ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
+ // TODO(mikhal): Stride should be set in initialization.
+ raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
+ raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);
diff --git a/http/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index a8369b8de0..2dd60ae44a 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,6 +1,7 @@
OPTS="$WEBKIT_OPTS $OPTS" &&
sed -i '30i#include <unicode/utf8.h>' \
- Source/WebCore/platform/text/TextCodecUTF8.h &&
+ Source/WebCore/platform/text/TextCodecUTF8.h \
+ Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp &&
sed -i '30i#include <unicode/utf16.h>' \
Source/WTF/wtf/text/StringBuilder.h &&
sed -i '26i#include <unicode/utf16.h>' \
diff --git a/http/webkitgtk3/CONFIGURE b/http/webkitgtk3/CONFIGURE
index 87e576f027..97ef3e41fc 100755
--- a/http/webkitgtk3/CONFIGURE
+++ b/http/webkitgtk3/CONFIGURE
@@ -1,8 +1,11 @@
config_query_option WEBKIT_OPTS "Enable support for WebGL" y \
- -DENABLE_WEBGL={ON,OFF} &&
+ "-DENABLE_WEBGL=ON" \
+ "-DENABLE_WEBGL=OFF" &&
config_query_option WEBKIT_OPTS "Enable JIT compilation?" y \
- -DENABLE_JIT={ON,OFF} &&
+ "-DENABLE_JIT=ON" \
+ "-DENABLE_JIT=OFF" &&
config_query_option WEBKIT_OPTS "Enable Media statistics?" n \
- -DENABLE_MEDIA_STATISTICS={ON,OFF}
+ "-DENABLE_MEDIA_STATISTICS=ON" \
+ "-DENABLE_MEDIA_STATISTICS=OFF"
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index f21b438374..1b55fbc1a0 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -19,7 +19,7 @@ depends freetype2 &&
depends -sub ICU harfbuzz &&
depends cairo &&
depends pango &&
-depends gtk+3 -DPORT=GTK &&
+depends gtk+3 "-DPORT=GTK" &&
depends gdk-pixbuf2 &&
depends libsoup &&
depends at-spi2-core &&
@@ -36,37 +36,46 @@ if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
fi &&
optional_depends enchant \
- -DENABLE_SPELLCHECK={ON,OFF} \
+ "-DENABLE_SPELLCHECK=ON" \
+ "-DENABLE_SPELLCHECK=OFF" \
"Enable spellchecking support?" &&
+optional_depends hyphen \
+ "-DUSE_LIBHYPHEN=ON" \
+ "-DUSE_LIBHYPHEN=OFF" \
+ "Enable default automatic hyphenation?"
+
optional_depends libsecret \
- -DENABLE_CREDENTIAL_STORAGE={1,0} \
+ "-DENABLE_CREDENTIAL_STORAGE=1" \
+ "-DENABLE_CREDENTIAL_STORAGE=0" \
"Enable support for credential storage?" &&
-optional_depends gobject-introspection "" "" \
+optional_depends gobject-introspection \
+ "-DENABLE_INTROSPECTION=ON" \
+ "-DENABLE_INTROSPECTION=OFF" \
"Enable GObject introspection?" &&
optional_depends geoclue \
- -DENABLE_GEOLOCATION={ON,OFF} \
+ "-DENABLE_GEOLOCATION=ON" \
+ "-DENABLE_GEOLOCATION=OFF" \
"Enable geolocation support?" &&
optional_depends gstreamer-1.0 \
"-DENABLE_WEB_AUDIO=ON -DENABLE_VIDEO=ON" \
"-DENABLE_WEB_AUDIO=OFF -DENABLE_VIDEO=OFF" \
- "Enable support for enable HTML5 video and Web Audio?" &&
+ "Enable support for HTML5 video and Web Audio?" &&
if is_depends_enabled $SPELL gstreamer-1.0 ; then
depends gst-plugins-base-1.0
fi &&
optional_depends upower \
- -DENABLE_BATTERY_STATUS={ON,OFF} \
+ "-DENABLE_BATTERY_STATUS=ON" \
+ "-DENABLE_BATTERY_STATUS=OFF" \
"Enable support for Battery Status API?" &&
optional_depends gtk-doc \
- -DENABLE_GTKDOC={ON,OFF} \
- "Build documentation with gtk-doc?" &&
+ "-DENABLE_GTKDOC=ON" \
+ "-DENABLE_GTKDOC=OFF" \
+ "Build documentation with gtk-doc?"
-optional_depends gobject-introspection \
- -DENABLE_INTROSPECTION={ON,OFF} \
- "Enable introspection?"
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 04b68555ec..38a7bceecd 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,9 @@
+2016-03-25 Pavel Vinogradov <public@sourcemage.org>
+ * BUILD: added fix to build with hyphen
+ * CONFIGURE: expanded bash shortcuts, reformatted
+ * DEPENDS: removed shortcuts and extra gobject-introspection entry
+ from previous commit, added hyphen as option, fixed typo
+
2016-03-22 Pavel Vinogradov <public@sourcemage.org>
* DETAILS: updated spell to 2.12.0
* DEPENDS: x86_64 version needs llvm, added optional
diff --git a/libs/libcerf/DEPENDS b/libs/libcerf/DEPENDS
new file mode 100755
index 0000000000..7549252ecf
--- /dev/null
+++ b/libs/libcerf/DEPENDS
@@ -0,0 +1,2 @@
+depends perl &&
+depends libtool
diff --git a/libs/libcerf/DETAILS b/libs/libcerf/DETAILS
new file mode 100755
index 0000000000..7a7df0668d
--- /dev/null
+++ b/libs/libcerf/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=libcerf
+ VERSION=1.4
+ SOURCE="${SPELL}-${VERSION}.tgz"
+ SOURCE_URL[0]=http://apps.jcns.fz-juelich.de/src/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:93d7b03898c0f88e436947b204db7fb5097dc901928aedde48bf0a04552e1c041fdfcdbe6318fdc21508e1349b6c205f557660550e72d6e86b078d9d0dde0faa
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://apps.jcns.fz-juelich.de/doku/sc/libcerf"
+ LICENSE[0]=MIT
+ ENTERED=20160325
+ SHORT="a self-contained numeric library of complex error functions"
+cat << EOF
+libcerf is a self-contained numeric library that provides an efficient
+and accurate implementation of complex error functions, along with Dawson,
+Faddeeva, and Voigt functions.
+EOF
diff --git a/libs/libcerf/HISTORY b/libs/libcerf/HISTORY
new file mode 100644
index 0000000000..2487080dd6
--- /dev/null
+++ b/libs/libcerf/HISTORY
@@ -0,0 +1,3 @@
+2016-03-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/utils/acpid2/DETAILS b/utils/acpid2/DETAILS
index c040d3b21d..3c27eca8a3 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 25d1e7ff9e..b284b8e043 100644
--- a/utils/acpid2/HISTORY
+++ b/utils/acpid2/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.27
+
2015-11-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 2.0.25
diff --git a/utils/fatrace/BUILD b/utils/fatrace/BUILD
new file mode 100755
index 0000000000..6dfecc1f8a
--- /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 0000000000..8acb922144
--- /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 0000000000..4674de9764
--- /dev/null
+++ b/utils/fatrace/HISTORY
@@ -0,0 +1,3 @@
+2016-03-25 Florian Franzmann <siflfran@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 0000000000..e0074f3c5e
--- /dev/null
+++ b/utils/fatrace/INSTALL
@@ -0,0 +1 @@
+PREFIX=${INSTALL_ROOT}/usr default_install
diff --git a/utils/gnuplot/0001-fix-compatibility-with-lua-5.2.patch b/utils/gnuplot/0001-fix-compatibility-with-lua-5.2.patch
new file mode 100644
index 0000000000..79b5ef75a9
--- /dev/null
+++ b/utils/gnuplot/0001-fix-compatibility-with-lua-5.2.patch
@@ -0,0 +1,25 @@
+From f3f6fecea7b93934d107cea0710e95c7afc55a27 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.net>
+Date: Fri, 25 Mar 2016 10:13:17 +0100
+Subject: [PATCH] fix compatibility with lua >= 5.2
+
+---
+ term/lua/gnuplot-tikz.lua | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/term/lua/gnuplot-tikz.lua b/term/lua/gnuplot-tikz.lua
+index a2cb684..967345c 100644
+--- a/term/lua/gnuplot-tikz.lua
++++ b/term/lua/gnuplot-tikz.lua
+@@ -1754,7 +1754,7 @@ term.options = function(opt_str, initial, t_count)
+ o_next = string.sub(opt_str, s_start+1, s_end-1)
+ if next_char == '"' then
+ -- Wow! this is to resolve all string escapes, kind of "unescape string"
+- o_next = assert(loadstring("return(\""..o_next.."\")"))()
++ o_next = assert(load("return(\""..o_next.."\")"))()
+ end
+ o_type = "string"
+ else
+--
+2.7.4
+
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index fd5d26a80f..5809a04c86 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -13,7 +13,7 @@ optional_depends "readline" \
"use gnu readline instead of builtin readline" &&
optional_depends xorg-libs --with-x --without-x "X11 output" &&
-optional_depends WXWIDGET --enable-wxt --disable-wxt \
+optional_depends WXWIDGET --enable-wxwidgets --disable-wxwidgets \
"wxWidgets interactive terminal" &&
optional_depends svgalib \
@@ -27,8 +27,11 @@ optional_depends lua "--with-lua" "--without-lua" \
optional_depends cairo "--with-cairo" "--without-cairo" \
"cairo-based terminals" &&
-optional_depends qt4 "--enable-qt" "--disable-qt" \
- "Qt-based interactive terminal" &&
+optional_depends qt4 "--with-qt=qt4" "--without-qt" \
+ "Qt-based interactive terminal" &&
+
+optional_depends libcerf "--with-libcerf" "--without-libcerf" \
+ "for special functions from libcerf" &&
if is_depends_enabled $SPELL wxgtk; then
depends cairo &&
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index b31d5e97bb..038fea1a44 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -8,11 +8,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
SOURCE_URL[0]=cvs://:pserver:anonymous@gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot
SOURCE_IGNORE=volatile
else
- VERSION=4.6.5
+ VERSION=5.0.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
- SOURCE_HASH=sha512:5a9c55d664105242aaf6356e707094a7dd5a80ba8d836bc7b3ce8836bcf5d2a57174d38220ea9efc58fa04f3c5f7d680ca5023482cff1a62b93549ff0530c47d
+ SOURCE_HASH=sha512:44fb9fcb821139f9e61d86135d31a9308c3a46f10c96d08b342b64b14c942363dbc8af4fa233cb5ef0a6743280b5bf44572cabd838192128bfd6578b583ab0f0
fi
WEB_SITE=http://www.gnuplot.info
ENTERED=20020210
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index f1d391e321..347bec7bf0 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,8 @@
+2016-03-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 5.0.2
+ * PRE_BUILD, 0001-fix-compatibility-with-lua-5.2.patch: fix compatibility
+ with lua >= 5.2
+
2015-12-28 Thomas Orgis <sobukus@sourcemage.org>
* DEPENDS: WXWIDGET
diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
index 4e9ad8f9f0..03342b3098 100755
--- a/utils/gnuplot/PRE_BUILD
+++ b/utils/gnuplot/PRE_BUILD
@@ -3,6 +3,7 @@ cd "$SOURCE_DIRECTORY" &&
# Fix build that thinks we are cross-compiling.
# Hopefully fixed in gnuplot 4.7 .
patch -Np0 < "$SPELL_DIRECTORY/crossbuild.patch" &&
+patch -Np1 < "$SPELL_DIRECTORY/0001-fix-compatibility-with-lua-5.2.patch" &&
if [[ $GNUPLOT_BRANCH == scm ]]; then
cd "$SOURCE_DIRECTORY" &&
diff --git a/utils/kexec-tools/DETAILS b/utils/kexec-tools/DETAILS
index 25ac209e8c..584dbbe863 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 fa924b29e7..bd8a6a1903 100644
--- a/utils/kexec-tools/HISTORY
+++ b/utils/kexec-tools/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.12
+
2014-11-23 Ismael Luceno <ismael@sourcemage.org>
* BUILD: Use disable_pic function to fix CFLAGS
diff --git a/video-libs/gst-ffmpeg/BUILD b/video-libs/gst-ffmpeg/BUILD
index 59b9173125..1bf5da7f2a 100755
--- a/video-libs/gst-ffmpeg/BUILD
+++ b/video-libs/gst-ffmpeg/BUILD
@@ -1,3 +1,6 @@
# need -Os to build
CFLAGS="$CFLAGS -Os" &&
-default_build
+
+check_tmp_noexec /tmp &&
+default_build &&
+check_tmp_noexec /tmp
diff --git a/video-libs/gst-ffmpeg/DETAILS b/video-libs/gst-ffmpeg/DETAILS
index 9002a74411..182a23ad8e 100755
--- a/video-libs/gst-ffmpeg/DETAILS
+++ b/video-libs/gst-ffmpeg/DETAILS
@@ -1,10 +1,11 @@
SPELL=gst-ffmpeg
VERSION=0.10.13
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-ffmpeg/$SOURCE
SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
+ DOC_DIRS=""
LICENSE[0]=LGPL
WEB_SITE=http://gstreamer.freedesktop.org
ENTERED=20040316
diff --git a/video-libs/gst-ffmpeg/HISTORY b/video-libs/gst-ffmpeg/HISTORY
index 20646d2e8d..0bbfba7185 100644
--- a/video-libs/gst-ffmpeg/HISTORY
+++ b/video-libs/gst-ffmpeg/HISTORY
@@ -1,3 +1,7 @@
+2016-03-24 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: PATCHLEVEL++; don't do useless doc'ing
+ * BUILD: use check_tmp_noexec()
+
2013-01-03 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS: removed dependencies on icu, libffi, pcre
diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index 9a794840e6..36928f29c4 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 6d5f25d119..da558df22d 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2016.03.16
+
2015-04-20 Florian Franzmann <siflfran@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 0000000000..11b120ab89
--- /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@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 1e6817ad85..c6c1229d34 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,3 +1,8 @@
+2016-03-25 Florian Franzmann <siflfran@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@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 8d0a04a5ab..cfb400c29c 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 cae5e418c7..a682af9d50 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 44e627b54d..27660feb63 100644
--- a/xorg-lib/libxkbcommon/HISTORY
+++ b/xorg-lib/libxkbcommon/HISTORY
@@ -1,3 +1,6 @@
+2016-03-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.6.0
+
2014-12-22 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.5.0