Skip to content

Commit

Permalink
multimedia/libzen: Revert to previous commit
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Daniel Engberg authored and Daniel Engberg committed Mar 13, 2023
1 parent aa4c061 commit 90dc816
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 23 deletions.
25 changes: 13 additions & 12 deletions multimedia/libzen/Makefile
@@ -1,29 +1,30 @@
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
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>
6 changes: 3 additions & 3 deletions 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
13 changes: 5 additions & 8 deletions multimedia/libzen/pkg-plist
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 90dc816

Please sign in to comment.