From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id ABC334EF98 for ; Thu, 15 May 2025 14:23:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 86E8568C028; Thu, 15 May 2025 17:23:54 +0300 (EEST) Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id DB46668B7CC for ; Thu, 15 May 2025 17:23:47 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id D87F043B1C for ; Thu, 15 May 2025 14:23:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1747319027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jSnsflw4tT9tDHHTFaMCIn38vRbPJ3ZpgZdSnB36qxA=; b=g10Y83/Ko95pgl5T+miTDJVl8GQhrqzgnYTDhTU4ybRstrkZMe5CRSQRs4IaVcurdq91V7 lzlOEFMLo4Nv4APKqsLh8ZmyxgnHgm1+1lfEC57F6EcRBO7rjHGXTGycZvdEn+hd1ts4lO 2DHOHDMfMgPsFFqGI2r7xk3zsNibcFZoc9cwliXpzAwmrCLLG7drDF6rUxzhpheEixxzCs cI6zOFfXAO8dJUaxGyZyRUfEobdbBbq+yGEzP82mK0HZ+QvmHZ0waDAKE+eeFe7S7+mD6n t7uYXm3ARMSOpU9V/hjNVh2on8n4z5wItoRW0RvjLGtqKjzwOr+T5CBB+yEABg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 15 May 2025 16:23:44 +0200 Message-ID: <20250515142345.2586501-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-GND-State: clean X-GND-Score: -85 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdefuddtuddtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdduhedmnecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeejffeufeffveevtdfhueevtdefjeetheeiteffheetgedvudduvedtffefjefhleenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeguddrieeirdeijedruddufeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeguddrieeirdeijedruddufedphhgvlhhopehlohgtrghlhhhoshhtpdhmrghilhhfrhhomhepmhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtpdhnsggprhgtphhtthhopedupdhrtghpthhtohepfhhfmhhpvghgqdguvghvvghlsehffhhmphgvghdrohhrgh X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH v2 1/2] tools/merge-all-source-plugins: Try merging a tag or branch matching the current version X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Michael Niedermayer --- tools/merge-all-source-plugins | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) mode change 100644 => 100755 tools/merge-all-source-plugins diff --git a/tools/merge-all-source-plugins b/tools/merge-all-source-plugins old mode 100644 new mode 100755 index 20764a07737..4dbfa898723 --- a/tools/merge-all-source-plugins +++ b/tools/merge-all-source-plugins @@ -1,3 +1,27 @@ #!/bin/sh -git pull --no-rebase --log --stat --commit --no-edit https://github.com/michaelni/FFmpeg.git sourceplugin-libpostproc +#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 +} + +unset suceeded failed version + +merge(){ # $1=repository, $2=refspec + merge_internal "$1" "$2" || { + git reset --hard + echo merge of $1 $2 failed, continuing with other plugins + failed="$failed $2" + return 0 + } + suceeded="$suceeded $2" +} + +#version="12.34" + +merge "https://github.com/michaelni/FFmpeg.git" "libpostproc" + +[ -n "$version" ] && echo version: $version +[ -n "$suceeded" ] && echo Succeeded merging: $suceeded +[ -n "$failed" ] && echo Failed merging: $failed -- 2.49.0 _______________________________________________ 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".