[FFmpeg-cvslog] [ffmpeg] branch master updated. fd31df4306 tools: Split the list of source plugins out of "merge-all-source-plugins"

[ffmpeg-git]

The branch, master has been updated
       via  fd31df43067fe21cc1e4fabd07ee9d6a26cb7264 (commit)
       via  b5b306ca31ba4cc035f4cea3fd82ae43dccd38f3 (commit)
      from  373bd80b16643e349d229e2479fad565dba129a5 (commit)


- Log -----------------------------------------------------------------
commit fd31df43067fe21cc1e4fabd07ee9d6a26cb7264
Author:     Michael Niedermayer <mich...@niedermayer.cc>
AuthorDate: Tue Aug 12 12:43:06 2025 +0200
Commit:     michaelni <mich...@niedermayer.cc>
CommitDate: Wed Aug 13 11:50:52 2025 +0000

    tools: Split the list of source plugins out of "merge-all-source-plugins"

diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins
index 194a30fae2..42e5288c39 100755
--- a/tools/merge-all-source-plugins
+++ b/tools/merge-all-source-plugins
@@ -34,7 +34,16 @@ git diff --cached --exit-code >/dev/null ||\
 
 #version="12.34"
 
-merge "https://github.com/michaelni/FFmpeg.git"; "libpostproc"
+[ $# -ne 1 ] &&\
+    error "Usage: $0 source-plugins.txt"
+
+while IFS=' ' read -r a b; do
+    case "$a" in
+        ''|'#'*) continue ;;
+    esac
+
+    merge "$a" "$b"
+done < "$1"
 
 [ -n "$version"  ] && echo version: $version
 [ -n "$succeeded" ] && echo Succeeded merging: $succeeded
diff --git a/tools/source-plugins.txt b/tools/source-plugins.txt
new file mode 100644
index 0000000000..6940140ccc
--- /dev/null
+++ b/tools/source-plugins.txt
@@ -0,0 +1,4 @@
+# List of source plugins
+
+# libpostproc, GPL, maintained by Michael Niedermayer
+https://github.com/michaelni/FFmpeg.git libpostproc

commit b5b306ca31ba4cc035f4cea3fd82ae43dccd38f3
Author:     Michael Niedermayer <mich...@niedermayer.cc>
AuthorDate: Mon Aug 11 20:06:25 2025 +0200
Commit:     michaelni <mich...@niedermayer.cc>
CommitDate: Wed Aug 13 11:50:52 2025 +0000

    tools/merge-all-source-plugins: Fix merge_internal() return code
    
    Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins
index cd030cdabe..194a30fae2 100755
--- a/tools/merge-all-source-plugins
+++ b/tools/merge-all-source-plugins
@@ -2,8 +2,11 @@
 
 #If a version is set then we only try merging a source plugin with matching 
version as a generic one could change the ABI to master HEAD
 merge_internal(){ # $1=repository, $2=refspec
-    [ -n "$version" ] && git pull --no-rebase --log --stat --commit --no-edit  
$1 sourceplugin-$2-$version
-    [ -z "$version" ] && git pull --no-rebase --log --stat --commit --no-edit  
$1 sourceplugin-$2
+    branch="sourceplugin-$2"
+    if [ -n "$version" ] ; then
+        branch="$branch-$version"
+    fi
+    git pull --no-rebase --log --stat --commit --no-edit "$1" "$branch"
 }
 
 unset succeeded failed version

-----------------------------------------------------------------------

Summary of changes:
 tools/merge-all-source-plugins | 18 +++++++++++++++---
 tools/source-plugins.txt       |  4 ++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 tools/source-plugins.txt


hooks/post-receive
-- 

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".