aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorriggs <riggs@FreeBSD.org>2014-02-18 00:18:24 +0800
committerriggs <riggs@FreeBSD.org>2014-02-18 00:18:24 +0800
commit5e259741c9c0ce2aae2ce65d55ef302f470b93ee (patch)
treea8d95ad2328e6bd1cf9a38eb4b4198850d297116
parent5064db07a5b58884e32d81052fe288df0bb76c41 (diff)
downloadfreebsd-ports-gnome-5e259741c9c0ce2aae2ce65d55ef302f470b93ee.tar.gz
freebsd-ports-gnome-5e259741c9c0ce2aae2ce65d55ef302f470b93ee.tar.zst
freebsd-ports-gnome-5e259741c9c0ce2aae2ce65d55ef302f470b93ee.zip
- Fix build error during staging phase
- Pet portlint PR: ports/186529 Submitted by: Matthew Rezny <matthew@reztek.cz>, mickael.maillot@gmail.com (maintainer) Approved by: jadawin (co-mentor), mickael.maillot@gmail.com (maintainer)
-rw-r--r--multimedia/xbmc/Makefile34
-rw-r--r--multimedia/xbmc/pkg-plist2
2 files changed, 14 insertions, 22 deletions
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 8260a2aa5b74..2d3826ee28c2 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -10,11 +10,6 @@ COMMENT= Award winning media center application
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}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
${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/libssh.so:${PORTSDIR}/security/libssh
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 <bsd.port.options.mk>
@@ -155,25 +163,9 @@ CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
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:
diff --git a/multimedia/xbmc/pkg-plist b/multimedia/xbmc/pkg-plist
index 33e41f48bfdd..3a305ffd371c 100644
--- a/multimedia/xbmc/pkg-plist
+++ b/multimedia/xbmc/pkg-plist
@@ -31,7 +31,7 @@ lib/xbmc/addons/visualization.projectm/projectM.vis
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