Date: Sat, 11 Jun 2016 16:22:01 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r416726 - in branches/2016Q2/multimedia/vlc: . files Message-ID: <201606111622.u5BGM1gx016224@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Jun 11 16:22:01 2016 New Revision: 416726 URL: https://svnweb.freebsd.org/changeset/ports/416726 Log: MFH: r415944 r416225 r416711 Update to upstream version 2.2.3 Differential Revision: https://reviews.freebsd.org/D6373 Fix build with libc++ 3.8.0 VLC brings its own header for atomic operations which defines a whole bunch of atomic macros, conflicting with the ones in the C++ standard <atomic> header. This changeset works around those. PR: 209722 Submitted by: dim Update to upstream release 2.2.4, fix remote attack CVE-2016-5108 Detailed changelog (BSD relevant excerpts): Decoder: * Fix crash in G.711 wav files * Fix mp3 crash in libmad * Fix out-of-bound write in adpcm QT IMA codec (CVE-2016-5108) Qt: * Fix resizing issues Translations: * Update of Bulgarian, Catalan, German, French, Italian, Marathi, Norwegian Bokmål, Norwegian Nynorsk, Portuguese, Slovak, Spanish (Mexico), Swedish, Simplified Chinese, and Traditional Chinese translations Security: CVE-2016-5108 Approved by: ports-secteam (junovitch) Added: branches/2016Q2/multimedia/vlc/files/patch-include_vlc__atomic.h - copied unchanged from r416225, head/multimedia/vlc/files/patch-include_vlc__atomic.h branches/2016Q2/multimedia/vlc/files/patch-include_vlc__playlist.h - copied unchanged from r416225, head/multimedia/vlc/files/patch-include_vlc__playlist.h branches/2016Q2/multimedia/vlc/files/patch-include_vlc__sout.h - copied unchanged from r416225, head/multimedia/vlc/files/patch-include_vlc__sout.h branches/2016Q2/multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp - copied unchanged from r416225, head/multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp Deleted: branches/2016Q2/multimedia/vlc/files/patch-share-lua-intf-cli.lua branches/2016Q2/multimedia/vlc/files/patch-vendor-00-ce91452 Modified: branches/2016Q2/multimedia/vlc/Makefile branches/2016Q2/multimedia/vlc/distinfo branches/2016Q2/multimedia/vlc/files/patch-configure branches/2016Q2/multimedia/vlc/pkg-descr branches/2016Q2/multimedia/vlc/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/multimedia/vlc/Makefile ============================================================================== --- branches/2016Q2/multimedia/vlc/Makefile Sat Jun 11 16:06:41 2016 (r416725) +++ branches/2016Q2/multimedia/vlc/Makefile Sat Jun 11 16:22:01 2016 (r416726) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= vlc -DISTVERSION= 2.2.1 -PORTREVISION= 8 +DISTVERSION= 2.2.4 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -53,6 +52,7 @@ CONFIGURE_ARGS+=--enable-debug .endif CPPFLAGS+= -I${LOCALBASE}/include CFLAGS_i386= -fomit-frame-pointer +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DCA DIRAC DOCS DVDREAD \ DVDNAV FAAD FLAC FLUID FRIBIDI GME GNOMEVFS2 GNUTLS \ Modified: branches/2016Q2/multimedia/vlc/distinfo ============================================================================== --- branches/2016Q2/multimedia/vlc/distinfo Sat Jun 11 16:06:41 2016 (r416725) +++ branches/2016Q2/multimedia/vlc/distinfo Sat Jun 11 16:22:01 2016 (r416726) @@ -1,2 +1,3 @@ -SHA256 (vlc-2.2.1.tar.xz) = 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb -SIZE (vlc-2.2.1.tar.xz) = 20940288 +TIMESTAMP = 1465555959 +SHA256 (vlc-2.2.4.tar.xz) = 1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be +SIZE (vlc-2.2.4.tar.xz) = 22199316 Modified: branches/2016Q2/multimedia/vlc/files/patch-configure ============================================================================== --- branches/2016Q2/multimedia/vlc/files/patch-configure Sat Jun 11 16:06:41 2016 (r416725) +++ branches/2016Q2/multimedia/vlc/files/patch-configure Sat Jun 11 16:22:01 2016 (r416726) @@ -1,6 +1,6 @@ ---- configure.orig +--- configure.orig 2016-04-05 00:45:51 UTC +++ configure -@@ -8461,9 +8461,6 @@ case "${host_os}" in +@@ -8471,9 +8471,6 @@ case "${host_os}" in ;; freebsd*) SYS=freebsd @@ -10,7 +10,7 @@ ;; openbsd*) SYS=openbsd -@@ -26098,7 +26095,7 @@ main () +@@ -25539,7 +25536,7 @@ main () return 0; } _ACEOF @@ -19,7 +19,7 @@ ac_cv_c_o4=yes -@@ -26142,7 +26139,7 @@ main () +@@ -25583,7 +25580,7 @@ main () return 0; } _ACEOF @@ -28,7 +28,7 @@ ac_cv_c_o3=yes -@@ -27336,7 +27333,7 @@ _ACEOF +@@ -26777,7 +26774,7 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : ac_cv_altivec_inline="yes" else @@ -37,7 +37,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -27349,7 +27346,7 @@ asm volatile("vperm 0,1,2,3"); +@@ -26790,7 +26787,7 @@ asm volatile("vperm 0,1,2,3"); } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : @@ -46,3 +46,12 @@ else ac_cv_altivec_inline=no fi +@@ -49199,7 +49196,7 @@ fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + +- as_fn_error $? "\"You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c\"" "$LINENO" 5 ++ $as_echo "Qt-5.5.x found. Ensure Qt I78ef29975181ee22429c9bd4b11d96d9e68b7a9c is backported." >&5 + + fi + Copied: branches/2016Q2/multimedia/vlc/files/patch-include_vlc__atomic.h (from r416225, head/multimedia/vlc/files/patch-include_vlc__atomic.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/multimedia/vlc/files/patch-include_vlc__atomic.h Sat Jun 11 16:22:01 2016 (r416726, copy of r416225, head/multimedia/vlc/files/patch-include_vlc__atomic.h) @@ -0,0 +1,17 @@ +--- include/vlc_atomic.h.orig 2014-08-14 07:20:03 UTC ++++ include/vlc_atomic.h +@@ -32,6 +32,14 @@ + /*** Native C11 atomics ***/ + # include <stdatomic.h> + ++# elif defined (__cplusplus) && defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 3800 ++ ++# include <atomic> ++ ++using std::atomic_uint_least32_t; ++using std::atomic_uintptr_t; ++using std::atomic_int; ++ + # else + + # define ATOMIC_FLAG_INIT false Copied: branches/2016Q2/multimedia/vlc/files/patch-include_vlc__playlist.h (from r416225, head/multimedia/vlc/files/patch-include_vlc__playlist.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/multimedia/vlc/files/patch-include_vlc__playlist.h Sat Jun 11 16:22:01 2016 (r416726, copy of r416225, head/multimedia/vlc/files/patch-include_vlc__playlist.h) @@ -0,0 +1,19 @@ +--- include/vlc_playlist.h.orig 2014-11-16 18:57:58 UTC ++++ include/vlc_playlist.h +@@ -24,13 +24,13 @@ + #ifndef VLC_PLAYLIST_H_ + #define VLC_PLAYLIST_H_ + ++#include <vlc_input.h> ++#include <vlc_events.h> ++ + # ifdef __cplusplus + extern "C" { + # endif + +-#include <vlc_input.h> +-#include <vlc_events.h> +- + TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t) + + struct intf_thread_t; Copied: branches/2016Q2/multimedia/vlc/files/patch-include_vlc__sout.h (from r416225, head/multimedia/vlc/files/patch-include_vlc__sout.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/multimedia/vlc/files/patch-include_vlc__sout.h Sat Jun 11 16:22:01 2016 (r416726, copy of r416225, head/multimedia/vlc/files/patch-include_vlc__sout.h) @@ -0,0 +1,22 @@ +--- include/vlc_sout.h.orig 2014-11-16 18:57:58 UTC ++++ include/vlc_sout.h +@@ -28,6 +28,9 @@ + #ifndef VLC_SOUT_H_ + #define VLC_SOUT_H_ + ++#include <sys/types.h> ++#include <vlc_es.h> ++ + /** + * \file + * This file defines structures and functions for stream output in vlc +@@ -37,9 +40,6 @@ + extern "C" { + #endif + +-#include <sys/types.h> +-#include <vlc_es.h> +- + /** Stream output instance (FIXME: should be private to src/ to avoid + * invalid unsynchronized access) */ + struct sout_instance_t Copied: branches/2016Q2/multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp (from r416225, head/multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp Sat Jun 11 16:22:01 2016 (r416726, copy of r416225, head/multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp) @@ -0,0 +1,11 @@ +--- modules/gui/qt4/dialogs/messages.hpp.orig 2014-08-14 07:20:04 UTC ++++ modules/gui/qt4/dialogs/messages.hpp +@@ -55,7 +55,7 @@ private: + void sinkMessage( const MsgEvent * ); + bool matchFilter( const QString& ); + +- atomic_uint verbosity; ++ atomic_int verbosity; + static void MsgCallback( void *, int, const vlc_log_t *, const char *, + va_list ); + Modified: branches/2016Q2/multimedia/vlc/pkg-descr ============================================================================== --- branches/2016Q2/multimedia/vlc/pkg-descr Sat Jun 11 16:06:41 2016 (r416725) +++ branches/2016Q2/multimedia/vlc/pkg-descr Sat Jun 11 16:22:01 2016 (r416726) @@ -2,7 +2,7 @@ VLC media player is a highly portable mu audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, and more) as well as DVD's, VCD's, and various streaming protocols. It can also be used as a server to stream in unicast or multicast in -IPv4 or IPv6 on a high-bandwidth network. VLC also has the ability +IPv4 or IPv6 on a high-bandwidth network. VLC also has the ability to transcode media on-the-fly for streaming or saving to disk. WWW: http://www.videolan.org/ Modified: branches/2016Q2/multimedia/vlc/pkg-plist ============================================================================== --- branches/2016Q2/multimedia/vlc/pkg-plist Sat Jun 11 16:06:41 2016 (r416725) +++ branches/2016Q2/multimedia/vlc/pkg-plist Sat Jun 11 16:22:01 2016 (r416726) @@ -170,10 +170,12 @@ share/apps/solid/actions/vlc-openvcd.des %%NLS%%share/locale/km/LC_MESSAGES/vlc.mo %%NLS%%share/locale/kn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ko/LC_MESSAGES/vlc.mo +%%NLS%%share/locale/ks_IN/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ky/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lg/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lt/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lv/LC_MESSAGES/vlc.mo +%%NLS%%share/locale/mai/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mk/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ml/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mn/LC_MESSAGES/vlc.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606111622.u5BGM1gx016224>