diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/vlc/Manifest | 27 | ||||
| -rw-r--r-- | media-video/vlc/files/opencv-3.0.0.patch | 12 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.1.5-r1.ebuild | 5 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.2.1.ebuild | 5 |
5 files changed, 36 insertions, 20 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 343d132a1c41..90c19fd37eda 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.962 2015/07/24 15:53:07 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.963 2015/07/29 09:54:11 idella4 Exp $ + + 29 Jul 2015; Ian Delaney <idella4@gentoo.org> +files/opencv-3.0.0.patch, + vlc-2.1.5-r1.ebuild, vlc-2.2.1.ebuild: + patch to address missed header file in opencv, patch from upstream instigated + by maintainer submitted via bug #554562 24 Jul 2015; Anthony G. Basile <blueness@gentoo.org> vlc-2.2.1.ebuild: Keyword ~ppc. Bug #548966. diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 25d055643bf9..2385155359ef 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX opencv-3.0.0.patch 532 SHA256 1ad7dfb7e9aaf258f44fb22e41697147e5905bd48a38694e19500c44b4a431ed SHA512 b5bcf432e2fd17e39d0f07d98e64fd3b4bf12d8d2e52e54eb085d6fa823470c30fee4fba7a717bbc6539f977a9adddcc58005fbf6fd0955875a972b553a71a0e WHIRLPOOL 17a0fe373184067711dff8d4162b68abea9191378efc69c4d8fede4e5d5987abb1f9e56ef8e963e2c6c87934a27c0e3dcd907131aed7849f7d014757acc4aaf5 AUX qt4-select.patch 2244 SHA256 e0ca0c6740feb08f12ac3f511d0068471726233af5445834d1983835214698d5 SHA512 452ef91aff373f43416df5a3d5448b042beb3259b6a6ecccba905294311a63c08601de0226e23b35e4392f3ceda1d5b0f15d9e1c9c3731a038b7bef17b11b5a1 WHIRLPOOL 84205847d6d9758f4bf68db71a0d68e8f0f473f1c29f06abc45e36b84379f7fe3ea61a9225235c9d3e5e259d83003bc23c19f7a8fb28e0f6e5091db21704eb71 AUX vlc-2.1-mem_undefined_functions.patch 561 SHA256 d10c70d249bc795374b52e94bba53fcf2ca524c7d2f918b3ebb5467b1c2cbf33 SHA512 4a9cd18e8f552f9f469d5ff56c09e826e4b16c13f4702bd2d096ac3ff1ff17b4ad92aecd0fb553e8c1c0d7db99f8f2ec1920a1f34f497864338b215cc88f24e7 WHIRLPOOL caf9ce29af9b0e4234918f7e0a59f71e0d713fc27e3e45db59a0b3f913b29c2aaab1eaeb8a564170d71e4a4f3424902bb1278511d2add88c0a63c871ca901429 AUX vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch 700 SHA256 91752f1ed1fbe8a2fcc78336a0725e1450946bab8085a4efce85a076dff40b87 SHA512 c3aa82ba9252f87d8f87c0bbfed7e0cdbd93c4f454e0ca6a9d73346e2efa294864af7eea1ea76b504354fb1baf5378cf626b35dcbfba3d888dbf0168ddfbed13 WHIRLPOOL 87c5017c8cdc1ad8cb313b6342f89af7ca7e90b20f151dd226ad8863407dae4cefb5934040154020778d3eb5dc78c5be43ae1e8e33fd0e823628c69c8cac7e61 @@ -14,29 +15,21 @@ AUX vlc-9999-libva-1.2.1-compat.patch 291 SHA256 54eb34b32afe6876fa40abac2cb9709 DIST vlc-2.1.5.tar.xz 19574208 SHA256 6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 SHA512 37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32 WHIRLPOOL c13098f922c7b24f3c718e88807a7dcb656af21bcf2be63d2ec7401583680658bd371e3935ba22537857861e0b1b0c4f0e693c87ed20999c679b4a04cddf7008 DIST vlc-2.2.0.tar.xz 20861760 SHA256 5e0a27e248c47da723a696420aca3a4dd15cc3ed8cc81618d3f1dc8661b25517 SHA512 41162ff2dcc35edb47721c5a0f5d1346a0bcf3099c641e317ca1ce50baadeec3eef38f10355396a82e029474f6decd1e4355bbf218cadb795ccad3ff81a585bb WHIRLPOOL 83777143ef84177fffb1e034e47012bfe4ac2355883f64d3932dcf0c3edf237d858016523a886d00934da441ae2e7b635dc4111b0fb368083d4b71c43d00f695 DIST vlc-2.2.1.tar.xz 20940288 SHA256 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb SHA512 91cd33ac61ebe376c24b3cc0d1dc52d7765fdccbd17e75abbbbf38f52b400e0269dc48f34ed558bff7ec1dd52c4f27098012709a3eb9fe7e8aad1069516de5de WHIRLPOOL 5c889fc5c0137f022b0b3408a5252668a1a946ed45677bb97bbbf0ec14c9411c24e8d1587e987391596774aaf7f1e4592c55b0c0f76742e84296bbfffb08e885 -EBUILD vlc-2.1.5-r1.ebuild 15387 SHA256 97a50e19ac49cb4c9dcc6853fdceec04e4f00c1f856dbbcef1763852cd7c94ab SHA512 421f017215367523e62cac6ad89931449f76a78d439fb89b44e9a4088d6a199baddb4ffcef0726bcc94968540407ec993a9e560c53f38f1d547152cd17b4b3cf WHIRLPOOL cce9190e813c6b34fe8fde31061d98e526eeb61e06522978c3401b03b92095143e2d201c95e098dd03f61c7ac12d7fdc8e5a2d437e1861c9293a756fad427245 +EBUILD vlc-2.1.5-r1.ebuild 15493 SHA256 04c88debead144759f703bbfcf0c898bb8eaf42c72cb4a7dae402ad51a4eee44 SHA512 b02d5608e1ae2a19e152db9b72b89735f523cda4085fd28813382335e0a6ef7f98c371f2d29b14469c38fe96f402fd0bd3c7169d3fe2daca1d5c0ffdfc948b98 WHIRLPOOL 7edc2f5313c89183ab1d212c393ddc74ac6b0ef51b29a902d45eb47f6a1bdecc17ceb2603e3425425e1309278d2354351ab837bd566db0725ea8c1c4d4e1e97a EBUILD vlc-2.1.9999.ebuild 15308 SHA256 9ad081efa162ae762eaaef79510ce450ec12460fb11c864d25542828c387d925 SHA512 83864352df405eb3872a8fc3d546c91114e5fc7cbb74ed767d94ce4299787dde8fe8ee97c26fef1597809b524e7ce7a49dfd95774e3424e87ab64f122144de8b WHIRLPOOL c52b17f248cf34e86a4a469662d674ea8b223386a152488747b75a67bf8b0d1e0c6e4a8dfefab4aa7be5c804608a73be0eba539009d13ad31bc286efa0635620 EBUILD vlc-2.2.0.ebuild 15682 SHA256 07e27218f88b435aeba897f7ea7297b341084026d1ae73939508ee06420a63a1 SHA512 e1314a17a89f933a6bbcb592d7057d5fbf72e19c95bdbe62750249a8a6172e7fe07d748eca304094d546532c0c67369d18031325ab0d9f1c3274f963ee988653 WHIRLPOOL c64c3217d222942115601c7bb1f610f1a25900d8bfcb0b0765fffa902a4f0fccd0ecd3df878e6f3e81f933da5d05e752c4a2078d9c4e82b4b70211c5aa2fe344 -EBUILD vlc-2.2.1.ebuild 15799 SHA256 7333a68566ab9fb0f7bfa690b4366bdf64fbe0a7b0189bdb8deef9d76e4c4896 SHA512 7936eab7f76bfe528f4a13c7f1cfc59cd456bc0845c1e27c4e2df14a9e6fa87d478247480c467fbfa00ea1395044ce31cb7d2eff7a304fd4e525b9cde54b5ed7 WHIRLPOOL 6923aaf38edd1262279fd91f8c78d36970b683f49cdae297d1412f8af508ccf4ba87b4cf350599a8a0e8566146ebdb9e4f3eb7611e87572576736aec8758ff4b +EBUILD vlc-2.2.1.ebuild 15899 SHA256 8dbbdbc90ed67dbddb8b123747587574d1abb67fc625282e940df2ed4f49f720 SHA512 cedd24090baede867fae71f822687469ac89f5fa774c524a51ecd6e8a3cce68ecb906d4f849481c2fedfba46312df0ac98b8835ebf2432ec6c41dc2e9307e66c WHIRLPOOL 33a8e937f4608da88d221ca345c5290b96c0c6eb977d41108c59a74aa65b6306a6da9746854134dcf9d5867c701662e3996e991f070561cc765c61d3efbcd4b6 EBUILD vlc-2.2.9999.ebuild 15474 SHA256 3b1aa9e84996ffb6da6dbd41a0701f717c67a8aa1c4a87a8bb9c1f664c73614c SHA512 a789432050840d938b7381f0a68692153071cebecac94ab8b0bc2a9fb3537420563d447b8cf73e43467bfae258f79078585412e8dde8dd747d411b72aea01fa3 WHIRLPOOL ee247cfb87ee7e56b635f1ebccdf686fec23cca95484131685153d96d151eeb16742b05561d79b7043f29f9f31a0865086169e96f4662fc1e442ec9522b98236 EBUILD vlc-9999.ebuild 15475 SHA256 41246c9292e78d65ef6c8623af53f8148468a571b669d790a9303acdab6ea838 SHA512 04abec25e7e29374c1c0dddecbffb88a969fd7958e257b07535831da9659a4e3aeb4ad7091a1e3b3910148fd3194580d428174cea43ba23d63764cc5c2347ea8 WHIRLPOOL 79cc148eb34918931ae5205485c5cadbc05910148eff4bfc4bff8210b2dbb751057c103adb07ed67ab9c717e4646da9a0e552172c7685230110e27982612f658 -MISC ChangeLog 39129 SHA256 d64f2f08eaf4baf2493dd43fb1de8cb27bad4cbfe0e17ed2ebec6084fad65b26 SHA512 c35cb0f8314011bfa81f3d5bbdc0f22c933753586b5e9ffb11c8f13a6fe57423f99a441b5407945615abdf143449da13314204e5eb8cbe2ddb7b610608f31156 WHIRLPOOL f79bee0edb95b9fed4ebe099c1ead0121bc2f09e19b4211592c15d03d8964877177d4cb23c62676f566a16fa0d3208ea4418fbd4d7a2889616cc833f85006d79 +MISC ChangeLog 39367 SHA256 d9a2012ec353502b05977c190ed321f2c912e42f8fb46fc74841ab804a8f3afd SHA512 4c6d7f2eac460ffb22dc4c51bb28406ea3e2b24ac25601149441288fb2ab7b7bcca3c6ef0514b0da23c236625831352e0ab39242fca87c07eee242b175a27f90 WHIRLPOOL 40f38d620ec15e07e4da6ef5100c11c01c4b45f8184ea54530053dbce5e407a13ba6b623788a22c937550a39036b2f06f53554b751530b8cd1cf539978a44c57 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe MISC metadata.xml 6538 SHA256 cee37b9633b574305f8c07a19d7eee2d4362bd6de51822f98b7f150367ee5fe1 SHA512 29e8b36e5e4c89fdeb7cd3a9e9014a03855540d5b8246172febd4a5465cb50030187366c4d2c982115b08e0cd71e72e9dca7d49fd6ab8f263ad5b718df392345 WHIRLPOOL f15ca39b118e250412484a3be271f3eb2f476430e4957c77596cb11ca51752b80410e820adb559409dfd43fc631fc3262c87ac3f3ba2e4e8c53eb75c5a3baa8e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.1 -iQIcBAEBCAAGBQJVsmAgAAoJEJOE+m71LUu6+SYP/jW8BQFvZXKnchhGXgIDfXv/ -APERphMeaoA9Ge9c5xWcvbuUsZSU5uymTYPXDfA4FUdEh5yzMdwURHH5vU7fj/H+ -pBPlxMG3U7JCj+mXeBkb0Etp9VNU9NixVmC8XMNZ2LUAFI6JZKgosdfz/GU2Y46n -UnmOKon5KNQnFyfNlMLhIjpZB7NJ8SR+iz5UN85sConUtljpZ238ZyRhrI+PY+Yt -3ilxvBP4SThoRjBdW4KCxLMxVPsV/YBOuEfpjpjn840U+7/YpBvfw+9PPx6jiPUL -Du38KxfS7Ci7KAumST0yg2gN/8aaXKpTAUhz2+sEkJEcgS6mlaxt/HcRRbxsudBf -E0mXMsN28LunwPrUwIFdcduYvYkMHs2M2nS02OFxCfAbIWgwRoZhkzNn9SaqdyJz -LpzUD+u1t4MRT0G6R8xxPpoHwxm3f39Tp9uv9DA/VGUAlieunZN5odmRFL8/uWgc -5J5RCpdVb0DRmS0DRBMEhC860W3FuyhE4wYXwYX9lAy7nQEIADIMQepCnx7drlCH -zYSDznauUfd44fi02egYjfeoL3WmMh7v677s51G+gA2TAwpAck4Fv8AzWQcMVonE -EQFURunQ4jEhT1UWXRWXa3yeSKG+oUp9f2sCUvf0UyUzghLgXkhzxPvNAX77ez3r -1H6gDfIq4+m0ekxbzDLy -=tHMf +iKYEAREIAGYFAlW4osZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl +bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy +OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw3fsACZAZxkfZG1RtQVs6mc/2YqVkDy +baYAnjl2dAB+81p/EBTAvQpYNBsUafrm +=2Btb -----END PGP SIGNATURE----- diff --git a/media-video/vlc/files/opencv-3.0.0.patch b/media-video/vlc/files/opencv-3.0.0.patch new file mode 100644 index 000000000000..b09b65154373 --- /dev/null +++ b/media-video/vlc/files/opencv-3.0.0.patch @@ -0,0 +1,12 @@ +http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b82416d7000a993b33e903095a590fe32212a85e +diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp +index ae3af05..998f286 100644 (file) +--- a/modules/video_filter/opencv_example.cpp ++++ b/modules/video_filter/opencv_example.cpp +@@ -41,6 +41,8 @@ + + #include <opencv2/core/core_c.h> + #include <opencv2/core/core.hpp> ++#include <opencv2/imgproc/imgproc_c.h> ++#include <opencv2/imgproc/imgproc.hpp> + #include <opencv2/objdetect/objdetect.hpp> diff --git a/media-video/vlc/vlc-2.1.5-r1.ebuild b/media-video/vlc/vlc-2.1.5-r1.ebuild index 38d4607a5c6c..089d21890834 100644 --- a/media-video/vlc/vlc-2.1.5-r1.ebuild +++ b/media-video/vlc/vlc-2.1.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5-r1.ebuild,v 1.9 2015/03/01 09:31:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5-r1.ebuild,v 1.10 2015/07/29 09:54:11 idella4 Exp $ EAPI="5" @@ -249,6 +249,9 @@ src_prepare() { # Fix bug #541654 epatch "${FILESDIR}"/${PN}-2.1-mem_undefined_functions.patch + # Add missed header imgproc_c.h, imgproc.hpp, bug #554562 + epatch "${FILESDIR}"/opencv-3.0.0.patch + # Disable avcodec checks when avcodec is not used. if ! use avcodec; then sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die diff --git a/media-video/vlc/vlc-2.2.1.ebuild b/media-video/vlc/vlc-2.2.1.ebuild index 0526d2dec888..4242841b06c7 100644 --- a/media-video/vlc/vlc-2.2.1.ebuild +++ b/media-video/vlc/vlc-2.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.12 2015/07/24 15:53:07 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.13 2015/07/29 09:54:11 idella4 Exp $ EAPI="5" @@ -268,6 +268,9 @@ src_prepare() { # Bug #541678 epatch "${FILESDIR}"/qt4-select.patch + # Add missed header imgproc_c.h, imgproc.hpp, bug #554562 + epatch "${FILESDIR}"/opencv-3.0.0.patch + # 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 |