From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sa-prd-fep-048.btinternet.com (mailomta18-sa.btinternet.com [213.120.69.24]) by sourceware.org (Postfix) with ESMTPS id A8D38384F00C for ; Mon, 13 Feb 2023 18:28:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A8D38384F00C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=dronecode.org.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=dronecode.org.uk Received: from sa-prd-rgout-004.btmx-prd.synchronoss.net ([10.2.38.7]) by sa-prd-fep-048.btinternet.com with ESMTP id <20230213182837.DQOM1091.sa-prd-fep-048.btinternet.com@sa-prd-rgout-004.btmx-prd.synchronoss.net>; Mon, 13 Feb 2023 18:28:37 +0000 Authentication-Results: btinternet.com; auth=pass (PLAIN) smtp.auth=jonturney@btinternet.com; bimi=skipped X-SNCR-Rigid: 613943C64F83ED1A X-Originating-IP: [81.153.98.246] X-OWM-Source-IP: 81.153.98.246 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-VadeSecure-score: verdict=clean score=0/300, class=clean X-RazorGate-Vade: gggruggvucftvghtrhhoucdtuddrgedvhedrudeiuddguddutdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemuceutffkvffkuffjvffgnffgvefqofdpqfgfvfenuceurghilhhouhhtmecufedtudenucesvcftvggtihhpihgvnhhtshculddquddttddmnegoufhushhpvggtthffohhmrghinhculdegledmnecujfgurhepkfffgggfuffvfhfhjggtgfesthejredttdefjeenucfhrhhomheplfhonhcuvfhurhhnvgihuceojhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukheqnecuggftrfgrthhtvghrnhepkeeiuefhfeffgeduueeukeduueektdetveevkeeigeeuhefgteevgfevhfejtdeknecuffhomhgrihhnpehgihhthhhusgdrihhonecukfhppeekuddrudehfedrleekrddvgeeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehhvghloheplgduledvrdduieekrddurddutdeingdpihhnvghtpeekuddrudehfedrleekrddvgeeipdhmrghilhhfrhhomhepjhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukhdpnhgspghrtghpthhtohepvddprhgtphhtthhopegthihgfihinhdqrghpphhssegthihgfihinhdrtghomhdprhgtphhtthhopehtrghkrghshhhirdihrghnohesnhhifhhthidrnhgvrdhjph X-RazorGate-Vade-Verdict: clean 0 X-RazorGate-Vade-Classification: clean Received: from [192.168.1.106] (81.153.98.246) by sa-prd-rgout-004.btmx-prd.synchronoss.net (5.8.716.04) (authenticated as jonturney@btinternet.com) id 613943C64F83ED1A; Mon, 13 Feb 2023 18:28:37 +0000 Message-ID: <0b83ec7b-1338-2d41-67c3-f411cdcd3302@dronecode.org.uk> Date: Mon, 13 Feb 2023 18:28:37 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.7.2 Subject: Re: [ITP] ffmpeg (5.1.2) Content-Language: en-GB To: Takashi Yano , "cygwin-apps@cygwin.com" References: <20230120193540.a32d7180d8fa690f886ef625@nifty.ne.jp> <5afd1512-3f5f-ab90-50b4-1e00100ea68c@dronecode.org.uk> <20230122212559.815a8c2f08bb127d926ec1ce@nifty.ne.jp> <20230124122850.acbc1fb3135d376122783d05@nifty.ne.jp> <20230205174018.e3b9b3dde9d21555af07861d@nifty.ne.jp> <20230206225313.755d5cc007ae62721997b1da@nifty.ne.jp> From: Jon Turney In-Reply-To: <20230206225313.755d5cc007ae62721997b1da@nifty.ne.jp> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1191.5 required=5.0 tests=BAYES_00,FORGED_SPF_HELO,KAM_DMARC_STATUS,KAM_LAZY_DOMAIN_SECURITY,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 06/02/2023 13:53, Takashi Yano via Cygwin-apps wrote: > if [ ${all_codecs} = "yes" ] > then > cat <<_EOF_ > ffmpeg-wchar.patch > --- origsrc/ffmpeg-5.1.2/libavcodec/mf_utils.h 2022-07-23 02:58:39.000000000 +0900 > +++ src/ffmpeg-5.1.2/libavcodec/mf_utils.h 2023-01-26 12:33:12.745550400 +0900 > @@ -29,6 +29,7 @@ > // mf*.h headers below indirectly include strmif.h.) > #include > #else > +#include > #define NO_DSHOW_STRSAFE > #include > // Older versions of mingw-w64 need codecapi.h explicitly included, while newer > _EOF_ > PATCH_URI+=" ffmpeg-wchar.patch" > el This seems an odd way to write this. If possible, just apply the patch unconditionally (I assume it doesn't break all_codec=no builds), and treat it normally (i.e. keep it next to the cygport, list it in PATCH_URI, so it gets placed into the source package.) If it's really necessary to only apply the patch in the all_codec=yes case, use src_patch_apply_hook [1]. [1] https://cygwin.github.io/cygport/src_prep_cygpart.html#src_patch_apply_hook Otherwise, looks good.