Packman Build Service PMBS

vlc-beta.spec Changed

vlc-beta.patch Changed

@@ -27,6 +27,15 @@
            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
+@@ -4658,7 +4658,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)
+-AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1 | sed -e 's/ *$//'`", compiler)
++AC_DEFINE_UNQUOTED(VLC_COMPILER, "gcc", compiler)
+ dnl
+ dnl  Handle substvars that use $(top_srcdir)
+ dnl
 --- a/include/vlc/libvlc_version.h
 +++ b/include/vlc/libvlc_version.h
 @@ -54,7 +54,7 @@
@@ -38,6 +47,17 @@
  
  /** LibVLC ABI minor version number, updated when compatible changes are added */
  # define LIBVLC_ABI_VERSION_MINOR  (0)
+--- a/modules/codec/a52.c
++++ b/modules/codec/a52.c
+@@ -300,7 +300,7 @@ static int Open( vlc_object_t *p_this )
+     p_sys->i_flags |= A52_ADJUST_LEVEL;
+ 
+     /* Initialize liba52 */
+-    p_sys->p_liba52 = a52_init( 0 );
++    p_sys->p_liba52 = a52_init();
+     if( p_sys->p_liba52 == NULL )
+     {
+         msg_Err( p_this, "unable to initialize liba52" );
 --- a/modules/control/cli/cli.c
 +++ b/modules/control/cli/cli.c
 @@ -537,9 +537,8 @@ static void cli_client_delete(struct cli_client *cl)

vlc.a52dec.patch Deleted

vlc.hostname.patch Deleted

_service:obs_scm:vlc-beta-20230420.b437cad568.obscpio/modules/gui/qt/medialibrary/medialib.cpp -> _service:obs_scm:vlc-beta-20230421.8d930c5670.obscpio/modules/gui/qt/medialibrary/medialib.cpp Changed

@@ -298,6 +298,26 @@
         return;
     }
 
+    auto it = m_inputItemQuery.find(variantList);
+
+    if (it == m_inputItemQuery.end())
+    {
+        it = m_inputItemQuery.insert(variantList, {callback});
+    }
+    else
+    {
+        // be patient
+
+        for (const auto& it2 : it.value())
+        {
+            if (callback.strictlyEquals(it2))
+                return;
+        }
+
+        it.value().push_back(callback); // FIXME: Use an ordered set
+        return;
+    }
+
     runOnMLThread<Ctx>(this,
     //ML thread
     mlIdList(vlc_medialibrary_t* ml, Ctx& ctx){
@@ -326,7 +346,7 @@
         }
     },
     //UI thread
-    this, callback(quint64, Ctx& ctx) mutable
+    this, it(quint64, Ctx& ctx) mutable
     {
         auto jsEngine = qjsEngine(this);
         if (!jsEngine)
@@ -341,7 +361,12 @@
             i++;
         }
 
-        callback.call({jsArray});
+        for (auto cb : qAsConst(it.value())) // TODO: Qt 6 use const reference
+        {
+            cb.call({jsArray});
+        }
+
+        m_inputItemQuery.erase(it);
     });
 }

_service:obs_scm:vlc-beta-20230420.b437cad568.obscpio/modules/gui/qt/medialibrary/medialib.hpp -> _service:obs_scm:vlc-beta-20230421.8d930c5670.obscpio/modules/gui/qt/medialibrary/medialib.hpp Changed

_service:obs_scm:vlc-beta-20230420.b437cad568.obscpio/modules/gui/qt/medialibrary/qml/PlaylistMedia.qml -> _service:obs_scm:vlc-beta-20230421.8d930c5670.obscpio/modules/gui/qt/medialibrary/qml/PlaylistMedia.qml Changed

_service:obs_scm:vlc-beta-20230420.b437cad568.obscpio/modules/gui/qt/playlist/qml/PlaylistListView.qml -> _service:obs_scm:vlc-beta-20230421.8d930c5670.obscpio/modules/gui/qt/playlist/qml/PlaylistListView.qml Changed

@@ -102,13 +102,17 @@
 
         // NOTE: Dropping medialibrary content into the queue.
         } else if (Helpers.isValidInstanceOf(item, Widgets.DragItem)) {
-            item.getSelectedInputItem(function(inputItems) {
-                if (!Array.isArray(inputItems) || inputItems.length === 0) {
-                    console.warn("can't convert items to input items");
-                    return
-                }
-                mainPlaylistController.insert(index, inputItems, false)
-            })
+            if (item.inputItems) {
+                mainPlaylistController.insert(index, item.inputItems, false)
+            } else {
+                item.getSelectedInputItem(function(inputItems) {
+                    if (!Array.isArray(inputItems) || inputItems.length === 0) {
+                        console.warn("can't convert items to input items");
+                        return
+                    }
+                    mainPlaylistController.insert(index, inputItems, false)
+                })
+            }
 
         // NOTE: Dropping an external item (i.e. filesystem) into the queue.
         } else if (drop.hasUrls) {

_service:obs_scm:vlc-beta-20230420.b437cad568.obscpio/modules/gui/qt/widgets/qml/DragItem.qml -> _service:obs_scm:vlc-beta-20230421.8d930c5670.obscpio/modules/gui/qt/widgets/qml/DragItem.qml Changed

@@ -60,6 +60,8 @@
     // string => role
     property string titleRole: "title"
 
+    readonly property var inputItems: _inputItems
+
     function coversXPos(index) {
         return VLCStyle.margin_small + (coverSize / 3) * index;
     }
@@ -82,6 +84,8 @@
         if (!dragItem._active)
             return
 
+        Qt.callLater(dragItem.getSelectedInputItem, dragItem.setInputItems)
+
         var covers = 
         var titleList = 
 
@@ -107,6 +111,16 @@
         _title = titleList.join(",") + (indexes.length > _maxCovers ? "..." : "")
     }
 
+    function setInputItems(inputItems) {
+        if (!Array.isArray(inputItems) || inputItems.length === 0) {
+            console.warn("can't convert items to input items");
+            dragItem._inputItems = null
+            return
+        }
+
+        dragItem._inputItems = inputItems
+    }
+
     //---------------------------------------------------------------------------------------------
     // Private
 
@@ -118,6 +132,8 @@
 
     readonly property int _displayedCoversCount: Math.min(_indexesSize, _maxCovers + 1)
 
+    property var _inputItems
+
     property var _data: 
 
     property var _covers: 
@@ -131,6 +147,9 @@
         // TODO: Rework D&D positioning
         if (!Drag.active)
             x = y = -1
+
+        if (!Drag.active)
+            dragItem._inputItems = undefined
     }
 
     //---------------------------------------------------------------------------------------------

_service:obs_scm:vlc-beta.obsinfo Changed

Changes of Revision 293