From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 0642B4E7CD for <ffmpegdev@gitmailbox.com>; Wed, 11 Jun 2025 19:21:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id E3D2F68A417; Wed, 11 Jun 2025 22:21:13 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 167DB687D43 for <ffmpeg-devel@ffmpeg.org>; Wed, 11 Jun 2025 22:21:06 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id D9D40EB70B for <ffmpeg-devel@ffmpeg.org>; Wed, 11 Jun 2025 21:18:07 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZyIskBKGv6uH for <ffmpeg-devel@ffmpeg.org>; Wed, 11 Jun 2025 21:18:05 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 9E44FEB706 for <ffmpeg-devel@ffmpeg.org>; Wed, 11 Jun 2025 21:18:05 +0200 (CEST) Date: Wed, 11 Jun 2025 21:18:05 +0200 (CEST) From: Marton Balint <cus@passwd.hu> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> In-Reply-To: <08e01d9ad96b56dac6f0f1f0912e0aa94f80e8d0.1749497028.git.ffmpegagent@gmail.com> Message-ID: <cbc32aab-6fa0-cde1-791d-d19eeccfedfb@passwd.hu> References: <pull.95.ffstaging.FFmpeg.1749497028.ffmpegagent@gmail.com> <08e01d9ad96b56dac6f0f1f0912e0aa94f80e8d0.1749497028.git.ffmpegagent@gmail.com> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 3/3] tools/ffmpeg-sg: Include show-graph wrapper script in build output X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/cbc32aab-6fa0-cde1-791d-d19eeccfedfb@passwd.hu/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> On Mon, 9 Jun 2025, softworkz wrote: > From: softworkz <softworkz@hotmail.com> > > Signed-off-by: softworkz <softworkz@hotmail.com> > --- > .gitignore | 1 + > fftools/Makefile | 14 ++++++++++++-- > 2 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/.gitignore b/.gitignore > index 59c89da5e0..989c702b6c 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -32,6 +32,7 @@ > /.config > /.version > /ffmpeg > +/ffmpeg-sg Please, do not copy this from tools folder to the main build dir. The rest of the tools are also simply kept in the tools folder, no copying is necessary during the build process. Thanks, Marton > /ffplay > /ffprobe > /config.asm > diff --git a/fftools/Makefile b/fftools/Makefile > index b3c08ae5a0..378de79665 100644 > --- a/fftools/Makefile > +++ b/fftools/Makefile > @@ -5,6 +5,11 @@ AVPROGS-$(CONFIG_FFPROBE) += ffprobe > AVPROGS := $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF)) > PROGS += $(AVPROGS) > > +FFMPEG_SG_SCRIPT = $(SRC_PATH)/tools/ffmpeg-sg$(if $(filter .exe,$(EXESUF)),.cmd) > +FFMPEG_SG_TARGET = ffmpeg-sg$(EXESUF) > +FFMPEG_SG_ENABLED = $(and $(filter $(CONFIG_FFMPEG),yes),$(or $(filter $(target_os),win32),$(if $(target_os),,yes))) > +FFMPEG_SG_FILES = $(if $(FFMPEG_SG_ENABLED),$(FFMPEG_SG_TARGET)) > + > AVBASENAMES = ffmpeg ffplay ffprobe > ALLAVPROGS = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF)) > ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF)) > @@ -67,7 +72,10 @@ endef > > $(foreach P,$(AVPROGS-yes),$(eval $(call DOFFTOOL,$(P)))) > > -all: $(AVPROGS) > +all: $(AVPROGS) $(FFMPEG_SG_FILES) > + > +$(FFMPEG_SG_TARGET): $(FFMPEG_SG_SCRIPT) > + $(Q)$(CP) -p $(FFMPEG_SG_SCRIPT) $(FFMPEG_SG_TARGET) > > fftools/ffprobe.o fftools/cmdutils.o: libavutil/ffversion.h | fftools > OUTDIRS += fftools > @@ -85,11 +93,13 @@ install-progs-$(CONFIG_SHARED): install-libs > install-progs: install-progs-yes $(AVPROGS) > $(Q)mkdir -p "$(BINDIR)" > $(INSTALL) -c -m 755 $(AVPROGS) "$(BINDIR)" > + $(if $(FFMPEG_SG_FILES),$(INSTALL) -c -m 755 $(FFMPEG_SG_FILES) "$(BINDIR)") > > uninstall: uninstall-progs > > uninstall-progs: > $(RM) $(addprefix "$(BINDIR)/", $(ALLAVPROGS)) > + $(if $(FFMPEG_SG_FILES),$(RM) "$(BINDIR)/$(FFMPEG_SG_FILES)") > > clean:: > - $(RM) $(ALLAVPROGS) $(ALLAVPROGS_G) $(CLEANSUFFIXES:%=fftools/%) $(CLEANSUFFIXES:%=fftools/graph/%) $(CLEANSUFFIXES:%=fftools/textformat/%) > + $(RM) $(ALLAVPROGS) $(ALLAVPROGS_G) $(CLEANSUFFIXES:%=fftools/%) $(CLEANSUFFIXES:%=fftools/graph/%) $(CLEANSUFFIXES:%=fftools/textformat/%) $(FFMPEG_SG_FILES) > -- > ffmpeg-codebot > _______________________________________________ > 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 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".