gentoo resync : 25.08.2018

8 files changed, 0 insertions, 389 deletions

diff --git a/media-video/vlc/files/qt4-select.patch b/media-video/vlc/files/qt4-select.patch
deleted file mode 100644
index fb1526a30a7a..000000000000
--- a/media-video/vlc/files/qt4-select.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54
-For use until upstream ever accepts this patch or fixes it themsleves
---- a/configure.ac
-+++ b/configure.ac
-@@ -3709,7 +3709,8 @@
-   ])
- ])
- AS_IF([test "${enable_qt}" != "no"], [
--  PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
-+  AS_IF([test "${enable_qt}" != "4"], [
-+    PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
-       PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
-           VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
-           VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
-@@ -3721,20 +3722,23 @@
-       AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-       AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-       AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+      enable_qt="5"
--    ], [
--      PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
--        AS_IF([test -n "${enable_qt}"],[
--          AC_MSG_ERROR([${QT_PKG_ERRORS}.])
--        ],[
--          AC_MSG_WARN([${QT_PKG_ERRORS}.])
--        ])
--        enable_qt="no"
-+    ])
-+  ])
-+  AS_IF([test "${enable_qt}" != "5"], [
-+    PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
-+      AS_IF([test -n "${enable_qt}"],[
-+        AC_MSG_ERROR([${QT_PKG_ERRORS}.])
-+      ],[
-+        AC_MSG_WARN([${QT_PKG_ERRORS}.])
-       ])
--      QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
--      AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
--      AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
--      AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+      enable_qt="no"
-     ])
-+    QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
-+    AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+    AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
-+    AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+  ])
- ])
- AS_IF([test "${enable_qt}" != "no"], [
-   VLC_ADD_PLUGIN([qt4])
-
diff --git a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
deleted file mode 100644
index a024d0032b6d..000000000000
--- a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vlc-2.2.2/configure.ac
-+++ vlc-2.2.2/configure.ac
-@@ -3754,10 +3754,6 @@
-           AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
-       ])
- 
--      PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
--        AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
--      ])
--
-       QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
-       QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
-       AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
diff --git a/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch b/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch
deleted file mode 100644
index b5a9ff7267fb..000000000000
--- a/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faudio_output%2Falsa.c;h=4e9fd53592d048baa8b57f30df15ab5806139d07;hp=2d1f99e9cb743bca12c6bdf32cc84a92d07fda8b;hb=47f74a83c161173b0d15e95dab8ceb7c97de51b4;hpb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a
-
-diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
-index 2d1f99e..4e9fd53 100644
---- a/modules/audio_output/alsa.c
-+++ b/modules/audio_output/alsa.c
-@@ -495,6 +495,15 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
-     }
-     sys->rate = fmt->i_rate;
- 
-+#if 1 /* work-around for period-long latency outputs (e.g. PulseAudio): */
-+    param = AOUT_MIN_PREPARE_TIME;
-+    val = snd_pcm_hw_params_set_period_time_near (pcm, hw, &param, NULL);
-+    if (val)
-+    {
-+        msg_Err (aout, "cannot set period: %s", snd_strerror (val));
-+        goto error;
-+    }
-+#endif
-     /* Set buffer size */
-     param = AOUT_MAX_ADVANCE_TIME;
-     val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, &param, NULL);
-@@ -503,14 +512,22 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
-         msg_Err (aout, "cannot set buffer duration: %s", snd_strerror (val));
-         goto error;
-     }
--
--    param = AOUT_MIN_PREPARE_TIME;
-+#if 0
-+    val = snd_pcm_hw_params_get_buffer_time (hw, &param, NULL);
-+    if (val)
-+    {
-+        msg_Warn (aout, "cannot get buffer time: %s", snd_strerror(val));
-+        param = AOUT_MIN_PREPARE_TIME;
-+    }
-+    else
-+        param /= 2;
-     val = snd_pcm_hw_params_set_period_time_near (pcm, hw, &param, NULL);
-     if (val)
-     {
-         msg_Err (aout, "cannot set period: %s", snd_strerror (val));
-         goto error;
-     }
-+#endif
- 
-     /* Commit hardware parameters */
-     val = snd_pcm_hw_params (pcm, hw);
diff --git a/media-video/vlc/files/vlc-2.2.4-cxx0x.patch b/media-video/vlc/files/vlc-2.2.4-cxx0x.patch
deleted file mode 100644
index cb3d63522de3..000000000000
--- a/media-video/vlc/files/vlc-2.2.4-cxx0x.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2016-09-21 07:10:58.885508665 +0200
-+++ b/configure.ac	2016-09-21 07:19:17.835725004 +0200
-@@ -3746,7 +3746,7 @@
-     PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
-       PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
-           VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
--          VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
-+          VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11 -std=c++0x])
-           PKG_CHECK_MODULES([XI], [xi], [
-             VLC_ADD_LIBS([qt4], [${XI_LIBS}])
-             VLC_ADD_CXXFLAGS([qt4], [${XI_CFLAGS} -DHAVE_XI])
diff --git a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch b/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
deleted file mode 100644
index 3bc5954920d0..000000000000
--- a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Index: vlc-2.2.4/configure.ac
-===================================================================
---- vlc-2.2.4.orig/configure.ac
-+++ vlc-2.2.4/configure.ac
-@@ -2323,8 +2323,8 @@ AC_ARG_ENABLE(avcodec,
- [  --enable-avcodec        libavcodec codec (default enabled)])
- AS_IF([test "${enable_avcodec}" != "no"], [
-   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
--    PKG_CHECK_EXISTS([libavutil < 55],, [
--      AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
-+    PKG_CHECK_EXISTS([libavutil < 56],, [
-+      AC_MSG_ERROR([libavutil versions 56 and later are not supported.])
-     ])
-     VLC_SAVE_FLAGS
-     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
-Index: vlc-2.2.4/modules/codec/avcodec/audio.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/audio.c
-+++ vlc-2.2.4/modules/codec/avcodec/audio.c
-@@ -39,8 +39,6 @@
- #include <libavcodec/avcodec.h>
- #include <libavutil/mem.h>
- 
--#include <libavutil/audioconvert.h>
--
- #include "avcodec.h"
- 
- /*****************************************************************************
-Index: vlc-2.2.4/modules/codec/avcodec/encoder.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/encoder.c
-+++ vlc-2.2.4/modules/codec/avcodec/encoder.c
-@@ -41,7 +41,6 @@
- #include <vlc_cpu.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- 
- #include "avcodec.h"
- #include "avcommon.h"
-@@ -311,7 +310,7 @@ int OpenEncoder( vlc_object_t *p_this )
-     else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
-                              &psz_namecodec ) )
-     {
--        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
-+        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
-             return VLC_EGENERIC; /* handed chroma output */
- 
-         i_cat      = VIDEO_ES;
-@@ -555,7 +554,7 @@ int OpenEncoder( vlc_object_t *p_this )
- 
-         if( p_codec->pix_fmts )
-         {
--            const enum PixelFormat *p = p_codec->pix_fmts;
-+            const enum AVPixelFormat *p = p_codec->pix_fmts;
-             for( ; *p != -1; p++ )
-             {
-                 if( *p == p_context->pix_fmt ) break;
-@@ -1017,7 +1016,7 @@ errmsg:
-         }
-     }
- 
--    p_sys->frame = avcodec_alloc_frame();
-+    p_sys->frame = av_frame_alloc();
-     if( !p_sys->frame )
-     {
-         goto error;
-@@ -1088,7 +1087,7 @@ static block_t *EncodeVideo( encoder_t *
-     AVFrame *frame = NULL;
-     if( likely(p_pict) ) {
-         frame = p_sys->frame;
--        avcodec_get_frame_defaults( frame );
-+        av_frame_unref( frame );
-         for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
-         {
-             p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
-@@ -1329,7 +1328,7 @@ static block_t *handle_delay_buffer( enc
-     //How much we need to copy from new packet
-     const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
- 
--    avcodec_get_frame_defaults( p_sys->frame );
-+    av_frame_unref( p_sys->frame );
-     p_sys->frame->format     = p_sys->p_context->sample_fmt;
-     p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
- 
-@@ -1451,7 +1450,7 @@ static block_t *EncodeAudio( encoder_t *
-     while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
-            ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
-     {
--        avcodec_get_frame_defaults( p_sys->frame );
-+        av_frame_unref( p_sys->frame );
-         if( p_sys->b_variable )
-             p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
-         else
-Index: vlc-2.2.4/modules/codec/avcodec/vaapi.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/vaapi.c
-+++ vlc-2.2.4/modules/codec/avcodec/vaapi.c
-@@ -598,7 +598,7 @@ static int Create( vlc_va_t *p_va, AVCod
-         return err;
- 
-     /* Only VLD supported */
--    p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
-+    p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
-     p_va->setup = Setup;
-     p_va->get = Get;
-     p_va->release = Release;
-Index: vlc-2.2.4/modules/codec/avcodec/video.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/video.c
-+++ vlc-2.2.4/modules/codec/avcodec/video.c
-@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
- static int  ffmpeg_GetFrameBuf    ( struct AVCodecContext *, AVFrame * );
- static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
- #endif
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
--                                          const enum PixelFormat * );
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
-+                                          const enum AVPixelFormat * );
- 
- static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
- {
-@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
-     p_sys->p_codec = p_codec;
-     p_sys->i_codec_id = i_codec_id;
-     p_sys->psz_namecodec = psz_namecodec;
--    p_sys->p_ff_pic = avcodec_alloc_frame();
-+    p_sys->p_ff_pic = av_frame_alloc();
-     p_sys->b_delayed_open = true;
-     p_sys->p_va = NULL;
-     vlc_sem_init( &p_sys->sem_mt, 0 );
-@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
-     if( ffmpeg_OpenCodec( p_dec ) < 0 )
-     {
-         msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
--        avcodec_free_frame( &p_sys->p_ff_pic );
-+        av_frame_free( &p_sys->p_ff_pic );
-         vlc_sem_destroy( &p_sys->sem_mt );
-         free( p_sys );
-         return VLC_EGENERIC;
-@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
-     wait_mt( p_sys );
- 
-     if( p_sys->p_ff_pic )
--        avcodec_free_frame( &p_sys->p_ff_pic );
-+        av_frame_free( &p_sys->p_ff_pic );
- 
-     if( p_sys->p_va )
-         vlc_va_Delete( p_sys->p_va );
-@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
- }
- #endif
- 
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
--                                          const enum PixelFormat *pi_fmt )
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-+                                          const enum AVPixelFormat *pi_fmt )
- {
-     decoder_t *p_dec = p_context->opaque;
-     decoder_sys_t *p_sys = p_dec->p_sys;
diff --git a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch b/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
deleted file mode 100644
index 218af58281fa..000000000000
--- a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit b8869f97ea66ac7ec9912a74c2e8b5e15daf7752
-Author: Rafaël Carré <funman@videolan.org>
-Date:   Fri Feb 26 00:36:26 2016 +0000
-
-    Relax requirements for FFmpeg hwaccel
-    
-    It doesn't error out anymore since 5edd1f62ca1
-
-Index: vlc-2.2.4/configure.ac
-===================================================================
---- vlc-2.2.4.orig/configure.ac
-+++ vlc-2.2.4/configure.ac
-@@ -2383,7 +2383,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
-   case "${avfork}" in
-     ffmpeg)
-       PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
--        AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
-+        PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+          AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+        ])
-       ])
-       ;;
-   esac
-@@ -2417,7 +2419,9 @@ AS_IF([test "${enable_dxva2}" != "no"],
-     case "${avfork}" in
-       ffmpeg)
-         PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
--          AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
-+          PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+            AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+          ])
-         ])
-         ;;
-     esac
-@@ -3181,7 +3185,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
-     libav) av_vdpau_ver="55.26.0" ;;
-     ffmpeg) av_vdpau_ver="55.42.100"
-       PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
--        AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
-+        PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+          AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+        ])
-       ])
-       ;;
-   esac
diff --git a/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch b/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch
deleted file mode 100644
index 2e8064446d05..000000000000
--- a/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9
-
---- a/src/input/decoder.c
-+++ b/src/input/decoder.c
-@@ -1162,7 +1162,10 @@
-         b_paused = p_owner->b_paused;
- 
-         if (!p_audio)
-+        {
-+            vlc_mutex_unlock( &p_owner->lock );
-             break;
-+        }
- 
-         /* */
-         int i_rate = INPUT_RATE_DEFAULT;
-@@ -1180,6 +1183,9 @@
- 
-         if( unlikely(p_owner->b_paused != b_paused) )
-             continue; /* race with input thread? retry... */
-+
-+        vlc_mutex_unlock( &p_owner->lock );
-+
-         if( p_aout == NULL )
-             b_reject = true;
- 
-@@ -1199,7 +1205,6 @@
- 
-         break;
-     }
--    vlc_mutex_unlock( &p_owner->lock );
- }
- 
- static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
- 
diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
deleted file mode 100644
index 57b66685ede0..000000000000
--- a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f9c5a343f1a8cad9c2c153f9c05e4e7201675a43 Mon Sep 17 00:00:00 2001
-From: Tristan Matthews <tmatth@videolan.org>
-Date: Wed, 29 Nov 2017 10:45:04 -0500
-Subject: [PATCH] upnp: don't clash with libupnp's own compat code
-
-Fixes build for upnp >= 1.6.23 and less than 1.8.
-
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/services_discovery/upnp.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
-index bdd3c55ee5..82d43632f4 100644
---- a/modules/services_discovery/upnp.cpp
-+++ b/modules/services_discovery/upnp.cpp
-@@ -38,7 +38,7 @@
- #include <set>
- #include <string>
- 
--#if UPNP_VERSION < 10800
-+#if UPNP_VERSION < 10623
- /*
-  * Compat functions and typedefs for libupnp prior to 1.8
-  */
--- 
-2.11.0
-