a bit edited vlc ebuild from gentoo (do not depend on slot :0 lua ebuild)

10 files changed, 224 insertions, 0 deletions

diff --git a/media-video/vlc/files/qt4-select.patch b/media-video/vlc/files/qt4-select.patch
new file mode 100644
index 0000000..5fcabae
--- /dev/null
+++ b/media-video/vlc/files/qt4-select.patch
@@ -0,0 +1,51 @@
+https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54
+For use until upstream ever accepts this patch or fixes it themsleves
+--- configure.ac.orig	2015-03-01 02:28:48.983932684 +0100
++++ configure.ac	2015-03-01 02:41:29.641927072 +0100
+@@ -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.1-mem_undefined_functions.patch b/media-video/vlc/files/vlc-2.1-mem_undefined_functions.patch
new file mode 100644
index 0000000..7289c07
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1-mem_undefined_functions.patch
@@ -0,0 +1,14 @@
+# Fixes gentoo bug 541654
+# https://bugs.gentoo.org/show_bug.cgi?id=541654
+# Committed on behalf of Luca Barbato <lu_zero@gentoo.org>
+
+--- modules/codec/avcodec/avcommon.h.orig	2015-02-28 15:19:33.449761287 +0000
++++ modules/codec/avcodec/avcommon.h	2015-02-28 15:20:10.469537179 +0000
+@@ -81,6 +81,7 @@
+ #ifdef HAVE_LIBAVUTIL_AVUTIL_H
+ # include <libavutil/avutil.h>
+ # include <libavutil/dict.h>
++# include <libavutil/mem.h>
+ 
+ #define AV_OPTIONS_TEXT     "Advanced options."
+ #define AV_OPTIONS_LONGTEXT "Advanced options, in the form {opt=val,opt2=val2} ."
diff --git a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch b/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch
new file mode 100644
index 0000000..3163410
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch
@@ -0,0 +1,23 @@
+index 2debbcd..72e7fcf 100644
+--- a/modules/audio_output/pulse.c
++++ b/modules/audio_output/pulse.c
+@@ -472,8 +472,17 @@ static void stream_underflow_cb(pa_stream *s, void *userdata)
+ {
++    uint32_t rate = pa_stream_get_sample_spec(s)->rate;
+     audio_output_t *aout = userdata;
+ 
+-    msg_Dbg(aout, "underflow");
+-    (void) s;
++    msg_Warn(aout, "underflow");
++    stream_stop(s, aout);
++
++    aout_sys_t *sys = aout->sys;
++    sys->first_pts = VLC_TS_INVALID;
++
++    pa_operation *op = pa_stream_update_sample_rate(s, rate, NULL, NULL);
++    if (unlikely(op == NULL))
++        return;
++    pa_operation_unref(op);
+ }
+ 
+ static int stream_wait(pa_stream *stream, pa_threaded_mainloop *mainloop)
diff --git a/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch b/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch
new file mode 100644
index 0000000..8a58969
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch
@@ -0,0 +1,11 @@
+--- a/modules/codec/Makefile.am
++++ b/modules/codec/Makefile.am
+@@ -215,7 +215,7 @@
+ libtremor_plugin_la_SOURCES = codec/vorbis.c
+ libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
+ libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+-libtremor_plugin_la_LIBADD = -lvorbisdec -logg
++libtremor_plugin_la_LIBADD = $(VORBIS_LIBS) $(OGG_LIBS)
+ EXTRA_LTLIBRARIES += libtremor_plugin.la
+ codec_LTLIBRARIES += $(LTLIBtremor)
+ 
diff --git a/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch
new file mode 100644
index 0000000..db73a4e
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch
@@ -0,0 +1,12 @@
+--- a/modules/codec/avcodec/vaapi.c
++++ b/modules/codec/avcodec/vaapi.c
+@@ -36,6 +36,9 @@
+ #include <libavcodec/vaapi.h>
+ #include <X11/Xlib.h>
+ #include <va/va_x11.h>
++#if VA_MINOR_VERSION >= 34
++# include <va/va_compat.h>
++#endif
+ 
+ #include "avcodec.h"
+ #include "va.h"
\ No newline at end of file
diff --git a/media-video/vlc/files/vlc-2.1.0-newer-rdp.patch b/media-video/vlc/files/vlc-2.1.0-newer-rdp.patch
new file mode 100644
index 0000000..aa1957a
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1.0-newer-rdp.patch
@@ -0,0 +1,47 @@
+--- a/modules/access/rdp.c
++++ b/modules/access/rdp.c
+@@ -198,15 +198,15 @@
+     demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys;
+ 
+     /* Configure connexion */
+-    p_instance->settings->sw_gdi = true; /* render in buffer */
+-    p_instance->settings->fullscreen = true;
+-    p_instance->settings->hostname = strdup( p_sys->psz_hostname );
+-    p_instance->settings->username =
++    p_instance->settings->SoftwareGdi = true; /* render in buffer */
++    p_instance->settings->Fullscreen = true;
++    p_instance->settings->ServerHostname = strdup( p_sys->psz_hostname );
++    p_instance->settings->Username =
+             var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "user" );
+-    p_instance->settings->password =
++    p_instance->settings->Password =
+             var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "password" );
+-    p_instance->settings->port = p_sys->i_port;
+-    p_instance->settings->encryption =
++    p_instance->settings->ServerPort = p_sys->i_port;
++    p_instance->settings->EncryptionMethods =
+             var_InheritBool( p_vlccontext->p_demux, CFG_PREFIX "encrypt" );
+ 
+     return true;
+@@ -217,9 +217,9 @@
+     vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context;
+ 
+     msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
+-             p_instance->settings->width,
+-             p_instance->settings->height,
+-             p_instance->settings->color_depth );
++             p_instance->settings->DesktopWidth,
++             p_instance->settings->DesktopHeight,
++             p_instance->settings->ColorDepth );
+ 
+     p_instance->update->DesktopResize = desktopResizeHandler;
+     p_instance->update->BeginPaint = beginPaintHandler;
+@@ -415,7 +415,7 @@
+     p_sys->p_instance->Authenticate = authenticateHandler;
+ 
+     /* Set up context handlers and let it be allocated */
+-    p_sys->p_instance->context_size = sizeof( vlcrdp_context_t );
++    p_sys->p_instance->ContextSize = sizeof( vlcrdp_context_t );
+     freerdp_context_new( p_sys->p_instance );
+ 
+     vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_sys->p_instance->context;
diff --git a/media-video/vlc/files/vlc-2.2.0-fix-xcb.patch b/media-video/vlc/files/vlc-2.2.0-fix-xcb.patch
new file mode 100644
index 0000000..c6a1b94
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.0-fix-xcb.patch
@@ -0,0 +1,16 @@
+https://github.com/videolan/vlc/commit/c354efa3a2843d479c8fa9e929ff1064e5526bfa
+--- modules/hw/vdpau/Makefile.am.orig	2015-04-16 22:29:26.299342749 -0700
++++ modules/hw/vdpau/Makefile.am	2015-04-16 22:31:40.886340950 -0700
+@@ -45,6 +45,7 @@
+ libvdpau_chroma_plugin_la_LIBADD = libvlc_vdpau.la
+ vdpau_LTLIBRARIES += libvdpau_chroma_plugin.la
+ 
++if HAVE_XCB
+ libvdpau_display_plugin_la_SOURCES = display.c
+ libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../video_output/xcb
+ libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
+@@ -52,3 +53,4 @@
+ 	../../video_output/libvlc_xcb_events.la \
+ 	$(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
+ vdpau_LTLIBRARIES += libvdpau_display_plugin.la
++endif
diff --git a/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch b/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch
new file mode 100644
index 0000000..19fc70f
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch
@@ -0,0 +1,23 @@
+--- a/modules/access/rdp.c	2014-11-22 01:40:52.044973648 -0800
++++ b/modules/access/rdp.c	2014-11-22 01:36:44.291975380 -0800
+@@ -399,7 +404,9 @@
+     if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0;
+     p_sys->i_frame_interval = 1000000 / p_sys->f_fps;
+ 
++#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2))
+     freerdp_channels_global_init();
++#endif
+ 
+     p_sys->p_instance = freerdp_new();
+     if ( !p_sys->p_instance )
+@@ -475,7 +482,10 @@
+ 
+     freerdp_disconnect( p_sys->p_instance );
+     freerdp_free( p_sys->p_instance );
++
++#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2))
+     freerdp_channels_global_uninit();
++#endif
+ 
+     if ( p_sys->p_block )
+         block_Release( p_sys->p_block );
diff --git a/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch b/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch
new file mode 100644
index 0000000..dec6c12
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch
@@ -0,0 +1,15 @@
+--- modules/hw/vdpau/Makefile.am.orig	2015-04-16 22:29:26.299342749 -0700
++++ modules/hw/vdpau/Makefile.am	2015-04-16 22:31:40.886340950 -0700
+@@ -45,6 +45,7 @@
+ libvdpau_chroma_plugin_la_LIBADD = libvlc_vdpau.la
+ vdpau_LTLIBRARIES += libvdpau_chroma_plugin.la
+ 
++if HAVE_XCB
+ libvdpau_display_plugin_la_SOURCES = display.c
+ libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../video_output/xcb
+ libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
+@@ -52,3 +53,4 @@
+ 	../../video_output/libvlc_xcb_events.la \
+ 	$(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
+ vdpau_LTLIBRARIES += libvdpau_display_plugin.la
++endif
diff --git a/media-video/vlc/files/vlc-scm-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-scm-libva-1.2.1-compat.patch
new file mode 100644
index 0000000..adfdefe
--- /dev/null
+++ b/media-video/vlc/files/vlc-scm-libva-1.2.1-compat.patch
@@ -0,0 +1,12 @@
+--- a/modules/codec/avcodec/vaapi.c
++++ b/modules/codec/avcodec/vaapi.c
+@@ -34,6 +34,9 @@
+ #ifdef VLC_VA_BACKEND_XLIB
+ # include <vlc_xlib.h>
+ # include <va/va_x11.h>
++#if VA_MINOR_VERSION >= 34
++# include <va/va_compat.h>
++#endif
+ #endif
+ #ifdef VLC_VA_BACKEND_DRM
+ # include <sys/types.h>