From 434d713861b70f6c6563d6ee50a8e64f14c970d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 15 Feb 2018 16:58:00 +0000 Subject: gentoo resync : 15.02.2018 --- media-video/Manifest.gz | Bin 29895 -> 29906 bytes media-video/blinkensim/Manifest | 1 + media-video/blinkensim/blinkensim-2.7-r1.ebuild | 25 + media-video/ffmpeg/Manifest | 8 +- media-video/ffmpeg/ffmpeg-3.4.1.ebuild | 490 ---------------- media-video/ffmpeg/ffmpeg-3.4.2.ebuild | 491 ++++++++++++++++ media-video/ffmpeg/ffmpeg-9999.ebuild | 3 +- media-video/ffmpeg/metadata.xml | 1 + media-video/libva-utils/Manifest | 15 +- media-video/libva-utils/libva-utils-1.8.0.ebuild | 58 -- media-video/libva-utils/libva-utils-1.8.1.ebuild | 58 -- media-video/libva-utils/libva-utils-1.8.2.ebuild | 63 --- media-video/libva-utils/libva-utils-1.8.3.ebuild | 63 --- media-video/libva-utils/libva-utils-2.0.0.ebuild | 63 --- media-video/libva-utils/libva-utils-2.1.0.ebuild | 63 +++ media-video/libva-utils/libva-utils-9999.ebuild | 6 +- media-video/libva-utils/metadata.xml | 2 +- media-video/mplayer/Manifest | 5 +- .../mplayer/files/mplayer-1.3-vdpau-x11.patch | 4 +- media-video/mplayer/mplayer-1.3.0-r4.ebuild | 629 +++++++++++++++++++++ media-video/mplayer/mplayer-9999.ebuild | 18 +- media-video/mpv/Manifest | 18 +- .../0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch | 50 -- .../mpv-0.27.0-fix-wrong-colors-with-hwdec.patch | 44 -- ...pv-0.27.0-remove-duplicate-android-option.patch | 27 - .../files/0.27.0/mpv-0.27.0-support-libva2.patch | 86 --- ...mpv-0.27.0-add-missing-link-flags-for-rpi.patch | 25 + media-video/mpv/mpv-0.26.0.ebuild | 374 ------------ media-video/mpv/mpv-0.27.0-r1.ebuild | 371 ------------ media-video/mpv/mpv-0.27.1.ebuild | 374 ++++++++++++ media-video/mpv/mpv-0.28.0.ebuild | 361 ------------ media-video/mpv/mpv-0.28.1.ebuild | 361 ++++++++++++ media-video/mpv/mpv-9999.ebuild | 11 +- media-video/vlc/Manifest | 9 +- media-video/vlc/vlc-2.2.8-r1.ebuild | 4 +- media-video/vlc/vlc-2.2.9999.ebuild | 480 ---------------- media-video/vlc/vlc-3.0.0-r1.ebuild | 499 ++++++++++++++++ media-video/vlc/vlc-3.0.9999.ebuild | 322 ++++++----- media-video/vlc/vlc-9999.ebuild | 322 ++++++----- 39 files changed, 2850 insertions(+), 2954 deletions(-) create mode 100644 media-video/blinkensim/blinkensim-2.7-r1.ebuild delete mode 100644 media-video/ffmpeg/ffmpeg-3.4.1.ebuild create mode 100644 media-video/ffmpeg/ffmpeg-3.4.2.ebuild delete mode 100644 media-video/libva-utils/libva-utils-1.8.0.ebuild delete mode 100644 media-video/libva-utils/libva-utils-1.8.1.ebuild delete mode 100644 media-video/libva-utils/libva-utils-1.8.2.ebuild delete mode 100644 media-video/libva-utils/libva-utils-1.8.3.ebuild delete mode 100644 media-video/libva-utils/libva-utils-2.0.0.ebuild create mode 100644 media-video/libva-utils/libva-utils-2.1.0.ebuild create mode 100644 media-video/mplayer/mplayer-1.3.0-r4.ebuild delete mode 100644 media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch delete mode 100644 media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch delete mode 100644 media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch delete mode 100644 media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch create mode 100644 media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch delete mode 100644 media-video/mpv/mpv-0.26.0.ebuild delete mode 100644 media-video/mpv/mpv-0.27.0-r1.ebuild create mode 100644 media-video/mpv/mpv-0.27.1.ebuild delete mode 100644 media-video/mpv/mpv-0.28.0.ebuild create mode 100644 media-video/mpv/mpv-0.28.1.ebuild delete mode 100644 media-video/vlc/vlc-2.2.9999.ebuild create mode 100644 media-video/vlc/vlc-3.0.0-r1.ebuild (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index a8efabd08ba7..338a087ab777 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/blinkensim/Manifest b/media-video/blinkensim/Manifest index 28c45111d7aa..b64dcdf54acc 100644 --- a/media-video/blinkensim/Manifest +++ b/media-video/blinkensim/Manifest @@ -1,3 +1,4 @@ DIST blinkensim-2.7.tar.gz 88416 BLAKE2B a1ac70795f1eeb70ef3d4ff4a961a76c591071aaf4278a7a046d317b7c5a7dd2a19595ed0db659735f97143e1dffba3c53edd00521a8b450dbeb17b31d174c0f SHA512 35be6f0d871ede4ed3de1bb2a18e53e8a508a08001d795369cf222122dd9596ac48314d1c386905360be0a46b1fefffa763bdb9874eaaa6e1ed713a48a6fefd4 +EBUILD blinkensim-2.7-r1.ebuild 647 BLAKE2B 990d0a5cd5b5b9b0a61fbe4d1a15dcd7439711470dc69a01d16ba013c29210c3411121609ac0c605b2fbe1492104a01296d94bade9b1e8a32278ba8d58e792a4 SHA512 bef108b952734fbbda8047a6ebcb5ec2a96c4369c42e336170e81b8ed0eff451523d004bbbf8c952e6541f59b43899b0d614783a7355936b24e6c91695c228bd EBUILD blinkensim-2.7.ebuild 751 BLAKE2B bb225998d98c307d1510e962df3a6ceb38c39e5d20d5ac9332510d805c350ae5186ec7756f0b2d7d159ea49a9e5500d7c1591ccc663245b8d37466508273f873 SHA512 6e3206c78dae598a104b9baf9751ffaf7c59c4a9dd49cc3f3d375abf6a86dfc853ba3e71087f754c756c955225e6593eb4f5d44a85684f3406d04142eaa1afb8 MISC metadata.xml 360 BLAKE2B f7cfcf7e66ea5a7ae30864099416f896879b5fa28422420e6e597e6c0fe190a8ecda1518c1cc277a13444099f08eb31f27835b07194d8984e7dd04a8df3a4375 SHA512 b8538f19756f7bf5248e4d60916093cb4aba5d06947dfcc152168941d43acedc6079e0c0aee3da4089a06a6956f74320f874b4cf50d50ae8d7476f2838901782 diff --git a/media-video/blinkensim/blinkensim-2.7-r1.ebuild b/media-video/blinkensim/blinkensim-2.7-r1.ebuild new file mode 100644 index 000000000000..3aac989943e0 --- /dev/null +++ b/media-video/blinkensim/blinkensim-2.7-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +DESCRIPTION="Graphical Blinkenlights simulator with networking support" + +HOMEPAGE="http://www.blinkenlights.net/project/developer-tools" +SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="aalib gtk" + +# if the config script finds any of the optional library it will try to +# compile against it +RDEPEND=" + >=media-libs/blib-1.1.4 + media-video/blinkenthemes + aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) + gtk? ( >=x11-libs/gtk+-2.4.4:2 ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index b8d9988bc691..0042c691289f 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -8,12 +8,12 @@ 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.5.tar.bz2 9945243 BLAKE2B 0fb9aad3d35f6173085e5a790e84c3a45c2051b656e9fb12b13af372778861121d6595e1f929144c32c77861d101fdb2a67c4411907147bd5534ce09d0fae3b9 SHA512 b97eb61f1c8f8ee95d79c6c28b37a0a99ad7752605714bfe8827366d319aed8bcaf2403cefb856604e8d61bca54573838c2ea0d38fa89ab453ccdd46b104725a DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 2526fdf9580045131426e554a9bf44fdc6567c12213ea4d5b78aa27f14513f14e07f38b8380183686fa1a62440fe4108eaecddca96f4dec3c74c410b1f90ee03 SHA512 1305760fa981bcb43c8fcb5dd1bf7dd8d3f405a124975f062062b741d49e12386e4d3eec3de6a032fc93cd7f6086d939275a669a9997ffa400f70c20f7eb3d23 -DIST ffmpeg-3.4.1.tar.bz2 10177055 BLAKE2B b92f5a5d03770a52d1b3c2f20f0327acd17bff1dcc59ce3193f23695544838768addd807d38459c433172e9ad7410617cf1f30f3b2027a6558231138cac0233f SHA512 e509995eac0d54ebb7c0896303d1060ca1425841811df1b2bd61c9e41363cc50c91144bd3a7cf47e0d618591368763d054c3270b7a0a4b0e794c49bbdc59c4c5 +DIST ffmpeg-3.4.2.tar.bz2 10179184 BLAKE2B a9116fd42b62683d904159b4317df7216df556268d5ac05f48c2204b7269d353746ecd709ad194cab542627047b991528bcfe7c302439753f96ddc5617ab236b SHA512 7d14865316d514b8fee19431b45c5f456422447bd7c68a746e06c6f7450a49aff1ec1d9f88b642c9072e846163d1f7bbe41d1cf73a1ad580f5162f58c8b30fb4 EBUILD ffmpeg-3.2.6.ebuild 15078 BLAKE2B 5d8e389481ae3ddbd2848fedc7292cdb2131b2c5be63a9d8a5271bee58729dd014e1843ab55c9e5ddb616d4290e8daca0eac8f4c586fbfc5faae989e16929be7 SHA512 56e3a5e60aab2c15d22e9ce9630138ed95ff6e751a41b4211704b052f290d8748a0859766b39e0221d4cb1ad2b1163982a25179861eee7b85707053f99b5f869 EBUILD ffmpeg-3.2.7.ebuild 15083 BLAKE2B 313da834e164cca1c3fd1fdef6fb0094aefd8b2f752e28895a292221e5005b5d496e480a9dffc779790ee4036121e18fea8ded2eacd5c9e34aa51fc335c11688 SHA512 2645eada5e381a5df2b3972dee7435f51dea461f4535796ededcc4f705979b289c48c289f3384bb58bbe1b6f64dadfda10e2c9d1674bf00d566dfe107f52a42e EBUILD ffmpeg-3.3.4.ebuild 16107 BLAKE2B 2dabd381f934dde36e6a1cd25c9c44a93a702bc09f41718649a4bf7139eb18b7854b93350e3b46df1be87fe5f1421683f24a3173431b69901527b7cc63bb97db SHA512 ed129a8ee9f66bed5c2ab724114ed77ad345e7dec13f541ede5371ca442352b2e16666a715c30bac967210464d970bd4728c7753bd08dd542478d43da83b598b EBUILD ffmpeg-3.3.5.ebuild 16109 BLAKE2B 53b38d47499dc3ec2d9cf5864ef35999032894dc100d935221ef34294610c980d058288c3ff177b4e4ecd21933426cc57a60611133bf74db9065a09bffcb8f11 SHA512 5a3d8e7d84d0cbe1e23918263be4ef1f379f563c81be266d7e7a8333674f056f69db6e3f88fb8e0521a7f4944fd427c5e91f66b277a19b7029834be9810aa616 EBUILD ffmpeg-3.3.6.ebuild 16111 BLAKE2B cfd38b5c31fa6ac16ff08a5693a97dc4de04146a3c841d501ece315b3d4eb717d95a0033b336b02e2f96fb1c201ba6a4a940e0617e995e3cc888bc0681b995e1 SHA512 a2c764effeb92ba71d9563cca131fb0ad6bec842f4e9369152fa93d4a148f142b39aeae895457934dc668cf2c6db0de13bbc5cf7b7c915c3dcc0b0376d6b27a7 -EBUILD ffmpeg-3.4.1.ebuild 15673 BLAKE2B e5b0aecb018af1733c0c013e132e1c5060cff109421a54f63953e4df3a15a275d746981003533e5e4bdc5ade07d2ff17977e93a0a603dc7f5bb82dfe459a69e5 SHA512 061a487f8791b210ef2e593eb5e78382b158113f61b771f92c7c51e17d3d436056f22441f814ed81d23e5b4c3c6281b7853a48433731a89dc142aac08b5d2f39 -EBUILD ffmpeg-9999.ebuild 16057 BLAKE2B 262d140c3b9e9eb2f663336a77cfa94610401bcc41e5bb81ab50b7eead6bcef70a70b1ce314196557c7f334ff42e7aacdbb5914d50b8611f5a1cba8a77d0314d SHA512 bfdcf1a4c23372da65eb2be595e05975f1b28677ef04a101ee9150b6347a61f4b634a4e50a78a5b58c4514453d523550d5a2af4929a2d03e1ff9525cee454381 -MISC metadata.xml 5618 BLAKE2B cfca20347486aaead0039c0a256f31949609fd3c15f35273bd783657052fe8675f08e60cfe0df4c567b88f44f801d17326b6eb77ef39324e3e45e57b09a6001f SHA512 7a235250f9177343afb6ffcf6a3ff77bdc7cf028fd2c26bf84c05c049ebb89ce9d489a86b6b37d1e90262b8b3995c57f201586737e293458d2747ed1bf12e3c3 +EBUILD ffmpeg-3.4.2.ebuild 15729 BLAKE2B b2b84197b20a1b904aa91d4c48b5a7597a25f6911e3d70349cb0595861a6bb2efeb05392a527bd522e5950cd2ef8f8b9d58d75eef60a385401bea22e1bbe53b9 SHA512 a01935dd9c4708bc4b60cc47e57957ab0e65d9ac581aca153fe63362b7d17bc93e5c1f18278d2e7b95952ca4ef5e73d915478a27fb71aa2469885f78679608f7 +EBUILD ffmpeg-9999.ebuild 16113 BLAKE2B 1a59bc78f50cfd32417585ee2b8c78ccddc73cf3fef56dd28c0e5b0ed960ec3d252dc72228258cf0cd8ab015bcd9aa1591a1b826d4967f91f3cdf555385254a0 SHA512 082965818e981aa37f203af1fd12d81bba93247aa9cccf93c498637e7c3743232d5a2cabf35cff0f3c271a939f81df87df21013557f30ce3ef687b2ca8728bf5 +MISC metadata.xml 5749 BLAKE2B 1ff5bfe813e5dda3fb09ccdd7383adeceb2599ce173680eb917b7d088af6dd5f8d2434cb7a353b3f9dbf2d5ec3ecc05e3d4afab832e644d5aa7e5f9fe7e9082e SHA512 f635920b77f6e186f1a80a6a9a989a0d0876e915573d29f120631fc871bb65709d1fa9e1c29b4d5be3039465b8ea69ca966fc87435ff2a42cace5575fb92d435 diff --git a/media-video/ffmpeg/ffmpeg-3.4.1.ebuild b/media-video/ffmpeg/ffmpeg-3.4.1.ebuild deleted file mode 100644 index 4e76b854556c..000000000000 --- a/media-video/ffmpeg/ffmpeg-3.4.1.ebuild +++ /dev/null @@ -1,490 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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=55.57.57 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="git://source.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="http://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="http://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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 lzma +network 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 - # decoders - amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac - jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm - mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh - speex:libspeex svg:librsvg vorbis:libvorbis - vpx:libvpx zvbi:libzvbi - # libavfilter options - appkit - bs2b:libbs2b chromaprint flite:libflite frei0r - fribidi:libfribidi fontconfig ladspa libass 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 nvenc:nvenc - 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}] ) - 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}] ) - kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) - nvenc? ( media-video/nvidia_video_sdk ) - 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}] ) - gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${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}] ) - libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) - libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${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}] ) - 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}] ) - opengl? ( >=virtual/opengl-7.0-r1[${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}] ) - 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}] ) - 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.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 ) -" - -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 ) -" - -RDEPEND="${RDEPEND} - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" - -# 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 ) ) -" - -S=${WORKDIR}/${P/_/-} - -PATCHES=( - "${FILESDIR}"/chromium.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 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 - - # (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 - "${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-3.4.2.ebuild b/media-video/ffmpeg/ffmpeg-3.4.2.ebuild new file mode 100644 index 000000000000..d6095bce04b2 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-3.4.2.ebuild @@ -0,0 +1,491 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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=55.57.57 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="git://source.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="http://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="http://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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 lzma +network 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 fdk:libfdk-aac + jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm + mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh + speex:libspeex svg:librsvg vorbis:libvorbis + vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint flite:libflite frei0r + fribidi:libfribidi fontconfig ladspa libass 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 nvenc:nvenc + 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}] ) + 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}] ) + kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) + nvenc? ( media-video/nvidia_video_sdk ) + 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}] ) + gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${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}] ) + 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}] ) + 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}] ) + opengl? ( >=virtual/opengl-7.0-r1[${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}] ) + 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}] ) + 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.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 ) +" + +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 ) +" + +RDEPEND="${RDEPEND} + abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" + +# 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 ) ) +" + +S=${WORKDIR}/${P/_/-} + +PATCHES=( + "${FILESDIR}"/chromium.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 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 + + # (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 + "${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 bae322e21e76..b9fe40c792d9 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -70,7 +70,7 @@ FFMPEG_FLAG_MAP=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl # indevs - libv4l:libv4l2 pulseaudio:libpulse + 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 @@ -211,6 +211,7 @@ RDEPEND=" jpeg2k? ( >=media-libs/openjpeg-2:2[${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}] ) diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index e55fc74c4155..408dbb8e3c1f 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -30,6 +30,7 @@ Use pre-calculated tables rather than calculating them on the fly. Support for FireWire DV/HDV input device using media-libs/libiec61883. Enables media-libs/kvazaar based HEVC encoder. + Enables x11-libs/libdrm support for better screen grabbing and hardware accelerated codecs. Enables iLBC de/encoding via media-libs/libilbc. Enables Real Time Messaging Protocol using librtmp (media-video/rtmpdump) in addition to FFmpeg's native implementation. Enables audio resampling through media-libs/soxr. diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest index c87921628d06..e1918bd904cb 100644 --- a/media-video/libva-utils/Manifest +++ b/media-video/libva-utils/Manifest @@ -1,13 +1,6 @@ -DIST libva-utils-1.8.0.tar.gz 1011595 BLAKE2B 17a148ad866e0fa9b9871d15eb2e7adbf11f768db8b97eff8dbcf540b07eb2a6ef7f5baf052379dc44c51458042c3a22e35813e9b562a962b11a71a0530ce4f1 SHA512 020cf1d5af7a78ecb4806afe69d34106525086f10b007dddb8d36c0243b670c311df537d969c8b60222b4afc7bfc08c1d594843339af72618886eecfd03887ec -DIST libva-utils-1.8.1.tar.gz 1011602 BLAKE2B 49a55f2bc2334e90c9d3519db3e86d999257bb41cc4bfe8bbad11fad88fa3da6e14dd188474fe9187c3c1ac3a8833e529c8e87a586b76351c99fc49c0c64dcf7 SHA512 7b60cf773d7156bf5579754d0525a8cae07b5e63416fd1c6481a9bada388515f8f14d23661c11689599af7ddd192440f96f2c8873b539cf93e7db0550d4e1aae -DIST libva-utils-1.8.2.tar.gz 1011622 BLAKE2B 549b7ef0d4d2049423ff898d6eac94a29a164bb793626f0e93502ec7d4bf9cd8f0da40e5e6311372f6d144e49f5ccd9f7d66addf927857640c399785cda8204d SHA512 e6d1e025d1c27112bf61869fa097a27c81bff9fb1ed5226842f3c7685852b4cc8903b0a29204d3c85bc4513dab9331b327de0f93c9493a411ab15e7e577ce616 -DIST libva-utils-1.8.3.tar.gz 1012261 BLAKE2B a42c61d50e643f65e23689716a3c96eb5f617728c0e7a070eb7d88f7c1271c3abd50535ed8bb15156e21d207e38c9d89b7dddd11dce85b792f521b2707551cc0 SHA512 0a16243f39556cb7853c144b91c1fb07d4a4fafd43d05f5519af969153bc8a4e5f6512c665c0c7c32c413d50e913f8977bef004bf639f606ae5d6f6af1571d39 DIST libva-utils-2.0.0.tar.gz 1033292 BLAKE2B 5f9e36d2a69a6a65f3d47b0e29aa1807201da8bd69eb00da5dc232b2629fdd01279c38af77335244f673b4f2e849ea3cc89a572b7ce26fd614f44461603c0c19 SHA512 5c435b558fdeec6dc597c531b1e72e1a6e8b4f59f5f97af30d01b39a20430446cce7af5553b924144fbc54a64f0e39ab232c76e4e8a266329cc9868d60be0c4b -EBUILD libva-utils-1.8.0.ebuild 1244 BLAKE2B 3e25949b69c82cafefef573a44d4916d46784d3a881caa249921729fb08d8582f26258ba280b690ecfdd5e4bf5583aaf060b14ce04043289b3f4fea4b7770269 SHA512 af4e585ffcacbe4d13283661dcf0e2136d7a75ea0ad81cf716fe565ee0badf7ebc4aecf358cf67b428c942c8f29c5e1ffb03586af2e97f3028007c0e24662816 -EBUILD libva-utils-1.8.1.ebuild 1244 BLAKE2B 3e25949b69c82cafefef573a44d4916d46784d3a881caa249921729fb08d8582f26258ba280b690ecfdd5e4bf5583aaf060b14ce04043289b3f4fea4b7770269 SHA512 af4e585ffcacbe4d13283661dcf0e2136d7a75ea0ad81cf716fe565ee0badf7ebc4aecf358cf67b428c942c8f29c5e1ffb03586af2e97f3028007c0e24662816 -EBUILD libva-utils-1.8.2.ebuild 1348 BLAKE2B d1eb64cfecb5b490edc97712dddb2f148dde646443895c6b77f547d33002badd3aaee78d0c98126cf264850bab0a34f6a262c998d005fa687e811d988afa0a6a SHA512 26bfb37359a065a5e4776a046f69f3213b2f82ffa6f0762c17b4416d27d16ebe982947fcc99df4b70cd4ed3d52500264dc5633591d108006739b9de59b86ae5e -EBUILD libva-utils-1.8.3.ebuild 1348 BLAKE2B d1eb64cfecb5b490edc97712dddb2f148dde646443895c6b77f547d33002badd3aaee78d0c98126cf264850bab0a34f6a262c998d005fa687e811d988afa0a6a SHA512 26bfb37359a065a5e4776a046f69f3213b2f82ffa6f0762c17b4416d27d16ebe982947fcc99df4b70cd4ed3d52500264dc5633591d108006739b9de59b86ae5e +DIST libva-utils-2.1.0.tar.gz 1034951 BLAKE2B 88fb075bd1946bbba79c460640c3242a6ad85fcb6396a77b549ce3d2193fb4ab6df35b70a0981d56cbc40822a9b2146074255f573783547b23ee0e7d8670fce3 SHA512 2dbf1e1849136804be8970b1f02957e6e3eb593a72e34289e8e2c087b3a358596e5eed7d17d3c56701045116a0658450c37b26600a352dcb37ed0d58d5e14ba6 EBUILD libva-utils-2.0.0-r1.ebuild 1352 BLAKE2B 24cd83a890efeb1edc3794e58140590676b901c5e6df3374362bcfa3032515d9b2fbf19f55adc4dcb2fe10bc57aeb405a768b84c30f688c37de2b5d60b1f5f05 SHA512 7687c4c1a7093b6a645e2c08ff4ff14890d84e08c380c30033952792ab063e0d19ae79f360cb7306b0ccb3e6082558296a148e076939173e6b63f25ffcb0281f -EBUILD libva-utils-2.0.0.ebuild 1350 BLAKE2B 4a4cb8ff640c73cedca99d436f8b33111bda7406aa94021e810b0111c999a14df0479a846e5b2239a57b7c3971db1ce42815df8a11a45fd84d416084d94d2390 SHA512 9003e0d228567dc29970bcbca498bbaabceaa3252c8e020a06677159351d1870a6865514fe6466213c56c5d69507d285f1b503cb7718001a83b6dbc9b1caff3a -EBUILD libva-utils-9999.ebuild 1352 BLAKE2B 24cd83a890efeb1edc3794e58140590676b901c5e6df3374362bcfa3032515d9b2fbf19f55adc4dcb2fe10bc57aeb405a768b84c30f688c37de2b5d60b1f5f05 SHA512 7687c4c1a7093b6a645e2c08ff4ff14890d84e08c380c30033952792ab063e0d19ae79f360cb7306b0ccb3e6082558296a148e076939173e6b63f25ffcb0281f -MISC metadata.xml 414 BLAKE2B 6a77b200f9b416b31b36c5f2b19f0100b123e6e624afe9aea3c3ca4ffcfa1bd113b27467737a4e757a1071e2286baa20b50a62d6ed666593ce88cc36dcd89dd8 SHA512 4135a2f2d53fc2e53c1eec8c51f24ca2ddfe062b541de33df0fad5c6e21332902249e80b1d049711e7890c9b3802e29bc22d1695afda74949c364b533a829d8e +EBUILD libva-utils-2.1.0.ebuild 1352 BLAKE2B 700a90494c689b3260d0d0d09be5671aaec976b03bdd57b2b01de0469a4b3f678f2d3f5c9ec9dd311df059f612fa3ab1d7395bb2bbed51bfe5163cccec6d0062 SHA512 b64978b6b8b880d134d92edfb03cc0b2dc13389e76c4ce594549377ec688141756ff16f6d0a9bdb5439e1e5dd038cd20658b18c70dace5826b211916605bdf96 +EBUILD libva-utils-9999.ebuild 1352 BLAKE2B 700a90494c689b3260d0d0d09be5671aaec976b03bdd57b2b01de0469a4b3f678f2d3f5c9ec9dd311df059f612fa3ab1d7395bb2bbed51bfe5163cccec6d0062 SHA512 b64978b6b8b880d134d92edfb03cc0b2dc13389e76c4ce594549377ec688141756ff16f6d0a9bdb5439e1e5dd038cd20658b18c70dace5826b211916605bdf96 +MISC metadata.xml 414 BLAKE2B 38e8ac043ae6960cdc20190dd2f7f802b006c4d1f71920d1b699a8750a53c65ceeaa32f4d82f0699a5989f2f252daa1fbe5e2dfa330b9eb745a12cce8da045f8 SHA512 a515f432546c6063a66694fb5fbd310d498d2970cac15dea1c9497d086cb517557c15da0837f068bf28bd2e000345f95c68f4aa6170d65b960ba7e6d44e8ad57 diff --git a/media-video/libva-utils/libva-utils-1.8.0.ebuild b/media-video/libva-utils/libva-utils-1.8.0.ebuild deleted file mode 100644 index ef34dbe2e6cd..000000000000 --- a/media-video/libva-utils/libva-utils-1.8.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SCM=git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/01org/libva-utils" -fi - -AUTOTOOLS_AUTORECONF="yes" -inherit autotools-utils ${SCM} multilib - -DESCRIPTION="Collection of utilities and tests for VA-API" -HOMEPAGE="https://01.org/linuxmedia/vaapi" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SRC_URI="" -else - SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -if [ "${PV%9999}" = "${PV}" ] ; then - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -else - KEYWORDS="" -fi -IUSE="+drm test wayland X" - -RDEPEND=" - >=x11-libs/libva-1.8[drm?,wayland?,X?] - drm? ( >=x11-libs/libdrm-2.4 ) - X? ( - >=x11-libs/libX11-1.6.2 - >=x11-libs/libXext-1.3.2 - >=x11-libs/libXfixes-5.0.1 - ) - wayland? ( >=dev-libs/wayland-1.0.6 )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="|| ( drm wayland X )" - -DOCS=( CONTRIBUTING.md README.md ) - -src_configure() { - local myeconfargs=( - $(use_enable X x11) - $(use_enable wayland) - $(use_enable drm) - $(use_enable test tests) - ) - autotools-utils_src_configure -} diff --git a/media-video/libva-utils/libva-utils-1.8.1.ebuild b/media-video/libva-utils/libva-utils-1.8.1.ebuild deleted file mode 100644 index ef34dbe2e6cd..000000000000 --- a/media-video/libva-utils/libva-utils-1.8.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SCM=git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/01org/libva-utils" -fi - -AUTOTOOLS_AUTORECONF="yes" -inherit autotools-utils ${SCM} multilib - -DESCRIPTION="Collection of utilities and tests for VA-API" -HOMEPAGE="https://01.org/linuxmedia/vaapi" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SRC_URI="" -else - SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -if [ "${PV%9999}" = "${PV}" ] ; then - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -else - KEYWORDS="" -fi -IUSE="+drm test wayland X" - -RDEPEND=" - >=x11-libs/libva-1.8[drm?,wayland?,X?] - drm? ( >=x11-libs/libdrm-2.4 ) - X? ( - >=x11-libs/libX11-1.6.2 - >=x11-libs/libXext-1.3.2 - >=x11-libs/libXfixes-5.0.1 - ) - wayland? ( >=dev-libs/wayland-1.0.6 )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="|| ( drm wayland X )" - -DOCS=( CONTRIBUTING.md README.md ) - -src_configure() { - local myeconfargs=( - $(use_enable X x11) - $(use_enable wayland) - $(use_enable drm) - $(use_enable test tests) - ) - autotools-utils_src_configure -} diff --git a/media-video/libva-utils/libva-utils-1.8.2.ebuild b/media-video/libva-utils/libva-utils-1.8.2.ebuild deleted file mode 100644 index 0c4c99ffb3d8..000000000000 --- a/media-video/libva-utils/libva-utils-1.8.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SCM=git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/01org/libva-utils" -fi - -AUTOTOOLS_AUTORECONF="yes" -inherit autotools-utils ${SCM} multilib - -DESCRIPTION="Collection of utilities and tests for VA-API" -HOMEPAGE="https://01.org/linuxmedia/vaapi" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SRC_URI="" -else - SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -if [ "${PV%9999}" = "${PV}" ] ; then - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" -else - KEYWORDS="" -fi -IUSE="+drm test wayland X" - -RDEPEND=" - >=x11-libs/libva-1.8[drm?,wayland?,X?] - drm? ( >=x11-libs/libdrm-2.4 ) - X? ( - >=x11-libs/libX11-1.6.2 - >=x11-libs/libXext-1.3.2 - >=x11-libs/libXfixes-5.0.1 - ) - wayland? ( >=dev-libs/wayland-1.0.6 )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="|| ( drm wayland X )" - -DOCS=( CONTRIBUTING.md README.md ) - -src_prepare() { - sed -e 's/-Werror//' -i test/Makefile.am || die - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - $(use_enable X x11) - $(use_enable wayland) - $(use_enable drm) - $(use_enable test tests) - ) - autotools-utils_src_configure -} diff --git a/media-video/libva-utils/libva-utils-1.8.3.ebuild b/media-video/libva-utils/libva-utils-1.8.3.ebuild deleted file mode 100644 index 0c4c99ffb3d8..000000000000 --- a/media-video/libva-utils/libva-utils-1.8.3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SCM=git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/01org/libva-utils" -fi - -AUTOTOOLS_AUTORECONF="yes" -inherit autotools-utils ${SCM} multilib - -DESCRIPTION="Collection of utilities and tests for VA-API" -HOMEPAGE="https://01.org/linuxmedia/vaapi" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SRC_URI="" -else - SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -if [ "${PV%9999}" = "${PV}" ] ; then - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" -else - KEYWORDS="" -fi -IUSE="+drm test wayland X" - -RDEPEND=" - >=x11-libs/libva-1.8[drm?,wayland?,X?] - drm? ( >=x11-libs/libdrm-2.4 ) - X? ( - >=x11-libs/libX11-1.6.2 - >=x11-libs/libXext-1.3.2 - >=x11-libs/libXfixes-5.0.1 - ) - wayland? ( >=dev-libs/wayland-1.0.6 )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="|| ( drm wayland X )" - -DOCS=( CONTRIBUTING.md README.md ) - -src_prepare() { - sed -e 's/-Werror//' -i test/Makefile.am || die - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - $(use_enable X x11) - $(use_enable wayland) - $(use_enable drm) - $(use_enable test tests) - ) - autotools-utils_src_configure -} diff --git a/media-video/libva-utils/libva-utils-2.0.0.ebuild b/media-video/libva-utils/libva-utils-2.0.0.ebuild deleted file mode 100644 index 408a185f8394..000000000000 --- a/media-video/libva-utils/libva-utils-2.0.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SCM=git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/01org/libva-utils" -fi - -AUTOTOOLS_AUTORECONF="yes" -inherit autotools-utils ${SCM} multilib - -DESCRIPTION="Collection of utilities and tests for VA-API" -HOMEPAGE="https://01.org/linuxmedia/vaapi" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SRC_URI="" -else - SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -if [ "${PV%9999}" = "${PV}" ] ; then - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" -else - KEYWORDS="" -fi -IUSE="+drm test wayland X" - -RDEPEND=" - >=x11-libs/libva-2.0.0[drm?,wayland?,X?] - drm? ( >=x11-libs/libdrm-2.4 ) - X? ( - >=x11-libs/libX11-1.6.2 - >=x11-libs/libXext-1.3.2 - >=x11-libs/libXfixes-5.0.1 - ) - wayland? ( >=dev-libs/wayland-1.0.6 )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="|| ( drm wayland X )" - -DOCS=( CONTRIBUTING.md README.md ) - -src_prepare() { - sed -e 's/-Werror//' -i test/Makefile.am || die - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - $(use_enable X x11) - $(use_enable wayland) - $(use_enable drm) - $(use_enable test tests) - ) - autotools-utils_src_configure -} diff --git a/media-video/libva-utils/libva-utils-2.1.0.ebuild b/media-video/libva-utils/libva-utils-2.1.0.ebuild new file mode 100644 index 000000000000..6c7521ce0786 --- /dev/null +++ b/media-video/libva-utils/libva-utils-2.1.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +SCM="" +if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild + SCM=git-r3 + EGIT_BRANCH=master + EGIT_REPO_URI="https://github.com/intel/libva-utils" +fi + +AUTOTOOLS_AUTORECONF="yes" +inherit autotools-utils ${SCM} multilib + +DESCRIPTION="Collection of utilities and tests for VA-API" +HOMEPAGE="https://01.org/linuxmedia/vaapi" +if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild + SRC_URI="" +else + SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="MIT" +SLOT="0" +if [ "${PV%9999}" = "${PV}" ] ; then + KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +else + KEYWORDS="" +fi +IUSE="+drm test wayland X" + +RDEPEND=" + >=x11-libs/libva-2.0.0:=[drm?,wayland?,X?] + drm? ( >=x11-libs/libdrm-2.4 ) + X? ( + >=x11-libs/libX11-1.6.2 + >=x11-libs/libXext-1.3.2 + >=x11-libs/libXfixes-5.0.1 + ) + wayland? ( >=dev-libs/wayland-1.0.6 )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +REQUIRED_USE="|| ( drm wayland X )" + +DOCS=( CONTRIBUTING.md README.md ) + +src_prepare() { + sed -e 's/-Werror//' -i test/Makefile.am || die + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=( + $(use_enable X x11) + $(use_enable wayland) + $(use_enable drm) + $(use_enable test tests) + ) + autotools-utils_src_configure +} diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild index 98dff65e7b52..6c7521ce0786 100644 --- a/media-video/libva-utils/libva-utils-9999.ebuild +++ b/media-video/libva-utils/libva-utils-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -7,7 +7,7 @@ SCM="" if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild SCM=git-r3 EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/01org/libva-utils" + EGIT_REPO_URI="https://github.com/intel/libva-utils" fi AUTOTOOLS_AUTORECONF="yes" @@ -18,7 +18,7 @@ HOMEPAGE="https://01.org/linuxmedia/vaapi" if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild SRC_URI="" else - SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" fi LICENSE="MIT" diff --git a/media-video/libva-utils/metadata.xml b/media-video/libva-utils/metadata.xml index f539c20c15b0..6a47b632dfe2 100644 --- a/media-video/libva-utils/metadata.xml +++ b/media-video/libva-utils/metadata.xml @@ -9,6 +9,6 @@ Enables VA/DRM API support. - 01org/libva-utils + intel/libva-utils diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index c14b4ec7332b..2be7d8cf61c5 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,11 +1,12 @@ 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-vdpau-x11.patch 543 BLAKE2B 5e8b01243a8fd8a09389adeefadd2e3631a679138b3e50d100737703854121bb02815829dcc2ff408ad90389cba95da8ba1e4585e8c8dbd25ef52c9802f56f2e SHA512 c0dfdca8075fd8bdad7cde99e163ba5d55e6268883f852917e287eeeace85b06e244b727bd87501c77ff72fce4b6ba317d45694f1086b5cd1a63fe3ca222f805 +AUX mplayer-1.3-vdpau-x11.patch 547 BLAKE2B b168b61f5712788c25164cf286a119de1d42c1a142048fc8b138226d146614d7fc454dd7a5c05bfcbdef815bf5d5e18064e2893a3adecd0733fcb79a803a5876 SHA512 439c7925f97b973597239a8f684171e752321dad4bae80a3a2bad46dcf6bf0c49b0839cd5cdac5c8e0b9f5c165061b4177d05cd8060ebba6cd5c4e730ab019ab AUX prepare_mplayer.sh 757 BLAKE2B 5de1cb4b17628dd5443f98a20717f8ed028a76446104a471a669b1c7ed7a5b76a8e86203f436240312ac4814a0ba7dba7856bb4f3723da850188a3003aae8bbb SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae 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-r3.ebuild 17268 BLAKE2B 39bc007a2cd9c4d24423e34f4b5748225bb3eb673866e363e52f4cea715ce0a7c5ffd4768bd662e153b66290c07a2fe3bee0215aba30c70a5f4eab5339602d6a SHA512 1ef846cce25623acb7f58ea8f359b9ec3acf545c7c38f463d7df129bfe768d01f863bd852037244807fa8c1370660686f7c45a34756c42f8c60dd4548c0b79d1 -EBUILD mplayer-9999.ebuild 17132 BLAKE2B 9d444e6097f769bdf7e2a02ee0f208939a21975dda02af25757f48d971913d5bcf65eeaa3f24345e5b4864cd0c058e3ddef83ad3fe6fc09abc21aa9141a9258b SHA512 79b644282fc1b5111d3b7ecfc65294b8e07034efd79ff512db3d607e804d7483b647f82aa7e66f9e32621d5c0721f7e6ca66f138f57dd42498f49f082742d53b +EBUILD mplayer-1.3.0-r4.ebuild 17195 BLAKE2B ed7c637741d29fc34e4ccabb168a083705ee38e8b936c2ba9bf09692d52c16fb3bab09454806642c4502ed2d177c13898c2b8b3ec707d5d661f4bfd866c5f96e SHA512 f220b5fcd06a375f48d28aafa3e6ac0ec26fe9d88e1eff531e53f3b546879ac9abaa722dbf30b74b62921b1ecdc1fa05ca8e5c9edbcb6d60fd8077e2084c36c7 +EBUILD mplayer-9999.ebuild 17044 BLAKE2B 1b85b2ca48e0f3df600c89e2c6f4bafb30e7c2c38f0d9c3cef8026528d85ce2fa851fa5d6399560a7ffe89ac3accd78909b1b187a04a0b52285eec0628c63830 SHA512 b4fdf43ac7782b680a8095a440a33db08f60c15fdbca24a1e89b55417d18639844cc8883e6d79daac9f0bca77df1b623f6c3b2676725f27a4e5451a08d2f8a68 MISC metadata.xml 2530 BLAKE2B 83baf1357e9b0d31244b7c04ceab7eec0bc7db7eb9a2de4ffc1a85cc49af40f1094d9bdbac22c9abff43c215c19e5b8c745afbd397ae7221921c24b422590e3a SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch index ae21941a8aa1..cfefb63deb94 100644 --- a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch +++ b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch @@ -7,8 +7,8 @@ commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 . Index: libvo/vo_vdpau.c =================================================================== ---- libvo/vo_vdpau.c (revision 37931) -+++ libvo/vo_vdpau.c (revision 37932) +--- a/libvo/vo_vdpau.c (revision 37931) ++++ b/libvo/vo_vdpau.c (revision 37932) @@ -34,6 +34,7 @@ #include diff --git a/media-video/mplayer/mplayer-1.3.0-r4.ebuild b/media-video/mplayer/mplayer-1.3.0-r4.ebuild new file mode 100644 index 000000000000..d1f122ab57df --- /dev/null +++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild @@ -0,0 +1,629 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" +ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" +[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS="" + +inherit toolchain-funcs flag-o-matic ${SVN_ECLASS} + +IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray +bs2b cddb +cdio cdparanoia cpudetection debug dga +doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon +ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa ++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas ++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" + +VIDEO_CARDS="mga tdfx" +for x in ${VIDEO_CARDS}; do + IUSE+=" video_cards_${x}" +done + +FONT_URI=" + mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 + mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 + mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 +" +if [[ ${PV} == *9999* ]]; then + RELEASE_URI="" +elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then + MY_P="MPlayer-${PV}" + S="${WORKDIR}/${MY_P}" + RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz" +else + RELEASE_URI="mirror://gentoo/${P}.tar.xz" +fi +SRC_URI="${RELEASE_URI} + !truetype? ( ${FONT_URI} )" + +DESCRIPTION="Media Player for Linux" +HOMEPAGE="http://www.mplayerhq.hu/" + +FONT_RDEPS=" + virtual/ttf-fonts + media-libs/fontconfig + >=media-libs/freetype-2.2.1:2 +" +X_RDEPS=" + x11-libs/libXext + x11-libs/libXxf86vm +" +# Rar: althrought -gpl version is nice, it cant do most functions normal rars can +# nemesi? ( net-libs/libnemesi ) +RDEPEND+=" + sys-libs/ncurses:0= + app-arch/bzip2 + sys-libs/zlib + >=media-video/ffmpeg-3.0:0=[vdpau?] + a52? ( media-libs/a52dec ) + aalib? ( media-libs/aalib ) + alsa? ( media-libs/alsa-lib ) + bidi? ( dev-libs/fribidi ) + bluray? ( >=media-libs/libbluray-0.2.1:= ) + bs2b? ( media-libs/libbs2b ) + cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) + cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) + 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? ( + !twolame? ( toolame? ( media-sound/toolame ) ) + twolame? ( media-sound/twolame ) + faac? ( media-libs/faac ) + mp3? ( media-sound/lame ) + x264? ( >=media-libs/x264-0.0.20100423:= ) + xvid? ( media-libs/xvid ) + ) + enca? ( app-i18n/enca ) + faad? ( media-libs/faad2 ) + ggi? ( media-libs/libggi media-libs/libggiwmh ) + gif? ( media-libs/giflib:0= ) + gsm? ( media-sound/gsm ) + iconv? ( virtual/libiconv ) + jack? ( virtual/jack ) + jpeg? ( virtual/jpeg:0 ) + ladspa? ( media-libs/ladspa-sdk ) + libass? ( >=media-libs/libass-0.9.10:= ) + libcaca? ( media-libs/libcaca ) + libmpeg2? ( media-libs/libmpeg2 ) + lirc? ( app-misc/lirc ) + live? ( media-plugins/live ) + lzo? ( >=dev-libs/lzo-2 ) + mad? ( media-libs/libmad ) + mng? ( media-libs/libmng:= ) + mp3? ( media-sound/mpg123 ) + nas? ( media-libs/nas ) + nut? ( >=media-libs/libnut-661 ) + openal? ( media-libs/openal ) + opengl? ( virtual/opengl ) + png? ( media-libs/libpng:0= ) + pnm? ( media-libs/netpbm ) + pulseaudio? ( media-sound/pulseaudio ) + rar? ( + || ( + app-arch/unrar + app-arch/rar + ) + ) + rtmp? ( media-video/rtmpdump ) + samba? ( net-fs/samba ) + sdl? ( media-libs/libsdl ) + speex? ( media-libs/speex ) + theora? ( media-libs/libtheora[encode?] ) + tremor? ( media-libs/tremor ) + truetype? ( ${FONT_RDEPS} ) + vdpau? ( x11-libs/libvdpau ) + vorbis? ( !tremor? ( media-libs/libvorbis ) ) + X? ( ${X_RDEPS} ) + xinerama? ( x11-libs/libXinerama ) + xscreensaver? ( x11-libs/libXScrnSaver ) + xv? ( x11-libs/libXv ) + xvmc? ( x11-libs/libXvMC ) +" + +X_DEPS=" + x11-proto/videoproto + x11-proto/xf86vidmodeproto +" +ASM_DEP="dev-lang/yasm" +DEPEND="${RDEPEND} + virtual/pkgconfig + dga? ( x11-proto/xf86dgaproto ) + X? ( ${X_DEPS} ) + xinerama? ( x11-proto/xineramaproto ) + xscreensaver? ( x11-proto/scrnsaverproto ) + amd64? ( ${ASM_DEP} ) + doc? ( + dev-libs/libxslt app-text/docbook-xml-dtd + app-text/docbook-xsl-stylesheets + ) + x86? ( ${ASM_DEP} ) + x86-fbsd? ( ${ASM_DEP} ) +" +RDEPEND+=" + selinux? ( sec-policy/selinux-mplayer ) +" + +SLOT="0" +LICENSE="GPL-2" +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" +fi + +# faac codecs are nonfree +# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio +# dvd navigation requires dvd read support +# 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 ) + enca? ( iconv ) + ggi? ( X ) + libass? ( truetype ) + opengl? ( X ) + osdmenu? ( X ) + truetype? ( iconv ) + vdpau? ( X ) + vidix? ( X ) + xinerama? ( X ) + xscreensaver? ( X ) + xv? ( X ) + xvmc? ( xv )" +RESTRICT="faac? ( bindist )" + +PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" ) + +pkg_setup() { + if [[ ${PV} == *9999* ]]; then + elog + elog "This is a live ebuild which installs the latest from upstream's" + elog "subversion repository, and is unsupported by Gentoo." + elog "Everything but bugs in the ebuild itself will be ignored." + elog + fi + + if use cpudetection; then + ewarn + ewarn "You've enabled the cpudetection flag. This feature is" + ewarn "included mainly for people who want to use the same" + ewarn "binary on another system with a different CPU architecture." + ewarn "MPlayer will already detect your CPU settings by default at" + ewarn "buildtime; this flag is used for runtime detection." + ewarn "You won't need this turned on if you are only building" + ewarn "mplayer for this system. Also, if your compile fails, try" + ewarn "disabling this use flag." + fi + + if has_version 'media-video/libav' ; then + ewarn "Please note that upstream uses media-video/ffmpeg." + ewarn "media-video/libav should be fine in theory but if you" + ewarn "experience any problem, try to move to media-video/ffmpeg." + fi +} + +src_unpack() { + if [[ ${PV} = *9999* ]]; then + subversion_src_unpack + cd "${WORKDIR}" + rm -rf "${WORKDIR}/${P}/ffmpeg/" + ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack ) + else + unpack ${A} + fi + + if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then + cd "${S}" + cp "${FILESDIR}/dump_ffmpeg.sh" . || die + chmod +x dump_ffmpeg.sh + ./dump_ffmpeg.sh || die + fi + + if ! use truetype; then + unpack font-arial-iso-8859-1.tar.bz2 \ + font-arial-iso-8859-2.tar.bz2 \ + font-arial-cp1250.tar.bz2 + fi +} + +src_prepare() { + default + + local svf=snapshot_version + if [[ ${PV} = *9999* ]]; then + # Set SVN version manually + subversion_wc_info + printf "${ESVN_WC_REVISION}" > $svf + else + eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch + fi + if [ ! -f VERSION ] ; then + [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" + local sv=$(<$svf) + printf "SVN-r${sv} (Gentoo)" > VERSION + fi + + # fix path to bash executable in configure scripts + sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die + + # Use sane default for >=virtual/udev-197 + sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die +} + +src_configure() { + local myconf="" + local uses i + + # set LINGUAS + [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}" + [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968 + + # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable + # compilation in almost every situation. The reason for this is + # because if --enable is used, it will force the build of that option, + # regardless of whether the dependency is available or not. + + ################### + #Optional features# + ################### + # disable svga since we don't want it + # disable arts since we don't have kde3 + # always disable internal ass + # disable opus and ilbc since it only controls support in internal + # ffmpeg which we do not use + myconf+=" + --disable-svga --disable-svgalib_helper + --disable-ass-internal + --disable-arts + --disable-kai + --disable-libopus + --disable-libilbc + $(use_enable network networking) + $(use_enable joystick) + " + uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild + myconf+=" --disable-nemesi" # nemesi automagic disable + for i in ${uses}; do + use ${i} || myconf+=" --disable-${i}" + done + use bidi || myconf+=" --disable-fribidi" + use ipv6 || myconf+=" --disable-inet6" + use libass || myconf+=" --disable-ass" + use nut || myconf+=" --disable-libnut" + use rar || myconf+=" --disable-unrarexec" + use samba || myconf+=" --disable-smb" + use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir" + + # libcdio support: prefer libcdio over cdparanoia + # don't check for cddb w/cdio + if use cdio; then + myconf+=" --disable-cdparanoia" + else + myconf+=" --disable-libcdio" + use cdparanoia || myconf+=" --disable-cdparanoia" + use cddb || myconf+=" --disable-cddb" + fi + + ################################ + # DVD read, navigation support # + ################################ + # + # dvdread - accessing a DVD + # dvdnav - navigation of menus + use dvd || myconf+=" --disable-dvdread" + use dvdnav || myconf+=" --disable-dvdnav" + + ############# + # Subtitles # + ############# + # + # SRT/ASS/SSA (subtitles) requires freetype support + # freetype support requires iconv + # iconv optionally can use unicode + use truetype || myconf+=" --disable-freetype" + use iconv || myconf+=" --disable-iconv --charset=noconv" + use iconv && use unicode && myconf+=" --charset=UTF-8" + + ##################################### + # DVB / Video4Linux / Radio support # + ##################################### + myconf+=" --disable-tv-bsdbt848" + # broken upstream, won't work with recent kernels + myconf+=" --disable-ivtv" + # gone since linux-headers-2.6.38 + myconf+=" --disable-tv-v4l1" + if { use dvb || use v4l || use pvr || use radio; }; then + use dvb || myconf+=" --disable-dvb" + use pvr || myconf+=" --disable-pvr" + use v4l || myconf+=" --disable-tv-v4l2" + if use radio && { use dvb || use v4l; }; then + myconf+=" + --enable-radio + $(use_enable encode radio-capture) + " + else + myconf+=" + --disable-radio-v4l2 + --disable-radio-bsdbt848 + " + fi + else + myconf+=" + --disable-tv + --disable-tv-v4l2 + --disable-radio + --disable-radio-v4l2 + --disable-radio-bsdbt848 + --disable-dvb + --disable-v4l2 + --disable-pvr" + fi + + ########## + # Codecs # + ########## + myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support + myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2 + use dts || myconf+=" --disable-libdca" + if ! use mp3; then + myconf+=" + --disable-mp3lame + --disable-mpg123 + " + fi + uses="a52 bs2b dv gsm lzo rtmp vorbis" + for i in ${uses}; do + use ${i} || myconf+=" --disable-lib${i}" + done + + uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" + for i in ${uses}; do + use ${i} || myconf+=" --disable-${i}" + done + # Pulls an outdated libopenjpeg, ffmpeg provides better support for it + myconf+=" --disable-libopenjpeg" + + # Encoding + uses="faac x264 xvid toolame twolame" + if use encode; then + for i in ${uses}; do + use ${i} || myconf+=" --disable-${i}" + done + else + myconf+=" --disable-mencoder" + for i in ${uses}; do + myconf+=" --disable-${i}" + use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled." + done + fi + + ################# + # Binary codecs # + ################# + myconf+=" --disable-qtx --disable-real --disable-win32dll" + + ################ + # Video Output # + ################ + uses="md5sum sdl yuv4mpeg" + for i in ${uses}; do + use ${i} || myconf+=" --disable-${i}" + done + use aalib || myconf+=" --disable-aa" + use fbcon || myconf+=" --disable-fbdev" + use libcaca || myconf+=" --disable-caca" + use zoran || myconf+=" --disable-zr" + + if ! use kernel_linux || ! use video_cards_mga; then + myconf+=" --disable-mga --disable-xmga" + fi + + if use video_cards_tdfx; then + myconf+=" + $(use_enable video_cards_tdfx tdfxvid) + $(use_enable fbcon tdfxfb) + " + else + myconf+=" + --disable-3dfx + --disable-tdfxvid + --disable-tdfxfb + " + fi + + # sun card, disable by default, see bug #258729 + myconf+=" --disable-xvr100" + + ################ + # Audio Output # + ################ + myconf+=" --disable-esd" + uses="alsa jack ladspa nas openal" + for i in ${uses}; do + use ${i} || myconf+=" --disable-${i}" + done + use pulseaudio || myconf+=" --disable-pulse" + if ! use radio; then + use oss || myconf+=" --disable-ossaudio" + fi + + #################### + # Advanced Options # + #################### + # Platform specific flags, hardcoded on amd64 (see below) + use cpudetection && myconf+=" --enable-runtime-cpudetection" + + uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3" + for i in ${uses}; do + myconf+=" $(use_enable cpu_flags_x86_${i} ${i})" + done + + uses="altivec shm" + for i in ${uses}; do + myconf+=" $(use_enable ${i})" + done + + use debug && myconf+=" --enable-debug=3" + + if use x86 && gcc-specs-pie; then + filter-flags -fPIC -fPIE + append-ldflags -nopie + fi + + ########################### + # X enabled configuration # + ########################### + myconf+=" --disable-gui" + myconf+=" --disable-vesa" + uses="ggi vdpau xinerama xv" + for i in ${uses}; do + use ${i} || myconf+=" --disable-${i}" + done + use dga || myconf+=" --disable-dga1 --disable-dga2" + use opengl || myconf+=" --disable-gl" + use osdmenu && myconf+=" --enable-menu" + 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 # + ############################ + if use aqua; then + myconf+=" + --enable-macosx-finder + --enable-macosx-bundle + " + fi + + ./configure \ + --cc="$(tc-getCC)" \ + --host-cc="$(tc-getBUILD_CC)" \ + --prefix="${EPREFIX}/usr" \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --confdir="${EPREFIX}/etc/mplayer" \ + --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \ + --mandir="${EPREFIX}/usr/share/man" \ + --disable-ffmpeg_a \ + ${myconf} || die +} + +src_compile() { + default + + # Build only user-requested docs if they're available. + if use doc ; then + # select available languages from $LINGUAS + local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN" + local BUILT_DOCS="" + for i in ${LINGUAS} ; do + has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}" + done + if [[ -z $BUILT_DOCS ]]; then + emake -j1 html-chunked + else + for i in ${BUILT_DOCS}; do + emake -j1 html-chunked-${i} + done + fi + fi +} + +src_install() { + local i + + emake \ + DESTDIR="${D}" \ + INSTALLSTRIP="" \ + install + + dodoc AUTHORS Changelog Copyright README etc/codecs.conf + + docinto tech/ + dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist} + docinto TOOLS/ + dodoc -r TOOLS + docinto tech/mirrors/ + dodoc DOCS/tech/mirrors/* + + if use doc; then + docinto html/ + dohtml -r "${S}"/DOCS/HTML/* + fi + + if ! use truetype; then + dodir /usr/share/mplayer/fonts + # Do this generic, as the mplayer people like to change the structure + # of their zips ... + for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do + cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts" + done + # Fix the font symlink ... + rm -rf "${ED}/usr/share/mplayer/font" + dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font + fi + + insinto /etc/mplayer + newins "${S}/etc/example.conf" mplayer.conf + cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ +# Config options can be section specific, global +# options should go in the default section +[default] +_EOF_ + doins "${S}/etc/input.conf" + if use osdmenu; then + doins "${S}/etc/menu.conf" + fi + + if use truetype; then + cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ +fontconfig=1 +subfont-osd-scale=4 +subfont-text-scale=3 +_EOF_ + fi + + # bug 256203 + if use rar; then + cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ +unrarexec=${EPREFIX}/usr/bin/unrar +_EOF_ + fi + + dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf + newbin "${S}/TOOLS/midentify.sh" midentify +} + +pkg_preinst() { + [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \ + rm -rf "${EROOT}/usr/share/mplayer/Skin/default" +} + +pkg_postrm() { + # Cleanup stale symlinks + [ -L "${EROOT}/usr/share/mplayer/font" -a \ + ! -e "${EROOT}/usr/share/mplayer/font" ] && \ + rm -f "${EROOT}/usr/share/mplayer/font" + + [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \ + ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \ + rm -f "${EROOT}/usr/share/mplayer/subfont.ttf" +} diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index b75b7dbc479e..bc3255c47039 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" -[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS="" +[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3" || SVN_ECLASS="" -inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} +inherit toolchain-funcs flag-o-matic ${SVN_ECLASS} IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga -directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon +doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr @@ -69,7 +69,6 @@ RDEPEND+=" cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) - directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) @@ -238,6 +237,8 @@ src_unpack() { } src_prepare() { + default + local svf=snapshot_version if [[ ${PV} = *9999* ]]; then # Set SVN version manually @@ -253,8 +254,6 @@ src_prepare() { # fix path to bash executable in configure scripts sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die - base_src_prepare - # Use sane default for >=virtual/udev-197 sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die } @@ -414,7 +413,7 @@ src_configure() { ################ # Video Output # ################ - uses="directfb md5sum sdl yuv4mpeg" + uses="md5sum sdl yuv4mpeg" for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done @@ -524,7 +523,8 @@ src_configure() { } src_compile() { - base_src_compile + default + # Build only user-requested docs if they're available. if use doc ; then # select available languages from $LINGUAS diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 26fb0e23e73a..8f034dd48d5f 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,19 +1,15 @@ -AUX 0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch 1456 BLAKE2B e74c5828301daa303ee1fa826b96b06827ca6fa8fc9652cb6cd6f6e1fd82e002f4023a97c239cf332881a4f6686ea9b9d786d31e57fea7c1e06edecfc5877c2a SHA512 42cb00778b84157eff45d5143c3e1a232f7c98377d33aa9dbbb30122e678458168fe651b959656f00916a86069b727e814a6b8a9a7d10cd58f45dace2db32ef7 -AUX 0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch 2102 BLAKE2B 507ffa5983e2988889f82de786771bc4ff8ba6d5c7ca32cf16443e76906a93a101861098aa5e5c58c48b0eeeac0db74e787b1a8b452115d1ce45888d6ac37e5c SHA512 b2bfcb9529e2b90f786b3277a54018dedc3d8f38db5bf1f45c2df365ea297f05fc93524d225a308078b353f7be3c830e4091070a30a6ca30d767b8d207cb01bd -AUX 0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch 996 BLAKE2B 67988decbfe56b78541ba8786d4a12d124177278b424fad796ce814bb3befefce9dd9ffa7048eb727676769f3273a35137b184151ad1f1f9bdaf73c22bbf6fdd SHA512 cb2e04515da4f4d1154f489327ec282b75e71c8257477ac2f2602bb21b7c2765b2b6ebc7e5c7e1f6a57f271a804e694a9bf8dd25aa71b34fa13ab7a0ee21283e -AUX 0.27.0/mpv-0.27.0-support-libva2.patch 2918 BLAKE2B c9e217ebc0e42b56c327f8437a396dcb523ceeba3d2c2684a62babacb6bd3db636cd2e23e3311e0c57000e261f74b7c693aa128eedbb9b3f6f48d85e04beca3a SHA512 ece9f59d7875ba881bc9e913c3e44449401e0cc0bcfd46493f4c0d167e853bac9033fd7af2c15056768289709ec2a8d6b54c571360c140bbec3fd9d947c6b50b AUX mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch 1456 BLAKE2B 0d360a6470830fd2c76cc75a1712976112bdfc8269d04ec42de054d1f63d3e028b9ee61adc7d49500479f0f14955a627a34d797b512a9a9f976bc6b45b1e47b6 SHA512 f4865f5ed364012f1cba98c7522f43050c158e36f0100350e87db18636913bdad0b668c62283362366aba10f58db13297d21b111596475200283471d7da058a6 AUX mpv-0.23.0-make-libavdevice-check-accept-libav.patch 694 BLAKE2B 655bf30240ac95f63385bd3bb3c5c9da264aedfb20c2e4abbf43d17dbdb9f5f7a79c6b8d056f6bec32144be87a23b88f0722d6193ad216771bd9e220ef7efa76 SHA512 15861e0f27598c626a5f39319b473483d5d1cec26ca2aad928f6cc751568d7c6eab9bac479665677da92c5c962a3060a8b7cc02899390702e7fed370c28d9a6e AUX mpv-0.25.0-fix-float-comparisons-in-tests.patch 2096 BLAKE2B 88cfe962f3c9901e39837a8c890d0d07f362f3f5b2c1d9adc6cadffddb19bf38b918c76bdeb1d634a62ad09115c1d4adcfe218a3202843542d1d751e60e1d449 SHA512 46fdb40f0eafc9fdbf180d0334de5b57a3949b4479835750462414a996272da3ae816d62f58fc986f448045e4e8f8121cebbad19a0a031c589f5ed346a210875 +AUX mpv-0.27.0-add-missing-link-flags-for-rpi.patch 988 BLAKE2B 2dc3c70dbb0565db93fbaa9852e37afd1d953e896bb820095afdac8bc8d1bba52fca07173a63d306990e7c72611afb40e22a21d1bc8293b69691d4f5252c2753 SHA512 bb204c5910d927d3dd159fe17f8edecbbc80a9d36b60d83f08d10181e019fcb140a701d2b3d4c6436d08ef0ebe95fb81bb5d7467c2b63a1b098ba412defeea32 DIST mpv-0.25.0-patches-r2.tar.xz 11036 BLAKE2B 09fdd566c5fcca290829c536c9e41b655e254d64e63714281119d62e6963f07f8d384eccb3f8ea6ccb2a9b63a60e19bb7ff1fd4b8e4ccccdc9b1fd8e58a7c628 SHA512 fc8d2a23dff27131d2c18d3f91861ec6e6d5240e6531d1a04c06ebef8d5467250c4f131d9faee802842e1ea485dbf350b43a3eebcc13c230cd45ff875fc855e2 DIST mpv-0.25.0.tar.gz 2874584 BLAKE2B c64321b50fd635f82bbcbce5cdefee1d0da011558cebdacd3339aaa14162f659c955bea75341ed21096eea5b689e4c1ca4d2d97feff1f4026044ddd61bdd9944 SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf -DIST mpv-0.26.0.tar.gz 2916212 BLAKE2B b6402868face65c1179351697eff02116765eecdd105eef621faa73dc77f376aa060476bc80b92eba4839c46836c13bce0e56c6dccf0fe1aa49b1cfa463ec43e SHA512 fd772b4765317eb1ea3b54f12b86e0ac6c4d5e9d16895eb5bebe2e074a01f6b790981b9b34a87d9b23e4291149d3a7154b09fba4a259cec1949a6aa88d6ddec7 -DIST mpv-0.27.0.tar.gz 2956816 BLAKE2B 2af0fc7edbecb552fd7df93dcd9124fd4e30a2c29aa53d2139f2817356a6c4eb82eed74a8fdf0493ebb0315cb2806d76a8b2d8c24706975acf4d4704fd291dac SHA512 22738f907d84d362095773972f685e3b03ab4c8172a22ddede290fc221a83ab9135b96f8b18191dabe842b2963f68983929cf065097287fc1a054a7d5f1d0ae4 -DIST mpv-0.28.0.tar.gz 2982165 BLAKE2B 50f095d499df9685dec958287c159fc88be3b5db1465264404ba7c74184569ba47c147cb6491342ba8762199290f408737d03403e454a180bd0ed8b7191d14cc SHA512 33e889f9ca2dd16ad055ccd9fc5549fcead3fd15dcbc52c6b5f3ef608cf87b3d9952e9236e3dec8e7f32240b68d0b0cff1499f511d39c8f3a0501334f5c57a70 +DIST mpv-0.27.1-patches-r0.tar.xz 6580 BLAKE2B fdf5f580fbda9ec6856354d43fd80a177464af27ea6f65ab31c610996fced64670f178956b4030c9c34d0707f8fa4544c829e4401679d2e2d6e730b19ebfe6d8 SHA512 8f25c51f0a3c6b5304090144b8343afba4d872216f8fa13890240a51ac464bd2c486b017390d4d3398d7082ffdf3e617659861f15505bd2db72b6f5ab4500bcb +DIST mpv-0.27.1.tar.gz 2957202 BLAKE2B 79dd06ba9399368f24c2c0a065218432110829af08d97cfdf753966ec7ca75e5af8f04da381f83251cb57bdce9b30c0d2d8c6fc772f73b5a0ed43139ce66a316 SHA512 3b8e12edb20b6ffdbbb02aba9cc64ad25e4fb583efc72248549641a46cc840827c1b6b017e7efc323d8a8299b7b094a676525bd978b8c3c9ecccca32fe39149a +DIST mpv-0.28.1.tar.gz 2982546 BLAKE2B ae078e3393b1113a8211699da1fea867324c50d3696ab82446996f04b2571b29791811b3d3dc082761ca36d63c9b1aa844d7cd56b740e73821b3e7ca35d39512 SHA512 7593e5dbb5963bf39f57f8a08f1b5142474897172a2c6cafcbfd3a83a2f0cfb9a3e5d62eea6625f01aae8ccc236b738511846cd5a5016b93d2510f12f0be7624 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2 EBUILD mpv-0.25.0-r2.ebuild 10902 BLAKE2B fa9ae811c53d01d32b8288696436783f9cf434d04255c45ae5efb73d68821afe5bfc3a2548fde646e11b35b4329ca61fc4bf3d18e7277538274a10440cde9069 SHA512 00c1edd4c77e859fc03d8cbadfefa7278bceb94d788d1306478fbf7b7535225c15e6dc65058eccf8251b9e6f3a4f9ce7ba04bfbc2065ccff13416fc5a32ebb7b -EBUILD mpv-0.26.0.ebuild 10622 BLAKE2B 4a1f7e2dc861811e3aa5b8ed431f2aaeb29d8074e63cc396e0fa479b11ae37179f754ced934bc6c61a3e0acfb6364d0c0fc98a20aeca852602ea287fc9471884 SHA512 dd00d0b0a0d21612c8b1235b8905bf586b022410f254cdf3d944dd7146845d58d75d8480a5f2c5b3521feb576f586093eec7f89da9f7eacfb3f6bdc55e5deb36 -EBUILD mpv-0.27.0-r1.ebuild 10611 BLAKE2B 90ca794f83fefcb510c85652bbcd5e189dd7c3a7554071f2348806032edc3b8989cb313d94c443aeffa861a541145305ce21d0b8d794e15eb8aeb26198d684b2 SHA512 07ee2752322684f398aba5f1bad5e3140b84d8f395523a62158e58d7616c2b9d6cf98e8513bd31639852c7905d8b59b02fd6a70621b7776c758ebc3793203d26 -EBUILD mpv-0.28.0.ebuild 10351 BLAKE2B 723a63983cbd7f4109b1a0dd4a36d2501368e8d3ad32e3879cec388858df77b5e3c65c55977aeed3bdeb3bf99be5be720761f15265532f37e55bb530f46ea2a5 SHA512 7cd80b8251161588786a4c0104429441b5e9ecd56cbb81af587977eb66c7177100c4ac0f239ac0f2b3587994897d75b04ecc19e26bfb0554312c8cc114c5b0d4 -EBUILD mpv-9999.ebuild 10286 BLAKE2B 8866ee5e4817eeeabed02799640ff4390ecc32c922d255052e4a2d171e157296c71b8438fb6ea9a0ed2276c54a38e9dc320cfb9ffc27f0625c3a5630051d1e15 SHA512 dd71019d9a8533a475c1bae6c7d720b4b59b72b7f2d031e314c9bebc810446d2f3a27b6c7376e6d498b7965b1c8bb9c6a9cc21306dd8528866b3bbfd1a3d3486 +EBUILD mpv-0.27.1.ebuild 10608 BLAKE2B 8cf9467e23e5080042318407d4fa6ddf36a20688a051e4d0fe6935350687f8a433152aef4e4d9816d42806869bffd32a7f45f3e36125bc6521dbeeb70caf2375 SHA512 740a8339bf62af2916613c8c006f8938cd2ebe7d1a3eb6196f8f18d3757718298ed1a822bfb583b6a70f7b5218c7c6035ee0996f3715fbdb6eb1869c5a3c9d15 +EBUILD mpv-0.28.1.ebuild 10271 BLAKE2B bc1b2cb09fce5a7418832441a470a582c4e56c695266018b714c1e2d1da5680dfa854177a471b1ba6d9c7672a2ffc67b94af7b909839229d90cdd134d5edab49 SHA512 095ba672f0b62795348fa95ef491aa53e93ce1a339e8e09f27275e383864494652ff98fefcc11a0bed9398632adb420de2a1f250012718d0bc70d6b3e26f30f5 +EBUILD mpv-9999.ebuild 10141 BLAKE2B a184019b35680564e5065e227553cf1e259381a093406abd1d4c43d6b8b26a0b3c8c9dbaddbca033cd4c437f011c21861fb2f5413a4ec8b9ceb41452b781cc36 SHA512 c8c70c8180a2ea232558b678d95d1f975235bade86073b0586fe99da77c092c34b126f8a833f1eb3b2853a01800d97eb1ab241f7d2b017ddee6665b557c73a87 MISC metadata.xml 2376 BLAKE2B c585e5f1e6e5c91ad9c3ad25de75bde9f01188950bafdf016c2f3b55a5cc74e48775667e173962178f13bbae5b40d2a386144bba7343ec21a2b60f2ee9c1c6c7 SHA512 8da450ad8b003eacfc8aab85b8774206163305750c559e4e7e4e8a56b4e3c398f9cea970430b37d26069c6ec333a4ae860c012a63d702dfb24dc65089edaa604 diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch deleted file mode 100644 index e83be2250e72..000000000000 --- a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit b881881dbd38a1720a9f8401fd1baafdd0dfccc0 -Author: wm4 -Date: Tue Sep 19 18:33:37 2017 +0200 - -Revert "vd_lavc: change auto-probe order to prefer cuda over vdpau-copy" - -This reverts commit 96462040ec79b353457b64949f96fad30bd6e988. - -I guess the autoprobing is still too primitive to handle this well. What -it really should be trying is initializing the wrapper decoder, and if -that doesn't work, try another method. This is complicated by hwaccels -initializing in a delayed way, so there is no easy solution yet. - -Probably fixes #4865. - -diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c -index 476beeb9e..e08246a29 100644 ---- a/video/decode/vd_lavc.c -+++ b/video/decode/vd_lavc.c -@@ -261,11 +261,16 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { - #endif - #if HAVE_VDPAU_HWACCEL - &mp_vd_lavc_vdpau, -+ &mp_vd_lavc_vdpau_copy, - #endif - #if HAVE_VIDEOTOOLBOX_HWACCEL - &mp_vd_lavc_videotoolbox, - &mp_vd_lavc_videotoolbox_copy, - #endif -+#if HAVE_VAAPI_HWACCEL -+ &mp_vd_lavc_vaapi, -+ &mp_vd_lavc_vaapi_copy, -+#endif - #if HAVE_D3D_HWACCEL - &mp_vd_lavc_d3d11va, - -@@ -285,13 +290,6 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { - &mp_vd_lavc_cuda_old, - #endif - &mp_vd_lavc_cuda_copy, --#endif --#if HAVE_VDPAU_HWACCEL -- &mp_vd_lavc_vdpau_copy, --#endif --#if HAVE_VAAPI_HWACCEL -- &mp_vd_lavc_vaapi, -- &mp_vd_lavc_vaapi_copy, - #endif - &mp_vd_lavc_crystalhd, - NULL diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch deleted file mode 100644 index f7d3129d8559..000000000000 --- a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 810990a7465f31ee5ff5e29ebea1fb783e5ed502 -Author: wm4 -Date: Tue Sep 19 18:59:01 2017 +0200 - -mp_image: always copy color attributes on hw download - -It was noticed that -copy hwdec modes typically dropped the -chroma_location field. This happened because the attributes on hw -download are copied with mp_image_copy_attributes(), which tries to copy -these parameters only if src and dst were both YUV (in an attempt to -copy parameters only if it makes sense). - -But hardware formats did not have the YUV flag set (anymore?), and code -shouldn't attempt to check the flag in this way anyway. Drop the check, -and always copy the whole color metadata struct. There is a call to -mp_image_params_guess_csp() below, which tries to unset nonsense -metadata if it was copied from a YUV format to RGB. This function would -also do the right thing for hw formats (although for the cited bug only -the software case matters). - -Fixes #4804. - -diff --git a/video/mp_image.c b/video/mp_image.c -index 7180e2be5..5aa564775 100644 ---- a/video/mp_image.c -+++ b/video/mp_image.c -@@ -525,15 +525,8 @@ void mp_image_copy_attributes(struct mp_image *dst, struct mp_image *src) - dst->params.p_w = src->params.p_w; - dst->params.p_h = src->params.p_h; - } -- dst->params.color.primaries = src->params.color.primaries; -- dst->params.color.gamma = src->params.color.gamma; -- dst->params.color.sig_peak = src->params.color.sig_peak; -- dst->params.color.light = src->params.color.light; -- if ((dst->fmt.flags & MP_IMGFLAG_YUV) == (src->fmt.flags & MP_IMGFLAG_YUV)) { -- dst->params.color.space = src->params.color.space; -- dst->params.color.levels = src->params.color.levels; -- dst->params.chroma_location = src->params.chroma_location; -- } -+ dst->params.color = src->params.color; -+ dst->params.chroma_location = src->params.chroma_location; - dst->params.spherical = src->params.spherical; - mp_image_params_guess_csp(&dst->params); // ensure colorspace consistency - if ((dst->fmt.flags & MP_IMGFLAG_PAL) && (src->fmt.flags & MP_IMGFLAG_PAL)) { diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch deleted file mode 100644 index 3f2a5d1f56a3..000000000000 --- a/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 8810c1fc050347e1bef0d3eb89edd30c8e840648 -Author: Ilya Tumaykin -Date: Sun Sep 17 21:54:37 2017 +0300 - -build: remove duplicate android option after 72a8120da - -The first one (line 140) comes from 69650851f8 and is the correct one. -The second one (line 731) comes from 72a8120daa and slipped in with the -revert commit. - -Remove the second one. - -diff --git a/wscript b/wscript -index 9d885884d..9fe5b0bc8 100644 ---- a/wscript -+++ b/wscript -@@ -727,10 +727,6 @@ video_output_features = [ - 'desc': 'Direct3D support', - 'deps': [ 'win32-desktop' ], - 'func': check_cc(header_name='d3d9.h'), -- }, { -- 'name': '--android', -- 'desc': 'Android support', -- 'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header - }, { - # We need MMAL/bcm_host/dispmanx APIs. Also, most RPI distros require - # every project to hardcode the paths to the include directories. Also, diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch deleted file mode 100644 index 8ae7f537682f..000000000000 --- a/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch +++ /dev/null @@ -1,86 +0,0 @@ -commit 2ecf240b1cd20875991a5b18efafbe799864ff7f -Author: Mark Thompson -Date: Mon Oct 9 20:10:26 2017 +0100 - -vaapi: Use libva2 message callbacks - -They are no longer global, so they work vaguely sensibly. - -diff --git a/video/vaapi.c b/video/vaapi.c -index 6bedbbaa18..3b1cb9cc41 100644 ---- a/video/vaapi.c -+++ b/video/vaapi.c -@@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp) - return 0; - } - --// VA message callbacks are global and do not have a context parameter, so it's --// impossible to know from which VADisplay they originate. Try to route them --// to existing mpv/libmpv instances within this process. -+#if VA_CHECK_VERSION(1, 0, 0) -+static void va_message_callback(void *context, const char *msg, int mp_level) -+{ -+ struct mp_vaapi_ctx *res = context; -+ mp_msg(res->log, mp_level, "libva: %s", msg); -+} -+ -+static void va_error_callback(void *context, const char *msg) -+{ -+ va_message_callback(context, msg, MSGL_ERR); -+} -+ -+static void va_info_callback(void *context, const char *msg) -+{ -+ va_message_callback(context, msg, MSGL_V); -+} -+#else -+// Pre-libva2 VA message callbacks are global and do not have a context -+// parameter, so it's impossible to know from which VADisplay they -+// originate. Try to route them to existing mpv/libmpv instances within -+// this process. - static pthread_mutex_t va_log_mutex = PTHREAD_MUTEX_INITIALIZER; - static struct mp_vaapi_ctx **va_mpv_clients; - static int num_va_mpv_clients; -@@ -77,6 +95,7 @@ static void va_info_callback(const char *msg) - { - va_message_callback(msg, MSGL_V); - } -+#endif - - static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx) - { -@@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, - }, - }; - -+#if VA_CHECK_VERSION(1, 0, 0) -+ vaSetErrorCallback(display, va_error_callback, res); -+ vaSetInfoCallback(display, va_info_callback, res); -+#else - pthread_mutex_lock(&va_log_mutex); - MP_TARRAY_APPEND(NULL, va_mpv_clients, num_va_mpv_clients, res); - pthread_mutex_unlock(&va_log_mutex); -@@ -117,6 +140,7 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, - #ifdef VA_FOURCC_I010 - vaSetErrorCallback(va_error_callback); - vaSetInfoCallback(va_info_callback); -+#endif - #endif - - int major, minor; -@@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx) - if (ctx->destroy_native_ctx) - ctx->destroy_native_ctx(ctx->native_ctx); - -+#if !VA_CHECK_VERSION(1, 0, 0) - pthread_mutex_lock(&va_log_mutex); - for (int n = 0; n < num_va_mpv_clients; n++) { - if (va_mpv_clients[n] == ctx) { -@@ -164,6 +189,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx) - if (num_va_mpv_clients == 0) - TA_FREEP(&va_mpv_clients); // avoid triggering leak detectors - pthread_mutex_unlock(&va_log_mutex); -+#endif - - talloc_free(ctx); - } diff --git a/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch b/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch new file mode 100644 index 000000000000..411573a66251 --- /dev/null +++ b/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch @@ -0,0 +1,25 @@ +commit 48143b0cf52de37f93ae53a95261988d9b5ebff2 +Author: Ilya Tumaykin +Date: Thu Jan 26 23:51:29 2017 +0300 + +build: rpi: add missing linker flags to fix build + +See https://www.raspberrypi.org/forums/viewtopic.php?f=67&t=20005&p=194090 +and https://github.com/raspberrypi/firmware/issues/110 + +Raspberry-pi upstream also adds '-lGLESv2' when EGL is used: +https://github.com/raspberrypi/userland/blob/master/pkgconfig/egl.pc.in + +diff --git a/wscript b/wscript +index 1880f631e5..741fe1e5a4 100644 +--- a/wscript ++++ b/wscript +@@ -772,7 +772,7 @@ video_output_features = [ + lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']), + # We still need all OpenGL symbols, because the vo_opengl code is + # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. +- check_cc(lib="EGL"), ++ check_cc(lib="EGL", linkflags="-lGLESv2"), + check_cc(lib="GLESv2"), + ), + } , { diff --git a/media-video/mpv/mpv-0.26.0.ebuild b/media-video/mpv/mpv-0.26.0.ebuild deleted file mode 100644 index c3ff2f124af7..000000000000 --- a/media-video/mpv/mpv-0.26.0.ebuild +++ /dev/null @@ -1,374 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -PYTHON_REQ_USE='threads(+)' - -WAF_PV=1.9.8 - -inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils - -DESCRIPTION="Media player based on MPlayer and mplayer2" -HOMEPAGE="https://mpv.io/" - -if [[ ${PV} != *9999* ]]; then - SRC_URI="https://github.com/mpv-player/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" - DOCS=( RELEASE_NOTES ) -else - EGIT_REPO_URI="https://github.com/mpv-player/${PN}.git" - inherit git-r3 -fi -SRC_URI+=" https://waf.io/waf-${WAF_PV}" -DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) - -# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. -LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" -SLOT="0" -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb - dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca - libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband - samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib - zsh-completion" - -REQUIRED_USE=" - || ( cli libmpv ) - aqua? ( opengl ) - cuda? ( !libav opengl ) - egl? ( || ( gbm X wayland ) ) - gbm? ( drm egl opengl ) - lcms? ( opengl ) - luajit? ( lua ) - opengl? ( || ( aqua egl X raspberry-pi !cli ) ) - raspberry-pi? ( opengl ) - test? ( opengl ) - tools? ( cli ) - uchardet? ( iconv ) - v4l? ( || ( alsa oss ) ) - vaapi? ( || ( gbm X wayland ) ) - vdpau? ( X ) - wayland? ( egl ) - X? ( egl? ( opengl ) ) - xv? ( X ) - zsh-completion? ( cli ) - ${PYTHON_REQUIRED_USE} -" - -COMMON_DEPEND=" - !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) - libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) - alsa? ( >=media-libs/alsa-lib-1.0.18 ) - archive? ( >=app-arch/libarchive-3.0.0:= ) - bluray? ( >=media-libs/libbluray-0.3.0:= ) - cdda? ( dev-libs/libcdio-paranoia ) - cuda? ( >=media-video/ffmpeg-3.3:0 ) - drm? ( x11-libs/libdrm ) - dvd? ( - >=media-libs/libdvdnav-4.2.0 - >=media-libs/libdvdread-4.1.0 - ) - egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) - iconv? ( - virtual/libiconv - uchardet? ( app-i18n/uchardet ) - ) - jack? ( virtual/jack ) - javascript? ( >=dev-lang/mujs-1.0.0 ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( >=media-libs/lcms-2.6:2 ) - libass? ( - >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] - virtual/ttf-fonts - ) - libcaca? ( >=media-libs/libcaca-0.99_beta18 ) - lua? ( - !luajit? ( =media-libs/openal-1.13 ) - pulseaudio? ( media-sound/pulseaudio ) - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) - rubberband? ( >=media-libs/rubberband-1.8.0 ) - samba? ( net-fs/samba ) - sdl? ( media-libs/libsdl2[sound,threads,video] ) - v4l? ( media-libs/libv4l ) - vaapi? ( - !libav? ( >=media-video/ffmpeg-3.3:0 ) - libav? ( >=media-video/libav-13:0 ) - x11-libs/libva[drm?,X?,wayland?] - ) - vdpau? ( - !libav? ( >=media-video/ffmpeg-3.3:0 ) - libav? ( >=media-video/libav-13:0 ) - x11-libs/libvdpau - ) - wayland? ( - >=dev-libs/wayland-1.6.0 - >=x11-libs/libxkbcommon-0.3.0 - ) - X? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - opengl? ( - x11-libs/libXdamage - virtual/opengl - ) - xv? ( x11-libs/libXv ) - ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - dev-python/docutils - virtual/pkgconfig - doc? ( dev-python/rst2pdf ) - dvb? ( virtual/linuxtv-dvb-headers ) - test? ( >=dev-util/cmocka-1.0.0 ) - v4l? ( virtual/os-headers ) - zsh-completion? ( dev-lang/perl ) -" -RDEPEND="${COMMON_DEPEND} - cuda? ( x11-drivers/nvidia-drivers[X] ) - selinux? ( sec-policy/selinux-mplayer ) - tools? ( ${PYTHON_DEPS} ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" - "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" - "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" -) - -pkg_setup() { - [[ ${MERGE_TYPE} != "binary" ]] && python_setup -} - -src_prepare() { - cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die - chmod +x "${S}"/waf || die - default_src_prepare -} - -src_configure() { - tc-export CC PKG_CONFIG AR - - if tc-is-cross-compiler && use raspberry-pi; then - export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig" - # Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally. - die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344." - fi - - local mywafargs=( - --confdir="${EPREFIX}/etc/${PN}" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - - $(usex cli '' '--disable-cplayer') - $(use_enable libmpv libmpv-shared) - - --disable-libmpv-static - --disable-static-build - # See deep down below for build-date. - --disable-optimize # Don't add '-O2' to CFLAGS. - --disable-debug-build # Don't add '-g' to CFLAGS. - --enable-html-build - - $(use_enable doc pdf-build) - $(use_enable cplugins) - $(use_enable zsh-completion zsh-comp) - $(use_enable test) - - $(use_enable iconv) - $(use_enable samba libsmbclient) - $(use_enable lua) - $(usex luajit '--lua=luajit' '') - $(use_enable javascript) - $(use_enable libass) - $(use_enable libass libass-osd) - $(use_enable zlib) - $(use_enable encode encoding) - $(use_enable bluray libbluray) - $(use_enable dvd dvdread) - $(use_enable dvd dvdnav) - $(use_enable cdda) - $(use_enable uchardet) - $(use_enable rubberband) - $(use_enable lcms lcms2) - --disable-vapoursynth # Only available in overlays. - --disable-vapoursynth-lazy - $(use_enable archive libarchive) - - --enable-libavdevice - - # Audio outputs: - $(use_enable sdl sdl2) # Listed under audio, but also includes video. - --disable-sdl1 - $(use_enable oss oss-audio) - --disable-rsound # Only available in overlays. - --disable-sndio # Only available in overlays. - $(use_enable pulseaudio pulse) - $(use_enable jack) - $(use_enable openal) - --disable-opensles - $(use_enable alsa) - $(use_enable coreaudio) - - # Video outputs: - $(use_enable aqua cocoa) - $(use_enable drm) - $(use_enable gbm) - $(use_enable wayland) - $(use_enable X x11) - $(use_enable xv) - $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') - $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') - $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') - $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') - $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland') - $(use_enable vdpau) - $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') - $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl. - $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') - $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') - $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') - $(use_enable libcaca caca) - $(use_enable jpeg) - --disable-android - $(use_enable raspberry-pi rpi) - $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') - --disable-mali-fbdev # Only available in overlays. - $(usex opengl '' '--disable-gl') - - # HWaccels: - # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. - $(use_enable vaapi vaapi-hwaccel) - $(use_enable vdpau vdpau-hwaccel) - $(use_enable cuda cuda-hwaccel) - - # TV features: - $(use_enable v4l tv) - $(use_enable v4l tv-v4l2) - $(use_enable v4l libv4l2) - $(use_enable v4l audio-input) - $(use_enable dvb dvbin) - - # Miscellaneous features: - --disable-apple-remote # Needs testing first. See Gentoo bug 577332. - ) - - if use vaapi && use X; then - mywafargs+=( - $(use_enable opengl vaapi-glx) - $(use_enable egl vaapi-x-egl) - ) - fi - - # Create reproducible non-live builds. - [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) - - waf-utils_src_configure "${mywafargs[@]}" -} - -src_install() { - waf-utils_src_install - - if use lua; then - insinto /usr/share/${PN} - doins -r TOOLS/lua - fi - - if use cli && use luajit; then - pax-mark -m "${ED}"usr/bin/${PN} - fi - - if use tools; then - dobin TOOLS/{mpv_identify.sh,umpv} - newbin TOOLS/idet.sh mpv_idet.sh - python_replicate_script "${ED}"usr/bin/umpv - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0 - - for rv in ${REPLACING_VERSIONS}; do - version_compare ${rv} 0.18.1 - [[ $? -eq 1 ]] && softvol_0_18_1=1 - version_compare ${rv} 0.21.0 - [[ $? -eq 1 ]] && osc_0_21_0=1 - version_compare ${rv} 0.24.0 - [[ $? -eq 1 ]] && txtsubs_0_24_0=1 - version_compare ${rv} 0.25.0 - [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1 - done - - if [[ ${softvol_0_18_1} -eq 1 ]]; then - elog "Since version 0.18.1 the software volume control is always enabled." - elog "This means that volume controls don't change the system volume," - elog "e.g. per-application volume with PulseAudio." - elog "If you want to restore the previous behaviour, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1" - elog - fi - - if [[ ${osc_0_21_0} -eq 1 ]]; then - elog "In version 0.21.0 the default OSC layout was changed." - elog "If you want to restore the previous layout, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0" - elog - fi - - if [[ ${txtsubs_0_24_0} -eq 1 ]]; then - elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded." - elog "If you want to restore the previous behaviour, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0" - elog - fi - - if [[ ${opengl_0_25_0} -eq 1 ]]; then - elog "Since version 0.25.0 the 'opengl' USE flag is mapped to" - elog "the 'opengl' video output and no longer explicitly requires" - elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag." - fi - - if use cli && ! has_version 'app-shells/mpv-bash-completion'; then - elog "If you want to have command-line completion via bash-completion," - elog "please install app-shells/mpv-bash-completion." - fi - - if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \ - has_version 'app-shells/mpv-bash-completion'; then - elog "If command-line completion doesn't work after mpv update," - elog "please rebuild app-shells/mpv-bash-completion." - fi - - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -src_test() { - cd "${S}"/build/test || die - local test - for test in *; do - if [[ -x ${test} ]]; then - ./"${test}" || die "Test suite failed" - fi - done -} diff --git a/media-video/mpv/mpv-0.27.0-r1.ebuild b/media-video/mpv/mpv-0.27.0-r1.ebuild deleted file mode 100644 index 558adb5ce720..000000000000 --- a/media-video/mpv/mpv-0.27.0-r1.ebuild +++ /dev/null @@ -1,371 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE='threads(+)' - -WAF_PV=1.9.8 - -inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils - -DESCRIPTION="Media player based on MPlayer and mplayer2" -HOMEPAGE="https://mpv.io/" - -if [[ ${PV} != *9999* ]]; then - SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" - DOCS=( RELEASE_NOTES ) -else - EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" - inherit git-r3 -fi -SRC_URI+=" https://waf.io/waf-${WAF_PV}" -DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) - -# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. -LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" -SLOT="0" -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb - dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca - libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband - samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib - zsh-completion" - -REQUIRED_USE=" - || ( cli libmpv ) - aqua? ( opengl ) - cuda? ( !libav opengl ) - egl? ( || ( gbm X wayland ) ) - gbm? ( drm egl opengl ) - lcms? ( opengl ) - luajit? ( lua ) - opengl? ( || ( aqua egl X raspberry-pi !cli ) ) - raspberry-pi? ( opengl ) - test? ( opengl ) - tools? ( cli ) - uchardet? ( iconv ) - v4l? ( || ( alsa oss ) ) - vaapi? ( || ( gbm X wayland ) ) - vdpau? ( X ) - wayland? ( egl ) - X? ( egl? ( opengl ) ) - xv? ( X ) - zsh-completion? ( cli ) - ${PYTHON_REQUIRED_USE} -" - -COMMON_DEPEND=" - !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) - libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) - alsa? ( >=media-libs/alsa-lib-1.0.18 ) - archive? ( >=app-arch/libarchive-3.0.0:= ) - bluray? ( >=media-libs/libbluray-0.3.0:= ) - cdda? ( dev-libs/libcdio-paranoia ) - cuda? ( >=media-video/ffmpeg-3.3:0 ) - drm? ( x11-libs/libdrm ) - dvd? ( - >=media-libs/libdvdnav-4.2.0 - >=media-libs/libdvdread-4.1.0 - ) - egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) - iconv? ( - virtual/libiconv - uchardet? ( app-i18n/uchardet ) - ) - jack? ( virtual/jack ) - javascript? ( >=dev-lang/mujs-1.0.0 ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( >=media-libs/lcms-2.6:2 ) - libass? ( - >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] - virtual/ttf-fonts - ) - libcaca? ( >=media-libs/libcaca-0.99_beta18 ) - lua? ( - !luajit? ( =media-libs/openal-1.13 ) - pulseaudio? ( media-sound/pulseaudio ) - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) - rubberband? ( >=media-libs/rubberband-1.8.0 ) - samba? ( net-fs/samba ) - sdl? ( media-libs/libsdl2[sound,threads,video] ) - v4l? ( media-libs/libv4l ) - vaapi? ( - !libav? ( >=media-video/ffmpeg-3.3:0 ) - libav? ( >=media-video/libav-13:0 ) - x11-libs/libva:=[drm?,X?,wayland?] - ) - vdpau? ( - !libav? ( >=media-video/ffmpeg-3.3:0 ) - libav? ( >=media-video/libav-13:0 ) - x11-libs/libvdpau - ) - wayland? ( - >=dev-libs/wayland-1.6.0 - >=x11-libs/libxkbcommon-0.3.0 - ) - X? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - opengl? ( - x11-libs/libXdamage - virtual/opengl - ) - xv? ( x11-libs/libXv ) - ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - dev-python/docutils - virtual/pkgconfig - doc? ( dev-python/rst2pdf ) - dvb? ( virtual/linuxtv-dvb-headers ) - test? ( >=dev-util/cmocka-1.0.0 ) - v4l? ( virtual/os-headers ) - zsh-completion? ( dev-lang/perl ) -" -RDEPEND="${COMMON_DEPEND} - cuda? ( x11-drivers/nvidia-drivers[X] ) - selinux? ( sec-policy/selinux-mplayer ) - tools? ( ${PYTHON_DEPS} ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" - "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" - "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" -) - -pkg_setup() { - [[ ${MERGE_TYPE} != "binary" ]] && python_setup -} - -src_prepare() { - cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die - chmod +x "${S}"/waf || die - eapply "${FILESDIR}/${PV}" - default_src_prepare -} - -src_configure() { - tc-export CC PKG_CONFIG AR - - if tc-is-cross-compiler && use raspberry-pi; then - export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig" - # Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally. - die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344." - fi - - local mywafargs=( - --confdir="${EPREFIX}/etc/${PN}" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - - $(usex cli '' '--disable-cplayer') - $(use_enable libmpv libmpv-shared) - - --disable-libmpv-static - --disable-static-build - # See deep down below for build-date. - --disable-optimize # Don't add '-O2' to CFLAGS. - --disable-debug-build # Don't add '-g' to CFLAGS. - --enable-html-build - - $(use_enable doc pdf-build) - $(use_enable cplugins) - $(use_enable zsh-completion zsh-comp) - $(use_enable test) - - --disable-android - $(use_enable iconv) - $(use_enable samba libsmbclient) - $(use_enable lua) - $(usex luajit '--lua=luajit' '') - $(use_enable javascript) - $(use_enable libass) - $(use_enable libass libass-osd) - $(use_enable zlib) - $(use_enable encode encoding) - $(use_enable bluray libbluray) - $(use_enable dvd dvdread) - $(use_enable dvd dvdnav) - $(use_enable cdda) - $(use_enable uchardet) - $(use_enable rubberband) - $(use_enable lcms lcms2) - --disable-vapoursynth # Only available in overlays. - --disable-vapoursynth-lazy - $(use_enable archive libarchive) - - --enable-libavdevice - - # Audio outputs: - $(use_enable sdl sdl2) # Listed under audio, but also includes video. - --disable-sdl1 - $(use_enable oss oss-audio) - --disable-rsound # Only available in overlays. - --disable-sndio # Only available in overlays. - $(use_enable pulseaudio pulse) - $(use_enable jack) - $(use_enable openal) - --disable-opensles - $(use_enable alsa) - $(use_enable coreaudio) - - # Video outputs: - $(use_enable aqua cocoa) - $(use_enable drm) - $(use_enable gbm) - $(use_enable wayland) - $(use_enable X x11) - $(use_enable xv) - $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') - $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') - $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') - $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') - $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland') - $(use_enable vdpau) - $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') - $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl. - $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') - $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') - $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') - $(use_enable libcaca caca) - $(use_enable jpeg) - $(use_enable raspberry-pi rpi) - $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') - --disable-mali-fbdev # Only available in overlays. - $(usex opengl '' '--disable-gl') - - # HWaccels: - # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. - $(use_enable vaapi vaapi-hwaccel) - $(use_enable vdpau vdpau-hwaccel) - $(use_enable cuda cuda-hwaccel) - - # TV features: - $(use_enable v4l tv) - $(use_enable v4l tv-v4l2) - $(use_enable v4l libv4l2) - $(use_enable v4l audio-input) - $(use_enable dvb dvbin) - - # Miscellaneous features: - --disable-apple-remote # Needs testing first. See Gentoo bug 577332. - ) - - if use vaapi && use X; then - mywafargs+=( - $(use_enable opengl vaapi-glx) - $(use_enable egl vaapi-x-egl) - ) - fi - - # Create reproducible non-live builds. - [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) - - waf-utils_src_configure "${mywafargs[@]}" -} - -src_install() { - waf-utils_src_install - - if use lua; then - insinto /usr/share/${PN} - doins -r TOOLS/lua - fi - - if use cli && use luajit; then - pax-mark -m "${ED}"usr/bin/${PN} - fi - - if use tools; then - dobin TOOLS/{mpv_identify.sh,umpv} - newbin TOOLS/idet.sh mpv_idet.sh - python_replicate_script "${ED}"usr/bin/umpv - fi -} - -pkg_postinst() { - local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0 - - for rv in ${REPLACING_VERSIONS}; do - version_compare ${rv} 0.18.1 - [[ $? -eq 1 ]] && softvol_0_18_1=1 - version_compare ${rv} 0.21.0 - [[ $? -eq 1 ]] && osc_0_21_0=1 - version_compare ${rv} 0.24.0 - [[ $? -eq 1 ]] && txtsubs_0_24_0=1 - version_compare ${rv} 0.25.0 - [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1 - done - - if [[ ${softvol_0_18_1} -eq 1 ]]; then - elog "Since version 0.18.1 the software volume control is always enabled." - elog "This means that volume controls don't change the system volume," - elog "e.g. per-application volume with PulseAudio." - elog "If you want to restore the previous behaviour, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1" - elog - fi - - if [[ ${osc_0_21_0} -eq 1 ]]; then - elog "In version 0.21.0 the default OSC layout was changed." - elog "If you want to restore the previous layout, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0" - elog - fi - - if [[ ${txtsubs_0_24_0} -eq 1 ]]; then - elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded." - elog "If you want to restore the previous behaviour, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0" - elog - fi - - if [[ ${opengl_0_25_0} -eq 1 ]]; then - elog "Since version 0.25.0 the 'opengl' USE flag is mapped to" - elog "the 'opengl' video output and no longer explicitly requires" - elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag." - fi - - if use cli && ! has_version 'app-shells/mpv-bash-completion'; then - elog "If you want to have command-line completion via bash-completion," - elog "please install app-shells/mpv-bash-completion." - fi - - if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \ - has_version 'app-shells/mpv-bash-completion'; then - elog "If command-line completion doesn't work after mpv update," - elog "please rebuild app-shells/mpv-bash-completion." - fi - - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -src_test() { - cd "${S}"/build/test || die - local test - for test in *; do - if [[ -x ${test} ]]; then - ./"${test}" || die "Test suite failed" - fi - done -} diff --git a/media-video/mpv/mpv-0.27.1.ebuild b/media-video/mpv/mpv-0.27.1.ebuild new file mode 100644 index 000000000000..dec8d69628f0 --- /dev/null +++ b/media-video/mpv/mpv-0.27.1.ebuild @@ -0,0 +1,374 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_REQ_USE='threads(+)' + +WAF_PV=1.9.8 + +inherit flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils + +DESCRIPTION="Media player based on MPlayer and mplayer2" +HOMEPAGE="https://mpv.io/" + +if [[ ${PV} != *9999* ]]; then + SRC_URI=" + https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~kensington/distfiles/${P}-patches-${PR}.tar.xz + " + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" + DOCS=( RELEASE_NOTES ) +else + EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" + inherit git-r3 +fi +SRC_URI+=" https://waf.io/waf-${WAF_PV}" +DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) + +# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. +LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" +SLOT="0" +IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb + dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca + libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband + samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib + zsh-completion" + +REQUIRED_USE=" + || ( cli libmpv ) + aqua? ( opengl ) + cuda? ( !libav opengl ) + egl? ( || ( gbm X wayland ) ) + gbm? ( drm egl opengl ) + lcms? ( opengl ) + luajit? ( lua ) + opengl? ( || ( aqua egl X raspberry-pi !cli ) ) + raspberry-pi? ( opengl ) + test? ( opengl ) + tools? ( cli ) + uchardet? ( iconv ) + v4l? ( || ( alsa oss ) ) + vaapi? ( || ( gbm X wayland ) ) + vdpau? ( X ) + wayland? ( egl ) + X? ( egl? ( opengl ) ) + xv? ( X ) + zsh-completion? ( cli ) + ${PYTHON_REQUIRED_USE} +" + +COMMON_DEPEND=" + !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) + libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) + alsa? ( >=media-libs/alsa-lib-1.0.18 ) + archive? ( >=app-arch/libarchive-3.0.0:= ) + bluray? ( >=media-libs/libbluray-0.3.0:= ) + cdda? ( dev-libs/libcdio-paranoia ) + cuda? ( >=media-video/ffmpeg-3.3:0 ) + drm? ( x11-libs/libdrm ) + dvd? ( + >=media-libs/libdvdnav-4.2.0 + >=media-libs/libdvdread-4.1.0 + ) + egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) + iconv? ( + virtual/libiconv + uchardet? ( app-i18n/uchardet ) + ) + jack? ( virtual/jack ) + javascript? ( >=dev-lang/mujs-1.0.0 ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( >=media-libs/lcms-2.6:2 ) + libass? ( + >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] + virtual/ttf-fonts + ) + libcaca? ( >=media-libs/libcaca-0.99_beta18 ) + lua? ( + !luajit? ( =media-libs/openal-1.13 ) + pulseaudio? ( media-sound/pulseaudio ) + raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) + rubberband? ( >=media-libs/rubberband-1.8.0 ) + samba? ( net-fs/samba ) + sdl? ( media-libs/libsdl2[sound,threads,video] ) + v4l? ( media-libs/libv4l ) + vaapi? ( + !libav? ( >=media-video/ffmpeg-3.3:0 ) + libav? ( >=media-video/libav-13:0 ) + x11-libs/libva:=[drm?,X?,wayland?] + ) + vdpau? ( + !libav? ( >=media-video/ffmpeg-3.3:0 ) + libav? ( >=media-video/libav-13:0 ) + x11-libs/libvdpau + ) + wayland? ( + >=dev-libs/wayland-1.6.0 + >=x11-libs/libxkbcommon-0.3.0 + ) + X? ( + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXrandr + opengl? ( + x11-libs/libXdamage + virtual/opengl + ) + xv? ( x11-libs/libXv ) + ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} + dev-python/docutils + virtual/pkgconfig + doc? ( dev-python/rst2pdf ) + dvb? ( virtual/linuxtv-dvb-headers ) + test? ( >=dev-util/cmocka-1.0.0 ) + v4l? ( virtual/os-headers ) + zsh-completion? ( dev-lang/perl ) +" +RDEPEND="${COMMON_DEPEND} + cuda? ( x11-drivers/nvidia-drivers[X] ) + selinux? ( sec-policy/selinux-mplayer ) + tools? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" + "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" + "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" + "${FILESDIR}/${PN}-0.27.0-add-missing-link-flags-for-rpi.patch" +) + +pkg_setup() { + [[ ${MERGE_TYPE} != "binary" ]] && python_setup +} + +src_prepare() { + cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die + chmod +x "${S}"/waf || die + eapply "${WORKDIR}/${PV}" + default_src_prepare +} + +src_configure() { + tc-export CC PKG_CONFIG AR + + if use raspberry-pi; then + append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include" + append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib" + fi + + local mywafargs=( + --confdir="${EPREFIX}/etc/${PN}" + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + + $(usex cli '' '--disable-cplayer') + $(use_enable libmpv libmpv-shared) + + --disable-libmpv-static + --disable-static-build + # See deep down below for build-date. + --disable-optimize # Don't add '-O2' to CFLAGS. + --disable-debug-build # Don't add '-g' to CFLAGS. + --enable-html-build + + $(use_enable doc pdf-build) + $(use_enable cplugins) + $(use_enable zsh-completion zsh-comp) + $(use_enable test) + + --disable-android + $(use_enable iconv) + $(use_enable samba libsmbclient) + $(use_enable lua) + $(usex luajit '--lua=luajit' '') + $(use_enable javascript) + $(use_enable libass) + $(use_enable libass libass-osd) + $(use_enable zlib) + $(use_enable encode encoding) + $(use_enable bluray libbluray) + $(use_enable dvd dvdread) + $(use_enable dvd dvdnav) + $(use_enable cdda) + $(use_enable uchardet) + $(use_enable rubberband) + $(use_enable lcms lcms2) + --disable-vapoursynth # Only available in overlays. + --disable-vapoursynth-lazy + $(use_enable archive libarchive) + + --enable-libavdevice + + # Audio outputs: + $(use_enable sdl sdl2) # Listed under audio, but also includes video. + --disable-sdl1 + $(use_enable oss oss-audio) + --disable-rsound # Only available in overlays. + --disable-sndio # Only available in overlays. + $(use_enable pulseaudio pulse) + $(use_enable jack) + $(use_enable openal) + --disable-opensles + $(use_enable alsa) + $(use_enable coreaudio) + + # Video outputs: + $(use_enable aqua cocoa) + $(use_enable drm) + $(use_enable gbm) + $(use_enable wayland) + $(use_enable X x11) + $(use_enable xv) + $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') + $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') + $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') + $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') + $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland') + $(use_enable vdpau) + $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') + $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl. + $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') + $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') + $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') + $(use_enable libcaca caca) + $(use_enable jpeg) + $(use_enable raspberry-pi rpi) + $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') + --disable-mali-fbdev # Only available in overlays. + $(usex opengl '' '--disable-gl') + + # HWaccels: + # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. + $(use_enable vaapi vaapi-hwaccel) + $(use_enable vdpau vdpau-hwaccel) + $(use_enable cuda cuda-hwaccel) + + # TV features: + $(use_enable v4l tv) + $(use_enable v4l tv-v4l2) + $(use_enable v4l libv4l2) + $(use_enable v4l audio-input) + $(use_enable dvb dvbin) + + # Miscellaneous features: + --disable-apple-remote # Needs testing first. See Gentoo bug 577332. + ) + + if use vaapi && use X; then + mywafargs+=( + $(use_enable opengl vaapi-glx) + $(use_enable egl vaapi-x-egl) + ) + fi + + # Create reproducible non-live builds. + [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) + + waf-utils_src_configure "${mywafargs[@]}" +} + +src_install() { + waf-utils_src_install + + if use lua; then + insinto /usr/share/${PN} + doins -r TOOLS/lua + fi + + if use cli && use luajit; then + pax-mark -m "${ED}"usr/bin/${PN} + fi + + if use tools; then + dobin TOOLS/{mpv_identify.sh,umpv} + newbin TOOLS/idet.sh mpv_idet.sh + python_replicate_script "${ED}"usr/bin/umpv + fi +} + +pkg_postinst() { + local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0 + + for rv in ${REPLACING_VERSIONS}; do + version_compare ${rv} 0.18.1 + [[ $? -eq 1 ]] && softvol_0_18_1=1 + version_compare ${rv} 0.21.0 + [[ $? -eq 1 ]] && osc_0_21_0=1 + version_compare ${rv} 0.24.0 + [[ $? -eq 1 ]] && txtsubs_0_24_0=1 + version_compare ${rv} 0.25.0 + [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1 + done + + if [[ ${softvol_0_18_1} -eq 1 ]]; then + elog "Since version 0.18.1 the software volume control is always enabled." + elog "This means that volume controls don't change the system volume," + elog "e.g. per-application volume with PulseAudio." + elog "If you want to restore the previous behaviour, please refer to" + elog + elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1" + elog + fi + + if [[ ${osc_0_21_0} -eq 1 ]]; then + elog "In version 0.21.0 the default OSC layout was changed." + elog "If you want to restore the previous layout, please refer to" + elog + elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0" + elog + fi + + if [[ ${txtsubs_0_24_0} -eq 1 ]]; then + elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded." + elog "If you want to restore the previous behaviour, please refer to" + elog + elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0" + elog + fi + + if [[ ${opengl_0_25_0} -eq 1 ]]; then + elog "Since version 0.25.0 the 'opengl' USE flag is mapped to" + elog "the 'opengl' video output and no longer explicitly requires" + elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag." + fi + + if use cli && ! has_version 'app-shells/mpv-bash-completion'; then + elog "If you want to have command-line completion via bash-completion," + elog "please install app-shells/mpv-bash-completion." + fi + + if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \ + has_version 'app-shells/mpv-bash-completion'; then + elog "If command-line completion doesn't work after mpv update," + elog "please rebuild app-shells/mpv-bash-completion." + fi + + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +src_test() { + cd "${S}"/build/test || die + local test + for test in *; do + if [[ -x ${test} ]]; then + ./"${test}" || die "Test suite failed" + fi + done +} diff --git a/media-video/mpv/mpv-0.28.0.ebuild b/media-video/mpv/mpv-0.28.0.ebuild deleted file mode 100644 index 23b6694770d7..000000000000 --- a/media-video/mpv/mpv-0.28.0.ebuild +++ /dev/null @@ -1,361 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE='threads(+)' - -WAF_PV=1.9.8 - -inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils - -DESCRIPTION="Media player based on MPlayer and mplayer2" -HOMEPAGE="https://mpv.io/" - -if [[ ${PV} != *9999* ]]; then - SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" - DOCS=( RELEASE_NOTES ) -else - EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" - inherit git-r3 -fi -SRC_URI+=" https://waf.io/waf-${WAF_PV}" -DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) - -# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. -LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" -SLOT="0" -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb - dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca - libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband - samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib - zsh-completion" - -REQUIRED_USE=" - || ( cli libmpv ) - aqua? ( opengl ) - cuda? ( !libav opengl ) - egl? ( || ( gbm X wayland ) ) - gbm? ( drm egl opengl ) - lcms? ( opengl ) - luajit? ( lua ) - opengl? ( || ( aqua egl X raspberry-pi !cli ) ) - raspberry-pi? ( opengl ) - test? ( opengl ) - tools? ( cli ) - uchardet? ( iconv ) - v4l? ( || ( alsa oss ) ) - vaapi? ( || ( gbm X wayland ) ) - vdpau? ( X ) - wayland? ( egl ) - X? ( egl? ( opengl ) ) - xv? ( X ) - zsh-completion? ( cli ) - ${PYTHON_REQUIRED_USE} -" - -COMMON_DEPEND=" - !libav? ( >=media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] ) - libav? ( >=media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] ) - alsa? ( >=media-libs/alsa-lib-1.0.18 ) - archive? ( >=app-arch/libarchive-3.0.0:= ) - bluray? ( >=media-libs/libbluray-0.3.0:= ) - cdda? ( dev-libs/libcdio-paranoia ) - drm? ( x11-libs/libdrm ) - dvd? ( - >=media-libs/libdvdnav-4.2.0 - >=media-libs/libdvdread-4.1.0 - ) - egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) - iconv? ( - virtual/libiconv - uchardet? ( app-i18n/uchardet ) - ) - jack? ( virtual/jack ) - javascript? ( >=dev-lang/mujs-1.0.0 ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( >=media-libs/lcms-2.6:2 ) - libass? ( - >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] - virtual/ttf-fonts - ) - libcaca? ( >=media-libs/libcaca-0.99_beta18 ) - lua? ( - !luajit? ( =media-libs/openal-1.13 ) - pulseaudio? ( media-sound/pulseaudio ) - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) - rubberband? ( >=media-libs/rubberband-1.8.0 ) - samba? ( net-fs/samba ) - sdl? ( media-libs/libsdl2[sound,threads,video] ) - v4l? ( media-libs/libv4l ) - vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) - vdpau? ( x11-libs/libvdpau ) - wayland? ( - >=dev-libs/wayland-1.6.0 - >=x11-libs/libxkbcommon-0.3.0 - dev-libs/wayland-protocols - ) - X? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - opengl? ( - x11-libs/libXdamage - virtual/opengl - ) - xv? ( x11-libs/libXv ) - ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - dev-python/docutils - virtual/pkgconfig - doc? ( dev-python/rst2pdf ) - dvb? ( virtual/linuxtv-dvb-headers ) - test? ( >=dev-util/cmocka-1.0.0 ) - v4l? ( virtual/os-headers ) - zsh-completion? ( dev-lang/perl ) -" -RDEPEND="${COMMON_DEPEND} - cuda? ( x11-drivers/nvidia-drivers[X] ) - selinux? ( sec-policy/selinux-mplayer ) - tools? ( ${PYTHON_DEPS} ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" - "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" -) - -pkg_setup() { - [[ ${MERGE_TYPE} != "binary" ]] && python_setup -} - -src_prepare() { - cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die - chmod +x "${S}"/waf || die - default_src_prepare -} - -src_configure() { - tc-export CC PKG_CONFIG AR - - if tc-is-cross-compiler && use raspberry-pi; then - export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig" - # Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally. - die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344." - fi - - local mywafargs=( - --confdir="${EPREFIX}/etc/${PN}" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - - $(usex cli '' '--disable-cplayer') - $(use_enable libmpv libmpv-shared) - - --disable-libmpv-static - --disable-static-build - # See deep down below for build-date. - --disable-optimize # Don't add '-O2' to CFLAGS. - --disable-debug-build # Don't add '-g' to CFLAGS. - --enable-html-build - - $(use_enable doc pdf-build) - $(use_enable cplugins) - $(use_enable zsh-completion zsh-comp) - $(use_enable test) - - --disable-android - $(use_enable iconv) - $(use_enable samba libsmbclient) - $(use_enable lua) - $(usex luajit '--lua=luajit' '') - $(use_enable javascript) - $(use_enable libass) - $(use_enable libass libass-osd) - $(use_enable zlib) - $(use_enable encode encoding) - $(use_enable bluray libbluray) - $(use_enable dvd dvdread) - $(use_enable dvd dvdnav) - $(use_enable cdda) - $(use_enable uchardet) - $(use_enable rubberband) - $(use_enable lcms lcms2) - --disable-vapoursynth # Only available in overlays. - --disable-vapoursynth-lazy - $(use_enable archive libarchive) - - --enable-libavdevice - - # Audio outputs: - $(use_enable sdl sdl2) # Listed under audio, but also includes video. - --disable-sdl1 - $(use_enable oss oss-audio) - --disable-rsound # Only available in overlays. - --disable-sndio # Only available in overlays. - $(use_enable pulseaudio pulse) - $(use_enable jack) - $(use_enable openal) - --disable-opensles - $(use_enable alsa) - $(use_enable coreaudio) - - # Video outputs: - $(use_enable aqua cocoa) - $(use_enable drm) - $(use_enable gbm) - $(use_enable wayland wayland-scanner) - $(use_enable wayland wayland-protocols) - $(use_enable wayland) - $(use_enable X x11) - $(use_enable xv) - $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') - $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') - $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') - $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') - $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland') - $(use_enable vdpau) - $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') - $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl. - $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') - $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') - $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') - $(use_enable libcaca caca) - $(use_enable jpeg) - $(use_enable raspberry-pi rpi) - $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') - --disable-mali-fbdev # Only available in overlays. - $(usex opengl '' '--disable-gl') - - # HWaccels: - # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. - $(use_enable cuda cuda-hwaccel) - - # TV features: - $(use_enable v4l tv) - $(use_enable v4l tv-v4l2) - $(use_enable v4l libv4l2) - $(use_enable v4l audio-input) - $(use_enable dvb dvbin) - - # Miscellaneous features: - --disable-apple-remote # Needs testing first. See Gentoo bug 577332. - ) - - if use vaapi && use X; then - mywafargs+=( - $(use_enable opengl vaapi-glx) - $(use_enable egl vaapi-x-egl) - ) - fi - - # Create reproducible non-live builds. - [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) - - waf-utils_src_configure "${mywafargs[@]}" -} - -src_install() { - waf-utils_src_install - - if use lua; then - insinto /usr/share/${PN} - doins -r TOOLS/lua - fi - - if use cli && use luajit; then - pax-mark -m "${ED}"usr/bin/${PN} - fi - - if use tools; then - dobin TOOLS/{mpv_identify.sh,umpv} - newbin TOOLS/idet.sh mpv_idet.sh - python_replicate_script "${ED}"usr/bin/umpv - fi -} - -pkg_postinst() { - local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0 - - for rv in ${REPLACING_VERSIONS}; do - version_compare ${rv} 0.18.1 - [[ $? -eq 1 ]] && softvol_0_18_1=1 - version_compare ${rv} 0.21.0 - [[ $? -eq 1 ]] && osc_0_21_0=1 - version_compare ${rv} 0.24.0 - [[ $? -eq 1 ]] && txtsubs_0_24_0=1 - version_compare ${rv} 0.25.0 - [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1 - done - - if [[ ${softvol_0_18_1} -eq 1 ]]; then - elog "Since version 0.18.1 the software volume control is always enabled." - elog "This means that volume controls don't change the system volume," - elog "e.g. per-application volume with PulseAudio." - elog "If you want to restore the previous behaviour, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1" - elog - fi - - if [[ ${osc_0_21_0} -eq 1 ]]; then - elog "In version 0.21.0 the default OSC layout was changed." - elog "If you want to restore the previous layout, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0" - elog - fi - - if [[ ${txtsubs_0_24_0} -eq 1 ]]; then - elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded." - elog "If you want to restore the previous behaviour, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0" - elog - fi - - if [[ ${opengl_0_25_0} -eq 1 ]]; then - elog "Since version 0.25.0 the 'opengl' USE flag is mapped to" - elog "the 'opengl' video output and no longer explicitly requires" - elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag." - fi - - if use cli && ! has_version 'app-shells/mpv-bash-completion'; then - elog "If you want to have command-line completion via bash-completion," - elog "please install app-shells/mpv-bash-completion." - fi - - if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \ - has_version 'app-shells/mpv-bash-completion'; then - elog "If command-line completion doesn't work after mpv update," - elog "please rebuild app-shells/mpv-bash-completion." - fi - - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -src_test() { - cd "${S}"/build/test || die - local test - for test in *; do - if [[ -x ${test} ]]; then - ./"${test}" || die "Test suite failed" - fi - done -} diff --git a/media-video/mpv/mpv-0.28.1.ebuild b/media-video/mpv/mpv-0.28.1.ebuild new file mode 100644 index 000000000000..472b73c52c56 --- /dev/null +++ b/media-video/mpv/mpv-0.28.1.ebuild @@ -0,0 +1,361 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_REQ_USE='threads(+)' + +WAF_PV=1.9.8 + +inherit flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils + +DESCRIPTION="Media player based on MPlayer and mplayer2" +HOMEPAGE="https://mpv.io/" + +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" + DOCS=( RELEASE_NOTES ) +else + EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" + inherit git-r3 +fi +SRC_URI+=" https://waf.io/waf-${WAF_PV}" +DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) + +# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. +LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" +SLOT="0" +IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb + dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca + libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband + samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib + zsh-completion" + +REQUIRED_USE=" + || ( cli libmpv ) + aqua? ( opengl ) + cuda? ( !libav opengl ) + egl? ( || ( gbm X wayland ) ) + gbm? ( drm egl opengl ) + lcms? ( opengl ) + luajit? ( lua ) + opengl? ( || ( aqua egl X raspberry-pi !cli ) ) + raspberry-pi? ( opengl ) + test? ( opengl ) + tools? ( cli ) + uchardet? ( iconv ) + v4l? ( || ( alsa oss ) ) + vaapi? ( || ( gbm X wayland ) ) + vdpau? ( X ) + wayland? ( egl ) + X? ( egl? ( opengl ) ) + xv? ( X ) + zsh-completion? ( cli ) + ${PYTHON_REQUIRED_USE} +" + +COMMON_DEPEND=" + !libav? ( >=media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] ) + libav? ( >=media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] ) + alsa? ( >=media-libs/alsa-lib-1.0.18 ) + archive? ( >=app-arch/libarchive-3.0.0:= ) + bluray? ( >=media-libs/libbluray-0.3.0:= ) + cdda? ( dev-libs/libcdio-paranoia ) + drm? ( x11-libs/libdrm ) + dvd? ( + >=media-libs/libdvdnav-4.2.0 + >=media-libs/libdvdread-4.1.0 + ) + egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) + iconv? ( + virtual/libiconv + uchardet? ( app-i18n/uchardet ) + ) + jack? ( virtual/jack ) + javascript? ( >=dev-lang/mujs-1.0.0 ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( >=media-libs/lcms-2.6:2 ) + libass? ( + >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] + virtual/ttf-fonts + ) + libcaca? ( >=media-libs/libcaca-0.99_beta18 ) + lua? ( + !luajit? ( =media-libs/openal-1.13 ) + pulseaudio? ( media-sound/pulseaudio ) + raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) + rubberband? ( >=media-libs/rubberband-1.8.0 ) + samba? ( net-fs/samba ) + sdl? ( media-libs/libsdl2[sound,threads,video] ) + v4l? ( media-libs/libv4l ) + vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) + vdpau? ( x11-libs/libvdpau ) + wayland? ( + >=dev-libs/wayland-1.6.0 + >=x11-libs/libxkbcommon-0.3.0 + dev-libs/wayland-protocols + ) + X? ( + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXrandr + opengl? ( + x11-libs/libXdamage + virtual/opengl + ) + xv? ( x11-libs/libXv ) + ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} + dev-python/docutils + virtual/pkgconfig + doc? ( dev-python/rst2pdf ) + dvb? ( virtual/linuxtv-dvb-headers ) + test? ( >=dev-util/cmocka-1.0.0 ) + v4l? ( virtual/os-headers ) + zsh-completion? ( dev-lang/perl ) +" +RDEPEND="${COMMON_DEPEND} + cuda? ( x11-drivers/nvidia-drivers[X] ) + selinux? ( sec-policy/selinux-mplayer ) + tools? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" + "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" + "${FILESDIR}/${PN}-0.27.0-add-missing-link-flags-for-rpi.patch" +) + +pkg_setup() { + [[ ${MERGE_TYPE} != "binary" ]] && python_setup +} + +src_prepare() { + cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die + chmod +x "${S}"/waf || die + default_src_prepare +} + +src_configure() { + tc-export CC PKG_CONFIG AR + + if use raspberry-pi; then + append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include" + append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib" + fi + + local mywafargs=( + --confdir="${EPREFIX}/etc/${PN}" + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + + $(usex cli '' '--disable-cplayer') + $(use_enable libmpv libmpv-shared) + + --disable-libmpv-static + --disable-static-build + # See deep down below for build-date. + --disable-optimize # Don't add '-O2' to CFLAGS. + --disable-debug-build # Don't add '-g' to CFLAGS. + --enable-html-build + + $(use_enable doc pdf-build) + $(use_enable cplugins) + $(use_enable zsh-completion zsh-comp) + $(use_enable test) + + --disable-android + $(use_enable iconv) + $(use_enable samba libsmbclient) + $(use_enable lua) + $(usex luajit '--lua=luajit' '') + $(use_enable javascript) + $(use_enable libass) + $(use_enable libass libass-osd) + $(use_enable zlib) + $(use_enable encode encoding) + $(use_enable bluray libbluray) + $(use_enable dvd dvdread) + $(use_enable dvd dvdnav) + $(use_enable cdda) + $(use_enable uchardet) + $(use_enable rubberband) + $(use_enable lcms lcms2) + --disable-vapoursynth # Only available in overlays. + --disable-vapoursynth-lazy + $(use_enable archive libarchive) + + --enable-libavdevice + + # Audio outputs: + $(use_enable sdl sdl2) # Listed under audio, but also includes video. + --disable-sdl1 + $(use_enable oss oss-audio) + --disable-rsound # Only available in overlays. + --disable-sndio # Only available in overlays. + $(use_enable pulseaudio pulse) + $(use_enable jack) + $(use_enable openal) + --disable-opensles + $(use_enable alsa) + $(use_enable coreaudio) + + # Video outputs: + $(use_enable aqua cocoa) + $(use_enable drm) + $(use_enable gbm) + $(use_enable wayland wayland-scanner) + $(use_enable wayland wayland-protocols) + $(use_enable wayland) + $(use_enable X x11) + $(use_enable xv) + $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') + $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') + $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') + $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') + $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland') + $(use_enable vdpau) + $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') + $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl. + $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') + $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') + $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') + $(use_enable libcaca caca) + $(use_enable jpeg) + $(use_enable raspberry-pi rpi) + $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') + --disable-mali-fbdev # Only available in overlays. + $(usex opengl '' '--disable-gl') + + # HWaccels: + # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. + $(use_enable cuda cuda-hwaccel) + + # TV features: + $(use_enable v4l tv) + $(use_enable v4l tv-v4l2) + $(use_enable v4l libv4l2) + $(use_enable v4l audio-input) + $(use_enable dvb dvbin) + + # Miscellaneous features: + --disable-apple-remote # Needs testing first. See Gentoo bug 577332. + ) + + if use vaapi && use X; then + mywafargs+=( + $(use_enable opengl vaapi-glx) + $(use_enable egl vaapi-x-egl) + ) + fi + + # Create reproducible non-live builds. + [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) + + waf-utils_src_configure "${mywafargs[@]}" +} + +src_install() { + waf-utils_src_install + + if use lua; then + insinto /usr/share/${PN} + doins -r TOOLS/lua + fi + + if use cli && use luajit; then + pax-mark -m "${ED}"usr/bin/${PN} + fi + + if use tools; then + dobin TOOLS/{mpv_identify.sh,umpv} + newbin TOOLS/idet.sh mpv_idet.sh + python_replicate_script "${ED}"usr/bin/umpv + fi +} + +pkg_postinst() { + local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0 + + for rv in ${REPLACING_VERSIONS}; do + version_compare ${rv} 0.18.1 + [[ $? -eq 1 ]] && softvol_0_18_1=1 + version_compare ${rv} 0.21.0 + [[ $? -eq 1 ]] && osc_0_21_0=1 + version_compare ${rv} 0.24.0 + [[ $? -eq 1 ]] && txtsubs_0_24_0=1 + version_compare ${rv} 0.25.0 + [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1 + done + + if [[ ${softvol_0_18_1} -eq 1 ]]; then + elog "Since version 0.18.1 the software volume control is always enabled." + elog "This means that volume controls don't change the system volume," + elog "e.g. per-application volume with PulseAudio." + elog "If you want to restore the previous behaviour, please refer to" + elog + elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1" + elog + fi + + if [[ ${osc_0_21_0} -eq 1 ]]; then + elog "In version 0.21.0 the default OSC layout was changed." + elog "If you want to restore the previous layout, please refer to" + elog + elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0" + elog + fi + + if [[ ${txtsubs_0_24_0} -eq 1 ]]; then + elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded." + elog "If you want to restore the previous behaviour, please refer to" + elog + elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0" + elog + fi + + if [[ ${opengl_0_25_0} -eq 1 ]]; then + elog "Since version 0.25.0 the 'opengl' USE flag is mapped to" + elog "the 'opengl' video output and no longer explicitly requires" + elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag." + fi + + if use cli && ! has_version 'app-shells/mpv-bash-completion'; then + elog "If you want to have command-line completion via bash-completion," + elog "please install app-shells/mpv-bash-completion." + fi + + if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \ + has_version 'app-shells/mpv-bash-completion'; then + elog "If command-line completion doesn't work after mpv update," + elog "please rebuild app-shells/mpv-bash-completion." + fi + + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +src_test() { + cd "${S}"/build/test || die + local test + for test in *; do + if [[ -x ${test} ]]; then + ./"${test}" || die "Test suite failed" + fi + done +} diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 1543eb4db2e5..c530dace68b4 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ PYTHON_REQ_USE='threads(+)' WAF_PV=1.9.8 -inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils +inherit flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils DESCRIPTION="Media player based on MPlayer and mplayer2" HOMEPAGE="https://mpv.io/" @@ -147,10 +147,9 @@ src_prepare() { src_configure() { tc-export CC PKG_CONFIG AR - if tc-is-cross-compiler && use raspberry-pi; then - export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig" - # Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally. - die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344." + if use raspberry-pi; then + append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include" + append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib" fi local mywafargs=( diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 5cc3d5a3bbbc..be5bfb59c77e 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -16,9 +16,10 @@ AUX vlc-9999-libupnp-slot-1.8.patch 757 BLAKE2B 816ef97e0dc7218ed49ee8880aaa9464 AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b97b6a504a762375347223d759b605e20d210fd62d967160ba43cc10a1730409d7d06d71ad95c0aaf37bb05caa320ad35213 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968 DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a +DIST vlc-3.0.0.tar.xz 25191148 BLAKE2B 8f0826f5586a304df4cc53acae768377a53bbd9a1c6578b4dcd39a4e1fb627d2e6f6f2f6ce3abacfb9ebc2a9fb1bae179938bbf88644aa9070f49675cc10fcf1 SHA512 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7 EBUILD vlc-2.2.6.ebuild 15554 BLAKE2B bb51292251d39edda6e981b3805480396307dc0052cf4124fd74acda3bc48103646b147761aca15093f00afae21264eb27a46b1bab27d208755b47591981d0fc SHA512 56a3383357cf055d4bc1a459b0c395a22afa95d9d3eb2be1ed48d1b485378b9d5d230851b8c65accd9713a712685044f62a5652b1fa79749f678aca190fcc6cb -EBUILD vlc-2.2.8-r1.ebuild 14813 BLAKE2B 7c03fd365a135eeb9c2a859dfc7e6e878940f621d8dd0a27022cd984fd17d22e41be524ae6899281eb7b273072606e3b38b7f0a6e524215e0779a1b155316a00 SHA512 b506c3c01ce5e35e31194622bde4eab21cb698a3280edb83b553752caa42428abc07a744d3aaae458405c97facb7b7eef10ee652afd667d16546af34fd89a207 -EBUILD vlc-2.2.9999.ebuild 14829 BLAKE2B d7ffc34f6e72390a45ae5bb4218dc25c3eebcab96047a7ab43f5695ca833f7bf492cdd22337aee635c5fb3b9d9bc04c4fe4d750a44b9020babbfe8e20fc27aeb SHA512 46ee0565bfa2884abce8a0b230721ce3c9adfda7cffb0d43cb2d3a7fa3099ba226ee7aff3534f42de0fa09302be0c89da3b8460575bf550eeb65dedc973e8bed -EBUILD vlc-3.0.9999.ebuild 13815 BLAKE2B 5748955ba987e4fbaa8b7f9851f94aadbc4612d12b4be80cbceae29c43a54262a0064975934dd61714b63c9ed540a718406e01625eb18a5828ddece87b6a245b SHA512 55da89559e31ae099c21f17eaa346ad39afbd0de637fb24ecd7674c38faa1319eadf264cbaed8e00df4b93a2f0b211f4086ddda6e01964f7e230b0441af663aa -EBUILD vlc-9999.ebuild 13808 BLAKE2B 02fe3a017cd07b06b19d337c2e09f687820be7b095a8a33110d02d15710a14dee07d183eaaaeb38d29be0af0389005e15a60d2a66943966287f4cc20f06c2778 SHA512 d1d4f508d185dad2c38b11548950daf2edd7f39220371e1537a1f765d92d788693d28dd8018f5fe6bb93b9d3ed9df3a3d7cbd914f9306682d7ce8299a6aa0cf7 +EBUILD vlc-2.2.8-r1.ebuild 14829 BLAKE2B bd4dfb29beba20d2f9177c41ee4791aa733054eee6c522039b76586f0c9be8ec8ba6c79043a139ef0557b73cfc14c81edc7b14821241969a2bb8c84c1b5eefb0 SHA512 20305c4736dabc61729189a06be0082340f4f0619a9e49e28f4192585d88147c6a1c49a6284664c02b6674ab24c7ef4b1963484336cbb6c899330c048b250163 +EBUILD vlc-3.0.0-r1.ebuild 13764 BLAKE2B 974b217b5096a6072c2a30c901b04b26c850a3d47315756b256fc8416537ed54de651ee83130dec582d2c09bc347ae974c5bf8f4538d67e9d5375dcf3d687db1 SHA512 7e8ee4ba97bd64afca1d952815de7ebf3faadabc4bf88dc731489e8c3b8175986fea541fe04e742dd792a8558303c3c24b49cdc1d0e26c85c336eef85dcfc78e +EBUILD vlc-3.0.9999.ebuild 13764 BLAKE2B 974b217b5096a6072c2a30c901b04b26c850a3d47315756b256fc8416537ed54de651ee83130dec582d2c09bc347ae974c5bf8f4538d67e9d5375dcf3d687db1 SHA512 7e8ee4ba97bd64afca1d952815de7ebf3faadabc4bf88dc731489e8c3b8175986fea541fe04e742dd792a8558303c3c24b49cdc1d0e26c85c336eef85dcfc78e +EBUILD vlc-9999.ebuild 13757 BLAKE2B a63677b92fd8ad7e432071f88962247b37b5394d609827b3ace21ea64f437fdc82a6fcf238f2ab3deb86b29b2e57f34919bd951a5ae857c53e0c304c68f923e6 SHA512 b088d6fec3f082455a95f318e6487eb522ba6c80fa4a321637471e4352ca3d584c8d52b2ecf12e3d546bc78bc93cae1ee6066c9d4137732bb39cc096fc7ea3dd MISC metadata.xml 6560 BLAKE2B 7a079c7b3d008646d49c8669834fccb7e78cf2ab88e0eb2671c571f91f012ab8b33989ef2035e35b55c585c1bdc930e9a5fd7d26c7f1a2fc7cab819fca54f21f SHA512 ed19d0f4e3349e13ef9967911c16a4b6569cefa97169ad79d7a9510ca88965c9e8fefcd593ceb2e5b0c31e82ad92e9513ff36460eddf3605d2250d285b19530f diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild index e5ea17223128..cf77af601678 100644 --- a/media-video/vlc/vlc-2.2.8-r1.ebuild +++ b/media-video/vlc/vlc-2.2.8-r1.ebuild @@ -470,8 +470,8 @@ pkg_postinst() { } pkg_postrm() { - if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then - rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + 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 diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild deleted file mode 100644 index e9fdb939b366..000000000000 --- a/media-video/vlc/vlc-2.2.9999.ebuild +++ /dev/null @@ -1,480 +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-8" # vlc - vlccore - -IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda - cddb chromaprint dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 - elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme - gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav - libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua - macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit - matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg - omxil opencv opengl optimisememory opus png postproc projectm pulseaudio - +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout - sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype - twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X - x264 x265 +xcb xml xv zeroconf zvbi -" -REQUIRED_USE=" - aalib? ( X ) - bidi? ( truetype ) - cddb? ( cdda ) - dvb? ( dvbpsi ) - dxva2? ( avcodec ) - ffmpeg? ( avcodec avformat swscale ) - fontconfig? ( truetype ) - gnutls? ( gcrypt ) - httpd? ( lua ) - libcaca? ( X ) - libtar? ( skins ) - libtiger? ( kate ) - qt5? ( X ) - sdl? ( X ) - skins? ( qt5 truetype X xml ) - vaapi? ( avcodec X ) - vdpau? ( X ) - vlm? ( encode ) - xv? ( xcb ) -" -RDEPEND=" - dev-libs/libgpg-error:0 - net-dns/libidn:0 - sys-libs/zlib:0[minizip] - virtual/libintl:0 - a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) - aalib? ( media-libs/aalib:0 ) - alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) - avcodec? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) - ) - avformat? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) - ) - bidi? ( dev-libs/fribidi:0 ) - bluray? ( >=media-libs/libbluray-0.3:0= ) - cddb? ( >=media-libs/libcddb-1.2:0 ) - chromaprint? ( >=media-libs/chromaprint-0.6:0 ) - dbus? ( >=sys-apps/dbus-1.6:0 ) - dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) - dts? ( >=media-libs/libdca-0.0.5:0 ) - dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) - dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) - elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) - faad? ( >=media-libs/faad2-2.6.1:0 ) - fdk? ( media-libs/fdk-aac:0 ) - flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) - fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) - fontconfig? ( media-libs/fontconfig:1.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) - gme? ( media-libs/game-music-emu:0 ) - gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) - gnutls? ( >=net-libs/gnutls-3.0.20:0 ) - gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) - ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) - jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) - kate? ( >=media-libs/libkate-0.3:0 ) - libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) - libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) - libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) - libsamplerate? ( media-libs/libsamplerate:0 ) - libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) - libtiger? ( >=media-libs/libtiger-0.3.1:0 ) - linsys? ( >=media-libs/zvbi-0.2.28:0 ) - lirc? ( app-misc/lirc:0 ) - live? ( >=media-plugins/live-2011.12.23:0 ) - lua? ( >=dev-lang/lua-5.1:0 ) - matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) - modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) - mp3? ( media-libs/libmad:0 ) - mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) - mtp? ( >=media-libs/libmtp-1:0 ) - musepack? ( >=media-sound/musepack-tools-444:0 ) - ncurses? ( sys-libs/ncurses:0=[unicode] ) - ogg? ( >=media-libs/libogg-1:0 ) - opencv? ( >media-libs/opencv-2:0= ) - opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) - opus? ( >=media-libs/opus-1.0.3:0 ) - png? ( media-libs/libpng:0= ) - postproc? ( - !libav? ( >=media-video/ffmpeg-2.2:0= ) - libav? ( media-libs/libpostproc:0= ) - ) - projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) - pulseaudio? ( >=media-sound/pulseaudio-1:0 ) - qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) - 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? ( >=media-libs/libsdl-1.2.10:0 - sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) - sftp? ( net-libs/libssh2:0 ) - shout? ( >=media-libs/libshout-2.1:0 ) - sid? ( media-libs/libsidplay:2 ) - skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) - speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) - svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) - swscale? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) - ) - taglib? ( >=media-libs/taglib-1.9:0 ) - theora? ( >=media-libs/libtheora-1.0_beta3: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-142:0 ) - upnp? ( net-libs/libupnp:= ) - v4l? ( media-libs/libv4l:0 ) - vaapi? ( - x11-libs/libva:0=[X,drm] - !libav? ( media-video/ffmpeg:0=[vaapi] ) - libav? ( media-video/libav:0=[vaapi] ) - ) - vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) - vdpau? ( - x11-libs/libvdpau:0 - !libav? ( media-video/ffmpeg:0= ) - libav? ( >=media-video/libav-10:0= ) - ) - vnc? ( >=net-libs/libvncserver-0.9.9:0 ) - vorbis? ( media-libs/libvorbis:0 ) - vpx? ( media-libs/libvpx:0= ) - X? ( x11-libs/libX11:0 ) - x264? ( media-libs/x264:0= ) - x265? ( media-libs/x265:0= ) - xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) - xml? ( dev-libs/libxml2:2 ) - zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) - zvbi? ( media-libs/zvbi:0 ) -" -DEPEND="${RDEPEND} - app-arch/xz-utils:0 - >=sys-devel/gettext-0.18.3:* - virtual/pkgconfig:* - amd64? ( dev-lang/yasm:* ) - x86? ( dev-lang/yasm:* ) - xcb? ( x11-proto/xproto:0 ) -" - -PATCHES=( - # Fix build system mistake. - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch - - # Bug #541678 - "${FILESDIR}"/qt4-select.patch - - # Allow QT5.5 since Gentoo has a patched QTwidgets - "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch - - # Bug #575072 - "${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch - "${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch - - # Bug #589396 - "${FILESDIR}"/${PN}-2.2.4-cxx0x.patch - - # Bug #594126, #629294 - "${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch - "${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch - - # Bug #593460 - "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch - - "${FILESDIR}"/${P}-libupnp-compat.patch - - # Bug 590164 - "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch -) - -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.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 -f 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 - - # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt - # version may be used. Setting QT_SELECT environment variable will enforce correct binaries. - if use qt5; then - export QT_SELECT=qt5 - fi -} - -src_configure() { - local myconf - - # 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 - - # 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 projectm ; then - local dejavu="/usr/share/fonts/dejavu/" - myconf="--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 - - if use qt5 ; then - myconf+=" --enable-qt=5" - else - myconf+=" --disable-qt" - fi - - econf \ - ${myconf} \ - --enable-vlc \ - --docdir=/usr/share/doc/${PF} \ - --disable-dependency-tracking \ - --disable-optimizations \ - --disable-update-check \ - --enable-fast-install \ - --enable-screen \ - $(use_enable a52) \ - $(use_enable aalib aa) \ - $(use_enable alsa) \ - $(use_enable altivec) \ - $(use_enable atmo) \ - $(use_enable audioqueue) \ - $(use_enable avcodec) \ - $(use_enable avformat) \ - $(use_enable bidi fribidi) \ - $(use_enable bluray) \ - $(use_enable cdda vcd) \ - $(use_enable cddb libcddb) \ - $(use_enable chromaprint) \ - $(use_enable dbus) \ - $(use_enable directx) \ - $(use_enable dc1394) \ - $(use_enable debug) \ - $(use_enable dts dca) \ - $(use_enable dvbpsi) \ - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ - $(use_enable dxva2) \ - $(use_enable encode sout) \ - $(use_enable faad) \ - $(use_enable fdk fdkaac) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable fontconfig) \ - $(use_enable gcrypt libgcrypt) \ - $(use_enable gme) \ - $(use_enable gnome gnomevfs) \ - $(use_enable gnutls) \ - $(use_enable growl) \ - $(use_enable gstreamer gst-decode) \ - $(use_enable httpd) \ - $(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-dialog-provider) \ - $(use_enable macosx-eyetv) \ - $(use_enable macosx-qtkit) \ - $(use_enable macosx-quartztext) \ - $(use_enable matroska mkv) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(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 ogg mux_ogg) \ - $(use_enable omxil) \ - $(use_enable omxil omxil-vout) \ - $(use_enable opencv) \ - $(use_enable opengl glspectrum) \ - $(use_enable opus) \ - $(use_enable optimisememory optimize-memory) \ - $(use_enable png) \ - $(use_enable postproc) \ - $(use_enable projectm) \ - $(use_enable pulseaudio pulse) \ - $(use_enable rdp freerdp) \ - $(use_enable rtsp realrtsp) \ - $(use_enable run-as-root) \ - $(use_enable samba smbclient) \ - $(use_enable schroedinger) \ - $(use_enable sdl) \ - $(use_enable sdl-image) \ - $(use_enable sid) \ - $(use_enable sftp) \ - $(use_enable shout) \ - $(use_enable skins skins2) \ - $(use_enable speex) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable svg) \ - $(use_enable svg svgdec) \ - $(use_enable swscale) \ - $(use_enable taglib) \ - $(use_enable theora) \ - $(use_enable tremor) \ - $(use_enable truetype freetype) \ - $(use_enable twolame) \ - $(use_enable udev) \ - $(use_enable upnp) \ - $(use_enable v4l v4l2) \ - $(use_enable vaapi libva) \ - $(use_enable vcdx) \ - $(use_enable vdpau) \ - $(use_enable vlm) \ - $(use_enable vnc) \ - $(use_enable vorbis) \ - $(use_enable vpx) \ - $(use_enable wma-fixed) \ - $(use_with X x) \ - $(use_enable x264) \ - $(use_enable x265) \ - $(use_enable xcb) \ - $(use_enable xml libxml2) \ - $(use_enable xv xvideo) \ - $(use_enable zeroconf bonjour) \ - $(use_enable zvbi) $(use_enable !zvbi telx) \ - --disable-asdcp \ - --disable-coverage \ - --disable-cprof \ - --disable-crystalhd \ - --disable-decklink \ - --disable-directfb \ - --disable-gles1 \ - --disable-gles2 \ - --disable-goom \ - --disable-kai \ - --disable-kva \ - --disable-maintainer-mode \ - --disable-merge-ffmpeg \ - --disable-mfx \ - --disable-mmal-codec \ - --disable-mmal-vout \ - --disable-opensles \ - --disable-oss \ - --disable-quicktime \ - --disable-rpi-omxil \ - --disable-shine \ - --disable-sndio \ - --disable-vda \ - --disable-vsxu \ - --disable-wasapi - - # ^ We don't have these disabled libraries in the Portage tree yet. - - # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file - sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/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" -f "/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/lib64/vlc/plugins/plugins.dat ]]; then - rm /usr/lib64/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.0-r1.ebuild b/media-video/vlc/vlc-3.0.0-r1.ebuild new file mode 100644 index 000000000000..782d399de032 --- /dev/null +++ b/media-video/vlc/vlc-3.0.0-r1.ebuild @@ -0,0 +1,499 @@ +# 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 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb + chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd + dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt + gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca + libnotify +libsamplerate libtiger linsys libtar lirc live lua + macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 + mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus + png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba + schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg + +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau + vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi +" +REQUIRED_USE=" + aalib? ( X ) + bidi? ( truetype ) + dvb? ( dvbpsi ) + dxva2? ( avcodec ) + ffmpeg? ( avcodec avformat swscale ) + fontconfig? ( truetype ) + gnutls? ( gcrypt ) + libcaca? ( X ) + libtar? ( skins ) + libtiger? ( kate ) + skins? ( qt5 truetype X xml ) + vaapi? ( avcodec X ) + vdpau? ( X ) + vlm? ( encode ) + xv? ( xcb ) +" +RDEPEND=" + dev-libs/libgpg-error:0 + net-dns/libidn:0 + sys-libs/zlib:0[minizip] + virtual/libintl:0 + a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) + aalib? ( media-libs/aalib:0 ) + alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) + aom? ( media-libs/libaom:= ) + archive? ( app-arch/libarchive:= ) + avcodec? ( + !libav? ( media-video/ffmpeg:0= ) + libav? ( media-video/libav:0= ) + ) + avformat? ( + !libav? ( media-video/ffmpeg:0= ) + libav? ( media-video/libav:0= ) + ) + bidi? ( dev-libs/fribidi:0 ) + bluray? ( >=media-libs/libbluray-0.6.2:0= ) + cddb? ( >=media-libs/libcddb-1.2:0 ) + chromaprint? ( >=media-libs/chromaprint-0.6:0 ) + chromecast? ( >=dev-libs/protobuf-2.5.0:= ) + dbus? ( >=sys-apps/dbus-1.6:0 ) + dc1394? ( + >=media-libs/libdc1394-2.1:2 + >=sys-libs/libraw1394-2.0.1:0 + ) + dts? ( >=media-libs/libdca-0.0.5:0 ) + dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) + dvd? ( + >=media-libs/libdvdnav-4.9:0 + >=media-libs/libdvdread-4.9:0 + ) + elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) + faad? ( >=media-libs/faad2-2.6.1:0 ) + fdk? ( media-libs/fdk-aac:0 ) + flac? ( + >=media-libs/flac-1.1.2:0 + >=media-libs/libogg-1:0 + ) + fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) + fontconfig? ( media-libs/fontconfig:1.0 ) + gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) + gme? ( media-libs/game-music-emu:0 ) + gnome-keyring? ( app-crypt/libsecret ) + gnutls? ( net-libs/gnutls:0 ) + gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) + ieee1394? ( + >=sys-libs/libavc1394-0.5.3:0 + >=sys-libs/libraw1394-2.0.1:0 + ) + jack? ( virtual/jack ) + jpeg? ( virtual/jpeg:0 ) + kate? ( >=media-libs/libkate-0.3:0 ) + libass? ( + media-libs/fontconfig:1.0 + >=media-libs/libass-0.9.8:0= + ) + libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) + libnotify? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libnotify:0 + ) + libsamplerate? ( media-libs/libsamplerate:0 ) + libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) + libtiger? ( >=media-libs/libtiger-0.3.1:0 ) + linsys? ( >=media-libs/zvbi-0.2.28:0 ) + lirc? ( app-misc/lirc:0 ) + live? ( >=media-plugins/live-2011.12.23:0 ) + lua? ( >=dev-lang/lua-5.1:0 ) + matroska? ( + >=dev-libs/libebml-1:0= + >=media-libs/libmatroska-1:0= + ) + modplug? ( media-libs/libmodplug:0 ) + mp3? ( media-libs/libmad:0 ) + mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) + mtp? ( >=media-libs/libmtp-1:0 ) + musepack? ( >=media-sound/musepack-tools-444:0 ) + ncurses? ( sys-libs/ncurses:0=[unicode] ) + nfs? ( >=net-fs/libnfs-0.10.0:= ) + ogg? ( >=media-libs/libogg-1:0 ) + opencv? ( >media-libs/opencv-2:0= ) + opengl? ( + virtual/opengl:0 + >=x11-libs/libX11-1.3.99.901:0 + ) + opus? ( >=media-libs/opus-1.0.3:0 ) + png? ( media-libs/libpng:0= ) + postproc? ( + !libav? ( >=media-video/ffmpeg-3.1.3:0= ) + libav? ( media-libs/libpostproc:0= ) + ) + projectm? ( + media-fonts/dejavu:0 + media-libs/libprojectm:0 + ) + pulseaudio? ( >=media-sound/pulseaudio-1:0 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( dev-qt/qtx11extras:5 ) + ) + 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-1.2.10:0 ) + sftp? ( net-libs/libssh2:0 ) + shout? ( >=media-libs/libshout-2.1:0 ) + sid? ( media-libs/libsidplay:2 ) + skins? ( + x11-libs/libXext:0 + x11-libs/libXinerama:0 + x11-libs/libXpm:0 + ) + speex? ( + >=media-libs/speex-1.2.0:0 + media-libs/speexdsp:0 + ) + svg? ( + >=gnome-base/librsvg-2.9:2 + >=x11-libs/cairo-1.13.1:0 + ) + swscale? ( + !libav? ( media-video/ffmpeg:0= ) + libav? ( media-video/libav: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?] + !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) + libav? ( media-video/libav:0=[vaapi] ) + ) + vcd? ( >=dev-libs/libcdio-0.78.2:0 ) + vdpau? ( + x11-libs/libvdpau:0 + !libav? ( media-video/ffmpeg:0= ) + libav? ( >=media-video/libav-10:0= ) + ) + vnc? ( >=net-libs/libvncserver-0.9.9:0 ) + vorbis? ( media-libs/libvorbis:0 ) + vpx? ( media-libs/libvpx:0= ) + wayland? ( + dev-libs/wayland + dev-libs/wayland-protocols + ) + X? ( x11-libs/libX11:0 ) + x264? ( media-libs/x264:0= ) + x265? ( media-libs/x265:0= ) + xcb? ( + x11-libs/libxcb:0 + x11-libs/xcb-util:0 + x11-libs/xcb-util-keysyms:0 + ) + xml? ( dev-libs/libxml2:2 ) + zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) + zvbi? ( media-libs/zvbi:0 ) +" +DEPEND="${RDEPEND} + app-arch/xz-utils:0 + >=sys-devel/gettext-0.19.8:* + virtual/pkgconfig:* + amd64? ( dev-lang/yasm:* ) + x86? ( dev-lang/yasm:* ) + xcb? ( x11-proto/xproto:0 ) +" + +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 +) + +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=( + --enable-vlc + --docdir=/usr/share/doc/${PF} + --disable-dependency-tracking + --disable-optimizations + --disable-update-check + --enable-fast-install + --enable-screen + $(use_enable a52) + $(use_enable aalib aa) + $(use_enable alsa) + $(use_enable altivec) + $(use_enable aom) + $(use_enable archive) + $(use_enable avcodec) + $(use_enable avformat) + $(use_enable bidi fribidi) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable directx) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable dxva2) + $(use_enable encode sout) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gnutls) + $(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 cpu_flags_x86_mmx mmx) + $(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 ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable opencv) + $(use_enable opus) + $(use_enable optimisememory optimize-memory) + $(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 sid) + $(use_enable sftp) + $(use_enable shout) + $(use_enable skins skins2) + $(use_enable speex) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable swscale) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable truetype freetype) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vcd) + $(use_enable vdpau) + $(use_enable vlm) + $(use_enable vnc) + $(use_enable vorbis) + $(use_enable vpx) + $(use_enable wayland) + $(use_enable wma-fixed) + $(use_with X x) + $(use_enable x264) + $(use_enable xcb) + $(use_enable xml libxml2) + $(use_enable xv xvideo) + $(use_enable x265) + $(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-srt + --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 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.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index f97e73f1b770..782d399de032 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -27,19 +27,19 @@ DESCRIPTION="Media player and framework with support for most multimedia files a HOMEPAGE="https://www.videolan.org/vlc/" LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5-8" # vlc - vlccore +SLOT="0/5-9" # vlc - vlccore IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt - gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca + gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau - vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi + vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi " REQUIRED_USE=" aalib? ( X ) @@ -80,7 +80,7 @@ RDEPEND=" bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) - chromecast? ( >=dev-libs/protobuf-2.5.0 ) + chromecast? ( >=dev-libs/protobuf-2.5.0:= ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 @@ -103,6 +103,7 @@ RDEPEND=" fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) + gnome-keyring? ( app-crypt/libsecret ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( @@ -202,7 +203,7 @@ RDEPEND=" upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( - x11-libs/libva:0=[X,drm] + x11-libs/libva:0=[drm,wayland?,X?] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) @@ -215,6 +216,10 @@ RDEPEND=" vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) + wayland? ( + dev-libs/wayland + dev-libs/wayland-protocols + ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) @@ -249,7 +254,8 @@ 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 + 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 @@ -278,7 +284,149 @@ src_prepare() { } src_configure() { - local myconf + local myeconfargs=( + --enable-vlc + --docdir=/usr/share/doc/${PF} + --disable-dependency-tracking + --disable-optimizations + --disable-update-check + --enable-fast-install + --enable-screen + $(use_enable a52) + $(use_enable aalib aa) + $(use_enable alsa) + $(use_enable altivec) + $(use_enable aom) + $(use_enable archive) + $(use_enable avcodec) + $(use_enable avformat) + $(use_enable bidi fribidi) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable directx) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable dxva2) + $(use_enable encode sout) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gnutls) + $(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 cpu_flags_x86_mmx mmx) + $(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 ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable opencv) + $(use_enable opus) + $(use_enable optimisememory optimize-memory) + $(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 sid) + $(use_enable sftp) + $(use_enable shout) + $(use_enable skins skins2) + $(use_enable speex) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable swscale) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable truetype freetype) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vcd) + $(use_enable vdpau) + $(use_enable vlm) + $(use_enable vnc) + $(use_enable vorbis) + $(use_enable vpx) + $(use_enable wayland) + $(use_enable wma-fixed) + $(use_with X x) + $(use_enable x264) + $(use_enable xcb) + $(use_enable xml libxml2) + $(use_enable xv xvideo) + $(use_enable x265) + $(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-srt + --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" @@ -300,156 +448,20 @@ src_configure() { if use truetype || use projectm ; then local dejavu="/usr/share/fonts/dejavu/" - myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \ - --with-default-font-family=Sans \ - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace" + 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 \ - ${myconf} \ - --enable-vlc \ - --docdir=/usr/share/doc/${PF} \ - --disable-dependency-tracking \ - --disable-optimizations \ - --disable-update-check \ - --enable-fast-install \ - --enable-screen \ - $(use_enable a52) \ - $(use_enable aalib aa) \ - $(use_enable alsa) \ - $(use_enable altivec) \ - $(use_enable aom) \ - $(use_enable archive) \ - $(use_enable avcodec) \ - $(use_enable avformat) \ - $(use_enable bidi fribidi) \ - $(use_enable bluray) \ - $(use_enable cddb libcddb) \ - $(use_enable chromaprint) \ - $(use_enable chromecast) \ - $(use_enable dbus) \ - $(use_enable directx) \ - $(use_enable dc1394) \ - $(use_enable debug) \ - $(use_enable dts dca) \ - $(use_enable dvbpsi) \ - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ - $(use_enable dxva2) \ - $(use_enable encode sout) \ - $(use_enable faad) \ - $(use_enable fdk fdkaac) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable fontconfig) \ - $(use_enable gcrypt libgcrypt) \ - $(use_enable gme) \ - $(use_enable gnutls) \ - $(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 cpu_flags_x86_mmx mmx) \ - $(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 ogg) \ - $(use_enable omxil) \ - $(use_enable omxil omxil-vout) \ - $(use_enable opencv) \ - $(use_enable opus) \ - $(use_enable optimisememory optimize-memory) \ - $(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 sid) \ - $(use_enable sftp) \ - $(use_enable shout) \ - $(use_enable skins skins2) \ - $(use_enable speex) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable svg) \ - $(use_enable svg svgdec) \ - $(use_enable swscale) \ - $(use_enable taglib) \ - $(use_enable theora) \ - $(use_enable tremor) \ - $(use_enable truetype freetype) \ - $(use_enable twolame) \ - $(use_enable udev) \ - $(use_enable upnp) \ - $(use_enable v4l v4l2) \ - $(use_enable vaapi libva) \ - $(use_enable vcd) \ - $(use_enable vdpau) \ - $(use_enable vlm) \ - $(use_enable vnc) \ - $(use_enable vorbis) \ - $(use_enable vpx) \ - $(use_enable wma-fixed) \ - $(use_with X x) \ - $(use_enable x264) \ - $(use_enable xcb) \ - $(use_enable xml libxml2) \ - $(use_enable xv xvideo) \ - $(use_enable x265) \ - $(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-srt \ - --disable-vsxu \ - --disable-wasapi - - # ^ We don't have these disabled libraries in the Portage tree yet. + econf ${myeconfargs[@]} # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file - sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die + # 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() { @@ -477,8 +489,8 @@ pkg_postinst() { } pkg_postrm() { - if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then - rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + 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 diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index d4545b0e1f96..9a3f64ee3bf8 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -27,19 +27,19 @@ DESCRIPTION="Media player and framework with support for most multimedia files a HOMEPAGE="https://www.videolan.org/vlc/" LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5-8" # vlc - vlccore +SLOT="0/5-9" # vlc - vlccore IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt - gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca + gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau - vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi + vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi " REQUIRED_USE=" aalib? ( X ) @@ -80,7 +80,7 @@ RDEPEND=" bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) - chromecast? ( >=dev-libs/protobuf-2.5.0 ) + chromecast? ( >=dev-libs/protobuf-2.5.0:= ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 @@ -103,6 +103,7 @@ RDEPEND=" fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) + gnome-keyring? ( app-crypt/libsecret ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( @@ -202,7 +203,7 @@ RDEPEND=" upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( - x11-libs/libva:0=[X,drm] + x11-libs/libva:0=[drm,wayland?,X?] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) @@ -215,6 +216,10 @@ RDEPEND=" vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) + wayland? ( + dev-libs/wayland + dev-libs/wayland-protocols + ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) @@ -249,7 +254,8 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch + has_version '>=net-libs/libupnp-1.8.0' && \ + eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch # Bootstrap when we are on a git checkout. if [[ ${PV} = *9999 ]] ; then @@ -278,7 +284,149 @@ src_prepare() { } src_configure() { - local myconf + local myeconfargs=( + --enable-vlc + --docdir=/usr/share/doc/${PF} + --disable-dependency-tracking + --disable-optimizations + --disable-update-check + --enable-fast-install + --enable-screen + $(use_enable a52) + $(use_enable aalib aa) + $(use_enable alsa) + $(use_enable altivec) + $(use_enable aom) + $(use_enable archive) + $(use_enable avcodec) + $(use_enable avformat) + $(use_enable bidi fribidi) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable directx) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable dxva2) + $(use_enable encode sout) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gnutls) + $(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 cpu_flags_x86_mmx mmx) + $(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 ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable opencv) + $(use_enable opus) + $(use_enable optimisememory optimize-memory) + $(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 sid) + $(use_enable sftp) + $(use_enable shout) + $(use_enable skins skins2) + $(use_enable speex) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable swscale) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable truetype freetype) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vcd) + $(use_enable vdpau) + $(use_enable vlm) + $(use_enable vnc) + $(use_enable vorbis) + $(use_enable vpx) + $(use_enable wayland) + $(use_enable wma-fixed) + $(use_with X x) + $(use_enable x264) + $(use_enable xcb) + $(use_enable xml libxml2) + $(use_enable xv xvideo) + $(use_enable x265) + $(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-srt + --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" @@ -300,156 +448,20 @@ src_configure() { if use truetype || use projectm ; then local dejavu="/usr/share/fonts/dejavu/" - myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \ - --with-default-font-family=Sans \ - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace" + 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 \ - ${myconf} \ - --enable-vlc \ - --docdir=/usr/share/doc/${PF} \ - --disable-dependency-tracking \ - --disable-optimizations \ - --disable-update-check \ - --enable-fast-install \ - --enable-screen \ - $(use_enable a52) \ - $(use_enable aalib aa) \ - $(use_enable alsa) \ - $(use_enable altivec) \ - $(use_enable aom) \ - $(use_enable archive) \ - $(use_enable avcodec) \ - $(use_enable avformat) \ - $(use_enable bidi fribidi) \ - $(use_enable bluray) \ - $(use_enable cddb libcddb) \ - $(use_enable chromaprint) \ - $(use_enable chromecast) \ - $(use_enable dbus) \ - $(use_enable directx) \ - $(use_enable dc1394) \ - $(use_enable debug) \ - $(use_enable dts dca) \ - $(use_enable dvbpsi) \ - $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ - $(use_enable dxva2) \ - $(use_enable encode sout) \ - $(use_enable faad) \ - $(use_enable fdk fdkaac) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable fontconfig) \ - $(use_enable gcrypt libgcrypt) \ - $(use_enable gme) \ - $(use_enable gnutls) \ - $(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 cpu_flags_x86_mmx mmx) \ - $(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 ogg) \ - $(use_enable omxil) \ - $(use_enable omxil omxil-vout) \ - $(use_enable opencv) \ - $(use_enable opus) \ - $(use_enable optimisememory optimize-memory) \ - $(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 sid) \ - $(use_enable sftp) \ - $(use_enable shout) \ - $(use_enable skins skins2) \ - $(use_enable speex) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable svg) \ - $(use_enable svg svgdec) \ - $(use_enable swscale) \ - $(use_enable taglib) \ - $(use_enable theora) \ - $(use_enable tremor) \ - $(use_enable truetype freetype) \ - $(use_enable twolame) \ - $(use_enable udev) \ - $(use_enable upnp) \ - $(use_enable v4l v4l2) \ - $(use_enable vaapi libva) \ - $(use_enable vcd) \ - $(use_enable vdpau) \ - $(use_enable vlm) \ - $(use_enable vnc) \ - $(use_enable vorbis) \ - $(use_enable vpx) \ - $(use_enable wma-fixed) \ - $(use_with X x) \ - $(use_enable x264) \ - $(use_enable xcb) \ - $(use_enable xml libxml2) \ - $(use_enable xv xvideo) \ - $(use_enable x265) \ - $(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-srt \ - --disable-vsxu \ - --disable-wasapi - - # ^ We don't have these disabled libraries in the Portage tree yet. + econf ${myeconfargs[@]} # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file - sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die + # 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() { @@ -477,8 +489,8 @@ pkg_postinst() { } pkg_postrm() { - if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then - rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + 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 -- cgit v1.2.3