From patchwork Sat May 6 21:59:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3597 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp247272vsd; Sat, 6 May 2017 14:59:39 -0700 (PDT) X-Received: by 10.223.168.120 with SMTP id l111mr33148514wrc.137.1494107979421; Sat, 06 May 2017 14:59:39 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l19si9883948wrb.169.2017.05.06.14.59.38; Sat, 06 May 2017 14:59:39 -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=@gmail.com; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A8BD680A59; Sun, 7 May 2017 00:59:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3BEDF68094E for ; Sun, 7 May 2017 00:59:23 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id y128so5487968qka.3 for ; Sat, 06 May 2017 14:59:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=H9iU+ZTE9ioYV/M7LGwpM5eztsxtFjXB1CQbMTjnh80=; b=oPziwWZkBmMDamwDoquA4up/WLq9anujcjt8o61HGpS1K28u6HSIg5Tu4flWnn5Ngz WDilENmAXiXKuGq3OU2mPWog37bTsJnr5qeEVp5a2S1EDKU6ptr3yaFsY8TgXx/wFIhn EPwU+95Mr8rC7ORXBC83zKGJZ7fF3vN80X71t0Qb1MVBJ7MM3UOytBho3kJmJfbAO+QH qnvEil6Hi2lwBoziG3sWW6lFHCmWvquEIVLxHyJoyfEcT/k85zt9Wt+ligO9iqM2KvbI lngk1gYIKi+ZcJwlTr0+Mf7rva6JalbMbxtEI+/XQGXFHCFUfe1E1wmPqukSYIhijSu4 A1fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=H9iU+ZTE9ioYV/M7LGwpM5eztsxtFjXB1CQbMTjnh80=; b=aK70TFbPaknHYev7jcnId7ooWCS++J7ef1bXyAZ1pl2UJTAU02BWNkmMGjXz2eBcPa /vGjdnKELpJe3Uc/sF1tSYFa38h+SPR1565cXykrZenMRbTD6bpHIA+421A+Ulh1jlEl iryEopSbbTjewDMXaYIMK2GnDjEwA+NSa3khRNXMDuZEB7TD3YKkuGqCf2f2GjdBEcfL LLC+EOAFVuyXeY6NycCeu08uwkbUH65zGETCLiCa2KktZxCXuh21yIPa7HxjANsMdv/j EROta9i4tM0k/wX3qFBc9O8ZvmgIDEirSC8boalGkBpGV5iQHjCZHViKcp1tQnh+PzDk O7/Q== X-Gm-Message-State: AODbwcBTKDoN/IG19zcINaWNZsu07OtrGChSQ1rEfc1m3Eb3PLutW5S0 Iujft0xQRcHDqu+J X-Received: by 10.55.74.215 with SMTP id x206mr18353025qka.57.1494107967358; Sat, 06 May 2017 14:59:27 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id z12sm6159249qka.28.2017.05.06.14.59.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 06 May 2017 14:59:26 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 May 2017 18:59:13 -0300 Message-Id: <20170506215913.7676-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 Subject: [FFmpeg-devel] [PATCH] build: remove --enable-raise-major configure option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It's not used by anything, has dubious usefulness, the reasons for which it was introduced are no longer valid, and only serves to add complexity to the build system. Signed-off-by: James Almer --- Makefile | 6 ------ configure | 2 -- ffbuild/library.mak | 2 +- ffbuild/libversion.sh | 2 -- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Makefile b/Makefile index d414cf841e..d177311262 100644 --- a/Makefile +++ b/Makefile @@ -107,12 +107,6 @@ $(1) := $(1)-yes := endef -ifdef CONFIG_RAISE_MAJOR -RAISE_MAJOR = 100 -else -RAISE_MAJOR = 0 -endif - define DOSUBDIR $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) SUBDIR := $(1)/ diff --git a/configure b/configure index b76f9ce567..e28f27a739 100755 --- a/configure +++ b/configure @@ -109,7 +109,6 @@ Configuration options: --enable-gray enable full grayscale support (slower color) --disable-swscale-alpha disable alpha channel support in swscale --disable-all disable building components, libraries and programs - --enable-raise-major increase major version numbers in sonames [no] Program options: --disable-programs do not build command line programs @@ -1686,7 +1685,6 @@ CONFIG_LIST=" neon_clobber_test ossfuzz pic - raise_major thumb valgrind_backtrace xmm_clobber_test diff --git a/ffbuild/library.mak b/ffbuild/library.mak index cfc2d36067..22f1e4c37f 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -34,7 +34,7 @@ $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR) - $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< $(RAISE_MAJOR) > $$@ + $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< > $$@ $(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h | $(SUBDIR) $$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)" diff --git a/ffbuild/libversion.sh b/ffbuild/libversion.sh index 687adf28bc..990ce9f640 100755 --- a/ffbuild/libversion.sh +++ b/ffbuild/libversion.sh @@ -5,10 +5,8 @@ toupper(){ name=lib$1 ucname=$(toupper ${name}) file=$2 -raise_major=$3 eval $(awk "/#define ${ucname}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file") -eval ${ucname}_VERSION_MAJOR=$((${ucname}_VERSION_MAJOR+${raise_major})) 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"