git: 90dc81600699 - main - multimedia/libzen: Revert to previous commit

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Mon, 13 Mar 2023 10:03:30 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=90dc81600699c2e7a9918bc641e21d3326af490e

commit 90dc81600699c2e7a9918bc641e21d3326af490e
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-03-13 07:32:47 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
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 <michiel@vanbaak.eu>
    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 <bsd.port.mk>
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