Attachment 238619 Details for Bug 268234 – patch for 268234 and 265931

[patch] patch for 268234 and 265931

kodi.patch (text/plain), 4.45 KB, created by yzrh on 2022-12-07 23:18:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: yzrh

Created: 2022-12-07 23:18:58 UTC

Size: 4.45 KB

patch

obsolete

>diff -urN kodi.orig/Makefile kodi/Makefile
>--- kodi.orig/Makefile	2022-10-26 12:44:26.912845000 +0000
>+++ kodi/Makefile	2022-12-07 23:05:30.205125000 +0000
>@@ -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 @@
> 		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 @@
> 		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_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 @@
> 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 @@
> .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 -urN kodi.orig/distinfo kodi/distinfo
>--- kodi.orig/distinfo	2022-04-13 00:03:08.348927000 +0000
>+++ kodi/distinfo	2022-08-19 01:17:16.997007000 +0000
>@@ -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 -urN kodi.orig/files/patch-xbmc_windowing_X11_GLContextEGL.h kodi/files/patch-xbmc_windowing_X11_GLContextEGL.h
>--- kodi.orig/files/patch-xbmc_windowing_X11_GLContextEGL.h	1970-01-01 00:00:00.000000000 +0000
>+++ kodi/files/patch-xbmc_windowing_X11_GLContextEGL.h	2022-12-07 22:31:30.164970000 +0000
>@@ -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

Actions: View | Diff

Attachments on bug 268234: 238613 | 238618 | 238619