Projects
Extra
vlc-beta
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 57
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/contrib/src/taglib/SHA512SUMS -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/contrib/src/taglib/SHA512SUMS
Changed
@@ -1,2 +1,2 @@ -25ee89293a96d7f8dca6276f822bdaef01fd98503b78c20ffeac8e1d9821de7273a5127146aa798d304c6a995cb2b7229a205aff1cc261b5d4fa9e499dda0439 taglib-2.0.1.tar.gz +061db9f0340e916133859dfdba6fdca496bff2813a3132d34736ad8fec6365b6da753e68adb338b2cc974be9d240d01312241428fe4a7df4b520a1bc4def0fb5 taglib-2.1.tar.gz 1ce12c8158a2f3bcddec104ceacedaea4031b4c88fc0fa1f1fae8dfa8df81c846861df9d01e8f294d79b9e4ab8c51bd1289f404eed24d07abc760688fee13090 utfcpp-3.2.5.tar.gz
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/contrib/src/taglib/rules.mak -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/contrib/src/taglib/rules.mak
Changed
@@ -1,6 +1,6 @@ # TagLib -TAGLIB_VERSION := 2.0.1 +TAGLIB_VERSION := 2.1 TAGLIB_URL := $(GITHUB)/taglib/taglib/releases/download/v$(TAGLIB_VERSION)/taglib-$(TAGLIB_VERSION).tar.gz UTFCPP_VERSION := 3.2.5
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/Makefile.am -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/Makefile.am
Changed
@@ -1307,7 +1307,8 @@ widgets/qml/ScrollBarExt.qml \ widgets/qml/FastBlend.qml \ widgets/qml/RadioButtonExt.qml \ - widgets/qml/RoundedRectangleShadow.qml + widgets/qml/RoundedRectangleShadow.qml \ + widgets/qml/VoronoiSnow.qml if HAVE_QT65 libqml_module_widgets_a_QML += \ widgets/qml/BlurEffect.qml @@ -1363,7 +1364,8 @@ shaders/FastBlend_multiply.frag \ shaders/FastBlend_screen.frag \ shaders/RoundedRectangleShadow.frag \ - shaders/RoundedRectangleShadow_hollow.frag + shaders/RoundedRectangleShadow_hollow.frag \ + shaders/VoronoiSnow.frag if ENABLE_QT libqt_plugin_la_LIBADD += libqml_module_dialogs.a \
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/maininterface/interface_window_handler.cpp -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/maininterface/interface_window_handler.cpp
Changed
@@ -42,6 +42,13 @@ } +const Qt::Key InterfaceWindowHandler::kc10 = +{ + Qt::Key_Up, Qt::Key_Up, + Qt::Key_Down, Qt::Key_Down, + Qt::Key_Left, Qt::Key_Right, Qt::Key_Left, Qt::Key_Right, + Qt::Key_B, Qt::Key_A +}; InterfaceWindowHandler::InterfaceWindowHandler(qt_intf_t *_p_intf, MainCtx* mainCtx, QWindow* window, QObject *parent) : QObject(parent) @@ -143,6 +150,9 @@ connect(m_mainCtx, &MainCtx::requestInterfaceMinimized, this, &InterfaceWindowHandler::setInterfaceMinimized); + connect(this, &InterfaceWindowHandler::kc_pressed, + m_mainCtx, &MainCtx::kc_pressed); + m_window->installEventFilter(this); } @@ -221,6 +231,18 @@ { QKeyEvent * keyEvent = static_cast<QKeyEvent *> (event); + /* easter eggs sequence handling */ + if ( keyEvent->key() == kc i_kc_offset ) + i_kc_offset++; + else + i_kc_offset = 0; + + if ( i_kc_offset == ARRAY_SIZE( kc ) ) + { + i_kc_offset = 0; + emit kc_pressed(); + } + if (applyKeyEvent(keyEvent) == false) return false;
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/maininterface/interface_window_handler.hpp -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/maininterface/interface_window_handler.hpp
Changed
@@ -60,6 +60,7 @@ void interfaceAlwaysOnTopChanged(bool); void interfaceFullScreenChanged(bool); void incrementIntfUserScaleFactor(bool increment); + void kc_pressed(); private: bool applyKeyEvent(QKeyEvent * event) const; @@ -84,6 +85,9 @@ bool m_hasResizeCursor = false; QRect m_interfaceGeometry; + + static const Qt::Key kc10; /* easter eggs */ + int i_kc_offset = 0; }; #endif // INTERFACEWINDOWHANDLER_H
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/maininterface/mainctx.hpp -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/maininterface/mainctx.hpp
Changed
@@ -266,10 +266,10 @@ if constexpr (QT_VERSION < QT_VERSION_CHECK(6, 8, 2)) return false; // This feature was not tested properly upstream, and often causes crashes (QTBUG-131898, #28919). #endif - if constexpr (QT_VERSION < QT_VERSION_CHECK(6, 9, 1)) + if constexpr (QT_VERSION < QT_VERSION_CHECK(6, 9, 2)) { - if (qGuiApp->platformName().startsWith(QLatin1String("wayland"))) - return false; // QTBUG-135158 + static const bool isWayland = qGuiApp->platformName().startsWith(QLatin1String("wayland")); + return !isWayland; // QTBUG-135158 } return true; }
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/maininterface/qml/MainDisplay.qml -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/maininterface/qml/MainDisplay.qml
Changed
@@ -162,6 +162,25 @@ colorSet: ColorContext.View } + Loader { + id: voronoiSnowLoader + + z: 1.5 + source: "qrc:///qt/qml/VLC/Widgets/VoronoiSnow.qml" + anchors.fill: parent + active: false + + function toggleActive() { + voronoiSnowLoader.active = !voronoiSnowLoader.active + } + + Component.onCompleted: { + if (MainCtx.useXmasCone()) { + MainCtx.kc_pressed.connect(voronoiSnowLoader.toggleActive) + } + } + } + ColumnLayout { id: mainColumn anchors.fill: parent
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml
Changed
@@ -69,6 +69,12 @@ Accessible.onPressAction: root.itemClicked() + Component.onCompleted: { + // Qt Quick AbstractButton sets a cursor for itself, unset it so that if the view has + // busy cursor, it is visible over the delegate: + MainCtx.unsetCursor(this) + } + // Childs readonly property ColorContext colorContext: ColorContext {
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml
Changed
@@ -21,7 +21,7 @@ import QtQuick.Layouts import VLC.MediaLibrary - +import VLC.MainInterface import VLC.Util import VLC.Widgets as Widgets import VLC.Style @@ -219,6 +219,21 @@ section.property = "" } } + + onLoadingChanged: { + if (loading) { + MainCtx.setCursor(root, Qt.BusyCursor) + visibilityTimer.start() + } else { + visibilityTimer.stop() + progressIndicator.visible = false + MainCtx.unsetCursor(root) + } + } + + Component.onCompleted: { + loadingChanged() // in case boolean default value is `true`, currently it is not + } } MLContextMenu { @@ -226,4 +241,25 @@ model: rootmodel } + + Widgets.ProgressIndicator { + id: progressIndicator + + anchors.centerIn: parent + z: 99 + + visible: false + + text: "" + + Timer { + id: visibilityTimer + + interval: VLCStyle.duration_humanMoment + + onTriggered: { + progressIndicator.visible = true + } + } + } }
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml
Changed
@@ -129,8 +129,8 @@ resetFocus(); } - onTransactionPendingChanged: { - if (transactionPending) { + function onBusynessChanged() { + if (transactionPending || loading) { MainCtx.setCursor(root, Qt.BusyCursor) visibilityTimer.start() } else { @@ -139,6 +139,12 @@ MainCtx.unsetCursor(root) } } + + Component.onCompleted: { + model.transactionPendingChanged.connect(model.onBusynessChanged) + model.loadingChanged.connect(model.onBusynessChanged) + model.onBusynessChanged() + } } Widgets.ProgressIndicator { @@ -151,7 +157,7 @@ z: 99 - text: qsTr("Processing...") + text: root.model?.transactionPending ? qsTr("Processing...") : "" Timer { id: visibilityTimer
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml
Changed
@@ -106,8 +106,8 @@ coverPrefix: (isMusic) ? "playlist-music" : "playlist-video" - onTransactionPendingChanged: { - if (transactionPending) { + function onBusynessChanged() { + if (transactionPending || loading) { MainCtx.setCursor(root, Qt.BusyCursor) visibilityTimer.start() } else { @@ -116,6 +116,12 @@ MainCtx.unsetCursor(root) } } + + Component.onCompleted: { + playlistModel.transactionPendingChanged.connect(playlistModel.onBusynessChanged) + playlistModel.loadingChanged.connect(playlistModel.onBusynessChanged) + playlistModel.onBusynessChanged() + } } function _actionAtIndex() { @@ -203,7 +209,7 @@ z: 99 - text: qsTr("Processing...") + text: root.model?.transactionPending ? qsTr("Processing...") : "" Timer { id: visibilityTimer @@ -326,12 +332,6 @@ }) } } - - Component.onCompleted: { - // Qt Quick Button sets a cursor for itself, unset it so that if the view has - // busy cursor, it is visible over the delegate: - MainCtx.unsetCursor(this) - } } //-------------------------------------------------------------------------------------
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/meson.build -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/meson.build
Changed
@@ -904,6 +904,7 @@ 'widgets/qml/FastBlend.qml', 'widgets/qml/RadioButtonExt.qml', 'widgets/qml/RoundedRectangleShadow.qml', + 'widgets/qml/VoronoiSnow.qml', ), }
View file
_service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/shaders/VoronoiSnow.frag
Added
@@ -0,0 +1,166 @@ +#version 440 + +/***************************************************************************** + * Copyright (C) 2025 VLC authors and VideoLAN + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * ( at your option ) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ + +/***************************************************************************** + * The MIT License + * Copyright (C) 2015 Inigo Quilez + * Copyright (C) 2017 Inigo Quilez + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the “Software”), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is furnished + * to do so, subject to the following conditions: + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + *****************************************************************************/ + +#define ANIMATE + +#define LAYER_MAX 1.5 +#define LAYER_INCREMENT 0.2 // increment +#define ANTIALIASING + +layout(location = 0) out vec4 fragColor; // premultiplied + +layout(std140, binding = 0) uniform buf { + mat4 qt_Matrix; + float qt_Opacity; + + vec2 windowSize; + float time; // seed + vec4 color; // snowflake color +}; + +// Inigo Quilez's voronoi (https://iquilezles.org/articles/voronoilines): +/// <voronoi> +vec2 hash2( vec2 p ) +{ + // procedural white noise + return fract(sin(vec2(dot(p,vec2(127.1,311.7)),dot(p,vec2(269.5,183.3))))*43758.5453); +} + +vec3 voronoi( in vec2 x ) +{ + vec2 ip = floor(x); + vec2 fp = fract(x); + + //---------------------------------- + // first pass: regular voronoi + //---------------------------------- + vec2 mg, mr; + + float md = 8.0; + for( int j=-1; j<=1; j++ ) + for( int i=-1; i<=1; i++ ) + { + vec2 g = vec2(float(i),float(j)); + vec2 o = hash2( ip + g ); + #ifdef ANIMATE + o = 0.5 + 0.5*sin( time + 6.2831*o ); + #endif + vec2 r = g + o - fp; + float d = dot(r,r); + + if( d<md ) + { + md = d; + mr = r; + mg = g; + } + } + + //---------------------------------- + // second pass: distance to borders + //---------------------------------- + md = 8.0; + for( int j=-2; j<=2; j++ ) + for( int i=-2; i<=2; i++ ) + { + vec2 g = mg + vec2(float(i),float(j)); + vec2 o = hash2( ip + g ); + #ifdef ANIMATE + o = 0.5 + 0.5*sin( time + 6.2831*o ); + #endif + vec2 r = g + o - fp; + + if( dot(mr-r,mr-r)>0.00001 ) + md = min( md, dot( 0.5*(mr+r), normalize(r-mr) ) ); + } + + return vec3( md, mr ); +} +/// </voronoi> + +// Inigo Quilez's snowflake SDF (https://www.shadertoy.com/view/wsGSD3): +/// <snowflake> +float sdLine( in vec2 p, in vec2 a, in vec2 b ) +{ + vec2 pa = p-a, ba = b-a; + float h = clamp( dot(pa,ba)/dot(ba,ba), 0.0, 1.0 ); + return length( pa - ba*h ); +} + +vec2 opModPolarMirrored( in vec2 p, float theta, float offset) +{ + float a = atan(p.y, p.x) - offset; + a = abs(mod(a + .5 * theta, theta) - .5 * theta); + return length(p) * vec2(cos(a), sin(a)); +} + +float sdSnowflake( in vec2 p ) +{ + p = opModPolarMirrored(p, radians(360.) / 6., radians(90.)); + + float d = sdLine( p, vec2(0, 0), vec2(.75, 0) ); + d = min(d, sdLine( p, vec2(.5, 0), vec2(.5, 0) + vec2(.1, .1) )); + d = min(d, sdLine( p, vec2(.25, 0), vec2(.25, 0) + 1.5 * vec2(.1, .1) )); + return d - .04; +} +/// </snowflake> + +void main() +{ + vec2 p = gl_FragCoord.xy / windowSize.xx; + + vec3 col = vec3(0.0, 0.0, 0.0); + + // Multiple layers + for (float i = 1.0; i <= LAYER_MAX; i += LAYER_INCREMENT) + { + vec3 c = voronoi((6.0 * p + sign(qt_Matrix31) * vec2(sin(time) / 2.0, time)) * i); + + // Snowflake size depends on the layer: + float dist = sdSnowflake(c.yz * 8.0 * i); + + // additive: +#ifdef ANTIALIASING + float fw = fwidth(dist) * 0.75; // for AA + col += (1.0 - smoothstep(-fw , fw, dist)) * color.rgb * color.a; +#else + col += (1.0 - step(0.0, dist)) * color.rgb * color.a; +#endif + } + + col *= qt_Opacity; + + fragColor = vec4(col, 0.0); // premultiplied additive +}
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/shaders/meson.build -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/shaders/meson.build
Changed
@@ -22,6 +22,7 @@ 'FastBlend_screen.frag', 'RoundedRectangleShadow.frag', 'RoundedRectangleShadow_hollow.frag', + 'VoronoiSnow.frag', shader_files = files(shader_sources)
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/shaders/shaders.qrc -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/shaders/shaders.qrc
Changed
@@ -16,5 +16,6 @@ <file alias="FastBlend_screen.frag.qsb">FastBlend_screen.frag.qsb</file> <file alias="RoundedRectangleShadow.frag.qsb">RoundedRectangleShadow.frag.qsb</file> <file alias="RoundedRectangleShadow_hollow.frag.qsb">RoundedRectangleShadow_hollow.frag.qsb</file> + <file alias="VoronoiSnow.frag.qsb">VoronoiSnow.frag.qsb</file> </qresource> </RCC>
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/widgets/qml/GridItem.qml -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/widgets/qml/GridItem.qml
Changed
@@ -21,7 +21,7 @@ import QtQuick.Layouts import QtQml.Models - +import VLC.MainInterface import VLC.Widgets as Widgets import VLC.Util import VLC.Style @@ -92,6 +92,12 @@ Keys.onMenuPressed: root.contextMenuButtonClicked(picture, root.mapToGlobal(0,0)) + Component.onCompleted: { + // Qt Quick AbstractButton sets a cursor for itself, unset it so that if the view has + // busy cursor, it is visible over the delegate: + MainCtx.unsetCursor(this) + } + // States states:
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/gui/qt/widgets/qml/ViewHeader.qml -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/widgets/qml/ViewHeader.qml
Changed
@@ -60,6 +60,12 @@ Navigation.navigable: button.visible + Component.onCompleted: { + // Qt Quick Pane sets a cursor for itself, unset it so that if the view has + // busy cursor, it is visible over the header: + MainCtx.unsetCursor(this) + } + // Children readonly property ColorContext colorContext: ColorContext {
View file
_service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/gui/qt/widgets/qml/VoronoiSnow.qml
Added
@@ -0,0 +1,48 @@ +/***************************************************************************** + * Copyright (C) 2025 VLC authors and VideoLAN + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * ( at your option ) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + *****************************************************************************/ +import QtQuick +import QtQuick.Window + +ShaderEffect { + id: effect + + readonly property size windowSize: { + if (Window.window) + // Currently only one dimension is taken into account (to not stretch) + // in the shader, but still provide both for now. We use window size + // instead of item (shader effect) size because the shader uses + // gl_FragCoord: + return Qt.size(Window.window.width, Window.window.height) + return Qt.size(0, 0) + } + + property color color: Qt.rgba(0.8, 0.8, 0.8, 0.4) // snowflake color + + property real time: 0.0 // seed + + property real speed: 1.2 // speed factor + + UniformAnimator on time { + loops: Animation.Infinite + from: 0 + to: 50 + duration: 100000 / effect.speed + } + + fragmentShader: "qrc:///shaders/VoronoiSnow.frag.qsb" +}
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/meson.build -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/meson.build
Changed
@@ -345,12 +345,12 @@ # text renderer modules subdir('text_renderer') -# video filter modules -subdir('video_filter') - # video output modules subdir('video_output') +# video filter modules +subdir('video_filter') + # hardware modules subdir('hw')
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/video_filter/meson.build -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/video_filter/meson.build
Changed
@@ -36,6 +36,25 @@ 'sources' : files('antiflicker.c') } +opengl_filter_dep = disabler() +opengl_filter_cargs = +if opengl_dep.found() or opengles2_dep.found() + if host_system in 'darwin', 'android' and opengles2_dep.found() + opengl_filter_dep = opengles2_dep + opengl_filter_cargs += '-DUSE_OPENGL_ES2' + elif opengl_dep.found() + opengl_filter_dep = opengl_dep + endif +endif + +vlc_modules += { + 'name' : 'opengl_filter', + 'sources' : files('opengl.c'), + 'dependencies' : gl_common_dep, opengl_filter_dep, + 'c_args' : opengl_filter_cargs, + 'enabled' : opengl_filter_dep.found() +} + if host_system == 'windows' vlc_modules += { 'name' : 'amf_frc',
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/video_output/libplacebo/meson.build -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/video_output/libplacebo/meson.build
Changed
@@ -1,5 +1,17 @@ # Libplacebo-based video outputs +libplacebo_dep = dependency('libplacebo', + version: '>= 2.72', + required: get_option('libplacebo')) + +if not libplacebo_dep.found() + subdir_done() +endif +libplacebo_utils = static_library('vlc_libplacebo_utils', + files('utils.c'), + dependencies: libplacebo_dep, + include_directories: vlc_include_dirs) + vlc_modules += { 'name' : 'placebo', 'sources' : files('instance.c', 'display.c'),
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/video_output/meson.build -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/video_output/meson.build
Changed
@@ -13,9 +13,6 @@ missing_win_glew = false endif -libplacebo_dep = dependency('libplacebo', - version: '>= 2.72', - required: get_option('libplacebo')) if missing_win_glew # Our OpenGL code requires glew.h to be present opengl_dep = disabler() @@ -28,16 +25,7 @@ subdir('apple') endif -if libplacebo_dep.found() - libplacebo_utils = static_library('vlc_libplacebo_utils', - files('./libplacebo/utils.c'), - dependencies: libplacebo_dep, - include_directories: vlc_include_dirs) - - subdir('libplacebo') -else - libplacebo_utils = -endif +subdir('libplacebo') subdir('opengl') if host_system == 'windows'
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/modules/video_output/opengl/meson.build -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/modules/video_output/opengl/meson.build
Changed
@@ -4,7 +4,6 @@ endif gl_common_dep = declare_dependency( - link_with: libplacebo_utils, sources: files( 'filter.c', 'filters.c',
View file
_service:obs_scm:vlc-beta-20250606.a615ef8f10.obscpio/test/modules/meson.build -> _service:obs_scm:vlc-beta-20250608.24a72c2840.obscpio/test/modules/meson.build
Changed
@@ -127,7 +127,9 @@ 'c_args' : '-DVLC_TEST_OPENGL_API=VLC_OPENGL', 'module_depends' : vlc_plugins_targets.keys() } +endif +if opengles2_dep.found() vlc_tests += { 'name' : 'test_modules_video_output_opengl_es2_filters', 'sources' : files(
View file
_service:obs_scm:vlc-beta.obsinfo
Changed
@@ -1,4 +1,4 @@ name: vlc-beta -version: 20250606.a615ef8f10 -mtime: 1749222103 -commit: a615ef8f10f3a02b9c5b43b247f845352cca6492 +version: 20250608.24a72c2840 +mtime: 1749387734 +commit: 24a72c2840b2ae4f42649e4b6bce3631c3abcabd
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.