VLC :)

2015-08-20 18:39:07 +03:00
parent 05bbca2811
commit f4b9a4848d
12 changed files with 751 additions and 0 deletions
@@ -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 
@@ -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])
+ 
@@ -0,0 +1,11 @@
+--- modules/codec/dmo/dmo.c~	2012-09-14 00:02:04.000000000 +0800
+++ modules/codec/dmo/dmo.c	2012-10-16 07:10:41.145463290 +0800
+@@ -546,7 +546,7 @@
+         }
+ 
+         p_bih = &p_vih->bmiHeader;
+-        p_bih->biCompression = i_chroma == VLC_CODEC_RGB24 ? BI_RGB : i_chroma;
+        p_bih->biCompression = i_chroma == VLC_CODEC_RGB24 ? 0L : i_chroma;
+         p_bih->biHeight *= -1;
+         p_bih->biBitCount = p_dec->fmt_out.video.i_bits_per_pixel;
+         p_bih->biSizeImage = p_dec->fmt_in.video.i_width *
@@ -0,0 +1,11 @@
+diff -rupN a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
+--- a/modules/codec/avcodec/vaapi.c	2013-01-22 09:51:40.000000000 +0000
+++ b/modules/codec/avcodec/vaapi.c	2013-07-27 17:23:37.965202118 +0000
+@@ -47,6 +47,7 @@
+ 
+ #include <X11/Xlib.h>
+ #include <va/va_x11.h>
+#include <va/va_compat.h>
+ 
+ typedef struct
+ {
@@ -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)
@@ -0,0 +1,10 @@
+--- share/vlc.desktop.in.OSmanOS	2013-06-24 21:00:39.000000000 +0300
+++ share/vlc.desktop.in	        2013-11-16 18:49:06.848928443 +0200
+@@ -73,6 +73,7 @@
+ Name[sv]=Mediaspelaren VLC
+ GenericName[sv]=Mediaspelaren
+ Comment[sv]=Allmän uppspelare av film och musik
+Comment[tr]=VLC medya oynatıcı
+ Name[te]=VLC మాధ్యమ ప్రదర్శకం
+ GenericName[te]=మాధ్యమ ప్రదర్శకం
+ Comment[te]=మీ బహుళమాధ్యమ ప్రవాహాలను చదువు, బంధించు మరియు ప్రసారం చేయి
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index a684338..053713a 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -2242,8 +2242,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([libavcodec < 56],, [
+-      AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
+    PKG_CHECK_EXISTS([libavcodec < 57],, [
+      AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.])
+     ])
+     VLC_SAVE_FLAGS
+     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
@@ -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 );