From nobody Tue Jan 17 07:59:17 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 4Nx1WB3gwZz2sZWF; Tue, 17 Jan 2023 07:59:18 +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 4Nx1W95PF7z3Nmm; Tue, 17 Jan 2023 07:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673942357; 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=lOfgBa2yGSY0GT9a4SraG57RHTFWoSvbC5AKn+wTQss=; b=aye/+1CNRFLbuz7yZbSOWV014AMIDpy3LL3wZrkcu3ljjdBq7XOvqw111FYjdGZMGDoRCq A9TAkFbvuT71z8UjoX3H1TFyi/2L/lyiVA1AHzUe88J8xvOEoOnoZb2RPyfkwlEqHh/kK7 pNGg4OoV0PtMz1SXoX72p7eB0rl32gY8QkDMwhjoXsDxSeDbToQln6Ztp5WoDC9zvqn/U0 lJtc2RkuqoEgyjVwckwyHC1PUbxe+++ro8QJPtoDiHbOwV0lU6He3WvPBjvrI1dzXbV1XM UlkLJxOeTUej5Z/9PyatJTri6WzlMC/B4TEOLuNV4r6Eov84wNWPDjtD8qVU1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673942357; 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=lOfgBa2yGSY0GT9a4SraG57RHTFWoSvbC5AKn+wTQss=; b=LgDyT7Ehp4wnfctBZbpp6QRFpPdw1SEPc8bC9497YW5tPuO9iGmTuHTeXBmD9/NIbAvKfd ttM7OiKNvZVSGiOT2LpXtF75+s3IvZ2jNBVmGZeNAXdGeGfm1558INNU3P4ahEBZH3ORbl BvDYUH8dDso6dumgD3ajCAqLybDF25vpM23zjl2MsGFuR5VBjMUnJ/uEAG7ubR65F5EcJC LSU2f30JVvuzgnhmt7e6iNggofaKHpXnTDt8WSNZDrtmXT2vsgePKDNIqclVNt04bo6l67 0eWC8HT1rRBM6SNBRbmdU4RTDkp60GwM4eUxP/NgNTVXVNjiFZEhJJ4WjHlJcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673942357; a=rsa-sha256; cv=none; b=l75yvj5k4svDqzAK7tmIFrPw3Ga+c/apUVXVXtAZvi1xRvY4b4EsBOPSDwxH1YoxZsoDXc qY1d599nftC/mWzCIqvOmG/zf7r/MecJ5GjnVxnlCll1kl5XAurl5QgKBeao9m96CaO4U0 XJVHhONynMpylxa4ajpNX5N4OE7kuU1pInKMH1ZTObYhcFw3Vq2rc8AFjl7YMtSjVldBc2 5gbwAtVj5kDvFYmyxsjxu+FVyLYt5WyjGR+IBj0qD09Y12TijJivt/c014Dr2JWL3Pe1R+ jnllsQ6MmZoNhUrfAChRIUchLUaSiqNjey3BN+z/dYbhuq2IMpl7XKU/sRyKrA== 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 4Nx1W94TrfzP6f; Tue, 17 Jan 2023 07:59:17 +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 30H7xHng050313; Tue, 17 Jan 2023 07:59:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30H7xHP7050312; Tue, 17 Jan 2023 07:59:17 GMT (envelope-from git) Date: Tue, 17 Jan 2023 07:59:17 GMT Message-Id: <202301170759.30H7xHP7050312@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: a0e75401cb37 - main - multimedia/libmediainfo: Update to 22.12 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0e75401cb3714a9c3638c7c06a431ec4bf7dffd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0e75401cb3714a9c3638c7c06a431ec4bf7dffd commit a0e75401cb3714a9c3638c7c06a431ec4bf7dffd Author: Daniel Engberg AuthorDate: 2023-01-17 07:40:49 +0000 Commit: Daniel Engberg CommitDate: 2023-01-17 07:59:06 +0000 multimedia/libmediainfo: Update to 22.12 * Switch to separate source archives * Switch to CMake which brings us much closer to other distributions and reduces manual patching * Always use tinyxml2 in tree * Sanitize source code * Adjust port to more closely follow other distributions Changelog: https://github.com/MediaArea/MediaInfoLib/releases/tag/v22.12 PR: 268708 Approved by: portmgr (maintainer timeout, 2+ weeks) --- multimedia/libmediainfo/Makefile | 42 +++++++++++++-------------- multimedia/libmediainfo/distinfo | 6 ++-- multimedia/libmediainfo/files/patch-configure | 36 ----------------------- multimedia/libmediainfo/pkg-plist | 9 ++++-- 4 files changed, 30 insertions(+), 63 deletions(-) diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index 3a0b9d6f17e6..558fa90bf887 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -1,41 +1,39 @@ PORTNAME= libmediainfo -PORTVERSION= 22.09 +DISTVERSION= 22.12 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 WWW= https://mediaarea.net/en/MediaInfo LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/../../../License.html +LICENSE_FILE= ${WRKSRC}/../../License.html -LIB_DEPENDS= libzen.so:multimedia/libzen +LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2 \ + libzen.so:multimedia/libzen -USES= alias compiler:c++11-lang libtool localbase pathfix pkgconfig tar:xz - -CFLAGS+= -D_POSIX_PRIORITY_SCHEDULING -CONFIGURE_ARGS= --enable-shared --enable-static -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_CXXSTD= c++11 +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} + +CXXFLAGS+= -D_POSIX_PRIORITY_SCHEDULING + +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 TINYXML2 -OPTIONS_DEFAULT=TINYXML2 -TINYXML2_DESC= Use textproc/tinyxml2 instead of bundled one +OPTIONS_DEFINE= CURL -CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} +CURL_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_CURL:BOOL=True CURL_LIB_DEPENDS= libcurl.so:ftp/curl -TINYXML2_CONFIGURE_ON= --with-libtinyxml2=yes -TINYXML2_LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2 -post-install: - ${INSTALL_DATA} ${WRKSRC}/libmediainfo.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libmediainfo.pc - ${RM} -r ${STAGEDIR}${PREFIX}/include/MediaInfoDLL/ +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 cdaf4d2824d6..7f9e186b64ea 100644 --- a/multimedia/libmediainfo/distinfo +++ b/multimedia/libmediainfo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665073086 -SHA256 (MediaInfo_CLI_22.09_GNU_FromSource.tar.xz) = 02070e50a9cde50180a31c0529435a0ac4fdc0cc823982395833472c6ef464e9 -SIZE (MediaInfo_CLI_22.09_GNU_FromSource.tar.xz) = 3337624 +TIMESTAMP = 1672601994 +SHA256 (libmediainfo_22.12.tar.xz) = 0fc6d32f06d6ce5e144074d2e57e0db8dfa4e38e752d3123ada27ccaf89634bc +SIZE (libmediainfo_22.12.tar.xz) = 1893340 diff --git a/multimedia/libmediainfo/files/patch-configure b/multimedia/libmediainfo/files/patch-configure deleted file mode 100644 index b8e65f3719e1..000000000000 --- a/multimedia/libmediainfo/files/patch-configure +++ /dev/null @@ -1,36 +0,0 @@ ---- configure.orig 2020-08-10 23:41:20 UTC -+++ configure -@@ -17656,8 +17656,8 @@ if test -d $with_libcurl; then - if test -f $with_libcurl/libcurl.pc; then - libcurlpcfile="$with_libcurl/libcurl.pc" - else -- if test -f "$with_libcurl/lib/pkgconfig/libcurl.pc"; then -- libcurlpcfile="$with_libcurl/lib/pkgconfig/libcurl.pc" -+ if test -f "$with_libcurl/libdata/pkgconfig/libcurl.pc"; then -+ libcurlpcfile="$with_libcurl/libdata/pkgconfig/libcurl.pc" - else - as_fn_error $? "Problem while configuring builtin curl (libcurl.pc not found)" "$LINENO" 5 - fi -@@ -17739,16 +17739,16 @@ else - fi - - if test -d $with_libmms; then -- CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBMMS_FROMSOURCE -I$with_libmms/src $(pkg-config --cflags $with_libmms/pkgconfig/libmms.pc)" -- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS -I$with_libmms $(pkg-config --cflags $with_libmms/pkgconfig/libmms.pc)" -+ CXXFLAGS="$CXXFLAGS -I$with_libmms/src $(pkg-config --cflags $with_libmms/libdata/pkgconfig/libmms.pc)" -+ MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS -I$with_libmms $(pkg-config --cflags $with_libmms/libdata/pkgconfig/libmms.pc)" - if test "$enable_staticlibs" = "yes"; then - using_libmms="custom (static)" -- LIBS="$LIBS -L$with_libmms/src/.libs $(pkg-config --libs --static $with_libmms/pkgconfig/libmms.pc)" -- MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L$with_libmms/src/.libs $(pkg-config --libs --static $with_libmms/pkgconfig/libmms.pc)" -+ LIBS="$LIBS -L$with_libmms/lib $(pkg-config --libs --static $with_libmms/libdata/pkgconfig/libmms.pc)" -+ MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L$with_libmms/lib $(pkg-config --libs --static $with_libmms/libdata/pkgconfig/libmms.pc)" - else - using_libmms="custom" -- LIBS="$LIBS -L$with_libmms/src/.libs $(pkg-config --libs $with_libmms/pkgconfig/libmms.pc)" -- MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L$with_libmms/src/.libs $(pkg-config --libs $with_libmms/pkgconfig/libmms.pc)" -+ LIBS="$LIBS -L$with_libmms/lib $(pkg-config --libs $with_libmms/libdata/pkgconfig/libmms.pc)" -+ MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L$with_libmms/lib $(pkg-config --libs $with_libmms/libdata/pkgconfig/libmms.pc)" - fi - elif test "$with_libmms" = "no"; then - CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBMMS_NO" 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