From nobody Sun May 04 10:08:32 2025 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 4Zr0jY45njz5vgBy; Sun, 04 May 2025 10:08:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zr0jY0HKVz3rtP; Sun, 04 May 2025 10:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746353313; 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=/g+i33zWEl9cLHmk50im8CSwCJucdUPL6h35A4qDUPo=; b=CS5eO2x9eb/yMK52jm73mLJxPDKZHz1GvigGQ6ZCdZeR2+gHxNdkRVmGxkBn1Xut8cDBnq 143LIXbe8Hg4qLbWALlByZS4gEO/tJtE0lnpEaDbj4YxdVT83XDAmyZdaeEvOKI5zvZeis 8VcS9psilp3U250R2+WJgncbdbmteRW7ja2DuuCJ5XVneZnkOjwByQcc+j5TAz2ZUtXvOh 862oXtKVIhbjjC9Qev98JpFdrT2rBjehuBuYEAonMMk7bYGGrRD9wssSo8yFw9ejRfX18F AWBWyhU8ZqxuFMTaJdihKAMMYDS3W79YfzN+54w7UlUx32wCFCECJh+eJQ6wHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746353313; 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=/g+i33zWEl9cLHmk50im8CSwCJucdUPL6h35A4qDUPo=; b=PIlhGXkKAHLN+4nPD67s1ZveOXd+sAhXLoQP6ZT9OTqetZ8JvrxWrG16IsBM/k+p3AXvkl sV6bUirB2EQtkNm64dXUtYEsIAvfdgHRmLApb3UvUh+gXG8PQVPScnO3tDJaJb9Jk0zBs8 G++evB1ulSdozYExBBpSl3z3ZsDcIg/W7BuA7717M2LqbKIFNHA3F5nBB/5ojk4fePsBFA g49TrwVfRz2PdjWCp5xUwSVqDOKjo1HRCAPxWlsZXX4vvL77ML6zKboKCm7+XS5jcsX6zX LmvQV9RaqScKmHzvcFsCj8O9MmZhBBr839UKhjMn/H3KBE9aC1LCfaPlP/C5Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746353313; a=rsa-sha256; cv=none; b=bejOM1Ptb2W3pfEu82zaMPlaO8lUnj/7dsbvOXlJaDtGSMy2txFi0KEtkZupe3D4LR0K8p LCxndEllUN2Bi1H+0iZgseH/2z39ePtaIQ/jL9yI1mp2Q7MZYs/fl+vhx661rPPZbaYcwj zqCW+HhweeoGI0OEwZ3pQVImhbsyYbWwRzufd/uxk+c8K009VO7rcWQZeaH/cViXrJqIM0 ReTpCi5w8wN+z8HvMOmKATaq5CEJNVXebnfDq/Y7n2l+10JFRResgdwOYuDKG2S3n3/fuY oobd55glCgF1vo9Qcp8gGynoR7bAkuAvcfxjiEMDFyWpwwS+lvpsd3v5vQv2vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zr0jX6sw9z7yB; Sun, 04 May 2025 10:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 544A8W7O066392; Sun, 4 May 2025 10:08:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 544A8WHm066389; Sun, 4 May 2025 10:08:32 GMT (envelope-from git) Date: Sun, 4 May 2025 10:08:32 GMT Message-Id: <202505041008.544A8WHm066389@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: e4f38f8d3615 - main - multimedia/libmediainfo: Switch to CMake 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: e4f38f8d361526d5e938f5fb8e342e64605562e0 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e4f38f8d361526d5e938f5fb8e342e64605562e0 commit e4f38f8d361526d5e938f5fb8e342e64605562e0 Author: Daniel Engberg AuthorDate: 2025-05-04 07:11:25 +0000 Commit: Daniel Engberg CommitDate: 2025-05-04 09:55:13 +0000 multimedia/libmediainfo: Switch to CMake Switch to CMake to unbreak curl option Makefile is also reworked as this is from a repo maintained separately PR: 286173 Tested by: Ale Approved by: maintainer timeout, 2+ weeks --- multimedia/libmediainfo/Makefile | 34 +++++++++++++++++++--------------- multimedia/libmediainfo/distinfo | 6 +++--- multimedia/libmediainfo/pkg-plist | 7 +++++-- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index b53b5dd0bf5c..2a75b4b2dd57 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -1,9 +1,9 @@ PORTNAME= libmediainfo -PORTVERSION= 25.03 +DISTVERSION= 25.03 +PORTREVISION= 1 CATEGORIES= multimedia -MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \ - LOCAL/sunpoet -DISTNAME= MediaInfo_CLI_${PORTVERSION}_GNU_FromSource +MASTER_SITES= https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/ +DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= MediaInfo library @@ -11,28 +11,32 @@ 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 -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -PATHFIX_MAKEFILEIN+= configure +USES= cmake compiler:c++11-lang dos2unix localbase:ldflags pathfix \ + pkgconfig tar:xz +DOS2UNIX_GLOB= *.c *.cmake.in *.cpp *.h *.pc.in *.txt +DOS2UNIX_WRKSRC=${WRKDIR} USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library +EXTRACT_AFTER_ARGS= --exclude MediaInfoLib/Source/ThirdParty/tinyxml2 +WRKSRC= ${WRKDIR}/MediaInfoLib/Project/CMake + +PLIST_SUB= DISTVERSION=${DISTVERSION:S/.//} -DOS2UNIX_FILES= ../../../Source/MediaInfo/Audio/File_Usac.cpp \ - ../../../Source/MediaInfo/Audio/File_Usac.h +CMAKE_ON= BUILD_SHARED_LIBS OPTIONS_DEFINE= CURL OPTIONS_DEFAULT=CURL -CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} CURL_LIB_DEPENDS= libcurl.so:ftp/curl +CURL_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_CURL + +post-patch: + @${REINPLACE_CMD} -e '/^Libs_Static/d' ${PATCH_WRKSRC}/libmediainfo.pc.in + ${RM} -r ${STAGEDIR}${PREFIX}/include/MediaInfoDLL/ .include diff --git a/multimedia/libmediainfo/distinfo b/multimedia/libmediainfo/distinfo index 0fce1db1249c..97ea1f14363e 100644 --- a/multimedia/libmediainfo/distinfo +++ b/multimedia/libmediainfo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744288736 -SHA256 (MediaInfo_CLI_25.03_GNU_FromSource.tar.xz) = 248f2183f1db14b2d70c5650e5fda84cc9923e1c57a79b9000000f09803e13fa -SIZE (MediaInfo_CLI_25.03_GNU_FromSource.tar.xz) = 5897484 +TIMESTAMP = 1742645027 +SHA256 (libmediainfo_25.03.tar.xz) = 35f1fdab81239ca355c6de358a84fbde0477fed8eb350e5dfef6a598145c5207 +SIZE (libmediainfo_25.03.tar.xz) = 2117836 diff --git a/multimedia/libmediainfo/pkg-plist b/multimedia/libmediainfo/pkg-plist index 9ef4e9825f73..2aa1b99b2181 100644 --- a/multimedia/libmediainfo/pkg-plist +++ b/multimedia/libmediainfo/pkg-plist @@ -4,8 +4,11 @@ include/MediaInfo/MediaInfo_Const.h include/MediaInfo/MediaInfo_Events.h include/MediaInfoDLL/MediaInfoDLL.h include/MediaInfoDLL/MediaInfoDLL_Static.h -lib/libmediainfo.a +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