Request 6567 (accepted)

Overview

Request 6567 (accepted)

Update to version 2.8.2.git20260806

Created by enzokiel 16 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.git20260730.tar.xz/.devcontainer_mxe64/Dockerfile -> avidemux2-2.8.2.git20260806.tar.xz/.devcontainer_mxe64/Dockerfile Changed

@@ -146,23 +146,48 @@
 
 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 := 4" >> settings.mk && make  qt6-qtbase
-RUN cd /opt/mxe && make qt6
-RUN cd /opt/mxe && make opencore-amr  && make fdk-aac && make sdl3
-RUN echo Done
+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 := 4" >> settings.mk \
+    && echo "MXE_SILENT_NO_NETWORK :=" >> settings.mk
+
+WORKDIR /opt/mxe
+
+COPY fdk-aac.patch /tmp/
+RUN patch -p1 --dry-run < /tmp/fdk-aac.patch \
+    && patch -p1 < /tmp/fdk-aac.patch || :
+
+COPY opus.patch /tmp/
+RUN patch -p1 --dry-run < /tmp/opus.patch \
+    && patch -p1 < /tmp/opus.patch || :
+
+RUN make \
+    fdk-aac \
+    lame \
+    libass \
+    libvpx \
+    ogg \
+    opencore-amr \
+    opus \
+    sdl3 \
+    vorbis \
+    x264 \
+    x265 \
+    xvidcore
+
+RUN make qt6-qttools && 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/
+
+WORKDIR /tmp
+
 COPY install-libaom.bash /tmp/
-RUN cd /tmp && \
-    AOM_TAG="v3.14.1" \
+RUN AOM_TAG="v3.14.1" \
     bash install-libaom.bash /opt/mxe
 # -- nvenc
-RUN cd /tmp && git clone https://github.com/FFmpeg/nv-codec-headers.git && cd nv-codec-headers && \
-    git checkout "sdk/11.1"  && \
-    make install DESTDIR=/opt/mxe/usr/x86_64-w64-mingw32.shared/ PREFIX=/
-
-
+RUN git clone https://github.com/FFmpeg/nv-codec-headers.git && cd nv-codec-headers \
+    && git checkout "sdk/11.1" \
+    && make install DESTDIR=/opt/mxe/usr/x86_64-w64-mingw32.shared/ PREFIX=/

avidemux2-2.8.2.git20260806.tar.xz/.devcontainer_mxe64/fdk-aac.patch Added

avidemux2-2.8.2.git20260806.tar.xz/.devcontainer_mxe64/opus.patch Added

@@ -0,0 +1,24 @@
+diff --git a/src/opus.mk b/src/opus.mk
+index a16a6736..30355dfb 100644
+--- a/src/opus.mk
++++ b/src/opus.mk
+@@ -3,15 +3,15 @@
+ PKG             := opus
+ $(PKG)_WEBSITE  := https://opus-codec.org/
+ $(PKG)_IGNORE   :=
+-$(PKG)_VERSION  := 1.3.1
+-$(PKG)_CHECKSUM := 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d
++$(PKG)_VERSION  := 1.6.1
++$(PKG)_CHECKSUM := 6ffcb593207be92584df15b32466ed64bbec99109f007c82205f0194572411a1
+ $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+-$(PKG)_URL      := https://archive.mozilla.org/pub/$(PKG)/$($(PKG)_FILE)
++$(PKG)_URL      := https://downloads.xiph.org/releases/$(PKG)/$($(PKG)_FILE)
+ $(PKG)_DEPS     := cc
+ 
+ define $(PKG)_UPDATE
+-    $(WGET) -q -O- 'https://archive.mozilla.org/pub/opus/?C=M;O=D' | \
++    $(WGET) -q -O- 'https://downloads.xiph.org/releases/opus/?C=M;O=D' | \
+     $(SED) -n 's,.*opus-$0-9^>*$\.tar.*,\1,p' | \
+     grep -v 'alpha' | \
+     grep -v 'beta' | \

avidemux2-2.8.2.git20260730.tar.xz/bootStrapCrossMingwQt6_2026.sh -> avidemux2-2.8.2.git20260806.tar.xz/bootStrapCrossMingwQt6_2026.sh Changed

Build Results
RPM Lint

Refresh

Comments for request 6567 0

Request History

enzokiel created request 16 days ago

Update to version 2.8.2.git20260806

enzokiel accepted request 16 days ago