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

2 files changed, 0 insertions, 103 deletions

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);
- }