From patchwork Wed Mar 16 17:44:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 34797 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp222425nkb; Wed, 16 Mar 2022 10:44:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZVEBD8WB/FUsljNt5XuUGPWCAtYwLiMrUGHb22ax4Dv/OtzqwwJCqXsAYkLzSYZgMkd0T X-Received: by 2002:a17:907:e89:b0:6db:af1f:5e22 with SMTP id ho9-20020a1709070e8900b006dbaf1f5e22mr879810ejc.649.1647452677555; Wed, 16 Mar 2022 10:44:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647452677; cv=none; d=google.com; s=arc-20160816; b=cCdzcmLPqg51ycEMD5en3i7kZUVxYJIKMOYfxe7zhy8Q8rHyKrONmABqFUPjGisg55 gJuhR47+A2ltgEu+9pKY0mQ5wwq8BTWMz0bziaFownKClIXf9QkXIIXhF270yl7XclPF 3O7mVRB2/pYp2g6dXWiXxCR4XK9osMCG/FALqlLIIBjkCKyMqIo8x9MgOuXBeYtQTfWB Ec3yJANkywfp7skz54IpqOhbgAKHAaJkA0TAXeMStX6PXd9Ea/+G/keXakAcydSB34f6 DcJMSHD5BpqV5WvDj3Fm4J8dYjnutH3+78WPPQVb9myvsxic7jUs9Xou0ELmsnGD+6Z+ OP3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=afcMXDbyU5I9Xknf9Q/7fq8GJJuxdlvkhiQOacFPXak=; b=egftGpDojp73EL9YHDQXME4x1/PhG7RWAWQ7dQ8iiKqbYeJfLr6vnnaLj12DL1oLom oUIkmlZtKWuMM0SWgVBpLYiBrNIYfXy8V/SLMsH3YsZK/ETyQNn2D68PyUsk32tScG6g P9/15U9A1HXd4BWdlmu9TKNon05JcGz0Nd3zIR41aBRhpkZs65oyTzm5QvyWtyrJweI2 K/rABo96RXV3mfWoJJ3Q5FQlFaYsukqbKIXJHTfHmAS4sS5ruzX19CNnk2S4BlMNe2TX jop0WdGj6/UxXJdrTOGKyI9/mSKldGqaL1M1T+vYA5yvzyL2LoF2oAgpdKYA50PWmLgc k5OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=VH+w5ZUL; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id er27-20020a056402449b00b0041622779c54si1553519edb.624.2022.03.16.10.44.36; Wed, 16 Mar 2022 10:44:37 -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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=VH+w5ZUL; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 265BC68AEAE; Wed, 16 Mar 2022 19:44:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F8DA68A2FB for ; Wed, 16 Mar 2022 19:44:26 +0200 (EET) Received: by mail-lj1-f170.google.com with SMTP id z26so4097298lji.8 for ; Wed, 16 Mar 2022 10:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TX6XiGIc0h5YqV4c4TurrZZnr/Lbg96tVXu187LL5SE=; b=VH+w5ZULEOKWAX2DrrComic+ZKzz0dSim1e49zi6aucOiO/vUYs1JAJhDUzhpR5NgU 30YfsF+VX1P2WkyEtluczyuQXLM+X0k/C+3MWdpKO4bfavo11A+IFSJD58HoZ55/dUu1 Ht+cyC1+b42HKGbgs1i9IBCzuQDtGv8DLPCKGBbZuRrA8ZmnZ3QPHLVRZoQU/E30WTKw AN5+W4c0U0X4sE9X+CIlHJ11tt0uuA2d209TPaTEWv6nWpr9Mf9S2+QtcnnMY8jzi/vu YvRQ/rvENbxkrAovOWA1fZrQpUyhjcS7GQGC68gslG2MtkWzZcDC0af3LSzrUEeOgmXZ TDfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TX6XiGIc0h5YqV4c4TurrZZnr/Lbg96tVXu187LL5SE=; b=1kLAIQ8cfFCZ0sQJ862QcNILmoWjTR51Y5TX10L/HK0kwmSG5jHz43n4rluVqh4Qti WUJpuz8GPJdL2ZC0DZAmPCsg2UD/HWlQxHaiW1dak6bV5elsVqaw1fUfXU0R5RGFxfXm pya7+5r6mVB0g/aYWpvySzQvTJtKtlw/2YOHIE1NsqEL3l3a78zuIO5QoWDud/8AdMgD JQ5cHkLenbA2lMstnJmqRMxtgbJABpwPZ7XP++b+cYgtvOeddPOXCNvDuuB9YG594al9 jXBMdDkcaJBuZ4xbqFgY32iwwAltjZhqbDGP3tuHkFRzADA40kxJtJzEqVjE7i7No/BK 7CtQ== X-Gm-Message-State: AOAM5321CMtvphzni6I4CgSXAm9FcY+9cFJsyLIhznU0tyLClzOYhMfp XEJJYPHqLy6eUFNuB/hjBzFiz8RKpYCRDAv1 X-Received: by 2002:a2e:96c4:0:b0:249:30d1:77a1 with SMTP id d4-20020a2e96c4000000b0024930d177a1mr478365ljj.264.1647452665744; Wed, 16 Mar 2022 10:44:25 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id o11-20020ac2434b000000b004481eafa257sm229608lfl.285.2022.03.16.10.44.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Mar 2022 10:44:25 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Mar 2022 19:44:24 +0200 Message-Id: <20220316174424.2167137-1-martin@martin.st> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Fix libversion.sh for split headers 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HGRwXc1HU3/H --- The extra dummy version_major.h isn't pretty though, but needed (I think?) to fulfill the make dependency. --- ffbuild/library.mak | 4 ++-- ffbuild/libversion.sh | 4 ++++ libavutil/version_major.h | 25 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 libavutil/version_major.h diff --git a/ffbuild/library.mak b/ffbuild/library.mak index ad09f20da9..793e9d41fa 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -52,8 +52,8 @@ $(LIBOBJS): CPPFLAGS += -DBUILDING_$(NAME) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(EXTRALIBS-$$(*F)) $$(ELIBS) -$(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR) - $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< > $$@ +$(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h $(SUBDIR)version_major.h | $(SUBDIR) + $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$^ > $$@ $(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h ffbuild/config.sh | $(SUBDIR) $$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)" diff --git a/ffbuild/libversion.sh b/ffbuild/libversion.sh index 990ce9f640..a94ab58057 100755 --- a/ffbuild/libversion.sh +++ b/ffbuild/libversion.sh @@ -5,8 +5,12 @@ toupper(){ name=lib$1 ucname=$(toupper ${name}) file=$2 +file2=$3 eval $(awk "/#define ${ucname}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file") +if [ -f "$file2" ]; then + eval $(awk "/#define ${ucname}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file2") +fi eval ${ucname}_VERSION=\$${ucname}_VERSION_MAJOR.\$${ucname}_VERSION_MINOR.\$${ucname}_VERSION_MICRO eval echo "${name}_VERSION=\$${ucname}_VERSION" eval echo "${name}_VERSION_MAJOR=\$${ucname}_VERSION_MAJOR" diff --git a/libavutil/version_major.h b/libavutil/version_major.h new file mode 100644 index 0000000000..7b89e20031 --- /dev/null +++ b/libavutil/version_major.h @@ -0,0 +1,25 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_VERSION_MAJOR_H +#define AVUTIL_VERSION_MAJOR_H + +/* This file is intentionally empty; it's only kept to fulfill dependencies + * for ffbuild/libversion.sh. It is not installed. */ + +#endif /* AVUTIL_VERSION_MAJOR_H */