[vlc-commits] linux: Add signal.h header for SIGEV_THREAD symbol.
vlc | branch: master | Vinson Lee <v...@freedesktop.org> | Sat Jun 17 00:55:03 2017 +| [6da67ca2a31cd004ef0f709bfacf0f2acf9a] | committer: Rémi Denis-Courmont linux: Add signal.h header for SIGEV_THREAD symbol. Fix this build error. CC linux/getaddrinfo.lo linux/getaddrinfo.c: In function ‘vlc_getaddrinfo_i11e’: linux/getaddrinfo.c:62:25: error: ‘SIGEV_THREAD’ undeclared (first use in this function); did you mean ‘CLONE_THREAD’? .sigev_notify = SIGEV_THREAD, ^~~~ CLONE_THREAD Signed-off-by: Vinson Lee <v...@freedesktop.org> Signed-off-by: Rémi Denis-Courmont <r...@remlab.net> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6da67ca2a31cd004ef0f709bfacf0f2acf9a --- src/linux/getaddrinfo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/linux/getaddrinfo.c b/src/linux/getaddrinfo.c index 0df6db0260..aaba24df88 100644 --- a/src/linux/getaddrinfo.c +++ b/src/linux/getaddrinfo.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] video_splliter: Add XCB flags for panoramix.
vlc/vlc-2.2 | branch: master | Vinson Lee <v...@freedesktop.org> | Sat Aug 20 06:02:27 2016 +| [b123f94b8593cf2f97680c96cb0f444e3efa400a] | committer: Jean-Baptiste Kempf video_splliter: Add XCB flags for panoramix. This patch fixes this build error. video_splitter/.libs/libpanoramix_plugin_la-panoramix.o: In function `CountMonitors': modules/video_splitter/panoramix.c:352: undefined reference to `xcb_connect' modules/video_splitter/panoramix.c:354: undefined reference to `xcb_connection_has_error' modules/video_splitter/panoramix.c:357: undefined reference to `xcb_get_setup' modules/video_splitter/panoramix.c:359: undefined reference to `xcb_setup_roots_iterator' modules/video_splitter/panoramix.c:360: undefined reference to `xcb_screen_next' modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect' modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect' modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect' Signed-off-by: Vinson Lee <v...@freedesktop.org> Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> (cherry picked from commit a854dc7108cdb70b5f58a1232868c74ad3620c99) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=b123f94b8593cf2f97680c96cb0f444e3efa400a --- modules/video_splitter/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/video_splitter/Makefile.am b/modules/video_splitter/Makefile.am index f0e023c..4998c71 100644 --- a/modules/video_splitter/Makefile.am +++ b/modules/video_splitter/Makefile.am @@ -15,8 +15,8 @@ if HAVE_WIN32 splitter_LTLIBRARIES += libpanoramix_plugin.la else if HAVE_XCB_RANDR -libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS) -libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS) +libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS) $(XCB_CFLAGS) +libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS) $(XCB_LIBS) splitter_LTLIBRARIES += libpanoramix_plugin.la endif endif ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] video_splliter: Add XCB flags for panoramix.
vlc | branch: master | Vinson Lee <v...@freedesktop.org> | Sat Aug 20 06:02:27 2016 +| [a854dc7108cdb70b5f58a1232868c74ad3620c99] | committer: Jean-Baptiste Kempf video_splliter: Add XCB flags for panoramix. This patch fixes this build error. video_splitter/.libs/libpanoramix_plugin_la-panoramix.o: In function `CountMonitors': modules/video_splitter/panoramix.c:352: undefined reference to `xcb_connect' modules/video_splitter/panoramix.c:354: undefined reference to `xcb_connection_has_error' modules/video_splitter/panoramix.c:357: undefined reference to `xcb_get_setup' modules/video_splitter/panoramix.c:359: undefined reference to `xcb_setup_roots_iterator' modules/video_splitter/panoramix.c:360: undefined reference to `xcb_screen_next' modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect' modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect' modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect' Signed-off-by: Vinson Lee <v...@freedesktop.org> Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a854dc7108cdb70b5f58a1232868c74ad3620c99 --- modules/video_splitter/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/video_splitter/Makefile.am b/modules/video_splitter/Makefile.am index da32c52..ffeb94e 100644 --- a/modules/video_splitter/Makefile.am +++ b/modules/video_splitter/Makefile.am @@ -15,8 +15,8 @@ if HAVE_WIN32_DESKTOP splitter_LTLIBRARIES += libpanoramix_plugin.la else if HAVE_XCB_RANDR -libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS) -libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS) +libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS) $(XCB_CFLAGS) +libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS) $(XCB_LIBS) splitter_LTLIBRARIES += libpanoramix_plugin.la endif endif ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] rdp: Fix build with FreeRDP 2.0.0.
vlc/vlc-2.2 | branch: master | Vinson Lee <v...@freedesktop.org> | Fri Jul 22 13:37:13 2016 +0200| [58b64da19c082e128cc92c3d5852c981be9312f3] | committer: Jean-Baptiste Kempf rdp: Fix build with FreeRDP 2.0.0. Signed-off-by: Vinson Lee <v...@freedesktop.org> Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=58b64da19c082e128cc92c3d5852c981be9312f3 --- modules/access/rdp.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/access/rdp.c b/modules/access/rdp.c index 0a11f42..744788b 100644 --- a/modules/access/rdp.c +++ b/modules/access/rdp.c @@ -46,7 +46,7 @@ #endif #if !defined(FREERDP_VERSION_MAJOR) || \ -(defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 )) +(defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))) # define SoftwareGdi sw_gdi # define Fullscreen fullscreen # define ServerHostname hostname @@ -233,7 +233,7 @@ static bool postConnectHandler( freerdp *p_instance ) vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)", -#if (FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 ) +#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)) p_instance->settings->DesktopWidth, p_instance->settings->DesktopHeight, p_instance->settings->ColorDepth ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] rdp: Fix build with FreeRDP 2.0.0.
vlc | branch: master | Vinson Lee <v...@freedesktop.org> | Tue Dec 1 02:06:19 2015 -0800| [fa5081cc9166dc911eef21182906391105daa670] | committer: Jean-Baptiste Kempf rdp: Fix build with FreeRDP 2.0.0. Signed-off-by: Vinson Lee <v...@freedesktop.org> Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa5081cc9166dc911eef21182906391105daa670 --- modules/access/rdp.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/access/rdp.c b/modules/access/rdp.c index d9d05a2..e20cb14 100644 --- a/modules/access/rdp.c +++ b/modules/access/rdp.c @@ -46,7 +46,7 @@ #endif #if !defined(FREERDP_VERSION_MAJOR) || \ -(defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 )) +(defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))) # define SoftwareGdi sw_gdi # define Fullscreen fullscreen # define ServerHostname hostname @@ -237,7 +237,7 @@ static bool postConnectHandler( freerdp *p_instance ) vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)", -#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 ) +#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)) p_instance->settings->DesktopWidth, p_instance->settings->DesktopHeight, p_instance->settings->ColorDepth ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] rdp: Support FreeRDP-1.2.0-beta1-android9
vlc/vlc-2.2 | branch: master | Vinson Lee v...@freedesktop.org | Fri Feb 20 06:05:09 2015 +| [4ddbb29da4c4869dac8b16cd897a682a509b026b] | committer: Jean-Baptiste Kempf rdp: Support FreeRDP-1.2.0-beta1-android9 Fix build errors. CC access/librdp_plugin_la-rdp.lo access/rdp.c: In function ‘Open’: access/rdp.c:431:5: error: implicit declaration of function ‘freerdp_channels_global_init’ [-Werror=implicit-function-declaration] freerdp_channels_global_init(); ^ access/rdp.c: In function ‘Close’: access/rdp.c:507:5: error: implicit declaration of function ‘freerdp_channels_global_uninit’ [-Werror=implicit-function-declaration] freerdp_channels_global_uninit(); ^ freerdp channels global functions were removed from FreeRDP repository in commit 2a82684521dc8b23ae92e284e866227e5194a7bb. commit 2a82684521dc8b23ae92e284e866227e5194a7bb Author: Marc-André Moreau marcandre.mor...@gmail.com Date: Wed Jun 11 16:27:31 2014 -0400 channels: cleanup unused freerdp channels global functions Signed-off-by: Vinson Lee v...@freedesktop.org Signed-off-by: Jean-Baptiste Kempf j...@videolan.org (cherry picked from commit 5c07f87a773153c128b3a771ed61e7915cd8fe18) Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=4ddbb29da4c4869dac8b16cd897a682a509b026b --- modules/access/rdp.c |4 1 file changed, 4 insertions(+) diff --git a/modules/access/rdp.c b/modules/access/rdp.c index a7280a59..0a11f42 100644 --- a/modules/access/rdp.c +++ b/modules/access/rdp.c @@ -428,7 +428,9 @@ static int Open( vlc_object_t *p_this ) if ( p_sys-f_fps = 0 ) p_sys-f_fps = 1.0; p_sys-i_frame_interval = 100 / p_sys-f_fps; +#if FREERDP_VERSION_MAJOR == 1 FREERDP_VERSION_MINOR 2 freerdp_channels_global_init(); +#endif p_sys-p_instance = freerdp_new(); if ( !p_sys-p_instance ) @@ -504,7 +506,9 @@ static void Close( vlc_object_t *p_this ) freerdp_disconnect( p_sys-p_instance ); freerdp_free( p_sys-p_instance ); +#if FREERDP_VERSION_MAJOR == 1 FREERDP_VERSION_MINOR 2 freerdp_channels_global_uninit(); +#endif if ( p_sys-p_block ) block_Release( p_sys-p_block ); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] rdp: Support FreeRDP-1.2.0-beta1-android9
vlc | branch: master | Vinson Lee v...@freedesktop.org | Fri Feb 20 06:05:09 2015 +| [5c07f87a773153c128b3a771ed61e7915cd8fe18] | committer: Jean-Baptiste Kempf rdp: Support FreeRDP-1.2.0-beta1-android9 Fix build errors. CC access/librdp_plugin_la-rdp.lo access/rdp.c: In function ‘Open’: access/rdp.c:431:5: error: implicit declaration of function ‘freerdp_channels_global_init’ [-Werror=implicit-function-declaration] freerdp_channels_global_init(); ^ access/rdp.c: In function ‘Close’: access/rdp.c:507:5: error: implicit declaration of function ‘freerdp_channels_global_uninit’ [-Werror=implicit-function-declaration] freerdp_channels_global_uninit(); ^ freerdp channels global functions were removed from FreeRDP repository in commit 2a82684521dc8b23ae92e284e866227e5194a7bb. commit 2a82684521dc8b23ae92e284e866227e5194a7bb Author: Marc-André Moreau marcandre.mor...@gmail.com Date: Wed Jun 11 16:27:31 2014 -0400 channels: cleanup unused freerdp channels global functions Signed-off-by: Vinson Lee v...@freedesktop.org Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5c07f87a773153c128b3a771ed61e7915cd8fe18 --- modules/access/rdp.c |4 1 file changed, 4 insertions(+) diff --git a/modules/access/rdp.c b/modules/access/rdp.c index 1dca8ae..769ba60 100644 --- a/modules/access/rdp.c +++ b/modules/access/rdp.c @@ -428,7 +428,9 @@ static int Open( vlc_object_t *p_this ) if ( p_sys-f_fps = 0 ) p_sys-f_fps = 1.0; p_sys-i_frame_interval = 100 / p_sys-f_fps; +#if FREERDP_VERSION_MAJOR == 1 FREERDP_VERSION_MINOR 2 freerdp_channels_global_init(); +#endif p_sys-p_instance = freerdp_new(); if ( !p_sys-p_instance ) @@ -504,7 +506,9 @@ static void Close( vlc_object_t *p_this ) freerdp_disconnect( p_sys-p_instance ); freerdp_free( p_sys-p_instance ); +#if FREERDP_VERSION_MAJOR == 1 FREERDP_VERSION_MINOR 2 freerdp_channels_global_uninit(); +#endif if ( p_sys-p_block ) block_Release( p_sys-p_block ); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] lua: Define LUA_COMPAT_APIINTCASTS for Lua = 5.3.0 compatibility.
vlc | branch: master | Vinson Lee v...@freedesktop.org | Thu Feb 5 14:48:53 2015 -0800| [41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23] | committer: Jean-Baptiste Kempf lua: Define LUA_COMPAT_APIINTCASTS for Lua = 5.3.0 compatibility. In Lua 5.3.0, luaL_checkint was deprecated. This patch fixes this build error with Lua 5.3.0. lua/demux.c: In function ‘vlclua_demux_peek’: lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration] int n = luaL_checkint( L, 1 ); ^ Signed-off-by: Vinson Lee v...@freedesktop.org Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23 --- modules/lua/vlc.h |1 + 1 file changed, 1 insertion(+) diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h index efd94f1..85c7fc1 100644 --- a/modules/lua/vlc.h +++ b/modules/lua/vlc.h @@ -38,6 +38,7 @@ #include vlc_stream.h #include vlc_demux.h +#define LUA_COMPAT_APIINTCASTS #define LUA_COMPAT_MODULE #include lua.h/* Low level lua C API */ #include lauxlib.h/* Higher level C API */ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
