I have WITH_CLANG_IS_CC=1 in /etc/src.conf, so /usr/bin/cc is clang and /usr/bin/c++ is clang++. clang++ -v: FreeBSD clang version 3.1 (branches/release_31 156863) 20120523 My /etc/make.conf: CC=clang CXX=clang++ CXXFLAGS=-stdlib=libc++ -std=c++11 -Wno-c++11-narrowing When running portmaster vlc- i get: CXX libspatializer_plugin_la-spatializer.lo In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:653:24: error: C++ requires a type specifier for all declarations static inline uint16_t bswap16 (uint16_t x) ^~~~~~~~~~~~~~~~~~~~ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:16: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^~~~~~~~~~~~~~~~~~~~ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:653:24: error: expected ')' static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:41: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ ./../include/vlc_common.h:653:24: note: to match this '(' static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:15: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:655:13: error: use of undeclared identifier 'x' return (x << 8) | (x >> 8); ^ ./../include/vlc_common.h:655:24: error: use of undeclared identifier 'x' return (x << 8) | (x >> 8); ^ ./../include/vlc_common.h:660:24: error: expected ')' static inline uint32_t bswap32 (uint32_t x) ^ /usr/include/sys/endian.h:60:20: note: expanded from macro 'bswap32' #define bswap32(x) __bswap32(x) ^ /usr/include/machine/endian.h:118:28: note: expanded from macro '__bswap32' (__builtin_constant_p(_x) ? \ ^ ./../include/vlc_common.h:660:24: note: to match this '(' static inline uint32_t bswap32 (uint32_t x) ^ /usr/include/sys/endian.h:60:20: note: expanded from macro 'bswap32' #define bswap32(x) __bswap32(x) ^ /usr/include/machine/endian.h:118:2: note: expanded from macro '__bswap32' (__builtin_constant_p(_x) ? \ ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:660:24: error: static declaration of '__builtin_constant_p' follows non-static declaration static inline uint32_t bswap32 (uint32_t x) ^ /usr/include/sys/endian.h:60:20: note: expanded from macro 'bswap32' #define bswap32(x) __bswap32(x) ^ /usr/include/machine/endian.h:118:3: note: expanded from macro '__bswap32' (__builtin_constant_p(_x) ? \ ^ ./../include/vlc_common.h:653:24: note: previous implicit declaration is here static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:16: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:660:24: error: definition of builtin function '__builtin_constant_p' static inline uint32_t bswap32 (uint32_t x) ^ /usr/include/sys/endian.h:60:20: note: expanded from macro 'bswap32' #define bswap32(x) __bswap32(x) ^ /usr/include/machine/endian.h:118:3: note: expanded from macro '__bswap32' (__builtin_constant_p(_x) ? \ ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:674:24: error: expected ')' static inline uint64_t bswap64 (uint64_t x) ^ /usr/include/sys/endian.h:61:20: note: expanded from macro 'bswap64' #define bswap64(x) __bswap64(x) ^ /usr/include/machine/endian.h:114:28: note: expanded from macro '__bswap64' (__builtin_constant_p(_x) ? \ ^ ./../include/vlc_common.h:674:24: note: to match this '(' static inline uint64_t bswap64 (uint64_t x) ^ /usr/include/sys/endian.h:61:20: note: expanded from macro 'bswap64' #define bswap64(x) __bswap64(x) ^ /usr/include/machine/endian.h:114:2: note: expanded from macro '__bswap64' (__builtin_constant_p(_x) ? \ ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:674:24: error: static declaration of '__builtin_constant_p' follows non-static declaration static inline uint64_t bswap64 (uint64_t x) ^ /usr/include/sys/endian.h:61:20: note: expanded from macro 'bswap64' #define bswap64(x) __bswap64(x) ^ /usr/include/machine/endian.h:114:3: note: expanded from macro '__bswap64' (__builtin_constant_p(_x) ? \ ^ ./../include/vlc_common.h:653:24: note: previous implicit declaration is here static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' CC libheadphone_channel_mixer_plugin_la-headphone.lo #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:16: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:674:24: error: definition of builtin function '__builtin_constant_p' static inline uint64_t bswap64 (uint64_t x) ^ /usr/include/sys/endian.h:61:20: note: expanded from macro 'bswap64' #define bswap64(x) __bswap64(x) ^ /usr/include/machine/endian.h:114:3: note: expanded from macro '__bswap64' (__builtin_constant_p(_x) ? \ ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:732:12: error: reference to '__uint16_t' is ambiguous return ntoh16 (x); ^ ./../include/vlc_common.h:721:19: note: expanded from macro 'ntoh16' #define ntoh16(i) hton16(i) ^ ./../include/vlc_common.h:717:20: note: expanded from macro 'hton16' # define hton16(i) bswap16(i) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:4: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ ./../include/vlc_common.h:653:24: note: candidate found by name lookup is '__uint16_t' static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:4: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ /usr/include/machine/_types.h:54:25: note: candidate found by name lookup is '__uint16_t' typedef unsigned short __uint16_t; ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:732:12: error: reference to '__uint16_t' is ambiguous return ntoh16 (x); ^ ./../include/vlc_common.h:721:19: note: expanded from macro 'ntoh16' #define ntoh16(i) hton16(i) ^ ./../include/vlc_common.h:717:20: note: expanded from macro 'hton16' # define hton16(i) bswap16(i) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:123:6: note: expanded from macro '__bswap16' __bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))) ^ /usr/include/machine/endian.h:88:30: note: expanded from macro '__bswap16_const' #define __bswap16_const(_x) (__uint16_t)((_x) << 8 | (_x) >> 8) ^ ./../include/vlc_common.h:653:24: note: candidate found by name lookup is '__uint16_t' static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:4: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ /usr/include/machine/_types.h:54:25: note: candidate found by name lookup is '__uint16_t' typedef unsigned short __uint16_t; ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:732:12: error: reference to '__uint16_t' is ambiguous return ntoh16 (x); ^ ./../include/vlc_common.h:721:19: note: expanded from macro 'ntoh16' #define ntoh16(i) hton16(i) ^ ./../include/vlc_common.h:717:20: note: expanded from macro 'hton16' # define hton16(i) bswap16(i) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:123:23: note: expanded from macro '__bswap16' __bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))) ^ /usr/include/machine/endian.h:88:43: note: expanded from macro '__bswap16_const' #define __bswap16_const(_x) (__uint16_t)((_x) << 8 | (_x) >> 8) ^ ./../include/vlc_common.h:653:24: note: candidate found by name lookup is '__uint16_t' static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:4: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ /usr/include/machine/_types.h:54:25: note: candidate found by name lookup is '__uint16_t' typedef unsigned short __uint16_t; ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:732:12: error: reference to '__uint16_t' is ambiguous return ntoh16 (x); ^ ./../include/vlc_common.h:721:19: note: expanded from macro 'ntoh16' #define ntoh16(i) hton16(i) ^ ./../include/vlc_common.h:717:20: note: expanded from macro 'hton16' # define hton16(i) bswap16(i) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:123:23: note: expanded from macro '__bswap16' __bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))) ^ /usr/include/machine/endian.h:88:55: note: expanded from macro '__bswap16_const' #define __bswap16_const(_x) (__uint16_t)((_x) << 8 | (_x) >> 8) ^ ./../include/vlc_common.h:653:24: note: candidate found by name lookup is '__uint16_t' static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:4: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ /usr/include/machine/_types.h:54:25: note: candidate found by name lookup is '__uint16_t' typedef unsigned short __uint16_t; ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:801:9: error: reference to '__uint16_t' is ambiguous w = hton16 (w); ^ ./../include/vlc_common.h:717:20: note: expanded from macro 'hton16' # define hton16(i) bswap16(i) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:4: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ ./../include/vlc_common.h:653:24: note: candidate found by name lookup is '__uint16_t' static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:4: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ /usr/include/machine/_types.h:54:25: note: candidate found by name lookup is '__uint16_t' typedef unsigned short __uint16_t; ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:801:9: error: reference to '__uint16_t' is ambiguous w = hton16 (w); ^ ./../include/vlc_common.h:717:20: note: expanded from macro 'hton16' # define hton16(i) bswap16(i) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:123:6: note: expanded from macro '__bswap16' __bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))) ^ /usr/include/machine/endian.h:88:30: note: expanded from macro '__bswap16_const' #define __bswap16_const(_x) (__uint16_t)((_x) << 8 | (_x) >> 8) ^ ./../include/vlc_common.h:653:24: note: candidate found by name lookup is '__uint16_t' static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:4: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ /usr/include/machine/_types.h:54:25: note: candidate found by name lookup is '__uint16_t' typedef unsigned short __uint16_t; ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:801:9: error: reference to '__uint16_t' is ambiguous w = hton16 (w); ^ ./../include/vlc_common.h:717:20: note: expanded from macro 'hton16' # define hton16(i) bswap16(i) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:123:23: note: expanded from macro '__bswap16' __bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))) ^ /usr/include/machine/endian.h:88:43: note: expanded from macro '__bswap16_const' #define __bswap16_const(_x) (__uint16_t)((_x) << 8 | (_x) >> 8) ^ ./../include/vlc_common.h:653:24: note: candidate found by name lookup is '__uint16_t' static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:4: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ /usr/include/machine/_types.h:54:25: note: candidate found by name lookup is '__uint16_t' typedef unsigned short __uint16_t; ^ In file included from spatializer/spatializer.cpp:40: ./../include/vlc_common.h:801:9: error: reference to '__uint16_t' is ambiguous w = hton16 (w); ^ ./../include/vlc_common.h:717:20: note: expanded from macro 'hton16' # define hton16(i) bswap16(i) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:123:23: note: expanded from macro '__bswap16' __bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))) ^ /usr/include/machine/endian.h:88:55: note: expanded from macro '__bswap16_const' #define __bswap16_const(_x) (__uint16_t)((_x) << 8 | (_x) >> 8) ^ ./../include/vlc_common.h:653:24: note: candidate found by name lookup is '__uint16_t' static inline uint16_t bswap16 (uint16_t x) ^ /usr/include/sys/endian.h:59:20: note: expanded from macro 'bswap16' #define bswap16(x) __bswap16(x) ^ /usr/include/machine/endian.h:122:4: note: expanded from macro '__bswap16' ((__uint16_t)(__builtin_constant_p(_x) ? \ ^ /usr/include/machine/_types.h:54:25: note: candidate found by name lookup is '__uint16_t' typedef unsigned short __uint16_t; ^ 18 errors generated. gmake[4]: *** [libspatializer_plugin_la-spatializer.lo] Error 1 gmake[4]: *** Waiting for unfinished jobs.... gmake[4]: Leaving directory `/usr/ports/multimedia/vlc/work/vlc-2.0.3/modules/audio_filter' gmake[3]: *** [all] Error 2 How-To-Repeat: Build port with CC=clang and CXX=clang++
Responsible Changed From-To: freebsd-ports-bugs->freebsd-multimedia Over to maintainer (via the GNATS Auto Assign Tool)
Interesting that this didn't occur when I tested clang... Anyway, can you try this patch: (put it in files/patch-include-vlc_common.h ) --- include/vlc_common.h.orig +++ include/vlc_common.h @@ -642,7 +642,7 @@ static inline unsigned popcount (unsigne #endif } -#ifdef __OS2__ +#if defined(__OS2__) || defined(__FreeBSD__) # undef bswap16 # undef bswap32 # undef bswap64 Thanx! Juergen
[Now with the right PR, sorry] Hm query-pr.cgi doesn't pick up the patch properly, here is it again, this time against the port dir: Index: files/patch-include-vlc_common.h =================================================================== --- files/patch-include-vlc_common.h.orig +++ files/patch-include-vlc_common.h @@ -0,0 +1,11 @@ +--- include/vlc_common.h.orig ++++ include/vlc_common.h +@@ -642,7 +642,7 @@ static inline unsigned popcount (unsigne + #endif + } + +-#ifdef __OS2__ ++#if defined(__OS2__) || defined(__FreeBSD__) + # undef bswap16 + # undef bswap32 + # undef bswap64
Now it goes farther, but dies with: CXX dialogs/libqt4_plugin_la-help.lo dialogs/help.cpp:115:27: error: differing user-defined suffixes ('__DATE__' and '__TIME__') in string literal concatenation + " ("__DATE__" "__TIME__").\n" ~~~~~~~~~~~~^~~~~~~~~~~ 1 error generated. gmake[6]: *** [dialogs/libqt4_plugin_la-help.lo] Error 1 gmake[6]: Leaving directory `/usr/ports/multimedia/vlc/work/vlc-2.0.3/modules/gui/qt4' On Wed, Sep 5, 2012 at 9:36 PM, Juergen Lock <nox@jelal.kn-bremen.de> wrote: > [Now with the right PR, sorry] > > Hm query-pr.cgi doesn't pick up the patch properly, here is it again, > this time against the port dir: > > Index: files/patch-include-vlc_common.h > =================================================================== > --- files/patch-include-vlc_common.h.orig > +++ files/patch-include-vlc_common.h > @@ -0,0 +1,11 @@ > +--- include/vlc_common.h.orig > ++++ include/vlc_common.h > +@@ -642,7 +642,7 @@ static inline unsigned popcount (unsigne > + #endif > + } > + > +-#ifdef __OS2__ > ++#if defined(__OS2__) || defined(__FreeBSD__) > + # undef bswap16 > + # undef bswap32 > + # undef bswap64 > >
I've now put the patch here: http://people.freebsd.org/~nox/tmp/vlc-2.0.3-clang.patch
On Wed, Sep 05, 2012 at 10:09:21PM +0400, arrowdodger wrote: > Now it goes farther, but dies with: > > CXX dialogs/libqt4_plugin_la-help.lo > dialogs/help.cpp:115:27: error: differing user-defined suffixes ('__DATE__' > and '__TIME__') in string literal concatenation > + " ("__DATE__" "__TIME__").\n" > ~~~~~~~~~~~~^~~~~~~~~~~ > 1 error generated. > gmake[6]: *** [dialogs/libqt4_plugin_la-help.lo] Error 1 > gmake[6]: Leaving directory > `/usr/ports/multimedia/vlc/work/vlc-2.0.3/modules/gui/qt4' > Hm what if you try w/o your CXXFLAGS=-stdlib=libc++ -std=c++11 -Wno-c++11-narrowing ? Or else try this updated patch; also at: http://people.freebsd.org/~nox/tmp/vlc-2.0.3-clang.patch Index: files/patch-include-vlc_common.h =================================================================== --- files/patch-include-vlc_common.h.orig +++ files/patch-include-vlc_common.h @@ -0,0 +1,11 @@ +--- include/vlc_common.h.orig ++++ include/vlc_common.h +@@ -642,7 +642,7 @@ static inline unsigned popcount (unsigne + #endif + } + +-#ifdef __OS2__ ++#if defined(__OS2__) || defined(__FreeBSD__) + # undef bswap16 + # undef bswap32 + # undef bswap64 Index: files/patch-modules-gui-qt4-dialogs-help.cpp =================================================================== --- files/patch-modules-gui-qt4-dialogs-help.cpp.orig +++ files/patch-modules-gui-qt4-dialogs-help.cpp @@ -0,0 +1,11 @@ +--- modules/gui/qt4/dialogs/help.cpp.orig ++++ modules/gui/qt4/dialogs/help.cpp +@@ -112,7 +112,7 @@ AboutDialog::AboutDialog( intf_thread_t + "popular platform.\n\n" ) + + qtr( "This version of VLC was compiled by:\n " ) + + qfu( VLC_CompileBy() )+ " on " + qfu( VLC_CompileHost() ) + +- + " ("__DATE__" "__TIME__").\n" ++ + " (" + __DATE__ + " " + __TIME__ + ").\n" + + qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n" + + qtr( "You are using the Qt4 Interface.\n\n" ) + + qtr( "Copyright (C) " ) + COPYRIGHT_YEARS Thanx! Juergen
On Wed, Sep 05, 2012 at 08:55:42PM +0200, Juergen Lock wrote: > On Wed, Sep 05, 2012 at 10:09:21PM +0400, arrowdodger wrote: > > [...] > Hm what if you try w/o your > > CXXFLAGS=-stdlib=libc++ -std=c++11 -Wno-c++11-narrowing > > ? > > Or else try this updated patch; also at: > > http://people.freebsd.org/~nox/tmp/vlc-2.0.3-clang.patch > > [...] Hm I now tried your CXXFLAGS and get further failures in work/vlc-2.0.3/modules/audio_filter/spatializer/spatializer.cpp - I guess the vlc code is simply not c++11 ready. Sorry... Juergen
Author: nox Date: Wed Sep 5 20:37:05 2012 New Revision: 303722 URL: http://svn.freebsd.org/changeset/ports/303722 Log: - Add patch for (possible) compilation failure - even though the CXXFLAGS used in the PR are not supported. [1] - Fix runtime issue receiving UDP multicast streams. [2] - Bump PORTREVISION. PR: ports/171341 [1] Submitted by: arrowdodger <6yearold@gmail.com> [1] Reported by: Sulev-Madis Silber <madis555@hot.ee> (via private email) [2] Added: head/multimedia/vlc/files/patch-include-vlc_common.h (contents, props changed) head/multimedia/vlc/files/patch-src-network-udp.c (contents, props changed) Modified: head/multimedia/vlc/Makefile Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Wed Sep 5 19:21:31 2012 (r303721) +++ head/multimedia/vlc/Makefile Wed Sep 5 20:37:05 2012 (r303722) @@ -7,7 +7,7 @@ PORTNAME= vlc DISTVERSION= 2.0.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/p/-pre/}/ \ Added: head/multimedia/vlc/files/patch-include-vlc_common.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-include-vlc_common.h Wed Sep 5 20:37:05 2012 (r303722) @@ -0,0 +1,11 @@ +--- include/vlc_common.h.orig ++++ include/vlc_common.h +@@ -642,7 +642,7 @@ static inline unsigned popcount (unsigne + #endif + } + +-#ifdef __OS2__ ++#if defined(__OS2__) || defined(__FreeBSD__) + # undef bswap16 + # undef bswap32 + # undef bswap64 Added: head/multimedia/vlc/files/patch-src-network-udp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-src-network-udp.c Wed Sep 5 20:37:05 2012 (r303722) @@ -0,0 +1,11 @@ +--- src/network/udp.c.orig ++++ src/network/udp.c +@@ -383,7 +383,7 @@ int net_Subscribe (vlc_object_t *obj, in + { + /* MCAST_JOIN_GROUP was introduced to OS X in v10.7, but it doesn't work, + * so ignore it to use the same code as on 10.5 or 10.6 */ +-#if defined (MCAST_JOIN_GROUP) && !defined (__APPLE__) ++#if defined (MCAST_JOIN_GROUP) && !defined (__APPLE__) && !defined (__FreeBSD__) + /* Agnostic SSM multicast join */ + int level; + struct group_req gr; _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed (Partly) fix commited - the CXXFLAGS used in the PR are not actually supported.