svn commit: r331589 - in head/multimedia/xbmc: . files

[Ulrich Spoerlein]

Author: uqs
Date: Fri Oct 25 14:41:08 2013
New Revision: 331589
URL: http://svnweb.freebsd.org/changeset/ports/331589

Log:
  Disable the default dependency on LAME for xbmc so that package building
  and distribution becomes possible.
  
  LAME is a restricted package so we cannot ship a package that depends on it.
  According to the maintainer it is only used for ripping CDs, and there are
  better tools than XBMC to do just that.
  
  Also fix the build with a C11 compiler (clang). There's now a weak_ptr in
  boost::, and one in std::.
  
  Approved by:	maintainer

Added:
  head/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VAAPI.cpp   (contents, props changed)
Modified:
  head/multimedia/xbmc/Makefile

Modified: head/multimedia/xbmc/Makefile
==============================================================================
--- head/multimedia/xbmc/Makefile	Fri Oct 25 14:33:17 2013	(r331588)
+++ head/multimedia/xbmc/Makefile	Fri Oct 25 14:41:08 2013	(r331589)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xbmc
 DISTVERSION=	12.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mirrors.xbmc.org/releases/source/
 
@@ -85,7 +85,7 @@ NONFREE_DESC=	Enable non-free components
 SFTP_DESC=	SSH SFTP support via libssh
 VORBIS_DESC=	Ogg Vorbis audio encoder
 
-OPTIONS_DEFAULT=	AIRPLAY AVAHI CEC LAME LIBBLURAY HAL MYSQL \
+OPTIONS_DEFAULT=	AIRPLAY AVAHI CEC LIBBLURAY HAL MYSQL \
 			RTMP SFTP SMB VORBIS WEBSERVER
 
 .include <bsd.port.pre.mk>

Added: head/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VAAPI.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VAAPI.cpp	Fri Oct 25 14:41:08 2013	(r331589)
@@ -0,0 +1,11 @@
+--- xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp.orig	2013-10-19 23:07:02.530131780 +0200
++++ xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp	2013-10-19 23:06:38.499626784 +0200
+@@ -74,7 +74,7 @@
+ 
+ static CDisplayPtr GetGlobalDisplay()
+ {
+-  static weak_ptr<CDisplay> display_global;
++  static boost::weak_ptr<CDisplay> display_global;
+ 
+   CDisplayPtr display(display_global.lock());
+   if(display)