From nobody Tue Mar 21 19:24:57 2023 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 4Ph1lG0mcxz40gyv; Tue, 21 Mar 2023 19:24:58 +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 4Ph1lG0Lpfz4Gqt; Tue, 21 Mar 2023 19:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679426698; 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=xGyf+Zz0YqqKVcPTRaam2Xe3XdAvClXgI9mYcr+8wug=; b=B0dXkXWqgKzl3Iv5SmKvmI0AZJbcUf4NfIOMoSIkKRFPCutBhKM2bq2DMFYNJCrk4tG1UJ e+3EFign4Z2TwI40pJAKtkYCrsVZQoknm0qTys00t42IA/6FJEteZPpG3t4NsppkCihorS JixhOx4fYWxTEPcwYDgVS3BFcIOzK9m+F485CE+U69/9JLrBNNQVMcZ1cKd1+Qdn7DhpWY Tl4llyhzyPMf+Vryyaz+ZDb2gVXpdbN8kv9d1SF7k5wAbMEwJ/8nBSVVQg9sXZskMLWLLg fKe8b/PDu97jh70iFfdA1H06sX875FNz7B0AUwvYGzXimb1CEk9KEyjJsoV+mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679426698; 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=xGyf+Zz0YqqKVcPTRaam2Xe3XdAvClXgI9mYcr+8wug=; b=u41IbBOzEMM2suZ7E8qIQfJsRg0YlukVV5tn954wf1aVAHRtCuXCjBhVhqBhtsWI/CujOL g8/L72eDqN26QrsKmeMZZ8DfAoRr8A2A1E2TUFYEFsufxPyrGDS+gx/SFt0S6tap/GtaIN QsX0kJDDrAs14LE5uDHIzdPQ35vBKbgbztxPKKuZ1brCQ7E2+w2vip+mqK8AlTbdlnRery xJuS9Sxp1uUQn/WdfwvbCkhWUyGKknNCRi5A3WEgPBvoDhL0ED06GXoWhL97PmfExiT/JY 4myuU6qPcozpyOIOemSW/IWX1hqLTF74YY4FxVGMPUmJ9NJTCo6tG+MupUFNnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679426698; a=rsa-sha256; cv=none; b=JEaUlGivma2hgyj5P7aLty88FGpynza1b1bRMsUVoI30WcJ7qNI0etYcMYjziEiAVCw/Bo Unf3/+tuK+6Zek0qOvpmYOcFER7PbIdrF1cljw/epTpskjZXQ4G7wYCK6dnjYgHNzxDSHR i4xP9axL7AIeNQ9vo03hd/wd9yq9BbC4GsulNhm9SBFsZcGJwPJR9NAeSvVsy7L4G1XIgW XLTMNvpw4mhhd3YeoMXCbO3YUKYECNmi/ydzHk6aHrVsOCs10Nl9JQcRpqmh5fVq3XkSik ATIVwJVRCw8iREW/VN3nRZSy2lE7x8dkDJm7G9FCKeSSBt5CthEvirHlBFug2A== 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 4Ph1lF6RHrzPb2; Tue, 21 Mar 2023 19:24:57 +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 32LJOv9L028156; Tue, 21 Mar 2023 19:24:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LJOvYh028155; Tue, 21 Mar 2023 19:24:57 GMT (envelope-from git) Date: Tue, 21 Mar 2023 19:24:57 GMT Message-Id: <202303211924.32LJOvYh028155@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: 080a95fcd3d7 - main - multimedia/libmediainfo: Re-apply 93d0a119a698aa76d582123be9d97c4fedadc6bd 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: 080a95fcd3d78c83120e4465792c042556a25dc0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=080a95fcd3d78c83120e4465792c042556a25dc0 commit 080a95fcd3d78c83120e4465792c042556a25dc0 Author: Po-Chuan Hsieh AuthorDate: 2023-03-21 18:40:03 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-03-21 19:20:07 +0000 multimedia/libmediainfo: Re-apply 93d0a119a698aa76d582123be9d97c4fedadc6bd - Remove --disable-dll - Bump PORTREVISION for package change --- multimedia/libmediainfo/Makefile | 31 ++++++++++++++----------------- multimedia/libmediainfo/distinfo | 6 +++--- multimedia/libmediainfo/pkg-plist | 7 ++----- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index be1609a67db2..c8b73acce76a 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -1,10 +1,10 @@ PORTNAME= libmediainfo -DISTVERSION= 22.12 -PORTREVISION= 2 +PORTVERSION= 22.12 +PORTREVISION= 3 CATEGORIES= multimedia -MASTER_SITES= https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/ \ +MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \ LOCAL/sunpoet -DISTNAME= ${PORTNAME}_${DISTVERSION} +DISTNAME= MediaInfo_CLI_${PORTVERSION}_GNU_FromSource MAINTAINER= sunpoet@FreeBSD.org COMMENT= MediaInfo library @@ -12,28 +12,25 @@ 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= 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} +USES= compiler:c++11-lang dos2unix libtool localbase pathfix pkgconfig tar:xz -WRKSRC= ${WRKDIR}/MediaInfoLib/Project/CMake -PLIST_SUB= DISTVERSION=${DISTVERSION:S|.||g} +CONFIGURE_ARGS= --enable-shared --enable-static +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +PATHFIX_MAKEFILEIN+= configure +USE_LDCONFIG= yes -CMAKE_ON= BUILD_SHARED_LIBS +WRKSRC= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library OPTIONS_DEFINE= CURL +OPTIONS_DEFAULT=CURL -CURL_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_CURL:BOOL=True +CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} 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 ccc980a5614e..71eee4447932 100644 --- a/multimedia/libmediainfo/distinfo +++ b/multimedia/libmediainfo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678696235 -SHA256 (libmediainfo_22.12.tar.xz) = 0fc6d32f06d6ce5e144074d2e57e0db8dfa4e38e752d3123ada27ccaf89634bc -SIZE (libmediainfo_22.12.tar.xz) = 1893340 +TIMESTAMP = 1677771027 +SHA256 (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = e67ce7419ec6af9fb54ffbe3164a42ae1cd874a7e559bfff017868cef1106947 +SIZE (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = 3352944 diff --git a/multimedia/libmediainfo/pkg-plist b/multimedia/libmediainfo/pkg-plist index 2aa1b99b2181..9ef4e9825f73 100644 --- a/multimedia/libmediainfo/pkg-plist +++ b/multimedia/libmediainfo/pkg-plist @@ -4,11 +4,8 @@ include/MediaInfo/MediaInfo_Const.h include/MediaInfo/MediaInfo_Events.h 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.a lib/libmediainfo.so lib/libmediainfo.so.0 -lib/libmediainfo.so.0.%%DISTVERSION%%.0 +lib/libmediainfo.so.0.0.0 libdata/pkgconfig/libmediainfo.pc