From nobody Mon Mar 13 10:03:30 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 4PZsg63M0Rz3xTvC; Mon, 13 Mar 2023 10:03:30 +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 4PZsg62tGJz3KWB; Mon, 13 Mar 2023 10:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678701810; 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=V8c/T7jJeA9uj1TcFCuY52Um+wwVrD1B9Vc8v5y7A8Q=; b=VlHtH5SKaxWmJpUp1EkfWMo19NfOZRv2MTR8RJx83JMWv99MjbAue1LG4VjdJGk9HI1Uy9 mi2bnSbXBJURDrhClxMjxgJZTswZlNgzdBEZwJp0RXZWnODWcdLnCINMntc70spWxP3kV0 imOumoF8eCXtVAQw0El65Vr8NuzkB33JLKs2ZqaqQey7kh3f/QVHiOo0Ff3hFLE6zkrTV+ wWBp/8eWWoMLPJEJTNzTca4M9+FSFxubolCiioCd9zaWsBf0mnFMC4i+Ehh8O4rrmzCmdI VaffTURB244nUjlVffGnqAr7UhNsxkX6BYsaYEmFnbyPFC/jHGWOoIt+Uhv1CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678701810; 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=V8c/T7jJeA9uj1TcFCuY52Um+wwVrD1B9Vc8v5y7A8Q=; b=IPuGPO3n7ee319HlBwa5V6SXswDtQgUSGjmULpZbEs4SpchyZIWd9uPomAJuLeNWKxRu9i D1dFM8C+oDAH1jbZ21FENjwy5rTjOClviiw5CxZQjEOZnrUBdIckl93kFS/RwFVM8bUtTH BW41FfhPmW6m0hcVS6PytF5oEhXZBBwfNpPBvS91C2prq2N0Fn9zJRj8ko8ds106LtnTdE BPu8KjAxk0DfeEebH2Bh7p1vfZ6tGu2Tulgg7IVU2Jon7Vo29bQV6xS3FGM6W1uv0K7Rqg jFDFoKWLz/mXvkthvq7DzQNH3IyIil/wuebmwdIqAaY30vVTBWxFcK9eAJapOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678701810; a=rsa-sha256; cv=none; b=dO97u+a34xzow/Th5aylRNVkK7w2i12hHNGkrlzjD7txz0pJFyLEDLzOwNmRI/GQ6I7E95 4rOT5nC38S+CBS3ywn9Azdq8V/lOklOjN1rHYPD20HrSl7joH6D2KjnKtwis7WsDOUc54Z GQWwhjLxGS3mWJ2q44VK3EyCt4eGnuwJ+KtnoSORa1a52T3B1pQ58VMbGGj4U+/sQJ7Jbc 59BJmYMwKHlD4045F39FjzAgE752eufDnQQrVRKgAeLl2pg1vHYULtM/nY+gI9WFYzC/4P WJ+XpGAVefpOGl0g90DC8MaXESzfR+qAWYSo52kwzExLYKtsMaFckq3vzRyhQQ== 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 4PZsg61yR7zp1H; Mon, 13 Mar 2023 10:03:30 +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 32DA3U9H064891; Mon, 13 Mar 2023 10:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DA3Umf064890; Mon, 13 Mar 2023 10:03:30 GMT (envelope-from git) Date: Mon, 13 Mar 2023 10:03:30 GMT Message-Id: <202303131003.32DA3Umf064890@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: 90dc81600699 - main - multimedia/libzen: Revert to previous commit 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: 90dc81600699c2e7a9918bc641e21d3326af490e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=90dc81600699c2e7a9918bc641e21d3326af490e commit 90dc81600699c2e7a9918bc641e21d3326af490e Author: Daniel Engberg AuthorDate: 2023-03-13 07:32:47 +0000 Commit: Daniel Engberg CommitDate: 2023-03-13 10:02:54 +0000 multimedia/libzen: 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 PR: 268709, 269601 Reported by: Michiel van Baak Jansen Approved by: portmgr (blanket, maintainer timeout: 3+ weeks) Fixes: 23e0c77 --- multimedia/libzen/Makefile | 25 +++++++++++++------------ multimedia/libzen/distinfo | 6 +++--- multimedia/libzen/pkg-plist | 13 +++++-------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/multimedia/libzen/Makefile b/multimedia/libzen/Makefile index 793cc8fd7c16..2e68b26bc294 100644 --- a/multimedia/libzen/Makefile +++ b/multimedia/libzen/Makefile @@ -1,11 +1,11 @@ PORTNAME= libzen -PORTVERSION= 0.4.40 -PORTREVISION= 1 +DISTVERSION= 0.4.40 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= multimedia -MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${MEDIAINFO_PORTVERSION}/ \ +MASTER_SITES= https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/ \ LOCAL/sunpoet -DISTNAME= MediaInfo_CLI_${MEDIAINFO_PORTVERSION}_GNU_FromSource +DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= ZenLib used by MediaInfo and its library @@ -13,17 +13,18 @@ WWW= https://mediaarea.net/en/MediaInfo \ https://github.com/MediaArea/ZenLib LICENSE= ZLIB -LICENSE_FILE= ${WRKSRC}/../../../License.txt +LICENSE_FILE= ${WRKSRC}/../../License.txt -USES= compiler:c++11-lang dos2unix libtool pathfix tar:xz - -CONFIGURE_ARGS= --enable-shared --enable-static -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip +USES= cmake compiler:c++11-lang dos2unix pathfix pkgconfig tar:bz2 USE_LDCONFIG= yes +DOS2UNIX_GLOB= *.c *.cmake.in *.cpp *.h *.pc.in *.txt +DOS2UNIX_WRKSRC= ${WRKDIR} + +WRKSRC= ${WRKDIR}/ZenLib/Project/CMake -WRKSRC= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library +PLIST_SUB= DISTVERSION=${DISTVERSION} -MEDIAINFO_PORTVERSION= 22.12 +post-patch: + @${REINPLACE_CMD} -e '/^Libs_Static/d' ${PATCH_WRKSRC}/libzen.pc.in .include diff --git a/multimedia/libzen/distinfo b/multimedia/libzen/distinfo index 48a716a05881..79987d0a9d61 100644 --- a/multimedia/libzen/distinfo +++ b/multimedia/libzen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674589522 -SHA256 (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = e67ce7419ec6af9fb54ffbe3164a42ae1cd874a7e559bfff017868cef1106947 -SIZE (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = 3352944 +TIMESTAMP = 1678696303 +SHA256 (libzen_0.4.40.tar.bz2) = 5543e2c45214b9d9f0ba4f43dee61d0296e1ff9f1427ed6c879ddd1b62b9f69e +SIZE (libzen_0.4.40.tar.bz2) = 137110 diff --git a/multimedia/libzen/pkg-plist b/multimedia/libzen/pkg-plist index 7be66e8fe0ef..5a6ccf2e270c 100644 --- a/multimedia/libzen/pkg-plist +++ b/multimedia/libzen/pkg-plist @@ -13,12 +13,6 @@ include/ZenLib/Format/Http/Http_Cookies.h include/ZenLib/Format/Http/Http_Handler.h include/ZenLib/Format/Http/Http_Request.h include/ZenLib/Format/Http/Http_Utils.h -include/ZenLib/HTTP_Client.h -include/ZenLib/HTTP_Client/HTTPClient.h -include/ZenLib/HTTP_Client/HTTPClientAuth.h -include/ZenLib/HTTP_Client/HTTPClientCommon.h -include/ZenLib/HTTP_Client/HTTPClientString.h -include/ZenLib/HTTP_Client/HTTPClientWrapper.h include/ZenLib/InfoMap.h include/ZenLib/MemoryDebug.h include/ZenLib/OS_Utils.h @@ -33,8 +27,11 @@ include/ZenLib/ZtringListList.h include/ZenLib/ZtringListListF.h include/ZenLib/int128s.h include/ZenLib/int128u.h -lib/libzen.a +lib/cmake/zenlib/ZenLibConfig.cmake +lib/cmake/zenlib/ZenLibConfigVersion.cmake +lib/cmake/zenlib/ZenLibTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/zenlib/ZenLibTargets.cmake lib/libzen.so lib/libzen.so.0 -lib/libzen.so.0.0.0 +lib/libzen.so.%%DISTVERSION%% libdata/pkgconfig/libzen.pc