From patchwork Sun Aug 7 15:12:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 37173 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1341866pzg; Sun, 7 Aug 2022 08:13:08 -0700 (PDT) X-Google-Smtp-Source: AA6agR7KpPvP4mlsJo8YUHgoL7jRw3rw7grUQ/PKq47DJqaSG1v0BzCle8YSlmUb7CaMGtvN4Fvm X-Received: by 2002:a17:906:9c82:b0:6df:c5f0:d456 with SMTP id fj2-20020a1709069c8200b006dfc5f0d456mr11228932ejc.287.1659885188641; Sun, 07 Aug 2022 08:13:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659885188; cv=none; d=google.com; s=arc-20160816; b=AestSqlTIY9gSG/BRQ8cS/d5th17Y0o+TpFw+9UGeHLEblgtUpO/3TRueEkJ9vfrhJ OhZfzeaddCVwK+IpmuXnNWoUngGIhgJD1NY2M8MDdXFmRDxQv2bcfarhw26pXoo3lKWs 20LwH3x0w35PdatgBjzNAlXPYlyLLQmsdupPUpNBWnP7tLPW+rUMMAneI1+4V6hP2U+h 2ODR04pK7M5N+Y08O/NzQLKdAhs8dtGUTUzGXjrTEDNI9HJCz+ckeaLCVtg01hvba8/l mp5R41xvNMpLhlDo1u5DhIrNXj3npAEcQN3u7NMVDlAcZIn4lnT2QQvVguIhvuQ5Pf6e H7VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=fXUd9sLb1dwZVheP85SLBDgYWzMK1opW8OtAy7KCCC4=; b=NL4RzLLuAQoJ9gTHBnTpCipuyi+M8xluKJ0mhMF80MX2Cv/ljfulqgxjehg1v1nEoB +fJ+bhd3tH5iYjjTiHrPZTwRefTVNoFs7CPkXgxzmntUFMhjhnHlDz8jgi2NEvmaxsCb Wn4SVj2U8qvfEa8YrrV/Uq0odd8iMPGv2216XMTePuiUTT9A9LIdOo2jP9UWTqGcOQx4 GEZJZijgs+MXOhMvvzbYL8cw+zueqxkPwNULGpZhiRYoZPh1+di0Gzt0ROMmMNOm9qg2 HkeLze8ZcgzDhsRUJVLZe+pnvjq8T76PAJB+Z0ZZ5Nn2PQJfIG+jMIpCkNg57KxbIbxU PaBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=Na1ddM1b; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dn22-20020a17090794d600b007303cde561csi7274999ejc.947.2022.08.07.08.13.07; Sun, 07 Aug 2022 08:13:08 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=Na1ddM1b; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CF99E68B680; Sun, 7 Aug 2022 18:13:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [136.243.74.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C663268B56D for ; Sun, 7 Aug 2022 18:12:57 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id 411D92DDA19; Sun, 7 Aug 2022 17:12:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1659885177; bh=Tx9KKOPDKisDc/X/SqUSuxMTr0pMmigXn57iuYhGN+s=; h=From:To:Cc:Subject:Date; b=Na1ddM1bWePEhSbQvsH95DVJrXMxWKi8PvpJafMQY+VQAmKwre7VwQ3RYeAeeU293 6ayk+7L/vyCX88jopUq/si8ilGkgngBmhbYUEwMIUuhOrr6vR5Mn798ZtMkZ1NDzmg HDIg2N3jIBz0w+KZA3ZZb/P04T7vCnGu272BZpJjSlQ4hP/tFZSym9mq6xbxoNI397 xxT/PZ8XRnOkUlokTqYITWwMzs0gM0BlVlltoVXSvO83uYmMSCK+MZu5wNs1ipYfTA UkfLixzmMGcBtSYGSNVztC4c6qen2GD67FZo03wsLcGG5JfKjaIm9+KpVGHPYAmjNC Tg/lndPKcE3bA== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Aug 2022 17:12:46 +0200 Message-Id: <20220807151248.15182-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] configure: always enable gnu_windres if available 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 Cc: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FXVoCu+qcJQx Use the appropiate Makefile variable to ensure it's only built into shared libraries instead. --- configure | 4 ++-- libavdevice/Makefile | 2 +- libavfilter/Makefile | 2 +- libavformat/Makefile | 2 +- libavutil/Makefile | 2 +- libpostproc/Makefile | 2 +- libswresample/Makefile | 2 +- libswscale/Makefile | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index cbbb4dd9c8..09fbe66e9b 100755 --- a/configure +++ b/configure @@ -5569,7 +5569,7 @@ case $target_os in # Cannot build both shared and static libs when using dllimport. disable static fi - enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres + ! enabled small && test_cmd $windres --version && enable gnu_windres enabled x86_32 && check_ldflags -Wl,--large-address-aware shlibdir_default="$bindir_default" SLIBPREF="" @@ -5648,7 +5648,7 @@ case $target_os in SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a' enabled x86_64 && objformat="win64" || objformat="win32" enable dos_paths - enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres + ! enabled small && test_cmd $windres --version && enable gnu_windres add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 ;; *-dos|freedos|opendos) diff --git a/libavdevice/Makefile b/libavdevice/Makefile index bbe2f69dcc..8a62822b69 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -59,7 +59,7 @@ OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o SHLIBOBJS-$(CONFIG_DECKLINK_INDEV) += reverse.o # Windows resource file -SLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o +SHLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o SKIPHEADERS += decklink_common.h SKIPHEADERS-$(CONFIG_DECKLINK) += decklink_enc.h decklink_dec.h \ diff --git a/libavfilter/Makefile b/libavfilter/Makefile index c026f8f809..3187f99a50 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -605,7 +605,7 @@ OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o SHLIBOBJS += log2_tab.o # Windows resource file -SLIBOBJS-$(HAVE_GNU_WINDRES) += avfilterres.o +SHLIBOBJS-$(HAVE_GNU_WINDRES) += avfilterres.o SKIPHEADERS-$(CONFIG_LCMS2) += fflcms2.h SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h diff --git a/libavformat/Makefile b/libavformat/Makefile index e420384355..f67a99f839 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -714,7 +714,7 @@ SHLIBOBJS-$(CONFIG_SPDIF_MUXER) += dca_sample_rate_tab.o OBJS-$(CONFIG_IEC61883_INDEV) += dv.o # Windows resource file -SLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o +SHLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o SKIPHEADERS-$(CONFIG_IMF_DEMUXER) += imf.h SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h diff --git a/libavutil/Makefile b/libavutil/Makefile index 9435a0bfb0..3d9c07aea8 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -201,7 +201,7 @@ OBJS-$(!CONFIG_VULKAN) += hwcontext_stub.o OBJS += $(COMPAT_OBJS:%=../compat/%) # Windows resource file -SLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o +SHLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o SKIPHEADERS += objc.h SKIPHEADERS-$(HAVE_CUDA_H) += hwcontext_cuda.h diff --git a/libpostproc/Makefile b/libpostproc/Makefile index d3f3b27f35..77c2b6b016 100644 --- a/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -10,4 +10,4 @@ OBJS = postprocess.o \ version.o \ # Windows resource file -SLIBOBJS-$(HAVE_GNU_WINDRES) += postprocres.o +SHLIBOBJS-$(HAVE_GNU_WINDRES) += postprocres.o diff --git a/libswresample/Makefile b/libswresample/Makefile index dc80027c35..8b9a0fe6f5 100644 --- a/libswresample/Makefile +++ b/libswresample/Makefile @@ -22,6 +22,6 @@ OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o SHLIBOBJS += log2_tab.o # Windows resource file -SLIBOBJS-$(HAVE_GNU_WINDRES) += swresampleres.o +SHLIBOBJS-$(HAVE_GNU_WINDRES) += swresampleres.o TESTPROGS = swresample diff --git a/libswscale/Makefile b/libswscale/Makefile index 8e95f74c6b..4c950e6c43 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -25,7 +25,7 @@ OBJS = alphablend.o \ SHLIBOBJS += log2_tab.o # Windows resource file -SLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o +SHLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o TESTPROGS = colorspace \ floatimg_cmp \