From 65ce92654aae0b0dd2b86d6eb4bd8cc5d2f9f354 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 9 Feb 2018 13:22:43 +0000 Subject: [PATCH] Update to 3.0.0 release --- ...don-t-call-directly-config_GetLibDir.patch | 38 ---- ...rt-qt-add-Wayland-run-time-detection.patch | 191 ------------------ 0001-qt-Prefer-XCB-over-Wayland.patch | 43 ---- disable_hidpi_scaling.patch | 14 -- sources | 2 +- vlc.spec | 13 +- 6 files changed, 8 insertions(+), 293 deletions(-) delete mode 100644 0001-Revert-lua-don-t-call-directly-config_GetLibDir.patch delete mode 100644 0001-Revert-qt-add-Wayland-run-time-detection.patch delete mode 100644 0001-qt-Prefer-XCB-over-Wayland.patch delete mode 100644 disable_hidpi_scaling.patch diff --git a/0001-Revert-lua-don-t-call-directly-config_GetLibDir.patch b/0001-Revert-lua-don-t-call-directly-config_GetLibDir.patch deleted file mode 100644 index fa98769..0000000 --- a/0001-Revert-lua-don-t-call-directly-config_GetLibDir.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9bec043da70def3adf0a69747ebe3601f1886fe1 Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet -Date: Mon, 31 Jul 2017 10:42:39 +0200 -Subject: [PATCH] Revert "lua: don't call directly config_GetLibDir" - -libdir and datadir are different kind of directories on Linux. -So they are unrelated - -This reverts commit d5ac6c4ce3d9f50b7bf9e9325b8c9f93b376c574. ---- - modules/lua/vlc.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c -index 512d9e505c..57dc7d8e49 100644 ---- a/modules/lua/vlc.c -+++ b/modules/lua/vlc.c -@@ -214,6 +214,17 @@ int vlclua_dir_list( const char *luadirname, char ***pppsz_dir_list ) - i++; - free( datadir ); - -+#if !(defined(__APPLE__) || defined(_WIN32)) -+ char *psz_libpath = config_GetLibDir(); -+ if( likely(psz_libpath != NULL) ) -+ { -+ if( likely(asprintf( &ppsz_dir_list[i], "%s"DIR_SEP"lua"DIR_SEP"%s", -+ psz_libpath, luadirname ) != -1) ) -+ i++; -+ free( psz_libpath ); -+ } -+#endif -+ - char *psz_datapath = config_GetDataDir(); - if( likely(psz_datapath != NULL) ) - { --- -2.13.3 - diff --git a/0001-Revert-qt-add-Wayland-run-time-detection.patch b/0001-Revert-qt-add-Wayland-run-time-detection.patch deleted file mode 100644 index 20ce795..0000000 --- a/0001-Revert-qt-add-Wayland-run-time-detection.patch +++ /dev/null @@ -1,191 +0,0 @@ -From 82e73a6fa15cb7cf62decdd8ba44df4d1685301d Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet -Date: Mon, 16 Jan 2017 12:03:14 +0100 -Subject: [PATCH] Revert "qt: add Wayland run-time detection" - -This reverts commit 785b0f18d70815288c8a673bcd0f3849af7ef6f7. ---- - modules/gui/qt/Makefile.am | 4 -- - modules/gui/qt/qt.cpp | 104 +++++++++++++-------------------------------- - 2 files changed, 29 insertions(+), 79 deletions(-) - -diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am -index 7e5f5ae..16e3596 100644 ---- a/modules/gui/qt/Makefile.am -+++ b/modules/gui/qt/Makefile.am -@@ -24,10 +24,6 @@ if HAVE_QT5_X11 - libqt_plugin_la_CXXFLAGS += $(QT5_X11_CFLAGS) -DQT5_HAS_X11 - libqt_plugin_la_LIBADD += $(QT5_X11_LIBS) $(X_LIBS) $(X_PRE_LIB) -lX11 - endif --if HAVE_WAYLAND --libqt_plugin_la_CXXFLAGS += $(WAYLAND_CLIENT_CFLAGS) -DQT5_HAS_WAYLAND --libqt_plugin_la_LIBADD += $(WAYLAND_CLIENT_LIBS) --endif - if HAVE_WIN32 - libqt_plugin_la_LIBADD += $(LIBCOM) -lcomctl32 -luuid - endif -diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp -index 6015b2a..0229f6e 100644 ---- a/modules/gui/qt/qt.cpp -+++ b/modules/gui/qt/qt.cpp -@@ -48,6 +48,10 @@ - #include "util/qvlcapp.hpp" /* QVLCApplication definition */ - #include "components/playlist/playlist_model.hpp" /* for ~PLModel() */ - -+#if defined (QT5_HAS_X11) || defined (Q_WS_X11) -+ #include -+#endif -+ - #include - #include - -@@ -75,6 +79,7 @@ static int Open ( vlc_object_t *, bool ); - static void Close ( vlc_object_t * ); - static int WindowOpen ( vout_window_t *, const vout_window_cfg_t * ); - static void WindowClose ( vout_window_t * ); -+static void *Thread ( void * ); - static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); - - /***************************************************************************** -@@ -332,13 +337,6 @@ static bool active = false; - * Module callbacks - *****************************************************************************/ - --static void *ThreadPlatform( void *, char * ); -- --static void *Thread( void *data ) --{ -- return ThreadPlatform( data, NULL ); --} -- - #ifdef Q_OS_MAC - /* Used to abort the app.exec() on OSX after libvlc_Quit is called */ - #include "../../../lib/libvlc_internal.h" /* libvlc_SetExitHandler */ -@@ -348,67 +346,22 @@ static void Abort( void *obj ) - } - #endif - --#if defined (QT5_HAS_X11) --# include -- --static void *ThreadXCB( void *data ) --{ -- char platform_name[] = "xcb"; -- return ThreadPlatform( data, platform_name ); --} -- --static bool HasX11( vlc_object_t *obj ) --{ -- if( !vlc_xlib_init( obj ) ) -- return false; -- -- Display *dpy = XOpenDisplay( NULL ); -- if( dpy == NULL ) -- return false; -- -- XCloseDisplay( dpy ); -- return true; --} --#endif -- --#ifdef QT5_HAS_WAYLAND --# include -- --static void *ThreadWayland( void *data ) --{ -- char platform_name[] = "wayland"; -- return ThreadPlatform( data, platform_name ); --} -- --static bool HasWayland( void ) --{ -- struct wl_display *dpy = wl_display_connect( NULL ); -- if( dpy == NULL ) -- return false; -- -- wl_display_disconnect( dpy ); -- return true; --} --#endif -- - /* Open Interface */ - static int Open( vlc_object_t *p_this, bool isDialogProvider ) - { - intf_thread_t *p_intf = (intf_thread_t *)p_this; -- void *(*thread)(void *) = Thread; - --#ifdef QT5_HAS_WAYLAND -- if( HasWayland() ) -- thread = ThreadWayland; -- else --#endif --#ifdef QT5_HAS_X11 -- if( HasX11( p_this ) ) -- thread = ThreadXCB; -- else --#endif --#if defined (QT5_HAS_X11) || defined (QT5_HAS_WAYLAND) -+#if defined (QT5_HAS_X11) || defined (Q_WS_X11) -+ if( !vlc_xlib_init( p_this ) ) -+ return VLC_EGENERIC; -+ -+ Display *p_display = XOpenDisplay( NULL ); -+ if( !p_display ) -+ { -+ msg_Err( p_intf, "Could not connect to X server" ); - return VLC_EGENERIC; -+ } -+ XCloseDisplay( p_display ); - #endif - - QMutexLocker locker (&lock); -@@ -435,9 +388,9 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider ) - #ifdef Q_OS_MAC - /* Run mainloop on the main thread as Cocoa requires */ - libvlc_SetExitHandler( p_intf->obj.libvlc, Abort, p_intf ); -- thread( (void *)p_intf ); -+ Thread( (void *)p_intf ); - #else -- if( vlc_clone( &p_sys->thread, thread, p_intf, VLC_THREAD_PRIORITY_LOW ) ) -+ if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) ) - { - delete p_sys; - return VLC_ENOMEM; -@@ -493,22 +446,23 @@ static void Close( vlc_object_t *p_this ) - busy = false; - } - --static void *ThreadPlatform( void *obj, char *platform_name ) -+static void *Thread( void *obj ) - { - intf_thread_t *p_intf = (intf_thread_t *)obj; - intf_sys_t *p_sys = p_intf->p_sys; - char vlc_name[] = "vlc"; /* for WM_CLASS */ -+#ifdef QT5_HAS_X11 - char platform_parm[] = "-platform"; -- char *argv[4]; -- int argc = 0; -- -- argv[argc++] = vlc_name; -- if( platform_name != NULL ) -- { -- argv[argc++] = platform_parm; -- argv[argc++] = platform_name; -- } -- argv[argc] = NULL; -+ char platform_value[] = "xcb"; -+#endif -+ char *argv[] = { -+ vlc_name, -+#ifdef QT5_HAS_X11 -+ platform_parm, platform_value, -+#endif -+ NULL, -+ }; -+ int argc = sizeof(argv) / sizeof(argv[0]) - 1; - - Q_INIT_RESOURCE( vlc ); - --- -2.7.4 - diff --git a/0001-qt-Prefer-XCB-over-Wayland.patch b/0001-qt-Prefer-XCB-over-Wayland.patch deleted file mode 100644 index 71872c0..0000000 --- a/0001-qt-Prefer-XCB-over-Wayland.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 781dee40c6f32941207322561ebab7166a90569c Mon Sep 17 00:00:00 2001 -From: Martin Briza -Date: Fri, 23 Jun 2017 16:30:09 +0200 -Subject: [PATCH] qt: Prefer XCB over Wayland - -Wayland users now have no choice (except setting WAYLAND_DISPLAY to '') how to avoid getting VLC under Wayland which may not be optimal yet. - -This patch ensures the XCB backend is preferred. This means the developers who want to work on Wayland support will have to clear their DISPLAY variable instead. - -Related to https://trac.videolan.org/vlc/ticket/18383 . ---- - modules/gui/qt/qt.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp -index 2ad68eb401..3224361ecb 100644 ---- a/modules/gui/qt/qt.cpp -+++ b/modules/gui/qt/qt.cpp -@@ -411,16 +411,16 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider ) - intf_thread_t *p_intf = (intf_thread_t *)p_this; - void *(*thread)(void *) = Thread; - --#ifdef QT5_HAS_WAYLAND -- if( HasWayland() ) -- thread = ThreadWayland; -- else --#endif - #ifdef QT5_HAS_X11 - if( HasX11( p_this ) ) - thread = ThreadXCB; - else - #endif -+#ifdef QT5_HAS_WAYLAND -+ if( HasWayland() ) -+ thread = ThreadWayland; -+ else -+#endif - #if defined (QT5_HAS_X11) || defined (QT5_HAS_WAYLAND) - return VLC_EGENERIC; - #endif --- -2.13.0 - diff --git a/disable_hidpi_scaling.patch b/disable_hidpi_scaling.patch deleted file mode 100644 index 116edb5..0000000 --- a/disable_hidpi_scaling.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/modules/gui/qt/qt.cpp 2016-11-18 02:24:10.000000000 +0000 -+++ b/modules/gui/qt/qt.cpp 2016-11-22 14:28:23.503056877 +0000 -@@ -478,9 +478,10 @@ static void *Thread( void *obj ) - - Q_INIT_RESOURCE( vlc ); - -+ /* Disable scaling as it's broken - #if HAS_QT56 - QApplication::setAttribute( Qt::AA_EnableHighDpiScaling ); --#endif -+#endif */ - - /* Start the QApplication here */ - QVLCApp app( argc, argv ); diff --git a/sources b/sources index 828dc72..60c16f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d3e779564f2381341c1eb14cb6133f6 vlc-3.0.0-20180202-0233-rc9.tar.xz +a953d8b90e56f06828c4ca8e390c5c9b vlc-3.0.0.tar.xz diff --git a/vlc.spec b/vlc.spec index ca57768..2c261cc 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,7 +1,7 @@ %global vlc_vers 3.0.0 -%global vlc_date 20180202 -%global vlc_rc rc9 -%global vlc_tag -%{?vlc_date}-0233-%{?vlc_rc} +#global vlc_date 20180202 +#global vlc_rc rc9 +#global vlc_tag -%%{?vlc_date}-0233-%%{?vlc_rc} %if 0%{?vlc_rc:1} %global vlc_url https://nightlies.videolan.org/build/source/ %else @@ -43,7 +43,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Name: vlc Version: %{vlc_vers} -Release: 0.53%{?vlc_date:.git%{vlc_date}}%{?vlc_rc:.%{vlc_rc}}%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org @@ -271,8 +271,6 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : %build - - %configure \ --disable-dependency-tracking \ --disable-optimizations \ @@ -548,6 +546,9 @@ fi || : %changelog +* Fri Feb 09 2018 Leigh Scott - 3.0.0-1 +- Update to 3.0.0 release + * Sun Feb 04 2018 Sérgio Basto - 3.0.0-0.53.git20180202.rc9 - Rebuild (live555-2018.01.29)