Date: Sun, 17 Feb 2013 11:50:00 GMT From: Rainer Hurling <rhurlin@gwdg.de> To: freebsd-multimedia@FreeBSD.org Subject: Re: ports/174338: [patch] multimedia/mkvtoolnix: update to 5.9.0 Message-ID: <201302171150.r1HBo04v089062@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/174338; it has been noted by GNATS. From: Rainer Hurling <rhurlin@gwdg.de> To: bug-followup@FreeBSD.org, rhurlin@gwdg.de Cc: Subject: Re: ports/174338: [patch] multimedia/mkvtoolnix: update to 5.9.0 Date: Sun, 17 Feb 2013 12:48:27 +0100 This is a multi-part message in MIME format. --------------010405020400090002090603 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Because of the newest version 6.0.0 of mkvtoolnix here is an update, which is more up to date. --------------010405020400090002090603 Content-Type: text/plain; charset=UTF-8; name="patch-multimedia_mkvtoolnix_5.9.0-6.0.0.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-multimedia_mkvtoolnix_5.9.0-6.0.0.txt" diff -Naur mkvtoolnix.orig/Makefile mkvtoolnix/Makefile --- mkvtoolnix.orig/Makefile 2013-01-31 17:21:45.000000000 +0100 +++ mkvtoolnix/Makefile 2013-02-17 12:13:54.000000000 +0100 @@ -2,11 +2,11 @@ # $FreeBSD: head/multimedia/mkvtoolnix/Makefile 311310 2013-01-31 13:38:42Z bapt $ PORTNAME= mkvtoolnix -PORTVERSION= 5.9.0 -PORTREVISION= 1 +PORTVERSION= 6.0.0 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ CRITICAL +EXTRACT_SUFX= .tar.xz MAINTAINER= multimedia@FreeBSD.org COMMENT= Tools to extract from/get info about/create Matroska media streams @@ -14,17 +14,13 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \ - expat:${PORTSDIR}/textproc/expat2 \ - lzo2:${PORTSDIR}/archivers/lzo2 \ +LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ vorbis:${PORTSDIR}/audio/libvorbis \ ogg:${PORTSDIR}/audio/libogg \ boost_regex:${PORTSDIR}/devel/boost-libs \ - curl:${PORTSDIR}/ftp/curl \ ebml:${PORTSDIR}/textproc/libebml \ matroska:${PORTSDIR}/multimedia/libmatroska -USE_BZIP2= yes USE_GCC= 4.6+ USE_GETTEXT= yes USE_ICONV= yes @@ -36,7 +32,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= ac_cv_path_PO4A=no ZLIB_CFLAGS=-I/usr/include ZLIB_LIBS=-lz -CONFIGURE_ARGS= --enable-lzo --enable-bz2 --disable-qt \ +CONFIGURE_ARGS= --enable-bz2 --disable-qt \ --with-boost=${LOCALBASE} \ --with-boost-filesystem=boost_filesystem \ --with-boost-system=boost_system \ @@ -46,8 +42,10 @@ MANLANG= "" ja zh_CN nl uk MAN1= mkvextract.1 mkvinfo.1 mkvmerge.1 mkvpropedit.1 -OPTIONS_DEFINE= WXGTK -OPTIONS_DEFAULT= WXGTK +OPTIONS_DEFINE= WXGTK LZO FLAC CURL +OPTIONS_DEFAULT= WXGTK LZO FLAC CURL +NO_OPTIONS_SORT= yes +LZO_DESC= lzo compression support .include <bsd.port.pre.mk> @@ -66,10 +64,37 @@ MAN1+= mmg.1 PLIST_SUB+= GUI="" .else -CONFIGURE_ARGS+=--disable-gui +CONFIGURE_ARGS+= --disable-gui PLIST_SUB+= GUI="@comment " .endif +.if ${PORT_OPTIONS:MLZO} +LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2 +CONFIGURE_ARGS+= --enable-lzo +PLIST_SUB+= LZO2="" +.else +CONFIGURE_ARGS+= --disable-lzo +PLIST_SUB+= LZO2="@comment " +.endif + +.if ${PORT_OPTIONS:MFLAC} +LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac +CONFIGURE_ARGS+= --with-flac +PLIST_SUB+= FLAC="" +.else +CONFIGURE_ARGS+= --without-flac +PLIST_SUB+= FLAC="@comment " +.endif + +.if ${PORT_OPTIONS:MCURL} +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +PLIST_SUB+= CURL="" +.else +# --without-curl and --disable-curl don't work, but this one does: +CONFIGURE_ARGS+= --with-curl-config=/dev/null +PLIST_SUB+= CURL="@comment " +.endif + do-build: @(cd ${WRKSRC}/; unset PREFIX; ${RAKE_BIN}) diff -Naur mkvtoolnix.orig/distinfo mkvtoolnix/distinfo --- mkvtoolnix.orig/distinfo 2012-12-20 15:37:52.000000000 +0100 +++ mkvtoolnix/distinfo 2013-02-17 12:07:17.000000000 +0100 @@ -1,2 +1,2 @@ -SHA256 (mkvtoolnix-5.9.0.tar.bz2) = d913f531331c3332d2fb334c872ea19bfea7293dfedc4bf33ae7162e4efcbde1 -SIZE (mkvtoolnix-5.9.0.tar.bz2) = 4493517 +SHA256 (mkvtoolnix-6.0.0.tar.xz) = 84ddefb079aeef2b3b2ac418e3d5461e670a15771e90d5eab98a88b0f5417bf0 +SIZE (mkvtoolnix-6.0.0.tar.xz) = 3766204 diff -Naur mkvtoolnix.orig/pkg-plist mkvtoolnix/pkg-plist --- mkvtoolnix.orig/pkg-plist 2012-09-28 13:55:18.000000000 +0200 +++ mkvtoolnix/pkg-plist 2013-02-17 12:17:23.000000000 +0100 @@ -5,6 +5,79 @@ %%GUI%%bin/mmg %%GUI%%share/applications/mkvinfo.desktop %%GUI%%share/applications/mkvmergeGUI.desktop +%%GUI%%%%DOCSDIR%%/guide/en/images/addingremovingattachments.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/addremovefiles.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/attachmentoptions.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/audiotrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/chaptereditor.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/generaltrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/jobmanager.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/movietitle.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/muxingwindow.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/selectmkvmergeexecutable.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/splitting.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/textsubtitlestrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/trackselection.gif +%%GUI%%%%DOCSDIR%%/guide/en/images/videotrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/en/mkvmerge-gui.hhc +%%GUI%%%%DOCSDIR%%/guide/en/mkvmerge-gui.hhk +%%GUI%%%%DOCSDIR%%/guide/en/mkvmerge-gui.hhp +%%GUI%%%%DOCSDIR%%/guide/en/mkvmerge-gui.html +%%GUI%%%%DOCSDIR%%/guide/es/images/addingremovingattachments.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/addremovefiles.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/attachmentoptions.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/audiotrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/chaptereditor.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/generaltrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/jobmanager.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/movietitle.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/muxingwindow.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/selectmkvmergeexecutable.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/splitting.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/textsubtitlestrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/trackselection.gif +%%GUI%%%%DOCSDIR%%/guide/es/images/videotrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/es/mkvmerge-gui.hhc +%%GUI%%%%DOCSDIR%%/guide/es/mkvmerge-gui.hhk +%%GUI%%%%DOCSDIR%%/guide/es/mkvmerge-gui.hhp +%%GUI%%%%DOCSDIR%%/guide/es/mkvmerge-gui.html +%%GUI%%%%DOCSDIR%%/guide/eu/images/addingremovingattachments.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/addremovefiles.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/attachmentoptions.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/audiotrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/chaptereditor.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/generaltrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/headereditor.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/jobmanager.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/movietitle.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/muxingwindow.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/selectmkvmergeexecutable.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/splitting.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/textsubtitlestrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/trackselection.gif +%%GUI%%%%DOCSDIR%%/guide/eu/images/videotrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhc +%%GUI%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhk +%%GUI%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhp +%%GUI%%%%DOCSDIR%%/guide/eu/mkvmerge-gui.html +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/addingremovingattachments.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/addremovefiles.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/attachmentoptions.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/audiotrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/chaptereditor.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/generaltrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/jobmanager.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/movietitle.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/muxingwindow.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/selectmkvmergeexecutable.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/splitting.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/textsubtitlestrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/trackselection.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/images/videotrackoptions.gif +%%GUI%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhc +%%GUI%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhk +%%GUI%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhp +%%GUI%%%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.html %%GUI%%share/icons/hicolor/16x16/apps/mkvextract.png %%GUI%%share/icons/hicolor/16x16/apps/mkvinfo.png %%GUI%%share/icons/hicolor/16x16/apps/mkvmerge.png @@ -61,93 +134,40 @@ share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo %%GUI%%share/mime/packages/mkvtoolnix.xml -%%DOCSDIR%%/guide/en/images/addingremovingattachments.gif -%%DOCSDIR%%/guide/en/images/addremovefiles.gif -%%DOCSDIR%%/guide/en/images/attachmentoptions.gif -%%DOCSDIR%%/guide/en/images/audiotrackoptions.gif -%%DOCSDIR%%/guide/en/images/chaptereditor.gif -%%DOCSDIR%%/guide/en/images/generaltrackoptions.gif -%%DOCSDIR%%/guide/en/images/jobmanager.gif -%%DOCSDIR%%/guide/en/images/movietitle.gif -%%DOCSDIR%%/guide/en/images/muxingwindow.gif -%%DOCSDIR%%/guide/en/images/selectmkvmergeexecutable.gif -%%DOCSDIR%%/guide/en/images/splitting.gif -%%DOCSDIR%%/guide/en/images/textsubtitlestrackoptions.gif -%%DOCSDIR%%/guide/en/images/trackselection.gif -%%DOCSDIR%%/guide/en/images/videotrackoptions.gif -%%DOCSDIR%%/guide/en/mkvmerge-gui.hhc -%%DOCSDIR%%/guide/en/mkvmerge-gui.hhk -%%DOCSDIR%%/guide/en/mkvmerge-gui.hhp -%%DOCSDIR%%/guide/en/mkvmerge-gui.html -%%DOCSDIR%%/guide/es/images/addingremovingattachments.gif -%%DOCSDIR%%/guide/es/images/addremovefiles.gif -%%DOCSDIR%%/guide/es/images/attachmentoptions.gif -%%DOCSDIR%%/guide/es/images/audiotrackoptions.gif -%%DOCSDIR%%/guide/es/images/chaptereditor.gif -%%DOCSDIR%%/guide/es/images/generaltrackoptions.gif -%%DOCSDIR%%/guide/es/images/jobmanager.gif -%%DOCSDIR%%/guide/es/images/movietitle.gif -%%DOCSDIR%%/guide/es/images/muxingwindow.gif -%%DOCSDIR%%/guide/es/images/selectmkvmergeexecutable.gif -%%DOCSDIR%%/guide/es/images/splitting.gif -%%DOCSDIR%%/guide/es/images/textsubtitlestrackoptions.gif -%%DOCSDIR%%/guide/es/images/trackselection.gif -%%DOCSDIR%%/guide/es/images/videotrackoptions.gif -%%DOCSDIR%%/guide/es/mkvmerge-gui.hhc -%%DOCSDIR%%/guide/es/mkvmerge-gui.hhk -%%DOCSDIR%%/guide/es/mkvmerge-gui.hhp -%%DOCSDIR%%/guide/es/mkvmerge-gui.html -%%DOCSDIR%%/guide/eu/images/addingremovingattachments.gif -%%DOCSDIR%%/guide/eu/images/addremovefiles.gif -%%DOCSDIR%%/guide/eu/images/attachmentoptions.gif -%%DOCSDIR%%/guide/eu/images/audiotrackoptions.gif -%%DOCSDIR%%/guide/eu/images/chaptereditor.gif -%%DOCSDIR%%/guide/eu/images/generaltrackoptions.gif -%%DOCSDIR%%/guide/eu/images/headereditor.gif -%%DOCSDIR%%/guide/eu/images/jobmanager.gif -%%DOCSDIR%%/guide/eu/images/movietitle.gif -%%DOCSDIR%%/guide/eu/images/muxingwindow.gif -%%DOCSDIR%%/guide/eu/images/selectmkvmergeexecutable.gif -%%DOCSDIR%%/guide/eu/images/splitting.gif -%%DOCSDIR%%/guide/eu/images/textsubtitlestrackoptions.gif -%%DOCSDIR%%/guide/eu/images/trackselection.gif -%%DOCSDIR%%/guide/eu/images/videotrackoptions.gif -%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhc -%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhk -%%DOCSDIR%%/guide/eu/mkvmerge-gui.hhp -%%DOCSDIR%%/guide/eu/mkvmerge-gui.html -%%DOCSDIR%%/guide/zh_CN/images/addingremovingattachments.gif -%%DOCSDIR%%/guide/zh_CN/images/addremovefiles.gif -%%DOCSDIR%%/guide/zh_CN/images/attachmentoptions.gif -%%DOCSDIR%%/guide/zh_CN/images/audiotrackoptions.gif -%%DOCSDIR%%/guide/zh_CN/images/chaptereditor.gif -%%DOCSDIR%%/guide/zh_CN/images/generaltrackoptions.gif -%%DOCSDIR%%/guide/zh_CN/images/jobmanager.gif -%%DOCSDIR%%/guide/zh_CN/images/movietitle.gif -%%DOCSDIR%%/guide/zh_CN/images/muxingwindow.gif -%%DOCSDIR%%/guide/zh_CN/images/selectmkvmergeexecutable.gif -%%DOCSDIR%%/guide/zh_CN/images/splitting.gif -%%DOCSDIR%%/guide/zh_CN/images/textsubtitlestrackoptions.gif -%%DOCSDIR%%/guide/zh_CN/images/trackselection.gif -%%DOCSDIR%%/guide/zh_CN/images/videotrackoptions.gif -%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhc -%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhk -%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.hhp -%%DOCSDIR%%/guide/zh_CN/mkvmerge-gui.html +@dirrmtry share/mime/packages +@dirrmtry share/mime +%%GUI%%@dirrmtry share/icons/hicolor/96x96/apps +%%GUI%%@dirrmtry share/icons/hicolor/96x96 +%%GUI%%@dirrmtry share/icons/hicolor/64x64/apps +%%GUI%%@dirrmtry share/icons/hicolor/64x64 +%%GUI%%@dirrmtry share/icons/hicolor/48x48/apps +%%GUI%%@dirrmtry share/icons/hicolor/48x48 +%%GUI%%@dirrmtry share/icons/hicolor/32x32/apps +%%GUI%%@dirrmtry share/icons/hicolor/32x32 +%%GUI%%@dirrmtry share/icons/hicolor/256x256/apps +%%GUI%%@dirrmtry share/icons/hicolor/256x256 +%%GUI%%@dirrmtry share/icons/hicolor/24x24/apps +%%GUI%%@dirrmtry share/icons/hicolor/24x24 +%%GUI%%@dirrmtry share/icons/hicolor/16x16/apps +%%GUI%%@dirrmtry share/icons/hicolor/16x16 +%%GUI%%@dirrmtry share/icons/hicolor/128x128/apps +%%GUI%%@dirrmtry share/icons/hicolor/128x128 +%%GUI%%@dirrmtry share/icons/hicolor +%%GUI%%@dirrmtry share/icons @dirrmtry man/zh_CN/man1 @dirrmtry man/zh_CN @dirrmtry man/uk/man1 @dirrmtry man/uk @dirrmtry man/nl/man1 @dirrmtry man/nl -@dirrm %%DOCSDIR%%/guide/zh_CN/images -@dirrm %%DOCSDIR%%/guide/zh_CN -@dirrm %%DOCSDIR%%/guide/eu/images -@dirrm %%DOCSDIR%%/guide/eu -@dirrm %%DOCSDIR%%/guide/es/images -@dirrm %%DOCSDIR%%/guide/es -@dirrm %%DOCSDIR%%/guide/en/images -@dirrm %%DOCSDIR%%/guide/en -@dirrm %%DOCSDIR%%/guide -@dirrm %%DOCSDIR%% +%%GUI%%@dirrm %%DOCSDIR%%/guide/zh_CN/images +%%GUI%%@dirrm %%DOCSDIR%%/guide/zh_CN +%%GUI%%@dirrm %%DOCSDIR%%/guide/eu/images +%%GUI%%@dirrm %%DOCSDIR%%/guide/eu +%%GUI%%@dirrm %%DOCSDIR%%/guide/es/images +%%GUI%%@dirrm %%DOCSDIR%%/guide/es +%%GUI%%@dirrm %%DOCSDIR%%/guide/en/images +%%GUI%%@dirrm %%DOCSDIR%%/guide/en +%%GUI%%@dirrm %%DOCSDIR%%/guide +%%GUI%%@dirrm %%DOCSDIR%% %%GUI%%@dirrmtry share/applications --------------010405020400090002090603--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302171150.r1HBo04v089062>