diff options
| author |   Christophe Lermytte <gentoo@lermytte.be> | 2022-05-18 00:58:49 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-05-22 21:46:06 +0100 |
| commit | 0d64bbacf95adb79fc62ac4f52e2fedfbd594d07 (patch) | |
| tree | f5116c10bc0bc01ba1733658a8e37a05caa1ba64 /media-libs/opencv | |
| parent | dev-util/clazy: stabilize 1.11-r1 for x86 (diff) | |
| download | gentoo-0d64bbacf95adb79fc62ac4f52e2fedfbd594d07.tar.gz gentoo-0d64bbacf95adb79fc62ac4f52e2fedfbd594d07.tar.bz2 gentoo-0d64bbacf95adb79fc62ac4f52e2fedfbd594d07.zip | |
media-libs/opencv: add upstream patch to support ffmpeg-5
Tested with both ffmpeg-4.4.2 and ffmpeg-5.0.1
Closes: https://bugs.gentoo.org/831485
Thanks-to: cyrillic <cyrilmaley@hotmail.com>
Signed-off-by: Christophe Lermytte <gentoo@lermytte.be>
Closes: https://github.com/gentoo/gentoo/pull/25543
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/opencv')
| -rw-r--r-- | media-libs/opencv/Manifest | 1 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-4.5.5-r1.ebuild | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index cf43ea8cfd9e..7bb0c71f3335 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -1,6 +1,7 @@ DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b66e76a561fd625e112face427d001185f8d7c0eaace55adbd8474663021841a1382bfe393a210e64c51223441713cdb9156fac866a845c SHA512 2cd29ce42c08b2966db3ef4a2bc217ab3d07051819757ec6de8f3deea29e28f60abab39f101dba03f766f17018598e411bd687a7eaab0c681c113e10a2de2b23 DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e +DIST opencv-4.5.5-fix-build-with-ffmpeg5.patch 39562 BLAKE2B ede6cb0c8f96af1d91696bc8cd011b449100ab7eccd45ae7dfe209ffc55b773cd219e82ba7afbac95239624475041d4cf87861c0d8c9f7f99999a74acf001bc2 SHA512 597c45615434411e9148c6cd88da5017cee6dff858a01f9706ae76a910e27144b67aa3033465a8f1f768a4096db7016b3f6d3b248a7c21c00af757302ba2e3a5 DIST opencv-4.5.5.tar.gz 89879893 BLAKE2B 6f2ce34b33132ad544d661417f730e17aedfbe17a22048ad0b8d287970626756c51309410d0fb5bf487af773ff4415d36b6768158ebc3cb963b37bb888ee4ba6 SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02 DIST opencv-4.5.5_contrib.tar.gz 60563220 BLAKE2B 4a020824688e379f1d127fb834b0008b3cbf78acea4847cb4994e9e0b6ddfeec3f06867967b8546725cf050c1fd0df042a18caff80463ad101cf14dc66daea9a SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r1.ebuild index e3d2e5a3efbe..c91d39563697 100644 --- a/media-libs/opencv/opencv-4.5.5-r1.ebuild +++ b/media-libs/opencv/opencv-4.5.5-r1.ebuild @@ -11,6 +11,7 @@ DESCRIPTION="A collection of algorithms and sample code for various computer vis HOMEPAGE="https://opencv.org" TINY_DNN_PV="1.0.0a3" SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/opencv/opencv/commit/5440fd6cb43ea65a056c46b691fcdab1a425e92d.patch -> ${PN}-4.5.5-fix-build-with-ffmpeg5.patch dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz ) contrib? ( @@ -291,6 +292,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch + "${DISTDIR}"/${PN}-4.5.5-fix-build-with-ffmpeg5.patch ) pkg_pretend() { |