Request 6568 (accepted)

avidemux3.changes Changed

avidemux3.spec Changed

avidemux2-2.8.2.git20260806.tar.xz/.devcontainer_mxe64/Dockerfile -> avidemux2-2.8.2.git20260812.tar.xz/.devcontainer_mxe64/Dockerfile Changed

avidemux2-2.8.2.git20260806.tar.xz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp -> avidemux2-2.8.2.git20260812.tar.xz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp Changed

@@ -183,7 +183,7 @@
 {
     _width = width;
     _height = height;
-#if !defined(__APPLE__) && !defined(_WIN32) && defined(USING_QT6)
+#if 0 /* !defined(__APPLE__) && !defined(_WIN32) && defined(USING_QT6) */
     // Work around an issue with Qt 6.2.1 which results in video frame displaying
     // garbage for all subsequently loaded videos after its size was set to zero.
     static uint8_t workaround = 0;
@@ -224,7 +224,7 @@
     videoWindow = new ADM_Qvideo(host);
     if (admDetectQtEngine() == QT_WAYLAND_ENGINE)
     {
-        //videoWindow->winId(); // The result looks broken, don't try this for now.
+        videoWindow->winId();
         if (videoWindow->windowHandle() && QuiMainWindows && QuiMainWindows->windowHandle())
         {
             videoWindow->windowHandle()->setParent(QuiMainWindows->windowHandle());
@@ -331,8 +331,7 @@
     break;
     case QT_WAYLAND_ENGINE: {
         mySystemWindowId = 0;
-//#ifdef USE_NATIVE_API
-#if 0
+#ifdef USE_NATIVE_API
         QPlatformNativeInterface *native = currentQApplication()->platformNativeInterface();
         if (native && videoWindow)
         {
@@ -390,9 +389,8 @@
 void UI_getWindowInfo(void *draw, GUI_WindowInfo *xinfo)
 {
     ADM_assert(videoWindow);
-    QWidget *widget = videoWindow->parentWidget();
     xinfo->widget = videoWindow;
-    // xinfo->windowOpaquePointer = myWindowOpaque;
+    xinfo->windowOpaquePointer = myWindowOpaque;
     xinfo->systemWindowId = 0;
     xinfo->scalingFactor = 1.;
     QPoint localPoint(0, 0);

avidemux2-2.8.2.git20260806.tar.xz/avidemux/qt4/cmake/admCheckQt5.cmake -> avidemux2-2.8.2.git20260812.tar.xz/avidemux/qt4/cmake/admCheckQt5.cmake Changed

@@ -1,86 +1,74 @@
 
 MACRO(checkQt5)
-  #        SET(QT5_CHECKED 1)
   IF(NOT QT5_CHECKED)
     OPTION(QT5 "" ON)
 
-    MESSAGE(STATUS "Checking for Qt 5*")
-    MESSAGE(STATUS "******************")
-    IF(CROSS)
-      SET(CROSS5 ${QT_HOME}/lib/cmake)
-      MESSAGE(STATUS "Cross compiling override for QT5 : ${CROSS5}")
-      SET(CMAKE_MODULE_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_MODULE_PATH} )
-      SET(CMAKE_PREFIX_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_PREFIX_PATH} )
-      SET(CROSS5 ${QT_HOME}/lib64/cmake) # Mingw64
-      SET(CMAKE_MODULE_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_MODULE_PATH} )
-      SET(CMAKE_PREFIX_PATH ${CROSS5}/Qt5 ${CROSS5}/Qt5Core ${CROSS5}/Qt5Widgets ${CROSS5}/Qt5Gui ${CMAKE_PREFIX_PATH} )
-      MESSAGE(STATUS "Search path ${CMAKE_MODULE_PATH}")
-      FIND_PACKAGE(Qt5Core)
-      FIND_PACKAGE(Qt5Widgets)
+    MESSAGE(STATUS "Checking for Qt5")
+    MESSAGE(STATUS "****************")
 
-      SET(QT_HEADERS_DIR   ${QT_HOME}/include  ${QT_HOME}/include/QtGui ${QT_HOME}/include/QtCore ${QT_HOME}/include/QtWidgets ${QT_HOME}/include/QtNetwork)
-      SET(QT_INCLUDES    -I${QT_HOME}/include -I${QT_HOME}/include/QtGui -I${QT_HOME}/include/QtCore -I${QT_HOME}/include/QtWidgets -I${QT_HOME}/include/QtNetwork)
-      SET(QT_INCLUDE_DIR   ${QT_HEADERS_DIR})
-      SET(QT_BINARY_DIR    ${QT_HOME}/bin)
-      SET(QT_LIBRARY_DIR   ${QT_HOME}/lib ${QT_HOME}/bin)
-      #SET(QT_QTCORE_LIBRARY ${QT_HOME}//lib/libQt5Core.a)
-      SET(QT_QTCORE_LIBRARY Qt5Core)
-      SET(QT_QTNETWORK_LIBRARY Qt5Network)
-      #SET(QT_QTGUI_LIBRARY  ${QT_HOME}//lib/libQt5Gui.a ${QT_HOME}//lib/libQt5Widgets.a))
-      SET(QT_QTGUI_LIBRARY  Qt5Gui Qt5Widgets Qt5WinExtras)
-      SET(QT_EXTENSION qt5)
-      SET(QT_LIBRARY_EXTENSION QT5)
-      SET(QT5_FOUND True)
-      SET(ADM_QT_VERSION 5)
-      SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR})
-      SET(QT5_ROOT_DIR ${QT_HOME}/bin)
-      SET(QT_RCC_EXECUTABLE ${QT5_ROOT_DIR}/rcc)
-      SET(QT_MOC_EXECUTABLE ${QT5_ROOT_DIR}/moc)
-      SET(QT_UIC_EXECUTABLE ${QT5_ROOT_DIR}/uic)
-      LINK_DIRECTORIES( ${QT_LIBRARY_DIR})
-      #include(admCrossQt5)
-    ELSE() # NOT WIN32/64 cross
-      IF(QT5)
-        MESSAGE(STATUS "  Checking for Qt5Core")
-        FIND_PACKAGE(Qt5Core REQUIRED)
-        MESSAGE(STATUS "  Checking for Qt5Widgets")
-        FIND_PACKAGE(Qt5Widgets REQUIRED)
-        MESSAGE(STATUS "  Checking for Qt5Network")
-        FIND_PACKAGE(Qt5Network)
-        IF(WIN32)
-          FIND_PACKAGE(Qt5WinExtras)
+    IF(QT5)
+
+      IF(CROSS)
+        SET(CROSS5 ${QT_HOME}/lib/cmake)
+        MESSAGE(STATUS "Cross-compiling override for Qt5: \"${CROSS5}\"")
+        SET(CMAKE_MODULE_PATH
+            ${CROSS5}/Qt5
+            ${CROSS5}/Qt5Core
+            ${CROSS5}/Qt5Gui
+            ${CROSS5}/Qt5Network
+            ${CROSS5}/Qt5Widgets
+            ${CROSS5}/Qt5WinExtras
+            ${CMAKE_MODULE_PATH})
+        MESSAGE(STATUS "CMake search path: \"${CMAKE_MODULE_PATH}\"")
+        SET(QT_BINARY_DIR ${QT_HOME}/bin)
+        SET(QT_LIBRARY_DIR ${QT_HOME}/lib ${QT_HOME}/bin)
+        LINK_DIRECTORIES(${QT_LIBRARY_DIR})
+      ENDIF()
+
+      MESSAGE(STATUS "Checking for Qt5Core")
+      FIND_PACKAGE(Qt5Core REQUIRED)
+      MESSAGE(STATUS "Checking for Qt5Widgets")
+      FIND_PACKAGE(Qt5Widgets REQUIRED)
+      MESSAGE(STATUS "Checking for Qt5Network")
+      FIND_PACKAGE(Qt5Network)
+      IF(WIN32)
+        FIND_PACKAGE(Qt5WinExtras)
+      ENDIF()
+      IF(Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Network_FOUND)
+        MESSAGE(STATUS "Qt5 found ")
+        SET(QT5_FOUND 1)
+        SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR})
+        SET(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
+        SET(QT_INCLUDE_DIR ${QT_INCLUDES})
+        SET(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES})
+        SET(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES})
+        SET(QT_QTGUI_LIBRARY ${Qt5Widgets_LIBRARIES})
+        SET(QT_DEFINITIONS ${Qt5Core_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS})
+        IF(Qt5WinExtras_FOUND)
+          SET(QT_QTGUI_LIBRARY ${QT_QTGUI_LIBRARY} ${Qt5WinExtras_LIBRARIES})
+          SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_HAS_WINEXTRA)
         ENDIF()
-        IF(Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Network_FOUND)
-          MESSAGE(STATUS "  Qt5 found ")
-          SET(QT5_FOUND 1)
-          SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR})
-          SET(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}/QtWidgets ${Qt5Network_INCLUDE_DIRS})
-          SET(QT_INCLUDE_DIR   ${QT_INCLUDES})
-          SET(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES})
-          SET(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES})
-          SET(QT_QTGUI_LIBRARY  ${Qt5Widgets_LIBRARIES} ${Qt5WinExtras_LIBRARIES})
-          SET(QT_DEFINITIONS    ${Qt5Core_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS})
-          STRING(REGEX REPLACE "\\" "/" QT_INCLUDES "${QT_INCLUDES}")    # backslashes aren't taken care of properly on Windows
-          MESSAGE(STATUS "QT5_INCLUDES     : ${QT_INCLUDES}")
-          MESSAGE(STATUS "QT5_DEFINITIONS  : ${QT5_DEFINITIONS}")
-          MESSAGE(STATUS "QT5_LIBS         : ${QT_QTCORE_LIBRARY} : ${QT_QTGUI_LIBRARY} : ${QT_QTNETWORK_LIBRARY}")
-          MARK_AS_ADVANCED(LRELEASE_EXECUTABLE)
-          MARK_AS_ADVANCED(QT_MKSPECS_DIR)
-          MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE)
-          SET(QT_EXTENSION qt5)
-          SET(QT_LIBRARY_EXTENSION QT5)
-          SET(ADM_QT_VERSION 5)
-          IF(Qt5_POSITION_INDEPENDENT_CODE)
-            SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-          ENDIF()
-          get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+        STRING(REGEX REPLACE "\\" "/" QT_INCLUDES "${QT_INCLUDES}")    # backslashes aren't taken care of properly on Windows
+        MESSAGE(STATUS "Qt5 includes     : ${QT_INCLUDES}")
+        MESSAGE(STATUS "Qt5 definitions  : ${QT_DEFINITIONS}")
+        MESSAGE(STATUS "Qt5 libs         : ${QT_QTCORE_LIBRARY} : ${QT_QTGUI_LIBRARY} : ${QT_QTNETWORK_LIBRARY}")
+        MARK_AS_ADVANCED(LRELEASE_EXECUTABLE)
+        MARK_AS_ADVANCED(QT_MKSPECS_DIR)
+        MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE)
+        SET(QT_EXTENSION qt5)
+        SET(QT_LIBRARY_EXTENSION QT5)
+        SET(ADM_QT_VERSION 5)
+        IF(Qt5_POSITION_INDEPENDENT_CODE)
+          SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+        ENDIF()
+        get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
 
-          execute_process(COMMAND "${QMAKE_EXECUTABLE}" -query QT_INSTALL_PLUGINS
+        execute_process(COMMAND "${QMAKE_EXECUTABLE}" -query QT_INSTALL_PLUGINS
                             RESULT_VARIABLE return_code
                             OUTPUT_VARIABLE QT_PLUGINS_DIR
                             OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-          MESSAGE(STATUS "plugin dir = \"${QT_PLUGINS_DIR}\"")
+        MESSAGE(STATUS "plugin dir = \"${QT_PLUGINS_DIR}\"")
 
           # Do we have qtScript also ?
           #FIND_PACKAGE(Qt5Script)
@@ -94,14 +82,13 @@
           #ENDIF()
           # ----------------------------------
 
-        ELSE()
-          MESSAGE(STATUS "Some Qt5 components are missing")
-        ENDIF()
-
       ELSE()
-        MESSAGE("${MSG_DISABLE_OPTION}")
+        MESSAGE(STATUS "Some Qt5 components are missing")
       ENDIF()
-    ENDIF() # WIN32/64 cross
+
+    ELSE()
+      MESSAGE("${MSG_DISABLE_OPTION}")
+    ENDIF()
 
     SET(QT5_CHECKED 1)

avidemux2-2.8.2.git20260806.tar.xz/mxe/mxe-last-known-good -> avidemux2-2.8.2.git20260812.tar.xz/mxe/mxe-last-known-good Changed

avidemux2-2.8.2.git20260806.tar.xz/mxe/mxe-setup.sh -> avidemux2-2.8.2.git20260812.tar.xz/mxe/mxe-setup.sh Changed

Overview

Request 6568 (accepted)

Request History