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 62C834055F for ; Thu, 26 May 2022 10:50:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E417168B54D; Thu, 26 May 2022 13:50:46 +0300 (EEST) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D836B68B496 for ; Thu, 26 May 2022 13:50:40 +0300 (EEST) Received: from localhost (unknown [213.47.68.29]) (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 27DD9C000B for ; Thu, 26 May 2022 10:50:39 +0000 (UTC) Date: Thu, 26 May 2022 12:50:33 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20220526105033.GE396728@pb2> References: MIME-Version: 1.0 In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH v5] 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: multipart/mixed; boundary="===============8896651804814104492==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============8896651804814104492== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Wo0oCZYLrer5S3Oe" Content-Disposition: inline --Wo0oCZYLrer5S3Oe Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 26, 2022 at 07:28:10AM +0000, Matt Oliver wrote: > From: Matt Oliver >=20 > Was "[PATCH] libx264: Do not explicitly set X264_API_IMPORTS" >=20 > 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. >=20 > The requirement for 158 is applied for msvc builds only, > no change is made for all other cases. >=20 > Co-authored-by: softworkz > Signed-off-by: softworkz > Signed-off-by: Matt Oliver > --- > libx264: Set min build version to 158 > =20 > I'm submitting this patch on behalf of Matt with his permission. > =20 > There was agreement that the >=3D 158 version requirement should be > applied to MSVC builds only. > =20 > v2: restrict the version requirement to msvc builds > v3: fix unintended author change > v4: add missing braces > v5: fixed condition (again ;-) >=20 > Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstagi= ng-30%2Fsoftworkz%2Fsubmit_x264_api_imports_matt-v5 > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-= 30/softworkz/submit_x264_api_imports_matt-v5 > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/30 >=20 > Range-diff vs v4: >=20 > 1: 0d1bee35b0 ! 1: 8c4fe7ffc2 libx264: Set min build version to 158 > @@ configure: enabled libvpx && { > - require_cpp_condition libx264 x264.h = "X264_BUILD >=3D 118" && > - check_cpp_condition libx262 x264.h "X= 264_MPEG2" > +enabled libx264 && check_pkg_config libx264 x264 "stdint= =2Eh x264.h" x264_encoder_encode && > -+ { require_cpp_condition libx264 x264.= h "X264_BUILD >=3D 158" || > -+ { "$toolchain" !=3D msvc && require_c= pp_condition libx264 x264.h "X264_BUILD >=3D 118"; }; } > ++ require_cpp_condition libx264 x264.h = "X264_BUILD >=3D 118" && { > ++ "$toolchain" !=3D msvc || require_cpp= _condition libx264 x264.h "X264_BUILD >=3D 158"; } > enabled libx265 && require_pkg_config libx265 x265 x265.= h x265_api_get && > require_cpp_condition libx265 x265.h = "X265_BUILD >=3D 70" > enabled libxavs && require libxavs "stdint.h xavs.h" xav= s_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" >=20 >=20 > configure | 8 +++----- > libavcodec/libx264.c | 4 ---- > 2 files changed, 3 insertions(+), 9 deletions(-) >=20 > diff --git a/configure b/configure > index f115b21064..e46d362b04 100755 > --- a/configure > +++ b/configure > @@ -6656,11 +6656,9 @@ enabled libvpx && { > enabled libwebp && { > enabled libwebp_encoder && require_pkg_config libwebp "libwebp = >=3D 0.2.0" webp/encode.h WebPGetEncoderVersion > enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encode= r "libwebpmux >=3D 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } > -enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x= 264.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 >=3D 118" && > - check_cpp_condition libx262 x264.h "X264_MP= EG2" > +enabled libx264 && check_pkg_config libx264 x264 "stdint.h x26= 4.h" x264_encoder_encode && > + require_cpp_condition libx264 x264.h "X264_= BUILD >=3D 118" && { > + "$toolchain" !=3D msvc || require_cpp_condi= tion libx264 x264.h "X264_BUILD >=3D 158"; } > enabled libx265 && require_pkg_config libx265 x265 x265.h x265= _api_get && > require_cpp_condition libx265 x265.h "X265_= BUILD >=3D 70" > enabled libxavs && require libxavs "stdint.h xavs.h" xavs_enco= der_encode "-lxavs $pthreads_extralibs $libm_extralibs" =2E/configure: 6663: ./configure: : Permission denied ERROR: X264_BUILD >=3D 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 wil= l help solve the problem. [...] --=20 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 --Wo0oCZYLrer5S3Oe Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCYo9bdQAKCRBhHseHBAsP q53XAJ471OE7fdFNmHKmM4c/mzPJpwV4ZwCeOo8Nc1/6sWCCKs4Bo7lCLryPXMI= =vVFI -----END PGP SIGNATURE----- --Wo0oCZYLrer5S3Oe-- --===============8896651804814104492== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============8896651804814104492==--