Fix hardened support

Package-Manager: portage-2.2.17/cvs/Linux x86_64

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index fb7e98164fe874d6e9c8846730e1d11c3408e237..9e9ff520c45b279e2a14a608d63ce1feacd8af86 100644 (file)
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.244 2015/03/17 18:55:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.245 2015/03/20 15:21:19 lu_zero Exp $
+
+  20 Mar 2015; Luca Barbato <lu_zero@gentoo.org> -libav-11.2.ebuild,
+  libav-11.3.ebuild:
+  Fix hardened support
 
   17 Mar 2015; Luca Barbato <lu_zero@gentoo.org> libav-11.3.ebuild,
   libav-11.9999.ebuild, libav-9999.ebuild, metadata.xml:

diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 62ea12b29b049ce641369b8490eff80b70694884..f794abe16b5e595340fd25c64f327e773b44ce17 100644 (file)
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,18 +1,17 @@
+DIST 0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz 736 SHA256 3df88fc60ad15116c03fd3f70d41f1a18db98b095add0fb937309116d7cf7201 SHA512 dbdfdf7fc1d42ebd93b0853e85ba0c07d816035c126a9303e6a5656bb9faeea16f16068d7e4aa67c7c4ade8ca09f64669e67f52d7d0a2a65518fa3897d586311 WHIRLPOOL 3038214bd498a195f405a0ce6eece3b04004802f50e05cb1ed081bd0345f93a7a00663902f50207061998a33cb4f5f8fcc1f63c8056233e79a3ad43d9823e9c5
 DIST fate-10.tar.xz 558524508 SHA256 65779319ff75a5d93f20132a7c348db2ff6f0f0275fb64a23f81fbda6e44c1cb SHA512 5e569b899961d82c579d974eb13b8a5263ae7a83dc788119d6abf923c9c133029fd861960a85c316e0b0a0bd61722cc3bcb393a65d9d2c551084c0b1103cc582 WHIRLPOOL d9e0bb01ae809ca57a566ae804b9e30ff0239e43047a7f93d07ab0d31e95c7f06cadd651dd3badc2b906f34ffa12669cff87910ffe115f34c3279615f8afaddb
 DIST fate-11.tar.xz 691009480 SHA256 4de446ae8c665e9410475c58f6294720f34cfdb1f20d29bbc0ee2576f810d597 SHA512 f9dc152964e3f19cf32d5d4cbc923a2bd05ba3b0f8f3880122df79d32852ee9d4795a0bfd66d7a2925299e9e9533888df6103e212ea3e5cbfe799d17ffa2b433 WHIRLPOOL 11034760105d1028330712f5ead087dffc9edc119945d618f6b02b37f4599db4c575a04c72f77cd5c6f180dc8e8ac2c9c1786d748b759aef2efd38191fcc6361
 DIST fate-9.tar.xz 467671500 SHA256 27d10fd49267452ac787c3f43501a4a21d0ccaccc5ddd6d79d8a6150ee276532 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202 WHIRLPOOL d280ac32c6d84f121be8d733774e72a4df3f2e84d71051aea509ef5ca3289c94fd548bf03ff12215e045bf20c83426c547e6b5eb446429d167f38af7c7aa9803
 DIST libav-10.5.tar.xz 4650900 SHA256 c7a57042a5e4720152d27a0beea961ae52a3ae1d916a88c78c1e192e9e0d5f86 SHA512 fa4837daa3bf40f05902ac2d849179d104b1f9881b63b460363e577849cd55b0795e6e41aadec817eac89d1eaca88ce4a9ad0eb2dbf1dd789496dd9cd2637c59 WHIRLPOOL 03ba4cb4dbe8da4dee4a242dc14333ed6b1a2198783f687d143d65cd9c25a5f05aa7b30e49b784309af04045d4726ee3a702159da72ed00d76eaa1be01b7c4d3
-DIST libav-11.2.tar.xz 4855224 SHA256 48f4a36cd823f2449d1e45b114371033dc68f0e09ff0f7c841405c09a707682e SHA512 5e50eda5d576b0a3f263a8f7e7680ebdb5147b9755063e6fb4c48b6d16b29ceca6afdeadf9c51c663ee62061775e19cf6dbaca3647a2d57158141e85ccd8ad83 WHIRLPOOL d7f8f8b8e6d1f96cfcd3f56a371371e4d6a56c658b8cdff49ec321273af8c891e0b6c22aaf55c3fa041719b0b8d91eab2e72f957530e57009cb40c90a1fc2b5a
 DIST libav-11.3.tar.xz 4858864 SHA256 12ae6c051967765ae5faeddf94c4584129ac0b18edb884afffc5fcedcdb5e030 SHA512 f25b9fb7392d5bb4df35937f79beae26bd8f6606f0ad7cdebf16963834eb9b423d882f6a3a44b5120a5d5d853c7c31bb8c3420a427cd2b360f41a48a6d5df284 WHIRLPOOL 721c4cbe7ee3f7307d24c0e4f1cc1f8ab8b0ccd50ddf88b77ecf1cae05f06fc80d7527e9f7a0a098a6d95d0e7fed50082aaffa07935eab6e9131f7c9be6e696c
 DIST libav-9.14.tar.xz 4077424 SHA256 e4baf0c2adbd941a827854794dd6af9c29cd2042b23501c5828e9b8e1725f61d SHA512 fa8e83cb92a5a565cd23c63467c64972a69a4cbd652b946c7891b73180b609890f67a6f89f009ed263fb9e2c769236f3a8f7f70b0fce4c4373fa93a49470c04d WHIRLPOOL 178ba6c6ad0ecd8ad59eb3bf7a0d4289a3c253d82981cf3ad454e3b222848ae4f875e37cfd280be43faa25a9614c445106555c9f3b5ee4497aec9d71f39ac1af
 DIST libav-9.17.tar.xz 4080028 SHA256 e32d5f152bce1de283c002a35eb6e71f265877633dee8a40db4d16381dd5d17c SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a WHIRLPOOL ec07b5dd116e87416a9841044e09a6ef9b124fe4882f53e88711a32813d3d3a1d71f5067854bbd553ecdadec401dbbb8b504bfc1c6966bfd5e2db79459fb9995
 EBUILD libav-10.5.ebuild 10367 SHA256 b7cfa219974d331103db55c353f2fac3227af7d122ceffce449a26c610a1987b SHA512 2e2689f79d2fdca3b2fe178daaf8daf824d83c054b4363a57d3c9cce8f25c729598a4277fc7780b08266c077d5104c369a5c5ee4b572f124f1e25150c1b26471 WHIRLPOOL a8f5bdf0125d0643deb3efcff89eeeab978bc6c2c640f408a9652fb6a818752f3ef2624b735a2b46b27559978eb8db1f21330faf5d1665723683ca19dc84023a
 EBUILD libav-10.9999.ebuild 10388 SHA256 70724344c51941c1337aedb41fe8c612da475e6319792df023431c6a592dbd98 SHA512 645fa6d6b52836495199bb0c853cd1b4d5fb7e3cf8d5f527ec2bc00c3af05c19d4c1ffc482f20250ba852228811fa40c45e9260f44fa0a0cb08c90559c4085c4 WHIRLPOOL acb022a3197cebab04edb539acbfc2153bd0405a5a1bfc7009ab1edb882f390abc9c3e75e72a7ba84b53a9e74c97b55526cdf457d3d74c53bfc717dcd5bdb958
-EBUILD libav-11.2.ebuild 10616 SHA256 42124947823e49bb1e21f1f0894afcd62e63cae379326b400208e4361fade063 SHA512 1d869210bb5e6a515e7cf1cae8482359adebe8af67f3f87afa758d62b0b92d855217410f4737ade3661a10c723fd1542cf95b5ed8376d8bce98b1e8366cf6d87 WHIRLPOOL 4d1a82a65ab65a8529e7097110748a2695d0b1aff7a366fa0157ac5920785c1b60aa74897a856fe0e2a54bc3ef7c7c542a0ce682e7b7fe98a7e2d4cef7362ec9
-EBUILD libav-11.3.ebuild 11081 SHA256 7327493d0f24d50cb39d25ac39e216ebc356f8f95fb850c78776c4b52702404f SHA512 ee11f58a5ef2ea6f9cf4d54405495854b88f1973cce5855d0c5de39c36ce5f0f65d4afbd036f4d3a403e382c1dffdefcae73143a530b5ac356f11192c24af904 WHIRLPOOL 1ba39a0e010e84a434f439147021e3cd6c8309db2b460bf413299ea509540c5f20bc952a1be61e1d2dd9e7d8a4f45c08bd524bbfcf9d7ca081a161b9207ab8bb
+EBUILD libav-11.3.ebuild 11260 SHA256 d21b471ef37e2f57c03ef7912d1d727bb9b8eb8a6f31c26d0c354e574167478e SHA512 43782156eebb6cde7090e9a5a2653ba284457ccdc57f52ed26fe7a489e4fe5ede051097f7742ee1cd33108de268b6817491f70e7c3af6c52112165b11e6a9359 WHIRLPOOL 33be081c969d011135d770e0cfd308ebf62d3a50ca36341c54ce3ba7e17cfa7d9bb73dfda66603eaf9fc8b15a2764c952f2ae8713d7b7b7dfc52ce9715a5a728
 EBUILD libav-11.9999.ebuild 11083 SHA256 d2bcfac61ceceb972fc5512945cdf44cacbddd869a6746652f645e682748044f SHA512 985685870a7d003923b66bf2f0fa7048adb7bd5d286a632ec7b268740e24fdd4948488a94447fba703bd2a2535904b648c1ce77fa7e52f7b034cb01a49e5f620 WHIRLPOOL 49d724181fdbb07a2bcee11e95af4c23e590c01e51308b3d2e71176353d70fcd56a6f6152a218b77e97ecf46d5f65b807ac08eb27b2b4b7835e14d256b763f6c
 EBUILD libav-9.14.ebuild 10298 SHA256 9f6f9a255dd7d0d22e45d619e0600b76292ed117fd815cd9b7158e2e73db2e00 SHA512 6e697bc18741ed7a28d2b824f0453d3c6aaa8430f20560755d60104be2d13e8bc960cb6cf93081d236c46ecc75779c7277b00ed79c1e1d6081046fce7a1daf35 WHIRLPOOL 45de537cb07a4b455e48a8bf195903b14738a492712812ed9b099c96b6130d6a245e4a3f0715efd3c5844d5db3c4926b54f0b92fd5e7289f50955e04df292500
 EBUILD libav-9.17.ebuild 10298 SHA256 82ed31263576f7bd080c1d026e40ca1ad230d56786b97aa90f6740cf4ad40a77 SHA512 fdd52b89f16205392d601a971a4db34fc484f734ea8234699ffcd8bfa7aff6741fe71a6ad29c07d0bde54e18eab4dd5a30bd4360df6b1ef33091299028c342ea WHIRLPOOL d80678b9c4d4bd9995707bb734d20732016f4d70e910700db61942af1e94afbb7436a6946e62a07d2cc670a08a14e792b9018a8bec3837cd4a2d873ebe5e711e
 EBUILD libav-9999.ebuild 11030 SHA256 5365d3f27b17456e84035cfccb330874ba90e9aec74db383e83ea3a66116f4d5 SHA512 a6697542aae95de19d27df191eb628625577eff4b85f3d835f1100bd3f369b0579a95e431a3ff9edf5087d186fac4ec5c63b35a4b8e5d7f7302054ca9795da5d WHIRLPOOL fa1e58ac3cbe71166ffc44579e101544425a52885626776795bed867345e7118d7967886989a8eef366312512be5eaeb97b125de227abb253b21b6fdd39ccc0e
-MISC ChangeLog 37238 SHA256 a06f75af08e3d54a26904ee6144bdf4facdf55658314a0c410e8cfcf2b372bd0 SHA512 512e98bae6f2939a482879c0e683325b1e7985f828047881ae60f9c9b1b335f2226a8ae209b7ad708060b6c7f3c9d9dd2fa8a26eece1e03b75a1780b31549f5d WHIRLPOOL 74c4df62100323fd676c6dbc3cdb4c2536cbfae815b9580487973ca547027ff27842f5f76215cd31d7a541bc4029657fbc3b8300abd0c8026cc83b67253d3eb2
+MISC ChangeLog 37352 SHA256 797ff4f065c4de074963371f47d7dc375f0a64e27dee824ca281db8d83d9122f SHA512 cf1064cae6d70d646422418fa81f1d09bc83d9bba5718c32c4974b6a3d9d1b8d4ab69dbe1fc78445b3cf4b50fde631b9e2bb19c21dd53669bb854a9078d71bb1 WHIRLPOOL 3965d461080048fef68d81c4a4d4615efaa4a658337850c6d5a9b287d77e6d26b4383bfa70a189e7300a6461d2da01e8c493d772197ad783920311fde4ffe058
 MISC metadata.xml 2867 SHA256 3d7179c8e4d4d7c135ceb2fe6b1636a5573a83a296c1ecadad806b1526459583 SHA512 4076e607a95c596b78750ce3dc4b600a337c243f17af4098d3626a7c279be5eeb854031a2aa4817df8ff09b82215c1f9d70b07748c02abe5f82ff0b5a7fff159 WHIRLPOOL 3d1f2c70973c4de05cb2be6f716f7885682aff4ea7da424e583f9bdb9f8e05708f4f25f5c0becaeb567e22d36c961d90102acf78eb957510a90da6663981ec09

diff --git a/media-video/libav/libav-11.2.ebuild b/media-video/libav/libav-11.2.ebuild
deleted file mode 100644 (file)
index 8288e01..0000000
--- a/media-video/libav/libav-11.2.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.2.ebuild,v 1.3 2015/03/15 17:33:24 ulm Exp $
-
-EAPI=5
-
-if [[ ${PV} == *9999 ]] ; then
-       SCM="git-2"
-       : ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-       if [[ ${PV%9999} != "" ]] ; then
-               : ${EGIT_BRANCH:="release/${PV%.9999}"}
-       fi
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="http://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-       SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-       SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-       SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/10"
-[[ ${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 fontconfig +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
-       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="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 cpu_flags_x86_avx2:avx2"
-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}]
-                       <dev-libs/libcdio-0.90[-minimal,${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}]
-               )
-               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}] )
-       )
-       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}] )
-       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 )
-"
-
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# 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 )
-"
-
-# Test on live ebuild are not possible as they require trunk fate
-RESTRICT="test faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/libavutil/avconfig.h
-)
-
-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
-
-       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 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
-       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 )
-       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 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 INSTALL
-}
-
-multilib_src_test() {
-       LD_LIBRARY_PATH="${BUILD_DIR}/libavcore:${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \
-               emake -j1 fate
-}

diff --git a/media-video/libav/libav-11.3.ebuild b/media-video/libav/libav-11.3.ebuild
index 90da07233255652fe7b6185ab5be9d5e052a7b82..bee199887a2e58a444c1e7c4532208e0fe9f5d4f 100644 (file)
--- a/media-video/libav/libav-11.3.ebuild
+++ b/media-video/libav/libav-11.3.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/libav/libav-11.3.ebuild,v 1.4 2015/03/17 18:55:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.3.ebuild,v 1.5 2015/03/20 15:21:19 lu_zero Exp $
 
 EAPI=5
 
@@ -22,6 +22,7 @@ elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
        SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
 else # Official release
        SRC_URI="https://libav.org/releases/${P}.tar.xz"
+       SRC_URI+=" http://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz"
 fi
 # 9999 does not have fate-*.tar.xz
 [[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
@@ -151,6 +152,8 @@ src_unpack() {
 src_prepare() {
        epatch_user
 
+       epatch "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch"
+
        # 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