From nobody Fri Mar 25 13:42:52 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 29ED31A2906F; Fri, 25 Mar 2022 13:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQ3FB28Vvz3KwV; Fri, 25 Mar 2022 13:42:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648215774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b23QnxcMS95xY+Afj9SY3yYulhjT1oqlisdLIOp0DfE=; b=Rf/iYY/L+ECIOcDmYbs0A8htUEvWvHipDwOtV9wIQ/hghF08NcjJWvnwyUZrR7GGV1xnil 9ia84YDRIgLniDDxJalTotA17oHGfbefmiB4WOXOzqe5u1ds3mAsN+HKY+KWeq8yvyl63l CsEdrt+rN1LbzM36qvrBoXaoP5LqKDEDEp5ua80VIoH7vZWTc27o5xRaWy0khxDnGCZZMj /nGKaszTPWSnG2XMrfKIYhPqQp7YaHqDQ7YK5gNK3KM4oYL0GxTAsfqYgg7/DlZyHgARP4 eb968j7z1EzQFUzikkkMHo32LygvAqFUfcY7ftqvuQXaggyOMNvo53w5N2Rj7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 60A5C5882; Fri, 25 Mar 2022 13:42:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22PDgqZ8018638; Fri, 25 Mar 2022 13:42:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDgq8X018637; Fri, 25 Mar 2022 13:42:52 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:42:52 GMT Message-Id: <202203251342.22PDgq8X018637@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 11d96fa01c90 - main - multimedia/libmediainfo: Fix aa49adc65a51fff6afe04b2e1b51dc86189af1d2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11d96fa01c90d0ebf49eb5a60e6a3e8c336d75ca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648215774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b23QnxcMS95xY+Afj9SY3yYulhjT1oqlisdLIOp0DfE=; b=sTjKCyXjCao1xANgUSUsQ6+YYVBGct65+HIz8VOtnOwUzt9pQ9HMnD+FnC2B856WG6w/et DVwvQda0LhtUuYUl5k5dRLYqkimN7XQZ7GFg7oaJ8D4tYNS8f0CScORezU3Ukl/HV8ZqXo QhzJGRvQtR3wR50AX2bEkD04/jHpeTRIsN2qf60RInJIlwdrZ9E9CcFenKskBv36aSQZtD /YZ/tbrDdbOge/nkU75efU1Zr6EQL9U4fkolXZv08coG3nxkZKXaqc2XpC42n62um/GkcD 4IP94YKZmGgihPsNiokWe2qfEvVkxGub0HFHPkKj2v+kfyg7ZQNaF63hjrO6YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648215774; a=rsa-sha256; cv=none; b=wSt+ECY4DnbuO2JaWCeWGNVM0Zjf9z3dFNkq1l4ilJUDBwQgW8FVYbMR5Md8Mu/StnGDIr MueOImlQS2as6yT7CQVDvanOi0HWQyiRm+atQ3kAsM7PyisdIZSMKK8xoqIn9pa/beFM2t uB8NK9khbxGYaaF6FldrcT8RDNNM70X/18MzGrl0GnGFwrRGwJVvrebc1AYWA3BcO3diGv EUtuVe6FAg4+dtOhgUvlnsqDqS8MTyGHPCQHM0CuJJYx+5G/rfWLPr6WeWvMQ9N9veIUd0 icrQYciIanaTYnMA5IQwzmhi6jA8ROKhcF7eKY+m8E5HdpPy8IttONwAw3ksLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=11d96fa01c90d0ebf49eb5a60e6a3e8c336d75ca commit 11d96fa01c90d0ebf49eb5a60e6a3e8c336d75ca Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 12:46:10 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:36:42 +0000 multimedia/libmediainfo: Fix aa49adc65a51fff6afe04b2e1b51dc86189af1d2 - Bump PORTREVISION for package change Tested with TINYXML2 option disabled. PR: 259190, 259853 --- multimedia/libmediainfo/Makefile | 4 +-- multimedia/libmediainfo/files/patch-Makefile.am | 22 ------------- multimedia/libmediainfo/files/patch-Makefile.in | 42 +++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index c5c69a9d7434..e51500e4abd5 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -1,8 +1,8 @@ -# Created by: Sunpoet Po-Chuan Hsieh +# Created by: Po-Chuan Hsieh PORTNAME= libmediainfo PORTVERSION= 21.09 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \ LOCAL/sunpoet diff --git a/multimedia/libmediainfo/files/patch-Makefile.am b/multimedia/libmediainfo/files/patch-Makefile.am deleted file mode 100644 index c61eb0546025..000000000000 --- a/multimedia/libmediainfo/files/patch-Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -Obtained from: https://github.com/MediaArea/MediaInfoLib/commit/e40d91326ab070f88d3e8d194268ce3cd9275028 - ---- Makefile.am.orig 2021-09-17 08:01:27 UTC -+++ Makefile.am -@@ -230,7 +230,8 @@ lib@MediaInfoLib_LibName@_la_SOURCES = \ - ../../../Source/MediaInfo/Video/File_Vp8.cpp \ - ../../../Source/MediaInfo/Video/File_Y4m.cpp \ - ../../../Source/MediaInfo/XmlUtils.cpp \ -- ../../../Source/MediaInfo/OutputHelpers.cpp -+ ../../../Source/MediaInfo/OutputHelpers.cpp \ -+ ../../../Source/ThirdParty/tfsxml/tfsxml.c - - @MediaInfoLib_LibName@includedir = $(includedir)/MediaInfo - @MediaInfoLib_LibName@include_HEADERS = \ -@@ -280,7 +281,6 @@ endif - - if COMPILE_TINYXML2 - lib@MediaInfoLib_LibName@_la_SOURCES += \ -- ../../../Source/ThirdParty/tfsxml/tfsxml.c \ - ../../../Source/ThirdParty/tinyxml2/tinyxml2.cpp - endif - diff --git a/multimedia/libmediainfo/files/patch-Makefile.in b/multimedia/libmediainfo/files/patch-Makefile.in new file mode 100644 index 000000000000..2727743b3aa4 --- /dev/null +++ b/multimedia/libmediainfo/files/patch-Makefile.in @@ -0,0 +1,42 @@ +Obtained from: https://github.com/MediaArea/MediaInfoLib/commit/e40d91326ab070f88d3e8d194268ce3cd9275028 (based on) + +--- Makefile.in.orig 2021-09-17 08:01:27 UTC ++++ Makefile.in +@@ -113,7 +113,6 @@ host_triplet = @host@ + @COMPILE_HMAC_TRUE@ ../../../Source/ThirdParty/hmac-gladman/hmac.c + + @COMPILE_TINYXML2_TRUE@am__append_7 = \ +-@COMPILE_TINYXML2_TRUE@ ../../../Source/ThirdParty/tfsxml/tfsxml.c \ + @COMPILE_TINYXML2_TRUE@ ../../../Source/ThirdParty/tinyxml2/tinyxml2.cpp + + subdir = . +@@ -416,8 +415,7 @@ am__dirstamp = $(am__leading_dot)dirstamp + @COMPILE_SHA1_TRUE@am__objects_4 = ../../../Source/ThirdParty/sha1-gladman/sha1.lo + @COMPILE_SHA2_TRUE@am__objects_5 = ../../../Source/ThirdParty/sha2-gladman/sha2.lo + @COMPILE_HMAC_TRUE@am__objects_6 = ../../../Source/ThirdParty/hmac-gladman/hmac.lo +-@COMPILE_TINYXML2_TRUE@am__objects_7 = ../../../Source/ThirdParty/tfsxml/tfsxml.lo \ +-@COMPILE_TINYXML2_TRUE@ ../../../Source/ThirdParty/tinyxml2/tinyxml2.lo ++@COMPILE_TINYXML2_TRUE@am__objects_7 = ../../../Source/ThirdParty/tinyxml2/tinyxml2.lo + am_lib@MediaInfoLib_LibName@_la_OBJECTS = \ + ../../../Source/MediaInfo/File__Analyze.lo \ + ../../../Source/MediaInfo/File__Analyze_Buffer.lo \ +@@ -647,7 +645,8 @@ am_lib@MediaInfoLib_LibName@_la_OBJECTS = \ + ../../../Source/MediaInfo/Video/File_Vp8.lo \ + ../../../Source/MediaInfo/Video/File_Y4m.lo \ + ../../../Source/MediaInfo/XmlUtils.lo \ +- ../../../Source/MediaInfo/OutputHelpers.lo $(am__objects_1) \ ++ ../../../Source/MediaInfo/OutputHelpers.lo \ ++ ../../../Source/ThirdParty/tfsxml/tfsxml.lo $(am__objects_1) \ + $(am__objects_2) $(am__objects_3) $(am__objects_4) \ + $(am__objects_5) $(am__objects_6) $(am__objects_7) + lib@MediaInfoLib_LibName@_la_OBJECTS = \ +@@ -1427,7 +1427,8 @@ lib@MediaInfoLib_LibName@_la_SOURCES = \ + ../../../Source/MediaInfo/Video/File_Vp8.cpp \ + ../../../Source/MediaInfo/Video/File_Y4m.cpp \ + ../../../Source/MediaInfo/XmlUtils.cpp \ +- ../../../Source/MediaInfo/OutputHelpers.cpp $(am__append_1) \ ++ ../../../Source/MediaInfo/OutputHelpers.cpp \ ++ ../../../Source/ThirdParty/tfsxml/tfsxml.c $(am__append_1) \ + $(am__append_2) $(am__append_3) $(am__append_4) \ + $(am__append_5) $(am__append_6) $(am__append_7) + @MediaInfoLib_LibName@includedir = $(includedir)/MediaInfo