Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Jun 2014 21:41:57 +0200
From:      Ralf van der Enden <tremere@cainites.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        multimedia@FreeBSD.org
Subject:   [PATCH] multimedia/mkvtoolnix: update to 7.0.0
Message-ID:  <E1WxiDd-0006GV-S7@cainites.net>

next in thread | raw e-mail | index | archive | help

>Submitter-Id:	current-users
>Originator:	Ralf van der Enden
>Organization:	
>Confidential:	no
>Synopsis:	[PATCH] multimedia/mkvtoolnix: update to 7.0.0
>Severity:	non-critical
>Priority:	low
>Category:	ports
>Class:		update
>Release:	FreeBSD 10.0-RELEASE-p5 amd64
>Environment:
System: FreeBSD lan.cainites.net 10.0-RELEASE-p5 FreeBSD 10.0-RELEASE-p5 #0 r267109: Thu Jun  5 19:51:48
>Description:
- Update to 7.0.0
CHANGELOG: http://www.bunkus.org/videotools/mkvtoolnix/doc/ChangeLog
- CURL support removed + fixed a clang build issue

Port maintainer (multimedia@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 1.02 (mode: update, diff: SVN)
>How-To-Repeat:
>Fix:

--- mkvtoolnix-7.0.0.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 358460)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	6.9.1
+PORTVERSION=	7.0.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		CRITICAL
@@ -32,8 +32,8 @@
 		--with-boost-system=boost_system \
 		--with-boost-regex=boost_regex
 
-OPTIONS_DEFINE=	WXGTK FLAC CURL
-OPTIONS_DEFAULT=WXGTK FLAC 
+OPTIONS_DEFINE=	WXGTK FLAC
+OPTIONS_DEFAULT=WXGTK FLAC
 
 BROKEN_sparc64=	Does not install on sparc64
 
@@ -47,8 +47,6 @@
 FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
 FLAC_CONFIGURE_WITH=	flac
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-CURL_CONFIGURE_WITH=	curl
 .if defined(BATCH)
 MAKE_ENV+=	V=1
 .endif
Index: distinfo
===================================================================
--- distinfo	(revision 358460)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (mkvtoolnix-6.9.1.tar.xz) = a874afcf61c4d6235c789be07417dfebe992b68aaf4858920f9f3ac0d88b81e7
-SIZE (mkvtoolnix-6.9.1.tar.xz) = 5198388
+SHA256 (mkvtoolnix-7.0.0.tar.xz) = 2bbdf060e193d4a7f961f84d28b28d67d859be66e3f2cdf8ee4ae380f8d15725
+SIZE (mkvtoolnix-7.0.0.tar.xz) = 5182348
Index: files/patch-src__common__command_line.cpp
===================================================================
--- files/patch-src__common__command_line.cpp	(revision 0)
+++ files/patch-src__common__command_line.cpp	(working copy)
@@ -0,0 +1,18 @@
+--- ./src/common/command_line.cpp.orig	2014-06-09 15:04:43.000000000 +0200
++++ ./src/common/command_line.cpp	2014-06-19 11:24:24.441776888 +0200
+@@ -291,6 +291,7 @@
+     } else if ((args[i] == "-h") || (args[i] == "-?") || (args[i] == "--help"))
+       usage();
+ 
++#if 0
+ #if defined(HAVE_CURL_EASY_H)
+     else if (args[i] == "--check-for-updates") {
+       mtx_release_version_t rel = get_latest_release_version();
+@@ -310,6 +311,7 @@
+       mxexit(rel.current_version < rel.latest_source ? 1 : 0);
+     }
+ #endif  // defined(HAVE_CURL_EASY_H)
++#endif
+ 
+     else
+       ++i;

Property changes on: files/patch-src__common__command_line.cpp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-src__common__version.cpp
===================================================================
--- files/patch-src__common__version.cpp	(revision 0)
+++ files/patch-src__common__version.cpp	(working copy)
@@ -0,0 +1,11 @@
+--- ./src/common/version.cpp.orig	2014-06-09 15:04:43.000000000 +0200
++++ ./src/common/version.cpp	2014-06-19 11:23:59.321777432 +0200
+@@ -228,7 +228,7 @@
+     std::stringstream urls;
+     brng::for_each(release.urls, [&](std::pair<std::string, std::string> const &kv) { urls << " " << kv.first << ":" << kv.second; });
+     mxdebug(boost::format("update check: current %1% latest source %2% latest winpre %3% URLs%4%\n")
+-            % release.current_version.to_string() % release.latest_source.to_string() % release.latest_windows_build.to_string() % urls);
++            % release.current_version.to_string() % release.latest_source.to_string() % release.latest_windows_build.to_string() % urls.str());
+   }
+ 
+   return release;

Property changes on: files/patch-src__common__version.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
--- mkvtoolnix-7.0.0.patch ends here ---




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1WxiDd-0006GV-S7>