Date: Fri, 28 Jun 2019 06:11:00 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505267 - head/multimedia/kodi-devel Message-ID: <201906280611.x5S6B0r5047478@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Jun 28 06:11:00 2019 New Revision: 505267 URL: https://svnweb.freebsd.org/changeset/ports/505267 Log: multimedia/kodi-devel: Cosmetic changes - Pet portclippy and portfmt Modified: head/multimedia/kodi-devel/Makefile Modified: head/multimedia/kodi-devel/Makefile ============================================================================== --- head/multimedia/kodi-devel/Makefile Fri Jun 28 05:38:28 2019 (r505266) +++ head/multimedia/kodi-devel/Makefile Fri Jun 28 06:11:00 2019 (r505267) @@ -56,43 +56,43 @@ USE_GITHUB= yes GH_ACCOUNT= xbmc GH_PROJECT= xbmc GH_TAGNAME= d14a5bf1066d3412f488b2ce9e286fc9b30d2c8f -USE_GNOME= libxslt libxml2 +USE_GNOME= libxml2 libxslt USE_JAVA= yes JAVA_BUILD= yes USE_LDCONFIG= yes -CONFLICTS_INSTALL= kodi - -CMAKE_ARGS= -DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include" \ +CMAKE_ARGS= -DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" \ -DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \ - -DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" -CMAKE_OFF= ENABLE_ALSA \ - ENABLE_DVDCSS \ - ENABLE_INTERNAL_FFMPEG \ - ENABLE_INTERNAL_CROSSGUID -CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB}" OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - CPU_FEATURES=" Features=0xdeadbeef<${CPU_FEATURES:ts,}>" + -DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include" +CMAKE_OFF= ENABLE_ALSA ENABLE_DVDCSS ENABLE_INTERNAL_CROSSGUID \ + ENABLE_INTERNAL_FFMPEG +CONFIGURE_ENV= CPU_FEATURES=" Features=0xdeadbeef<${_CPU_FEATURES:ts,}>" \ + OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + OPENSSL_LIBS="-L${OPENSSLLIB}" -KODIARCH_i386= x86 -KODIARCH_amd64= x86_64 +CONFLICTS_INSTALL= kodi -PLIST_SUB= ARCH=${KODIARCH_${ARCH}:U${ARCH}} OPSYS=${OPSYS:tl} -PORTDATA= * +_KODIARCH_i386= x86 +_KODIARCH_amd64= x86_64 +PLIST_SUB= ARCH=${_KODIARCH_${ARCH}:U${ARCH}} \ + OPSYS=${OPSYS:tl} +PORTDATA= * -OPTIONS_DEFINE= AVAHI CEC DBUS LIBBLURAY MYSQL NFS SMB SSE UPNP VAAPI VDPAU WEBSERVER -OPTIONS_DEFAULT= DBUS GBM LIBBLURAY UPNP VAAPI VDPAU WEBSERVER WAYLAND X11 +OPTIONS_DEFINE= AVAHI CEC DBUS LIBBLURAY MYSQL NFS SMB SSE UPNP VAAPI \ + VDPAU WEBSERVER +OPTIONS_DEFAULT= DBUS GBM LIBBLURAY UPNP VAAPI VDPAU WAYLAND WEBSERVER \ + X11 OPTIONS_DEFAULT_amd64= SSE -OPTIONS_MULTI= PLATFORM +OPTIONS_GROUP= SOUND +OPTIONS_GROUP_SOUND= PULSEAUDIO SNDIO +OPTIONS_MULTI= PLATFORM OPTIONS_MULTI_PLATFORM= GBM RPI WAYLAND X11 OPTIONS_EXCLUDE_amd64= RPI OPTIONS_EXCLUDE_armv6= SSE OPTIONS_EXCLUDE_armv7= SSE OPTIONS_EXCLUDE_i386= RPI -OPTIONS_SUB= yes +OPTIONS_SUB= yes -OPTIONS_GROUP= SOUND -OPTIONS_GROUP_SOUND= PULSEAUDIO SNDIO - CEC_DESC= CEC adapter support GBM_DESC= GBM support (requires a kernel with evdev support) PLATFORM_DESC= Platform @@ -107,13 +107,13 @@ CEC_CMAKE_BOOL= ENABLE_CEC DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CMAKE_BOOL= ENABLE_DBUS -KODI_GBM_ARGS= -DCORE_PLATFORM_NAME:STRING="gbm" \ - -DGBM_RENDER_SYSTEM:STRING="gl" GBM_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto GBM_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon -GBM_VARS= KODI_PLATFORMS+=GBM +GBM_VARS= _KODI_PLATFORMS+=GBM +_KODI_GBM_ARGS= -DCORE_PLATFORM_NAME:STRING="gbm" \ + -DGBM_RENDER_SYSTEM:STRING="gl" LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CMAKE_BOOL= ENABLE_BLURAY @@ -130,58 +130,57 @@ PULSEAUDIO_CMAKE_BOOL= ENABLE_PULSEAUDIO # For RPI, disable VAAPI in multimedia/ffmpeg too, so that mesa-libs # is *not* installed via libva in the build environment. Both # mesa-libs and raspberrypi-userland conflict with each other. -KODI_RBPI_ARGS= -DCORE_PLATFORM_NAME:STRING="rbpi" -RPI_LIB_DEPENDS= libbrcmEGL.so:misc/raspberrypi-userland -RPI_LIB_DEPENDS_OFF= libdrm.so:graphics/libdrm RPI_PREVENTS= GBM VAAPI VDPAU WAYLAND X11 +RPI_LIB_DEPENDS_OFF= libdrm.so:graphics/libdrm +RPI_LIB_DEPENDS= libbrcmEGL.so:misc/raspberrypi-userland RPI_USES_OFF= gl RPI_USE_OFF= GL=egl,gl,glu RPI_VARS= KODI_PLATFORMS+=RBPI +_KODI_RBPI_ARGS= -DCORE_PLATFORM_NAME:STRING="rbpi" -SMB_USES= samba:lib -SMB_CMAKE_BOOL= ENABLE_SMBCLIENT +SMB_USES= samba:lib +SMB_CMAKE_BOOL= ENABLE_SMBCLIENT SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CMAKE_BOOL= ENABLE_SNDIO -SSE_CPU_FEATURES= SSE SSE2 SSE3 SSSE3 SSE4.1 SSE4.2 -SSE_CMAKE_BOOL= ${SSE_CPU_FEATURES:S/./_/g:S/^/ENABLE_/} -SSE_VARS= CPU_FEATURES+=${SSE_CPU_FEATURES:ts,} +SSE_CMAKE_BOOL= ${_SSE_CPU_FEATURES:S/./_/g:S/^/ENABLE_/} +SSE_VARS= _CPU_FEATURES+=${_SSE_CPU_FEATURES:ts,} +_SSE_CPU_FEATURES= SSE SSE2 SSE3 SSE4.1 SSE4.2 SSSE3 UPNP_CMAKE_BOOL= ENABLE_UPNP # XXX: Upstream is https://github.com/plutinosoft/Neptune UPNP_CXXFLAGS= -DNPT_CONFIG_HAVE_ARPA_INET_H \ -DNPT_CONFIG_HAVE_GETADDRINFO \ -DNPT_CONFIG_HAVE_GETIFADDRS \ - -DNPT_CONFIG_HAVE_INET_NTOP \ - -DNPT_CONFIG_HAVE_INET_PTON \ + -DNPT_CONFIG_HAVE_INET_NTOP -DNPT_CONFIG_HAVE_INET_PTON \ -DNPT_CONFIG_HAVE_NET_IF_DL_H \ -DNPT_CONFIG_HAVE_SOCKADDR_DL \ -DNPT_CONFIG_HAVE_SOCKADDR_IN_SIN_LEN -VAAPI_CMAKE_BOOL= ENABLE_VAAPI VAAPI_LIB_DEPENDS= libva.so:multimedia/libva +VAAPI_CMAKE_BOOL= ENABLE_VAAPI -VDPAU_CMAKE_BOOL= ENABLE_VDPAU VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau +VDPAU_CMAKE_BOOL= ENABLE_VDPAU -KODI_WAYLAND_ARGS= -DCORE_PLATFORM_NAME:STRING="wayland" \ - -DWAYLAND_RENDER_SYSTEM:STRING="gl" WAYLAND_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libinput.so:x11/libinput \ libwayland-client++.so:graphics/waylandpp \ libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon -WAYLAND_VARS= KODI_PLATFORMS+=WAYLAND +WAYLAND_VARS= _KODI_PLATFORMS+=WAYLAND +_KODI_WAYLAND_ARGS= -DCORE_PLATFORM_NAME:STRING="wayland" \ + -DWAYLAND_RENDER_SYSTEM:STRING="gl" WEBSERVER_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd WEBSERVER_CMAKE_BOOL= ENABLE_MICROHTTPD -KODI_X11_ARGS= -DCORE_PLATFORM_NAME:STRING="x11" -KODI_X11_BINS= kodi-x11 kodi-xrandr -X11_USE= XORG=x11,xext,xrandr -X11_VARS= KODI_PLATFORMS+=X11 +X11_USE= XORG=x11,xext,xrandr +X11_VARS= _KODI_PLATFORMS+=X11 +_KODI_X11_ARGS= -DCORE_PLATFORM_NAME:STRING="x11" +_KODI_X11_BINS= kodi-x11 kodi-xrandr .include <bsd.port.options.mk> @@ -200,11 +199,11 @@ post-patch: ${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp do-configure: -.for platform in ${KODI_PLATFORMS:O} +.for platform in ${_KODI_PLATFORMS:O} @${ECHO_MSG} "===> Performing out-of-source build for ${platform}" ${MKDIR} ${CONFIGURE_WRKSRC}/${platform} @cd ${CONFIGURE_WRKSRC}/${platform} && ${SETENV} ${CONFIGURE_ENV} \ - ${CMAKE_BIN} ${CMAKE_ARGS} ${KODI_${platform}_ARGS} \ + ${CMAKE_BIN} ${CMAKE_ARGS} ${_KODI_${platform}_ARGS} \ ${CMAKE_SOURCE_PATH} .endfor @@ -212,23 +211,23 @@ do-build: # build in reverse to avoid touching some source files in later # builds and triggering rebuilds/relinks in the first platform # install phase. -.for platform in ${KODI_PLATFORMS:O:[-1..1]} +.for platform in ${_KODI_PLATFORMS:O:[-1..1]} @${ECHO_MSG} "===> Building for ${platform}" @${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/${platform} ${ALL_TARGET} .endfor do-install: # Do a full install for the first platform including shared data files... -.for platform in ${KODI_PLATFORMS:O:[1]} +.for platform in ${_KODI_PLATFORMS:O:[1]} @${ECHO_MSG} "===> Installing for ${platform}" @cd ${INSTALL_WRKSRC}/${platform} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} \ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} .endfor # ... followed by only the other platform binaries -.for platform in ${KODI_PLATFORMS:O:[2..-1]} +.for platform in ${_KODI_PLATFORMS:O:[2..-1]} @${ECHO_MSG} "===> Installing for ${platform}" cd ${INSTALL_WRKSRC}/${platform} && \ - ${INSTALL_PROGRAM} ${KODI_${platform}_BINS:Ukodi-${platform:tl}} \ + ${INSTALL_PROGRAM} ${_KODI_${platform}_BINS:Ukodi-${platform:tl}} \ ${STAGEDIR}${PREFIX}/lib/kodi .endfor ${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906280611.x5S6B0r5047478>