Index: vlc/distinfo =================================================================== --- vlc/distinfo (revision 11212) +++ vlc/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (vlc-2.0.5.tar.xz) = dff9eb00861bcd9f8446ff5cedbd3c5fd2bed460e6bfa84bd9e01f750ed96b6e -SIZE (vlc-2.0.5.tar.xz) = 18369292 +SHA256 (vlc-2.0.6.tar.xz) = 31cc98035e2ce36c71a8f105aa5a87e3d8b5e206a0b3f7208c5ced407cbe1963 +SIZE (vlc-2.0.6.tar.xz) = 18619836 Index: vlc/files/patch-clang =================================================================== --- vlc/files/patch-clang (revision 11212) +++ vlc/files/patch-clang (working copy) @@ -1,110 +1,3 @@ -From d3685de9011e0484a0e6f11266ae0f0378aad5e6 Mon Sep 17 00:00:00 2001 -From: Brad Smith -Date: Mon, 14 Jan 2013 14:44:59 +0100 -Subject: [PATCH] Fix building with Clang/LLVM -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -The following diff provides some fixes for VLC to allow building -with LLVM. - -Signed-off-by: Rafael Carre ---- - include/vlc_common.h | 4 ++-- - include/vlc_cpu.h | 4 ++-- - modules/video_filter/deinterlace/yadif.h | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git include/vlc_common.h include/vlc_common.h -index 015a4ba..8e87a96 100644 ---- include/vlc_common.h -+++ include/vlc_common.h -@@ -661,7 +661,7 @@ static inline uint16_t bswap16 (uint16_t x) - VLC_USED - static inline uint32_t bswap32 (uint32_t x) - { --#if VLC_GCC_VERSION(4,3) -+#if VLC_GCC_VERSION(4,3) || defined(__clang__) - return __builtin_bswap32 (x); - #else - return ((x & 0x000000FF) << 24) -@@ -675,7 +675,7 @@ static inline uint32_t bswap32 (uint32_t x) - VLC_USED - static inline uint64_t bswap64 (uint64_t x) - { --#if VLC_GCC_VERSION(4,3) -+#if VLC_GCC_VERSION(4,3) || defined(__clang__) - return __builtin_bswap64 (x); - #elif !defined (__cplusplus) - return ((x & 0x00000000000000FF) << 56) -diff --git include/vlc_cpu.h include/vlc_cpu.h -index 36f8da5..6c82004 100644 ---- include/vlc_cpu.h -+++ include/vlc_cpu.h -@@ -40,7 +40,7 @@ - - # if defined (__MMX__) - # define VLC_MMX --# elif VLC_GCC_VERSION(4, 4) -+# elif VLC_GCC_VERSION(4, 4) || defined(__clang__) - # define VLC_MMX __attribute__ ((__target__ ("mmx"))) - # else - # define VLC_MMX VLC_MMX_is_not_implemented_on_this_compiler -@@ -48,7 +48,7 @@ - - # if defined (__SSE__) - # define VLC_SSE --# elif VLC_GCC_VERSION(4, 4) -+# elif VLC_GCC_VERSION(4, 4) || defined(__clang__) - # define VLC_SSE __attribute__ ((__target__ ("sse"))) - # else - # define VLC_SSE VLC_SSE_is_not_implemented_on_this_compiler -diff --git modules/video_filter/deinterlace/yadif.h modules/video_filter/deinterlace/yadif.h -index a2fccac..233504e 100644 ---- modules/video_filter/deinterlace/yadif.h -+++ modules/video_filter/deinterlace/yadif.h -@@ -39,7 +39,7 @@ DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL, 0x000100010 - - - #ifdef CAN_COMPILE_SSSE3 --#if defined(__SSE__) || VLC_GCC_VERSION(4, 4) -+#if defined(__SSE__) || VLC_GCC_VERSION(4, 4) || defined(__clang__) - // ================ SSSE3 ================= - #define HAVE_YADIF_SSSE3 - #define COMPILE_TEMPLATE_SSE 1 -@@ -55,7 +55,7 @@ DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL, 0x000100010 - #endif - - #ifdef CAN_COMPILE_SSE2 --#if defined(__SSE__) || VLC_GCC_VERSION(4, 4) -+#if defined(__SSE__) || VLC_GCC_VERSION(4, 4) || defined(__clang__) - // ================= SSE2 ================= - #define HAVE_YADIF_SSE2 - #define COMPILE_TEMPLATE_SSE 1 -@@ -69,7 +69,7 @@ DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL, 0x000100010 - #endif - - #ifdef CAN_COMPILE_MMX --#if defined(__MMX__) || VLC_GCC_VERSION(4, 4) -+#if defined(__MMX__) || VLC_GCC_VERSION(4, 4) || defined(__clang__) - // ================ MMX ================= - #define HAVE_YADIF_MMX - #define VLC_TARGET VLC_MMX --- -1.7.10.4 - -From: Reinhard Tartler -Subject: Fixes mkv playback with gcc-4.4 as found in debian/squeeze - -This effectively reverts this upstream commit: -http://git.videolan.org/?p=vlc/vlc-2.0.git;a=commitdiff;h=59491dcedffbf97612d2c572943b56ee4289dd07 - -Suggested by: -http://forum.videolan.org/viewtopic.php?f=13&t=98175&p=327945&hilit=KaxSegment#p327945 - -Thanks to Artyom Kazak for pointing this out - Index: modules/demux/mkv/mkv.hpp =================================================================== --- modules/demux/mkv/mkv.hpp 2012-08-10 13:14:35.284287024 +0200 Index: vlc/Makefile =================================================================== --- vlc/Makefile (revision 11212) +++ vlc/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= vlc -DISTVERSION= 2.0.5 -PORTREVISION= 3 +DISTVERSION= 2.0.6 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/p/-pre/}/ \ @@ -30,7 +29,7 @@ SAMBA SCHROED SDL SHOUTCAST SKINS STREAM SPEEX SQLITE SVG \ TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VORBIS \ X11 X264 XCB XOSD XVIDEO ZVBI SERVER_ONLY DEBUG \ - NO_DVD LIBBLURAY SAMPLERATE + NO_DVD LIBBLURAY SAMPLERATE SIDPLAY OPTIONS_DEFAULT=A52 AVAHI DBUS DTS DVDREAD DVDNAV FAAD FLAC GLX GNUTLS \ HTTPD LUA MAD MATROSKA MPEG2 OGG OPUS PNG QT4 REALAUDIO \ SDL SKINS STREAM SPEEX TAGLIB THEORA TWOLAME V4L \ @@ -49,6 +48,7 @@ RUNROOT_DESC= Enable running as root SAMBA_DESC= SAMBA Access module SCHROED_DESC= Schroedinger decoder +SIDPLAY_DESC= C64 sid demux support SKINS_DESC= winamp skins interface STREAM_DESC= stream output TAGLIB_DESC= ID3 tag and Ogg comment support @@ -66,6 +66,7 @@ USE_ICONV= yes USE_PERL5_BUILD=yes USE_GL=yes +USE_CSTD= gnu99 MAKE_JOBS_SAFE= yes WANT_GNOME= yes @@ -493,6 +494,14 @@ CONFIGURE_ARGS+=--disable-schroedinger .endif +.if ${PORT_OPTIONS:MSIDPLAY} +LIB_DEPENDS+= sidplay2:${PORTSDIR}/audio/libsidplay2 +LDFLAGS+= -L${LOCALBASE}/lib/sidplay/builders +CONFIGURE_ARGS+=--enable-sid +.else +CONFIGURE_ARGS+=--disable-sid +.endif + .if ${PORT_OPTIONS:MSDL} && ${PORT_OPTIONS:MXCB} WANT_SDL= yes USE_SDL= image @@ -715,6 +724,7 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e '\|LIBS|s|-lrt||' \ + -e '/PKG_CONFIG.*lib.*> ${PLIST} -.for locale in ach cgg bn_IN ckb co ff fur gd ia kk km kmr lg my oc ps tet tl zu +.for locale in ach an cgg bn_IN ckb co ff fur gd ia kk km kmr lg my oc ps tet tl zu ${ECHO_CMD} "@dirrmtry share/locale/${locale}/LC_MESSAGES" >> ${PLIST} ${ECHO_CMD} "@dirrmtry share/locale/${locale}" >> ${PLIST} .endfor