From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3585D41D4A for ; Thu, 26 May 2022 07:26:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 60F0668B55E; Thu, 26 May 2022 10:26:25 +0300 (EEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2049.outbound.protection.outlook.com [40.92.19.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 146F168AA68 for ; Thu, 26 May 2022 10:26:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S5+wfVTdh6IMc7u5nlCMODWqS4OCcUmf/vxxm/bA6fy9v8FDPlwHncDeaQpEXxcdcoX5BcRp6eDamWCWiGM+b/Dswb2Dr7ygouo9YiJYH6zRWQe9zMTma6DkmgO+g1o84wikQpvNfUzK9sPUEBFE755D7tMOloDuPv864StxOBJqFDoNpIilKYUZXrLM210jm5Of89oAeiZDNIYm4qHRw89SFv+E9QdzOQtN+xpLLGSTMB6yoLFJxV7JDYghnvkMsI0FHkyySjRmctQMTQ8xyADIS/L5i1jF/ZnOzA1pQRrjS+SfUqC2JYNkdmS74SRoiqU7QGKzJcwjV6r7ZjkS6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1rLj58aMq1BU4MN9atOqyjpVHCGP03P6E8unQT/frUg=; b=hUGHE7q/0rXRvv2XqNz+KUUwO9Po8ifC2hPgsfe3PTcw9OKsmQdAOlqjLvUwfXgRovwD1vRpFzfKRsJh5Y3eUBazZKxmrF3BWUMDWiHv3Spm/ioZGcawZ73ksvjGNubHXWW61YlKE00a89b1abz0hTIXS1xzx4Jq8iYBw8z3yNE2gAxvC6qZs4m4ngOrOsLmA2K6L4GkyCGWT+SKxriUtTQxg/BA1XnoY9iX/2N1XjcvnQ1dFUALgl7tf2GDjV++E8FL+ZvJoznpslaGOTw2UwSqt0W2PnP6rlknkbjwgX62Cl/MonP8G881LsNLN0i+zUUfdnHey6XLTvDy2UtK0w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1rLj58aMq1BU4MN9atOqyjpVHCGP03P6E8unQT/frUg=; b=PYJ3o3JZhS1g3EF2KN9Vs0abFjv0d1ISvCZFwuNCnt0CM/0AxCdlfbku+5xX9d0+gkcoAiny9Q66v1mWs2xB03cI1aTpk21tBJVabL7NRhX7EJJ2jYMhYTYrEPlVoFBXHj+QZxU03UhoWPBduBZFR01Jgc0isMqT3nAzfLinFJMbtoOqjmKXUsyjCn1aEMlyBX7tgNUh/PPmQQhesuSk88hsOYf853YyZ2rZUOhbYqP8i9mttiTYurPYIkV037sOKoACeD/Jt9DRcjv6+rQrKByBVmWbv5w9GEONUbAyGKDrLk92URq3xdE9cu5tSnS+5ycfzJxiKpZN0gZlhKZ7Ng== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by SJ1P223MB0435.NAMP223.PROD.OUTLOOK.COM (2603:10b6:a03:45e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.17; Thu, 26 May 2022 07:26:14 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::f144:21f9:cdb1:5c8a]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::f144:21f9:cdb1:5c8a%7]) with mapi id 15.20.5293.013; Thu, 26 May 2022 07:26:14 +0000 From: Soft Works To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH v4] libx264: Set min build version to 158 Thread-Index: AQHYcCdgri5vi3o1M0a0FB6/rpULdq0vtFmAgAB/0gCAAIoGEA== Date: Thu, 26 May 2022 07:26:14 +0000 Message-ID: References: <20220525151555.GY396728@pb2> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [2xfv/+tf1gOXtTPCt3/bV7vPYTVNlbL2] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3f00ff6f-ff11-4747-b81c-08da3ee90429 x-ms-traffictypediagnostic: SJ1P223MB0435:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: kJt6zYHW1DbhShUGECW7avFWD/csGLoT2mjqJFy5KevK92aa4EIwH7CerdhZ4c4rSrcEi16ivfuWzJJZ2zsnosDT2Lwyjdq66ERSDyCIuC377TWh2LK2EKpK+7JqZYom241GmnycsFx0hs9t8mJ/ZBaSL2DgPeaNjKXKOd/anQuOJCVX11PXEFejW7QehvH05TICqDQc2jwUxyHU6s3Rkcom0llWrKfGkXflJKwg79+vDkQCgj9dmAA0nvSHyZLDrr05zW+sqcnzZHncIbSjIO9GvunFKeWQnFh1emVY2fVf4wFfc9OEydqbPUHAvWnqGgSVLyNEYoWnbGRYvKP4gG+5xLP+8E1WUznvlN1N4+SVcmFiuilKOYEl+UfU2eEX4UxmyhOBRDb4IPvztRb+EHS8c8hqyl7l3L1GauFFB4MxuFDGyMegDbqKXRdTtxalRcraUe5GdLmLc5vjwxKHGDNduubTmjsqL/vmU6Kveyqa3EqUTzsdVnxIFjNqwUDgSHM9Pil41AGOp5U66tq9XZl2fI4dQPUDbQ5bi8AkMD1twkyHWiVaIg2ruhz/J7SBWC764fzVj3ecmQc33gQ0/JbuVlYOLQ6jFa27zgn+JTS88Redm4SG59a79AvOULBl5Qeiy+9sgj+TfolXFsx8Cbd6WZ6QQdN5tcNyBfGs4Gc= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?aVlzQmRvKzhDODcxSWFGRzhLSzg1aDZ2dEVROVJ1TVFpN1QyV2N5ODRtYlVP?= =?utf-8?B?bnZlNEJTVDZUUkxDN2paVzBMVFkwQzFnWlJEc3VxSTZrakFJSmV1aVlEQ1JJ?= =?utf-8?B?NjlXY0syYkQ1bVJvVW9KUk0yU0F6cStNYVF6NmFRSzFBWC9zR1F1UHByVTNF?= =?utf-8?B?RERqRjBhZE10eTJNdUZ3RjNIeUJvczM3dkVCbE92UVpsM0s4TW1aWXc5Yk83?= =?utf-8?B?ZTFHZGJrWjhrUWtJSGk5R3V2UTZtRVpMeFZnSHpqUFQ1dE1lT044aGsxMm1C?= =?utf-8?B?dy92SVFIaVdEa0FVQVhUMEdETHppMDlrT0RWTzJ0WlRFZEVXRTFvNE9wL2tE?= =?utf-8?B?aUlSVkxBK3hzRHVDU1doV2JQTU1KRjdXL3EwekxVNmFHR1AxN2NuQnpLdFBF?= =?utf-8?B?ZkhIRDRPNkVyVEE1M2hoWkE1aDM2UTFaOGozYnhYcjBPNUNvcG05cG11ejNk?= =?utf-8?B?d3Jqb3RXd2JaK3VYUlR4ZzgxZi9MNTBPbDYvaDU0TEFQZE1reWZlS2t4Skxv?= =?utf-8?B?WktkV2RuVGdOY0M2cllhYkhtOWthZDFzYm9Nd3dFTkpXUlM5L2ptcnBkbDFY?= =?utf-8?B?NXU5bkxqQ2d1aFloUXdOSlI4SHJ3TVZTVnN6YVAyM0NLM01Kdjd3eHBVR1VL?= =?utf-8?B?TVk3Z0dZb2ZaSG4yMTA2NEZyN3loL2pOcU1DK2tabFNsY2JBVTNtRUhrOXlP?= =?utf-8?B?YnFmVWRRemZ0aXBRZWhjL25YSzQ4T2xvOENRMXBxZEtZem45NDBqME1JVEhn?= =?utf-8?B?ZFZRTjFrSlJma0cvS1RZZ1BjVGYzQ0tJZ2RrTWNrZGlMZFFmMVRLNjB5OHhi?= =?utf-8?B?NEhOMG43amtJdGFnV3MrQzVlSmVia1UxRWhtMG5Na0RBT3NjWWRFc0poYTdI?= =?utf-8?B?dEdJa1VmOVFTWGZBS2RnMkFhQS92MjhqTytuREFTZTllTC9hZWdBVlRibHpU?= =?utf-8?B?V1g3K3V5TndqdkRJTEEvTUJ6SFRGOWZWc1l4Vm9rTENKcmk5U1ExZWRlZGhB?= =?utf-8?B?OHI3V2MzMXBUM0w5NGptVHNPU0gvaFlXWlg1dm4zd0hxUDRqSitTZkhFdk5m?= =?utf-8?B?a3V1bW5CVzlIOHpqY1pFVjlFZGpEbVZmZVh3eDlqbWFPQ0FMYVJBYnd3WTZj?= =?utf-8?B?alJZZDNvWGlEbGNvTnZLcnBWL3NsUEVoUHZ4Uld6SjZscEJ5RHE5T09YWERF?= =?utf-8?B?U2VFRi8rRkNqWHRxZUx6Y0hZZ2ZpMUV6WkZDZVArSFJBcGgzakRWYWw5d05X?= =?utf-8?B?MHNzb0w4QlhxMkQvaWs3b2ZXdkFtSUVzeUNXSzRGZUdyT2dKM3EyclAyZTJY?= =?utf-8?B?WnUzWmJwUzA1bmhIbmVUQlV6SW1XYXZCZUxPeExYcmU5TTRJczR4VzhLWlZW?= =?utf-8?B?blRDMGdja2d5dW85Q0V4OTVFWWRPWk1la0FoR01aaUM3RisvaGIreVpJS2M5?= =?utf-8?B?UnBQOXBJV2NuZldrSkU5aDhsY3NzcCs0Z2haNFJyUFVtU0s2VHlJR0swUVJ0?= =?utf-8?B?eDZmaHcwckpkb1FlZy9qWTN6Q3Q1a2RkenBtN3hScy9sZVpqMlc0QjVWdVRt?= =?utf-8?B?T0pRckp5dGxTOVJtaUFZN0tVeWxxb3d3WUlEWnNidWxEcmthd1FHZFhMWFdm?= =?utf-8?B?RDBNNFpydG5WNXVYeDZ4R3RCc0IzT1ArdzNNM3kxYllCWjJtRlpGcmtCR2la?= =?utf-8?B?cXptNTZzdEliSm81aXhybXVEZkJ5SUdmekhJOFBDWHU3Z2wrYUhxeDRSVXR6?= =?utf-8?B?YjBJY0kyRk40QXYxKzErT3lkUDBic1ZIZ2Y0cG9ZVUF1R0NBajJrL0l0THow?= =?utf-8?B?TXBlclZ3OEpEWkhKc1dVNDVSemFxTENiT0s1RjZRTFpESkZzSlg5dnhPZ3F6?= =?utf-8?B?Q2pXbWRCNFpEbk9uOHhPQ05aWjRURDNzaHRqa0FsZ1UwMExSWWhhUi9SbzMy?= =?utf-8?Q?YZ87Evytf80=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 3f00ff6f-ff11-4747-b81c-08da3ee90429 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 May 2022 07:26:14.3866 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1P223MB0435 Subject: Re: [FFmpeg-devel] [PATCH v4] libx264: Set min build version to 158 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: > -----Original Message----- > From: ffmpeg-devel On Behalf Of Andreas > Rheinhardt > Sent: Thursday, May 26, 2022 12:53 AM > To: ffmpeg-devel@ffmpeg.org > Subject: Re: [FFmpeg-devel] [PATCH v4] libx264: Set min build version to > 158 > > Michael Niedermayer: > > On Wed, May 25, 2022 at 11:05:39AM +0000, Matt Oliver wrote: > >> From: Matt Oliver > >> > >> Was "[PATCH] libx264: Do not explicitly set X264_API_IMPORTS" > >> > >> Setting X264_API_IMPORTS only affects msvc builds and it breaks > >> linking to static builds (although is required for shared builds). > >> This flag is set by x264 in its pkgconfig as required since build > >> 158 (a615f027ed172e2dd5380e736d487aa858a0c4ff) from July 2019. > >> So this patch updates configure to require a newer x264 build that > >> correctly sets the imports flag. > >> > >> The requirement for 158 is applied for msvc builds only, > >> no change is made for all other cases. > >> > >> Co-authored-by: softworkz > >> Signed-off-by: softworkz > >> Signed-off-by: Matt Oliver > >> --- > >> libx264: Set min build version to 158 > >> > >> I'm submitting this patch on behalf of Matt with his permission. > >> > >> There was agreement that the >= 158 version requirement should be > >> applied to MSVC builds only. > >> > >> v2: restrict the version requirement to msvc builds > >> v3: fix unintended author change > >> v4: add missing braces > >> > >> Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr- > ffstaging-30%2Fsoftworkz%2Fsubmit_x264_api_imports_matt-v4 > >> Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr- > ffstaging-30/softworkz/submit_x264_api_imports_matt-v4 > >> Pull-Request: https://github.com/ffstaging/FFmpeg/pull/30 > >> > >> Range-diff vs v3: > >> > >> 1: 374130a09e ! 1: 0d1bee35b0 libx264: Set min build version to 158 > >> @@ configure: enabled libvpx && { > >> - require_cpp_condition libx264 > x264.h "X264_BUILD >= 118" && > >> - check_cpp_condition libx262 x264.h > "X264_MPEG2" > >> +enabled libx264 && check_pkg_config libx264 x264 > "stdint.h x264.h" x264_encoder_encode && > >> -+ require_cpp_condition libx264 > x264.h "X264_BUILD >= 158" || > >> -+ { "$toolchain" != msvc && > require_cpp_condition libx264 x264.h "X264_BUILD >= 118"; } > >> ++ { require_cpp_condition libx264 > x264.h "X264_BUILD >= 158" || > >> ++ { "$toolchain" != msvc && > require_cpp_condition libx264 x264.h "X264_BUILD >= 118"; }; } > >> enabled libx265 && require_pkg_config libx265 x265 > x265.h x265_api_get && > >> require_cpp_condition libx265 > x265.h "X265_BUILD >= 70" > >> enabled libxavs && require libxavs "stdint.h xavs.h" > xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" > >> > >> > >> configure | 8 +++----- > >> libavcodec/libx264.c | 4 ---- > >> 2 files changed, 3 insertions(+), 9 deletions(-) > >> > >> diff --git a/configure b/configure > >> index f115b21064..129473c75c 100755 > >> --- a/configure > >> +++ b/configure > >> @@ -6656,11 +6656,9 @@ enabled libvpx && { > >> enabled libwebp && { > >> enabled libwebp_encoder && require_pkg_config libwebp > "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion > >> enabled libwebp_anim_encoder && check_pkg_config > libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h > WebPAnimEncoderOptionsInit; } > >> -enabled libx264 && { check_pkg_config libx264 x264 "stdint.h > x264.h" x264_encoder_encode || > >> - { require libx264 "stdint.h x264.h" > x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && > >> - warn "using libx264 without pkg- > config"; } } && > >> - require_cpp_condition libx264 x264.h > "X264_BUILD >= 118" && > >> - check_cpp_condition libx262 x264.h > "X264_MPEG2" > >> +enabled libx264 && check_pkg_config libx264 x264 "stdint.h > x264.h" x264_encoder_encode && > >> + { require_cpp_condition libx264 x264.h > "X264_BUILD >= 158" || > >> + { "$toolchain" != msvc && > require_cpp_condition libx264 x264.h "X264_BUILD >= 118"; }; } > > > > On ubuntu LTS: > > > > ERROR: X264_BUILD >= 158 not satisfied > > > > If you think configure made a mistake, make sure you are using the > latest > > version from Git. If the latest version fails, report the problem to > the > > ffmpeg-user@ffmpeg.org mailing list or IRC #ffmpeg on irc.libera.chat. > > Include the log file "ffbuild/config.log" produced by configure as this > will help > > solve the problem. > > > > That is because require_cpp_condition has a "|| die "ERROR: $condition > not satisfied" at the end, so ordinary short-circuiting logic does not > apply. > require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && { > "$toolchain" != msvc || require_cpp_condition libx264 x264.h "X264_BUILD > >= 158"; } > would avoid this and might actually work. Cool, thanks! @Michael - thanks for testing. It's not that I hadn't tested myself but I tested MinGW with existing libx264 and Ubuntu, where I don't have libx264 installed. softworkz _______________________________________________ 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".