From nobody Mon Mar 13 10:03:31 2023 X-Original-To: dev-commits-ports-all@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 4PZsg74N1Dz3xTpH; Mon, 13 Mar 2023 10:03:31 +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 4PZsg73rSqz3KQy; Mon, 13 Mar 2023 10:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678701811; 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=syDyiH5o2san72noMWWJUVXfOkuHGUf+aAKmSwww020=; b=NUzo98rV6Nb1u3n5oesLCbeiZCBtIymvHNZNG5EztXdGNn8vaFb/4RCnYWIk5ycxJMavf+ dORLKRY6UfHQWUwaTC0o5e0fJTTd7+MS1kOCf9QTi5BZvbf6U7lHf4YgCqS9dCRkJ0r23J 37RP7tu93Pz54DNgFTTWVF+m/9oGE7Ql3oX3AB+jvXpJA8Qbrh2CzlzhKQ1XuJoAaqwtzG WAsLfAbV1zNPEhcunh+oLL1WCeptFwfu1zs79dhNtZK6exG/eHJmZ4AlzSSINXsGHIs8iE FoBJS8fHk5Blvt+gvZkCzozpwj0Lp6jKeBuPiRfL+uhR62npajL0sWujht3qKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678701811; 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=syDyiH5o2san72noMWWJUVXfOkuHGUf+aAKmSwww020=; b=ZRq7rOC9Ea7c1KpHqGyJeCagNI5Dg/6rpqlqOPuW16tRSjJC90LnXnZcnKwbXV9t8gHJ+c DN5EV2KeDPub9xHavHFFCPsVJUwqVvT/7IoFFFMm22+acuHrFXhyVvn6wc1SPuHBZ+8EcA aSGXSCId25h19+h5G9n5ABthEnNYFtVx/pL5pD/7Sp+mZt+Zj6ATlrtGPLKICH2X0qsNNc FK5iigr6bRRslYRJTKo+lcJ+E9plB3hbM+soBekAiL2z/xagmVWc0GdFuLiD0JCrGIPWBy ACOMOkzSimUvSaxfxSV8P4nI3tsAxkVpXe059MmY3b9GJMOGxGIbrYgKfpZNZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678701811; a=rsa-sha256; cv=none; b=qz3lB35Ant4Z+Wo05boiqqohpUQRxxS0EWXWvA7DSqBm9eOSrx9QYipWzi2dJgkeRSgVwm OXWW+wjxt6ju67zuh6GLFxlvP7n5Vs5dbxOjMHNJuF+CdIpiSjMKM7gzLRmCSI815M6pl6 auvyl8MnC6F34mSuLkyIoiVvaKNe4lzHglsvUMh4Wd4CpXepYvDQmt8EEzEOS3DL0Ek8Km dRb1hXC9ewcGp0/WmnscJ5BiZjgKq8XBWxYptYbIL3raCSyj/EYCmjREvi4Rv/EX9P7lgY eWWYlgTxWuTvwI6MWlI9xc1cyYJsBqAS/kA5o1nFLbIqigSJG+43pz1iaw2Jag== 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 4PZsg72vW5zpMs; Mon, 13 Mar 2023 10:03:31 +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 32DA3VKq064910; Mon, 13 Mar 2023 10:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DA3V59064909; Mon, 13 Mar 2023 10:03:31 GMT (envelope-from git) Date: Mon, 13 Mar 2023 10:03:31 GMT Message-Id: <202303131003.32DA3V59064909@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 0194336dea50 - main - multimedia/libmediainfo: Revert to previous commit List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0194336dea50b97cf44e51f1991abf785be34caa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0194336dea50b97cf44e51f1991abf785be34caa commit 0194336dea50b97cf44e51f1991abf785be34caa Author: Daniel Engberg AuthorDate: 2023-03-13 07:50:57 +0000 Commit: Daniel Engberg CommitDate: 2023-03-13 10:02:54 +0000 multimedia/libmediainfo: Revert to previous commit Last commit by maintainer broke users of mediainfo, revert related libraries prior to this change This retains changes to WWW and pkg-descr and removal of CXXFLAGS PR: 268709, 269601 Reported by: Michiel van Baak Jansen Approved by: portmgr (blanket, maintainer timeout: 3+ weeks) Fixes: 93d0a11 --- multimedia/libmediainfo/Makefile | 31 +++++++++++++++++-------------- multimedia/libmediainfo/distinfo | 6 +++--- multimedia/libmediainfo/pkg-plist | 9 +++++++-- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index d22b8f5ac548..be1609a67db2 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -1,10 +1,10 @@ PORTNAME= libmediainfo -PORTVERSION= 22.12 -PORTREVISION= 1 +DISTVERSION= 22.12 +PORTREVISION= 2 CATEGORIES= multimedia -MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \ +MASTER_SITES= https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/ \ LOCAL/sunpoet -DISTNAME= MediaInfo_CLI_${PORTVERSION}_GNU_FromSource +DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= MediaInfo library @@ -12,25 +12,28 @@ WWW= https://mediaarea.net/en/MediaInfo \ https://github.com/MediaArea/MediaInfoLib LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/../../../License.html +LICENSE_FILE= ${WRKSRC}/../../License.html LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2 \ libzen.so:multimedia/libzen -USES= compiler:c++11-lang dos2unix libtool localbase pathfix pkgconfig tar:xz - -CONFIGURE_ARGS= --enable-shared --enable-static --disable-dll -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -PATHFIX_MAKEFILEIN+= configure +USES= cmake compiler:c++11-lang dos2unix localbase:ldflags pathfix \ + pkgconfig tar:xz USE_LDCONFIG= yes +DOS2UNIX_GLOB= *.c *.cmake.in *.cpp *.h *.pc.in *.txt +DOS2UNIX_WRKSRC= ${WRKDIR} + +WRKSRC= ${WRKDIR}/MediaInfoLib/Project/CMake +PLIST_SUB= DISTVERSION=${DISTVERSION:S|.||g} -WRKSRC= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library +CMAKE_ON= BUILD_SHARED_LIBS OPTIONS_DEFINE= CURL -OPTIONS_DEFAULT=CURL -CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} +CURL_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_CURL:BOOL=True CURL_LIB_DEPENDS= libcurl.so:ftp/curl +post-patch: + @${REINPLACE_CMD} -e '/^Libs_Static/d' ${PATCH_WRKSRC}/libmediainfo.pc.in + .include diff --git a/multimedia/libmediainfo/distinfo b/multimedia/libmediainfo/distinfo index 4c7db7e82382..ccc980a5614e 100644 --- a/multimedia/libmediainfo/distinfo +++ b/multimedia/libmediainfo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674589520 -SHA256 (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = e67ce7419ec6af9fb54ffbe3164a42ae1cd874a7e559bfff017868cef1106947 -SIZE (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = 3352944 +TIMESTAMP = 1678696235 +SHA256 (libmediainfo_22.12.tar.xz) = 0fc6d32f06d6ce5e144074d2e57e0db8dfa4e38e752d3123ada27ccaf89634bc +SIZE (libmediainfo_22.12.tar.xz) = 1893340 diff --git a/multimedia/libmediainfo/pkg-plist b/multimedia/libmediainfo/pkg-plist index df45a20c7f0e..2aa1b99b2181 100644 --- a/multimedia/libmediainfo/pkg-plist +++ b/multimedia/libmediainfo/pkg-plist @@ -2,8 +2,13 @@ include/MediaInfo/MediaInfo.h include/MediaInfo/MediaInfoList.h include/MediaInfo/MediaInfo_Const.h include/MediaInfo/MediaInfo_Events.h -lib/libmediainfo.a +include/MediaInfoDLL/MediaInfoDLL.h +include/MediaInfoDLL/MediaInfoDLL_Static.h +lib/cmake/mediainfolib/MediaInfoLibConfig.cmake +lib/cmake/mediainfolib/MediaInfoLibConfigVersion.cmake +lib/cmake/mediainfolib/MediaInfoLibTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/mediainfolib/MediaInfoLibTargets.cmake lib/libmediainfo.so lib/libmediainfo.so.0 -lib/libmediainfo.so.0.0.0 +lib/libmediainfo.so.0.%%DISTVERSION%%.0 libdata/pkgconfig/libmediainfo.pc