diff -urN kodi.orig/Makefile kodi/Makefile --- kodi.orig/Makefile 2020-10-11 14:46:13.000000000 +0000 +++ kodi/Makefile 2020-10-13 15:39:52.497250000 +0000 @@ -1,19 +1,15 @@ -# $FreeBSD: head/multimedia/kodi/Makefile 552067 2020-10-11 14:46:13Z mandree $ +# $FreeBSD: head/multimedia/kodi/Makefile 542655 2020-07-20 16:27:43Z tobik $ PORTNAME= kodi -DISTVERSION= 18.7.1 -PORTREVISION= 3 +DISTVERSION= 18.8 CATEGORIES= multimedia java -PATCH_SITES= https://github.com/xbmc/xbmc/commit/ -PATCHFILES= 920cc74da069216d19f724ecf5246cf997861bc6.patch:-p1 - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= yzrh@tuta.io COMMENT= Award winning media center application LICENSE= GPLv2+ -ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 +ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 BUILD_DEPENDS= flatbuffers>0:devel/flatbuffers \ gperf>0:devel/gperf \ @@ -27,6 +23,8 @@ libcdio.so:sysutils/libcdio \ libcrossguid.so:devel/libcrossguid \ libcurl.so:ftp/curl \ + libdvdnav.so:multimedia/libdvdnav \ + libdvdread.so:multimedia/libdvdread \ libexpat.so:textproc/expat2 \ libfmt.so:devel/libfmt \ libfreetype.so:print/freetype2 \ @@ -42,16 +40,25 @@ libtag.so:audio/taglib \ libtinyxml.so:textproc/tinyxml \ libuuid.so:misc/e2fsprogs-libuuid -RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu -USES= autoreconf:build cmake:noninja compiler:c++14-lang gettext gl gmake \ - gnome iconv jpeg libtool pkgconfig python:2.7 ssl sqlite xorg +USES= autoreconf:build cmake:noninja cmake compiler:c++14-lang gettext gmake \ + gnome iconv jpeg libtool pkgconfig python:2.7 ssl sqlite -KODI_ARCH_amd64=x86_64 -KODI_ARCH_i386= x86 -KODI_ARCH_armv7=armv7 -KODI_ARCH_armv6=armv6 +KODI_CODENAME= Leia +USE_GITHUB= yes +GH_ACCOUNT= xbmc +GH_PROJECT= xbmc +GH_TAGNAME= ${DISTVERSION}-${KODI_CODENAME} + +KODI_ARCH_aarch64= aarch64 +KODI_ARCH_amd64= x86_64 +KODI_ARCH_i386= x86 +KODI_ARCH_armv7= armv7 +KODI_ARCH_armv6= armv6 + +PLIST_SUB= ARCH=${KODI_ARCH_${ARCH}} + NOPRECIOUSMAKEVARS= yes INSTALLS_ICONS= yes @@ -59,33 +66,21 @@ USE_JAVA= yes JAVA_BUILD= jre USE_GNOME= libxml2 -CMAKE_ARGS= -Dlibdvdcss_URL="${DISTDIR}/xbmc-libdvdcss-1.4.2-Leia-Beta-5_GH0.tar.gz" \ - -Dlibdvdnav_URL="${DISTDIR}/xbmc-libdvdnav-6.0.0-Leia-Alpha-3_GH0.tar.gz" \ - -Dlibdvdread_URL="${DISTDIR}/xbmc-libdvdread-6.0.0-Leia-Alpha-3_GH0.tar.gz" +CMAKE_ARGS= -DGIT_VERSION="${GH_TAGNAME}" \ + -DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" \ + -DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \ + -DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include" CMAKE_OFF= ENABLE_INTERNAL_CROSSGUID \ ENABLE_INTERNAL_FFMPEG CONFIGURE_ENV= _CPU_FEATURE="${CPU_FEATURE}" -KODI_CODENAME= Leia -LIBDVDCSS_VERSION= 1.4.2-${KODI_CODENAME}-Beta-5 -LIBDVDNAV_VERSION= 6.0.0-${KODI_CODENAME}-Alpha-3 -LIBDVDREAD_VERSION= 6.0.0-${KODI_CODENAME}-Alpha-3 - -USE_GITHUB= yes -GH_TUPLE= xbmc:xbmc:${PORTVERSION}-${KODI_CODENAME} \ - xbmc:libdvdcss:${LIBDVDCSS_VERSION}:libdvdcss/tools/depends/target/libdvdcss/native \ - xbmc:libdvdnav:${LIBDVDNAV_VERSION}:libdvdnav/tools/depends/target/libdvdnav/native \ - xbmc:libdvdread:${LIBDVDREAD_VERSION}:libdvdread/tools/depends/target/libdvdread/native - -PLIST_SUB= ARCH=${KODI_ARCH_${ARCH}} - OPTIONS_SUB= yes -# Not implemented: BLUETOOTH CAP -OPTIONS_DEFINE= AIRPLAY AIRTUNES AVAHI CEC DBUS DOCS DVDCSS LCMS2 \ - LIBBLURAY LIRC NFS OPTICAL SMB UDEV UPNP VAAPI VDPAU \ - WEBSERVER XSLT -OPTIONS_DEFAULT= AIRPLAY AIRTUNES AVAHI CEC DVDCSS LIBBLURAY NFS OPTICAL SMB \ - UDEV UPNP VAAPI VDPAU WEBSERVER X11 XSLT +# Broken: BLUETOOTH +OPTIONS_DEFINE= AIRPLAY AVAHI LIBBLURAY CEC DBUS DVDCSS LCMS2 \ + LIRC WEBSERVER NFS DVD SMB UDEV UPNP \ + VAAPI VDPAU XSLT DOCS +OPTIONS_DEFAULT= AIRPLAY AVAHI LIBBLURAY CEC DVDCSS LCMS2 WEBSERVER NFS \ + DVD SMB UDEV UPNP VAAPI VDPAU XSLT X11 OPTIONS_DEFAULT_amd64= SSE SSE2 SSE3 OPTIONS_DEFAULT_i386= SSE SSE2 SSE3 OPTIONS_SINGLE= PLATFORM @@ -98,43 +93,46 @@ OPTIONS_GROUP_FEATURE= SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2 OPTIONS_EXCLUDE_amd64= RPI OPTIONS_EXCLUDE_i386= RPI +OPTIONS_EXCLUDE_aarch64=FEATURE OPTIONS_EXCLUDE_armv7= FEATURE OPTIONS_EXCLUDE_armv6= FEATURE -AIRPLAY_DESC= AirPlay support via libplist -AIRTUNES_DESC= AirTunes support via libshairplay -AVX_DESC= Use AVX optimized routines -AVX2_DESC= Use AVX2 optimized routines -BLUETOOTH_DESC= Bluetooth support via bluez -CAP_DESC= Capability support via libcap -CEC_DESC= CEC adapter support +PLATFORM_DESC= Kodi platform DATABASE_DESC= Database FEATURE_DESC= X86 CPU feature + +AIRPLAY_DESC= AirPlay support +BLUETOOTH_DESC= Bluetooth support +CEC_DESC= CEC adapter support +DVD_DESC= DVD support +UDEV_DESC= Use libudev-devd +XSLT_DESC= Use libxslt + +RPI_DESC= Raspberry Pi support GBM_DESC= GBM support MARIADB_DESC= MariaDB database support -OPTICAL_DESC= Optical disc support -PLATFORM_DESC= Kodi platform -RPI_DESC= Raspberry Pi support + SSE2_DESC= Use SSE2 optimized routines SSE3_DESC= Use SSE3 optimized routines SSSE3_DESC= Use SSSE3 optimized routines SSE4_1_DESC= Use SSE4.1 optimized routines SSE4_2_DESC= Use SSE4.2 optimized routines -UDEV_DESC= Use libudev-devd -XSLT_DESC= Use libxslt +AVX_DESC= Use AVX optimized routines +AVX2_DESC= Use AVX2 optimized routines -AIRPLAY_LIB_DEPENDS= libplist.so:devel/libplist -AIRPLAY_CMAKE_BOOL= ENABLE_PLIST +AIRPLAY_LIB_DEPENDS= libplist.so:devel/libplist \ + libshairplay.so:audio/shairplay +AIRPLAY_CMAKE_BOOL= ENABLE_PLIST \ + ENABLE_AIRTUNES -AIRTUNES_LIB_DEPENDS= libshairplay.so:audio/shairplay -AIRTUNES_CMAKE_BOOL= ENABLE_AIRTUNES - AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_CMAKE_BOOL= ENABLE_AVAHI BLUETOOTH_CMAKE_BOOL= ENABLE_BLUETOOTH +BLUETOOTH_CMAKE_ON= -DBLUETOOTH_INCLUDE_DIR="${LOCALBASE}/include" -CAP_CMAKE_BOOL= ENABLE_CAP +LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray +LIBBLURAY_CMAKE_BOOL= ENABLE_BLURAY CEC_LIB_DEPENDS= libcec.so:multimedia/libcec CEC_CMAKE_BOOL= ENABLE_CEC @@ -142,28 +140,23 @@ DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CMAKE_BOOL= ENABLE_DBUS +DVDCSS_LIB_DEPENDS= libdvdcss.so:multimedia/libdvdcss DVDCSS_CMAKE_BOOL= ENABLE_DVDCSS +DVDCSS_CMAKE_ON= -DDVDCSS_LIBRARY="${LOCALBASE}/lib/libdvdcss.so" LCMS2_LIB_DEPENDS= liblcms2.so.2:graphics/lcms2 LCMS2_CMAKE_BOOL= ENABLE_LCMS2 -LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray -LIBBLURAY_CMAKE_BOOL= ENABLE_BLURAY - LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CMAKE_BOOL= ENABLE_LIRCCLIENT -MARIADB_USES= mysql:104m -MARIADB_CMAKE_BOOL= ENABLE_MARIADBCLIENT -MARIADB_CMAKE_ON= -DMARIADBCLIENT_INCLUDE_DIR="${LOCALBASE}/include" +WEBSERVER_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd +WEBSERVER_CMAKE_BOOL= ENABLE_MICROHTTPD -MYSQL_USES= mysql -MYSQL_CMAKE_BOOL= ENABLE_MYSQLCLIENT - NFS_LIB_DEPENDS= libnfs.so:net/libnfs NFS_CMAKE_BOOL= ENABLE_NFS -OPTICAL_CMAKE_BOOL= ENABLE_OPTICAL +DVD_CMAKE_BOOL= ENABLE_OPTICAL SMB_USES= samba:lib SMB_CMAKE_BOOL= ENABLE_SMBCLIENT @@ -179,12 +172,16 @@ VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CMAKE_BOOL= ENABLE_VDPAU -WEBSERVER_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd -WEBSERVER_CMAKE_BOOL= ENABLE_MICROHTTPD - XSLT_LIB_DEPENDS= libxslt.so:textproc/libxslt XSLT_CMAKE_BOOL= ENABLE_XSLT +MARIADB_USES= mysql:105m +MARIADB_CMAKE_BOOL= ENABLE_MARIADBCLIENT +MARIADB_CMAKE_ON= -DMARIADBCLIENT_INCLUDE_DIR="${LOCALBASE}/include" + +MYSQL_USES= mysql +MYSQL_CMAKE_BOOL= ENABLE_MYSQLCLIENT + ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= ENABLE_ALSA @@ -203,6 +200,7 @@ AVX_VARS= CPU_FEATURE+=AVX AVX2_VARS= CPU_FEATURE+=AVX2 +GBM_USES= gl GBM_USE= GL=egl,gbm,glu GBM_CFLAGS= -I${LOCALBASE}/include/libepoll-shim GBM_LDFLAGS= -L${LOCALBASE}/lib -lepoll-shim @@ -220,6 +218,7 @@ libinput.so:x11/libinput RPI_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="rbpi" +WAYLAND_USES= gl WAYLAND_USE= GL=egl,glu WAYLAND_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols @@ -229,6 +228,7 @@ WAYLAND_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="wayland" \ -DWAYLAND_RENDER_SYSTEM:STRING="gl" +X11_USES= xorg gl X11_USE= XORG=x11,xext,xrandr GL=egl,gl,glu X11_LIB_DEPENDS= libdrm.so:graphics/libdrm X11_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="x11" @@ -236,6 +236,8 @@ .include post-patch: + ${REINPLACE_CMD} 's|KODI_DEPENDSBUILD|true|' \ + ${WRKSRC}/cmake/modules/FindLibDvd.cmake ${REINPLACE_CMD} 's|/usr/share|${LOCALBASE}/share|' \ ${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp diff -urN kodi.orig/distinfo kodi/distinfo --- kodi.orig/distinfo 2020-10-11 14:46:13.000000000 +0000 +++ kodi/distinfo 2020-10-13 15:39:52.497617000 +0000 @@ -1,11 +1,3 @@ -TIMESTAMP = 1601840959 -SHA256 (xbmc-xbmc-18.7.1-18.7.1-Leia_GH0.tar.gz) = 5cfec391bcd168bbd4f9d38a6c8ec93e42e040cf82cf6ebf23db5e86753816fb -SIZE (xbmc-xbmc-18.7.1-18.7.1-Leia_GH0.tar.gz) = 51052174 -SHA256 (xbmc-libdvdcss-1.4.2-Leia-Beta-5_GH0.tar.gz) = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d -SIZE (xbmc-libdvdcss-1.4.2-Leia-Beta-5_GH0.tar.gz) = 101068 -SHA256 (xbmc-libdvdnav-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a -SIZE (xbmc-libdvdnav-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 137942 -SHA256 (xbmc-libdvdread-6.0.0-Leia-Alpha-3_GH0.tar.gz) = a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf -SIZE (xbmc-libdvdread-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 130649 -SHA256 (920cc74da069216d19f724ecf5246cf997861bc6.patch) = e4963bdeb1de7c147a364cd3ee2186fb1d0b2fc8f3ea7636054cf2adac040468 -SIZE (920cc74da069216d19f724ecf5246cf997861bc6.patch) = 25487 +TIMESTAMP = 1597729103 +SHA256 (xbmc-xbmc-18.8-18.8-Leia_GH0.tar.gz) = 6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296 +SIZE (xbmc-xbmc-18.8-18.8-Leia_GH0.tar.gz) = 51052219