Index: head/multimedia/kodi-devel/Makefile
===================================================================
--- head/multimedia/kodi-devel/Makefile	(revision 501916)
+++ head/multimedia/kodi-devel/Makefile	(revision 501917)
@@ -1,244 +1,243 @@
 # $FreeBSD$
 
 PORTNAME=	kodi
-DISTVERSION=	18.2
-DISTVERSIONSUFFIX=	-Leia
+DISTVERSION=	19.0.a20190518
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Award winning media center application
 
 LICENSE=	GPLv2+
 
 ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
 
 BUILD_DEPENDS=	flatbuffers>=0:devel/flatbuffers \
 		rapidjson>=0:devel/rapidjson \
 		swig3.0:devel/swig30
 LIB_DEPENDS=	libass.so:multimedia/libass \
 		libavcodec.so:multimedia/ffmpeg \
 		libavfilter.so:multimedia/ffmpeg \
 		libavformat.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
 		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 \
 		libfribidi.so:converters/fribidi \
 		libfstrcmp.so:devel/fstrcmp \
 		libgif.so:graphics/giflib \
 		libgnutls.so:security/gnutls \
 		liblcms2.so:graphics/lcms2 \
 		liblzo2.so:archivers/lzo2 \
 		libpcre.so:devel/pcre \
 		libpcrecpp.so:devel/pcre \
 		libpng.so:graphics/png \
 		libpostproc.so:multimedia/ffmpeg \
 		libswresample.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg \
 		libtag.so:audio/taglib \
 		libtinyxml.so:textproc/tinyxml \
 		libudev.so:devel/libudev-devd \
 		libuuid.so:misc/e2fsprogs-libuuid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 # Building libcpluff.a requires autoreconf and gmake.  Using ninja
 # leads to dependency problems where libcpluff.a is not yet finished
 # building when it's required.
-USES=		autoreconf:build cmake:noninja compiler:c++11-lang \
-		gettext gmake gnome iconv:wchar_t jpeg libtool pkgconfig \
-		python:2.7 ssl sqlite
+USES=		autoreconf:build cmake:noninja compiler:c++11-lang gettext \
+		gmake gnome iconv:wchar_t jpeg libtool pkgconfig python:3.5+ \
+		sqlite ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	xbmc
 GH_PROJECT=	xbmc
+GH_TAGNAME=	131485167f53d09e068430d2cb5656a03ca76697
 USE_GNOME=	libxslt libxml2
 USE_JAVA=	yes
 JAVA_BUILD=	yes
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	kodi
 
 CMAKE_ARGS=	-DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include" \
 		-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,}>"
 
 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_DEFAULT_amd64=	SSE
 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_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
 RPI_DESC=	Raspberry Pi support
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CMAKE_BOOL=	ENABLE_AVAHI
 
 CEC_LIB_DEPENDS=	libcec.so:multimedia/libcec
 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_CFLAGS=		-I${LOCALBASE}/include/libepoll-shim
-GBM_LDFLAGS=		-L${LOCALBASE}/lib -lepoll-shim -lpthread -lrt
 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
 
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CMAKE_BOOL=	ENABLE_BLURAY
 
 MYSQL_USES=		mysql
 MYSQL_CMAKE_BOOL=	ENABLE_MYSQLCLIENT
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_CMAKE_BOOL=		ENABLE_NFS
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 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_USES_OFF=		gl
 RPI_USE_OFF=		GL=egl,gl,glu
 RPI_VARS=		KODI_PLATFORMS+=RBPI
 
 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,}
 
 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_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
 
 VDPAU_CMAKE_BOOL=	ENABLE_VDPAU
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 
 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
 
 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
 
 .include <bsd.port.options.mk>
 
 post-patch:
 # Do not try to download dvdnav/dvdread during the build, instead
 # we'll manually point the build to the system's libdvd{nav,read}.so
 # (see CMAKE_ARGS).
 	@${REINPLACE_CMD} 's@KODI_DEPENDSBUILD@true@' \
 		${WRKSRC}/cmake/modules/FindLibDvd.cmake
 # Make sure freebsd.xml is in sync with linux.xml since the
 # upstream devs do not sync them
 	@${CP} ${WRKSRC}/system/settings/linux.xml \
 		${WRKSRC}/system/settings/freebsd.xml
 # Make sure Kodi can find keyboard layouts from xkeyboard-config
 	@${REINPLACE_CMD} 's,/usr/share/X11/xkb/rules/,${LOCALBASE}/share/X11/xkb/rules/,g' \
 		${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp
 
 do-configure:
 .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_SOURCE_PATH}
 .endfor
 
 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]}
 	@${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]}
 	@${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]}
 	@${ECHO_MSG} "===>  Installing for ${platform}"
 	cd ${INSTALL_WRKSRC}/${platform} && \
 		${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
 	@cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf kodi.bin.1.gz kodi.1.gz
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/TexturePacker
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -name '*.so' | ${XARGS} ${STRIP_CMD}
 # Nothing useful here...
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 # No firewalld on FreeBSD...
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/firewalld
 
 .include <bsd.port.mk>
Index: head/multimedia/kodi-devel/distinfo
===================================================================
--- head/multimedia/kodi-devel/distinfo	(revision 501916)
+++ head/multimedia/kodi-devel/distinfo	(revision 501917)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555928210
-SHA256 (xbmc-xbmc-18.2-Leia_GH0.tar.gz) = 07b8cffc396473523a51354dc95dfffb54a6a456b82cda7ad67dc2c052d99f64
-SIZE (xbmc-xbmc-18.2-Leia_GH0.tar.gz) = 51012621
+TIMESTAMP = 1558154592
+SHA256 (xbmc-xbmc-19.0.a20190518-131485167f53d09e068430d2cb5656a03ca76697_GH0.tar.gz) = b7a7433cecf1fafc8a0342f39ebcd0c5cdf178cd493dce13e1ed8eb5dd38b3bb
+SIZE (xbmc-xbmc-19.0.a20190518-131485167f53d09e068430d2cb5656a03ca76697_GH0.tar.gz) = 78706844
Index: head/multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake
===================================================================
--- head/multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake	(nonexistent)
+++ head/multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake	(revision 501917)
@@ -0,0 +1,30 @@
+--- cmake/modules/FindEpollShim.cmake.orig	2019-05-18 04:05:16 UTC
++++ cmake/modules/FindEpollShim.cmake
+@@ -0,0 +1,27 @@
++# FindEpollShim
++# -------------
++# Finds the epoll-shim library
++#
++# This will define the following variables::
++#
++# EPOLLSHIM_FOUND       - the system has epoll-shim
++# EPOLLSHIM_INCLUDE_DIR - the epoll-shim include directory
++# EPOLLSHIM_LIBRARY     - the epoll-shim library
++
++if(PKG_CONFIG_FOUND)
++  pkg_check_modules(PC_EPOLLSHIM epoll-shim QUIET)
++endif()
++
++find_path(EPOLLSHIM_INCLUDE_DIR NAMES sys/epoll.h PATHS ${PC_EPOLLSHIM_INCLUDE_DIRS})
++find_library(EPOLLSHIM_LIBRARY NAMES epoll-shim PATHS ${PC_EPOLLSHIM_LIBDIR})
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(EpollShim
++                                  REQUIRED_VARS EPOLLSHIM_LIBRARY EPOLLSHIM_INCLUDE_DIR)
++
++if(EPOLLSHIM_FOUND)
++  set(EPOLLSHIM_INCLUDE_DIRS ${EPOLLSHIM_INCLUDE_DIR})
++  set(EPOLLSHIM_LIBRARIES ${EPOLLSHIM_LIBRARY})
++endif()
++
++mark_as_advanced(EPOLLSHIM_INCLUDE_DIR EPOLLSHIM_LIBRARY)

Property changes on: head/multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake
===================================================================
--- head/multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake	(nonexistent)
+++ head/multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake	(revision 501917)
@@ -0,0 +1,5 @@
+--- cmake/platform/freebsd/gbm.cmake.orig	2019-05-08 08:47:45 UTC
++++ cmake/platform/freebsd/gbm.cmake
+@@ -1 +1,2 @@
+ include(cmake/platform/linux/gbm.cmake)
++list(APPEND PLATFORM_REQUIRED_DEPS EpollShim)

Property changes on: head/multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/kodi-devel/pkg-descr
===================================================================
--- head/multimedia/kodi-devel/pkg-descr	(revision 501916)
+++ head/multimedia/kodi-devel/pkg-descr	(revision 501917)
@@ -1,8 +1,9 @@
 Kodi is a free and open source cross-platform media-player and
 entertainment hub.  It allows users to play and view most videos,
 music, podcasts, and other digital media files from local and network
 storage media and the internet.
 
-This is a development snapshot for the upcoming Kodi v18.
+This is a development snapshot for the upcoming Kodi v19 based on
+the Python 3 support feature branch.
 
 WWW: http://kodi.tv/
Index: head/multimedia/kodi-devel/pkg-plist
===================================================================
--- head/multimedia/kodi-devel/pkg-plist	(revision 501916)
+++ head/multimedia/kodi-devel/pkg-plist	(revision 501917)
@@ -1,86 +1,91 @@
 bin/TexturePacker
 bin/kodi
 bin/kodi-standalone
 include/kodi/AEChannelData.h
 include/kodi/ActionIDs.h
 include/kodi/AddonBase.h
+include/kodi/AudioEngine.h
 include/kodi/DemuxCrypto.h
 include/kodi/DemuxPacket.h
 include/kodi/Filesystem.h
 include/kodi/General.h
 include/kodi/IFileTypes.h
 include/kodi/Network.h
 include/kodi/StreamCodec.h
 include/kodi/StreamCrypto.h
 include/kodi/TimingConstants.h
 include/kodi/XBMC_vkeys.h
 include/kodi/addon-instance/AudioDecoder.h
 include/kodi/addon-instance/AudioEncoder.h
 include/kodi/addon-instance/ImageDecoder.h
 include/kodi/addon-instance/Inputstream.h
 include/kodi/addon-instance/Peripheral.h
 include/kodi/addon-instance/PeripheralUtils.h
 include/kodi/addon-instance/Screensaver.h
 include/kodi/addon-instance/VFS.h
 include/kodi/addon-instance/VideoCodec.h
 include/kodi/addon-instance/Visualization.h
 include/kodi/gui/General.h
 include/kodi/gui/ListItem.h
 include/kodi/gui/Window.h
 include/kodi/gui/controls/Button.h
 include/kodi/gui/controls/Edit.h
 include/kodi/gui/controls/FadeLabel.h
 include/kodi/gui/controls/Image.h
 include/kodi/gui/controls/Label.h
 include/kodi/gui/controls/Progress.h
 include/kodi/gui/controls/RadioButton.h
 include/kodi/gui/controls/Rendering.h
 include/kodi/gui/controls/SettingsSlider.h
 include/kodi/gui/controls/Slider.h
 include/kodi/gui/controls/Spin.h
 include/kodi/gui/controls/TextBox.h
 include/kodi/gui/definitions.h
 include/kodi/gui/dialogs/ContextMenu.h
 include/kodi/gui/dialogs/ExtendedProgress.h
 include/kodi/gui/dialogs/FileBrowser.h
 include/kodi/gui/dialogs/Keyboard.h
 include/kodi/gui/dialogs/Numeric.h
 include/kodi/gui/dialogs/OK.h
 include/kodi/gui/dialogs/Progress.h
 include/kodi/gui/dialogs/Select.h
 include/kodi/gui/dialogs/TextViewer.h
 include/kodi/gui/dialogs/YesNo.h
+include/kodi/gui/gl/GL.h
+include/kodi/gui/gl/GLonDX.h
+include/kodi/gui/gl/Shader.h
+include/kodi/gui/renderHelper.h
 include/kodi/kodi_game_dll.h
 include/kodi/kodi_game_types.h
 include/kodi/kodi_vfs_types.h
 include/kodi/libKODI_game.h
 include/kodi/libKODI_guilib.h
 include/kodi/libXBMC_addon.h
 include/kodi/libXBMC_pvr.h
 include/kodi/platform/android/System.h
 include/kodi/tools/DllHelper.h
 include/kodi/versions.h
 include/kodi/xbmc_addon_dll.h
 include/kodi/xbmc_addon_types.h
 include/kodi/xbmc_epg_types.h
 include/kodi/xbmc_pvr_dll.h
 include/kodi/xbmc_pvr_types.h
 %%GBM%%lib/kodi/kodi-gbm
 %%RPI%%lib/kodi/kodi-rbpi
 %%WAYLAND%%lib/kodi/kodi-wayland
 %%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
+lib/kodi/system/players/VideoPlayer/libdvdnav-%%ARCH%%-%%OPSYS%%.so
 man/man1/kodi.1.gz
 man/man1/kodi.bin.1.gz
 share/applications/kodi.desktop
 share/icons/hicolor/128x128/apps/kodi.png
 share/icons/hicolor/16x16/apps/kodi.png
 share/icons/hicolor/22x22/apps/kodi.png
 share/icons/hicolor/24x24/apps/kodi.png
 share/icons/hicolor/256x256/apps/kodi.png
 share/icons/hicolor/32x32/apps/kodi.png
 share/icons/hicolor/48x48/apps/kodi.png
 share/icons/hicolor/64x64/apps/kodi.png
 share/xsessions/kodi.desktop