diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-06-20 00:10:57 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-20 00:10:57 +0100 |
commit | d6ca4e4f90cb75c323b5988eefa96a04c0d36908 (patch) | |
tree | 8197fc88451976470c871e991b75a9d40c240270 /media-video | |
parent | e8df704cf9b5e9e517317b8912377c0a8ca0d11e (diff) |
gentoo auto-resync : 20:06:2024 - 00:10:56
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/Manifest.gz | bin | 23853 -> 23858 bytes | |||
-rw-r--r-- | media-video/ffmpeg-chromium/Manifest | 10 | ||||
-rw-r--r-- | media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild | 250 | ||||
-rw-r--r-- | media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild | 250 | ||||
-rw-r--r-- | media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild (renamed from media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild) | 9 | ||||
-rw-r--r-- | media-video/ffmpeg-chromium/metadata.xml | 1 |
6 files changed, 8 insertions, 512 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 27af6f08efb7..57b58235e429 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index 1e1c820ba4b7..bb9d418c92e5 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -1,15 +1,11 @@ AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eaddb51611b7c39fb48c23890257997d3ddfee47244e6ffc0abb241e3118e0e8bcbf63442885445bcee3 SHA512 711b338178fe042aff92375d6593197337529986ea55ac6288df4c725145dd06c41fcfc11df4843e03eeaa4bad90ed558acf8f6945b9b96c9751fff92a41811a AUX ffmpeg-chromium-120.patch 1485 BLAKE2B 49ece028bf7da100adc7af93e82b6235fb39f12199ce037b730b97012ca787047b45be821cec609cdfa7e00bb1f8c88a9ecae0b7b88fd8db6f53476b94833f9f SHA512 0f3276f75132bd8adbde4305ffa604cfa3d504ed66f883af109c75711d0f9af6dee2d55d7298ec36864a421250a0c4998d3306f0e47750c016c4274545195b49 -DIST ffmpeg-chromium-120.tar.xz 10096036 BLAKE2B 8f24dfed854c713df369e6ef15bc773a3166fdf6eb8c90bcb1d1b7ddddaca0702df7615bc323432a40b5d213352945fa49acf8e864df2caa358764b5068a75f3 SHA512 0e0bfb44225981f91edceeb6f302592a7e108da49c5e6503b43f0e12b91d84dece908efe5e548bb31ccab49c5fba5a8365f5f0793bbf1450d35bfd836f8a3e9b -DIST ffmpeg-chromium-121.tar.xz 10128048 BLAKE2B ba8e25356b7e0820dffea1b919288ddb3d6ec56fe8d17493529ec978deae629607ff5a5857a313e478193a1fca55fa3e5256e37d57251141e1f0a892cbdcf674 SHA512 e6cef1285237673ce5851cbddf4cda77779821c247a120bf73af2b931745b2886c915a35bb2bc21a8a9c5154be9e540f8abccc3bb64e704f5b859141d0dcc2e1 -DIST ffmpeg-chromium-123.tar.xz 10323756 BLAKE2B b56afd5946513511938feeea4fd60e22fcf241a2380b36990eadf812b3517d6941156de73135efdc873704d27bc3329c71193be5132e462caaf7f2dc29e8a058 SHA512 635e1c5496d6f41fa5dd69efbe6dd335a15705dce8544fc45df440b19965caa130646d16b7c22b2b7cc0809979d28f39245fc5c208637e445b1fc1eb384da418 DIST ffmpeg-chromium-124.tar.xz 10378648 BLAKE2B 3cb79d356e84d76a241ad81491d22d42b7a768e348d245bda00101e3967c0864e95a1dd83372e6aaf3a9130ff5ae38610fe2bd4ee8e21fc8247af4172af0683a SHA512 627d1ba81c50300e7188e8a2cc5f76ea9e81e817209631f2eecb81b7b9a0be60a12290eba16240dd0b0dce3d59550a8246be54df2035bd75a9e95ae77d67467b DIST ffmpeg-chromium-125.tar.xz 10372892 BLAKE2B 53b805354b55f1dfbe2341b767aaccca7efea4cced02db9090be88e89a4d2d688904ffc996c206d92a99d4eb93733b7f8cb47fd80dc43019c3bb6690903a1140 SHA512 c1b68b16a3dbd6f96e52c313b9ddf1c193ef302e5cbe7e127c511e54a4453c32c84b3df954e397d7ba834ef17fe1cba6efabfde855d3bb9e497bcde1b66c3d8d DIST ffmpeg-chromium-126.tar.xz 10402160 BLAKE2B 96a92ff2a5ece8668693f5ef7ed5da3e61a523b98a91d00316494df91edfc42c1622663719a3c192de2a4ebf7a6258f08c53393201ee3fc3261f162e1b529dcd SHA512 8fc10b1d5fe159a1dd718229bf8ec50ed0bea1fedd917859b3a0703f15e94809087e67ccf2031eb14ae8b06ad32d958ed71ff54621fd667f5507abd9738a6f0c -EBUILD ffmpeg-chromium-120.ebuild 6692 BLAKE2B db110de522d1885bcf2f5d3c45ca3b343943ecdbe594610a427baeae6e5e6521ee9abfebc6126b543da4c35b7715f464916e65a6c44205c69612a68fd7692317 SHA512 fd3b1ded196a4af08742723ab1ca36dda21e13c2899718e64b5ca3046474bb97042402b3870c2b9edeee3027a0f1eaba1f960bd4208c465651ad741ec8c361c8 -EBUILD ffmpeg-chromium-121.ebuild 6692 BLAKE2B 36aafbff5f4c4a7bf81d9fe1293a1962a8632f9df49012f08e7130e6050a2a026ee3b4394eca6456200ba30a2661a7fe7d1b4a3c5c95602d7865802d65587247 SHA512 a47296b03217d345a6465321ed51ae11a0a61991ea6b8790571e7c0754d1a0c9d91f7944f255dd6a05e255d863523b4637e0e9c21cc644541c04fd5abbd3a43d -EBUILD ffmpeg-chromium-123.ebuild 6629 BLAKE2B ccf9f2604c0440214a1a3670208d192b237be824bfb70294aaf594c0a3f7241c16b1443806b0aa5e78e184c24ad6978f2d588b0953fcd1478f7699d279e7922c SHA512 aa35b07def61daa2b1c4ac575e8c7b9db019dc2be1dd284b20f43e76cb2dd72e8d47d7e5429f9e703de46439a310de4a20d2973fe219de8af1142ec5178430c7 +DIST ffmpeg-chromium-127.tar.xz 10418192 BLAKE2B 2a623ee8e2c0940e4067e6ebecaecdc64c45b16022327a84d77323348c210b091c58eb52b4afea1f2918cd29a27c3457a3294f561a5e6ee2db28c63f432b23bd SHA512 0cddb21761ad3b54f5393d3963ca94518cb4ab8183f2bbe975f8419bd94d8b20131750a22d75fd56b304a2b83be364993a839f727342b7eed6a2d1868f79af4c EBUILD ffmpeg-chromium-124.ebuild 6631 BLAKE2B 5f190273d57e0a20c90d042a231bff16dae975c6153145c74218245b5cd4207fc56033620590fd5e79370ca0e295d1e1075e6113b896e2b43b7af8b6b699977a SHA512 2f69214111249dda6e01535d402d8fc457bcb220e5ae8360f08b686ec2a96a4c78a36e2dd7205b6fffe5b3f9aa0282154c844dae0d59a2edb2e6f183fce5687d EBUILD ffmpeg-chromium-125.ebuild 6657 BLAKE2B db9582314b61909de311d3287577cad8d087a96eb9fd2ac1c9fd8ba0f89622ec8cfbb5790069af68e1f6b42efe0b4be5aea5d6f99425bfa4f99e8ace553ba4d2 SHA512 ec6d625c3d5d6007a3f0f5bea98cf684ddde7087db030e7dacaa93a673a279edf74d62c475c3112927e4a7ab68d3f80621378ad0db77ac7ff3e5b56cc5d6e88d EBUILD ffmpeg-chromium-126.ebuild 6657 BLAKE2B 3e08ce545199da60565e97f1328e4c9e31f14fc169aa0e36aeb7f6c772497d1f92c98f0039ce8968a551e9e38bf4acf3f86db0ac5bbeb9f59837a6851adc0d78 SHA512 7f50b01df708adfc2a94509a606f47b2f119a0af4671c7020c7dc21a0ccf24780f340059532cf5eb45cc30859c7394432d7b2f56cb529fb739bea8e8ab7b4480 -MISC metadata.xml 820 BLAKE2B 666416ef717f7990f3e90e644b82c2833adb4942676f74eac6f15841d0f2a3a841b72906a7079321fb2101ffd672308892f90f536fcefa3837fb49344aeff3e9 SHA512 ffd36a905e6891f5d2134f159e6cb6707d4b37b2c5398474983ffa314fa9c5c140a5b8297de43827dd8108b7b4bcda7859158d2947e5b48730b820660a06962e +EBUILD ffmpeg-chromium-127.ebuild 6659 BLAKE2B b257982863c168fdc163cb9353108999598917bd6954f27f16abface61edb085a2b268e920ceddee54dbb419861e2185431a316ce3739e90c00b41855e3702a4 SHA512 5de38699bf23a442c1865020b299b666ce38c8ca9cd5424eaf245d6c9b8cc86129c70f6c27c4898cbd28ba92eeb4266f2839219ca4ca74bc732760d0dd0ea334 +MISC metadata.xml 695 BLAKE2B 84fa4967572665812d4da8bb1a86a8b28a749892570cb1fca5c0515f860fbe8c472a91240f1d3b7b3109ccdbd32cf8da941c438cd9f332b763f2824e0e193ac8 SHA512 0069bcf32d2aa083c66e13579295e8ef96b9ac72b02f1436620000c71c4d1e335391838f9a9e56f7768bd13dbe13ce6f3f3674a303cf90cc658360825867c3f9 diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild deleted file mode 100644 index f5c83cb50871..000000000000 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT="bed545c1488e1f95075168dfe02388c16ffe1418" -DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" -HOMEPAGE="https://ffmpeg.org/" -SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.xz" - -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) -" -SLOT="${PV}" - -KEYWORDS="amd64 ~arm ~arm64" - -# 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=( - cpudetection:runtime-cpudetect debug - +gpl - vaapi vdpau vulkan - # decoders - mmal - nvenc:ffnvcodec - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -IUSE=" - ${FFMPEG_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 - cpu_flags_arm_asimddp:dotprod - cpu_flags_arm_i8mm:i8mm -) -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_vfp - arm? ( cpu_flags_arm_thumb2 ) - ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( - arm? ( cpu_flags_arm_thumb ) - ) -" -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[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -RDEPEND=" - mmal? ( media-libs/raspberrypi-userland ) - >=media-libs/opus-1.0.2-r2 - vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) - nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) - vdpau? ( >=x11-libs/libvdpau-0.7 ) - vulkan? ( >=media-libs/vulkan-loader-1.3.255:= ) -" - -DEPEND="${RDEPEND} - vulkan? ( >=dev-util/vulkan-headers-1.3.255 ) -" -BDEPEND=" - >=dev-build/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) -" - -REQUIRED_USE=" - ${CPU_REQUIRED_USE}" -RESTRICT=" - test -" - -PATCHES=( - "${FILESDIR}"/${PN}-120.patch - "${FILESDIR}"/chromium.patch -) - -src_prepare() { - export revision=git-N-g${COMMIT:0:10} - default - - # -fdiagnostics-color=auto gets appended after user flags which - # will ignore user's preference. - sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die - - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -src_configure() { - local myconf=( ) - - # Bug #918997. Will probably be fixed upstream in the next release. - use vulkan && append-ldflags -Wl,-z,muldefs - - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # 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, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && tc-is-lto; then - # Respect -flto value, e.g -flto=thin - local v="$(get-flag flto)" - [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) - fi - filter-lto - - # Mandatory configuration - myconf=( - --disable-stripping - # This is only for hardcoded cflags; those are used in configure checks that may - # interfere with proper detections, bug #671746 and bug #645778 - # We use optflags, so that overrides them anyway. - --disable-optimizations - --disable-libcelt # bug #664158 - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) - case ${CHOST} in - *mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Use --extra-libs if needed for LIBS - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --strip="$(tc-getSTRIP)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - --disable-all \ - --disable-autodetect \ - --disable-error-resilience \ - --disable-everything \ - --disable-faan \ - --disable-iconv \ - --disable-network \ - --enable-avcodec \ - --enable-avformat \ - --enable-avutil \ - --enable-libopus \ - --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ - --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ - --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ - --enable-pic \ - --enable-static \ - "${myconf[@]}" \ - ${EXTRA_FFMPEG_CONF} - - echo "${@}" - "${@}" || die -} - -src_compile() { - emake V=1 libffmpeg -} - -src_install() { - emake V=1 DESTDIR="${D}" install-libffmpeg -} diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild deleted file mode 100644 index 99c72fcc7a81..000000000000 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT="3997177624f6b302bbc8a7edbb6f8a6ab47ea978" -DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" -HOMEPAGE="https://ffmpeg.org/" -SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.xz" - -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) -" -SLOT="${PV}" - -KEYWORDS="amd64 ~arm ~arm64" - -# 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=( - cpudetection:runtime-cpudetect debug - +gpl - vaapi vdpau vulkan - # decoders - mmal - nvenc:ffnvcodec - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -IUSE=" - ${FFMPEG_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 - cpu_flags_arm_asimddp:dotprod - cpu_flags_arm_i8mm:i8mm -) -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_vfp - arm? ( cpu_flags_arm_thumb2 ) - ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( - arm? ( cpu_flags_arm_thumb ) - ) -" -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[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -RDEPEND=" - mmal? ( media-libs/raspberrypi-userland ) - >=media-libs/opus-1.0.2-r2 - vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) - nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) - vdpau? ( >=x11-libs/libvdpau-0.7 ) - vulkan? ( >=media-libs/vulkan-loader-1.3.255:= ) -" - -DEPEND="${RDEPEND} - vulkan? ( >=dev-util/vulkan-headers-1.3.255 ) -" -BDEPEND=" - >=dev-build/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) -" - -REQUIRED_USE=" - ${CPU_REQUIRED_USE}" -RESTRICT=" - test -" - -PATCHES=( - "${FILESDIR}"/${PN}-120.patch - "${FILESDIR}"/chromium.patch -) - -src_prepare() { - export revision=git-N-g${COMMIT:0:10} - default - - # -fdiagnostics-color=auto gets appended after user flags which - # will ignore user's preference. - sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die - - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -src_configure() { - local myconf=( ) - - # Bug #918997. Will probably be fixed upstream in the next release. - use vulkan && append-ldflags -Wl,-z,muldefs - - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # 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, bug #754654, bug #772854 - if [[ ${ABI} != x86 ]] && tc-is-lto; then - # Respect -flto value, e.g -flto=thin - local v="$(get-flag flto)" - [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) - fi - filter-lto - - # Mandatory configuration - myconf=( - --disable-stripping - # This is only for hardcoded cflags; those are used in configure checks that may - # interfere with proper detections, bug #671746 and bug #645778 - # We use optflags, so that overrides them anyway. - --disable-optimizations - --disable-libcelt # bug #664158 - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) - case ${CHOST} in - *mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # Use --extra-libs if needed for LIBS - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --strip="$(tc-getSTRIP)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - --disable-all \ - --disable-autodetect \ - --disable-error-resilience \ - --disable-everything \ - --disable-faan \ - --disable-iconv \ - --disable-network \ - --enable-avcodec \ - --enable-avformat \ - --enable-avutil \ - --enable-libopus \ - --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ - --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ - --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ - --enable-pic \ - --enable-static \ - "${myconf[@]}" \ - ${EXTRA_FFMPEG_CONF} - - echo "${@}" - "${@}" || die -} - -src_compile() { - emake V=1 libffmpeg -} - -src_install() { - emake V=1 DESTDIR="${D}" install-libffmpeg -} diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild index cdb9ff78f655..eb68732fd0bc 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-123.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit flag-o-matic toolchain-funcs -COMMIT=7c1b0b524c639beeb25363b1d0809ebe5c6efe5e +COMMIT=bc1ee906cede137c061bea5a5e8d0743374392a5 DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" HOMEPAGE="https://ffmpeg.org/" SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz" @@ -16,7 +16,7 @@ LICENSE=" " SLOT="${PV}" -KEYWORDS="amd64 ~arm arm64 ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64" # Options to use as use_enable in the foo[:bar] form. # This will feed configure with $(use_enable foo bar) @@ -99,11 +99,11 @@ RDEPEND=" vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) vdpau? ( >=x11-libs/libvdpau-0.7 ) - vulkan? ( >=media-libs/vulkan-loader-1.3.255:= ) + vulkan? ( >=media-libs/vulkan-loader-1.3.277:= ) " DEPEND="${RDEPEND} - vulkan? ( >=dev-util/vulkan-headers-1.3.255 ) + vulkan? ( >=dev-util/vulkan-headers-1.3.277 ) " BDEPEND=" >=dev-build/make-3.81 @@ -112,6 +112,7 @@ BDEPEND=" " REQUIRED_USE=" + vulkan? ( threads ) ${CPU_REQUIRED_USE}" RESTRICT=" test diff --git a/media-video/ffmpeg-chromium/metadata.xml b/media-video/ffmpeg-chromium/metadata.xml index 026866d3f537..0e2003eeb51b 100644 --- a/media-video/ffmpeg-chromium/metadata.xml +++ b/media-video/ffmpeg-chromium/metadata.xml @@ -16,6 +16,5 @@ <use> <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag> <flag name="gpl">Build GPL code. Should be enabled unless you require LGPL binaries.</flag> - <flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag> </use> </pkgmetadata> |