Packman Build Service PMBS

Changes of Revision 385

vlc-beta.patch Changed

@@ -9,7 +9,7 @@
  LIBVLC_ABI_MINOR=0
  LIBVLC_ABI_MICRO=0
  
-@@ -2114,7 +2114,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
+@@ -2175,7 +2175,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
  dnl
  dnl dvdread module: check for libdvdread
  dnl
@@ -18,7 +18,7 @@
  
  dnl
  dnl libdvdnav plugin
-@@ -2461,7 +2461,7 @@ AC_ARG_ENABLE(mod,
+@@ -2532,7 +2532,7 @@ AC_ARG_ENABLE(mod,
    AS_HELP_STRING(--disable-mod,
      do not use libmodplug (default auto)))
  if test "${enable_mod}" != "no" ; then
@@ -27,7 +27,7 @@
            VLC_ADD_PLUGIN(mod)
            VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)
            VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod
-@@ -4731,7 +4731,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
+@@ -4850,7 +4850,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
     VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`
  )
  AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)
@@ -63,7 +63,7 @@
          msg_Err( p_this, "unable to initialize liba52" );
 --- a/modules/control/cli/cli.c
 +++ b/modules/control/cli/cli.c
-@@ -580,6 +580,7 @@ static void *Run(void *data)
+@@ -580,6 +580,7 @@ _Noreturn static void *Run(void *data)
  
          vlc_restorecancel(canc);
      }
@@ -71,9 +71,22 @@
  }
  
  #else // _WIN32
+--- a/modules/gui/qt/maininterface/compositor.cpp
++++ b/modules/gui/qt/maininterface/compositor.cpp
+@@ -215,8 +215,10 @@ void CompositorVideo::windowDestroy()
+     if (m_destroyCb)
+         m_destroyCb(m_wnd);
+ 
++QMetaObject::invokeMethod(this, this() {
+     m_videoSurfaceProvider.reset();
+     m_videoWindowHandler.reset();
++}, Qt::QueuedConnection);
+ }
+ 
+ void CompositorVideo::windowResize(unsigned width, unsigned height)
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -566,7 +566,7 @@ libvlccore_la_LDFLAGS = \
+@@ -568,7 +568,7 @@ libvlccore_la_LDFLAGS = \
  	$(LDFLAGS_libvlccore) \
  	-no-undefined \
  	-export-symbols $(srcdir)/libvlccore.sym \