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 MFH: 2016Q1 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
This commit is contained in:
parent
cdb8fae546
commit
5469f96645
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=407676
@ -24,11 +24,13 @@ lib/ADM_plugins6/videoEncoders/libADM_ve_null.so
|
||||
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
|
||||
|
@ -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
|
||||
|
@ -6,7 +6,6 @@
|
||||
|
||||
PORTNAME= avidemux
|
||||
PORTVERSION= ${AVIDEMUX_VERSION}
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= multimedia
|
||||
|
||||
MAINTAINER= multimedia@FreeBSD.org
|
||||
|
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
AVIDEMUX_VERSION= 2.6.10
|
||||
AVIDEMUX_VERSION= 2.6.11
|
||||
MASTER_SITES= \
|
||||
SF/avidemux/avidemux/${PORTVERSION}
|
||||
DISTNAME= avidemux_${PORTVERSION}
|
||||
@ -20,7 +20,7 @@ OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options
|
||||
|
||||
USES= cmake:outsource pkgconfig iconv gmake compiler:features sqlite
|
||||
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
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -1,12 +0,0 @@
|
||||
--- po/CMakeLists.txt.orig 2015-06-01 06:04:58 UTC
|
||||
+++ po/CMakeLists.txt
|
||||
@@ -1,3 +1,4 @@
|
||||
+IF (NOT DEFINED NO_NLS)
|
||||
IF (HAVE_GETTEXT)
|
||||
INCLUDE(Po)
|
||||
COMPILE_PO_FILES(${CMAKE_SOURCE_DIR}/po MO_FILES)
|
||||
@@ -11,3 +12,4 @@ IF (QT4_FOUND)
|
||||
|
||||
ADD_CUSTOM_TARGET(qmfiles ALL DEPENDS ${QM_FILES})
|
||||
ENDIF (QT4_FOUND)
|
||||
+ENDIF (NOT DEFINED NO_NLS)
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user