diff options
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/Manifest | 2 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 21 |
2 files changed, 18 insertions, 5 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 431e154d35c6..8633057b5b61 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -33,5 +33,5 @@ EBUILD ffmpeg-6.0-r11.ebuild 20020 BLAKE2B a40a46d38cf91778bac13235c227dcb6c9b2d EBUILD ffmpeg-6.0.1-r2.ebuild 19932 BLAKE2B a061f4479a123e5718eddb266099c3026092e566b3de0f1402f5ea06bf0138d2996c15f71679e44ca28cc48c87506b98cd46c4ee1ef8b230260a4d45e8b61955 SHA512 eba2afb8851ed6ead9db8443d80b6b782139a0f02e33a64371442f7c02d1b901885c34116923e029091e4caa67f57ee2179a21908c0da98454586935fa73920b EBUILD ffmpeg-6.1.1-r2.ebuild 19557 BLAKE2B 37f2d46bce4dbbd0fdc1be54c718075da95fadfc6caa28fd4391960af022a2cac54374708a7e8f57455e66fdacaf69b580faaa2a532729c694c5e01faff3da4b SHA512 f04da11f41143394565733af05667e504a5d012c7b4ad669e8be46896f33f71caa3f8fc3b9fd7751667b92b40e412cb15c700423efbb1db5f7c3308fca07e288 EBUILD ffmpeg-6.1.1-r3.ebuild 19857 BLAKE2B 257b08c1ea37d39019cbc08d392d83d8f0146bb3ba42a22f3f06bb5a7e812a64e62fc64fc554e1e444f99f288d045c89c7cd666d524d02306eac44455acf56cf SHA512 49f3eb157089ec6aa2f462ce351d3ca9d89d356ef8357e6dd48ba2f1e25f84356f86bd042f2d9fd7b8e9cd68ac10532dbd88dbca28ea6af54d7389d2e2a044dd -EBUILD ffmpeg-9999.ebuild 19361 BLAKE2B d681d6f92adc37dd1a69e2a39ce9419c167d7d7ea1e30fd4254f524d89feb37225e6b2e940e0b8ec1618d6f05cc142f3012101a3921175560d82c377373c49f4 SHA512 036078ad30d19e833fae749c4525a70b9ae208fbaefaf8ba8f27f86327be5fce3f48e5a2e044ebdf1d57f0785c6d0fab6fab424bbcbe833bc579ab5765163675 +EBUILD ffmpeg-9999.ebuild 19709 BLAKE2B 3d940c36823d190c3450bf1087d80df700d5ad621633c19d65da5f95c1c50686698557194436164ede74da258a6b9496c094f1da03de12596a39508a2ca8aeb1 SHA512 b9839d4c6b24ba8cfc4c719d535177f0f920d9fcb026ad6ddbdf5c779f61896a622908e63b703351a61e2df1b26e81e63c1b0fa13067288290aab8abdd572973 MISC metadata.xml 7897 BLAKE2B 911f673353c480db243c202046f876840849cb27155fb109ee365e009d20af086fe188d91c7d33d509a7362330cea853a808c8e0a463aca8de3c304a3ed52ed0 SHA512 bdf26ee26d65a5ce58bc958eaad682cf4b5101100566cd4a4adf0b671418a2a7958a54baa2abff480f17bfcfe2d33aae20ba7d37f0d7b116f210d40796483da1 diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index e79ef6ab48eb..b5e32f2c8f88 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -14,6 +14,10 @@ EAPI=8 # doing so since such a case is unlikely. FFMPEG_SUBSLOT=58.60.60 +SOC_PATCHES=( + ffmpeg-rpi-6.1.patch +) + SCM="" if [ "${PV#9999}" != "${PV}" ] ; then SCM="git-r3" @@ -25,14 +29,15 @@ inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" HOMEPAGE="https://ffmpeg.org/" +SRC_URI="soc? ( "${SOC_PATCHES[@]/#/https://dev.gentoo.org/~chewi/distfiles/}" )" if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" + : elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" + SRC_URI+=" mirror://gentoo/${P}.tar.xz" else # Release VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc inherit verify-sig - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz" + SRC_URI+=" https://ffmpeg.org/releases/${P/_/-}.tar.xz" SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" @@ -108,7 +113,7 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa chromium doc +encode oss +pic sndio static-libs test v4l + alsa chromium doc +encode oss +pic sndio static-libs test v4l soc ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " @@ -263,6 +268,7 @@ RDEPEND=" sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) + soc? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] ) ssh? ( >=net-libs/libssh-0.6.0:=[sftp,${MULTILIB_USEDEP}] ) @@ -341,6 +347,7 @@ REQUIRED_USE=" glslang? ( vulkan !shaderc ) libv4l? ( v4l ) shaderc? ( vulkan !glslang ) + soc? ( libdrm ) test? ( encode ) ${GPL_REQUIRED_USE} ${CPU_REQUIRED_USE}" @@ -379,6 +386,9 @@ src_prepare() { export revision=git-N-${FFMPEG_REVISION} fi + use soc && + eapply "${SOC_PATCHES[@]/#/${DISTDIR}/}" + default # -fdiagnostics-color=auto gets appended after user flags which @@ -392,6 +402,9 @@ src_prepare() { multilib_src_configure() { local myconf=( ) + # Conditional patch options + use soc && myconf+=( --enable-v4l2-request --enable-libudev --enable-sand ) + # bug 842201 use ia64 && tc-is-gcc && append-flags \ -fno-tree-ccp \ |