commit: 3a1d816d9bd8cc13bf203fd4076ec8059596e8ca Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jul 10 20:28:32 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Aug 15 12:35:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1d816d
media-video/vlc: Drop 2.2.8-r1 Closes: https://bugs.gentoo.org/647606 Package-Manager: Portage-2.3.41, Repoman-2.3.9 media-video/vlc/Manifest | 1 - media-video/vlc/files/qt4-select.patch | 51 --- media-video/vlc/files/vlc-2.2.2-qt5widgets.patch | 13 - .../vlc/files/vlc-2.2.4-alsa-large-buffers.patch | 47 -- media-video/vlc/files/vlc-2.2.4-cxx0x.patch | 11 - media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch | 160 ------- media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch | 45 -- .../vlc/files/vlc-2.2.6-decoder-lock-scope.patch | 34 -- .../vlc/files/vlc-2.2.8-libupnp-compat.patch | 28 -- media-video/vlc/metadata.xml | 15 - media-video/vlc/vlc-2.2.8-r1.ebuild | 480 --------------------- 11 files changed, 885 deletions(-) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 82d849bd006..06f4d1b15d5 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,2 +1 @@ -DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab diff --git a/media-video/vlc/files/qt4-select.patch b/media-video/vlc/files/qt4-select.patch deleted file mode 100644 index fb1526a30a7..00000000000 --- 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 a024d0032b6..00000000000 --- 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 b5a9ff7267f..00000000000 --- 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, ¶m, 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, ¶m, 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, ¶m, 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, ¶m, 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 cb3d63522de..00000000000 --- 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 3bc5954920d..00000000000 --- 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 218af58281f..00000000000 --- a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit b8869f97ea66ac7ec9912a74c2e8b5e15daf7752 -Author: Rafaël Carré <fun...@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 2e8064446d0..00000000000 --- 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 57b66685ede..00000000000 --- 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 <tma...@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 <j...@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 - diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml index 1ce2f06bd57..170d86d98e4 100644 --- a/media-video/vlc/metadata.xml +++ b/media-video/vlc/metadata.xml @@ -9,27 +9,19 @@ <flag name="aom">Enable experimental support for AV1 codec</flag> <flag name="archive">Enable support for libarchive stream extractor</flag> <flag name="aribsub">Enable support for decoding ARIB STD-B24 subtitles</flag> - <flag name="atmo">Enable support for AtmoLight (homebrew Ambient Lighting Technology)</flag> - <flag name="audioqueue">Enable AudioQueue audio module for Mac OS X</flag> - <flag name="avcodec">Enable libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg</flag> - <flag name="avformat">Enable libformat support for reading and writing various media containers. libavformat is part of FFmpeg</flag> <flag name="bluray">Enable libbluray for Blu-ray disc support</flag> <flag name="chromaprint">Enable libchromaprint for Chromaprint based audio fingerprinter support</flag> <flag name="chromecast">Enable experimental support for Google Chromecast</flag> <flag name="dc1394">Enable IIDC cameras support</flag> <flag name="directx">Enable Win32 DirectX support</flag> <flag name="dvbpsi">Enable support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg></flag> - <flag name="dxva2">Enable Win32 DxVA2 support</flag> <flag name="encode">Enable streaming-output support and videolan manager to control multiple streams from within one instance</flag> <flag name="faad">Enable AAC audio decoding library support via media-libs/faad2</flag> <flag name="fdk">Enable the Fraunhofer AAC codec library</flag> <flag name="fluidsynth">Enable Fluidsynth MIDI software synthesis (with external sound fonts)</flag> <flag name="gcrypt">Enable cryptography support via libgcrypt</flag> <flag name="gme">Enable support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats</flag> - <flag name="gnome">Adds support for GNOME's filesystem abstraction layer, <pkg>gnome-base/gnome-vfs</pkg>. This flag is not GUI-related</flag> - <flag name="growl">Enable growl notification support (over UDP for remote access and native on OSX)</flag> <flag name="gstreamer">Enable GStreamer based decoding support (currently supports only video decoding)</flag> - <flag name="httpd">Enable a web based interface for vlc</flag> <flag name="kate">Adds support for Ogg Kate subtitles via libkate</flag> <flag name="kms">Enable kernel mode setting video output plugin via <pkg>x11-libs/libdrm</pkg></flag> <flag name="libtar">Uses libtar instead of the built-in tar reader for reading custom skins</flag> @@ -37,10 +29,7 @@ <flag name="linsys">Enable support for Linux Linear Systems Ltd. SDI and HD-SDI input cards</flag> <flag name="live">Enable live555 streaming media support (client support for rtsp)</flag> <flag name="lua">Enable Lua scripting support, needed for including support for Jamendo (online music platform) and similar things</flag> - <flag name="macosx-dialog-provider">Enable Mac OS X dialog module</flag> - <flag name="macosx-eyetv">Enable Mac OS X EyeTV (TNT Tuner) module</flag> <flag name="macosx-notifications">Enable Mac OS X notifications module (formerly growl)</flag> - <flag name="macosx-quartztext">Enable Mac OS X quartz text module</flag> <flag name="macosx-qtkit">Enable Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module</flag> <flag name="matroska">Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag> <flag name="mpeg">Add libmpeg2 support for mpeg-1 and mpeg-2 video streams</flag> @@ -61,17 +50,13 @@ <flag name="skins">Enable support for the skins2 interface</flag> <flag name="soxr">Enable SoX Resampler support via <pkg>media-libs/soxr</pkg></flag> <flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag> - <flag name="swscale">Enable image scaling and conversion via libswscale (part of FFmpeg)</flag> <flag name="tremor">Enable tremor, a fixed-point version of the Ogg Vorbis decoder</flag> <flag name="twolame">Enable twolame support (MPEG Audio Layer 2 encoder)</flag> <flag name="upnp">Enable support for the Intel SDK stack based UPnP discovery module instead of CyberLink</flag> - <flag name="vcdx">Enable VCD with navigation via libvcdinfo (depends on cdio)</flag> - <flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC</flag> <flag name="vpx">Enable the decoder(s) from the WebM VP8 / VP9 Codec SDK</flag> <flag name="wma-fixed">Enable fixed point WMA decoder</flag> <flag name="X">Enable support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface</flag> <flag name="x265">Support X265 Encoder</flag> - <flag name="xcb">Support the X C-language Binding, a replacement for Xlib; !!! you will need this option to be able to integrate video in the Qt interface, see bug #500678</flag> <flag name="zeroconf">Enable support for zero-configuration networking via avahi</flag> <flag name="zvbi">Enable support for teletext subtitles via the zvbi library</flag> </use> diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild deleted file mode 100644 index df48927b371..00000000000 --- a/media-video/vlc/vlc-2.2.8-r1.ebuild +++ /dev/null @@ -1,480 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-beta/-test}" -MY_P="${PN}-${MY_PV}" -if [[ ${PV} = *9999 ]] ; then - if [[ ${PV%.9999} != ${PV} ]] ; then - EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"; - else - EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"; - fi - SCM="git-r3" -else - if [[ ${MY_P} = ${P} ]] ; then - SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"; - else - SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"; - fi - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 -sparc x86 ~x86-fbsd" -fi -inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM} - -DESCRIPTION="Media player and framework with support for most multimedia files and streaming" -HOMEPAGE="https://www.videolan.org/vlc/"; - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5-8" # vlc - vlccore - -IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda - cddb chromaprint dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 - elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme - gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav - libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua - macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit - matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg - omxil opencv opengl optimisememory opus png postproc projectm pulseaudio - +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout - sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype - twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X - x264 x265 +xcb xml xv zeroconf zvbi -" -REQUIRED_USE=" - aalib? ( X ) - bidi? ( truetype ) - cddb? ( cdda ) - dvb? ( dvbpsi ) - dxva2? ( avcodec ) - ffmpeg? ( avcodec avformat swscale ) - fontconfig? ( truetype ) - gnutls? ( gcrypt ) - httpd? ( lua ) - libcaca? ( X ) - libtar? ( skins ) - libtiger? ( kate ) - qt5? ( X ) - sdl? ( X ) - skins? ( qt5 truetype X xml ) - vaapi? ( avcodec X ) - vdpau? ( X ) - vlm? ( encode ) - xv? ( xcb ) -" -RDEPEND=" - dev-libs/libgpg-error:0 - net-dns/libidn:0 - sys-libs/zlib:0[minizip] - virtual/libintl:0 - a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) - aalib? ( media-libs/aalib:0 ) - alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) - avcodec? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) - ) - avformat? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) - ) - bidi? ( dev-libs/fribidi:0 ) - bluray? ( >=media-libs/libbluray-0.3:0= ) - cddb? ( >=media-libs/libcddb-1.2:0 ) - chromaprint? ( >=media-libs/chromaprint-0.6:0 ) - dbus? ( >=sys-apps/dbus-1.6:0 ) - dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) - dts? ( >=media-libs/libdca-0.0.5:0 ) - dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) - dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) - elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) - faad? ( >=media-libs/faad2-2.6.1:0 ) - fdk? ( media-libs/fdk-aac:0 ) - flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) - fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) - fontconfig? ( media-libs/fontconfig:1.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) - gme? ( media-libs/game-music-emu:0 ) - gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) - gnutls? ( >=net-libs/gnutls-3.0.20:0 ) - gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) - ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) - jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) - kate? ( >=media-libs/libkate-0.3:0 ) - libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) - libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) - libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) - libsamplerate? ( media-libs/libsamplerate:0 ) - libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) - libtiger? ( >=media-libs/libtiger-0.3.1:0 ) - linsys? ( >=media-libs/zvbi-0.2.28:0 ) - lirc? ( app-misc/lirc:0 ) - live? ( >=media-plugins/live-2011.12.23:0 ) - lua? ( >=dev-lang/lua-5.1:0 ) - matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) - modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) - mp3? ( media-libs/libmad:0 ) - mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) - mtp? ( >=media-libs/libmtp-1:0 ) - musepack? ( >=media-sound/musepack-tools-444:0 ) - ncurses? ( sys-libs/ncurses:0=[unicode] ) - ogg? ( >=media-libs/libogg-1:0 ) - opencv? ( >media-libs/opencv-2:0= ) - opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) - opus? ( >=media-libs/opus-1.0.3:0 ) - png? ( media-libs/libpng:0= ) - postproc? ( - !libav? ( >=media-video/ffmpeg-2.2:0= ) - libav? ( media-libs/libpostproc:0= ) - ) - projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) - pulseaudio? ( >=media-sound/pulseaudio-1:0 ) - qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) - rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) - samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) - schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) - sdl? ( >=media-libs/libsdl-1.2.10:0 - sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) - sftp? ( net-libs/libssh2:0 ) - shout? ( >=media-libs/libshout-2.1:0 ) - sid? ( media-libs/libsidplay:2 ) - skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) - speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) - svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) - swscale? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) - ) - taglib? ( >=media-libs/taglib-1.9:0 ) - theora? ( >=media-libs/libtheora-1.0_beta3:0 ) - tremor? ( media-libs/tremor:0 ) - truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 - !fontconfig? ( media-fonts/dejavu:0 ) ) - twolame? ( media-sound/twolame:0 ) - udev? ( >=virtual/udev-142:0 ) - upnp? ( net-libs/libupnp:= ) - v4l? ( media-libs/libv4l:0 ) - vaapi? ( - x11-libs/libva:0=[X,drm] - !libav? ( media-video/ffmpeg:0=[vaapi] ) - libav? ( media-video/libav:0=[vaapi] ) - ) - vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) - vdpau? ( - x11-libs/libvdpau:0 - !libav? ( media-video/ffmpeg:0= ) - libav? ( >=media-video/libav-10:0= ) - ) - vnc? ( >=net-libs/libvncserver-0.9.9:0 ) - vorbis? ( media-libs/libvorbis:0 ) - vpx? ( media-libs/libvpx:0= ) - X? ( x11-libs/libX11:0 ) - x264? ( media-libs/x264:0= ) - x265? ( media-libs/x265:0= ) - xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) - xml? ( dev-libs/libxml2:2 ) - zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) - zvbi? ( media-libs/zvbi:0 ) -" -DEPEND="${RDEPEND} - app-arch/xz-utils:0 - >=sys-devel/gettext-0.18.3:* - virtual/pkgconfig:* - amd64? ( dev-lang/yasm:* ) - x86? ( dev-lang/yasm:* ) - xcb? ( x11-base/xorg-proto ) -" - -PATCHES=( - # Fix build system mistake. - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch - - # Bug #541678 - "${FILESDIR}"/qt4-select.patch - - # Allow QT5.5 since Gentoo has a patched QTwidgets - "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch - - # Bug #575072 - "${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch - "${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch - - # Bug #589396 - "${FILESDIR}"/${PN}-2.2.4-cxx0x.patch - - # Bug #594126, #629294 - "${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch - "${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch - - # Bug #593460 - "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch - - "${FILESDIR}"/${P}-libupnp-compat.patch - - # Bug 590164 - "${FILESDIR}"/${P}-freerdp-2.patch -) - -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch - - # Bootstrap when we are on a git checkout. - if [[ ${PV} = *9999 ]] ; then - ./bootstrap - fi - - # Make it build with libtool 1.5 - rm -f m4/lt* m4/libtool.m4 || die - - # We are not in a real git checkout due to the absence of a .git directory. - touch src/revision.txt || die - - # Don't use --started-from-file when not using dbus. - if ! use dbus ; then - sed -i 's/ --started-from-file//' share/vlc.desktop.in || die - fi - - # Disable running of vlc-cache-gen, we do that in pkg_postinst - sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ - -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" - - eautoreconf - - # Disable automatic running of tests. - find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die - - # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt - # version may be used. Setting QT_SELECT environment variable will enforce correct binaries. - if use qt5; then - export QT_SELECT=qt5 - fi -} - -src_configure() { - local myconf - - # Compatibility fix for Samba 4. - use samba && append-cppflags "-I/usr/include/samba-4.0" - - if use x86; then - # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 - append-cflags $(test-flags-CC -fno-stack-check) - # Bug 569774 - replace-flags -Os -O2 - fi - - # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" - - xdg_environment_reset # bug 608256 - - if use truetype || use projectm ; then - local dejavu="/usr/share/fonts/dejavu/" - myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \ - --with-default-font-family=Sans \ - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace" - fi - - if use qt5 ; then - myconf+=" --enable-qt=5" - else - myconf+=" --disable-qt" - fi - - econf \ - ${myconf} \ - --enable-vlc \ - --docdir=/usr/share/doc/${PF} \ - --disable-dependency-tracking \ - --disable-optimizations \ - --disable-update-check \ - --enable-fast-install \ - --enable-screen \ - $(use_enable a52) \ - $(use_enable aalib aa) \ - $(use_enable alsa) \ - $(use_enable altivec) \ - $(use_enable atmo) \ - $(use_enable audioqueue) \ - $(use_enable avcodec) \ - $(use_enable avformat) \ - $(use_enable bidi fribidi) \ - $(use_enable bluray) \ - $(use_enable cdda vcd) \ - $(use_enable cddb libcddb) \ - $(use_enable chromaprint) \ - $(use_enable dbus) \ - $(use_enable directx) \ - $(use_enable dc1394) \ - $(use_enable debug) \ - $(use_enable dts dca) \ - $(use_enable dvbpsi) \ - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ - $(use_enable dxva2) \ - $(use_enable encode sout) \ - $(use_enable faad) \ - $(use_enable fdk fdkaac) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable fontconfig) \ - $(use_enable gcrypt libgcrypt) \ - $(use_enable gme) \ - $(use_enable gnome gnomevfs) \ - $(use_enable gnutls) \ - $(use_enable growl) \ - $(use_enable gstreamer gst-decode) \ - $(use_enable httpd) \ - $(use_enable ieee1394 dv1394) \ - $(use_enable jack) \ - $(use_enable jpeg) \ - $(use_enable kate) \ - $(use_enable libass) \ - $(use_enable libcaca caca) \ - $(use_enable libnotify notify) \ - $(use_enable libsamplerate samplerate) \ - $(use_enable libtar) \ - $(use_enable libtiger tiger) \ - $(use_enable linsys) \ - $(use_enable lirc) \ - $(use_enable live live555) \ - $(use_enable lua) \ - $(use_enable macosx-dialog-provider) \ - $(use_enable macosx-eyetv) \ - $(use_enable macosx-qtkit) \ - $(use_enable macosx-quartztext) \ - $(use_enable matroska mkv) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable modplug mod) \ - $(use_enable mp3 mad) \ - $(use_enable mpeg libmpeg2) \ - $(use_enable mtp) \ - $(use_enable musepack mpc) \ - $(use_enable ncurses) \ - $(use_enable neon) \ - $(use_enable ogg) $(use_enable ogg mux_ogg) \ - $(use_enable omxil) \ - $(use_enable omxil omxil-vout) \ - $(use_enable opencv) \ - $(use_enable opengl glspectrum) \ - $(use_enable opus) \ - $(use_enable optimisememory optimize-memory) \ - $(use_enable png) \ - $(use_enable postproc) \ - $(use_enable projectm) \ - $(use_enable pulseaudio pulse) \ - $(use_enable rdp freerdp) \ - $(use_enable rtsp realrtsp) \ - $(use_enable run-as-root) \ - $(use_enable samba smbclient) \ - $(use_enable schroedinger) \ - $(use_enable sdl) \ - $(use_enable sdl-image) \ - $(use_enable sid) \ - $(use_enable sftp) \ - $(use_enable shout) \ - $(use_enable skins skins2) \ - $(use_enable speex) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable svg) \ - $(use_enable svg svgdec) \ - $(use_enable swscale) \ - $(use_enable taglib) \ - $(use_enable theora) \ - $(use_enable tremor) \ - $(use_enable truetype freetype) \ - $(use_enable twolame) \ - $(use_enable udev) \ - $(use_enable upnp) \ - $(use_enable v4l v4l2) \ - $(use_enable vaapi libva) \ - $(use_enable vcdx) \ - $(use_enable vdpau) \ - $(use_enable vlm) \ - $(use_enable vnc) \ - $(use_enable vorbis) \ - $(use_enable vpx) \ - $(use_enable wma-fixed) \ - $(use_with X x) \ - $(use_enable x264) \ - $(use_enable x265) \ - $(use_enable xcb) \ - $(use_enable xml libxml2) \ - $(use_enable xv xvideo) \ - $(use_enable zeroconf bonjour) \ - $(use_enable zvbi) $(use_enable !zvbi telx) \ - --disable-asdcp \ - --disable-coverage \ - --disable-cprof \ - --disable-crystalhd \ - --disable-decklink \ - --disable-directfb \ - --disable-gles1 \ - --disable-gles2 \ - --disable-goom \ - --disable-kai \ - --disable-kva \ - --disable-maintainer-mode \ - --disable-merge-ffmpeg \ - --disable-mfx \ - --disable-mmal-codec \ - --disable-mmal-vout \ - --disable-opensles \ - --disable-oss \ - --disable-quicktime \ - --disable-rpi-omxil \ - --disable-shine \ - --disable-sndio \ - --disable-vda \ - --disable-vsxu \ - --disable-wasapi - - # ^ We don't have these disabled libraries in the Portage tree yet. - - # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file - sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die -} - -src_test() { - virtx emake check-TESTS -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then - einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" - "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/" - else - ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" - ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" - ewarn "If you do not do it, vlc will take a long time to load." - fi - - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then - rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" - fi - - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -}
