From owner-svn-ports-head@FreeBSD.ORG Mon Feb 17 16:18:25 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4524416D; Mon, 17 Feb 2014 16:18:25 +0000 (UTC) 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 316E3133B; Mon, 17 Feb 2014 16:18:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HGIP8s031402; Mon, 17 Feb 2014 16:18:25 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HGIOh8031400; Mon, 17 Feb 2014 16:18:24 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201402171618.s1HGIOh8031400@svn.freebsd.org> From: Thomas Zander Date: Mon, 17 Feb 2014 16:18:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344790 - head/multimedia/xbmc 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.17 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: Mon, 17 Feb 2014 16:18:25 -0000 Author: riggs Date: Mon Feb 17 16:18:24 2014 New Revision: 344790 URL: http://svnweb.freebsd.org/changeset/ports/344790 QAT: https://qat.redports.org/buildarchive/r344790/ Log: - Fix build error during staging phase - Pet portlint PR: ports/186529 Submitted by: Matthew Rezny , mickael.maillot@gmail.com (maintainer) Approved by: jadawin (co-mentor), mickael.maillot@gmail.com (maintainer) Modified: head/multimedia/xbmc/Makefile head/multimedia/xbmc/pkg-plist Modified: head/multimedia/xbmc/Makefile ============================================================================== --- head/multimedia/xbmc/Makefile Mon Feb 17 16:14:39 2014 (r344789) +++ head/multimedia/xbmc/Makefile Mon Feb 17 16:18:24 2014 (r344790) @@ -10,11 +10,6 @@ COMMENT= Award winning media center appl LICENSE= GPLv2 -USE_GITHUB= yes -GH_ACCOUNT= xbmc -GH_COMMIT= 8eb49b3 -GH_TAGNAME= Gotham_alpha11 - BUILD_DEPENDS= enca:${PORTSDIR}/converters/enca \ gawk:${PORTSDIR}/lang/gawk \ gperf:${PORTSDIR}/devel/gperf \ @@ -57,6 +52,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqli ${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging \ xdpyinfo:${PORTSDIR}/x11/xdpyinfo +USE_GITHUB= yes +GH_ACCOUNT= xbmc +GH_COMMIT= 8eb49b3 +GH_TAGNAME= Gotham_alpha11 + USES= gmake iconv:wchar_t pkgconfig USE_AUTOTOOLS= autoconf libtool automake libltdl GNU_CONFIGURE= yes @@ -77,6 +77,7 @@ DESKTOP_ENTRIES="XBMC" \ "AudioVideo;Video;" \ true +OPTIONS_SUB= yes OPTIONS_DEFINE= AIRPLAY AIRTUNES AVAHI CEC LAME \ LIBBLURAY HAL LIRC MYSQL NONFREE PULSEAUDIO RTMP SFTP \ SMB VAAPI VDPAU VORBIS WEBSERVER XRANDR @@ -111,9 +112,13 @@ HAL_CONFIGURE_ENABLE= hal LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CONFIGURE_ENABLE= libmp3lame +LIRC_RUN_DEPENDS= lircd:${PORTSDIR}/comms/lirc + MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ENABLE= mysql +NONFREE_CONFIGURE_ENABLE= non-free + PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse @@ -139,6 +144,9 @@ SFTP_BUILD_DEPENDS= ${LOCALBASE}/lib/lib SFTP_RUN_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh SFTP_CONFIGURE_ENABLE= ssh +XRANDR_USE= XORG=xrandr +XRANDR_CONFIGURE_ENABLE= xrandr + CONFIGURE_ARGS+= --disable-debug --disable-nfs --disable-alsa .include @@ -155,25 +163,9 @@ CONFIGURE_ENV+= COMPILER_PATH=${LOCALBAS MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif -.if ${PORT_OPTIONS:MLIRC} -RUN_DEPENDS+= lircd:${PORTSDIR}/comms/lirc -.endif - .if ${PORT_OPTIONS:MNONFREE} -CONFIGURE_ARGS+= --enable-non-free NO_CDROM= Restricted binary distribution NO_PACKAGE= ${NO_CDROM} -.else -CONFIGURE_ARGS+= --disable-non-free -.endif - -.if ${PORT_OPTIONS:MXRANDR} -CONFIGURE_ARGS+= --enable-xrandr -USE_XORG+= xrandr -PLIST_SUB+= XRANDR="" -.else -CONFIGURE_ARGS+= --disable-xrandr -PLIST_SUB+= XRANDR="@comment " .endif post-patch: Modified: head/multimedia/xbmc/pkg-plist ============================================================================== --- head/multimedia/xbmc/pkg-plist Mon Feb 17 16:14:39 2014 (r344789) +++ head/multimedia/xbmc/pkg-plist Mon Feb 17 16:18:24 2014 (r344790) @@ -31,7 +31,7 @@ lib/xbmc/addons/visualization.projectm/p lib/xbmc/addons/visualization.waveform/Waveform.vis lib/xbmc/system/ImageLib-%%ARCH%%-freebsd.so lib/xbmc/system/hdhomerun-%%ARCH%%-freebsd.so -lib/xbmc/system/libcmyth-%%ARCH%%-freebsd.so +%%MYSQL%%lib/xbmc/system/libcmyth-%%ARCH%%-freebsd.so lib/xbmc/system/libcpluff-%%ARCH%%-freebsd.so lib/xbmc/system/libexif-%%ARCH%%-freebsd.so lib/xbmc/system/players/dvdplayer/avcodec-54-%%ARCH%%-freebsd.so