Date: Tue, 13 Dec 2022 06:33:30 GMT From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7f65ff0bf131 - main - multimedia/kodi: fix build after mesa-libs update Message-ID: <202212130633.2BD6XUrF047487@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f65ff0bf131d96a68cb72088e9afa9442c91d5d commit 7f65ff0bf131d96a68cb72088e9afa9442c91d5d Author: yzrh <yzrh@noema.org> AuthorDate: 2022-12-12 07:02:23 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2022-12-13 06:28:56 +0000 multimedia/kodi: fix build after mesa-libs update With the recent update to graphics/mesa-libs the EGL/eglextchromium.h header got removed and replaced by EGL/eglext_angle.h. While here, include the patch for Bug 265931 (libdvdnav) PR: 268234 Reported by: m.ne@gmx.net --- multimedia/kodi/Makefile | 30 ++++++++++------------ multimedia/kodi/distinfo | 12 ++++++--- .../files/patch-xbmc_windowing_X11_GLContextEGL.h | 11 ++++++++ 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile index 4208141bf18d..ee7b763cb4ef 100644 --- a/multimedia/kodi/Makefile +++ b/multimedia/kodi/Makefile @@ -1,7 +1,6 @@ PORTNAME= kodi DISTVERSION= 19.4 -DISTVERSIONSUFFIX= -${KODI_CODENAME} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia java MAINTAINER= yzrh@noema.org @@ -24,8 +23,6 @@ LIB_DEPENDS= libass.so:multimedia/libass \ libcrossguid.so:devel/libcrossguid \ libcurl.so:ftp/curl \ libdav1d.so:multimedia/dav1d \ - libdvdnav.so:multimedia/libdvdnav \ - libdvdread.so:multimedia/libdvdread \ libexpat.so:textproc/expat2 \ libfmt.so:devel/libfmt \ libfreetype.so:print/freetype2 \ @@ -43,14 +40,19 @@ LIB_DEPENDS= libass.so:multimedia/libass \ libtinyxml.so:textproc/tinyxml \ libuuid.so:misc/e2fsprogs-libuuid -USES= cpe cmake compiler:c++14-lang gettext \ - gnome iconv jpeg pkgconfig python:3.5+ sqlite ssl +USES= autoreconf:build cpe cmake:noninja compiler:c++17-lang gettext \ + gmake gnome iconv jpeg libtool pkgconfig python:3.7+ sqlite ssl KODI_CODENAME= Matrix +LIBDVDCSS_VERSION= 1.4.2-Leia-Beta-5 +LIBDVDNAV_VERSION= 6.0.0-Leia-Alpha-3 +LIBDVDREAD_VERSION= 6.0.0-Leia-Alpha-3 USE_GITHUB= yes -GH_ACCOUNT= xbmc -GH_PROJECT= xbmc +GH_TUPLE= xbmc:xbmc:${DISTVERSION}-${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 KODI_ARCH_aarch64= aarch64 KODI_ARCH_amd64= x86_64 @@ -66,10 +68,10 @@ USE_LDCONFIG= yes USE_JAVA= yes JAVA_BUILD= jre USE_GNOME= libxml2 -CMAKE_ARGS= -DGIT_VERSION="${GH_TAGNAME}" \ - -DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" \ - -DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \ - -DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include" +CMAKE_ARGS= -DGIT_VERSION="${DISTVERSION}-${KODI_CODENAME}" \ + -DLIBDVDCSS_URL="${DISTDIR}/xbmc-libdvdcss-${LIBDVDCSS_VERSION}_GH0.tar.gz" \ + -DLIBDVDNAV_URL="${DISTDIR}/xbmc-libdvdnav-${LIBDVDNAV_VERSION}_GH0.tar.gz" \ + -DLIBDVDREAD_URL="${DISTDIR}/xbmc-libdvdread-${LIBDVDREAD_VERSION}_GH0.tar.gz" CMAKE_OFF= ENABLE_INTERNAL_CROSSGUID CONFIGURE_ENV= _CPU_FEATURE="${CPU_FEATURE}" @@ -141,9 +143,7 @@ CEC_CMAKE_BOOL= ENABLE_CEC 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 @@ -278,8 +278,6 @@ PLIST_SUB+= KODIX11="@comment " .endif 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 --git a/multimedia/kodi/distinfo b/multimedia/kodi/distinfo index 6ad4c3f21f06..337c0bf2b2af 100644 --- a/multimedia/kodi/distinfo +++ b/multimedia/kodi/distinfo @@ -1,3 +1,9 @@ -TIMESTAMP = 1646484818 -SHA256 (xbmc-xbmc-19.4-Matrix_GH0.tar.gz) = cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da -SIZE (xbmc-xbmc-19.4-Matrix_GH0.tar.gz) = 53487622 +TIMESTAMP = 1660871836 +SHA256 (xbmc-xbmc-19.4-19.4-Matrix_GH0.tar.gz) = cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da +SIZE (xbmc-xbmc-19.4-19.4-Matrix_GH0.tar.gz) = 53487622 +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 diff --git a/multimedia/kodi/files/patch-xbmc_windowing_X11_GLContextEGL.h b/multimedia/kodi/files/patch-xbmc_windowing_X11_GLContextEGL.h new file mode 100644 index 000000000000..ee0df4979024 --- /dev/null +++ b/multimedia/kodi/files/patch-xbmc_windowing_X11_GLContextEGL.h @@ -0,0 +1,11 @@ +--- xbmc/windowing/X11/GLContextEGL.h.orig 2022-03-02 18:38:51 UTC ++++ xbmc/windowing/X11/GLContextEGL.h +@@ -13,7 +13,7 @@ + #include "threads/CriticalSection.h" + + #include <EGL/eglext.h> +-#include <EGL/eglextchromium.h> ++#include <EGL/eglext_angle.h> + #include <X11/Xutil.h> + + class CGLContextEGL : public CGLContext
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212130633.2BD6XUrF047487>