From patchwork Fri Nov 10 11:00:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7336 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4SRbTp1ylkz3x25 for ; Fri, 10 Nov 2023 11:01:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4SRbTn5JQDz2w9; Fri, 10 Nov 2023 11:01:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4SRbTn3Fmzz33gG; Fri, 10 Nov 2023 11:01:01 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4SRbTl1p56z2yXc for ; Fri, 10 Nov 2023 11:00:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4SRbTl0LG8zkF; Fri, 10 Nov 2023 11:00:59 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1699614059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iipab2HTIHjBzoHHA4mABhTkhz+g6HQCW/Ih0ucp3bE=; b=7UThNGga0qUhbvTIIwCKCP1NhCmkSUSM5RvAcLLMstx8U4g6O/+tBy8oTOI58DhgOIV13e CJdKuVNZ6PIb26Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1699614059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iipab2HTIHjBzoHHA4mABhTkhz+g6HQCW/Ih0ucp3bE=; b=K45/rBVlEgp2smolpRrpYTgxHWMxjcf1yS0/Kcmuphc40uyDK3aJi9o5pONnFuuHI3q5uh dlCZsLNuyMwgr8Gs5nGKCQ13bwUEqr+ua5U6KFge2PTMgvZ7M12dCr5HjifCJwGMsN8AeZ KMh2GuGXSfrQbhu8baiBNkx4MX8Az2HnzOVZnm2OlLxT0j053oywMUq0ARp0RQt7cxSu3I E44lj0AUtO9aGsq/zndWzAkIVw6uJIzZG7ld5K9F/sZaUWS+2A8TgaiDR/YaML9I6Q8olO zgOFrR8H1my87yRCcPKJAvYDfQl0y/U7tj02c+teRyIQOV3coVfUj3rfLRHMIw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] ffmpeg: Fix build problem from updated texinfo Date: Fri, 10 Nov 2023 12:00:53 +0100 Message-ID: <20231110110053.11300-2-adolf.belka@ipfire.org> In-Reply-To: <20231110110053.11300-1-adolf.belka@ipfire.org> References: <20231110110053.11300-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: EZRX4DN74D4QJCDPUILDAQN3O54FLRJG X-Message-ID-Hash: EZRX4DN74D4QJCDPUILDAQN3O54FLRJG X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - With the 7.1 version of texinfo function names have changed which caused ffmpeg to fail to build. There were some unofficial patches to fix ffmpeg to work with the new texinfo but the simplest solution was to stop the docs being built in the configure command. Signed-off-by: Adolf Belka --- config/rootfiles/packages/ffmpeg | 56 -------------------------------- lfs/ffmpeg | 5 +-- 2 files changed, 3 insertions(+), 58 deletions(-) diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index 89c48bc0a..31097eaac 100644 --- a/config/rootfiles/packages/ffmpeg +++ b/config/rootfiles/packages/ffmpeg @@ -179,40 +179,6 @@ usr/lib/libswscale.so.7.1.100 #usr/lib/pkgconfig/libpostproc.pc #usr/lib/pkgconfig/libswresample.pc #usr/lib/pkgconfig/libswscale.pc -#usr/share/doc/ffmpeg -#usr/share/doc/ffmpeg/bootstrap.min.css -#usr/share/doc/ffmpeg/default.css -#usr/share/doc/ffmpeg/developer.html -#usr/share/doc/ffmpeg/faq.html -#usr/share/doc/ffmpeg/fate.html -#usr/share/doc/ffmpeg/ffmpeg-all.html -#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html -#usr/share/doc/ffmpeg/ffmpeg-codecs.html -#usr/share/doc/ffmpeg/ffmpeg-devices.html -#usr/share/doc/ffmpeg/ffmpeg-filters.html -#usr/share/doc/ffmpeg/ffmpeg-formats.html -#usr/share/doc/ffmpeg/ffmpeg-protocols.html -#usr/share/doc/ffmpeg/ffmpeg-resampler.html -#usr/share/doc/ffmpeg/ffmpeg-scaler.html -#usr/share/doc/ffmpeg/ffmpeg-utils.html -#usr/share/doc/ffmpeg/ffmpeg.html -#usr/share/doc/ffmpeg/ffplay-all.html -#usr/share/doc/ffmpeg/ffplay.html -#usr/share/doc/ffmpeg/ffprobe-all.html -#usr/share/doc/ffmpeg/ffprobe.html -#usr/share/doc/ffmpeg/general.html -#usr/share/doc/ffmpeg/git-howto.html -#usr/share/doc/ffmpeg/libavcodec.html -#usr/share/doc/ffmpeg/libavdevice.html -#usr/share/doc/ffmpeg/libavfilter.html -#usr/share/doc/ffmpeg/libavformat.html -#usr/share/doc/ffmpeg/libavutil.html -#usr/share/doc/ffmpeg/libswresample.html -#usr/share/doc/ffmpeg/libswscale.html -#usr/share/doc/ffmpeg/mailing-list-faq.html -#usr/share/doc/ffmpeg/nut.html -#usr/share/doc/ffmpeg/platform.html -#usr/share/doc/ffmpeg/style.min.css #usr/share/ffmpeg #usr/share/ffmpeg/examples #usr/share/ffmpeg/examples/Makefile @@ -247,25 +213,3 @@ usr/lib/libswscale.so.7.1.100 #usr/share/ffmpeg/libvpx-360p.ffpreset #usr/share/ffmpeg/libvpx-720p.ffpreset #usr/share/ffmpeg/libvpx-720p50_60.ffpreset -#usr/share/man/man1/ffmpeg-all.1 -#usr/share/man/man1/ffmpeg-bitstream-filters.1 -#usr/share/man/man1/ffmpeg-codecs.1 -#usr/share/man/man1/ffmpeg-devices.1 -#usr/share/man/man1/ffmpeg-filters.1 -#usr/share/man/man1/ffmpeg-formats.1 -#usr/share/man/man1/ffmpeg-protocols.1 -#usr/share/man/man1/ffmpeg-resampler.1 -#usr/share/man/man1/ffmpeg-scaler.1 -#usr/share/man/man1/ffmpeg-utils.1 -#usr/share/man/man1/ffmpeg.1 -#usr/share/man/man1/ffplay-all.1 -#usr/share/man/man1/ffplay.1 -#usr/share/man/man1/ffprobe-all.1 -#usr/share/man/man1/ffprobe.1 -#usr/share/man/man3/libavcodec.3 -#usr/share/man/man3/libavdevice.3 -#usr/share/man/man3/libavfilter.3 -#usr/share/man/man3/libavformat.3 -#usr/share/man/man3/libavutil.3 -#usr/share/man/man3/libswresample.3 -#usr/share/man/man3/libswscale.3 diff --git a/lfs/ffmpeg b/lfs/ffmpeg index 836c4dd37..0118f75f2 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 15 +PAK_VER = 16 DEPS = sdl2 lame libvorbis xvid @@ -95,7 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-static \ --enable-gpl \ --enable-version3 \ - --enable-avfilter + --enable-avfilter \ + --disable-doc cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install