From a21aa4ab111462511ef53461f69e7a3555e11e7a Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Tue, 31 Dec 2019 09:09:33 +0000 Subject: [PATCH] rkmpp: remove package --- packages/multimedia/rkmpp/package.mk | 21 ------------- ...p-0001-disable-unit-tests-by-default.patch | 31 ------------------- .../patches/rkmpp-0002-m2vd-use-ctx-pts.patch | 22 ------------- 3 files changed, 74 deletions(-) delete mode 100644 packages/multimedia/rkmpp/package.mk delete mode 100644 packages/multimedia/rkmpp/patches/rkmpp-0001-disable-unit-tests-by-default.patch delete mode 100644 packages/multimedia/rkmpp/patches/rkmpp-0002-m2vd-use-ctx-pts.patch diff --git a/packages/multimedia/rkmpp/package.mk b/packages/multimedia/rkmpp/package.mk deleted file mode 100644 index 34f2c1dea6..0000000000 --- a/packages/multimedia/rkmpp/package.mk +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="rkmpp" -PKG_VERSION="451ae59386bbb8093a25defdca7a95f588c28706" -PKG_SHA256="b2f6478783caa8ffb9698b4207bae3a684fe861ba09cd371414fe26d41a3433e" -PKG_ARCH="arm aarch64" -PKG_LICENSE="APL" -PKG_SITE="https://github.com/rockchip-linux/mpp" -PKG_URL="https://github.com/rockchip-linux/mpp/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain libdrm" -PKG_LONGDESC="rkmpp: Rockchip Media Process Platform (MPP) module" - -if [ "$DEVICE" = "RK3328" -o "$DEVICE" = "RK3399" ]; then - PKG_ENABLE_VP9D="ON" -else - PKG_ENABLE_VP9D="OFF" -fi - -PKG_CMAKE_OPTS_TARGET="-DENABLE_VP9D=$PKG_ENABLE_VP9D \ - -DHAVE_DRM=ON" diff --git a/packages/multimedia/rkmpp/patches/rkmpp-0001-disable-unit-tests-by-default.patch b/packages/multimedia/rkmpp/patches/rkmpp-0001-disable-unit-tests-by-default.patch deleted file mode 100644 index e36acf7c1a..0000000000 --- a/packages/multimedia/rkmpp/patches/rkmpp-0001-disable-unit-tests-by-default.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ef687eaf87efff3efcb1897ca02be97e09bf292e Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Sun, 24 Jun 2018 11:07:44 +0200 -Subject: [PATCH] disable unit tests by default - ---- - test/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 257a3efa..961086ae 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -10,7 +10,7 @@ macro(add_mpp_test module) - #message(STATUS "test_name : ${test_name}") - #message(STATUS "test_tag : ${test_tag}") - -- option(${test_tag} "Build mpp ${module} unit test" ON) -+ option(${test_tag} "Build mpp ${module} unit test" OFF) - if(${test_tag}) - add_executable(${test_name} ${test_name}.c mpp_event_trigger.c mpp_parse_cfg.c) - target_link_libraries(${test_name} ${MPP_SHARED} utils) -@@ -54,7 +54,7 @@ macro(add_legacy_test module) - #message(STATUS "test_name : ${test_name}") - #message(STATUS "test_tag : ${test_tag}") - -- option(${test_tag} "Build legacy ${module} unit test" ON) -+ option(${test_tag} "Build legacy ${module} unit test" OFF) - if(${test_tag}) - add_executable(${test_name} ${test_name}.c) - target_link_libraries(${test_name} ${VPU_SHARED} utils) diff --git a/packages/multimedia/rkmpp/patches/rkmpp-0002-m2vd-use-ctx-pts.patch b/packages/multimedia/rkmpp/patches/rkmpp-0002-m2vd-use-ctx-pts.patch deleted file mode 100644 index 8fb413e45e..0000000000 --- a/packages/multimedia/rkmpp/patches/rkmpp-0002-m2vd-use-ctx-pts.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8f9bd9b08f67beded2a8498754e59deb5e4eeae1 Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Thu, 1 Mar 2018 22:31:47 +0100 -Subject: [PATCH] [m2vd]: use ctx pts - ---- - mpp/codec/dec/m2v/m2vd_parser.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mpp/codec/dec/m2v/m2vd_parser.c b/mpp/codec/dec/m2v/m2vd_parser.c -index 903712c6..ce97cd9b 100755 ---- a/mpp/codec/dec/m2v/m2vd_parser.c -+++ b/mpp/codec/dec/m2v/m2vd_parser.c -@@ -1172,7 +1172,7 @@ static MPP_RET m2vd_alloc_frame(M2VDParserContext *ctx) - mpp_frame_set_hor_stride(ctx->frame_cur->f, ctx->display_width); - mpp_frame_set_ver_stride(ctx->frame_cur->f, ctx->display_height); - mpp_frame_set_errinfo(ctx->frame_cur->f, 0); -- mpp_frame_set_pts(ctx->frame_cur->f, Time * 1000); -+ mpp_frame_set_pts(ctx->frame_cur->f, ctx->pts); - ctx->frame_cur->flags = M2V_OUT_FLAG; - if (ctx->seq_ext_head.progressive_sequence) { - frametype = MPP_FRAME_FLAG_FRAME;