Date: Sun, 1 Jul 2018 08:32:35 +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: r473657 - in head/multimedia/kodi-devel: . files Message-ID: <201807010832.w618WZ13034075@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sun Jul 1 08:32:35 2018 New Revision: 473657 URL: https://svnweb.freebsd.org/changeset/ports/473657 Log: multimedia/kodi-devel: Add missing SSE option - Remove SSH option as Kodi has dropped internal sftp support in commit da7054759836fdaf169d37cb257dafdedbebca2f Added: head/multimedia/kodi-devel/files/patch-cmake_modules_FindSSE.cmake (contents, props changed) Modified: head/multimedia/kodi-devel/Makefile head/multimedia/kodi-devel/pkg-plist Modified: head/multimedia/kodi-devel/Makefile ============================================================================== --- head/multimedia/kodi-devel/Makefile Sun Jul 1 07:16:50 2018 (r473656) +++ head/multimedia/kodi-devel/Makefile Sun Jul 1 08:32:35 2018 (r473657) @@ -2,6 +2,7 @@ PORTNAME= kodi DISTVERSION= 18.0.g201806300625 +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMESUFFIX?= -devel @@ -69,16 +70,19 @@ CMAKE_OFF= ENABLE_ALSA \ ENABLE_DVDCSS \ ENABLE_INTERNAL_FFMPEG \ ENABLE_INTERNAL_CROSSGUID -CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB}" OPENSSL_CFLAGS="-I${OPENSSLINC}" +CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB}" OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + CPU_FEATURES=" Features=0xdeadbeef<${CPU_FEATURES:ts,}>" KODIARCH_i386= x86 KODIARCH_amd64= x86_64 PLIST_SUB= ARCH=${KODIARCH_${ARCH}:U${ARCH}} OPSYS=${OPSYS:tl} -OPTIONS_DEFINE= AVAHI CEC DBUS LIBBLURAY MYSQL NFS SMB SSH UPNP VAAPI \ - VDPAU WEBSERVER -OPTIONS_DEFAULT= LIBBLURAY SSH UPNP VAAPI VDPAU WEBSERVER X11 +OPTIONS_DEFINE= AVAHI CEC DBUS LIBBLURAY MYSQL NFS SMB UPNP VAAPI VDPAU WEBSERVER +OPTIONS_DEFINE_amd64= SSE +OPTIONS_DEFINE_i386= SSE +OPTIONS_DEFAULT= LIBBLURAY UPNP VAAPI VDPAU WEBSERVER X11 +OPTIONS_DEFAULT_amd64= SSE OPTIONS_SINGLE= PLATFORM OPTIONS_SINGLE_PLATFORM= GBM RPI WAYLAND X11 OPTIONS_EXCLUDE_amd64= RPI @@ -134,8 +138,9 @@ SMB_CMAKE_BOOL= ENABLE_SMBCLIENT SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CMAKE_BOOL= ENABLE_SNDIO -SSH_LIB_DEPENDS= libssh.so:security/libssh -SSH_CMAKE_BOOL= ENABLE_SSH +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,} UPNP_CMAKE_BOOL= ENABLE_UPNP # XXX: Upstream is https://github.com/plutinosoft/Neptune Added: head/multimedia/kodi-devel/files/patch-cmake_modules_FindSSE.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/kodi-devel/files/patch-cmake_modules_FindSSE.cmake Sun Jul 1 08:32:35 2018 (r473657) @@ -0,0 +1,15 @@ +/var/run/dmesg.boot is not available in Poudriere jails and reading +it at build time also doesn't allow for any control, so pass in the +CPU features through the CPU_FEATURES environment variable. + +--- cmake/modules/FindSSE.cmake.orig 2018-07-01 06:58:49 UTC ++++ cmake/modules/FindSSE.cmake +@@ -42,7 +42,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") + endif() + elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + if(CPU MATCHES "amd64" OR CPU MATCHES "i.86") +- exec_program(cat ARGS "/var/run/dmesg.boot | grep Features" OUTPUT_VARIABLE CPUINFO) ++ exec_program(echo ARGS "$CPU_FEATURES" OUTPUT_VARIABLE CPUINFO) + + string(REGEX REPLACE "^.*(SSE).*$" "\\1" _SSE_THERE ${CPUINFO}) + string(COMPARE EQUAL "SSE" "${_SSE_THERE}" _SSE_TRUE) Modified: head/multimedia/kodi-devel/pkg-plist ============================================================================== --- head/multimedia/kodi-devel/pkg-plist Sun Jul 1 07:16:50 2018 (r473656) +++ head/multimedia/kodi-devel/pkg-plist Sun Jul 1 08:32:35 2018 (r473657) @@ -71,6 +71,7 @@ include/kodi/xbmc_pvr_types.h %%X11%%lib/kodi/kodi-x11 %%X11%%lib/kodi/kodi-xrandr lib/kodi/system/players/VideoPlayer/libdvdnav-%%ARCH%%-%%OPSYS%%.so +%%SSE%%lib/kodi/system/libsse4-%%ARCH%%-%%OPSYS%%.so man/man1/kodi.1.gz man/man1/kodi.bin.1.gz share/applications/kodi.desktop
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807010832.w618WZ13034075>