gentoo auto-resync : 16:11:2022 - 00:53:49

3 files changed, 0 insertions, 105 deletions

diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index bbeef3155460..05ee7f7d0141 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,5 +1,3 @@
-AUX libopenshot-0.2.5-gcc10.patch 2605 BLAKE2B 34967db6b59816738e7895f8c608603eab656ae90878fbaa146231ac14370fb11da0be616d5df9bf9c750c73a93d01643543abe81cf9228078060fa1b31d3b70 SHA512 29c974bbb896417b27c70eb9238038f05a4d2d1267f17b4e4f935696cc706fff4c3e0124c369bd24a8128dfd8bddc57bb4e7a740a9c0203b07fc40979875b999
-AUX libopenshot-0.2.5-no-hwaccel-testfix.patch 1691 BLAKE2B a587449964691bfd2940507f4a1d0b74342c0225bbe7b0a7620044603e0baffde73e7d71f6ca2ffa1ae7748e461ce661a86f11dd0b347a8c55eb07d19d7db75b SHA512 807c77c87a011e12e0a3c8696cbe83b4a6aea9c0770c5ac5194b4c3a6457e772795ca6ae309fdbbb458fefaaa03c7b930084e686e680b23e881f56a21493f85d
 DIST libopenshot-0.2.7.tar.gz 22472544 BLAKE2B 511ed214f0ecc43294a787e1c0119f036e274a1e8d051cb6e926bf7a9b5cea416325a2e051fca758d1f80ec2b9d746a4dd268e5ac5322fe8539fa2041a8c4d9d SHA512 71cb0e4010d8f3ff453486c3da3c7019c6569066845dcc58f438049a08b1c8663f31c29a728ce5461e9d3a1ca550038b757d4528e62a26eeb45ecbe600353988
 EBUILD libopenshot-0.2.7-r1.ebuild 2233 BLAKE2B 1a63594b8931438d02b5fc692bdff06c4052a623f99a6278b677af16d0bef18396967b5155266fbbd2275421183f1410886bdb37e09cec058d461b65439f71b5 SHA512 82d5ca6fbc5e73f6ca19366b5e0181d6caf54c6437a2081821f1cdc4ea6fde6adb904cdcb7a6413ae47337b157eb905cb2442dafd7c4c8f34e1cafee21e8c395
 MISC metadata.xml 616 BLAKE2B de66c4287ffe372cf76e3b48be340b0c981595f2381f8b248de88586cf9cad05b0a9cfc6465b55832db2bc76a5755ad5692494f5f2dc1dc9ee8a569887d50b34 SHA512 b2569b3545ef8a08ae3bc4b1307ee4414c82d488dea41efd4c3c977f2bcde65df273dc8f9aa44ba09abfc3a2fc19c8d83a3dd61faabddabe07bdb8c37f963c46
diff --git a/media-libs/libopenshot/files/libopenshot-0.2.5-gcc10.patch b/media-libs/libopenshot/files/libopenshot-0.2.5-gcc10.patch
deleted file mode 100644
index 4a116b120086..000000000000
--- a/media-libs/libopenshot/files/libopenshot-0.2.5-gcc10.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 13290364e7bea54164ab83d973951f2898ad9e23 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Sat, 16 May 2020 02:33:37 +0300
-Subject: [PATCH] FFmpegUtilities: replace variable definition with statement
- expression
-
-It is needed to avoid multiple definitions of AV_GET_CODEC_CONTEXT,
-which is considered as an error with '-fno-common' which is default
-since gcc-10.
-
-Fixes: #511
-
-Upstream-Status: Submitted
-[https://github.com/OpenShot/libopenshot/pull/512]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- include/FFmpegUtilities.h | 18 ++++++++----------
- 1 file changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/include/FFmpegUtilities.h b/include/FFmpegUtilities.h
-index 62d64df..b4ec951 100644
---- a/include/FFmpegUtilities.h
-+++ b/include/FFmpegUtilities.h
-@@ -163,11 +163,10 @@
- 		#define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context)
- 		#define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type
- 		#define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id
--		auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \
--			AVCodecContext *context = avcodec_alloc_context3(av_codec); \
--			avcodec_parameters_to_context(context, av_stream->codecpar); \
--			return context; \
--		};
-+		#define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \
-+			({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \
-+			   avcodec_parameters_to_context(context, av_stream->codecpar); \
-+			   context; })
- 		#define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec;
- 		#define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in)
- 		#define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar
-@@ -199,11 +198,10 @@
- 		#define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context)
- 		#define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type
- 		#define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id
--		auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \
--			AVCodecContext *context = avcodec_alloc_context3(av_codec); \
--			avcodec_parameters_to_context(context, av_stream->codecpar); \
--			return context; \
--		};
-+		#define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \
-+			({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \
-+			   avcodec_parameters_to_context(context, av_stream->codecpar); \
-+			   context; })
- 		#define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec;
- 		#define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in)
- 		#define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar
--- 
-2.26.2
-
diff --git a/media-libs/libopenshot/files/libopenshot-0.2.5-no-hwaccel-testfix.patch b/media-libs/libopenshot/files/libopenshot-0.2.5-no-hwaccel-testfix.patch
deleted file mode 100644
index a079d9746c0e..000000000000
--- a/media-libs/libopenshot/files/libopenshot-0.2.5-no-hwaccel-testfix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f71051e8f1add0b893ffaa9a799625017978e7f8 Mon Sep 17 00:00:00 2001
-From: Frank Dana <ferdnyc@gmail.com>
-Date: Thu, 20 Aug 2020 21:13:42 -0400
-Subject: [PATCH] Tests: Don't enable HW accel as side-effect (#557)
-
-The Settings test attempts to test the class by changing settings
-variables and reading them back again. Problem is, that affects
-the REST of the unit tests. So instead of enabling HW accel and
-causing crashes, we'll diddle something innocuous, like OMP_THREADS.
----
- tests/Settings_Tests.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/Settings_Tests.cpp b/tests/Settings_Tests.cpp
-index b63b56a8..65bd66a6 100644
---- a/tests/Settings_Tests.cpp
-+++ b/tests/Settings_Tests.cpp
-@@ -41,7 +41,7 @@ TEST(Settings_Default_Constructor)
- 	// Create an empty color
- 	Settings *s = Settings::Instance();
- 
--	CHECK_EQUAL(0, s->HARDWARE_DECODER);
-+	CHECK_EQUAL(12, s->OMP_THREADS);
- 	CHECK_EQUAL(false, s->HIGH_QUALITY_SCALING);
- 	CHECK_EQUAL(false, s->WAIT_FOR_VIDEO_PROCESSING_TASK);
- }
-@@ -50,15 +50,15 @@ TEST(Settings_Change_Settings)
- {
- 	// Create an empty color
- 	Settings *s = Settings::Instance();
--	s->HARDWARE_DECODER = 1;
-+	s->OMP_THREADS = 8;
- 	s->HIGH_QUALITY_SCALING = true;
- 	s->WAIT_FOR_VIDEO_PROCESSING_TASK = true;
- 
--	CHECK_EQUAL(1, s->HARDWARE_DECODER);
-+	CHECK_EQUAL(8, s->OMP_THREADS);
- 	CHECK_EQUAL(true, s->HIGH_QUALITY_SCALING);
- 	CHECK_EQUAL(true, s->WAIT_FOR_VIDEO_PROCESSING_TASK);
- 
--	CHECK_EQUAL(1, s->HARDWARE_DECODER);
-+	CHECK_EQUAL(8, Settings::Instance()->OMP_THREADS);
- 	CHECK_EQUAL(true, Settings::Instance()->HIGH_QUALITY_SCALING);
- 	CHECK_EQUAL(true, Settings::Instance()->WAIT_FOR_VIDEO_PROCESSING_TASK);
- }