git: 0194336dea50 - main - multimedia/libmediainfo: Revert to previous commit

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0194336dea50b97cf44e51f1991abf785be34caa

commit 0194336dea50b97cf44e51f1991abf785be34caa
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-03-13 07:50:57 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-03-13 10:02:54 +0000

    multimedia/libmediainfo: 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 and removal of CXXFLAGS
    
    PR:             268709, 269601
    Reported by:    Michiel van Baak Jansen <michiel@vanbaak.eu>
    Approved by:    portmgr (blanket, maintainer timeout: 3+ weeks)
    Fixes:          93d0a11
---
 multimedia/libmediainfo/Makefile  | 31 +++++++++++++++++--------------
 multimedia/libmediainfo/distinfo  |  6 +++---
 multimedia/libmediainfo/pkg-plist |  9 +++++++--
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile
index d22b8f5ac548..be1609a67db2 100644
--- a/multimedia/libmediainfo/Makefile
+++ b/multimedia/libmediainfo/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	libmediainfo
-PORTVERSION=	22.12
-PORTREVISION=	1
+DISTVERSION=	22.12
+PORTREVISION=	2
 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
@@ -12,25 +12,28 @@ 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 --disable-dll
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-PATHFIX_MAKEFILEIN+=	configure
+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}
+
+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
-OPTIONS_DEFAULT=CURL
 
-CURL_CONFIGURE_ON=	--with-libcurl=${LOCALBASE}
+CURL_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_CURL:BOOL=True
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^Libs_Static/d' ${PATCH_WRKSRC}/libmediainfo.pc.in
+
 .include <bsd.port.mk>
diff --git a/multimedia/libmediainfo/distinfo b/multimedia/libmediainfo/distinfo
index 4c7db7e82382..ccc980a5614e 100644
--- a/multimedia/libmediainfo/distinfo
+++ b/multimedia/libmediainfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674589520
-SHA256 (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = e67ce7419ec6af9fb54ffbe3164a42ae1cd874a7e559bfff017868cef1106947
-SIZE (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = 3352944
+TIMESTAMP = 1678696235
+SHA256 (libmediainfo_22.12.tar.xz) = 0fc6d32f06d6ce5e144074d2e57e0db8dfa4e38e752d3123ada27ccaf89634bc
+SIZE (libmediainfo_22.12.tar.xz) = 1893340
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