diff options
Diffstat (limited to 'media-video')
60 files changed, 1796 insertions, 2172 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 804d5aecf082..ad4fccc28915 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index ddf3076d9f30..661e8c4f20f5 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -1,6 +1,8 @@ +AUX avidemux-2.7.0-glibc-2.27.patch 872 BLAKE2B 2edd751aa7de1d6b4ed6d6dc12bff1f02e54e4950b8402cd531776bba7be1481c205ee3b11249addfe759c2d730db0831280e6bdcafb470a683220242ee79937 SHA512 3bf0bc7b15cb50141b5ec771dcee97971d2889af8913c9d825a3d6cc929143eabf04af76d033257722cb6be90f966a34e3ba2c069470cfb6097bc959bb0feead +AUX avidemux-2.7.0-qt-5.11.patch 1664 BLAKE2B 080497a678e869e143eb350ecdca2b77d5e5906a8a469e24f16fc58853665791dbbd94880418b492df6816b8f420d54ee7ecd06c805b0aab16e8d05ab43f545d SHA512 49186e7648db60e081f78e1257ea788313cac6e991c995249701189ab344744f0c410203b39b49e5530a8dd33de937582099eb8b615d19fe7d0e3731254d535c DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015 EBUILD avidemux-2.6.20-r1.ebuild 4366 BLAKE2B cf89350d867c09eb88d6efa63c1ef56d28eba7cb7b137b599d2431c9c129957296536d96438bc1d5f627110ef7cfa9b62fa29fdadd0b8eb287407e03251aad80 SHA512 7fb00801367a6c0adbe85641c28b4e09dc1ffcc8493e8066ae734a85e75cd957afb6b0366526e1fae1d072c6bc6c05b8fb1622491d97cfeedea0f715f9bd7988 -EBUILD avidemux-2.7.0.ebuild 4445 BLAKE2B 8b58ee4acaaccf1c6335964b7953fc30799711eb4896d37367463b4131e097bf417cd5dd381eacb15933bcb6fa62cb3624b4b2c77f0e4610fac6e0bebe2d0acf SHA512 e4e763c2ca67be1786cd785f6bf5bb1647cc9faacde334b56103fe4d3a3fcc26b2cee20761a56b680e371334de8fffc019e278566629db5b2bd61133984edc3b -EBUILD avidemux-9999.ebuild 4445 BLAKE2B 8b58ee4acaaccf1c6335964b7953fc30799711eb4896d37367463b4131e097bf417cd5dd381eacb15933bcb6fa62cb3624b4b2c77f0e4610fac6e0bebe2d0acf SHA512 e4e763c2ca67be1786cd785f6bf5bb1647cc9faacde334b56103fe4d3a3fcc26b2cee20761a56b680e371334de8fffc019e278566629db5b2bd61133984edc3b +EBUILD avidemux-2.7.0.ebuild 4518 BLAKE2B 6eb480a6467eb5a734891ffeefbbb0a37abbb83469ca12a090c18502e3a3836701ef43439681e51ac5f3259af368f6b045c830207b05b5df7febbbf70a534b66 SHA512 5d7c46c56e237386d0c9e8c74ddfe5f25aa3e510a0e7683c91880a863fe40d51e3d5d4661cb670af25c6ff7a43264a303f74e9a7c9033bf0daa3d3d55968a8d0 +EBUILD avidemux-9999.ebuild 4432 BLAKE2B 4b1c6dd8436233da06e74f0bbffa6881d545c49a187489660746653111b7b40845f286a7e843c824020edc14cd645c60c7c3b90ed6bc9868d6cebdd2c7bd6e05 SHA512 35a665d74df41a431551500be75c186d686a28bd6e208d02575226bfa3f8c9c8424234a3628475893f6235759a0882639d59bedc52e7e8039018c18a02c28bdc MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d diff --git a/media-video/avidemux/avidemux-2.7.0.ebuild b/media-video/avidemux/avidemux-2.7.0.ebuild index 3408af19d4a3..3a66ade975eb 100644 --- a/media-video/avidemux/avidemux-2.7.0.ebuild +++ b/media-video/avidemux/avidemux-2.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -46,7 +46,8 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]" S="${WORKDIR}/${MY_P}" src_prepare() { - default + eapply "${FILESDIR}/${P}-glibc-2.27.patch" + eapply "${FILESDIR}/${P}-qt-5.11.patch" processes="buildCli:avidemux/cli" if use qt5 ; then diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild index 3408af19d4a3..6d44aea9bcd2 100644 --- a/media-video/avidemux/avidemux-9999.ebuild +++ b/media-video/avidemux/avidemux-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -46,8 +46,6 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]" S="${WORKDIR}/${MY_P}" src_prepare() { - default - processes="buildCli:avidemux/cli" if use qt5 ; then processes+=" buildQt4:avidemux/qt4" diff --git a/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch b/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch new file mode 100644 index 000000000000..166791f4774a --- /dev/null +++ b/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch @@ -0,0 +1,22 @@ +From afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d Mon Sep 17 00:00:00 2001 +From: eumagga0x2a <eumagga0x2a@users.noreply.github.com> +Date: Fri, 29 Sep 2017 15:53:14 +0200 +Subject: [PATCH] [build] Fix compilation with glibc >= 2.27 + +--- + avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp b/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp +index c6cb43bb6..269c2d2e3 100644 +--- a/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp ++++ b/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp +@@ -35,7 +35,7 @@ + #elif defined(ADM_BSD_FAMILY) || defined(__sun__) + #define POW10(x) powf(10.0,x) + #else +-#define POW10(x) pow10f(x) ++#define POW10(x) exp10f(x) + #endif + + #define LINEAR_TO_DB(x) (20.*log10(x)) diff --git a/media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch b/media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch new file mode 100644 index 000000000000..8ac9bbc3b4ac --- /dev/null +++ b/media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch @@ -0,0 +1,48 @@ +From ba667da44fcb88ee660339e52859bb90dc1b00d3 Mon Sep 17 00:00:00 2001 +From: mean <fixounet@free.fr> +Date: Wed, 30 May 2018 07:31:03 +0200 +Subject: [PATCH] [Qt] Compatibilty patch with newer qt (>=5.11), patch by + Chris Clayton + +--- + avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp | 1 + + avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp | 1 + + avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp +index 256f69d5e..54b0ac639 100644 +--- a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp ++++ b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp +@@ -17,6 +17,7 @@ + #include "ADM_coreJobs.h" + #include "DIA_coreToolkit.h" + #include <QtCore/QDir> ++#include <QAction> + + extern void loadTranslator(void); + extern void initTranslator(void); +diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp +index 85cec5f9a..f537995ca 100644 +--- a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp ++++ b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp +@@ -21,6 +21,7 @@ + #include "ADM_memsupport.h" + #include "ADM_crashdump.h" + #include "ADM_win32.h" ++#include <QAction> + + void onexit( void ); + +diff --git a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp +index 94bdd577e..b2a01e54b 100644 +--- a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp ++++ b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp +@@ -17,6 +17,7 @@ + #include "Q_eq2.h" + #include "ADM_toolkitQt.h" + #include <QSignalMapper> ++#include <QAction> + + // + // Video is in YV12 Colorspace
\ No newline at end of file diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 7bdc2967c506..771e74d6fe0b 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,5 +1,6 @@ AUX chromium-r1.patch 1492 BLAKE2B efa332eb9cc842e2a9fa949c6c00d3c1956ae7ad55b5567e880e48a2fe21325ffcb7a7bc13f726cb8cfad44f0f63e23887c16d9938fcf80ed7427cc2f9253035 SHA512 55d7a06b630ac28c7b8e91112536fd67356664c7c91c3ca38b02733beb91d9a8a28247fd122e4b1d94009ffce5b83d29de10f331323179ae268e42851af10000 AUX chromium.patch 1420 BLAKE2B 1acf931cd2e635b0b6c2c42d649d1bc92ac59321acc451501c70076d84449fd17b3a95c24a33208994df9aac8f8959a084f0ebaedaf0c997f535008594872bd8 SHA512 1f3f6d08aac64bb8c9d8a974170064b8a3531a6d06cea6fb208439dc687addeaf0c90f7f407dd7e71f50cd524f69c110c92d5276d04fe3bcaf7fb1ff2494ec59 +AUX ffmpeg-4.1-vaapi-tools.patch 850 BLAKE2B 2303915fce02ea555118c1dbac8f84ceb803f6ad43de31af7ef2c49cedc37c15bb5f968aa83949ccd393a8710f9b59389eff1fea54940fdd45e52d67eb998d4d SHA512 836b5737e6714daa1a5c9f7f390b9cd473cd7e05ed184c96a860cf5ef145561dcbbfd214e4e55db525d46b1c0dec7ba7b81aca7d5835d9ce4fb9bee1819bdfb0 AUX ffmpeg32-openjpeg22.patch 4777 BLAKE2B 4ea7ed6b6b31c6d0d3e99358231ce27f18423aab866ceed75c10bf2c4b514ae4d023f9b0f4dd91346773f2ef2014943a08e6093e53266fa307557da69d766c8b SHA512 0d619b0e353ee9f80dffdb94bedd31b55fb4e6a18a0e60d8ef7119e5012583c1c0531b0b200b41c32caaa71cbade4899f74c9d0ae70d15403ef0aa6f3d77e07d AUX openjpeg22.patch 4770 BLAKE2B b5fd034e2af9d180b2e0ee76e5227fcc948e20bacc5e463c8d7d640db3c3e52dd0f12149e5a095388c3b8db0d7c37bb4080be3141b90fd554c46aa4650585b27 SHA512 8a198910cdf43df83fdf50e372c2ec5d911637dd61768d5ac3a1984f99d1f374f594af9ff6c501b248c390a22898e4964f7d07c81eb3586fa1bebad2c9e00730 AUX openjpeg23.patch 5105 BLAKE2B 64aab97ec21e44f7ab94c9513ebf63e60a76698889ed3cafebec3a25adb07dddffe9358c4c3b29f89b0d0b4c8bb54d9197a5b8ca2e4105c539fd6b513ad5c247 SHA512 a1e3b91add49a80633e19eb49870ecb7ef1493cf3503d121bdeb74f2fcd0320b8e5f04a3505241f7375f4a598f5da651afb92350e3b92412977f55b9193409a7 @@ -8,14 +9,18 @@ DIST ffmpeg-3.2.7.tar.bz2 9622391 BLAKE2B 7d6f094ca0bd5e2cab02e051acc8e554873bca DIST ffmpeg-3.3.4.tar.bz2 9944256 BLAKE2B 72d42a16396882b30641fb057bb597f8e98ecfa482a087ece48189acba8a80a72e931e70ad961db8c01c93a556f619ebdecb39bae9d4559cc504d0f7eabf15a7 SHA512 d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 2526fdf9580045131426e554a9bf44fdc6567c12213ea4d5b78aa27f14513f14e07f38b8380183686fa1a62440fe4108eaecddca96f4dec3c74c410b1f90ee03 SHA512 1305760fa981bcb43c8fcb5dd1bf7dd8d3f405a124975f062062b741d49e12386e4d3eec3de6a032fc93cd7f6086d939275a669a9997ffa400f70c20f7eb3d23 DIST ffmpeg-3.3.8.tar.bz2 9953307 BLAKE2B edd3c2ce9730494455a05ec9d81b6c2ceb0ebf526124f95a530214cdb113ffe91aa13b80a66501aefa4f571c5b8f2eedb97f8086370d08e3b4e2a98d517eb92b SHA512 a793f6d0a06ff5244a580d9e54e1252d3ac88e2513dad4d137081103327ae4440ebe9b0d60a13f93536cb6b35097982ea76acc4056bfa31683063eef5c211ede -DIST ffmpeg-3.4.4.tar.bz2 10181822 BLAKE2B 1b15d389576cbbe6d375e8934aac20a1d7ee5854c711aa90cc831201e5b1f42ed8b2c2b277ddde33060cda8fcd605dc6f3fa5e95ab8dff9125515de2d5bf8579 SHA512 6803ede26d403dd38835491e0b66c23856d62312a32520ad98866ebd4468d1d50723060c45101481282285711790bcf810c5012bc067e54568fc1954d361e620 +DIST ffmpeg-3.4.5.tar.bz2 10183082 BLAKE2B f72157baefcd6a0ca8f389309bbe947ad21996e0f2eb3c46c6bfc90f1ebbb14bfd007d001e46ea51efef5db5f9fcee24b1a90b6862136aeebecdc95bb61b23a5 SHA512 e12707d47404a9ce02790b77d2852fc1a1573c8108e980c7355fa48ba891d1649464d4fe4d08394ecd6d871f651ac4388486b7654cb54a7aaeedaf05c55513ec DIST ffmpeg-4.0.2.tar.bz2 10424065 BLAKE2B 0d3e072fa31bfae37722d8113f9c9cfd2071067b2a29ed5c7332ae49b388b91e8646b6bc8a816517bcebcdcc8d923d1e8b5a080dbdc63ea2a153aea8ecfb2af9 SHA512 92a3bedcd070df72b26dbe3ebf4a3faea0a02289fbefdb6a6c73d65801cf60a7e11cd832d29ab46b7749a1ffd0a31505cf75bb46bd01ea06423b454ca04e9b7b -EBUILD ffmpeg-3.2.6.ebuild 14916 BLAKE2B 36725fe6eca73d10787b95c174c4ad893226d1930462134d9d95cd6900ada87ffe60bdcac3873ae8db2d9c2b9ce3297a0eb87a02546ea1e465e0f2d34f87dc70 SHA512 2c7a9841c344eba9b165a6c0190867297212d04e139fa5e00d774cd8f90d56965daeb78c94b6453f35ace4cd6b750deaa4d694c2733be4e45724ef2aa248bcca -EBUILD ffmpeg-3.2.7.ebuild 14921 BLAKE2B 50fcb14dd41dae4ae0365568bad04f8e7d434c29add0ec17a9a39fec7d7219e11947eba820f81b88f8e1c296233a8ed1be3a1040d19240e4b58f10f9984ec4cf SHA512 3acd7468aca58b0d24acabb404f15da37fbe06a41b3e1b287aad6977306e1e819f0acc2ea79f9dd84113756269fb6ae97c54710f42b9d5d15685c806fd32b730 -EBUILD ffmpeg-3.3.4.ebuild 15945 BLAKE2B 827322318e0de371d5b449f46f728387e55ad08e8986c5f4c2851c9ac039348c73e33fe223cf5b3b3ae1dec8f43d97d57b4c03f3b7539febd1a6125a635beb15 SHA512 9d9cda2e7fe77d76d4a4a2a70c09fd4052528b394cbf3ff1225683949a66ff0eee36f77e8e4cefbb7469640f1d025651c54c04390672273cf38201f00fdfc4a9 -EBUILD ffmpeg-3.3.6.ebuild 15946 BLAKE2B f7c4901c2d50228f6ded80b2523f4b7bb98cc80825d22c571fb0668d8a5f63c5700db615db74a5e147a72c87209161c279c86a0456b0839cfaebf493a4d12281 SHA512 4fd8693818b0a3a7ef24c5e02f6b70b2849035e7976c93f590968e48b25be4abe82188a571127179cedebd5368666d3e0cba38283ab6facc68db6a5252a6d0b7 -EBUILD ffmpeg-3.3.8.ebuild 15952 BLAKE2B cb001262d47db1677277959baf4c3f272bdfa1be98a205be42599c2d00c9de0e405c3cc916d0bb4b035af4551c95af854a4c8418772d4e2916d7f1bf16fda3a4 SHA512 f8c2924c5eddccfe626edbf62f15fac0c7e700a8a0c5b25ef95a03d2434365cbc2c40fbfd089a639dc4897212f7346579d9940fc9a51dc6b06f2b1e25cb064c1 -EBUILD ffmpeg-3.4.4.ebuild 15622 BLAKE2B 7daf35a4c6d2ae51a03c9b2c7b7866de02cb6c730387b7725d47994a64807995ebe86fde4673f15d703a09998f4412bac6f3edaaa1bccd297102a1cdd6f50119 SHA512 b5210dda0b6593d2f3317bc6919fa6b91b809e34f4e0f951cfdd0290450837bf77bc89cdc291c9047d77d02d1a13eaabbca6c9d4fd601672379d994e0a5a0664 -EBUILD ffmpeg-4.0.2.ebuild 16472 BLAKE2B fe2c7dc060bad7b5eba2037089b8d3df8e62ce4d4bbf1adeafdc11587e1af4997b16bd79be88eec956ba198a2b739cc0c7dfb881c7cc3d8e61380f416b2b27e1 SHA512 a0bb187d96f6c00b51962a500f91ba1017f6205030971cd968159d0b910314c72e0b259822c6d3fdacdc73d053557322c9551f2da1868f526faebecbbe9aa1fa -EBUILD ffmpeg-9999.ebuild 16485 BLAKE2B 327840f56de6b23f32c887f8898c69369082486676ed368a66ebeac9e844f4fba4a0201e61cfa0be36a4693e605ae8c4ad500c38e054395225a99a8fb30dea41 SHA512 cd6fee7e89c5f7e29b2837f9f44a12ca3d0aa145f5e3d966242f5bdda3bdae224e010b7d37179dd78765e61dbd0e908f878c7d8d5190985ffdcfbd2c15d37141 -MISC metadata.xml 5843 BLAKE2B ac661ce6328d1f2aa3f29ca8a0f80822fc9b70a7dda1b2c05986b344e3acbcdf56226e2be982b1c918f4555a9efc3aecdd63de0fe818d9f06098e98acbe2d5b0 SHA512 d4703383f6877460c3174885fe24109ce09d4a21f260277fcd10f3c69a0e77814594a60bb9271dbc643b78be8b2373a556f0c4844b321cd770430a5522ff6c41 +DIST ffmpeg-4.0.3.tar.bz2 10425117 BLAKE2B 1517d66d5a0c931b866df5206ae660a01daf49d375f7750a7b027ce62ab7dc8131fc02b8a6320e5ff7295b9bccdafbbaf25e206c55fad420ea206c1b9638e777 SHA512 8d600adf55f2fc1574a7013700129766a4a3db83bb33ec32fe07759310f1d8804c00e74b58fd1fcbdd91efec214764e4b2fadf7b01c948dc2ccdcd1b4d56e303 +DIST ffmpeg-4.1.tar.bz2 10687291 BLAKE2B 07293af1b13c6c6cad72e368207db21bdbc4b991931166c24ff40b00c3b3c8e1242be1876af8e3f154cc840fcd90d87b762fe77faccf06936dd096478d5d074b SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417 +EBUILD ffmpeg-3.2.6.ebuild 14876 BLAKE2B 000940b7bb4a00288ca50439b5606b6ab482dab2a8956f72a49ecdc8a8055977a0d6b0c36b226003b5a4ab755036563d2f6ad74c0af6d4d84fbe23fa296d79e5 SHA512 83eb5308fb91b93dffc4e91c7fae0f4ea33c15efac04a97a6a1ac7bc2b6e14d305ed96814d64eebf97e4d15a1aba86f01d365f7f8c989b5326d59eabfb3420af +EBUILD ffmpeg-3.2.7.ebuild 14881 BLAKE2B 8a4c85d008a5cce7c26880721d4a3533eb16794795e96b40f00808c8142c2d0b68f01b1bb0990603e79158be89d8a2d9a4559fbca4469278b38c0444c754bb8c SHA512 3eb99bffa96b0ef1b3df7a47c54aa59918063888e9d7d1c114386283494c26050d66eb1657f51b5157ce18a04f53f076d5185b177f46a37e9d66f27526e747d0 +EBUILD ffmpeg-3.3.4.ebuild 15905 BLAKE2B 2dcb83a3b7dde73f1d92259e339b46d8fb53b5e17400286e1decfccbdce282ff18bd0bdd1f0a50ed0b1505c8053909f68a4d59992bc8ce5bdeb039469679a8f8 SHA512 e7113d98b89182772bdde3ab0624d0754864e081964ad22fa590eb69ab40ddeb437c21ad08e40d1c494fe8e580220b40695f76fa5171267f8686bf2a3c9707b8 +EBUILD ffmpeg-3.3.6.ebuild 15906 BLAKE2B f38762b837642571aa85c5a828e3fe5ae0706f3bd135dad2d32d62f8fb059bd58e7bf57a239471c5829ed29588f0167ddfcfdae4636db251419ee45c91fb9dff SHA512 2755fcf82f8d2a6eaf04bcbc4bf8e753a511588cf0f505f6129ae1eba6868e60cd05c50a47316eb791ee31b87d85005689d923972f2412ab08b33c7378bbb4f9 +EBUILD ffmpeg-3.3.8.ebuild 15912 BLAKE2B 04ec63d4f194045e71e5e4f475ce3881a472a1b6b804f8d62c5b05e8752e09a40793e2304ff6f498edab7de8760b0b95cf99d275d437ad1af8b3b872380a56a3 SHA512 0e8ffd2a55b0dde6238b4cdefb18271df962417c1f77ad4d344414dc9379cbc7945837d5c8168e7649eff1920d391205fcc553ff8dc4a4f9046c9222df320118 +EBUILD ffmpeg-3.4.5.ebuild 15582 BLAKE2B 745bc41a4cf5430e6df447b49378019d80d448fe49f444afae3b8f6dca9cb509d906506c73594a1be77269f6b5cb32440de7c360806f1878d40f996cd50b90db SHA512 cfd435409eb31bea28826f1e7c6aab9e802354f082a70eb1538d7dc6b97294f4da1df08a27e7e85a76e09c545fb450c7c9a6297e184820655a372e5e35eeecd7 +EBUILD ffmpeg-4.0.2.ebuild 16432 BLAKE2B 74f531fda1e944e12b905a99ba9a230bfb14aab073e8d353af26b4d31ffabc157657337e50031472124f2e6c8238918ca8469a64f942bdbd635d34d15cecb689 SHA512 a209772c384428fc390922358580fd6e71185312fe309c0567cfce3f3992c3ce40d5ec969ea9d21044adc7ae007a98afa48560a58ffb327e3a02ab844d0cf0e9 +EBUILD ffmpeg-4.0.3.ebuild 16445 BLAKE2B 6fa2b440e3f04fbf9494a7f49378e2aa32a57ea19b7a356cc7fd3599d9a54415aa68ed0b4feee98b4ad6f5f92b7b284e620a2ddf42669e4b2615629487f99a40 SHA512 3040d9cf18735fa6ae62236fe7deeec8ea3e2a1726da93714d64f83bd0efbaa29c6b8cff3557f117a5adebc57ab25dedacc13c4fd5c670649ecfee9f94caab39 +EBUILD ffmpeg-4.1.ebuild 16483 BLAKE2B d210f2e72f4abe646771ba8cacd585194cb53d071a6c34ab62b09584533113cb90a9ccabec0931e62973be92a76938e4098cf80fe217a8665d5d064667593b4f SHA512 cf7c1bab3dcb0ae72dd770dba58d5e3b8bd946449da3e00f8fa8d2ca49c6e1599d5f3b457852adade08638831a19ada965f82bcf45c98070cdae45c796020a3b +EBUILD ffmpeg-9999.ebuild 16445 BLAKE2B 6fa2b440e3f04fbf9494a7f49378e2aa32a57ea19b7a356cc7fd3599d9a54415aa68ed0b4feee98b4ad6f5f92b7b284e620a2ddf42669e4b2615629487f99a40 SHA512 3040d9cf18735fa6ae62236fe7deeec8ea3e2a1726da93714d64f83bd0efbaa29c6b8cff3557f117a5adebc57ab25dedacc13c4fd5c670649ecfee9f94caab39 +MISC metadata.xml 5779 BLAKE2B 7c14dc48960ada6ed913ba8b2d39018f95fcfca9e7f601b93c8f394ffd4bc51c89f7b48fea8a5c4307827e5bf0850ce7802d80a55922694b5e0ae229e91f65f7 SHA512 24e0f020434c76af8bb8a1dfb612ad5a2e1b40e4794829fc2f4f630076ab68172038e0bbe9dbc4be8ff1f13180ab0fc1791b5d64072675baaeca479cc4c15996 diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild index d133d024790d..010f59065ed5 100644 --- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=( libv4l:libv4l2 pulseaudio:libpulse # decoders amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac - jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx zvbi:libzvbi @@ -159,7 +159,6 @@ RDEPEND=" bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] ) encode? ( @@ -212,7 +211,7 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) @@ -380,6 +379,7 @@ multilib_src_configure() { --enable-avfilter --enable-avresample --disable-stripping + --disable-libcelt # bug #664158 "${myconf[@]}" ) diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild index ce347f5d0d86..b798bf59bc27 100644 --- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=( libv4l:libv4l2 pulseaudio:libpulse # decoders amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac - jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx zvbi:libzvbi @@ -159,7 +159,6 @@ RDEPEND=" bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] ) encode? ( @@ -212,7 +211,7 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) @@ -380,6 +379,7 @@ multilib_src_configure() { --enable-avfilter --enable-avresample --disable-stripping + --disable-libcelt # bug #664158 "${myconf[@]}" ) diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild index 106581975ec4..e21349699065 100644 --- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=( libv4l:libv4l2 pulseaudio:libpulse # decoders amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac - jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx zvbi:libzvbi @@ -176,7 +176,6 @@ RDEPEND=" bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) @@ -228,7 +227,7 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) @@ -400,6 +399,7 @@ multilib_src_configure() { --enable-avfilter --enable-avresample --disable-stripping + --disable-libcelt # bug #664158 "${myconf[@]}" ) diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild index 56f21ea10ded..8edfe99d1be6 100644 --- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=( libv4l:libv4l2 pulseaudio:libpulse # decoders amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac - jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx zvbi:libzvbi @@ -176,7 +176,6 @@ RDEPEND=" bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) @@ -228,7 +227,7 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) @@ -400,6 +399,7 @@ multilib_src_configure() { --enable-avfilter --enable-avresample --disable-stripping + --disable-libcelt # bug #664158 "${myconf[@]}" ) diff --git a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild index 8c86da808b0e..31f31bd7f750 100644 --- a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=( libv4l:libv4l2 pulseaudio:libpulse # decoders amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac - jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx zvbi:libzvbi @@ -176,7 +176,6 @@ RDEPEND=" bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) @@ -228,7 +227,7 @@ RDEPEND=" modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) @@ -400,6 +399,7 @@ multilib_src_configure() { --enable-avfilter --enable-avresample --disable-stripping + --disable-libcelt # bug #664158 "${myconf[@]}" ) diff --git a/media-video/ffmpeg/ffmpeg-3.4.4.ebuild b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild index 6a49d24e8e00..671893a16247 100644 --- a/media-video/ffmpeg/ffmpeg-3.4.4.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -73,7 +73,7 @@ FFMPEG_FLAG_MAP=( libv4l:libv4l2 pulseaudio:libpulse libdrm # decoders amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac - jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh speex:libspeex svg:librsvg vorbis:libvorbis vpx:libvpx zvbi:libzvbi @@ -167,7 +167,6 @@ RDEPEND=" bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) @@ -221,7 +220,7 @@ RDEPEND=" openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) @@ -382,6 +381,7 @@ multilib_src_configure() { --enable-avfilter --enable-avresample --disable-stripping + --disable-libcelt # bug #664158 "${myconf[@]}" ) diff --git a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild index af3844683b8f..0ecdf810c4ba 100644 --- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -74,7 +74,7 @@ FFMPEG_FLAG_MAP=( libv4l:libv4l2 pulseaudio:libpulse libdrm # decoders amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac - jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec vorbis:libvorbis vpx:libvpx zvbi:libzvbi @@ -168,7 +168,6 @@ RDEPEND=" bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) encode? ( @@ -263,7 +262,7 @@ RDEPEND=" RDEPEND="${RDEPEND} libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) !libressl? ( - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) ) " @@ -404,6 +403,7 @@ multilib_src_configure() { --enable-avfilter --enable-avresample --disable-stripping + --disable-libcelt # bug #664158 "${myconf[@]}" ) diff --git a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild new file mode 100644 index 000000000000..2a10fdca9482 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild @@ -0,0 +1,510 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=56.58.58 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" +fi + +inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/" +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.bz2" +else # Release + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#9999}" = "${PV}" ] ; then + KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi + +# Options to use as use_enable in the foo[:bar] form. +# This will feed configure with $(use_enable foo bar) +# or $(use_enable foo foo) if no :bar is set. +# foo is added to IUSE. +FFMPEG_FLAG_MAP=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp + +gpl +hardcoded-tables +iconv libressl:libtls lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau + X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm + mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh + speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint flite:libflite frei0r + fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype + rubberband:librubberband zeromq:libzmq zimg:libzimg + # libswresample options + libsoxr + # Threads; we only support pthread for now but ffmpeg supports more + +threads:pthreads +) + +# Same as above but for encoders, i.e. they do something only with USE=encode. +FFMPEG_ENCODER_FLAG_MAP=( + amrenc:libvo-amrwbenc mp3:libmp3lame + kvazaar:libkvazaar libaom + openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame + wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid +) + +IUSE=" + alsa chromium doc +encode jack oss pic static-libs test v4l + ${FFMPEG_FLAG_MAP[@]%:*} + ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} +" + +# Strings for CPU features in the useflag[:configure_option] form +# if :configure_option isn't set, it will use 'useflag' as configure option +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 +) +ARM_CPU_REQUIRED_USE=" + arm64? ( cpu_flags_arm_v8 ) + cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) + cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) +" +MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu ) +PPC_CPU_FEATURES=( altivec ) +X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) +X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) +X86_CPU_REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) + cpu_flags_x86_xop? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) + cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) + cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) + cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) + cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) + cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) + cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) + cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) +" + +CPU_FEATURES_MAP=( + ${ARM_CPU_FEATURES[@]} + ${MIPS_CPU_FEATURES[@]} + ${PPC_CPU_FEATURES[@]} + ${X86_CPU_FEATURES[@]} +) +IUSE="${IUSE} + ${CPU_FEATURES_MAP[@]%:*}" + +CPU_REQUIRED_USE=" + ${ARM_CPU_REQUIRED_USE} + ${X86_CPU_REQUIRED_USE} +" + +FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) +IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" + +RDEPEND=" + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) + bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) + bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) + chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) + codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) + encode? ( + amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) + openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] ) + snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) + theora? ( + >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + ) + twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) + wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) + webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] ) + x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) + x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] ) + xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) + ) + fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] ) + flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] ) + fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) + frei0r? ( media-plugins/frei0r-plugins ) + fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] ) + gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] ) + gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) + gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] ) + gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) + iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) + iec61883? ( + >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}] + ) + ieee1394? ( + >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + ) + jack? ( virtual/jack[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) + libaom? ( media-libs/libaom[${MULTILIB_USEDEP}] ) + libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) + libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) + libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) + libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) + libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) + libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) + mmal? ( media-libs/raspberrypi-userland ) + modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) + openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) + rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) + samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) + speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) + svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) + video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vorbis? ( + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + ) + vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + ) + xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) + zeromq? ( >=net-libs/zeromq-4.1.6 ) + zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) + !media-video/qt-faststart + postproc? ( !media-libs/libpostproc ) +" + +# Crypto & co provider magic +# - libressl is a useflag meaning it should always favor libressl over openssl +# - libressl and openssl provide more features to ffmpeg than gnutls +# +# The ordering is thus: libressl > openssl > gnutls +RDEPEND="${RDEPEND} + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + !libressl? ( + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) + ) +" + +DEPEND="${RDEPEND} + >=sys-devel/make-3.81 + doc? ( sys-apps/texinfo ) + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) + cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) + test? ( net-misc/wget sys-devel/bc ) + v4l? ( sys-kernel/linux-headers ) +" + +# Code requiring FFmpeg to be built under gpl license +GPL_REQUIRED_USE=" + postproc? ( gpl ) + frei0r? ( gpl ) + cdio? ( gpl ) + samba? ( gpl ) + encode? ( + x264? ( gpl ) + x265? ( gpl ) + xvid? ( gpl ) + X? ( !xcb? ( gpl ) ) + ) +" +REQUIRED_USE=" + libv4l? ( v4l ) + fftools_cws2fws? ( zlib ) + test? ( encode ) + ${GPL_REQUIRED_USE} + ${CPU_REQUIRED_USE}" +RESTRICT=" + gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) ) +" + +S=${WORKDIR}/${P/_/-} + +PATCHES=( + "${FILESDIR}"/chromium-r1.patch +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libavutil/avconfig.h +) + +src_prepare() { + if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot + export revision=git-N-${FFMPEG_REVISION} + fi + default + echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die +} + +multilib_src_configure() { + local myconf=( ${EXTRA_FFMPEG_CONF} ) + + local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) + use openssl || use libressl && use gpl && myconf+=( --enable-nonfree ) + use samba && myconf+=( --enable-version3 ) + + # Encoders + if use encode ; then + ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" ) + + # Licensing. + if use amrenc ; then + myconf+=( --enable-version3 ) + fi + else + myconf+=( --disable-encoders ) + fi + + # Indevs + use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 ) + for i in alsa oss jack ; do + use ${i} || myconf+=( --disable-indev=${i} ) + done + + # Outdevs + for i in alsa oss sdl ; do + use ${i} || myconf+=( --disable-outdev=${i} ) + done + + # Decoders + use amr && myconf+=( --enable-version3 ) + use gmp && myconf+=( --enable-version3 ) + use fdk && use gpl && myconf+=( --enable-nonfree ) + + for i in "${ffuse[@]#+}" ; do + myconf+=( $(use_enable ${i%:*} ${i#*:}) ) + done + + # Incompatible features: openssl or libressl and gnutls + if use libressl ; then + myconf+=( --disable-gnutls --disable-openssl ) + elif use openssl ; then + myconf+=( --disable-gnutls ) + fi + + # (temporarily) disable non-multilib deps + if ! multilib_is_native_abi; then + for i in frei0r libzmq ; do + myconf+=( --disable-${i} ) + done + fi + + # CPU features + for i in "${CPU_FEATURES_MAP[@]}" ; do + use ${i%:*} || myconf+=( --disable-${i#*:} ) + done + + if use pic ; then + myconf+=( --enable-pic ) + # disable asm code if PIC is required + # as the provided asm decidedly is not PIC for x86. + [[ ${ABI} == x86 ]] && myconf+=( --disable-asm ) + fi + [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004 + + # Try to get cpu type based on CFLAGS. + # Bug #172723 + # We need to do this so that features of that CPU will be better used + # If they contain an unknown CPU it will not hurt since ffmpeg's configure + # will just ignore it. + for i in $(get-flag mcpu) $(get-flag march) ; do + [[ ${i} = native ]] && i="host" # bug #273421 + myconf+=( --cpu=${i} ) + break + done + + # LTO support, bug #566282 + is-flagq "-flto*" && myconf+=( "--enable-lto" ) + + # Mandatory configuration + myconf=( + --enable-avfilter + --enable-avresample + --disable-stripping + --disable-libcelt # bug #664158 + "${myconf[@]}" + ) + + # cross compile support + if tc-is-cross-compiler ; then + myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) + case ${CHOST} in + *freebsd*) + myconf+=( --target-os=freebsd ) + ;; + *mingw32*) + myconf+=( --target-os=mingw32 ) + ;; + *linux*) + myconf+=( --target-os=linux ) + ;; + esac + fi + + # doc + myconf+=( + $(multilib_native_use_enable doc) + $(multilib_native_use_enable doc htmlpages) + $(multilib_native_enable manpages) + ) + + set -- "${S}/configure" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --mandir="${EPREFIX}/usr/share/man" \ + --enable-shared \ + --cc="$(tc-getCC)" \ + --cxx="$(tc-getCXX)" \ + --ar="$(tc-getAR)" \ + --optflags="${CFLAGS}" \ + $(use_enable static-libs static) \ + "${myconf[@]}" + echo "${@}" + "${@}" || die + + if multilib_is_native_abi && use chromium; then + einfo "Configuring for Chromium" + mkdir -p ../chromium || die + pushd ../chromium >/dev/null || die + set -- "${@}" \ + --disable-shared \ + --enable-static \ + --enable-pic \ + --extra-cflags="-DFF_API_CONVERGENCE_DURATION=0" + echo "${@}" + "${@}" || die + popd >/dev/null || die + fi +} + +multilib_src_compile() { + emake V=1 + + if multilib_is_native_abi; then + for i in "${FFTOOLS[@]}" ; do + if use fftools_${i} ; then + emake V=1 tools/${i}$(get_exeext) + fi + done + + if use chromium; then + einfo "Compiling for Chromium" + pushd ../chromium >/dev/null || die + emake V=1 libffmpeg + popd >/dev/null || die + fi + fi +} + +multilib_src_install() { + emake V=1 DESTDIR="${D}" install install-doc + + if multilib_is_native_abi; then + for i in "${FFTOOLS[@]}" ; do + if use fftools_${i} ; then + dobin tools/${i}$(get_exeext) + fi + done + + if use chromium; then + einfo "Installing for Chromium" + pushd ../chromium >/dev/null || die + emake V=1 DESTDIR="${D}" install-libffmpeg + popd >/dev/null || die + fi + fi +} + +multilib_src_install_all() { + dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges + [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" +} + +multilib_src_test() { + LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \ + emake V=1 fate +} diff --git a/media-video/ffmpeg/ffmpeg-4.1.ebuild b/media-video/ffmpeg/ffmpeg-4.1.ebuild new file mode 100644 index 000000000000..34b08d7a8e20 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-4.1.ebuild @@ -0,0 +1,511 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=56.58.58 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" +fi + +inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/" +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.bz2" +else # Release + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#9999}" = "${PV}" ] ; then + KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi + +# Options to use as use_enable in the foo[:bar] form. +# This will feed configure with $(use_enable foo bar) +# or $(use_enable foo foo) if no :bar is set. +# foo is added to IUSE. +FFMPEG_FLAG_MAP=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp + +gpl +hardcoded-tables +iconv libressl:libtls lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau + X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm + mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh + speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint flite:libflite frei0r + fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype + rubberband:librubberband zeromq:libzmq zimg:libzimg + # libswresample options + libsoxr + # Threads; we only support pthread for now but ffmpeg supports more + +threads:pthreads +) + +# Same as above but for encoders, i.e. they do something only with USE=encode. +FFMPEG_ENCODER_FLAG_MAP=( + amrenc:libvo-amrwbenc mp3:libmp3lame + kvazaar:libkvazaar libaom + openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame + wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid +) + +IUSE=" + alsa chromium doc +encode jack oss pic static-libs test v4l + ${FFMPEG_FLAG_MAP[@]%:*} + ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} +" + +# Strings for CPU features in the useflag[:configure_option] form +# if :configure_option isn't set, it will use 'useflag' as configure option +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 +) +ARM_CPU_REQUIRED_USE=" + arm64? ( cpu_flags_arm_v8 ) + cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) + cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) +" +MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu ) +PPC_CPU_FEATURES=( altivec ) +X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) +X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) +X86_CPU_REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) + cpu_flags_x86_xop? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) + cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) + cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) + cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) + cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) + cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) + cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) + cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) +" + +CPU_FEATURES_MAP=( + ${ARM_CPU_FEATURES[@]} + ${MIPS_CPU_FEATURES[@]} + ${PPC_CPU_FEATURES[@]} + ${X86_CPU_FEATURES[@]} +) +IUSE="${IUSE} + ${CPU_FEATURES_MAP[@]%:*}" + +CPU_REQUIRED_USE=" + ${ARM_CPU_REQUIRED_USE} + ${X86_CPU_REQUIRED_USE} +" + +FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) +IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" + +RDEPEND=" + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) + bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) + bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) + chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) + codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) + encode? ( + amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) + openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] ) + snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) + theora? ( + >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + ) + twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) + wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) + webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] ) + x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) + x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] ) + xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) + ) + fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] ) + flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] ) + fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) + frei0r? ( media-plugins/frei0r-plugins ) + fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] ) + gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] ) + gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) + gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] ) + gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) + iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) + iec61883? ( + >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}] + ) + ieee1394? ( + >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + ) + jack? ( virtual/jack[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) + libaom? ( media-libs/libaom[${MULTILIB_USEDEP}] ) + libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) + libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) + libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) + libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) + libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) + libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) + mmal? ( media-libs/raspberrypi-userland ) + modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) + openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) + rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) + samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) + speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) + svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) + video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vorbis? ( + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + ) + vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + ) + xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) + zeromq? ( >=net-libs/zeromq-4.1.6 ) + zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) + !media-video/qt-faststart + postproc? ( !media-libs/libpostproc ) +" + +# Crypto & co provider magic +# - libressl is a useflag meaning it should always favor libressl over openssl +# - libressl and openssl provide more features to ffmpeg than gnutls +# +# The ordering is thus: libressl > openssl > gnutls +RDEPEND="${RDEPEND} + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + !libressl? ( + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) + ) +" + +DEPEND="${RDEPEND} + >=sys-devel/make-3.81 + doc? ( sys-apps/texinfo ) + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) + cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) + test? ( net-misc/wget sys-devel/bc ) + v4l? ( sys-kernel/linux-headers ) +" + +# Code requiring FFmpeg to be built under gpl license +GPL_REQUIRED_USE=" + postproc? ( gpl ) + frei0r? ( gpl ) + cdio? ( gpl ) + samba? ( gpl ) + encode? ( + x264? ( gpl ) + x265? ( gpl ) + xvid? ( gpl ) + X? ( !xcb? ( gpl ) ) + ) +" +REQUIRED_USE=" + libv4l? ( v4l ) + fftools_cws2fws? ( zlib ) + test? ( encode ) + ${GPL_REQUIRED_USE} + ${CPU_REQUIRED_USE}" +RESTRICT=" + gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) ) +" + +S=${WORKDIR}/${P/_/-} + +PATCHES=( + "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}/${P}-vaapi-tools.patch" +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libavutil/avconfig.h +) + +src_prepare() { + if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot + export revision=git-N-${FFMPEG_REVISION} + fi + default + echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die +} + +multilib_src_configure() { + local myconf=( ${EXTRA_FFMPEG_CONF} ) + + local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) + use openssl || use libressl && use gpl && myconf+=( --enable-nonfree ) + use samba && myconf+=( --enable-version3 ) + + # Encoders + if use encode ; then + ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" ) + + # Licensing. + if use amrenc ; then + myconf+=( --enable-version3 ) + fi + else + myconf+=( --disable-encoders ) + fi + + # Indevs + use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 ) + for i in alsa oss jack ; do + use ${i} || myconf+=( --disable-indev=${i} ) + done + + # Outdevs + for i in alsa oss sdl ; do + use ${i} || myconf+=( --disable-outdev=${i} ) + done + + # Decoders + use amr && myconf+=( --enable-version3 ) + use gmp && myconf+=( --enable-version3 ) + use fdk && use gpl && myconf+=( --enable-nonfree ) + + for i in "${ffuse[@]#+}" ; do + myconf+=( $(use_enable ${i%:*} ${i#*:}) ) + done + + # Incompatible features: openssl or libressl and gnutls + if use libressl ; then + myconf+=( --disable-gnutls --disable-openssl ) + elif use openssl ; then + myconf+=( --disable-gnutls ) + fi + + # (temporarily) disable non-multilib deps + if ! multilib_is_native_abi; then + for i in frei0r libzmq ; do + myconf+=( --disable-${i} ) + done + fi + + # CPU features + for i in "${CPU_FEATURES_MAP[@]}" ; do + use ${i%:*} || myconf+=( --disable-${i#*:} ) + done + + if use pic ; then + myconf+=( --enable-pic ) + # disable asm code if PIC is required + # as the provided asm decidedly is not PIC for x86. + [[ ${ABI} == x86 ]] && myconf+=( --disable-asm ) + fi + [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004 + + # Try to get cpu type based on CFLAGS. + # Bug #172723 + # We need to do this so that features of that CPU will be better used + # If they contain an unknown CPU it will not hurt since ffmpeg's configure + # will just ignore it. + for i in $(get-flag mcpu) $(get-flag march) ; do + [[ ${i} = native ]] && i="host" # bug #273421 + myconf+=( --cpu=${i} ) + break + done + + # LTO support, bug #566282 + is-flagq "-flto*" && myconf+=( "--enable-lto" ) + + # Mandatory configuration + myconf=( + --enable-avfilter + --enable-avresample + --disable-stripping + --disable-libcelt # bug #664158 + "${myconf[@]}" + ) + + # cross compile support + if tc-is-cross-compiler ; then + myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) + case ${CHOST} in + *freebsd*) + myconf+=( --target-os=freebsd ) + ;; + *mingw32*) + myconf+=( --target-os=mingw32 ) + ;; + *linux*) + myconf+=( --target-os=linux ) + ;; + esac + fi + + # doc + myconf+=( + $(multilib_native_use_enable doc) + $(multilib_native_use_enable doc htmlpages) + $(multilib_native_enable manpages) + ) + + set -- "${S}/configure" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --mandir="${EPREFIX}/usr/share/man" \ + --enable-shared \ + --cc="$(tc-getCC)" \ + --cxx="$(tc-getCXX)" \ + --ar="$(tc-getAR)" \ + --optflags="${CFLAGS}" \ + $(use_enable static-libs static) \ + "${myconf[@]}" + echo "${@}" + "${@}" || die + + if multilib_is_native_abi && use chromium; then + einfo "Configuring for Chromium" + mkdir -p ../chromium || die + pushd ../chromium >/dev/null || die + set -- "${@}" \ + --disable-shared \ + --enable-static \ + --enable-pic \ + --extra-cflags="-DFF_API_CONVERGENCE_DURATION=0" + echo "${@}" + "${@}" || die + popd >/dev/null || die + fi +} + +multilib_src_compile() { + emake V=1 + + if multilib_is_native_abi; then + for i in "${FFTOOLS[@]}" ; do + if use fftools_${i} ; then + emake V=1 tools/${i}$(get_exeext) + fi + done + + if use chromium; then + einfo "Compiling for Chromium" + pushd ../chromium >/dev/null || die + emake V=1 libffmpeg + popd >/dev/null || die + fi + fi +} + +multilib_src_install() { + emake V=1 DESTDIR="${D}" install install-doc + + if multilib_is_native_abi; then + for i in "${FFTOOLS[@]}" ; do + if use fftools_${i} ; then + dobin tools/${i}$(get_exeext) + fi + done + + if use chromium; then + einfo "Installing for Chromium" + pushd ../chromium >/dev/null || die + emake V=1 DESTDIR="${D}" install-libffmpeg + popd >/dev/null || die + fi + fi +} + +multilib_src_install_all() { + dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges + [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" +} + +multilib_src_test() { + LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \ + emake V=1 fate +} diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index a6f55da8a28e..2a10fdca9482 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -55,7 +55,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi # Options to use as use_enable in the foo[:bar] form. @@ -262,7 +262,7 @@ RDEPEND=" RDEPEND="${RDEPEND} libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) !libressl? ( - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) ) " diff --git a/media-video/ffmpeg/files/ffmpeg-4.1-vaapi-tools.patch b/media-video/ffmpeg/files/ffmpeg-4.1-vaapi-tools.patch new file mode 100644 index 000000000000..e55917471fbf --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-4.1-vaapi-tools.patch @@ -0,0 +1,27 @@ +From 4f1e07090a9f6064078cac694f1d7148f86176c3 Mon Sep 17 00:00:00 2001 +From: Mark Thompson <sw@jkqxz.net> +Date: Wed, 14 Nov 2018 22:56:18 +0000 +Subject: [PATCH] configure: Add missing xlib dependency for VAAPI X11 code + +Fixes #7538. + +(cherry picked from commit 2ce3a48f30fe3cec7153aa3f18a1012a366aca3a) +--- + configure | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure b/configure +index e79dae896c..a70c5f9e9e 100755 +--- a/configure ++++ b/configure +@@ -2812,6 +2812,7 @@ d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext" + dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32" + ffnvcodec_deps_any="libdl LoadLibrary" + nvdec_deps="ffnvcodec" ++vaapi_x11_deps="xlib" + videotoolbox_hwaccel_deps="videotoolbox pthreads" + videotoolbox_hwaccel_extralibs="-framework QuartzCore" + xvmc_deps="X11_extensions_XvMClib_h" +-- +2.11.0 + diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index 8f681d0353b5..7ad4c88a08be 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -15,7 +15,6 @@ <flag name="bluray">Enable playback of Blu-ray filesystems</flag> <flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag> <flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag> - <flag name="celt">Adds Xiph CELT audio decoding support</flag> <flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag> <flag name="chromium">Builds libffmpeg.so to enable media playback in Chromium-based browsers like Opera and Vivaldi.</flag> <flag name="codec2">Enables codec2 low bit rate speech codec support via <pkg>media-libs/codec2</pkg>.</flag> diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest index 2ea053a0a220..79ac1dac8ea2 100644 --- a/media-video/kino/Manifest +++ b/media-video/kino/Manifest @@ -1,8 +1,9 @@ AUX kino-1.3.4-ffmpeg3.patch 6804 BLAKE2B 7517c00374bb48ec7677a749296a91c4e5d242496b14d0a38c1e262772cbdadb89c527a44a46db42fa7cad8460138e1d2b11e56ead5bc320a12f5a005363ad17 SHA512 d6ba42d70a907887a866c195946a130fcfff63c8caacf68e8de13fe4d43d4e1898df38fbea5afdb498aade03d14822f0c6f1a9b8308729041e1319acd8c2a0bf +AUX kino-1.3.4-ffmpeg4.patch 687 BLAKE2B 904e34afbc0707cc8b12de5ec4b733e78a6db91bd9af07a071ae623f82bb57b249acf0b49151a9a597985824c7b402fe8191616fd99ead50a6df7e8f79a1ef93 SHA512 55646377cfacf3a60d240845656e0f01060fb520cf51cac03a6d72941447a5ac05abe1086f84810d684ffe913bd04b3073c951a0efb5891bae44f3eb8c65a858 AUX kino-1.3.4-libav-0.7.patch 2001 BLAKE2B 75060268985ffbf0cb19e6b96acde037b7b86522e03661becf0fde1b8e114212a033150bb69cf4bdfcd4783cb149f2864c7cceb8d6cfbf778b26cca96108febb SHA512 f4e52546b3451684add1ce5d539b1630d476e0a6889da0f7b3d827cab0ba5d7dc1b5febaea735188886fdf7f8012402c8aa6baa73aa6ae7ae204e035df33394a AUX kino-1.3.4-libav-0.8.patch 2622 BLAKE2B 7345a43a6bfb6473dda9899ab675426db102d32a60d44256b14ab7834835b21e5e1a066bd950309bdaad0a5a66650ea220342ed542a641c35e7e1d07f81c21d4 SHA512 736eeb8f6902704166f48975581ebf2eb9e9edc6da8883d49e5f3710679988da57d796b5a926f27282d88584451ff03983402de66a4a707171674ad2de63d4d4 AUX kino-1.3.4-libavcodec-pkg-config.patch 451 BLAKE2B 87a6292a89627000437c07e60a39ee743e08e88e736e91db2728a19653c6d0eba22b3883e99e6c54f14b6f1262227aa883c067cd577eb69eef66caac3ee49339 SHA512 4351560f26ea47f3122ac5a44bea48eae48b8efcc6ca10e72adb31ff5c535ed17e7324444bd03a29482351c3100b07a4305f092c687f18d56f813839332f5847 AUX kino-1.3.4-v4l1.patch 635 BLAKE2B 5f4d4c69c2505fa59aff8ed2323b303092809d1c1991387795a8cd58687b27631d697997861f1b17e921875c5e798495fc4866eb1163afc19c80c376616c95da SHA512 840b9549aa4fa639a090ffdf2e4a65b8b37e5b8c8fd7f13eacb599b6659b0a6c1a435da5f3fbb7ca2b81ce5e2759ef49267af93864aff0426e61eb63d3aede77 DIST kino-1.3.4.tar.gz 11090771 BLAKE2B 58d61257c09638d12cc4ec1e40fa5f51c6812039825f915b0b8c32817c791c7ce89b69145ffffed8fb65ea21b57d50628bab2654df731b79c39d120ea4335bb9 SHA512 065695e6115f3f994ed89ebf52e64c4b8da100f7a973a8c686fd7e7377104b838968800c6a8e31913fd5e2be568076c60d588b840e51da3d082841546a53fc32 -EBUILD kino-1.3.4-r1.ebuild 2719 BLAKE2B f8342b996ff8cae911780156666d07e218bedc93cf60114b9abcf26d8244a490f66457924d4f48ef1d48ef1fc02575c37eee7aa8d8b497d5edebdb1f360302f3 SHA512 bde69841c1a193c2a40787dfc85f6dfd2f6aa7f8b115fd309afd9e273458b296a1f72c02e0fcb8ec7fce1c8687a9daab1289cf6e40fd0d7f28160279bdd4a59a +EBUILD kino-1.3.4-r1.ebuild 2757 BLAKE2B e2ee06d5487717336bd91cef35c5b693cf719d3b3e12b83d74d6bafb51367be5c73aaf61ccb754142a0719188d3ac2b6b44e51122b83ff8ebd8069c36c19d216 SHA512 a74a49dc3d46838d6554cb5784c9441af7f52e0158ad3d84f291c5e20681a4038bf50b25c3598ff4f4f479e4755bbe876544fdf0f1904e9f847fd922b7254948 MISC metadata.xml 439 BLAKE2B e5c5ba3dffa41f889738582a879e23b49a17ca31787c5461a6d136317d3fce8d1df4cc29657eec57af00ec8d810e52ad0a125cbd5b378fc1de63d018696e932b SHA512 b6c464f30ce0e75cad151021288fbf2e2fa360a978b707108eb39e23bb15d3d91212abbb23fa181c97959bd80ce519e4f26bf59c6a22a99ab19bc5051a0746a4 diff --git a/media-video/kino/files/kino-1.3.4-ffmpeg4.patch b/media-video/kino/files/kino-1.3.4-ffmpeg4.patch new file mode 100644 index 000000000000..b0f359f06ba3 --- /dev/null +++ b/media-video/kino/files/kino-1.3.4-ffmpeg4.patch @@ -0,0 +1,13 @@ +diff --git a/old/frame.cc b/src/frame.cc +index c88508f..1e2573a 100644 +--- a/old/frame.cc ++++ b/src/frame.cc +@@ -1367,7 +1367,7 @@ bool Frame::CreateEncoder( bool isPAL, bool isWide ) + avcodecEncoder->thread_count = 2; + avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 }; + avcodecEncoder->pix_fmt = isPAL ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV411P; +- avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT; ++ avcodecEncoder->flags |= AV_CODEC_FLAG_INTERLACED_DCT; + avcodec_open2( avcodecEncoder, avcodec_find_encoder( AV_CODEC_ID_DVVIDEO ), NULL ); + av_new_packet( &avpacketEncoder, 144000 ); + tempImage = ( uint8_t* ) av_malloc( diff --git a/media-video/kino/kino-1.3.4-r1.ebuild b/media-video/kino/kino-1.3.4-r1.ebuild index cb82c2338e31..9fc8dbb085ae 100644 --- a/media-video/kino/kino-1.3.4-r1.ebuild +++ b/media-video/kino/kino-1.3.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -81,6 +81,7 @@ src/page_bttv.cc' po/POTFILES.in || die eapply "${FILESDIR}/${P}-libav-0.8.patch" eapply "${FILESDIR}/${P}-libavcodec-pkg-config.patch" eapply "${FILESDIR}/${P}-ffmpeg3.patch" + eapply "${FILESDIR}/${P}-ffmpeg4.patch" mv configure.in configure.ac || die eautoreconf diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest index 8979f27ba014..d1b85af69049 100644 --- a/media-video/libav/Manifest +++ b/media-video/libav/Manifest @@ -1,19 +1,10 @@ AUX libav-11.3-libvpx-1.5.0.patch 2168 BLAKE2B a667702aaf67f1dc5d3355c5f9808694a40f9d7758c66ac5320a0caa627a1d42363a794570883b09ff2c446752727c996e3cc66c16b23ab8c6f9625b4eef579a SHA512 ef4a50d710eb11658fbf13fa29e5f60a64dbb3bf99ed56e12480a595679c242876ea7e0211048c3013e762c9484c3cd3363244c1b040fc8fd11f010b497d2e9e AUX libav-11.8-perl526.patch 575 BLAKE2B cda427336a8d2fec7dc8633bec072e7b765c586cd56fae5c6dc94bcdde0634fc2032e73d46efc2946ddafad06dead628f48c7c608c4f96fd5d9622d4b6f2d2d6 SHA512 27a3df5ae92032536c6d79074b8513aeb3dc0e781a8bad46dcea8cd4a5279bff79f21b11b651fafa1ec24515c355ca2f4e1fd4fc4e99584860d9f60aa15396ac -DIST fate-11.tar.xz 691009480 BLAKE2B 01e1e8125d34a623b5bd4bf1da0daee96d045e73fd069cf438f471970ad4cf71df8bd3235306b3493cb547fb5ac4bb8fce416e194fec9a7e9b9de68a5a15d572 SHA512 f9dc152964e3f19cf32d5d4cbc923a2bd05ba3b0f8f3880122df79d32852ee9d4795a0bfd66d7a2925299e9e9533888df6103e212ea3e5cbfe799d17ffa2b433 DIST fate-12-r1.tar.xz 763758260 BLAKE2B 299e1a2a773e49c7a51c1222ac34eaea24f77420570a1b0c0b18db5517736656f52ad0a7ca807f65f5e9f9597709265fcd950cf989ad995aa4289ba0e364950e SHA512 084f584c34d34b66c1f4d4742a11376ee2b90f6a07529b5aba6d50421dc8f863fded73dd57ad2c201aadfd529f0f923fa531ea9b41aaaa7b682846ef565a1018 DIST fate-12.tar.xz 755165356 BLAKE2B 031cef24bcfae6205cd6546f453cddb17387176ae837086dd38c8c7132ad9b8dee5367be5fb1b8c604b2203a1e2a55f0c3be2a62f825a95a7ace1aceb4593b70 SHA512 f6ffb3b673b01debd71d7c79cd5c3c4d6f6adb975ed0bdb7c791d674efd8a84ac98f7db3943dfbe3756a3f8819ceab2bdf4633c15fefddf0f8e10adfc805c1e1 -DIST fate-9.tar.xz 467671500 BLAKE2B df4ef8187f257c91b7b6c3c25c2f204c2d4a476cc73cca199ec1c8af2c4641cbb3a314e39ab38f6d8b68c5fe0b91ff1b4b592dec6b518d544806eaeaca003608 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202 -DIST libav-11.8.tar.xz 4865796 BLAKE2B fb0e8f129edee0423252f334b12485d514f9fdfb3d916877d83141e0985ec4efb4de0f5b65d6e3e6d94b835f317a52116b849eec99d023ebb109bdbc2b7a8c5c SHA512 26f9a6bb7312acc08b6785c260220ada3ca2a8db0d0f2bd4621b47082c275fbdb7978457cb423693ba9a61dc4570b05d0dceb5861ff0bcce859c349a6a8f49be -DIST libav-12.2.tar.xz 5268804 BLAKE2B e25b3dfe1026b9e69c89cbec2090070088a7004dc03e8cc23da2da03824a627c733c16c67e5fc65ec9f19942d93405d5ba6926de83cae04c497597f55220f004 SHA512 4b37cfb18a6cf6f12eddb5175b1751c093f3a495ae1d1b588884c60157cb260479b1d8fa3a6e3e08c00d7a26422b1e78a750eb35cf7bc763c01790f3567cba03 DIST libav-12.3.tar.xz 5267988 BLAKE2B 92147dde4f41a5aa05d93824d3ffa9a21b067f99cec5fa17bc4b8e3600f2b1913f7e74d4ea766c864cdba686dd14d5d3a8bc8af8f9e6de4c956f14cb8e20ab88 SHA512 fd4838a934792797a975ece034cbd63760c94ee6becc99b8707e8345e41777baf26e30ef6937ab30b7d2f722977e69aabc2cfca3fcdf88373d579f9cc9d69162 DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c168aa81d25e2fb08d99e300dc47d7ea28f61500fcfab0b16fa136261a5af27631b7536eb3aefa0e1feb4d615af57f9f5a36 SHA512 0c9b59957f1fbbff8f5b95b02c11014a4efdddf4b7e1b158cd0fda3af8b89bd90d48263ed0239915adfb7abcd7a8b22c278cd5cf1d01822bd22df65cc7f69689 -DIST libav-9.17.tar.xz 4080028 BLAKE2B 206e80835292af9f4c1c65539e69981b6993679c11e8a1feef1e37dc32174e47744ebce319b8709bcd60804f493fab1e524c781e174d60d9ebe35ad01f6fbc60 SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a -EBUILD libav-11.8.ebuild 11090 BLAKE2B bce6ee5af8fb86a4ca1c760fff386b4e3c7c70f4b8353e2d24162c7da9a42ee742b6a230b3e6b84ef57fb1bd957bb83e2d7c340e669ea2de4f98e46c2af8f319 SHA512 6b50605fe7e2d0f9468fa46e8d7b513db03603622ff69559e4517c1f610ea4be8fb8bceada46ab50694cc9bbbf6c0a5d1d2aa35a20046ffda7a60d4991d74037 -EBUILD libav-11.9999.ebuild 10990 BLAKE2B 2bab5e0b48d1d490d35c991fd74f4629a0de5b5375d7f9955c0d49c4f7a35fd6f1cfcc91b09833d89dc8f4fe01a29b0ab9058887c2ab2a299a957c0a6acfd50d SHA512 d5a1a7ecd91dbf0bad318ec8c5705afff4b12fd956da8e2a06ac7de002dd23e3dd8a86b5e162097901617d52ca0bdafd5ccc09b08fec51dc9b249d2169b58d90 -EBUILD libav-12.2.ebuild 11366 BLAKE2B c1f4de539f14e7f9ec9ff590ae245cfa49af199352e39b7f564a50ffa8e378bc6a573003fc9dfe494e7f4981bcf78c9be7baf02d7f9aa4b8c04bfbbbf8581428 SHA512 f90ff7d2052af3332ee626b1bbf73782ee1f1f8f257f342308a775ce35ca7c4d4a30bc445df2b9e7111b33dde8e2c6d577446a3c1bb7a5a509be68b457d63349 -EBUILD libav-12.3.ebuild 11360 BLAKE2B f4ca07046e206fbb08c4dc0234c5c62c96eef967907fa414957a5fd0efe9746dfd7dc657411c4d4105e30e2e6923d70cdb7e7f23877f790e9502ce68159e4809 SHA512 1edfdfdd26002d2fe2ef54062c65d04a65480637c0b2b3c41f4761b023bf65aea52b9a80eff820aa55f62b03751be292532586ac554c20709f0492e0e76401e9 +EBUILD libav-12.3.ebuild 11357 BLAKE2B 254622da9a02900ded12738c0e6ed1b47778f9fa3a98933e44fa2850d24fd6638020d16043298efa639acf53bc936fcbd753e70107c3f5d086a019dd2f885044 SHA512 6b128ce9d52f94bd47ababe8cc6bfe96de863e30246297b6e3c76c92547bb1867b9654623126750f0e82735c2b56586c0129744c0369c22c9e71ee772319f147 EBUILD libav-13_pre20171219.ebuild 10790 BLAKE2B 5a33e384d54549ec4fad1c082022b9d7187c3e3032461c38a1e237683e6e27b400a7bf23bc220fde169b1b2d7fd59b50620dbc4c4d9d2c8b2df195fbd3d4be05 SHA512 764fbebd1a086913e2a85430732a7b56a369a02a0200f10ed6fd7fef552bf76638df65601f7e2afdbc68987dccd777c403ed2799cca096bf606e382ee2681f54 -EBUILD libav-9.17.ebuild 9976 BLAKE2B 053e88c957d482f172b0ad170ed35712e86758d945df08e666640b28743d8970fc2c481b69c0ed74234a2a66e4e0116573f7e660500365f77e6ca3b41b55007e SHA512 0dba0e1cd904a8cacf6d50e6370983bba1dd85d5495e934d83def260a35a4d28fb14876d36d528dc4b2a34442e0d22b22e69a10b2b7d13506c9f175fad3e980a EBUILD libav-9999.ebuild 10931 BLAKE2B bc46348d1336751f1b1fea3c8a294d76664db14c6d59358e7a572f668bc296865e9b162fba33df122322c49e3489d9dc810fa5f798d9fd8f1f7ead4a31bdf9bf SHA512 27d47b0442fc8f8511b14d24419666397492eca2264c02abc7931a4ffac07302056e36900954d1356da4637823745da0b96f91b908ac67c9e12a91579e1739f4 -MISC metadata.xml 2876 BLAKE2B 3dc43cf775798c9055ef8083b8c16d0c7ec4843c70520a906cde49fa834ad2705ce81245a1bcee8074f24787ff36f3793a67d3eced843384da6584d54ce5f714 SHA512 a0b2b4dac62aa9d12268458434bffb752f2dec12cb26d0c1446b1d5d60f383c67270792c54804d5c95502636e1cb1b79e9a5eb3b3caa1354827af76d154dd5cf +MISC metadata.xml 2787 BLAKE2B 2c92b3be0e4ef7d5ca4d05871d26a4b77f0c7429dd7c54e5f8f7b713c56c57f28e138032ba5a8ee7fe6e2f4cdad23c29f1d34161c91fb0e5c4ded2d5d0802a12 SHA512 36ed399947850d92b85292731ea83e795cf37b0bd47e7c37d2802c77d30036797713acb305c127803fd7fa49fee48217f4214754d68bf9c597497c2e99aa2beb diff --git a/media-video/libav/libav-11.8.ebuild b/media-video/libav/libav-11.8.ebuild deleted file mode 100644 index 86c3ec705693..000000000000 --- a/media-video/libav/libav-11.8.ebuild +++ /dev/null @@ -1,343 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="git://git.libav.org/libav.git"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -fi - -DESCRIPTION="Complete solution to record, convert and stream audio and video" -HOMEPAGE="https://libav.org/" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" -elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot - SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz" -else # Official release - SRC_URI="https://libav.org/releases/${P}.tar.xz" -fi -# 9999 does not have fate-*.tar.xz -[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )" - -LICENSE="LGPL-2.1 gpl? ( GPL-3 )" -SLOT="0/11" -[[ ${PV} == *9999 ]] || \ -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk - frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 - +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl - static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X - wavpack webp x264 x265 xvid +zlib" - -# String for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon" -X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2" -for i in ${X86_CPU_FEATURES} ; do - CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}" -done -for i in ${CPU_FEATURES} ; do - IUSE+=" ${i%:*}" -done - -RDEPEND=" - !media-video/ffmpeg:0 - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) - bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - encode? ( - aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) - theora? ( - >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) - vorbis? ( - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) - wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) - ) - fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] ) - frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) - ieee1394? ( - >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - ) - jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) - opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - ssl? ( - openssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) - ) - !openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) - ) - sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) - fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) - vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - doc? ( app-text/texi2html ) - ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - cpu_flags_x86_mmx? ( dev-lang/yasm ) - rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - test? ( sys-devel/bc ) - truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - v4l? ( sys-kernel/linux-headers ) -" - -# faac can't be binary distributed -# openssl support marked as nonfree -# faac and aac are concurent implementations -# amr and aac require at least lgpl3 -# x264 requires gpl2 -REQUIRED_USE=" - rtmp? ( network ) - amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl ) - test? ( encode zlib ) - fontconfig? ( truetype ) -" -RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libavutil/avconfig.h -) - -src_unpack() { - [[ ${PV} == *9999 ]] && git-r3_src_unpack - # 9999 does not have fate-*.tar.xz - [[ ${PV%9999} != "" ]] && default_src_unpack -} - -src_prepare() { - epatch_user - - epatch "${FILESDIR}"/libav-11.3-libvpx-1.5.0.patch #565696 - epatch "${FILESDIR}"/libav-11.8-perl526.patch #634646 - - # if we have snapshot then we need to hardcode the version - if [[ ${PV%_p*} != ${PV} ]]; then - sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die - fi - - TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher ) - use zlib && TOOLS+=( cws2fws ) - - MAKEOPTS+=" V=1" -} - -multilib_src_configure() { - local myconf=( ${EXTRA_LIBAV_CONF} ) - local uses i - - # 9999 does not have fate-*.tar.xz - [[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" ) - - myconf+=( - $(use_enable gpl) - $(use_enable gpl version3) - # It is a security concern and removed in the next version - --disable-protocol=concat - ) - - # enabled by default - uses="debug doc network zlib" - for i in ${uses}; do - use ${i} || myconf+=( --disable-${i} ) - done - use bzip2 || myconf+=( --disable-bzlib ) - use sdl || myconf+=( --disable-avplay ) - - if use ssl; then - use openssl && myconf+=( --enable-openssl --enable-nonfree ) \ - || myconf+=( --enable-gnutls ) - fi - - use custom-cflags && myconf+=( --disable-optimizations ) - use cpudetection && myconf+=( --enable-runtime-cpudetect ) - - use vdpau || myconf+=( --disable-vdpau ) - - use vaapi && myconf+=( --enable-vaapi ) - - # Encoders - if use encode; then - use faac && myconf+=( --enable-nonfree ) - use mp3 && myconf+=( --enable-libmp3lame ) - use amr && myconf+=( --enable-libvo-amrwbenc ) - use aac && myconf+=( --enable-libvo-aacenc ) - uses="faac theora twolame vorbis wavpack webp x264 x265 xvid" - for i in ${uses}; do - use ${i} && myconf+=( --enable-lib${i} ) - done - else - myconf+=( --disable-encoders ) - fi - - # libavdevice options - use cdio && myconf+=( --enable-libcdio ) - use ieee1394 && myconf+=( --enable-libdc1394 ) - use pulseaudio && myconf+=( --enable-libpulse ) - - # Indevs - # v4l1 is gone since linux-headers-2.6.38 - myconf+=( --disable-indev=v4l ) - use v4l || myconf+=( --disable-indev=v4l2 ) - for i in alsa oss jack; do - use ${i} || myconf+=( --disable-indev=${i} ) - done - use X && myconf+=( --enable-x11grab ) - # Outdevs - for i in alsa oss ; do - use ${i} || myconf+=( --disable-outdev=${i} ) - done - # libavfilter options - use bs2b && myconf+=( --enable-libbs2b ) - multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r ) - use truetype && myconf+=( --enable-libfreetype ) - use fontconfig && myconf+=( --enable-libfontconfig ) - - # Threads; we only support pthread for now - use threads && myconf+=( --enable-pthreads ) - - # Decoders - use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb ) - use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac ) - uses="gsm opus rtmp schroedinger speex vpx" - for i in ${uses}; do - use ${i} && myconf+=( --enable-lib${i} ) - done - use jpeg2k && myconf+=( --enable-libopenjpeg ) - - # CPU features - for i in ${CPU_FEATURES}; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # pass the right -mfpu as extra - use neon && append-cflags -mfpu=neon - - # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC for x86. - if use pic && [[ ${ABI} == x86 ]]; then - myconf+=( --disable-mmx --disable-mmxext ) - fi - - # Option to force building pic - use pic && myconf+=( --enable-pic ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- ) - case ${CHOST} in - *freebsd*) - myconf+=( --target-os=freebsd ) - ;; - mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Misc stuff - use hardcoded-tables && myconf+=( --enable-hardcoded-tables ) - - # Specific workarounds for too-few-registers arch... - if [[ ${ABI} == x86 ]]; then - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - filter-flags -fforce-addr -momit-leaf-frame-pointer - append-flags -fomit-frame-pointer - is-flag -O? || append-flags -O2 - if use debug; then - # no need to warn about debug if not using debug flag - ewarn "" - ewarn "Debug information will be almost useless as the frame pointer is omitted." - ewarn "This makes debugging harder, so crashes that has no fixed behavior are" - ewarn "difficult to fix. Please have that in mind." - ewarn "" - fi - fi - - set -- "${S}"/configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --shlibdir="${EPREFIX}"/usr/$(get_libdir) \ - --mandir="${EPREFIX}"/usr/share/man \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --ar="$(tc-getAR)" \ - --optflags="${CFLAGS}" \ - --extra-cflags="${CFLAGS}" \ - $(use_enable static-libs static) \ - "${myconf[@]}" - echo "${@}" - "${@}" || die -} - -multilib_src_compile() { - emake - - if use tools; then - tc-export CC - - emake ${TOOLS[@]/#/tools/} - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install install-man - use doc && dodoc doc/*.html - - if use tools; then - dobin ${TOOLS[@]/#/tools/} - fi -} - -multilib_src_install_all() { - dodoc Changelog README.md INSTALL -} - -multilib_src_test() { - local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)" - einfo "LD_LIBRARY_PATH is set to \"${_libs}\"" - LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate -} diff --git a/media-video/libav/libav-11.9999.ebuild b/media-video/libav/libav-11.9999.ebuild deleted file mode 100644 index 7e5f92570421..000000000000 --- a/media-video/libav/libav-11.9999.ebuild +++ /dev/null @@ -1,340 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="git://git.libav.org/libav.git"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -fi - -DESCRIPTION="Complete solution to record, convert and stream audio and video" -HOMEPAGE="https://libav.org/" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" -elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot - SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz" -else # Official release - SRC_URI="https://libav.org/releases/${P}.tar.xz" -fi -# 9999 does not have fate-*.tar.xz -[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )" - -LICENSE="LGPL-2.1 gpl? ( GPL-3 )" -SLOT="0/11" -[[ ${PV} == *9999 ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk - frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 - +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl - static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X - wavpack webp x264 x265 xvid +zlib" - -# String for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon" -X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2" -for i in ${X86_CPU_FEATURES} ; do - CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}" -done -for i in ${CPU_FEATURES} ; do - IUSE+=" ${i%:*}" -done - -RDEPEND=" - !media-video/ffmpeg:0 - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) - bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - encode? ( - aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) - theora? ( - >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) - vorbis? ( - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) - wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) - ) - fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] ) - frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) - ieee1394? ( - >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - ) - jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) - opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - ssl? ( - openssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) - ) - !openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) - ) - sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) - fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) - vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - doc? ( app-text/texi2html ) - ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - cpu_flags_x86_mmx? ( dev-lang/yasm ) - rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - test? ( sys-devel/bc ) - truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - v4l? ( sys-kernel/linux-headers ) -" - -# faac can't be binary distributed -# openssl support marked as nonfree -# faac and aac are concurent implementations -# amr and aac require at least lgpl3 -# x264 requires gpl2 -REQUIRED_USE=" - rtmp? ( network ) - amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl ) - test? ( encode zlib ) - fontconfig? ( truetype ) -" -RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libavutil/avconfig.h -) - -src_unpack() { - [[ ${PV} == *9999 ]] && git-r3_src_unpack - # 9999 does not have fate-*.tar.xz - [[ ${PV%9999} != "" ]] && default_src_unpack -} - -src_prepare() { - epatch_user - - # if we have snapshot then we need to hardcode the version - if [[ ${PV%_p*} != ${PV} ]]; then - sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die - fi - - TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher ) - use zlib && TOOLS+=( cws2fws ) - - MAKEOPTS+=" V=1" -} - -multilib_src_configure() { - local myconf=( ${EXTRA_LIBAV_CONF} ) - local uses i - - # 9999 does not have fate-*.tar.xz - [[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" ) - - myconf+=( - $(use_enable gpl) - $(use_enable gpl version3) - # It is a security issue and will be removed in the next major version - --disable-protocol=concat - ) - - # enabled by default - uses="debug doc network zlib" - for i in ${uses}; do - use ${i} || myconf+=( --disable-${i} ) - done - use bzip2 || myconf+=( --disable-bzlib ) - use sdl || myconf+=( --disable-avplay ) - - if use ssl; then - use openssl && myconf+=( --enable-openssl --enable-nonfree ) \ - || myconf+=( --enable-gnutls ) - fi - - use custom-cflags && myconf+=( --disable-optimizations ) - use cpudetection && myconf+=( --enable-runtime-cpudetect ) - - use vdpau || myconf+=( --disable-vdpau ) - - use vaapi && myconf+=( --enable-vaapi ) - - # Encoders - if use encode; then - use faac && myconf+=( --enable-nonfree ) - use mp3 && myconf+=( --enable-libmp3lame ) - use amr && myconf+=( --enable-libvo-amrwbenc ) - use aac && myconf+=( --enable-libvo-aacenc ) - uses="faac theora twolame vorbis wavpack webp x264 x265 xvid" - for i in ${uses}; do - use ${i} && myconf+=( --enable-lib${i} ) - done - else - myconf+=( --disable-encoders ) - fi - - # libavdevice options - use cdio && myconf+=( --enable-libcdio ) - use ieee1394 && myconf+=( --enable-libdc1394 ) - use pulseaudio && myconf+=( --enable-libpulse ) - - # Indevs - # v4l1 is gone since linux-headers-2.6.38 - myconf+=( --disable-indev=v4l ) - use v4l || myconf+=( --disable-indev=v4l2 ) - for i in alsa oss jack; do - use ${i} || myconf+=( --disable-indev=${i} ) - done - use X && myconf+=( --enable-x11grab ) - # Outdevs - for i in alsa oss ; do - use ${i} || myconf+=( --disable-outdev=${i} ) - done - # libavfilter options - use bs2b && myconf+=( --enable-libbs2b ) - multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r ) - use truetype && myconf+=( --enable-libfreetype ) - use fontconfig && myconf+=( --enable-libfontconfig ) - - # Threads; we only support pthread for now - use threads && myconf+=( --enable-pthreads ) - - # Decoders - use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb ) - use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac ) - uses="gsm opus rtmp schroedinger speex vpx" - for i in ${uses}; do - use ${i} && myconf+=( --enable-lib${i} ) - done - use jpeg2k && myconf+=( --enable-libopenjpeg ) - - # CPU features - for i in ${CPU_FEATURES}; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # pass the right -mfpu as extra - use neon && append-cflags -mfpu=neon - - # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC for x86. - if use pic && [[ ${ABI} == x86 ]]; then - myconf+=( --disable-mmx --disable-mmxext ) - fi - - # Option to force building pic - use pic && myconf+=( --enable-pic ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- ) - case ${CHOST} in - *freebsd*) - myconf+=( --target-os=freebsd ) - ;; - mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Misc stuff - use hardcoded-tables && myconf+=( --enable-hardcoded-tables ) - - # Specific workarounds for too-few-registers arch... - if [[ ${ABI} == x86 ]]; then - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - filter-flags -fforce-addr -momit-leaf-frame-pointer - append-flags -fomit-frame-pointer - is-flag -O? || append-flags -O2 - if use debug; then - # no need to warn about debug if not using debug flag - ewarn "" - ewarn "Debug information will be almost useless as the frame pointer is omitted." - ewarn "This makes debugging harder, so crashes that has no fixed behavior are" - ewarn "difficult to fix. Please have that in mind." - ewarn "" - fi - fi - - set -- "${S}"/configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --shlibdir="${EPREFIX}"/usr/$(get_libdir) \ - --mandir="${EPREFIX}"/usr/share/man \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --ar="$(tc-getAR)" \ - --optflags="${CFLAGS}" \ - --extra-cflags="${CFLAGS}" \ - $(use_enable static-libs static) \ - "${myconf[@]}" - echo "${@}" - "${@}" || die -} - -multilib_src_compile() { - emake - - if use tools; then - tc-export CC - - emake ${TOOLS[@]/#/tools/} - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install install-man - use doc && dodoc doc/*.html - - if use tools; then - dobin ${TOOLS[@]/#/tools/} - fi -} - -multilib_src_install_all() { - dodoc Changelog README.md INSTALL -} - -multilib_src_test() { - local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)" - einfo "LD_LIBRARY_PATH is set to \"${_libs}\"" - LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate -} diff --git a/media-video/libav/libav-12.2.ebuild b/media-video/libav/libav-12.2.ebuild deleted file mode 100644 index d3414e7ba817..000000000000 --- a/media-video/libav/libav-12.2.ebuild +++ /dev/null @@ -1,349 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs - -if [[ ${PV} == *9999 ]] ; then - : ${EGIT_REPO_URI:="git://git.libav.org/libav.git"} - if [[ ${PV%9999} != "" ]] ; then - : ${EGIT_BRANCH:="release/${PV%.9999}"} - fi - inherit git-r3 -fi - -DESCRIPTION="Complete solution to record, convert and stream audio and video" -HOMEPAGE="https://libav.org/" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" -elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot - SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz" - SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )" -else # Official release - SRC_URI="https://libav.org/releases/${P}.tar.xz" - FATE_VER=${PV%%_*} - SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )" -fi - -# 9999 does not have fate-*.tar.xz - -LICENSE="LGPL-2.1 gpl? ( GPL-3 )" -SLOT="0/12" -[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk - frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 - +network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl - static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X - wavpack webp x264 x265 xvid +zlib" - -# String for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon" -X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2" -for i in ${X86_CPU_FEATURES} ; do - CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}" -done -for i in ${CPU_FEATURES} ; do - IUSE+=" ${i%:*}" -done - -RDEPEND=" - !media-video/ffmpeg:0 - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) - bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - encode? ( - aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) - theora? ( - >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) - vorbis? ( - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) - wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) - ) - nvidia? ( media-video/nvidia-video-codec ) - fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] ) - frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) - ieee1394? ( - >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - ) - jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) - opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - ssl? ( - openssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) - ) - !openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) - ) - sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) - fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) - vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) - X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - doc? ( app-text/texi2html ) - ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - cpu_flags_x86_mmx? ( dev-lang/yasm ) - rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - test? ( sys-devel/bc ) - truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - v4l? ( sys-kernel/linux-headers ) -" - -# faac can't be binary distributed -# openssl support marked as nonfree -# faac and aac are concurent implementations -# amr and aac require at least lgpl3 -# x264 requires gpl2 -REQUIRED_USE=" - rtmp? ( network ) - amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl ) - test? ( encode zlib ) - fontconfig? ( truetype ) -" -RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libavutil/avconfig.h -) - -src_unpack() { - [[ ${PV} == *9999 ]] && git-r3_src_unpack - # 9999 does not have fate-*.tar.xz - [[ ${PV%9999} != "" ]] && default_src_unpack -} - -src_prepare() { - epatch_user - - # if we have snapshot then we need to hardcode the version - if [[ ${PV%_p*} != ${PV} ]]; then - sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die - fi - - TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher ) - use zlib && TOOLS+=( cws2fws ) - - MAKEOPTS+=" V=1" -} - -multilib_src_configure() { - local myconf=( ${EXTRA_LIBAV_CONF} ) - local uses i - - # 9999 does not have fate-*.tar.xz - [[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" ) - - myconf+=( - $(use_enable gpl) - $(use_enable gpl version3) - --enable-avfilter - ) - - # enabled by default - uses="debug doc network zlib" - for i in ${uses}; do - use ${i} || myconf+=( --disable-${i} ) - done - use bzip2 || myconf+=( --disable-bzlib ) - use sdl || myconf+=( --disable-avplay ) - - if use ssl; then - use openssl && myconf+=( --enable-openssl --enable-nonfree ) \ - || myconf+=( --enable-gnutls ) - fi - - use custom-cflags && myconf+=( --disable-optimizations ) - use cpudetection && myconf+=( --enable-runtime-cpudetect ) - - use vdpau || myconf+=( --disable-vdpau ) - - use vaapi && myconf+=( --enable-vaapi ) - - NVIDIA_INCLUDES="-I/opt/nvidia-video-codec/include -I/opt/cuda/include" - NVIDIA_LIBS="-L/opt/cuda/lib64" - use nvidia && myconf+=( --enable-nonfree --enable-cuda --enable-libnpp - --extra-cflags="$NVIDIA_INCLUDES" --extra-ldflags="$NVIDIA_LIBS" ) - - # Encoders - if use encode; then - use faac && myconf+=( --enable-nonfree ) - use mp3 && myconf+=( --enable-libmp3lame ) - use amr && myconf+=( --enable-libvo-amrwbenc ) - use aac && myconf+=( --enable-libvo-aacenc ) - use nvidia && myconf+=( --enable-nvenc ) - uses="faac theora twolame vorbis wavpack webp x264 x265 xvid" - for i in ${uses}; do - use ${i} && myconf+=( --enable-lib${i} ) - done - else - myconf+=( --disable-encoders ) - fi - - # libavdevice options - use cdio && myconf+=( --enable-libcdio ) - use ieee1394 && myconf+=( --enable-libdc1394 ) - use pulseaudio && myconf+=( --enable-libpulse ) - - # Indevs - # v4l1 is gone since linux-headers-2.6.38 - myconf+=( --disable-indev=v4l ) - use v4l || myconf+=( --disable-indev=v4l2 ) - for i in alsa oss jack; do - use ${i} || myconf+=( --disable-indev=${i} ) - done - use X && myconf+=( --enable-libxcb ) - # Outdevs - for i in alsa oss ; do - use ${i} || myconf+=( --disable-outdev=${i} ) - done - # libavfilter options - use bs2b && myconf+=( --enable-libbs2b ) - multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r ) - use truetype && myconf+=( --enable-libfreetype ) - use fontconfig && myconf+=( --enable-libfontconfig ) - - # Threads; we only support pthread for now - use threads && myconf+=( --enable-pthreads ) - - # Decoders - use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb ) - use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac ) - uses="gsm opus rtmp schroedinger speex vpx" - for i in ${uses}; do - use ${i} && myconf+=( --enable-lib${i} ) - done - use jpeg2k && myconf+=( --enable-libopenjpeg ) - - # CPU features - for i in ${CPU_FEATURES}; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # pass the right -mfpu as extra - use neon && use arm && append-cflags -mfpu=neon - - # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC for x86. - if use pic && [[ ${ABI} == x86 ]]; then - myconf+=( --disable-mmx --disable-mmxext ) - fi - - # Option to force building pic - use pic && myconf+=( --enable-pic ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- ) - case ${CHOST} in - *freebsd*) - myconf+=( --target-os=freebsd ) - ;; - mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Misc stuff - use hardcoded-tables && myconf+=( --enable-hardcoded-tables ) - - # Forcing arm would make the compiler break left and right - if [[ ${ABI} == arm ]]; then - filter-flags -marm - fi - - # Specific workarounds for too-few-registers arch... - if [[ ${ABI} == x86 ]]; then - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - filter-flags -fforce-addr -momit-leaf-frame-pointer - append-flags -fomit-frame-pointer - is-flag -O? || append-flags -O2 - if use debug; then - # no need to warn about debug if not using debug flag - ewarn "" - ewarn "Debug information will be almost useless as the frame pointer is omitted." - ewarn "This makes debugging harder, so crashes that has no fixed behavior are" - ewarn "difficult to fix. Please have that in mind." - ewarn "" - fi - fi - - set -- "${S}"/configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --shlibdir="${EPREFIX}"/usr/$(get_libdir) \ - --mandir="${EPREFIX}"/usr/share/man \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --ar="$(tc-getAR)" \ - --optflags="${CFLAGS}" \ - --extra-cflags="${CFLAGS}" \ - $(use_enable static-libs static) \ - "${myconf[@]}" - echo "${@}" - "${@}" || die -} - -multilib_src_compile() { - emake - - if use tools; then - tc-export CC - - emake ${TOOLS[@]/#/tools/} - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install install-man - use doc && dodoc doc/*.html - - if use tools; then - dobin ${TOOLS[@]/#/tools/} - fi -} - -multilib_src_install_all() { - dodoc Changelog README.md INSTALL -} - -multilib_src_test() { - local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)" - einfo "LD_LIBRARY_PATH is set to \"${_libs}\"" - LD_LIBRARY_PATH="${_libs}" make -j1 fate V=1 -} diff --git a/media-video/libav/libav-12.3.ebuild b/media-video/libav/libav-12.3.ebuild index b519bf55f1a4..bdf3f3bd00d9 100644 --- a/media-video/libav/libav-12.3.ebuild +++ b/media-video/libav/libav-12.3.ebuild @@ -30,7 +30,7 @@ fi LICENSE="LGPL-2.1 gpl? ( GPL-3 )" SLOT="0/12" -[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 +network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl diff --git a/media-video/libav/libav-9.17.ebuild b/media-video/libav/libav-9.17.ebuild deleted file mode 100644 index ff2da501fc7b..000000000000 --- a/media-video/libav/libav-9.17.ebuild +++ /dev/null @@ -1,315 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-2" - EGIT_REPO_URI="git://git.libav.org/libav.git" - [[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}" -fi - -inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record, convert and stream audio and video" -HOMEPAGE="https://libav.org/" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" -elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot - SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz" -else # Official release - SRC_URI="https://${PN}.org/releases/${P}.tar.xz" -fi - -SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )" - -LICENSE="LGPL-2.1 gpl? ( GPL-3 )" -SLOT="0/9" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == *9999 ]] || \ -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -IUSE="aac alsa amr +bzip2 cdio cpudetection custom-cflags debug doc +encode - faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 - +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl - static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X - x264 xvid +zlib" - -# String for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -CPU_FEATURES="cpu_flags_x86_3dnow:amd3dnow cpu_flags_x86_3dnowext:amd3dnowext altivec cpu_flags_x86_avx:avx cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext neon cpu_flags_x86_ssse3:ssse3 vis" -for i in ${CPU_FEATURES} ; do - IUSE+=" ${i%:*}" -done - -RDEPEND=" - !media-video/ffmpeg:0 - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - cdio? ( - >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] - ) - encode? ( - aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) - fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) - theora? ( - >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - vorbis? ( - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) - ) - frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) - ieee1394? ( - >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - ) - jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) - opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - ssl? ( - openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) - !openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) - ) - sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) - schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) - vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - doc? ( app-text/texi2html ) - ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - cpu_flags_x86_mmx? ( dev-lang/yasm ) - rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - test? ( sys-devel/bc ) - truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) - v4l? ( sys-kernel/linux-headers ) -" - -# faac can't be binary distributed -# openssl support marked as nonfree -# faac and aac are concurent implementations -# amr and aac require at least lgpl3 -# x264 requires gpl2 -REQUIRED_USE="rtmp? ( network ) - amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) - test? ( encode zlib ) -" -RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libavutil/avconfig.h -) - -src_prepare() { - # if we have snapshot then we need to hardcode the version - if [[ ${PV%_p*} != ${PV} ]]; then - sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die - fi - - TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher ) - use zlib && TOOLS+=( cws2fws ) - - MAKEOPTS+=" V=1" -} - -multilib_src_configure() { - local myconf=( ${EXTRA_LIBAV_CONF} ) - local uses i - - myconf+=( - $(use_enable gpl) - $(use_enable gpl version3) - --enable-avfilter - ) - - # enabled by default - uses="debug doc network zlib" - for i in ${uses}; do - use ${i} || myconf+=( --disable-${i} ) - done - use bzip2 || myconf+=( --disable-bzlib ) - use sdl || myconf+=( --disable-avplay ) - - if use ssl; then - use openssl && myconf+=( --enable-openssl --enable-nonfree ) \ - || myconf+=( --enable-gnutls ) - fi - - use custom-cflags && myconf+=( --disable-optimizations ) - use cpudetection && myconf+=( --enable-runtime-cpudetect ) - - use vdpau || myconf+=( --disable-vdpau ) - - use vaapi && myconf+=( --enable-vaapi ) - - # Encoders - if use encode; then - use faac && myconf+=( --enable-nonfree ) - use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac ) - use mp3 && myconf+=( --enable-libmp3lame ) - use amr && myconf+=( --enable-libvo-amrwbenc ) - use aac && myconf+=( --enable-libvo-aacenc ) - uses="faac theora vorbis x264 xvid" - for i in ${uses}; do - use ${i} && myconf+=( --enable-lib${i} ) - done - else - myconf+=( --disable-encoders ) - fi - - # libavdevice options - use cdio && myconf+=( --enable-libcdio ) - use ieee1394 && myconf+=( --enable-libdc1394 ) - use pulseaudio && myconf+=( --enable-libpulse ) - - # Indevs - # v4l1 is gone since linux-headers-2.6.38 - myconf+=( --disable-indev=v4l ) - use v4l || myconf+=( --disable-indev=v4l2 ) - for i in alsa oss jack; do - use ${i} || myconf+=( --disable-indev=${i} ) - done - use X && myconf+=( --enable-x11grab ) - # Outdevs - for i in alsa oss ; do - use ${i} || myconf+=( --disable-outdev=${i} ) - done - # libavfilter options - multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r ) - use truetype && myconf+=( --enable-libfreetype ) - - # Threads; we only support pthread for now - use threads && myconf+=( --enable-pthreads ) - - # Decoders - use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb ) - uses="gsm opus rtmp schroedinger speex vpx" - for i in ${uses}; do - use ${i} && myconf+=( --enable-lib${i} ) - done - use jpeg2k && myconf+=( --enable-libopenjpeg ) - - # CPU features - for i in ${CPU_FEATURES}; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # pass the right -mfpu as extra - use neon && myconf+=( --extra-cflags=-mfpu=neon ) - - # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC for x86. - if use pic && [[ ${ABI} == x86 ]] ; then - myconf+=( --disable-mmx --disable-mmxext ) - fi - - # Option to force building pic - use pic && myconf+=( --enable-pic ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- ) - case ${CHOST} in - *freebsd*) - myconf+=( --target-os=freebsd ) - ;; - mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Misc stuff - use hardcoded-tables && myconf+=( --enable-hardcoded-tables ) - - # Specific workarounds for too-few-registers arch... - if [[ ${ABI} == x86 ]]; then - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - filter-flags -fforce-addr -momit-leaf-frame-pointer - append-flags -fomit-frame-pointer - is-flag -O? || append-flags -O2 - if use debug; then - # no need to warn about debug if not using debug flag - ewarn "" - ewarn "Debug information will be almost useless as the frame pointer is omitted." - ewarn "This makes debugging harder, so crashes that has no fixed behavior are" - ewarn "difficult to fix. Please have that in mind." - ewarn "" - fi - fi - - set -- "${S}"/configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --shlibdir="${EPREFIX}"/usr/$(get_libdir) \ - --mandir="${EPREFIX}"/usr/share/man \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --ar="$(tc-getAR)" \ - --optflags="${CFLAGS}" \ - --extra-cflags="${CFLAGS}" \ - $(use_enable static-libs static) \ - "${myconf[@]}" - echo "${@}" - "${@}" || die -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi && use tools; then - tc-export CC - - emake ${TOOLS[@]/#/tools/} - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install install-man - - use doc && dodoc doc/*.html - - if multilib_is_native_abi && use tools; then - dobin ${TOOLS[@]/#/tools/} - fi -} - -multilib_src_install_all() { - dodoc Changelog README INSTALL - dodoc doc/*.txt -} - -multilib_src_test() { - echo ${WORKDIR}/fate - LD_LIBRARY_PATH="${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavresample:${BUILD_DIR}/libavutil" \ - emake -j1 fate SAMPLES="${WORKDIR}/fate" -} diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml index dc0e04065222..b08ce591f470 100644 --- a/media-video/libav/metadata.xml +++ b/media-video/libav/metadata.xml @@ -30,7 +30,6 @@ <flag name="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>net-libs/gnutls</pkg>.</flag> <flag name="tools">Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.</flag> <flag name="twolame">Enable MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder</flag> - <flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag> <flag name="vpx">Enable vp8 encoding support using <pkg>media-libs/libvpx</pkg>.</flag> <flag name="x265">Enable HEVC encoding with <pkg>media-libs/x265</pkg>.</flag> </use> diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest index 46a918de81f2..7c73de9f6529 100644 --- a/media-video/makemkv/Manifest +++ b/media-video/makemkv/Manifest @@ -1,5 +1,5 @@ AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95 -DIST makemkv-bin-1.12.3.tar.gz 9252749 BLAKE2B b81503e6bb98dbf0f61cf7918ab614972032106fc44c79d698df8fc3ebf73b4c07f74e6208cacc1756dc6a5b06a6ada663d0529f9f35bf7f0c658e18b07cb6ac SHA512 79d73c8a3dcc4028a79b8aef8c228e6519ef8df7178cdbacd85ae24b8c6078a43651e34bb32c0ff83027ea2def998fefc938676ca6d83645d2b52fc36d65df9b -DIST makemkv-oss-1.12.3.tar.gz 4379072 BLAKE2B 3fded704fbb8f5c4fac944cac028fe8b7d7c9e86402475d84638db0052480d7694c170c5babb0422f756920f0f5b191031e555fce0dfdde8b9ee63be1d57c195 SHA512 cfb4f61333751038120b94e3854afa471e9007af36b47cb0a681c3615a7f66e0462ee601c711cd9ea7cb51cc6e0ff38662a62b78e0e47735b8c19b2da272f892 -EBUILD makemkv-1.12.3.ebuild 2859 BLAKE2B fc304b3cc80241f3a2f07e020291ca76dca99b85b028b92a1833cde011fdbadc45b9a908371fc77f5c5f050f2a116599b0754d659f4bb4eac6c25e80d616fba6 SHA512 d8d8b25018297ecee548e46bc364953d2db2fe41cbe970b74933ec18400d03ab7317e2b5fe5606cce73de0bb31560b6bd17dbb3169f88807a9a7383de19f010c +DIST makemkv-bin-1.14.1.tar.gz 9313691 BLAKE2B cbbb830c20a35d943e8b99bfb05c05942b817b29c986afa441458dfeac5b544caf8256c5ccf361168a3079852cb914e8c2cd4435c37536b9bace1c707bbaa269 SHA512 a3e2f1a41cc430d37d7252e15e5cf04a5c754e1ecb9b4d9e7fd3a3bb6b721d2b4d1d86d55e068d44df0e40912e6bf7a0ebf527b11d2cba07604fc29f5b69943f +DIST makemkv-oss-1.14.1.tar.gz 4384005 BLAKE2B 56ec40d46b0d807b552b87e44b129ea982ac5c0cfe4baf4e49a32ebefedd5be9bad8edc69cc5f81a06960e8d6a24ce37fc4f0c914dda32320af3242c3b6fe589 SHA512 4d0bf778d2efd417d058b6db339dc47363b3e179734ec51fc5ebd1fe35d4040aac06ca6387a77362dca8598e8eb5d4db6be16aeea00dc7a3655bf36be26998e5 +EBUILD makemkv-1.14.1-r1.ebuild 2871 BLAKE2B eb3e55734070fa944bd19811596646fc229d362f652286c611c85dd3e8b5cdcc00cbaf172a596203b498f5eefe7e4d2f7de1cf7ae3052d5cde860677f597ec7d SHA512 5f9fe9510376ad062451b585371d0a2ae54afd24cbcd4e367dbc8ec3137cd3168384a2e78c8eff689c6d3f07eab3a8b806d706468272e054eb476672ec26592d MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9 diff --git a/media-video/makemkv/makemkv-1.12.3.ebuild b/media-video/makemkv/makemkv-1.14.1-r1.ebuild index bcc7cf5092ec..72c2f91d17cd 100644 --- a/media-video/makemkv/makemkv-1.12.3.ebuild +++ b/media-video/makemkv/makemkv-1.14.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit flag-o-matic gnome2-utils linux-info xdg-utils +inherit flag-o-matic gnome2-utils linux-info MY_P=makemkv-oss-${PV} MY_PB=makemkv-bin-${PV} @@ -23,7 +23,7 @@ QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec" DEPEND=" sys-libs/glibc dev-libs/expat - dev-libs/openssl:0[-bindist(-)] + dev-libs/openssl:0=[-bindist(-)] sys-libs/zlib gui? ( dev-qt/qtcore:5 @@ -35,6 +35,7 @@ DEPEND=" libav? ( >=media-video/libav-0.8.9:0= ) " RDEPEND="${DEPEND} + media-video/ccextractor net-misc/wget" CONFIG_CHECK="~CHR_DEV_SG" @@ -72,15 +73,13 @@ src_install() { # install profiles and locales insinto /usr/share/MakeMKV doins src/share/* -} -pkg_preinst() { - gnome2_icon_savelist + # add symlink rather than relying on MMCCEXTRACTOR env var + dosym ccextractor /usr/bin/mmccextr } pkg_postinst() { gnome2_icon_cache_update - xdg_desktop_database_update elog "While MakeMKV is in beta mode, upstream has provided a license" elog "to use if you do not want to purchase one." @@ -104,5 +103,4 @@ pkg_postinst() { pkg_postrm() { gnome2_icon_cache_update - xdg_desktop_database_update } diff --git a/media-video/motiontrack/Manifest b/media-video/motiontrack/Manifest index fba645745648..508c9bdcb57e 100644 --- a/media-video/motiontrack/Manifest +++ b/media-video/motiontrack/Manifest @@ -1,3 +1,3 @@ DIST motiontrack-0.1.3.tar.gz 136592 BLAKE2B 2dbd994404db3fce43d59c866951d809f87b1739f244dd53566d673073c7376fbb83aa727e503a4e28ee22b07cd3a5500f405530626ac724180f58a96366c6ae SHA512 edda7e6019aab95ed93ae82ac4a09a763442073ba0eb5e9476daacbfdd0421019a3a0fd99ee2fa0a1930c69925e1494a2e2954bcefc0865d9f1d2f84cec15c0d -EBUILD motiontrack-0.1.3-r1.ebuild 826 BLAKE2B bc84e7d23ad9a8f0022b19621193e6f2da0fc69d16310192317da48c39df705bcfb8825f2a35f4f5f3a66d8da61c66b6a6fae71c4504edd798435af1bc6b6335 SHA512 343400bdae71751221a1a4a7489241a0a12931f35a9a040a0f1e4f409b9a0b70881c65af6bb4f0184002b59e44f5dffb0b72ac41328f09a65fcb1cd8cdc536b7 +EBUILD motiontrack-0.1.3-r2.ebuild 928 BLAKE2B 414004dfdd62bc0cc213e0e163adab121469d582cd1162077b54c3d8861053e08d234207646300abee4603195970602edba93e2e08dac45ac2333e9de78f928a SHA512 98a940fd2bf2afe24a7810e28828635d21344d5aae0daf399cc3ea334135011c26cc987f0d3bb07d2b0f448c0292dbe205e37687389f85df5da6df47c4440abd MISC metadata.xml 435 BLAKE2B 6ae9a0fc5795b879c60d5a77678a87842a9c8b33605c07a2a2eae9f6bfebf14de033557fecb2bfebf61f897a4f2616160a1db241f19087ccabd830c4374e1a29 SHA512 ac216d99f9648a27fc5f15ed15df4d28c59e14a4a4662732fd52e75bb725841cfa4a04e8d001a6631f4182116b418ed57e7a3bb858f36a69b1a29326046033cd diff --git a/media-video/motiontrack/motiontrack-0.1.3-r1.ebuild b/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild index 016434aac7e3..36f69311536f 100644 --- a/media-video/motiontrack/motiontrack-0.1.3-r1.ebuild +++ b/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - +EAPI=7 inherit flag-o-matic DESCRIPTION="A set of tools that detect motion between two images" @@ -11,13 +10,17 @@ HOMEPAGE="http://motiontrack.sourceforge.net" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~hppa ~amd64" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug imagemagick multiprocess" +IUSE="debug graphicsmagick imagemagick multiprocess" RDEPEND=" - imagemagick? ( media-gfx/imagemagick ) - !imagemagick? ( media-libs/gd )" + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:0= ) + graphicsmagick? ( media-gfx/graphicsmagick:0=[imagemagick] ) + ) + !imagemagick? ( media-libs/gd ) +" DEPEND="${RDEPEND}" src_configure() { diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 9aca096dd73a..c502d5414050 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,5 +1,6 @@ AUX dump_ffmpeg.sh 2529 BLAKE2B 2c945fcf0b430d74c85557f82497dbc4a2a8308ecb34c86e42cc3c6a5eed20496691839355c068ccabf6d20d11d62035231aa208341a1ce9affc44b3e30acfde SHA512 12c15efa5cdb99eac92ff808fa56c6137343cca48b73d5875a7a6b08cf36ebeda5022eb3bae0ba567ff9031d2a0f3b5dbe69ee191ae8ecf48b98a779504df66c AUX mplayer-1.3-CVE-2016-4352.patch 617 BLAKE2B 57f85be46230fa0576c6569bafc8c65f24b0a59d3b083c06d2e14fe176505567feca5024bafd73fb1b48960ea95a4705132ed6e2166a31aabcd1e34fc41e3803 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512 +AUX mplayer-1.3-ffmpeg4+mencoder.patch 19947 BLAKE2B 4fd3cc6f793c22b02febf99ba3ea557bf20848c6adafd995e6c4822418407c7f3f0498d512b1b08d55f449f528b681a2f4f256bcec5dd360fb6e85fe3db023dc SHA512 dc20718aad3dd00336e04ac8788cc9bd3ba5808dc69e33ee23a6c523920d05fd57db7355505e7c32d8cf740308be48b6c91332551ff423ae5e6e72925681b3f0 AUX mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081 AUX mplayer-1.3-vdpau-x11.patch 547 BLAKE2B b168b61f5712788c25164cf286a119de1d42c1a142048fc8b138226d146614d7fc454dd7a5c05bfcbdef815bf5d5e18064e2893a3adecd0733fcb79a803a5876 SHA512 439c7925f97b973597239a8f684171e752321dad4bae80a3a2bad46dcf6bf0c49b0839cd5cdac5c8e0b9f5c165061b4177d05cd8060ebba6cd5c4e730ab019ab AUX mplayer-1.3.0-freetype_pkgconfig.patch 417 BLAKE2B 3eb3d8463917f938b587858bca55f974382eab82ca5b22d05f3a3f3ef0f640a991e4b0dc527a7b02788f9fe361ae96898208f9a8d45c6b7dc1ddea5dd07a2dea SHA512 6e934229ab5c3a7bbfb583c9e41365c9f9de8f1448ff6bd9dfb4a8053cae18b66081b64d9f1bd26678db69470372805566df52894cb9a433f38d3c15ed4a8815 @@ -8,6 +9,6 @@ DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a3 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d -EBUILD mplayer-1.3.0-r5.ebuild 17239 BLAKE2B 14610d37c97c6ef7e1a7fd25a10814fdc8f5228e22dfb72fe7ff187be109df22726d971b8055573998f5195980147e11c825b0b9523565547e7f697f086bdbf3 SHA512 3e465467b575b01809513618f5a87d94673041e2408466e59af852c971bcaf1adfff15c703bd9b756b6bbd86351a3b1afcc186681d47c1e7c092a4aedcb6da6b -EBUILD mplayer-9999.ebuild 16826 BLAKE2B 241abb8f0f5f14dcfef74ee2d4ea246bf41192748142539d8d91bb587d9452717c4994964b6d618efb1067523a3a8b3f55589cda86e425331a205ae508c1200d SHA512 dc8bce1f333b2ed5e1f791fb44db4572c046994b6076be7e68aa1d1ce729d84c9c3c7d3b89ca66ba2ec972ef4bc54a4dd9f8f6baca8f47ccab1e99368732d487 -MISC metadata.xml 2530 BLAKE2B 83baf1357e9b0d31244b7c04ceab7eec0bc7db7eb9a2de4ffc1a85cc49af40f1094d9bdbac22c9abff43c215c19e5b8c745afbd397ae7221921c24b422590e3a SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b +EBUILD mplayer-1.3.0-r5.ebuild 17117 BLAKE2B 474223f6e45cc661f61576d476ae7d942ff34cafc72a83b75887caf0e6d09b4bf963674b4fccd76bfc78ef78ce971b01dba281e404f7878fae3938c4c526f259 SHA512 b64e449dc10417f19d497f27ff6efdf043aa52a096a2406baf8538f090ed43a6defe6c3a90c5d87913c995796f16524097a5cbcee9e201605380bfc289a5cbba +EBUILD mplayer-9999.ebuild 16823 BLAKE2B cb7d0916716f757c7cb924ebc2cdebadd52258d2b17ab371415117aa0fa3e67b8ca3b35e5205247623d22a4f70d102ce50d60406a68ea4c6047e03f9a588f59b SHA512 31660c7a8c3cf6abe1011fcbe13cb93dd5d3d3952be00430676859aeb3275fc57c707dd2514155e9e041ceda9c34f546e243edd970cf25efdbf356aed31ba426 +MISC metadata.xml 2457 BLAKE2B c0d722886466f46e09a28b2384a6b8ccf15bb080b69b513500633a03a1fc784fe85a167824879c9dde6417bde4852c4ec1f30a444e4d520b7d47315cfa4cc91e SHA512 578de48a26eddf8d8eb522141df02d9c948d97e1334c94897cad5a4a9a386e8207c90e6d931e1d2defe20d34504c0d4f993746f1cc0907cea1ed2740d02b49d5 diff --git a/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch b/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch new file mode 100644 index 000000000000..f312203027a9 --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch @@ -0,0 +1,360 @@ +r38001 | al | 2017-10-31 23:33:45 +0100 (Tue, 31 Oct 2017) | 37 lines + +ve_lavc,ae_lavc: Adjust to work with newest FFmpeg again + +This commit re-enables previously disabled lavc encoders. + +The lavc audio encoder had no problems by itself after +my last commit, but could not stay enabled because of +the coupling of the lavcopts option. + +Here follows a list of changes done to ve lavc + +* Explicitly use 16 as upper limit for vmax_b_frames + + The FF_MAX_B_FRAMES #define was removed from FFmpeg's API. + + It was removed because there is no global limit to the number of + b frames. While this is the most conservative change to address + the removal of the #define, it may not be optimal because we do + not allow for more than 16 b frames. + +* Options that now need to be passed to the encoder as AVOption + - lmin & lmax + - vrc_strategy + - vqsquish + - vqmod_amp & vqmod_freq + - vrc_eq + - vrc_buf_aggressivity + - vrc_init_cplx + - ibias & pbias + - border_mask + - naq + - gmc + - vme + +* Options that were dropped because they had no effect anymore + - sc_factor + + +Index: MPlayer-1.3.0/Makefile +=================================================================== +--- MPlayer-1.3.0.orig/Makefile ++++ MPlayer-1.3.0/Makefile +@@ -615,7 +615,9 @@ SRCS_MPLAYER = command.c + + #MEncoder + SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c +-SRCS_MENCODER-$(FFMPEG) += libmpdemux/muxer_lavf.c ++SRCS_MENCODER-$(FFMPEG) += libmpcodecs/ae_lavc.c \ ++ libmpcodecs/ve_lavc.c \ ++ libmpdemux/muxer_lavf.c + SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c + SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c \ + libmpcodecs/native/rtjpegn.c +Index: MPlayer-1.3.0/cfg-mencoder.h +=================================================================== +--- MPlayer-1.3.0.orig/cfg-mencoder.h ++++ MPlayer-1.3.0/cfg-mencoder.h +@@ -52,7 +52,7 @@ const m_option_t ovc_conf[]={ + " nuv - nuppel video\n" + #endif + #ifdef CONFIG_FFMPEG +-// " lavc - libavcodec codecs - best quality!\n"//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps ++ " lavc - libavcodec codecs - best quality!\n" + #endif + #ifdef CONFIG_WIN32DLL + " vfw - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n" +@@ -106,7 +106,7 @@ const m_option_t oac_conf[]={ + " mp3lame - cbr/abr/vbr MP3 using libmp3lame\n" + #endif + #ifdef CONFIG_FFMPEG +-// " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n"//TODO: ae_lavc was deactivated because it depends on ve_lavc which does not compile after latest FFmpeg major bumps ++ " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n" + #endif + #ifdef CONFIG_TOOLAME + " toolame - Toolame MP2 audio encoder\n" +@@ -226,7 +226,7 @@ const m_option_t mencoder_opts[]={ + {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + #endif + #ifdef CONFIG_FFMPEG +- //{"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, //TODO: ve_lavc doesn't build after latest FFmpeg major bumps ++ {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + #else + {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + #endif /* CONFIG_FFMPEG */ +Index: MPlayer-1.3.0/libmpcodecs/ve.c +=================================================================== +--- MPlayer-1.3.0.orig/libmpcodecs/ve.c ++++ MPlayer-1.3.0/libmpcodecs/ve.c +@@ -43,7 +43,7 @@ extern const vf_info_t ve_info_x264; + + static const vf_info_t * const encoder_list[] = { + #ifdef CONFIG_FFMPEG +-// &ve_info_lavc,//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps ++ &ve_info_lavc, + #endif + #ifdef CONFIG_WIN32DLL + &ve_info_vfw, +Index: MPlayer-1.3.0/libmpcodecs/ae.c +=================================================================== +--- MPlayer-1.3.0.orig/libmpcodecs/ae.c ++++ MPlayer-1.3.0/libmpcodecs/ae.c +@@ -59,7 +59,9 @@ audio_encoder_t *new_audio_encoder(muxer + break; + #endif + #ifdef CONFIG_FFMPEG +- //TODO: ACODEC_LAVC <-- has been removed here because it depends on ve_lavc which does not compile after latest FFmpeg major bumps ++ case ACODEC_LAVC: ++ ris = mpae_init_lavc(encoder); ++ break; + #endif + #ifdef CONFIG_MP3LAME + case ACODEC_VBRMP3: +Index: MPlayer-1.3.0/libmpcodecs/ve_lavc.c +=================================================================== +--- MPlayer-1.3.0.orig/libmpcodecs/ve_lavc.c ++++ MPlayer-1.3.0/libmpcodecs/ve_lavc.c +@@ -63,12 +63,9 @@ static int lavc_param_vbitrate = -1; + static int lavc_param_vrate_tolerance = 1000*8; + static int lavc_param_mb_decision = 0; /* default is realtime encoding */ + static int lavc_param_v4mv = 0; +-static int lavc_param_vme = 4; + static float lavc_param_vqscale = -1; + static int lavc_param_vqmin = 2; + static int lavc_param_vqmax = 31; +-static float lavc_param_lmin = 2; +-static float lavc_param_lmax = 31; + static float lavc_param_mb_lmin = 2; + static float lavc_param_mb_lmax = 31; + static int lavc_param_vqdiff = 3; +@@ -81,22 +78,15 @@ static float lavc_param_vi_qoffset = 0.0 + static int lavc_param_vmax_b_frames = 0; + static int lavc_param_keyint = -1; + static int lavc_param_vpass = 0; +-static int lavc_param_vrc_strategy = 0; + static int lavc_param_vb_strategy = 0; + static int lavc_param_packet_size= 0; + static int lavc_param_strict= -1; + static int lavc_param_data_partitioning= 0; + static int lavc_param_gray=0; +-static float lavc_param_rc_qsquish=1.0; +-static float lavc_param_rc_qmod_amp=0; +-static int lavc_param_rc_qmod_freq=0; + static char *lavc_param_rc_override_string=NULL; +-static char *lavc_param_rc_eq="tex^qComp"; + static int lavc_param_rc_buffer_size=0; +-static float lavc_param_rc_buffer_aggressivity=1.0; + static int lavc_param_rc_max_rate=0; + static int lavc_param_rc_min_rate=0; +-static float lavc_param_rc_initial_cplx=0; + static float lavc_param_rc_initial_buffer_occupancy=0.9; + static int lavc_param_mpeg_quant=0; + static int lavc_param_fdct=0; +@@ -108,8 +98,6 @@ static float lavc_param_dark_masking= 0. + static float lavc_param_temporal_cplx_masking= 0.0; + static float lavc_param_spatial_cplx_masking= 0.0; + static float lavc_param_p_masking= 0.0; +-static float lavc_param_border_masking= 0.0; +-static int lavc_param_normalize_aqp= 0; + static int lavc_param_interlaced_dct= 0; + static int lavc_param_prediction_method= FF_PRED_LEFT; + static int lavc_param_format= IMGFMT_YV12; +@@ -131,15 +119,12 @@ static int lavc_param_bit_exact = 0; + static int lavc_param_aic= 0; + static int lavc_param_aiv= 0; + static int lavc_param_umv= 0; +-static int lavc_param_gmc= 0; + static int lavc_param_obmc= 0; + static int lavc_param_loop= 0; + static int lavc_param_last_pred= 0; + static int lavc_param_pre_me= 1; + static int lavc_param_me_subpel_quality= 8; + static int lavc_param_me_range= 0; +-static int lavc_param_ibias= FF_DEFAULT_QUANT_BIAS; +-static int lavc_param_pbias= FF_DEFAULT_QUANT_BIAS; + static int lavc_param_coder= 0; + static int lavc_param_context= 0; + static char *lavc_param_intra_matrix = NULL; +@@ -162,7 +147,6 @@ static int lavc_param_skip_exp=0; + static int lavc_param_skip_cmp=0; + static int lavc_param_brd_scale = 0; + static int lavc_param_bidir_refine = 0; +-static int lavc_param_sc_factor = 1; + static int lavc_param_video_global_header= 0; + static int lavc_param_mv0_threshold = 256; + static int lavc_param_refs = 1; +@@ -190,21 +174,21 @@ const m_option_t lavcopts_conf[]={ + {"vhq", &lavc_param_mb_decision, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"mbd", &lavc_param_mb_decision, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, + {"v4mv", &lavc_param_v4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, +- {"vme", &lavc_param_vme, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL}, ++ {"vme", "vme has no effect, please use the corresponding codec specific option (see FFmpeg documentation) instead of vme.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL}, + {"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, + {"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, +- {"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, +- {"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, ++ {"lmin", "Please use o=lmin=<value>*QP2LAMBDA instead of lmin.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"lmax", "Please use o=lmax=<value>*QP2LAMBDA instead of lmax.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, + {"mblmax", &lavc_param_mb_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, + {"vqdiff", &lavc_param_vqdiff, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, + {"vqcomp", &lavc_param_vqcompress, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, + {"vqblur", &lavc_param_vqblur, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, + {"vb_qfactor", &lavc_param_vb_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL}, +- {"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, FF_MAX_B_FRAMES, NULL}, ++ {"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, 16, NULL}, // FF_MAX_B_FRAMES was removed from FFmpeg. We still use its value here, so we probably limit ourselves in some cases. + {"vpass", &lavc_param_vpass, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, +- {"vrc_strategy", &lavc_param_vrc_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, ++ {"vrc_strategy", "Please use o=rc_strategy=<value> instead of vrc_strategy.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vb_strategy", &lavc_param_vb_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, + {"vb_qoffset", &lavc_param_vb_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL}, + {"vlelim", "Please use o=luma_elim_threshold=<value> instead of vlelim.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, +@@ -217,16 +201,16 @@ const m_option_t lavcopts_conf[]={ + {"mpeg_quant", &lavc_param_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"vi_qfactor", &lavc_param_vi_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL}, + {"vi_qoffset", &lavc_param_vi_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL}, +- {"vqsquish", &lavc_param_rc_qsquish, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, +- {"vqmod_amp", &lavc_param_rc_qmod_amp, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, +- {"vqmod_freq", &lavc_param_rc_qmod_freq, CONF_TYPE_INT, 0, 0, 0, NULL}, +- {"vrc_eq", &lavc_param_rc_eq, CONF_TYPE_STRING, 0, 0, 0, NULL}, ++ {"vqsquish", "Please use o=qsquish=<value> instead of vqsquish.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"vqmod_amp", "Please use o=rc_qmod_amp=<value> instead of vqmod_amp.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"vqmod_freq", "Please use o=rc_qmod_freq=<value> instead of vqmod_freq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"vrc_eq", "Please use o=rc_eq=<value> instead of vrc_eq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vrc_override", &lavc_param_rc_override_string, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"vrc_maxrate", &lavc_param_rc_max_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL}, + {"vrc_minrate", &lavc_param_rc_min_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL}, + {"vrc_buf_size", &lavc_param_rc_buffer_size, CONF_TYPE_INT, CONF_RANGE, 4, MAX_BITRATE, NULL}, +- {"vrc_buf_aggressivity", &lavc_param_rc_buffer_aggressivity, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, +- {"vrc_init_cplx", &lavc_param_rc_initial_cplx, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9999999.0, NULL}, ++ {"vrc_buf_aggressivity", "Please use o=rc_buf_aggressivity=<value> instead of vrc_buf_aggressivity.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"vrc_init_cplx", "Please use o=rc_init_cplx=<value> instead of vrc_init_cplx.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vrc_init_occupancy", &lavc_param_rc_initial_buffer_occupancy, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, + {"vfdct", &lavc_param_fdct, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, + {"aspect", &lavc_param_aspect, CONF_TYPE_STRING, 0, 0, 0, NULL}, +@@ -235,7 +219,7 @@ const m_option_t lavcopts_conf[]={ + {"tcplx_mask", &lavc_param_temporal_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, + {"scplx_mask", &lavc_param_spatial_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, + {"p_mask", &lavc_param_p_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, +- {"naq", &lavc_param_normalize_aqp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, ++ {"naq", "Please use o=mpv_flags=+naq instead of naq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"dark_mask", &lavc_param_dark_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, + {"ildct", &lavc_param_interlaced_dct, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"idct", &lavc_param_idct, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL}, +@@ -266,8 +250,8 @@ const m_option_t lavcopts_conf[]={ + {"aiv", &lavc_param_aiv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"obmc", &lavc_param_obmc, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOOP_FILTER, NULL}, +- {"ibias", &lavc_param_ibias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL}, +- {"pbias", &lavc_param_pbias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL}, ++ {"ibias", "Please use o=ibias=<value> instead of ibias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"pbias", "Please use o=pbias=<value> instead of pbias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"coder", &lavc_param_coder, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, + {"context", &lavc_param_context, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, + {"intra_matrix", &lavc_param_intra_matrix, CONF_TYPE_STRING, 0, 0, 0, NULL}, +@@ -280,9 +264,9 @@ const m_option_t lavcopts_conf[]={ + {"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME, NULL}, + {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP, NULL}, +- {"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL}, ++ {"gmc", "Please use o=gmc=<value> instead of gmc.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL}, +- {"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, ++ {"border_mask", "Please use o=border_mask=<value> instead of border_mask.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"inter_threshold", "inter_threshold has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"sc_threshold", &lavc_param_sc_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000000, 1000000000, NULL}, + {"top", &lavc_param_top, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL}, +@@ -295,7 +279,7 @@ const m_option_t lavcopts_conf[]={ + {"skip_exp", &lavc_param_skip_exp, CONF_TYPE_INT, CONF_RANGE, 0, 1000000, NULL}, + {"brd_scale", &lavc_param_brd_scale, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, + {"bidir_refine", &lavc_param_bidir_refine, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL}, +- {"sc_factor", &lavc_param_sc_factor, CONF_TYPE_INT, CONF_RANGE, 1, INT_MAX, NULL}, ++ {"sc_factor", "sc_factor has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vglobal", &lavc_param_video_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, + {"aglobal", &lavc_param_audio_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, + {"mv0_threshold", &lavc_param_mv0_threshold, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, +@@ -351,8 +335,6 @@ static int config(struct vf_instance *vf + lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate}; + lavc_venc_context->qmin= lavc_param_vqmin; + lavc_venc_context->qmax= lavc_param_vqmax; +- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); +- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); + lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5); + lavc_venc_context->mb_lmax= (int)(FF_QP2LAMBDA * lavc_param_mb_lmax + 0.5); + lavc_venc_context->max_qdiff= lavc_param_vqdiff; +@@ -360,17 +342,12 @@ static int config(struct vf_instance *vf + lavc_venc_context->qblur= lavc_param_vqblur; + lavc_venc_context->max_b_frames= lavc_param_vmax_b_frames; + lavc_venc_context->b_quant_factor= lavc_param_vb_qfactor; +- lavc_venc_context->rc_strategy= lavc_param_vrc_strategy; + lavc_venc_context->b_frame_strategy= lavc_param_vb_strategy; + lavc_venc_context->b_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vb_qoffset + 0.5); + lavc_venc_context->rtp_payload_size= lavc_param_packet_size; + lavc_venc_context->strict_std_compliance= lavc_param_strict; + lavc_venc_context->i_quant_factor= lavc_param_vi_qfactor; + lavc_venc_context->i_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vi_qoffset + 0.5); +- lavc_venc_context->rc_qsquish= lavc_param_rc_qsquish; +- lavc_venc_context->rc_qmod_amp= lavc_param_rc_qmod_amp; +- lavc_venc_context->rc_qmod_freq= lavc_param_rc_qmod_freq; +- lavc_venc_context->rc_eq= lavc_param_rc_eq; + + mux_v->max_rate= + lavc_venc_context->rc_max_rate= lavc_param_rc_max_rate*1000; +@@ -382,8 +359,6 @@ static int config(struct vf_instance *vf + lavc_venc_context->rc_initial_buffer_occupancy= + lavc_venc_context->rc_buffer_size * + lavc_param_rc_initial_buffer_occupancy; +- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity; +- lavc_venc_context->rc_initial_cplx= lavc_param_rc_initial_cplx; + lavc_venc_context->debug= lavc_param_debug; + lavc_venc_context->last_predictor_count= lavc_param_last_pred; + lavc_venc_context->pre_me= lavc_param_pre_me; +@@ -391,8 +366,6 @@ static int config(struct vf_instance *vf + lavc_venc_context->pre_dia_size= lavc_param_pre_dia_size; + lavc_venc_context->me_subpel_quality= lavc_param_me_subpel_quality; + lavc_venc_context->me_range= lavc_param_me_range; +- lavc_venc_context->intra_quant_bias= lavc_param_ibias; +- lavc_venc_context->inter_quant_bias= lavc_param_pbias; + lavc_venc_context->coder_type= lavc_param_coder; + lavc_venc_context->context_model= lavc_param_context; + lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; +@@ -479,7 +452,6 @@ static int config(struct vf_instance *vf + lavc_venc_context->spatial_cplx_masking= lavc_param_spatial_cplx_masking; + lavc_venc_context->p_masking= lavc_param_p_masking; + lavc_venc_context->dark_masking= lavc_param_dark_masking; +- lavc_venc_context->border_masking = lavc_param_border_masking; + + if (lavc_param_aspect != NULL) + { +@@ -552,20 +524,17 @@ static int config(struct vf_instance *vf + if (lavc_param_alt) + av_dict_set(&opts, "alternate_scan", "1", 0); + lavc_venc_context->flags|= lavc_param_ilme; +- lavc_venc_context->flags|= lavc_param_gmc; + #ifdef AV_CODEC_FLAG_CLOSED_GOP + lavc_venc_context->flags|= lavc_param_closed_gop; + #endif + lavc_venc_context->flags|= lavc_param_gray; + +- if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP; + if(lavc_param_interlaced_dct) lavc_venc_context->flags|= AV_CODEC_FLAG_INTERLACED_DCT; + lavc_venc_context->flags|= lavc_param_psnr; + lavc_venc_context->intra_dc_precision = lavc_param_dc_precision - 8; + lavc_venc_context->prediction_method= lavc_param_prediction_method; + lavc_venc_context->brd_scale = lavc_param_brd_scale; + lavc_venc_context->bidir_refine = lavc_param_bidir_refine; +- lavc_venc_context->scenechange_factor = lavc_param_sc_factor; + if((lavc_param_video_global_header&1) + /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){ + lavc_venc_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; +@@ -648,8 +617,6 @@ static int config(struct vf_instance *vf + } + } + +- lavc_venc_context->me_method = ME_ZERO+lavc_param_vme; +- + /* fixed qscale :p */ + if (lavc_param_vqscale >= 0.0) + { diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml index d6c05ce054c6..d4d955ac2501 100644 --- a/media-video/mplayer/metadata.xml +++ b/media-video/mplayer/metadata.xml @@ -34,7 +34,6 @@ <flag name="twolame">Enable twolame MPEG-2 encoding</flag> <flag name="vcd">Enables VCD support</flag> <flag name="vidix">Support for vidix video output</flag> - <flag name="xvmc">Enables X-Video Motion Compensation support</flag> <flag name="yuv4mpeg">Enables yuv4mpeg video output</flag> <flag name="zoran">Enables ZR360[56]7/ZR36060 video output</flag> </use> diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild index bd0a05495e9c..b5a27b3c40e1 100644 --- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix -vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran" +vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran" VIDEO_CARDS="mga tdfx" for x in ${VIDEO_CARDS}; do @@ -71,7 +71,6 @@ RDEPEND+=" dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) - dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( @@ -126,13 +125,13 @@ RDEPEND+=" xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC ) " ASM_DEP="dev-lang/yasm" DEPEND="${RDEPEND} virtual/pkgconfig dga? ( x11-base/xorg-proto ) + dvb? ( virtual/linuxtv-dvb-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto ) @@ -160,7 +159,6 @@ fi # ass and freetype font require iconv and ass requires freetype fonts # unicode transformations are usefull only with iconv # radio requires oss or alsa backend -# xvmc requires xvideo support REQUIRED_USE=" dga? ( X ) dvdnav? ( dvd ) @@ -174,8 +172,7 @@ REQUIRED_USE=" vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) - xv? ( X ) - xvmc? ( xv )" + xv? ( X )" RESTRICT="faac? ( bindist )" PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" ) @@ -243,7 +240,7 @@ src_prepare() { else eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240 eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch - has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch + has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch "${FILESDIR}"/${PN}-1.3-ffmpeg4+mencoder.patch fi if [ ! -f VERSION ] ; then [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" @@ -287,6 +284,7 @@ src_configure() { --disable-kai --disable-libopus --disable-libilbc + --disable-xvmc $(use_enable network networking) $(use_enable joystick) " @@ -494,11 +492,6 @@ src_configure() { use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb" use xscreensaver || myconf+=" --disable-xss" use X || myconf+=" --disable-x11" - if use xvmc; then - myconf+=" --enable-xvmc --with-xvmclib=XvMCW" - else - myconf+=" --disable-xvmc" - fi ############################ # OSX (aqua) configuration # diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index c93bd3174815..248afbd492bc 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -71,7 +71,6 @@ RDEPEND+=" dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) - dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( @@ -132,6 +131,7 @@ ASM_DEP="dev-lang/yasm" DEPEND="${RDEPEND} virtual/pkgconfig dga? ( x11-base/xorg-proto ) + dvb? ( virtual/linuxtv-dvb-headers ) X? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) xscreensaver? ( x11-base/xorg-proto ) diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 17b2e8d53bce..1f01fb5fef94 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -2,7 +2,7 @@ AUX obs-studio-21.0.2-qt-5.11.0.patch 1078 BLAKE2B 4681ae50ae11fed00b227966cbac4 AUX obs-studio-21.1.2-use-less-automagic.patch 5284 BLAKE2B 43e9b7fc9c4699c77037a7e28668137e0ffb24de285b9f560d2ccb6214c54640893a5d34e179087f7b2dfce49a97ea8465df97bbac232ed7c013d580bbb6019a SHA512 00774c36e3437c5828677f71ff33e467fab3957b9622092ba3d2501769796ab5b6e4328b898ee9e92ee32dfef78f9797d03bb602bc68ad294202f180298afb38 DIST obs-studio-21.1.2.tar.gz 5959232 BLAKE2B 12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7 SHA512 5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938 DIST obs-studio-22.0.3.tar.gz 6015365 BLAKE2B e2c3aec7f97bbad2ec70a46d59035335d605a478ab1e4ff10a077d81c9ade5deef1ca56cf3ffc46d4d2ab89339d98a68aa5ca8c6ca240ed82939b59803af151c SHA512 491f7ce44c741d144c621eb645fe00604e1eb98ff7dac03dffe51ba78a742e6015e1f96f21aad69e16a22d9546b6cdb51b5c1a4defd96e7c64f099de83a31f04 -EBUILD obs-studio-21.1.2.ebuild 3085 BLAKE2B 59a06f60076e037d954588deedcd24556d60d77155337b464187164e028230ab3c182ccf0b656b35d0f06c1b407e883b85c6003de76267ee225eb4e686c3580a SHA512 3db68631d4c70f3951eb879202719fea85be5072f6d4ece7dac369f51e8d0e50f8f04835f7e870e05baee8731c1b12391072ec217f392fb497da750d38afd168 -EBUILD obs-studio-22.0.3.ebuild 3040 BLAKE2B 903c7dc90d554e53603b4fd4c8a9b191927b0c2da06c7a9bd04d37850bb82fc5eca56e30f53c8ab8c30353a3b22b40b8b2ed2ba01c26e8787805f2f22b36cf58 SHA512 b9d96598e55c8d8c4d1d51c52577d11c6b7b9367b003c10d19d9e1b62e6dfea5bd3731a099c0d6b0997aa8e35b1b9fcde92ea10f59adc9d4d18904ac47c8033a -EBUILD obs-studio-9999.ebuild 2969 BLAKE2B 42cd67c4a1679e1edd366a941b56633aa3e200193f650fa91cf8c07381db079ad6aa2543c0d3f41304264c1eba3356e0a6f2ebb9af6932ab45b54496091dcc7c SHA512 4951dee505c16193835d0609dd9c8a8e7963a698f7efdd7eb951977c46efe68fb193f423664cca1e38c1ab94c54240295170bec9e87fdf4eb7f9601d0d5fe956 +EBUILD obs-studio-21.1.2.ebuild 3147 BLAKE2B 8b342dd1f7170333447f848e280e9782d9ebe14de2015be81712cc8c1b025475b5eaef5be1ed2d1eb70084d7de5340ccaa239be8938543143a18802dd5f1d54e SHA512 361d888d91502fb15cfebb87aeee71f953719b5a26987f914cc9dc43d038069bef12c6963e979a77e64e084cb5de3bf5482be65ec1b77d051faeacb3c68f89c1 +EBUILD obs-studio-22.0.3.ebuild 3102 BLAKE2B 7428fb9eee153659fd5df973c73a462db5a4abe5836b2cae38cc36586282388ca95ef18258d5f6bc8e711b3131f559767bb4f8e4db5f5c7e59ec110df3e56fac SHA512 33e4e6f1de604ffedf22d04d5ef428f33af3a8e5c4697edadcc155038db7d029fe061b3edee14ef89ef330734d39c940b80eda30df9fa4886c8510db6b9e86a0 +EBUILD obs-studio-9999.ebuild 3006 BLAKE2B d3956db1caeae26675fe91941fc3b780358cb36e7bcc2eb68ded56d31b5b9b02eaf16d9e2c8b0301780676ad0d734705e387220d720b4471e5c57a2e40675c95 SHA512 16521f48909777b04d3a427adf666616b5498799e63d2ba17350d0e6fa64f3c1beb74eb6d61d59be1bc0cc09955d349f02e3f86a6de5ab12fa89846bd19327a0 MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f diff --git a/media-video/obs-studio/obs-studio-21.1.2.ebuild b/media-video/obs-studio/obs-studio-21.1.2.ebuild index ca9114ce291b..aa981e49491a 100644 --- a/media-video/obs-studio/obs-studio-21.1.2.ebuild +++ b/media-video/obs-studio/obs-studio-21.1.2.ebuild @@ -46,7 +46,12 @@ COMMON_DEPEND=" imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) - nvenc? ( media-video/ffmpeg:=[nvenc] ) + nvenc? ( + || ( + <media-video/ffmpeg-4[nvenc] + >=media-video/ffmpeg-4[video_cards_nvidia] + ) + ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) speex? ( media-libs/speexdsp ) diff --git a/media-video/obs-studio/obs-studio-22.0.3.ebuild b/media-video/obs-studio/obs-studio-22.0.3.ebuild index 7bd98fa4213b..a2403c9502a5 100644 --- a/media-video/obs-studio/obs-studio-22.0.3.ebuild +++ b/media-video/obs-studio/obs-studio-22.0.3.ebuild @@ -46,7 +46,12 @@ COMMON_DEPEND=" imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) - nvenc? ( media-video/ffmpeg:=[nvenc] ) + nvenc? ( + || ( + <media-video/ffmpeg-4[nvenc] + >=media-video/ffmpeg-4[video_cards_nvidia] + ) + ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) speex? ( media-libs/speexdsp ) diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index a596540a779f..991fa7ae9912 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -46,7 +46,12 @@ COMMON_DEPEND=" imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) - nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) + nvenc? ( + || ( + <media-video/ffmpeg-4[nvenc] + >=media-video/ffmpeg-4[video_cards_nvidia] + ) + ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) speex? ( media-libs/speexdsp ) diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest index 4a4c14334ed7..fd09032b73fe 100644 --- a/media-video/parole/Manifest +++ b/media-video/parole/Manifest @@ -1,7 +1,5 @@ -DIST parole-0.8.1.tar.bz2 814827 BLAKE2B 54c6753da5f9e6e6eef70bfbe13dd6496687fb35905ac8222a8ab96d3a46bc2f718a5d87dc44abec2c15cfde503f839960b0bcb51c8a58b5c978df830eec5207 SHA512 73c27022331828adb7b5805245ce97f03f4848c569125529436e82651da61e28f4d4a834468d6e4c165754f2fd9664eded9a7e15fc86f067d9b2c7c54afff3ee DIST parole-1.0.0.tar.bz2 900499 BLAKE2B d6a1eb21846426781a712f33b7cf8f412b17b9a3e02b1ef15b6ff742687efc70a3e3f0ae8124ed2226a1cf00022c7ef0650c8e1c1b6e3279b111891e8c3e651e SHA512 0581fed93d2a09a3d9ec9cf1bb68a298ccd47676b22d0824495136ee9d785290b8465af8c12b5ecd34a46936f7433bf96dd559e6252a8f1af46c0e2f9256c864 DIST parole-1.0.1.tar.bz2 903754 BLAKE2B 2bd8a8892c04bc145d7ba0bc08c29ad1f9c4507cce533d554952553e46c408e9f293a19820790541d0a494052ac6024d415bfef4864fc09b8d851664688ace3e SHA512 026ece62e6a8175976e7ce218edbd6955a0cdb5074996adad5bed3e536f90108e4d1106f22edcb06d213fb09dd47b04f81bff94f4534710b61f0f53cb0395f72 -EBUILD parole-0.8.1.ebuild 1284 BLAKE2B add340579bde9e74dad8d327f0a47d72d0275eac9a69f43b034b71b80f6e4f754999f937e6585c8e7494f35172fcfc55258f5eb8d6ed4d095a44efd3d2bef741 SHA512 d315e12d36f1d0c8bbf8a5e2bb4a34e3c9f67e4cfc06fa03ac862a7ac8df349957bb43f15fc75589e9523dda4785142e849f8ababd3cd18ed050f222627fcae2 EBUILD parole-1.0.0.ebuild 1423 BLAKE2B 2cf11db0e9ceb829b290ccf774f9fb9cf94a0af47f8d896e91cd5660d24f61f321fe4d9b5ee7381138efb739263ae71beae28a07352a700b5f8d781f6e882006 SHA512 f7a862aca1db2e6b234d5276f0fe6ea9febd3b7fef718e758558494dbfa3de1aa5302325431b8601702593ec857a7d8beea3ecb93f29e1716172ecf13f349b38 -EBUILD parole-1.0.1.ebuild 1447 BLAKE2B 0794e419882880e68ed9ee7a2280d2c5b618b16189c34c62315faea26be0c555074454274095f1804ef9b860e3ad7bd8591de42f1c6c5db62328802e72807db7 SHA512 f1c859fea6e9479a2694e22e1ba5c6308a16a7ec2ed543e66fa71ee976b4a7138512403a8da51576f03b1da949acb2c48e27d0873a1ddd97c5e721335d385529 -MISC metadata.xml 318 BLAKE2B fc559f9ed2dba93e1117e5b01a8e7202b4d8fa64493133ebbe758e4d6c13836ae484b7be986cbcae4d32ec3175d138292aa51a86018cf531c7f12c8f3bd06590 SHA512 412b57b034604b0b6d532fadf5eba6478222b30fe4a003ff1486b59ec1136f440343c4524951cee33b235dfa782c09380326d9cbee17e1406408947d12fc430e +EBUILD parole-1.0.1.ebuild 1442 BLAKE2B 7c6e7f4209136a9b2215bae72574652e0c54047b7a65aff05708f41466799499a3b82a514b54e0ea929a2c0501c6e4afb6ef01259cc1b6e1856e46868cd1d880 SHA512 eebb71d36da7b352c74a3ab7c18159e13de9aef93775cff90b43ace73ab8d7bdbe2aad5621cb7f8fa935c5de7d00216496e13f619f5f21e2f53e3fdd13c69434 +MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8 diff --git a/media-video/parole/metadata.xml b/media-video/parole/metadata.xml index 83d49ac20cb7..dce6704738a4 100644 --- a/media-video/parole/metadata.xml +++ b/media-video/parole/metadata.xml @@ -5,7 +5,4 @@ <email>xfce@gentoo.org</email> <name>XFCE Team</name> </maintainer> - <use> - <flag name="clutter">Compile in Clutter GTK+ support</flag> - </use> </pkgmetadata> diff --git a/media-video/parole/parole-0.8.1.ebuild b/media-video/parole/parole-0.8.1.ebuild deleted file mode 100644 index 880299d5fad0..000000000000 --- a/media-video/parole/parole-0.8.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit xfconf - -DESCRIPTION="a simple media player based on the GStreamer framework for the Xfce4 desktop" -HOMEPAGE="https://docs.xfce.org/apps/parole/start" -SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~mips x86" -IUSE="clutter debug libnotify taglib" - -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:= - >=dev-libs/glib-2.32:2= - media-libs/gstreamer:1.0= - media-libs/gst-plugins-base:1.0= - sys-apps/dbus:0= - >=x11-libs/gtk+-3.2:3= - x11-libs/libX11:0= - >=xfce-base/libxfce4ui-4.11:0=[gtk3(+)] - >=xfce-base/libxfce4util-4.11:0= - >=xfce-base/xfconf-4.10:0= - clutter? ( - >=media-libs/clutter-1.16.4:1.0= - >=media-libs/clutter-gtk-1.4.4:1.0= - ) - libnotify? ( >=x11-libs/libnotify-0.7:0= ) - taglib? ( >=media-libs/taglib-1.6:0= )" -RDEPEND="${COMMON_DEPEND} - media-plugins/gst-plugins-meta:1.0" -DEPEND="${COMMON_DEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -pkg_setup() { - XFCONF=( - $(use_enable clutter) - $(use_enable taglib) - $(use_enable libnotify notify-plugin) - $(xfconf_use_debug) - --with-gstreamer=1.0 - ) - - DOCS=( AUTHORS ChangeLog README THANKS TODO ) -} diff --git a/media-video/parole/parole-1.0.1.ebuild b/media-video/parole/parole-1.0.1.ebuild index 36f2c8f0745b..04d5007a5f7e 100644 --- a/media-video/parole/parole-1.0.1.ebuild +++ b/media-video/parole/parole-1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~mips ~x86" +KEYWORDS="amd64 ~mips x86" IUSE="libnotify taglib" COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:= diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest index f607355c529b..bbb19561af84 100644 --- a/media-video/smtube/Manifest +++ b/media-video/smtube/Manifest @@ -1,3 +1,3 @@ DIST smtube-17.5.0.tar.bz2 748559 BLAKE2B 41c5be3933b74b079136788c99cf3e073eab5903596f2e39f9451493e17338d39454a8956841452f37e56c0e6051720a02a9765f3165f4e7e4aa1d93caa1a59f SHA512 bda1d166fe03eb85e5a9971b0d5422ea3e72ea91293c4dd14cdb447788635971a1d9977fd2dda60bfcda68183511b5c6ca6b39a229960fbd4c7c5f125882140b -EBUILD smtube-17.5.0-r2.ebuild 1478 BLAKE2B e0b3ac3b26ba93aacc7a4a85937336654a90da7cdf75f327d33fe5b535a81b8dd307d3e76713fd903b9327472b8a1259142ce139deb11987d4d5c7ef24ed1df4 SHA512 04c92b7a11640595cd736021ca027e6e756d58384342ea6bbf94db3b1d6f45724bd467bff85a6f43234dc38a69aca2618a08e9946cda53909a4fde2544a2e646 +EBUILD smtube-17.5.0-r2.ebuild 1447 BLAKE2B 06f6b15ca00add442247f618b96c82560b7ecb65668ddea9547df95e818d28ad87069227b2d1be728c32bdaec99488e64962974c13ea323675c0580c62c70260 SHA512 679bceda52dc589a039d4520160b861dc03599d6dcf16bd5fef6c1e6e73753f1a36255525b4ce2c16bec356ee7ed0b08e2bbf26ef9855190bd1116b82052dfdf MISC metadata.xml 553 BLAKE2B 5818030e41958376eb0a4566f79a245d8bd1142dbcbf56aaeb21434e4194d2e8c7208bfd7b7e15b11f688f0e8ef47be2e1748740883a09cce1cda04836a70e24 SHA512 0e833e9f3075e066d059871c97bc951acb2d68152719388b9c1eb92776f50822585c88f662e8c5544ef15861f11bd76e469a34c593c98f3bc76ccf898eb202a6 diff --git a/media-video/smtube/smtube-17.5.0-r2.ebuild b/media-video/smtube/smtube-17.5.0-r2.ebuild index 129d8081f023..0643bb7553e9 100644 --- a/media-video/smtube/smtube-17.5.0-r2.ebuild +++ b/media-video/smtube/smtube-17.5.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -35,7 +35,6 @@ RDEPEND="${CDEPEND} media-video/mplayer media-video/vlc media-video/totem - media-video/gnome-mplayer ) " diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 1cad64a8cf7c..bd4eac2a0166 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -2,14 +2,9 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a AUX vlc-2.2.4-libav-11.7.patch 291 BLAKE2B 9ad8bac7897976ba50b98ce1063baab311f0ad8e267cbad751b1378280b2f8238e22096448889b4eb69bbec34d08225269c7d2f653676828dc7a7d755fe676bf SHA512 f216833dc1ad5ddbf6a19b497238e9c850582f16eae452862a4c7c9acd110a0033879b3e3555177ac0ef30663cdd3f72d1a1020999c44e1f577ef665dd658315 AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51 -AUX vlc-3.0.1-qt-5.11.patch 350 BLAKE2B e0980ebbefa94d9388785c12fa5cba666eb3681fa94b0c512018475477974502ce0df4aa4939865f43c2bf393654db902df5f070edd802296f1d3ef71b8caeb0 SHA512 66aad0ec32d1a96f65566b04eb9c0b4574824e281940fe5c0de54ac5f92189693a9f2576203d2c8562d7174ec5315cbbd683d93c481d16119d3038e30a58cbf5 -AUX vlc-3.0.3-fix-disable-vlm.patch 1366 BLAKE2B a0ebb75f8b171063dfc4490ed8abfcad515cac85a618bcd0e157fda71a6673023d45682a5c5507ffbc1412e15f1edb3cd0e3f1e5095d9d5ce5dfb0ae51488e36 SHA512 544c3f57112e7c37c1fc3a853e45b6ca3c186ee70734cd755365b233cbd481257ec0a7be8e8213c55ee6c6110a2ee8c0d4bce50eab67cdd57cb4e74a9edab862 -AUX vlc-3.0.3-fribidi-1.patch 3406 BLAKE2B d7c670a57a442a1f093f4ca72c84b633bafcf5a631f0a31af45109cf0cedc1761f93817c26b412fc1af0a7ee8a9f84b5e318d210d4e78c95a989af37d99410f4 SHA512 403524d92607e8862836fbbdd4f32c064ee67dac521fbbfdd474d4b057b76e006cca6e9541d95765451eb147320111ef1774b6399e05ce9d32db61430ab4ef2a AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d -DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271 -EBUILD vlc-3.0.3-r1.ebuild 13450 BLAKE2B 90c0942f1018dc8bae1bc15c4417bb7555aede9e6ec7d3a87ddd048af03d816855cc3f96e1042a2f6c0d2949ca76dd8b9d80b240509413af3bb61e212ffd11ad SHA512 072af5095c8fda41fe7c29d4254a4147687b64a8593b117d37466dc8012d1c64bb7291ecf6a5ef0f806f6de0522dd90eb796568f73201cd1a327d85efd3f7218 -EBUILD vlc-3.0.4.ebuild 13221 BLAKE2B 65f35cbb37b2da5bf91ceea246a32f70980c96eae0a30dd816dd43c26eba4326682b8a8a5b52b351eb666b6c107352498f1918f59b47edb34d0c13054f7af95f SHA512 3698903d40c16dee702bfedd47888b465d11a5a7d93442ceb758a92d8c14c93710a349a4e83943e39cdf9c8aa5fcd6e879dd1bca9fb71b06faf5a93cebc5266e -EBUILD vlc-3.0.9999.ebuild 13335 BLAKE2B 6fae468451c37a769c158af2bb1a63a6f20d4a09f0abd4a8f8591e328dc3b3fb757634e1ce157b8c7ef8e33ce326f55a6128569a1f778a6b4eeae4191def98a2 SHA512 da6f54017dfe0bd81632898a45141f837ca18e09e67765726a36f814b2f675bd3e9a1ff295bd318a37d1a98d059576da58f2df9700467abe2fe64d2a9dbf4207 -EBUILD vlc-9999.ebuild 13318 BLAKE2B a04c1806ced8930329d08146b407ed5ee7fae86727e2a77fd472296358eb9295a06b6f4e95a9f5c0f567b134e2339adbabfe0a978d13dccf726dd0adf71b8062 SHA512 0a431903eef79e28c7349f6a2737c5e82359258758641125ae30f60cedadeb1cb3e18143241fdb730a96b7776552241c0e95915351d48ef5110cda3ee46cc8bb -MISC metadata.xml 5126 BLAKE2B 107f372c830ec4bdb8ee0ca64dedb7259b08c5ee0832e9a371bf62f0a2908a76fda48cb0738e3c406090824a0c4840784004878c4364307ad76dc997e5425517 SHA512 39e2ddb1ff53603585b54410d04c783077f681b93be2f00ad91b418f029a6fb432671efb5ae3eede535d4c7b45bf43d7e5ce5cb8649064401e11eef6b025cd7a +EBUILD vlc-3.0.4.ebuild 13148 BLAKE2B 5b7ca68d78ffa3807705b3468d3b410b28808123b2dc56604fde529d0d18aba0876064022105f0a0cd24b5bee4d466b169c648c24544c20b61f0031a5ecc3062 SHA512 c546a5398ad1ae41157763b39bc36946c05e8944c39c3df02c550043e205f9aa405a64fad19f55b936a0caca2a0e163f3e629406fe6b0ba92cd907854806cc5d +EBUILD vlc-3.0.9999.ebuild 13264 BLAKE2B 3a45f9e018b98f09cf8b6c33cb8345f8dfb49abd31ffb0c39dde8a5adc7c3842177594d6ff4cb99f4c95e690daf1161ccb8c76459259f140da26db390489d8fd SHA512 0ef5e06d575cfe92aa336bb17bcbdac2c09a692310fa496db8768f3ce4ecc8f32ba20d0bad67da6c3e2278dfda9b828cb440b08c9b583f1cebc342cef8829aaf +EBUILD vlc-9999.ebuild 13247 BLAKE2B c7290d19ffe01ba299b8c3a9d320f414300fb60bb4536f05e6b4c6aa84fafdbbd787b20378b92386e3d40dab32f0ffbe406aa787d34abdb09f5f383abba67406 SHA512 56e2413f3d4bb15c01e8def45977630bb4280503c99bc47fc4304111d50ec2b63a21c401f559139c8909be182c39df333d216b4b989bfdda55337ac425e3dd1a +MISC metadata.xml 4878 BLAKE2B 9bceb02311f2a36536e92ed03e0bb8b7cc34139246ac40fc8450e1e7a245af4353cf3e8b526e5742a1bd85f3c21f2297bbf767ac38f129745a34d7a5114e2ff0 SHA512 8bcc809e4ea0956819a4802f3b3292dac8f9fed49935c33d6b3f80120998bd16681f2ad0218557f9e7e2989421028fba327caa34a81b5ffc22a321a834182cb1 diff --git a/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch b/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch deleted file mode 100644 index c99d89882478..000000000000 --- a/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/modules/gui/qt/components/simple_preferences.cpp 2018-01-25 17:57:40.000000000 +0100 -+++ b/modules/gui/qt/components/simple_preferences.cpp 2018-03-18 21:08:51.212556781 +0100 -@@ -33,6 +33,7 @@ - #include <vlc_config_cat.h> - #include <vlc_configuration.h> - -+#include <QButtonGroup> - #include <QString> - #include <QFont> - #include <QToolButton> diff --git a/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch b/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch deleted file mode 100644 index fe4eecb8e767..000000000000 --- a/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 49450a4ab90bba8530764c5cdb95d648aeda7d52 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> -Date: Mon, 28 May 2018 18:25:15 +0200 -Subject: [PATCH] qt: Fix build with --disable-vlm -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Fix #20495 - -(cherry picked from commit 44a635bd4ae16fec5295f6f8aee4dd2ffd7e97d8) -Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr> ---- - modules/gui/qt/Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am -index cb77b14d96..c67f4afc13 100644 ---- a/modules/gui/qt/Makefile.am -+++ b/modules/gui/qt/Makefile.am -@@ -191,7 +191,6 @@ nodist_libqt_plugin_la_SOURCES = \ - gui/qt/dialogs/open.moc.cpp \ - gui/qt/dialogs/openurl.moc.cpp \ - gui/qt/dialogs/podcast_configuration.moc.cpp \ -- gui/qt/dialogs/vlm.moc.cpp \ - gui/qt/dialogs/firstrun.moc.cpp \ - gui/qt/dialogs/extensions.moc.cpp \ - gui/qt/dialogs/fingerprintdialog.moc.cpp \ -@@ -445,6 +444,10 @@ EXTRA_DIST += gui/qt/vlc.qrc $(libqt_plugin_la_RES) - - nodist_libqt_plugin_la_SOURCES += gui/qt/resources.cpp - -+if ENABLE_VLM -+nodist_libqt_plugin_la_SOURCES += gui/qt/dialogs/vlm.moc.cpp -+endif -+ - gui/qt/resources.cpp: gui/qt/vlc.qrc $(libqt_plugin_la_RES) - $(AM_V_GEN)$(RCC) -name vlc -o $@ $< - --- -2.11.0 - diff --git a/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch b/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch deleted file mode 100644 index 4431025a21e2..000000000000 --- a/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 26e2d3906658c30f2f88f4b1bc9630ec43bf5525 Mon Sep 17 00:00:00 2001 -From: Shaleen Jain <shaleen@jain.sh> -Date: Sun, 25 Feb 2018 18:42:27 +0530 -Subject: [PATCH] fribidi: update for version 1.0 - -Update functions deprecated in version 1.0 when building with release 1.0 and -above. - -Signed-off-by: Thomas Guillem <thomas@gllm.fr> ---- - modules/text_renderer/freetype/text_layout.c | 24 ++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c -index 13efd567b46..1a28786d097 100644 ---- a/modules/text_renderer/freetype/text_layout.c -+++ b/modules/text_renderer/freetype/text_layout.c -@@ -153,6 +153,9 @@ typedef struct paragraph_t - - #ifdef HAVE_FRIBIDI - FriBidiCharType *p_types; -+#if FRIBIDI_MAJOR_VERSION >= 1 -+ FriBidiBracketType *p_btypes; -+#endif - FriBidiLevel *p_levels; - FriBidiStrIndex *pi_reordered_indices; - FriBidiParType paragraph_type; -@@ -361,6 +364,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter, - #ifdef HAVE_FRIBIDI - p_paragraph->p_levels = vlc_alloc( i_size, sizeof( *p_paragraph->p_levels ) ); - p_paragraph->p_types = vlc_alloc( i_size, sizeof( *p_paragraph->p_types ) ); -+#if FRIBIDI_MAJOR_VERSION >= 1 -+ p_paragraph->p_btypes = vlc_alloc( i_size, sizeof( *p_paragraph->p_btypes ) ); -+#endif - p_paragraph->pi_reordered_indices = - vlc_alloc( i_size, sizeof( *p_paragraph->pi_reordered_indices ) ); - -@@ -398,6 +404,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter, - #ifdef HAVE_FRIBIDI - if( p_paragraph->p_levels ) free( p_paragraph->p_levels ); - if( p_paragraph->p_types ) free( p_paragraph->p_types ); -+#if FRIBIDI_MAJOR_VERSION >= 1 -+ if( p_paragraph->p_btypes ) free( p_paragraph->p_btypes ); -+#endif - if( p_paragraph->pi_reordered_indices ) - free( p_paragraph->pi_reordered_indices ); - #endif -@@ -424,6 +433,9 @@ static void FreeParagraph( paragraph_t *p_paragraph ) - #ifdef HAVE_FRIBIDI - free( p_paragraph->pi_reordered_indices ); - free( p_paragraph->p_types ); -+#if FRIBIDI_MAJOR_VERSION >= 1 -+ free( p_paragraph->p_btypes ); -+#endif - free( p_paragraph->p_levels ); - #endif - -@@ -436,10 +448,22 @@ static int AnalyzeParagraph( paragraph_t *p_paragraph ) - fribidi_get_bidi_types( p_paragraph->p_code_points, - p_paragraph->i_size, - p_paragraph->p_types ); -+#if FRIBIDI_MAJOR_VERSION >= 1 -+ fribidi_get_bracket_types( p_paragraph->p_code_points, -+ p_paragraph->i_size, -+ p_paragraph->p_types, -+ p_paragraph->p_btypes ); -+ fribidi_get_par_embedding_levels_ex( p_paragraph->p_types, -+ p_paragraph->p_btypes, -+ p_paragraph->i_size, -+ &p_paragraph->paragraph_type, -+ p_paragraph->p_levels ); -+#else - fribidi_get_par_embedding_levels( p_paragraph->p_types, - p_paragraph->i_size, - &p_paragraph->paragraph_type, - p_paragraph->p_levels ); -+#endif - - #ifdef HAVE_HARFBUZZ - hb_unicode_funcs_t *p_funcs = hb_unicode_funcs_get_default(); diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml index 3897b001c10d..1e1da8166718 100644 --- a/media-video/vlc/metadata.xml +++ b/media-video/vlc/metadata.xml @@ -39,9 +39,7 @@ <flag name="optimisememory">Enable optimisation for memory rather than performance</flag> <flag name="postproc">Enable image post-processing via libpostproc (part of FFmpeg)</flag> <flag name="projectm">Enable the projectM visualization plugin</flag> - <flag name="rtsp">Enable real audio and RTSP modules</flag> <flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag> - <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec)</flag> <flag name="sdl-image">Enable sdl image video decoder (depends on sdl)</flag> <flag name="sftp">Enable libssh2 to support SFTP file transfer</flag> <flag name="shout">Enable libshout output</flag> diff --git a/media-video/vlc/vlc-3.0.3-r1.ebuild b/media-video/vlc/vlc-3.0.3-r1.ebuild deleted file mode 100644 index be1767efa8e5..000000000000 --- a/media-video/vlc/vlc-3.0.3-r1.ebuild +++ /dev/null @@ -1,500 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-beta/-test}" -MY_P="${PN}-${MY_PV}" -if [[ ${PV} = *9999 ]] ; then - if [[ ${PV%.9999} != ${PV} ]] ; then - EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git" - else - EGIT_REPO_URI="https://git.videolan.org/git/vlc.git" - fi - SCM="git-r3" -else - if [[ ${MY_P} = ${P} ]] ; then - SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" - else - SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" - fi - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 -sparc x86 ~x86-fbsd" -fi -inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM} - -DESCRIPTION="Media player and framework with support for most multimedia files and streaming" -HOMEPAGE="https://www.videolan.org/vlc/" - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5-9" # vlc - vlccore - -IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394 - debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig - +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca - libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications - macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg - omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp - run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg - taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx - wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse -" -REQUIRED_USE=" - chromecast? ( encode ) - directx? ( ffmpeg ) - fontconfig? ( truetype ) - libcaca? ( X ) - libtar? ( skins ) - libtiger? ( kate ) - postproc? ( ffmpeg ) - skins? ( qt5 truetype X xml ) - ssl? ( gcrypt ) - vaapi? ( ffmpeg X ) - vdpau? ( ffmpeg X ) -" -RDEPEND=" - net-dns/libidn:= - sys-libs/zlib:0[minizip] - virtual/libintl:0 - virtual/opengl - a52? ( media-libs/a52dec:0 ) - alsa? ( media-libs/alsa-lib:0 ) - aom? ( media-libs/libaom:= ) - archive? ( app-arch/libarchive:= ) - bidi? ( - dev-libs/fribidi:0 - media-libs/freetype:2[harfbuzz] - media-libs/harfbuzz - virtual/ttf-fonts:0 - ) - bluray? ( media-libs/libbluray:0= ) - cddb? ( media-libs/libcddb:0 ) - chromaprint? ( media-libs/chromaprint:0= ) - chromecast? ( - >=dev-libs/protobuf-2.5.0:= - >=net-libs/libmicrodns-0.0.9:= - ) - dbus? ( sys-apps/dbus:0 ) - dc1394? ( - media-libs/libdc1394:2 - sys-libs/libraw1394:0 - ) - dts? ( media-libs/libdca:0 ) - dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) - dvd? ( - >=media-libs/libdvdnav-4.9:0 - >=media-libs/libdvdread-4.9:0 - ) - faad? ( media-libs/faad2:0 ) - fdk? ( media-libs/fdk-aac:0= ) - ffmpeg? ( - !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) - libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) - ) - flac? ( - media-libs/flac:0 - media-libs/libogg:0 - ) - fluidsynth? ( media-sound/fluidsynth:0 ) - fontconfig? ( media-libs/fontconfig:1.0 ) - gcrypt? ( - dev-libs/libgcrypt:0= - dev-libs/libgpg-error:0 - ) - gme? ( media-libs/game-music-emu:0 ) - gnome-keyring? ( app-crypt/libsecret ) - gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) - ieee1394? ( - sys-libs/libavc1394:0 - sys-libs/libraw1394:0 - ) - jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) - kate? ( media-libs/libkate:0 ) - libass? ( - media-libs/fontconfig:1.0 - media-libs/libass:0= - ) - libcaca? ( media-libs/libcaca:0 ) - libnotify? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libnotify:0 - ) - libsamplerate? ( media-libs/libsamplerate:0 ) - libtar? ( dev-libs/libtar:0 ) - libtiger? ( media-libs/libtiger:0 ) - linsys? ( media-libs/zvbi ) - lirc? ( app-misc/lirc:0 ) - live? ( media-plugins/live:0 ) - lua? ( >=dev-lang/lua-5.1:0 ) - matroska? ( - dev-libs/libebml:0= - media-libs/libmatroska:0= - ) - modplug? ( media-libs/libmodplug:0 ) - mp3? ( media-libs/libmad:0 ) - mpeg? ( media-libs/libmpeg2:0 ) - mtp? ( media-libs/libmtp:0= ) - musepack? ( media-sound/musepack-tools:0 ) - ncurses? ( sys-libs/ncurses:0=[unicode] ) - nfs? ( >=net-fs/libnfs-0.10.0:= ) - ogg? ( media-libs/libogg:0 ) - opencv? ( media-libs/opencv:0= ) - opus? ( >=media-libs/opus-1.0.3:0 ) - png? ( media-libs/libpng:0= ) - postproc? ( libav? ( media-libs/libpostproc:0= ) ) - projectm? ( - media-fonts/dejavu:0 - media-libs/libprojectm:0 - ) - pulseaudio? ( media-sound/pulseaudio:0 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - X? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - ) - ) - rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) - samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) - schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) - sdl-image? ( media-libs/sdl-image:0 ) - sftp? ( net-libs/libssh2:0 ) - shout? ( media-libs/libshout:0 ) - sid? ( media-libs/libsidplay:2 ) - skins? ( - x11-libs/libXext:0 - x11-libs/libXinerama:0 - x11-libs/libXpm:0 - ) - soxr? ( media-libs/soxr ) - speex? ( - >=media-libs/speex-1.2.0:0 - media-libs/speexdsp:0 - ) - srt? ( net-libs/srt ) - ssl? ( net-libs/gnutls:0 ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo:0 - ) - taglib? ( >=media-libs/taglib-1.9:0 ) - theora? ( media-libs/libtheora:0 ) - tremor? ( media-libs/tremor:0 ) - truetype? ( - media-libs/freetype:2 - virtual/ttf-fonts:0 - !fontconfig? ( media-fonts/dejavu:0 ) - ) - twolame? ( media-sound/twolame:0 ) - udev? ( virtual/udev:0 ) - upnp? ( net-libs/libupnp:= ) - v4l? ( media-libs/libv4l:0 ) - vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) - vdpau? ( x11-libs/libvdpau:0 ) - vnc? ( net-libs/libvncserver:0 ) - vorbis? ( media-libs/libvorbis:0 ) - vpx? ( media-libs/libvpx:0= ) - wayland? ( - || ( - >=dev-libs/wayland-1.15 - ( - <dev-libs/wayland-1.15 - <media-libs/mesa-18.1.1-r1[egl] - ) - ) - dev-libs/wayland-protocols - ) - X? ( - x11-libs/libX11 - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-keysyms - ) - x264? ( media-libs/x264:0= ) - x265? ( media-libs/x265:0= ) - xml? ( dev-libs/libxml2:2 ) - zeroconf? ( net-dns/avahi:0[dbus] ) - zvbi? ( media-libs/zvbi ) -" -DEPEND="${RDEPEND} - >=sys-devel/gettext-0.19.8:* - virtual/pkgconfig:* - amd64? ( dev-lang/yasm:* ) - x86? ( dev-lang/yasm:* ) - X? ( x11-base/xorg-proto ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system - "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460 - "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 - "${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream - "${FILESDIR}"/${P}-fix-disable-vlm.patch # bug 649798 - "${FILESDIR}"/${P}-fribidi-1.patch # bug 662662 -) - -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - has_version '>=net-libs/libupnp-1.8.0' && \ - eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch - - # Bootstrap when we are on a git checkout. - if [[ ${PV} = *9999 ]] ; then - ./bootstrap - fi - - # Make it build with libtool 1.5 - rm m4/lt* m4/libtool.m4 || die - - # We are not in a real git checkout due to the absence of a .git directory. - touch src/revision.txt || die - - # Don't use --started-from-file when not using dbus. - if ! use dbus ; then - sed -i 's/ --started-from-file//' share/vlc.desktop.in || die - fi - - # Disable running of vlc-cache-gen, we do that in pkg_postinst - sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ - -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" - - eautoreconf - - # Disable automatic running of tests. - find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die -} - -src_configure() { - local myeconfargs=( - --disable-aa - --disable-dependency-tracking - --disable-optimizations - --disable-update-check - --enable-fast-install - --enable-screen - --enable-vcd - --enable-vlc - $(use_enable a52) - $(use_enable alsa) - $(use_enable altivec) - $(use_enable aom) - $(use_enable archive) - $(use_enable bidi fribidi) - $(use_enable bidi harfbuzz) - $(use_enable bluray) - $(use_enable cddb libcddb) - $(use_enable chromaprint) - $(use_enable chromecast) - $(use_enable chromecast microdns) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable dbus) - $(use_enable dbus kwallet) - $(use_enable dc1394) - $(use_enable debug) - $(use_enable directx) - $(use_enable directx d3d11va) - $(use_enable directx dxva2) - $(use_enable dts dca) - $(use_enable dvbpsi) - $(use_enable dvd dvdnav) - $(use_enable dvd dvdread) - $(use_enable encode sout) - $(use_enable encode vlm) - $(use_enable faad) - $(use_enable fdk fdkaac) - $(use_enable ffmpeg avcodec) - $(use_enable ffmpeg avformat) - $(use_enable ffmpeg swscale) - $(use_enable flac) - $(use_enable fluidsynth) - $(use_enable fontconfig) - $(use_enable gcrypt libgcrypt) - $(use_enable gme) - $(use_enable gnome-keyring secret) - $(use_enable gstreamer gst-decode) - $(use_enable ieee1394 dv1394) - $(use_enable jack) - $(use_enable jpeg) - $(use_enable kate) - $(use_enable libass) - $(use_enable libcaca caca) - $(use_enable libnotify notify) - $(use_enable libsamplerate samplerate) - $(use_enable libtar) - $(use_enable libtiger tiger) - $(use_enable linsys) - $(use_enable lirc) - $(use_enable live live555) - $(use_enable lua) - $(use_enable macosx-notifications osx-notifications) - $(use_enable macosx-qtkit) - $(use_enable matroska) - $(use_enable modplug mod) - $(use_enable mp3 mad) - $(use_enable mpeg libmpeg2) - $(use_enable mtp) - $(use_enable musepack mpc) - $(use_enable ncurses) - $(use_enable neon) - $(use_enable ogg) - $(use_enable omxil) - $(use_enable omxil omxil-vout) - $(use_enable opencv) - $(use_enable optimisememory optimize-memory) - $(use_enable opus) - $(use_enable png) - $(use_enable postproc) - $(use_enable projectm) - $(use_enable pulseaudio pulse) - $(use_enable qt5 qt) - $(use_enable rdp freerdp) - $(use_enable rtsp realrtsp) - $(use_enable run-as-root) - $(use_enable samba smbclient) - $(use_enable schroedinger) - $(use_enable sdl-image) - $(use_enable sftp) - $(use_enable shout) - $(use_enable sid) - $(use_enable skins skins2) - $(use_enable soxr) - $(use_enable speex) - $(use_enable srt) - $(use_enable ssl gnutls) - $(use_enable svg) - $(use_enable svg svgdec) - $(use_enable taglib) - $(use_enable theora) - $(use_enable tremor) - $(use_enable twolame) - $(use_enable udev) - $(use_enable upnp) - $(use_enable v4l v4l2) - $(use_enable vaapi libva) - $(use_enable vdpau) - $(use_enable vnc) - $(use_enable vorbis) - $(use_enable vpx) - $(use_enable wayland) - $(use_enable wma-fixed) - $(use_with X x) - $(use_enable X xcb) - $(use_enable X xvideo) - $(use_enable x264) - $(use_enable x265) - $(use_enable xml libxml2) - $(use_enable zeroconf avahi) - $(use_enable zvbi) - $(use_enable !zvbi telx) - --disable-asdcp - --disable-coverage - --disable-cprof - --disable-crystalhd - --disable-decklink - --disable-gles2 - --disable-goom - --disable-kai - --disable-kva - --disable-libplacebo - --disable-maintainer-mode - --disable-merge-ffmpeg - --disable-mfx - --disable-mmal - --disable-opensles - --disable-oss - --disable-rpi-omxil - --disable-shine - --disable-sndio - --disable-spatialaudio - --disable-vsxu - --disable-wasapi - ) - # ^ We don't have these disabled libraries in the Portage tree yet. - - # Compatibility fix for Samba 4. - use samba && append-cppflags "-I/usr/include/samba-4.0" - - if use x86; then - # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 - append-cflags $(test-flags-CC -fno-stack-check) - # Bug 569774 - replace-flags -Os -O2 - fi - - # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 - append-cxxflags -std=c++11 - - # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" - - xdg_environment_reset # bug 608256 - - if use truetype || use bidi; then - myeconfargs+=( --enable-freetype ) - else - myeconfargs+=( --disable-freetype ) - fi - - if use truetype || use projectm; then - local dejavu="/usr/share/fonts/dejavu/" - myeconfargs+=( - --with-default-font=${dejavu}/DejaVuSans.ttf - --with-default-font-family=Sans - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace - ) - fi - - econf ${myeconfargs[@]} - - # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values may break the build (bug 523144), so definition should not be removed. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h - sed -i '1i#undef _FORTIFY_SOURCE' config.h || die -} - -src_test() { - virtx emake check-TESTS -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then - einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" - "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" - else - ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" - ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" - ewarn "If you do not do it, vlc will take a long time to load." - fi - - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then - rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" - fi - - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-video/vlc/vlc-3.0.4.ebuild b/media-video/vlc/vlc-3.0.4.ebuild index 21bbaf080711..44f97c55f69a 100644 --- a/media-video/vlc/vlc-3.0.4.ebuild +++ b/media-video/vlc/vlc-3.0.4.ebuild @@ -19,7 +19,7 @@ else else SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" fi - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd" + KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 -sparc x86 ~x86-fbsd" fi inherit autotools flag-o-matic gnome2-utils toolchain-funcs virtualx xdg-utils ${SCM} @@ -35,7 +35,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 - rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl + rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse " @@ -163,7 +163,6 @@ RDEPEND=" ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) - schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) @@ -355,7 +354,6 @@ src_configure() { $(use_enable rdp freerdp) $(use_enable run-as-root) $(use_enable samba smbclient) - $(use_enable schroedinger) $(use_enable sdl-image) $(use_enable sftp) $(use_enable shout) @@ -407,6 +405,7 @@ src_configure() { --disable-opensles --disable-oss --disable-rpi-omxil + --disable-schroedinger --disable-shine --disable-sndio --disable-spatialaudio diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index c06e6f61f05c..793f7690453d 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -35,7 +35,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 - rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl + rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse " @@ -164,7 +164,6 @@ RDEPEND=" ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) - schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) @@ -358,7 +357,6 @@ src_configure() { $(use_enable rdp freerdp) $(use_enable run-as-root) $(use_enable samba smbclient) - $(use_enable schroedinger) $(use_enable sdl-image) $(use_enable sftp) $(use_enable shout) @@ -411,6 +409,7 @@ src_configure() { --disable-opensles --disable-oss --disable-rpi-omxil + --disable-schroedinger --disable-shine --disable-sndio --disable-spatialaudio diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index f38f3b52ffb8..0f094ec3e453 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -35,7 +35,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 - rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl + rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse " @@ -165,7 +165,6 @@ RDEPEND=" ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) - schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) @@ -360,7 +359,6 @@ src_configure() { $(use_enable rdp freerdp) $(use_enable run-as-root) $(use_enable samba smbclient) - $(use_enable schroedinger) $(use_enable sdl-image) $(use_enable sftp) $(use_enable shout) @@ -412,6 +410,7 @@ src_configure() { --disable-opensles --disable-oss --disable-rpi-omxil + --disable-schroedinger --disable-shine --disable-sndio --disable-spatialaudio diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest index f9d3af7cc19a..7162b0df7102 100644 --- a/media-video/webcamoid/Manifest +++ b/media-video/webcamoid/Manifest @@ -1,3 +1,4 @@ +AUX webcamoid-8.1.0-ffmpeg-4.patch 7369 BLAKE2B 64c7e45b9b8b29efe6982dff8205eb30d51fbbca751fed9afca0644d571c2a99b9151130f90c7fbe3cc20d08b40ed5585cdd34e59cf405c71fd89e6b9fcf294d SHA512 0e91d8e5b85972ccb057ef56a847e8dbe48f09eaea6de3cb37a483f04dc2a79379ca847ce3e13701ff33b697e02db46c1786d79198f4476279e296acdf314d8e DIST webcamoid-8.1.0.tar.gz 10062681 BLAKE2B e9501ace9ba42abdae4be4e9e689329b02796198fe2610ef3a404535d389a6aa7a7e540148548dd63ea6ba78c9b650b30f5497396e49b37d7ab06ca8708ad056 SHA512 6db53ed29288889c05955967d961b53fa0e4171aeed12cd1557829c26bb2e2031804319fcead4c5b888a695cfd84f531a27f992be56c38366076ff2945ec2dbb -EBUILD webcamoid-8.1.0.ebuild 2150 BLAKE2B 07cccb730dafc0d1f576b38b3fc2896632ef651cc7774281948fc77d61fb31274a210ad8444da1d35acccb61e54f8d1eaa3bcf1624290053bc50cd31e7025797 SHA512 47b736f8fe4671f0bfa75a4b030eeae211a3bd36c69e4914d0db001cf1ba4a5a24c6848a6cb1bb8f47558e6764bb9f2f5cf6c6244e1916213ff2f06ff2dde449 +EBUILD webcamoid-8.1.0.ebuild 2194 BLAKE2B 56f685e00f74290e2d0e33c9551cd4a593fe7c8046479accc573b97396ae1845fdcbc3e0a4b3dc0c8332219699201c2bfe2493c8f5fc8889d9a92798f20ca664 SHA512 c6659577f769026b918c97f215ecbc7c9426b8243fcd06a69cae7ac21931b0f79189facd7011893347fcc6566d708f3db451c5e4da38964bb9ae1ff4d2bc61e7 MISC metadata.xml 784 BLAKE2B ce617d4a9bcbf3f8e4ce651fd673bf3c0015e13bc8814d4b4e97eaa4a6c5428553d4a314054315fd3dc8a6b1362b4a322a4af78745f3c3d2378e2e731bdc9ef9 SHA512 6518965213e9deffdb6163243865c9e37ec0a14b6e83558761ff27ad7984003be1b6c6518d455631cd2af29f663b6e91f60dd061151e63b3a4f5ad73e35df5cf diff --git a/media-video/webcamoid/files/webcamoid-8.1.0-ffmpeg-4.patch b/media-video/webcamoid/files/webcamoid-8.1.0-ffmpeg-4.patch new file mode 100644 index 000000000000..005d45255d32 --- /dev/null +++ b/media-video/webcamoid/files/webcamoid-8.1.0-ffmpeg-4.patch @@ -0,0 +1,169 @@ +Description: Patch to build with FFmpeg 4.0 + https://github.com/webcamoid/webcamoid/pull/119/ + commits/52fbf8376085aded2d87397be58cda6e209d3bb7 +Author: https://github.com/webcamoid/webcamoid/commits?author=jbeich +Reviewed-By: Herbert Parentes Fortes Neto <hpfn@debian.org> +Last-Update: 2018-07-21 +Index: webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.cpp +=================================================================== +--- webcamoid.orig/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.cpp ++++ webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.cpp +@@ -62,7 +62,7 @@ AbstractStream::AbstractStream(const AVF + + // Some formats want stream headers to be separate. + if (formatContext->oformat->flags & AVFMT_GLOBALHEADER) +- this->m_codecContext->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ this->m_codecContext->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + this->m_codecContext->strict_std_compliance = CODEC_COMPLIANCE; + +Index: webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.h +=================================================================== +--- webcamoid.orig/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.h ++++ webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.h +@@ -29,6 +29,15 @@ extern "C" + { + #include <libavformat/avformat.h> + #include <libavcodec/avcodec.h> ++ #ifndef AV_CODEC_CAP_EXPERIMENTAL ++ #define AV_CODEC_CAP_EXPERIMENTAL CODEC_CAP_EXPERIMENTAL ++ #endif ++ #ifndef AV_CODEC_CAP_VARIABLE_FRAME_SIZE ++ #define AV_CODEC_CAP_VARIABLE_FRAME_SIZE CODEC_CAP_VARIABLE_FRAME_SIZE ++ #endif ++ #ifndef AV_CODEC_FLAG_GLOBAL_HEADER ++ #define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER ++ #endif + } + + #define CODEC_COMPLIANCE FF_COMPLIANCE_VERY_STRICT +Index: webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/audiostream.cpp +=================================================================== +--- webcamoid.orig/libAvKys/Plugins/MultiSink/src/ffmpeg/src/audiostream.cpp ++++ webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/audiostream.cpp +@@ -267,7 +267,7 @@ void AudioStream::convertPacket(const Ak + this->deleteFrame(&this->m_frame); + this->m_frame = oFrame; + +- if (codecContext->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE ++ if (codecContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE + || oFrame->nb_samples >= codecContext->frame_size) { + this->m_frameReady.wakeAll(); + } +@@ -280,7 +280,7 @@ int AudioStream::encodeData(AVFrame *fra + auto codecContext = this->codecContext(); + + if (!frame +- && codecContext->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) ++ && codecContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) + return AVERROR_EOF; + + if (frame) { +@@ -366,7 +366,7 @@ AVFrame *AudioStream::dequeueFrame() + this->m_frameMutex.lock(); + + if (!this->m_frame +- || (!(codecContext->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) ++ || (!(codecContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) + && this->m_frame->nb_samples < codecContext->frame_size)) { + if (!this->m_frameReady.wait(&this->m_frameMutex, THREAD_WAIT_LIMIT)) { + this->m_frameMutex.unlock(); +@@ -377,7 +377,7 @@ AVFrame *AudioStream::dequeueFrame() + + AVFrame *oFrame = nullptr; + +- if (codecContext->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE ++ if (codecContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE + || this->m_frame->nb_samples == codecContext->frame_size) { + oFrame = this->m_frame; + this->m_frame = nullptr; +Index: webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/videostream.cpp +=================================================================== +--- webcamoid.orig/libAvKys/Plugins/MultiSink/src/ffmpeg/src/videostream.cpp ++++ webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/videostream.cpp +@@ -273,8 +273,10 @@ int VideoStream::encodeData(AVFrame *fra + { + auto formatContext = this->formatContext(); + ++#ifdef AVFMT_RAWPICTURE + if (!frame && formatContext->oformat->flags & AVFMT_RAWPICTURE) + return AVERROR_EOF; ++#endif + + auto codecContext = this->codecContext(); + +@@ -300,6 +302,7 @@ int VideoStream::encodeData(AVFrame *fra + + auto stream = this->stream(); + ++#ifdef AVFMT_RAWPICTURE + if (formatContext->oformat->flags & AVFMT_RAWPICTURE) { + // Raw video case - directly store the picture in the packet + AVPacket pkt; +@@ -315,6 +318,7 @@ int VideoStream::encodeData(AVFrame *fra + + return 0; + } ++#endif + + // encode the image + #ifdef HAVE_SENDRECV +Index: webcamoid/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/abstractstream.cpp +=================================================================== +--- webcamoid.orig/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/abstractstream.cpp ++++ webcamoid/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/abstractstream.cpp +@@ -96,8 +96,10 @@ AbstractStream::AbstractStream(const AVF + this->m_codecContext->idct_algo = FF_IDCT_AUTO; + this->m_codecContext->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; + ++#ifdef CODEC_FLAG_EMU_EDGE + if (this->m_codec->capabilities & CODEC_CAP_DR1) + this->m_codecContext->flags |= CODEC_FLAG_EMU_EDGE; ++#endif + + av_dict_set(&this->m_codecOptions, "refcounted_frames", "0", 0); + } +Index: webcamoid/libAvKys/Plugins/VideoCapture/src/ffmpeg/src/convertvideoffmpeg.cpp +=================================================================== +--- webcamoid.orig/libAvKys/Plugins/VideoCapture/src/ffmpeg/src/convertvideoffmpeg.cpp ++++ webcamoid/libAvKys/Plugins/VideoCapture/src/ffmpeg/src/convertvideoffmpeg.cpp +@@ -19,6 +19,10 @@ + + #include <QMetaEnum> + ++#ifndef AV_CODEC_FLAG_TRUNCATED ++#define AV_CODEC_FLAG_TRUNCATED CODEC_FLAG_TRUNCATED ++#endif ++ + #include "convertvideoffmpeg.h" + + #define THREAD_WAIT_LIMIT 500 +@@ -219,11 +223,13 @@ bool ConvertVideoFFmpeg::init(const AkCa + if (!this->m_codecContext) + return false; + +- if (codec->capabilities & CODEC_CAP_TRUNCATED) +- this->m_codecContext->flags |= CODEC_FLAG_TRUNCATED; ++ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ this->m_codecContext->flags |= AV_CODEC_FLAG_TRUNCATED; + ++#ifdef CODEC_FLAG_EMU_EDGE + if (codec->capabilities & CODEC_CAP_DR1) + this->m_codecContext->flags |= CODEC_FLAG_EMU_EDGE; ++#endif + + this->m_codecContext->pix_fmt = rawToFF->value(fourcc, AV_PIX_FMT_NONE); + this->m_codecContext->width = caps.property("width").toInt(); +Index: webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/mediawriterffmpeg.cpp +=================================================================== +--- webcamoid.orig/libAvKys/Plugins/MultiSink/src/ffmpeg/src/mediawriterffmpeg.cpp ++++ webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/mediawriterffmpeg.cpp +@@ -251,7 +251,7 @@ class MediaWriterFFmpegGlobal + AVCodec *codec = nullptr; + + while ((codec = av_codec_next(codec))) { +- if (codec->capabilities & CODEC_CAP_EXPERIMENTAL ++ if (codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL + && CODEC_COMPLIANCE > FF_COMPLIANCE_EXPERIMENTAL) + continue; + diff --git a/media-video/webcamoid/webcamoid-8.1.0.ebuild b/media-video/webcamoid/webcamoid-8.1.0.ebuild index 50eb5018b024..0069489ecf2d 100644 --- a/media-video/webcamoid/webcamoid-8.1.0.ebuild +++ b/media-video/webcamoid/webcamoid-8.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -50,6 +50,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( "${FILESDIR}/${P}-ffmpeg-4.patch" ) + src_prepare() { local tsdir="${S}/StandAlone/share/ts" local mylrelease="$(qt5_get_bindir)"/lrelease |