From owner-svn-ports-branches@freebsd.org Mon Feb 1 05:10:46 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8F12A9984B; Mon, 1 Feb 2016 05:10:46 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 759501832; Mon, 1 Feb 2016 05:10:46 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u115Ajeg040189; Mon, 1 Feb 2016 05:10:45 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u115AiNV040182; Mon, 1 Feb 2016 05:10:44 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201602010510.u115AiNV040182@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 1 Feb 2016 05:10:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r407680 - in branches/2016Q1/multimedia: avidemux avidemux-plugins avidemux-qt4 avidemux/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Feb 2016 05:10:46 -0000 Author: riggs Date: Mon Feb 1 05:10:44 2016 New Revision: 407680 URL: https://svnweb.freebsd.org/changeset/ports/407680 Log: MFH: r407676 Update to upstream version 2.6.11, security fixes for bundled ffmpeg The bundled ffmpeg version has been upgraded to 2.7.2 which addresses multiple vulnerabilities as reported in https://vuxml.freebsd.org/freebsd/3d950687-b4c9-4a86-8478-c56743547af8.html https://vuxml.freebsd.org/freebsd/80c66af0-d1c5-449e-bd31-63b12525ff88.html Heads-up by: jbeich Approved by: portmgr (miwi) Security: CVE-2015-3395 CVE-2015-6818 CVE-2015-6819 CVE-2015-6820 CVE-2015-6821 CVE-2015-6822 CVE-2015-6823 CVE-2015-6824 CVE-2015-6825 CVE-2015-6826 Deleted: branches/2016Q1/multimedia/avidemux/files/patch-po__CMakeLists.txt Modified: branches/2016Q1/multimedia/avidemux-plugins/pkg-plist branches/2016Q1/multimedia/avidemux-qt4/pkg-plist branches/2016Q1/multimedia/avidemux/Makefile branches/2016Q1/multimedia/avidemux/Makefile.common branches/2016Q1/multimedia/avidemux/distinfo branches/2016Q1/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt branches/2016Q1/multimedia/avidemux/pkg-plist Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/multimedia/avidemux-plugins/pkg-plist ============================================================================== --- branches/2016Q1/multimedia/avidemux-plugins/pkg-plist Mon Feb 1 02:43:04 2016 (r407679) +++ branches/2016Q1/multimedia/avidemux-plugins/pkg-plist Mon Feb 1 05:10:44 2016 (r407680) @@ -24,11 +24,13 @@ lib/ADM_plugins6/videoEncoders/libADM_ve lib/ADM_plugins6/videoFilters/libADM_vf_addBorders.so lib/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so lib/ADM_plugins6/videoFilters/libADM_vf_blackenBorders.so +lib/ADM_plugins6/videoFilters/libADM_vf_black.so lib/ADM_plugins6/videoFilters/libADM_vf_changeFps.so lib/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so lib/ADM_plugins6/videoFilters/libADM_vf_decimate.so lib/ADM_plugins6/videoFilters/libADM_vf_DgBob.so lib/ADM_plugins6/videoFilters/libADM_vf_dummy.so +lib/ADM_plugins6/videoFilters/libADM_vf_fadeTo.so lib/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so lib/ADM_plugins6/videoFilters/libADM_vf_mean.so lib/ADM_plugins6/videoFilters/libADM_vf_gauss.so Modified: branches/2016Q1/multimedia/avidemux-qt4/pkg-plist ============================================================================== --- branches/2016Q1/multimedia/avidemux-qt4/pkg-plist Mon Feb 1 02:43:04 2016 (r407679) +++ branches/2016Q1/multimedia/avidemux-qt4/pkg-plist Mon Feb 1 05:10:44 2016 (r407680) @@ -2,6 +2,7 @@ bin/avidemux3_jobs_qt4 bin/avidemux3_qt4 include/avidemux/2.6/qt4/config.h lib/libADM_UIQT46.so +lib/libADM_openGLQT46.so lib/libADM_render6_QT4.so share/avidemux6/qt4/i18n/avidemux_ca.qm share/avidemux6/qt4/i18n/avidemux_cs.qm Modified: branches/2016Q1/multimedia/avidemux/Makefile ============================================================================== --- branches/2016Q1/multimedia/avidemux/Makefile Mon Feb 1 02:43:04 2016 (r407679) +++ branches/2016Q1/multimedia/avidemux/Makefile Mon Feb 1 05:10:44 2016 (r407680) @@ -6,7 +6,6 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 4 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org Modified: branches/2016Q1/multimedia/avidemux/Makefile.common ============================================================================== --- branches/2016Q1/multimedia/avidemux/Makefile.common Mon Feb 1 02:43:04 2016 (r407679) +++ branches/2016Q1/multimedia/avidemux/Makefile.common Mon Feb 1 05:10:44 2016 (r407680) @@ -1,6 +1,6 @@ # $FreeBSD$ -AVIDEMUX_VERSION= 2.6.10 +AVIDEMUX_VERSION= 2.6.11 MASTER_SITES= \ SF/avidemux/avidemux/${PORTVERSION} DISTNAME= avidemux_${PORTVERSION} @@ -21,7 +21,7 @@ OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NA USE_SQLITE= yes USES= cmake:outsource pkgconfig iconv gmake compiler:features USES+= dos2unix execinfo -DOS2UNIX_FILES= cmake/admCheckMiscLibs.cmake po/CMakeLists.txt +DOS2UNIX_FILES= cmake/admCheckMiscLibs.cmake CMAKE_ARGS+= -DGNUMAKE_EXECUTABLE=gmake CMAKE_ARGS+= -DAVIDEMUX_PACKAGER=none CMAKE_ARGS+= -DQT5:BOOL=OFF Modified: branches/2016Q1/multimedia/avidemux/distinfo ============================================================================== --- branches/2016Q1/multimedia/avidemux/distinfo Mon Feb 1 02:43:04 2016 (r407679) +++ branches/2016Q1/multimedia/avidemux/distinfo Mon Feb 1 05:10:44 2016 (r407680) @@ -1,2 +1,2 @@ -SHA256 (avidemux_2.6.10.tar.gz) = 176c2482a0656f81e307f1505e6dfcdab086ee73e7de363617b884c5d7205aed -SIZE (avidemux_2.6.10.tar.gz) = 19275880 +SHA256 (avidemux_2.6.11.tar.gz) = 936ff5e10ad0551460c1233c217e4cee642623f2899a8fe48cd7f0144cfd1b3a +SIZE (avidemux_2.6.11.tar.gz) = 17980757 Modified: branches/2016Q1/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt ============================================================================== --- branches/2016Q1/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt Mon Feb 1 02:43:04 2016 (r407679) +++ branches/2016Q1/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt Mon Feb 1 05:10:44 2016 (r407680) @@ -1,10 +1,10 @@ ---- avidemux_plugins/CMakeLists.txt.orig 2015-05-15 09:19:29 UTC +--- avidemux_plugins/CMakeLists.txt.orig 2016-01-31 19:06:53 UTC +++ avidemux_plugins/CMakeLists.txt -@@ -202,7 +202,6 @@ ENDIF(DO_COMMON) - ADD_SUBDIRECTORY(ADM_videoEncoder) +@@ -203,7 +203,6 @@ ADD_SUBDIRECTORY(ADM_videoEncoder) ADD_SUBDIRECTORY(ADM_videoFilters6) IF(DO_QT4) + add_subdirectory(ADM_demuxers/VapourSynth) - add_subdirectory(ADM_scriptEngines) - IF(USE_OPENGL AND NOT WIN32) + #IF(USE_OPENGL AND NOT WIN32) + IF(USE_OPENGL ) ADD_SUBDIRECTORY(ADM_videoFilters6_openGl) - ENDIF(USE_OPENGL AND NOT WIN32) Modified: branches/2016Q1/multimedia/avidemux/pkg-plist ============================================================================== --- branches/2016Q1/multimedia/avidemux/pkg-plist Mon Feb 1 02:43:04 2016 (r407679) +++ branches/2016Q1/multimedia/avidemux/pkg-plist Mon Feb 1 05:10:44 2016 (r407680) @@ -46,6 +46,7 @@ include/avidemux/2.6/libavutil/macros.h include/avidemux/2.6/libavutil/mathematics.h include/avidemux/2.6/libavutil/mem.h include/avidemux/2.6/libavutil/old_pix_fmts.h +include/avidemux/2.6/libavutil/opt.h include/avidemux/2.6/libavutil/pixfmt.h include/avidemux/2.6/libavutil/rational.h include/avidemux/2.6/libavutil/samplefmt.h