From nobody Tue Jan 17 07:59:16 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 4Nx1W86cnGz2sZKP; Tue, 17 Jan 2023 07:59:16 +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 4Nx1W84wjjz3Ngx; Tue, 17 Jan 2023 07:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673942356; 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=4pfpNycr4cT50suvkTPcTkq7dUaeFDaZGRKpgojJ4CI=; b=L5m3djbq4UmWHYFQXBtlLl6vRTSdkLgbDC7EJgZE/1Sk5OWncSCazk+Gd8VoY0tBlO2Mz/ r+RVf/ayn2/7lFqeXVu1gzlsr9a9qMllAVFPtrSQ1Wzv7OcC1eK4EzdEcPb1HNmQYIqDSC WsEzUMNyPhgfL4OiquCflnE9riyrZDgJ3FlGUouUfiBPN/EmAXgTfnChdndJoVW0LvfGKH Qdk98KFbG7Io7ZtFzueLYU9iuNTMBa8fD/nGoqUDeuL9Go5wUO2a2zn+iQsNKWqdjExvFH 2YHGV1ACa34sulCvKpM/yyLCVxdwQOIEkO8KGTAy97Y8J00gYssSPiW5+HsnwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673942356; 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=4pfpNycr4cT50suvkTPcTkq7dUaeFDaZGRKpgojJ4CI=; b=u6Elcu373cWIVzPYdl/Rw76VhjQPLN54U0Jc0Ip10ZieUipc3CKnjyQNsAS3bTzCdBnckv +FvL0X6J/+xrBu5/Y8mE65dNJVFp8OIHa25WoUAQKzcsfpxF6NqnSMZgMwRNDlrrOD5xpE T56l0ODa1usnappooOLQxtEvPZUEa5CBDfI2W1CKgcHaOGZOneb3zvznnZl1TDjFJFKYaA VWcZJp6j5z73p+Jy5wpZFAvAjm17zmMmYXDKbhyVUFH8dqQUQnLzUW3ta6dOH50OJAj+Up Bz7CqHS3MqP895R5ivc+VnVmH7xFR7wT2U9Yd9ZVW+Yc4xOuGG2OrlgJwmz4IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673942356; a=rsa-sha256; cv=none; b=G7vFDN3iEoaf/w56+pl4t+UkL5o1XCJmvJVrDWsscZ/D/NPxJDGykzkGzpUIz/KtbKjP97 SQYHDW/OOvyxaw048e1gQLwpIQL7QWJOS1EHBwDEwLuWRZpcdMQb8rl494vaUwT+ha7LHk UxFpHwCvDKkaJWcFUKrxukh/6RoXcg/RfaO06AnITRaAUgaEHao4PJxiKKENwlBh4LG7xl Y8WyuvcLfxO7Ri0DeJMZkiOQJD6S7Kv4QyjJi2/kvHRVOgBCPfxwi78RBdEgndzKLMTxNI 9PyK8E6gQ4OimgK1HE5l8WlEfPh9mwklSkpB18Z19ygFhLbBa0NKiiaMqG/jfg== 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 4Nx1W83y0LzP6d; Tue, 17 Jan 2023 07:59:16 +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 30H7xGv6050287; Tue, 17 Jan 2023 07:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30H7xGvJ050286; Tue, 17 Jan 2023 07:59:16 GMT (envelope-from git) Date: Tue, 17 Jan 2023 07:59:16 GMT Message-Id: <202301170759.30H7xGvJ050286@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: 53f16ee6af9f - main - multimedia/libzen: Update to 0.4.40 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: 53f16ee6af9fd18e473de92c2863bc0137f3bb0f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=53f16ee6af9fd18e473de92c2863bc0137f3bb0f commit 53f16ee6af9fd18e473de92c2863bc0137f3bb0f Author: Daniel Engberg AuthorDate: 2023-01-17 07:37:54 +0000 Commit: Daniel Engberg CommitDate: 2023-01-17 07:59:06 +0000 multimedia/libzen: Update to 0.4.40 * Use proper upstream version * Switch to separate source archives * Switch to CMake which brings us much closer to other distributions * Sanitize source code Reference: https://github.com/MediaArea/ZenLib Changelog: https://github.com/MediaArea/ZenLib/releases/tag/v0.4.40 PR: 268707 Approved by: portmgr (maintainer timeout, 2+ weeks) --- multimedia/libzen/Makefile | 28 ++++++++++++---------------- multimedia/libzen/distinfo | 6 +++--- multimedia/libzen/pkg-plist | 13 +++++-------- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/multimedia/libzen/Makefile b/multimedia/libzen/Makefile index 952b912e7efb..397f58a915e1 100644 --- a/multimedia/libzen/Makefile +++ b/multimedia/libzen/Makefile @@ -1,32 +1,28 @@ PORTNAME= libzen -PORTVERSION= 22.09 +DISTVERSION= 0.4.40 +PORTEPOCH= 1 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= ZenLib used by MediaInfo and its library WWW= https://mediaarea.net/en/MediaInfo LICENSE= ZLIB -LICENSE_FILE= ${WRKSRC}/../../../License.txt +LICENSE_FILE= ${WRKSRC}/../../License.txt -USES= compiler:c++11-lang libtool pathfix tar:xz - -CONFIGURE_ARGS= --enable-shared --enable-static -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_CXXSTD= c++11 +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}/MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library +WRKSRC= ${WRKDIR}/ZenLib/Project/CMake -post-patch: - @${REINPLACE_CMD} -e '/^ZenLib_LIBS/ s|$$(pwd)[^ ]*|${LOCALBASE}/lib|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's| -lstdc++||g' ${WRKSRC}/configure ${WRKSRC}/libzen.pc.in +PLIST_SUB= DISTVERSION=${DISTVERSION} -post-install: - ${INSTALL_DATA} ${WRKSRC}/../../../Source/ZenLib/BitStream_Fast.h ${STAGEDIR}${PREFIX}/include/ZenLib/BitStream_Fast.h +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 096f367b45e0..b7acb712cb1d 100644 --- a/multimedia/libzen/distinfo +++ b/multimedia/libzen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665073088 -SHA256 (MediaInfo_CLI_22.09_GNU_FromSource.tar.xz) = 02070e50a9cde50180a31c0529435a0ac4fdc0cc823982395833472c6ef464e9 -SIZE (MediaInfo_CLI_22.09_GNU_FromSource.tar.xz) = 3337624 +TIMESTAMP = 1672600333 +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