Merge pull request #7060 from heitbaum/graphics

Graphics package updates

packages/graphics/libde265/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libde265"
-PKG_VERSION="1.0.8"
+PKG_VERSION="1.0.9"
-PKG_SHA256="24c791dd334fa521762320ff54f0febfd3c09fc978880a8c5fbc40a88f21d905"
+PKG_SHA256="29bc6b64bf658d81a4446a3f98e0e4636fd4fd3d971b072d440cef987d5439de"
 PKG_LICENSE="LGPLv3"
 PKG_SITE="http://www.libde265.org"
 PKG_URL="https://github.com/strukturag/libde265/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"

packages/graphics/libde265/patches/libde265-0001-275-Add-CMake-option-ENABLE-SDL.patch

@@ -1,53 +0,0 @@
-From 48056f2eb5ed03be0589bbe335dcdaa676604b28 Mon Sep 17 00:00:00 2001
-From: theirix <theirix@gmail.com>
-Date: Sat, 31 Oct 2020 11:57:33 +0300
-Subject: [PATCH 1/2] Add CMake option DISABLE_SDL
-
----
- CMakeLists.txt | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e9f64fe6..c836a9a9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,12 @@ include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
- include(GNUInstallDirs)
- include(CheckFunctionExists)
- 
--find_package(SDL)
-+option(DISABLE_SDL "Disable SDL" OFF)
-+
-+if (NOT DISABLE_SDL)
-+	find_package(SDL)
-+endif()
-+
- find_package(Threads REQUIRED)
- 
- CHECK_INCLUDE_FILE(malloc.h HAVE_MALLOC_H)
-
-From c754a0342fe9bbd74bbb90d7244777cb6370804a Mon Sep 17 00:00:00 2001
-From: theirix <theirix@gmail.com>
-Date: Mon, 2 Nov 2020 19:03:05 +0300
-Subject: [PATCH 2/2] Use ENABLE_SDL instead of DISABLE_SDL
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c836a9a9..ac9d3ce8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,9 +20,9 @@ include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
- include(GNUInstallDirs)
- include(CheckFunctionExists)
- 
--option(DISABLE_SDL "Disable SDL" OFF)
-+option(ENABLE_SDL "Enable SDL" ON)
- 
--if (NOT DISABLE_SDL)
-+if (ENABLE_SDL)
- 	find_package(SDL)
- endif()
- 

packages/graphics/libpng/package.mk

@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libpng"
-PKG_VERSION="1.6.37"
+PKG_VERSION="1.6.38"
-PKG_SHA256="505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"
+PKG_SHA256="b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be"
 PKG_LICENSE="LibPNG2"
 PKG_SITE="http://www.libpng.org/"
 PKG_URL="${SOURCEFORGE_SRC}/libpng/${PKG_NAME}-${PKG_VERSION}.tar.xz"
@@ -32,5 +33,8 @@ post_makeinstall_target() {
       -e "s:libs=\"-lpng16\":libs=\"-lpng16 -lz\":g" \
       -i ${SYSROOT_PREFIX}/usr/bin/libpng*-config
 
+  sed -e 's|^Libs: -L${libdir} -lpng16|Libs: -L${libdir} -lpng16 -lz|g' \
+      -i ${SYSROOT_PREFIX}/usr/lib/pkgconfig/libpng*.pc
+
   rm -rf ${INSTALL}/usr/bin
 }