Changes of Revision 449
vlc-beta.patch
Changed
x
1
2
LIBVLC_ABI_MINOR=0
3
LIBVLC_ABI_MICRO=0
4
5
-@@ -2157,7 +2157,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no",
6
+@@ -2176,7 +2176,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no",
7
dnl
8
dnl dvdread module: check for libdvdread
9
dnl
10
11
12
dnl
13
dnl libdvdnav plugin
14
-@@ -2524,7 +2524,7 @@ AC_ARG_ENABLE(mod,
15
+@@ -2545,7 +2545,7 @@ AC_ARG_ENABLE(mod,
16
AS_HELP_STRING(--disable-mod,
17
do not use libmodplug (default auto)))
18
if test "${enable_mod}" != "no" ; then
19
20
VLC_ADD_PLUGIN(mod)
21
VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)
22
VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod
23
-@@ -4853,7 +4853,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
24
+@@ -4900,7 +4900,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
25
VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`
26
)
27
AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)
28
29
}
30
31
#else // _WIN32
32
+--- a/modules/gui/qt/maininterface/compositor_x11_uisurface.cpp
33
++++ b/modules/gui/qt/maininterface/compositor_x11_uisurface.cpp
34
+@@ -74,8 +74,6 @@ CompositorX11UISurface::CompositorX11UISurface(QWindow* window, QScreen* screen)
35
+ m_backingStorePainter->setCompositionMode(QPainter::CompositionMode_Source);
36
+ }
37
+
38
+- m_renderWindow->installEventFilter(this);
39
+-
40
+ m_uiRenderControl = new CompositorX11RenderControl(window);
41
+
42
+ m_uiWindow = new CompositorOffscreenWindow(m_uiRenderControl);
43
+@@ -87,6 +85,8 @@ CompositorX11UISurface::CompositorX11UISurface(QWindow* window, QScreen* screen)
44
+ if (!m_qmlEngine->incubationController())
45
+ m_qmlEngine->setIncubationController(m_uiWindow->incubationController());
46
+
47
++ m_renderWindow->installEventFilter(this);
48
++
49
+ if (m_context)
50
+ {
51
+ connect(m_uiWindow, &QQuickWindow::sceneGraphInitialized, this, this() {
52
+@@ -151,11 +151,12 @@ CompositorX11UISurface::~CompositorX11UISurface()
53
+
54
+ void CompositorX11UISurface::setContent(QQmlComponent*, QQuickItem* rootItem)
55
+ {
56
++ assert(rootItem);
57
+ m_rootItem = rootItem;
58
+
59
+ m_rootItem->setParentItem(m_uiWindow->contentItem());
60
+
61
+- updateSizes();
62
++ m_rootItem->setSize(size());
63
+
64
+ m_rootItem->forceActiveFocus();
65
+
66
+@@ -270,6 +271,8 @@ bool CompositorX11UISurface::render()
67
+
68
+ void CompositorX11UISurface::updateSizes()
69
+ {
70
++ assert(m_uiWindow);
71
++
72
+ qreal dpr = devicePixelRatio();
73
+ QSize windowSize = size();
74
+
75
+@@ -279,7 +282,8 @@ void CompositorX11UISurface::updateSizes()
76
+ m_backingStore->resize(m_onscreenSize);
77
+
78
+ // Behave like SizeRootObjectToView.
79
+- m_rootItem->setSize(windowSize);
80
++ if (m_rootItem)
81
++ m_rootItem->setSize(windowSize);
82
+ m_uiWindow->resize(windowSize);
83
+ }
84
+
85
--- a/src/Makefile.am
86
+++ b/src/Makefile.am
87
-@@ -566,7 +566,7 @@ libvlccore_la_LDFLAGS = \
88
+@@ -585,7 +585,7 @@ libvlccore_la_LDFLAGS = \
89
$(LDFLAGS_libvlccore) \
90
-no-undefined \
91
-export-symbols $(srcdir)/libvlccore.sym \
92
_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
9
1
2
name: vlc-beta
3
-version: 20250325.826ae37748
4
-mtime: 1742883215
5
-commit: 826ae377480fca0886defe7f752806d9ea7b81dd
6
+version: 20250328.258722d74c
7
+mtime: 1743147607
8
+commit: 258722d74cba782abe5d7a714ccf0516df639984
9