From 91df31c49f2d6085d195004a74d0890250475aaa Mon Sep 17 00:00:00 2001 From: nox Date: Wed, 5 Sep 2012 20:37:05 +0000 Subject: - 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 (via private email) [2] --- multimedia/vlc/Makefile | 2 +- multimedia/vlc/files/patch-include-vlc_common.h | 11 +++++++++++ multimedia/vlc/files/patch-src-network-udp.c | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 multimedia/vlc/files/patch-include-vlc_common.h create mode 100644 multimedia/vlc/files/patch-src-network-udp.c (limited to 'multimedia/vlc') diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 43cf2fa6097d..165435a7548f 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -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/}/ \ diff --git a/multimedia/vlc/files/patch-include-vlc_common.h b/multimedia/vlc/files/patch-include-vlc_common.h new file mode 100644 index 000000000000..b5b6a19907a6 --- /dev/null +++ b/multimedia/vlc/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 diff --git a/multimedia/vlc/files/patch-src-network-udp.c b/multimedia/vlc/files/patch-src-network-udp.c new file mode 100644 index 000000000000..fdd940b5fe0c --- /dev/null +++ b/multimedia/vlc/files/patch-src-network-udp.c @@ -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; -- cgit