Request 6570 (accepted)

Overview

Request 6570 (accepted)

Update to version 2.8.2.git20260819

Created by enzokiel 8 days ago
In state accepted

Submit avidemux3

Submit package home:enzokiel:...:home:enzokiel / avidemux3 to package home:enzokiel / avidemux3

avidemux3.changes Changed

avidemux3.spec Changed

avidemux2-2.8.2.git20260812.tar.xz/.devcontainer_fedora/Dockerfile -> avidemux2-2.8.2.git20260819.tar.xz/.devcontainer_fedora/Dockerfile Changed

@@ -1,10 +1,13 @@
 FROM fedora:43
-RUN sed -i 's|^metalink=|#metalink=|g' /etc/yum.repos.d/*.repo
-RUN sed -i 's|^#baseurl=http://download.example/pub/fedora/linux|baseurl=http://mirror.in2p3.fr/pub/fedora/linux/|g' /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo  && \
-sed -i 's|^metalink=|#metalink=|g' /etc/yum.repos.d/fedora.repo 
+#RUN sed -i 's|^metalink=|#metalink=|g' /etc/yum.repos.d/*.repo
+#RUN sed -i 's|^#baseurl=http://download.example/pub/fedora/linux|baseurl=http://mirror.in2p3.fr/pub/fedora/linux/|g' /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo  && \
+#sed -i 's|^metalink=|#metalink=|g' /etc/yum.repos.d/fedora.repo
 RUN rm -Rf  /etc/yum.repos.d/fedora-cisco-openh264.repo
-RUN sudo dnf -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
-RUN dnf -y  install git shadow-utils findutils util-linux tar sshd && useradd -m fedora 
+RUN sudo dnf -y install \
+  https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
+  https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+RUN dnf -y install git shadow-utils findutils util-linux tar sshd wget desktop-file-utils \
+  && useradd -m fedora
 RUN dnf -y  install   --skip-unavailable gcc \
   gcc-c++ \
   make \
@@ -38,12 +41,34 @@
   xvidcore-devel \
   x264-devel \
   x265-devel
-RUN dnf -y install qt6-*{devel,doc}*
+
+RUN dnf -y install \
+  qt6-qtbase-devel \
+  qt6-qtbase-private-devel \
+  qt6-linguist
 RUN dnf -y install SDL3-devel 
 RUN dnf -y clean all
 
-RUN cd /tmp && git clone https://github.com/FFmpeg/nv-codec-headers.git && cd nv-codec-headers && make install
+# We've already got ffnvcodec headers from Fedora repositories.
+#RUN cd /tmp && git clone https://github.com/FFmpeg/nv-codec-headers.git && cd nv-codec-headers && make install
+
+# App image
+RUN wget --no-proxy https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage \
+  && chmod +x appimage-builder-1.1.0-x86_64.AppImage \
+  && mv appimage-builder-1.1.0-x86_64.AppImage /usr/local/bin/appimage-builder
+
+RUN wget --no-proxy https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -O /usr/local/bin/linuxdeploy \
+  && chmod +x /usr/local/bin/linuxdeploy
 
+RUN wget --no-proxy https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage \
+  -O /usr/local/bin/linuxdeploy-plugin-appimage \
+  && wget --no-proxy https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage \
+    -O /usr/local/bin/linuxdeploy-plugin-qt \
+  && wget --no-proxy https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-x86_64 \
+    -O /usr/local/bin/runtime-x86_64 \
+  && wget --no-proxy https://github.com/AppImage/appimagetool/releases/download/1.9.0/appimagetool-x86_64.AppImage \
+    -O /usr/local/bin/appimagetool \
+  && chmod +x /usr/local/bin/*
 
 WORKDIR /home/fedora/workspace
 RUN chown fedora:fedora /home/fedora/workspace

avidemux2-2.8.2.git20260812.tar.xz/appImage/AppRun_qt6 -> avidemux2-2.8.2.git20260819.tar.xz/appImage/AppRun_qt6 Changed

avidemux2-2.8.2.git20260812.tar.xz/appImage/deploy_qt6.sh -> avidemux2-2.8.2.git20260819.tar.xz/appImage/deploy_qt6.sh Changed

@@ -13,33 +13,50 @@
 
 }
 set -x
-export QT6_PLUGINS=/usr/lib/x86_64-linux-gnu/qt6/plugins/
+if  -e /etc/redhat-release ; then
+  export LIBRARY_DIR=/usr/lib64
+else
+  export LIBRARY_DIR=/usr/lib/x86_64-linux-gnu
+fi
+export QT6_PLUGINS=$LIBRARY_DIR/qt6/plugins
 # export LD_DEBUG=amm LD_DEBUG_OUTPUT=/tmp/somefile
 export SOURCE=$1
 export DEST=$2
 
-echo "Installing $SOURCE -> $DEST"
+echo "Installing ${SOURCE} -> ${DEST}"
 
-rm -Rf $DEST
-mkdir $DEST
-cp -Rap $SOURCE/* $DEST/
-mv $DEST/usr/lib/x86_64-linux-gnu/* $DEST/usr/lib
-export H=$PWD
-cd $DEST/usr/lib/x86_64-linux-gnu/
-ln -s ../ADM_plugins6 .
-cd $H
-mv $DEST/usr/bin/avidemux3_qt6 $DEST/usr/bin/avidemux3_portable
+rm -Rf ${DEST} || fail "Removing destination directory"
+mkdir ${DEST}
+cp -Rap ${SOURCE}/* ${DEST}/
+
+if  -e /etc/redhat-release ; then
+  pushd ${DEST}/usr && mv lib64 lib && ln -sf lib lib64
+  popd
+else
+  mkdir -p ${DEST}/usr/lib && mv ${DEST}/${LIBRARY_DIR}/* ${DEST}/usr/lib/
+  pushd ${DEST}/${LIBRARY_DIR} && ln -s ../ADM_plugins6 .
+  popd
+fi
+mv ${DEST}/usr/bin/avidemux3_qt6 ${DEST}/usr/bin/avidemux3_portable
+mv ${DEST}/usr/bin/avidemux3_jobs_qt6 ${DEST}/usr/bin/avidemux3_jobs_portable
 #
 #
 #
-mkdir -p $DEST/usr/plugins/platforms
+mkdir -p ${DEST}/usr/plugins/platforms
 cp -t ${DEST}/usr/plugins/platforms/ ${QT6_PLUGINS}/platforms/*wayland* ${QT6_PLUGINS}/platforms/*xcb*
 cp -Rap -t ${DEST}/usr/plugins/ ${QT6_PLUGINS}/*integration*
+cp -Rap -t ${DEST}/usr/plugins ${QT6_PLUGINS}/wayland-decoration-client
 #
 #
-cp -t ${DEST}/usr/lib /usr/lib/x86_64-linux-gnu/libwayland-client.so
-cp -t ${DEST}/usr/lib /usr/lib/x86_64-linux-gnu/libwayland-cursor.so
-cp -t ${DEST}/usr/lib /usr/lib/x86_64-linux-gnu/libwayland-egl.so
+if  -e /etc/redhat-release ; then
+  cp -t ${DEST}/usr/lib64 -H ${LIBRARY_DIR}/libwayland-client.so.0
+  cp -t ${DEST}/usr/lib64 -H ${LIBRARY_DIR}/libwayland-cursor.so.0
+  cp -t ${DEST}/usr/lib64 -H ${LIBRARY_DIR}/libwayland-egl.so.1
+else
+  cp -t ${DEST}/usr/lib ${LIBRARY_DIR}/libwayland-client.so
+  cp -t ${DEST}/usr/lib ${LIBRARY_DIR}/libwayland-cursor.so
+  cp -t ${DEST}/usr/lib ${LIBRARY_DIR}/libwayland-egl.so
+fi
 python3 appImage/checkDeps.py $DEST
 
 exit 0

avidemux2-2.8.2.git20260812.tar.xz/avidemux/qt4/ADM_render_qt/GUI_sdl3Render.cpp -> avidemux2-2.8.2.git20260819.tar.xz/avidemux/qt4/ADM_render_qt/GUI_sdl3Render.cpp Changed

@@ -152,7 +152,14 @@
                                    window->display);
         }
     }
-    SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl,opengles2,software");
+
+    SDL_SetHint(SDL_HINT_RENDER_DRIVER,
+#ifdef _WIN32
+    "direct3d12,direct3d11,opengles2,software"
+#else
+    "opengl,opengles2,software"
+#endif
+    );
 
     if (!SDL_InitSubSystem(SDL_INIT_VIDEO))
     {
@@ -160,7 +167,8 @@
         ADM_warning("SDL3 Video subsystem init failed, error: %s\n", (err && *err) ? err : "Unknown");
         return false;
     }
-    ADM_info("SDL3 Video subsystem init ok, using driver: %s\n", SDL_GetCurrentVideoDriver());
+    ADM_info("SDL3 Video subsystem init ok, using driver \"%s\" and renderer \"%s\"\n",
+            SDL_GetCurrentVideoDriver(), SDL_GetRenderDriver(0));
     SDL_PropertiesID props = SDL_CreateProperties();
     SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_TITLE_STRING, "avidemux_sdl3");
     // SDL_SetBooleanProperty(props, SDL_PROP_WINDOW_CREATE_HIGH_PIXEL_DENSITY_BOOLEAN, true);

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

Build Results
RPM Lint

Refresh

Comments for request 6570 0

Request History

enzokiel created request 8 days ago

Update to version 2.8.2.git20260819

enzokiel accepted request 8 days ago