Re: [FFmpeg-devel] [PATCH] bugfix and split of source plugin list (PR #20225)

Re: [FFmpeg-devel] [PATCH] bugfix and split of source plugin list (PR #20225)

[Nicolas George]

michaelni (HE12025-08-12):
> PR #20225 opened by michaelni
> URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20225
> Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20225.patch
> 
> 
> >From a489870a2b35bf0e5a6a9a12696bceb211e18a35 Mon Sep 17 00:00:00 2001
> From: Michael Niedermayer <michael@niedermayer.cc>
> Date: Mon, 11 Aug 2025 20:06:25 +0200
> Subject: [PATCH 1/2] tools/merge-all-source-plugins: Fix merge_internal()
>  return code
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  tools/merge-all-source-plugins | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins
> index cd030cdabe..27f64f690c 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
> +    if [ -n "$version" ] ; then
> +        git pull --no-rebase --log --stat --commit --no-edit  $1 sourceplugin-$2-$version
> +    else
> +        git pull --no-rebase --log --stat --commit --no-edit  $1 sourceplugin-$2
> +    fi

Duplicated code in both the old and the new version. Better:

	branch=sourceplugin-$2-$version
	if [ -n "$version" ] ; then
	    branch="$branch-$version"
	fi
	git pull --no-rebase --log --stat --commit --no-edit "$1" "$branch"

Also, better not forget quoting shell variables, even if you trust the
caller to avoid dangerous characters.

>  }
>  
>  unset succeeded failed version

Not judging on the merits of having this scripts at all.

Regards,

-- 
  Nicolas George
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

Re: [FFmpeg-devel] [PATCH] bugfix and split of source plugin list (PR #20225)

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 2275 bytes --]

On Tue, Aug 12, 2025 at 04:18:10PM +0200, Nicolas George wrote:
> michaelni (HE12025-08-12):
> > PR #20225 opened by michaelni
> > URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20225
> > Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20225.patch
> > 
> > 
> > >From a489870a2b35bf0e5a6a9a12696bceb211e18a35 Mon Sep 17 00:00:00 2001
> > From: Michael Niedermayer <michael@niedermayer.cc>
> > Date: Mon, 11 Aug 2025 20:06:25 +0200
> > Subject: [PATCH 1/2] tools/merge-all-source-plugins: Fix merge_internal()
> >  return code
> > 
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  tools/merge-all-source-plugins | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins
> > index cd030cdabe..27f64f690c 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
> > +    if [ -n "$version" ] ; then
> > +        git pull --no-rebase --log --stat --commit --no-edit  $1 sourceplugin-$2-$version
> > +    else
> > +        git pull --no-rebase --log --stat --commit --no-edit  $1 sourceplugin-$2
> > +    fi
> 
> Duplicated code in both the old and the new version. Better:
> 
> 	branch=sourceplugin-$2-$version
> 	if [ -n "$version" ] ; then
> 	    branch="$branch-$version"
> 	fi
> 	git pull --no-rebase --log --stat --commit --no-edit "$1" "$branch"
> 
> Also, better not forget quoting shell variables, even if you trust the
> caller to avoid dangerous characters.

changed

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In fact, the RIAA has been known to suggest that students drop out
of college or go to community college in order to be able to afford
settlements. -- The RIAA

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

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

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

[FFmpeg-devel] [PATCH] bugfix and split of source plugin list (PR #20225)

[michaelni]

PR #20225 opened by michaelni
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20225
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20225.patch


From a489870a2b35bf0e5a6a9a12696bceb211e18a35 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Mon, 11 Aug 2025 20:06:25 +0200
Subject: [PATCH 1/2] tools/merge-all-source-plugins: Fix merge_internal()
 return code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 tools/merge-all-source-plugins | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins
index cd030cdabe..27f64f690c 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
+    if [ -n "$version" ] ; then
+        git pull --no-rebase --log --stat --commit --no-edit  $1 sourceplugin-$2-$version
+    else
+        git pull --no-rebase --log --stat --commit --no-edit  $1 sourceplugin-$2
+    fi
 }
 
 unset succeeded failed version
-- 
2.49.1


From b0480e9c25592c02c806974a2c0db93a172c5a7c Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Tue, 12 Aug 2025 12:43:06 +0200
Subject: [PATCH 2/2] tools: Split the list of source plugins out of
 "merge-all-source-plugins"

---
 tools/merge-all-source-plugins | 11 ++++++++++-
 tools/source-plugins.txt       |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 tools/source-plugins.txt

diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins
index 27f64f690c..575bbfbff9 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
-- 
2.49.1

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

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