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 EDD8442A6C for ; Sat, 11 Jun 2022 12:20:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4512F68B5F2; Sat, 11 Jun 2022 15:20:16 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA32A6800C7 for ; Sat, 11 Jun 2022 15:20:08 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id E06B6E6DEE for ; Sat, 11 Jun 2022 14:20:08 +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 8qLs1rK0z-IT for ; Sat, 11 Jun 2022 14:20:06 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id A66EFE30F2 for ; Sat, 11 Jun 2022 14:20:06 +0200 (CEST) Date: Sat, 11 Jun 2022 14:20:06 +0200 (CEST) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: Message-ID: References: MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v7] 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Thu, 9 Jun 2022, 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 min version requirement of 158 is applied for msvc builds only. > > This is also removing the check for 'libx264 without pkg-config' > which was left for compatibility reasons about 7 years ago when > the pkg-config check was introduced by commit > e06263ef1e0e172b2c76070b3dc739411af08e82. > > Co-authored-by: softworkz > Signed-off-by: softworkz > Signed-off-by: Matt Oliver Thanks, applied. Regards, Marton > --- > 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 > v5: fixed condition (again ;-) > v6: hope I got it now.. > v7: add comment about dropping non-pkg-conf check, re-add libx262 check > > Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-30%2Fsoftworkz%2Fsubmit_x264_api_imports_matt-v7 > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-30/softworkz/submit_x264_api_imports_matt-v7 > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/30 > > Range-diff vs v6: > > 1: 47843fb51e ! 1: 3baec48834 libx264: Set min build version to 158 > @@ Commit message > 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. > + The min version requirement of 158 is applied for msvc builds only. > + > + This is also removing the check for 'libx264 without pkg-config' > + which was left for compatibility reasons about 7 years ago when > + the pkg-config check was introduced by commit > + e06263ef1e0e172b2c76070b3dc739411af08e82. > > Co-authored-by: softworkz > Signed-off-by: softworkz > @@ configure: enabled libvpx && { > - { 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 >= 118" && { > + [ "$toolchain" != "msvc" ] || > -+ require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } > ++ require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } && > + check_cpp_condition libx262 x264.h "X264_MPEG2" > 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" > > ## libavcodec/libx264.c ## > @@ > > > configure | 8 ++++---- > libavcodec/libx264.c | 4 ---- > 2 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/configure b/configure > index 5a167613a4..3dca1c4bd3 100755 > --- a/configure > +++ b/configure > @@ -6658,10 +6658,10 @@ 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" && > +enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && > + require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && { > + [ "$toolchain" != "msvc" ] || > + require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } && > check_cpp_condition libx262 x264.h "X264_MPEG2" > enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && > require_cpp_condition libx265 x265.h "X265_BUILD >= 70" > diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c > index 4ce3791ae8..14177b3016 100644 > --- a/libavcodec/libx264.c > +++ b/libavcodec/libx264.c > @@ -37,10 +37,6 @@ > #include "atsc_a53.h" > #include "sei.h" > > -#if defined(_MSC_VER) > -#define X264_API_IMPORTS 1 > -#endif > - > #include > #include > #include > > base-commit: 5d5a01419928d0c00bae54f730eede150cd5b268 > -- > 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".