Request 6396 (accepted)

avidemux3.changes Changed

avidemux3.spec Changed

avidemux2-2.8.2.git20260404.tar.xz/.devcontainer_fedora/devcontainer.json -> avidemux2-2.8.2.git20260407.tar.xz/.devcontainer_fedora/devcontainer.json Changed

avidemux2-2.8.2.git20260404.tar.xz/.devcontainer_mxe64/Dockerfile -> avidemux2-2.8.2.git20260407.tar.xz/.devcontainer_mxe64/Dockerfile Changed

@@ -1,3 +1,4 @@
+#docker build -t avidemux/avidemux_mxe -f .devcontainer_mxe64/Dockerfile .
 FROM debian:trixie
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -95,7 +96,11 @@
     sqlite3 \
     apt-file \
     xz-utils \
-    libgl-dev libgl1-mesa-dev
+    libgl-dev libgl1-mesa-dev \
+    nsis \
+    nsis-common \
+    nsis-doc \
+    nsis-pluginapi 
 
   RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
   && :
@@ -106,6 +111,9 @@
 RUN chmod a+rwx /opt/
 RUN echo 'root:password' | chpasswd 
 #
+RUN apt-get install -y python3-pefile
+
+#
 #
 
 CMD  "/bin/bash" 
@@ -136,13 +144,17 @@
 alias ll='ls -lah'
 
 EOF
-
+# Split the build in two to avoid timeouts, not sure that helps
 RUN cd /opt &&  git clone https://github.com/mxe/mxe.git && cd mxe && \
      echo "MXE_TARGETS := x86_64-w64-mingw32.shared" > settings.mk \
-    && echo "JOBS :=6" >> settings.mk && make  qt6
-
+    && echo "JOBS := 4" >> settings.mk && make  qt6-qtbase
+RUN cd /opt/mxe && make qt6
+RUN echo Done
 ENV PATH="/opt/mxe/usr/bin:/usr/local/bin:/opt/mxe/bin:/opt/mxe/usr/x86_64-pc-linux-gnu/qt6/bin/:${PATH}"
+# --- install libaom
+#COPY ./.devcontainer_mxe64/install-libaom.bash /tmp/
+COPY install-libaom.bash /tmp/
+RUN cd /tmp && bash install-libaom.bash /opt/mxe
 
-RUN echo Done

avidemux2-2.8.2.git20260404.tar.xz/.devcontainer_mxe64/devcontainer.json -> avidemux2-2.8.2.git20260407.tar.xz/.devcontainer_mxe64/devcontainer.json Changed

avidemux2-2.8.2.git20260407.tar.xz/.devcontainer_mxe64/devpod_increased_timeout.patch Added

avidemux2-2.8.2.git20260407.tar.xz/.devcontainer_mxe64/install-libaom.bash Added

@@ -0,0 +1,125 @@
+#!/bin/bash
+# This is a convenience script to automate installation of libaom in MXE
+failMsg()
+{
+    echo "** $1 **"
+    exit 1
+}
+process()
+{
+    case "$1" in
+    32)
+        CROSS_PREFIX="i686-w64-mingw32.shared"
+        TOOLCHAIN="x86-mingw-gcc.cmake"
+        ;;
+    64)
+        CROSS_PREFIX="x86_64-w64-mingw32.shared"
+        TOOLCHAIN="x86_64-mingw-gcc.cmake"
+        ;;
+    *)
+        echo "Unsupported option \"$1\""
+        exit 1
+        ;;
+    esac
+    if  -d "build-aom$1" ; then
+        rm -rf "build-aom$1" || failMsg "Cannot remove old ${AOM_HOME}/build-aom$1 directory"
+    fi
+    mkdir "build-aom$1" || failMsg "Cannot create ${AOM_HOME}/build-aom$1 directory"
+    cd "build-aom$1"
+
+    cmake ../aom/ \
+        -DCROSS="${CROSS_PREFIX}-" \
+        -DCMAKE_TOOLCHAIN_FILE="../aom/build/cmake/toolchains/${TOOLCHAIN}" \
+        -DENABLE_DOCS=0 \
+        -DENABLE_EXAMPLES=0 \
+        -DENABLE_TOOLS=0 \
+        -DBUILD_SHARED_LIBS=0 \
+        -DCONFIG_ANALYZER=0 \
+        -DFORCE_HIGHBITDEPTH_DECODING=0 \
+        -DCONFIG_CWG_C013=1 \
+        -DCMAKE_INSTALL_PREFIX=${MXE_ROOT}/usr/${CROSS_PREFIX} || failMsg "Failed at cmake"
+    make -j $(nproc) || failMsg "Failed at make"
+    make install || failMsg "Failed at make install"
+# At least v3.6.1 installs the shared library already to the right location.
+#   DLL="${MXE_ROOT}/usr/${CROSS_PREFIX}/lib/libaom.dll"
+#   mv -v "${DLL}" "${MXE_ROOT}/usr/${CROSS_PREFIX}/bin/" || failMsg "Failed moving ${DLL} to ${MXE_ROOT}/usr/${CROSS_PREFIX}/bin/"
+}
+
+#AOM_HOME=/home/eumagga/adm
+#MXE_ROOT=${AOM_HOME}/mxe
+
+MXE_ROOT="$1"
+
+if  "x${MXE_ROOT}" = "x" ; then
+    echo "Usage: $0 /path/to/MXE/root/directory"
+    exit 1
+fi
+if !  -d "${MXE_ROOT}" ; then
+    failMsg "${MXE_ROOT} does not exist or is not a directory"
+fi
+if !  -f "${MXE_ROOT}/mxe.github.mk" ; then
+    failMsg "${MXE_ROOT} does look like a MXE root directory"
+fi
+
+BUILD_32_BITS=0
+BUILD_64_BITS=0
+
+if  -d "${MXE_ROOT}/usr/i686-w64-mingw32.shared" ; then
+    BUILD_32_BITS=1
+fi
+
+if  -d "${MXE_ROOT}/usr/x86_64-w64-mingw32.shared" ; then
+    BUILD_64_BITS=1
+fi
+
+if  ${BUILD_32_BITS} -eq 0  &&  ${BUILD_64_BITS} -eq 0 ; then
+    failMsg "No supported build targets found"
+fi
+
+if  "x${AOM_HOME}" = "x" ; then
+    export AOM_HOME="$(pwd)"
+fi
+if !  -d "${AOM_HOME}" ; then
+    failMsg "${AOM_HOME} does not exist or is not a directory"
+fi
+cd "${AOM_HOME}"
+if  -d "${AOM_HOME}/aom"  && !  -d "${AOM_HOME}/aom/.git" ; then
+    echo "${AOM_HOME}/aom is not a git repository, will try to remove it"
+    rm -rf "${AOM_HOME}/aom" || failMsg "Cannot remove ${AOM_HOME}/aom"
+fi
+
+FRESH=0
+
+if !  -d "${AOM_HOME}/aom" ; then
+    echo "Will clone aom source in ${AOM_HOME} directory"
+    git clone https://aomedia.googlesource.com/aom || failMsg "Failed cloning aom source"
+    FRESH=1
+fi
+cd "${AOM_HOME}/aom"
+
+if  "x${AOM_TAG}" = "x" ; then
+    AOM_TAG="v3.11.0"
+fi
+
+if  "x${FRESH}" = "x0" ; then
+    git fetch || failMsg "Cannot fetch changes"
+fi
+git checkout tags/${AOM_TAG} || failMsg "Cannot checkout ${AOM_TAG}"
+
+export PATH="${PATH}:${MXE_ROOT}/usr/bin"
+
+RESULT=0
+
+cd "${AOM_HOME}"
+if  ${BUILD_32_BITS} -eq 1 ; then
+    process 32 || ( echo "32-bit build failed"; RESULT=1 )
+fi
+cd "${AOM_HOME}"
+if  ${BUILD_64_BITS} -eq 1 ; then
+    process 64 || ( echo "64-bit build failed"; RESULT=1 )
+fi
+if  $RESULT -eq 1 ; then
+    failMsg "Some builds failed"
+fi
+echo "All done"
+exit 0

avidemux2-2.8.2.git20260404.tar.xz/.devcontainer_mxe64/post-create.sh -> avidemux2-2.8.2.git20260407.tar.xz/.devcontainer_mxe64/post-create.sh Changed

avidemux2-2.8.2.git20260404.tar.xz/.devcontainer_trixie/devcontainer.json -> avidemux2-2.8.2.git20260407.tar.xz/.devcontainer_trixie/devcontainer.json Changed

avidemux2-2.8.2.git20260404.tar.xz/.devcontainer_ubuntu2510/devcontainer.json -> avidemux2-2.8.2.git20260407.tar.xz/.devcontainer_ubuntu2510/devcontainer.json Changed

avidemux2-2.8.2.git20260407.tar.xz/avidemux/winInstaller/avidemux_crossQt6_2026.nsi Added

@@ -0,0 +1,78 @@
+# Use Unicode for modern Windows compatibility
+Unicode True
+
+!include "LogicLib.nsh"
+
+# --- Basic Config ---
+Name "Avidemux 64-bit"
+OutFile "Avidemux_64bit_Setup.exe"
+# This forces the "shield" icon and UAC prompt
+RequestExecutionLevel admin 
+# Points to C:\Program Files instead of C:\Program Files (x86)
+InstallDir "$PROGRAMFILES64\Avidemux64"
+
+# --- Visual Pages ---
+Page directory
+Page instfiles
+
+# --- Installation Section ---
+Section "Install"
+    # Tell NSIS we are dealing with a 64-bit system/registry
+    SetRegView 64
+
+    # Define where files go
+    SetOutPath "$INSTDIR"
+    
+    # Copy files from your local 'avidemux64' folder
+    # IMPORTANT: Ensure this folder is in the same directory as this .nsi file
+    File /r "../../avidemux64/*.*"
+
+    # Create the uninstaller binary
+    WriteUninstaller "$INSTDIR\uninstall.exe"
+
+    # Shortcuts
+    CreateDirectory "$SMPROGRAMS\Avidemux64"
+    CreateShortcut "$SMPROGRAMS\Avidemux64\Avidemux.lnk" "$INSTDIR\avidemux_portable.exe"
+    CreateShortcut "$SMPROGRAMS\Avidemux64\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+    CreateShortcut "$DESKTOP\Avidemux.lnk" "$INSTDIR\avidemux_portable.exe"
+
+    # Add to "Apps & Features" (Add/Remove Programs) for 64-bit
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Avidemux64" \
+                 "DisplayName" "Avidemux 64-bit"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Avidemux64" \
+                 "DisplayIcon" "$INSTDIR\avidemux.exe"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Avidemux64" \
+                 "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Avidemux64" \
+                 "Publisher" "Your Name or Organization"
+SectionEnd
+
+# --- Uninstallation Section ---
+Section "Uninstall"
+    # Switch to 64-bit mode to find the correct registry keys and folders
+    SetRegView 64
+
+    # Remove all files and the directory
+    Delete "$INSTDIR\*.*"
+    RMDir /r "$INSTDIR"
+
+    # Remove Start Menu and Desktop items
+    Delete "$SMPROGRAMS\Avidemux64\Avidemux.lnk"
+    Delete "$SMPROGRAMS\Avidemux64\Uninstall.lnk"
+    RMDir "$SMPROGRAMS\Avidemux64"
+    Delete "$DESKTOP\Avidemux.lnk"
+
+    # Clean up registry
+    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Avidemux64"
+SectionEnd
+
+# --- Admin Check ---
+Function .onInit
+    UserInfo::GetAccountType
+    Pop $0
+    ${If} $0 != "Admin"
+        MessageBox MB_ICONSTOP "Admin rights required! Please right-click and 'Run as Administrator'."
+        Quit
+    ${EndIf}
+FunctionEnd
+

avidemux2-2.8.2.git20260404.tar.xz/avidemux_core/ADM_coreUtils/src/update_prefs.sh -> avidemux2-2.8.2.git20260407.tar.xz/avidemux_core/ADM_coreUtils/src/update_prefs.sh Changed

avidemux2-2.8.2.git20260404.tar.xz/bootStrapCrossMingwQt6_2026.sh -> avidemux2-2.8.2.git20260407.tar.xz/bootStrapCrossMingwQt6_2026.sh Changed

avidemux2-2.8.2.git20260404.tar.xz/devpod_mxe64.sh -> avidemux2-2.8.2.git20260407.tar.xz/devpod_mxe64.sh Changed

Overview

Request 6396 (accepted)

Request History