diff options
Diffstat (limited to 'media-libs/libopenshot')
| -rw-r--r-- | media-libs/libopenshot/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/libopenshot/files/libopenshot-0.2.5-no-hwaccel-testfix.patch | 45 | ||||
| -rw-r--r-- | media-libs/libopenshot/libopenshot-0.2.5.ebuild | 5 |
3 files changed, 51 insertions, 2 deletions
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest index 2f9d470dbecc..5e4bd0ba138d 100644 --- a/media-libs/libopenshot/Manifest +++ b/media-libs/libopenshot/Manifest @@ -1,9 +1,10 @@ AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b 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.4.tar.gz 10295888 BLAKE2B 2967f1faa56090355255e24c0367a4171af7433c53eab303c9d88432174d03879ae9fd2e6904e614ea6ba210e0c72c401cab95a1d2aa93ddd2cea2b861e985ce SHA512 6824ad22e81814b6427a4cb6489e5b893be264b5afa6e54287cd649f244f86b938c1b1d56280c1f49af65fa118d056d204bd39bc5b2ccdc10376d2df2f33a352 DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1 DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7 EBUILD libopenshot-0.2.4.ebuild 2258 BLAKE2B 1c18783cc8c33d985ee21044d3561eaae01c26a38df21b65f0c5ef18a783fa646fe453f91eb80fe328ff248f05bb51333d4cc5da03a49b28286be38a9928bf85 SHA512 1671c4ab1ba07e01f4c5e517ff4960ea641b24fe0cfb7b82edd174592c03820aacbc39140ac7591d983ec8dd39209a1fc2c7714137d529ce858f079c2106e056 EBUILD libopenshot-0.2.4_pre20190609.ebuild 2415 BLAKE2B c890e1777e9fa8f01412bd50dffd1ff455c786805cde1717420fdaa846b2451ec0396dc2203a75baf969329525b75c5179830f145176dc3385a1496fd79da2bc SHA512 676bbbdc2958a228a0907e260a2a421f753283893415f393ebd3ba66379cc4910e3fc0b64dd7f87534db7e76d2ff6eb8f78bb22725ab4e095c9c969065410fab -EBUILD libopenshot-0.2.5.ebuild 2314 BLAKE2B 57f5e2664972250a5077a8dfbab5770e38eecfb6f88b57cb27d1029f3a45347d1bff0b50cfb9cbfd31f4358ee18bddd944797a158e8a9a5507117e5c24007a26 SHA512 a4795ea55196d630cc7c871cb2a6d6c752e6444d943b58c2e79811271ec79cc7477abc3d33f3057dbf1204fb38e33aad17d2c0e66eff03a568ea3e88ce963b51 +EBUILD libopenshot-0.2.5.ebuild 2355 BLAKE2B 2b7225b9b3bad2843595c4c6657392ef4f77722929c2de868222cb619354d05ad4f4e1886fb63b4208835b27396a6db57b24d337f77a7e89043c17589f1bced4 SHA512 5b0c6e16eb01ad7b5858397b6e803b83d32d7c03e5bdb7b66c1d733f37136da930976b8f17e8bd540f4c9078f1b365e4d01d8ab7b00423420fc4eac45b5c3c0a MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15 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 new file mode 100644 index 000000000000..a079d9746c0e --- /dev/null +++ b/media-libs/libopenshot/files/libopenshot-0.2.5-no-hwaccel-testfix.patch @@ -0,0 +1,45 @@ +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); + } diff --git a/media-libs/libopenshot/libopenshot-0.2.5.ebuild b/media-libs/libopenshot/libopenshot-0.2.5.ebuild index fdfa393fcfc9..37973900308f 100644 --- a/media-libs/libopenshot/libopenshot-0.2.5.ebuild +++ b/media-libs/libopenshot/libopenshot-0.2.5.ebuild @@ -38,7 +38,10 @@ BDEPEND=" test? ( dev-libs/unittest++ ) " -PATCHES=( ${FILESDIR}/${PN}-0.2.5-gcc10.patch ) +PATCHES=( + "${FILESDIR}/${P}-gcc10.patch" + "${FILESDIR}/${P}-no-hwaccel-testfix.patch" +) check_compiler() { if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then |