From owner-svn-ports-head@FreeBSD.ORG Fri Oct 25 14:41:09 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BAAD7870; Fri, 25 Oct 2013 14:41:09 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8E4C82B46; Fri, 25 Oct 2013 14:41:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9PEf9IJ097844; Fri, 25 Oct 2013 14:41:09 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9PEf8YZ097842; Fri, 25 Oct 2013 14:41:08 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201310251441.r9PEf8YZ097842@svn.freebsd.org> From: Ulrich Spoerlein Date: Fri, 25 Oct 2013 14:41:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331589 - in head/multimedia/xbmc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Oct 2013 14:41:09 -0000 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 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 display_global; ++ static boost::weak_ptr display_global; + + CDisplayPtr display(display_global.lock()); + if(display)