diff options
| author | Ulrich Spörlein <uqs@FreeBSD.org> | 2013-10-25 14:41:08 +0000 |
|---|---|---|
| committer | Ulrich Spörlein <uqs@FreeBSD.org> | 2013-10-25 14:41:08 +0000 |
| commit | cf78c9a1eb758d093572edb89017d6cb010d94c4 (patch) | |
| tree | b6e9c2337d775a3688fea592954163bed64ebd03 | |
| parent | Support staging. (diff) | |
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
Notes
Notes:
svn path=/head/; revision=331589
| -rw-r--r-- | multimedia/xbmc/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VAAPI.cpp | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile index 33627246898e..3f240d8f9c48 100644 --- a/multimedia/xbmc/Makefile +++ b/multimedia/xbmc/Makefile @@ -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 (rar, ccx, ffmpeg) 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> diff --git a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VAAPI.cpp b/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VAAPI.cpp new file mode 100644 index 000000000000..27ce4d4a531c --- /dev/null +++ b/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VAAPI.cpp @@ -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) |