Packman Build Service PMBS

Changes of Revision 449

vlc-beta.patch Changed

@@ -9,7 +9,7 @@
  LIBVLC_ABI_MINOR=0
  LIBVLC_ABI_MICRO=0
  
-@@ -2157,7 +2157,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
+@@ -2176,7 +2176,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
-@@ -2524,7 +2524,7 @@ AC_ARG_ENABLE(mod,
+@@ -2545,7 +2545,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
-@@ -4853,7 +4853,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
+@@ -4900,7 +4900,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)
@@ -57,9 +57,62 @@
  }
  
  #else // _WIN32
+--- a/modules/gui/qt/maininterface/compositor_x11_uisurface.cpp
++++ b/modules/gui/qt/maininterface/compositor_x11_uisurface.cpp
+@@ -74,8 +74,6 @@ CompositorX11UISurface::CompositorX11UISurface(QWindow* window, QScreen* screen)
+         m_backingStorePainter->setCompositionMode(QPainter::CompositionMode_Source);
+     }
+ 
+-    m_renderWindow->installEventFilter(this);
+-
+     m_uiRenderControl = new CompositorX11RenderControl(window);
+ 
+     m_uiWindow = new CompositorOffscreenWindow(m_uiRenderControl);
+@@ -87,6 +85,8 @@ CompositorX11UISurface::CompositorX11UISurface(QWindow* window, QScreen* screen)
+     if (!m_qmlEngine->incubationController())
+         m_qmlEngine->setIncubationController(m_uiWindow->incubationController());
+ 
++    m_renderWindow->installEventFilter(this);
++
+     if (m_context)
+     {
+         connect(m_uiWindow, &QQuickWindow::sceneGraphInitialized, this, this() {
+@@ -151,11 +151,12 @@ CompositorX11UISurface::~CompositorX11UISurface()
+ 
+ void CompositorX11UISurface::setContent(QQmlComponent*,  QQuickItem* rootItem)
+ {
++    assert(rootItem);
+     m_rootItem = rootItem;
+ 
+     m_rootItem->setParentItem(m_uiWindow->contentItem());
+ 
+-    updateSizes();
++    m_rootItem->setSize(size());
+ 
+     m_rootItem->forceActiveFocus();
+ 
+@@ -270,6 +271,8 @@ bool CompositorX11UISurface::render()
+ 
+ void CompositorX11UISurface::updateSizes()
+ {
++    assert(m_uiWindow);
++
+     qreal dpr = devicePixelRatio();
+     QSize windowSize = size();
+ 
+@@ -279,7 +282,8 @@ void CompositorX11UISurface::updateSizes()
+         m_backingStore->resize(m_onscreenSize);
+ 
+     // Behave like SizeRootObjectToView.
+-    m_rootItem->setSize(windowSize);
++    if (m_rootItem)
++        m_rootItem->setSize(windowSize);
+     m_uiWindow->resize(windowSize);
+ }
+ 
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -566,7 +566,7 @@ libvlccore_la_LDFLAGS = \
+@@ -585,7 +585,7 @@ libvlccore_la_LDFLAGS = \
  	$(LDFLAGS_libvlccore) \
  	-no-undefined \
  	-export-symbols $(srcdir)/libvlccore.sym \

_service:obs_scm:vlc-beta-20250325.826ae37748.obscpio Deleted

_service:obs_scm:vlc-beta-20250328.258722d74c.obscpio Added

_service:obs_scm:vlc-beta.obsinfo Changed