From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- media-video/h264enc/Manifest | 7 ++-- .../files/h264enc-10.4.7-libaacplusenc.patch | 12 +++++++ media-video/h264enc/h264enc-10.4.1.ebuild | 39 -------------------- media-video/h264enc/h264enc-10.4.7-r1.ebuild | 42 ++++++++++++++++++++++ media-video/h264enc/h264enc-10.4.7.ebuild | 39 -------------------- media-video/h264enc/metadata.xml | 3 -- 6 files changed, 57 insertions(+), 85 deletions(-) create mode 100644 media-video/h264enc/files/h264enc-10.4.7-libaacplusenc.patch delete mode 100644 media-video/h264enc/h264enc-10.4.1.ebuild create mode 100644 media-video/h264enc/h264enc-10.4.7-r1.ebuild delete mode 100644 media-video/h264enc/h264enc-10.4.7.ebuild (limited to 'media-video/h264enc') diff --git a/media-video/h264enc/Manifest b/media-video/h264enc/Manifest index 1b991a1c26d4..1c20c389928e 100644 --- a/media-video/h264enc/Manifest +++ b/media-video/h264enc/Manifest @@ -1,5 +1,4 @@ -DIST h264enc-10.4.1.tar.gz 138598 BLAKE2B 99a68cd9f4696a19c9502d76099f57b62e53851f2bd91c7dbec661daf96593d8962433dc09a27fcd61c9ed71507091dd1098801cdc2f5e6c0cd73cfb0e07456d SHA512 34b7177582931b0e291bf97eee27c8f2c8f5c83539875eebdb8f30f9dfed3eb0f03830130d49ae5c9c80477c7a90b80e95b27fc5855db1ec18894a813f1656f4 +AUX h264enc-10.4.7-libaacplusenc.patch 905 BLAKE2B b79273fbaf4fcfe3f176881c601ce9927bd33535392a0c95f770606f64cc1b69b4b407b919ca50d18a66c0a5c0c49c9c49f8b0972beeabc59b29d5016cb1af1c SHA512 1030a4f24da0499151e576328b0c5f292116012c63862a3d43a22bbd600c174c139ae4ba3dfb84abaeb7d83547b8e113d4062c8bfd82c9f7a859f1c025b693c9 DIST h264enc-10.4.7.tar.gz 138481 BLAKE2B f1571eb79c7d627eb8534a28d5c9ae337e3d1bb8fd416ae83754cb9f4d055c8f8937e228991e8ae15f6c5a657fbc5931acdaa6fe56cf71e89ce1c5b4ba820a27 SHA512 09d133e8b4d16f513b790b4517a276d48fe400c2a09a80ee2ae229a9224a9d225d54b5b48b5b60ed6ebe1f181f8b96340ad0e44a9e1e1eb7e6889809edab0bcf -EBUILD h264enc-10.4.1.ebuild 874 BLAKE2B 2e13892980a8444295377411f0af904010ef4281515c06108790b7254e910bd56f91fda9c4c64aa265d604031826e50a5a05ec35b2a366fffffc33bda5866320 SHA512 e467a23b1aa44d9d6c1e6e662ae8cee2816c79cbea5e686ecdc18d69b4caffc63a8f2ed0993870fea86a334840f8a112246db98125599182d979a1e5c2ff4bda -EBUILD h264enc-10.4.7.ebuild 874 BLAKE2B e6dd6e2c250184b6226b315e61e356d93acfa7bb63c09b3344366b1bfc93c12193a6061830b84f826b06a8bfc123eadab3dd4a9065a137096ee790eda215ce52 SHA512 5148bc8bf58b2f080e2ab1bb2e063898ac3fce914228e5f10cd06d211b5023400a61eb0e38c619f2d3da8e5dac372d1845466578736c587801f74277f4aaa256 -MISC metadata.xml 374 BLAKE2B 646e236202e011028a3e6298f6db4b7ef96da8f73bc1320ef214ab24768f70f608c64debfe4e61f89537ab0fabf3c4de87a56647d4492e5a4cee64735ef51dce SHA512 701d70f6994d2839433f1b7fbef04e1545b9d25a16169e478a465bd0fa3706141b0c190e40520b64c8d2f3c2d55106738295be4d812c750bb9e7874d4fe2a4c8 +EBUILD h264enc-10.4.7-r1.ebuild 1050 BLAKE2B 57fe76462e06faf9883a10b6c20b5465f063d9642be83a81c67881a6801a1b58aefd669110b9ec1c785ca86b074c9a7934e6fe30aca490f9e181d2685a7e8179 SHA512 533e7555e96f54940febe627eff029beafe3db9c096ad131082621245ad7db5c44c3bce55b2484e02827d78fd8fdf0f145466e1fb9ff50b3f581ca4e2c2c34e5 +MISC metadata.xml 300 BLAKE2B 351f5c58f1fe3b1c3db8a0210ba10a0d1f4a1d4749a3f06e2f9c93dc7fdbe583a1a06b6647e28e95f917c86aa29999f8c1aff7b3f2736dcc6044c8c548bc52cf SHA512 80a1cbae96078c5801ca3eff3e34f00bb4d22211ffc91f493dfa162d7e86134f9f6cc9d9192f238bf0620e2f65b5a34b2530d6a99863707d188ecfd6d611ed9b diff --git a/media-video/h264enc/files/h264enc-10.4.7-libaacplusenc.patch b/media-video/h264enc/files/h264enc-10.4.7-libaacplusenc.patch new file mode 100644 index 000000000000..993cbb1efd4a --- /dev/null +++ b/media-video/h264enc/files/h264enc-10.4.7-libaacplusenc.patch @@ -0,0 +1,12 @@ +diff -Naur a/h264enc b/h264enc +--- a/h264enc 2016-01-19 20:15:59.000000000 +0100 ++++ b/h264enc 2019-12-17 14:14:45.321115770 +0100 +@@ -7525,7 +7525,7 @@ + MPL[i]="$MPLAYER \"$AUDINPUT\" $MPLAYEROPTS ${channels[i]} ${audfilters[i]} -really-quiet -vc dummy -vo null -nocache -ao pcm:fast:file=\"$AUDPIPE\"" + NERO[i]="$NEROAACENC -ignorelength ${neroaacbr[i]} -if \"$AUDPIPE\" -of \"$TEMPDIR/audio$i.aac\" &" + FDKAAC[i]="$FDKAACENC ${fdkaacbr[i]} \"$AUDPIPE\" \"$TEMPDIR/audio$i.aac\" &" +- AACPLUS[i]="$AACPLUSENC \"$AUDPIPE\" \"$TEMPDIR/audio$i.aac\" ${aacplusbr[i]} &" ++ AACPLUS[i]="$AACPLUSENC \"$AUDPIPE\" \"$TEMPDIR/audio$i.aac\" $(( ${aacplusbr[i]} * 1000 )) s &" + OGG[i]="$OGGENC ${vorbq[i]} \"$AUDPIPE\" -o \"$TEMPDIR/audio$i.ogg\" &" + OPUS[i]="$OPUSENC ${opusopts[i]} \"$AUDPIPE\" \"$TEMPDIR/audio$i.opus\" &" + FLACENC[i]="$FLAC ${flacq[i]} \"$AUDPIPE\" -o \"$TEMPDIR/audio$i.flac\" &" diff --git a/media-video/h264enc/h264enc-10.4.1.ebuild b/media-video/h264enc/h264enc-10.4.1.ebuild deleted file mode 100644 index 7dac014c220f..000000000000 --- a/media-video/h264enc/h264enc-10.4.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Script to encode H.264/AVC/MPEG-4 Part 10 formats" -HOMEPAGE="http://h264enc.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="aac dvd flac lame matroska mp4 ogm vorbis" - -RDEPEND=" - media-video/mplayer[encode,x264] - sys-apps/coreutils - sys-apps/pv - sys-devel/bc - sys-process/time - aac? ( - media-libs/faac - media-sound/aacplusenc ) - dvd? ( media-video/lsdvd ) - flac? ( media-libs/flac ) - lame? ( media-sound/lame ) - matroska? ( media-video/mkvtoolnix ) - mp4? ( >=media-video/gpac-0.4.5[a52] ) - ogm? ( media-sound/ogmtools ) - vorbis? ( media-sound/vorbis-tools )" -DEPEND="" - -src_install() { - dobin ${PN} - doman man/${PN}.1 - dodoc doc/* - docinto matrices - dodoc matrices/* -} diff --git a/media-video/h264enc/h264enc-10.4.7-r1.ebuild b/media-video/h264enc/h264enc-10.4.7-r1.ebuild new file mode 100644 index 000000000000..51adbd9620cd --- /dev/null +++ b/media-video/h264enc/h264enc-10.4.7-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils + +DESCRIPTION="Script to encode H.264/AVC/MPEG-4 Part 10 formats" +HOMEPAGE="https://h264enc.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="media-video/mplayer[encode,x264] + sys-apps/coreutils + sys-apps/pv + sys-devel/bc + sys-process/time" + +PATCHES=( "${FILESDIR}/${P}-libaacplusenc.patch" ) + +src_install() { + dobin ${PN} + doman man/${PN}.1 + dodoc doc/* + docinto matrices + dodoc matrices/* +} + +pkg_postinst() { + elog "Optional encoders:" + optfeature "aac support" "media-libs/faac media-libs/libaacplus" + optfeature "dvd support" media-video/lsdvd + optfeature "flac support" media-libs/flac + optfeature "lame (mp3) support" media-sound/lame + optfeature "matroska (mkv) support" media-video/mkvtoolnix + optfeature "mp4 support" media-video/gpac[a52] + optfeature "ogm support" media-sound/ogmtools + optfeature "vorbis support" media-sound/vorbis-tools +} diff --git a/media-video/h264enc/h264enc-10.4.7.ebuild b/media-video/h264enc/h264enc-10.4.7.ebuild deleted file mode 100644 index fef4d27a4655..000000000000 --- a/media-video/h264enc/h264enc-10.4.7.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Script to encode H.264/AVC/MPEG-4 Part 10 formats" -HOMEPAGE="http://h264enc.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="aac dvd flac lame matroska mp4 ogm vorbis" - -RDEPEND=" - media-video/mplayer[encode,x264] - sys-apps/coreutils - sys-apps/pv - sys-devel/bc - sys-process/time - aac? ( - media-libs/faac - media-sound/aacplusenc ) - dvd? ( media-video/lsdvd ) - flac? ( media-libs/flac ) - lame? ( media-sound/lame ) - matroska? ( media-video/mkvtoolnix ) - mp4? ( >=media-video/gpac-0.4.5[a52] ) - ogm? ( media-sound/ogmtools ) - vorbis? ( media-sound/vorbis-tools )" -DEPEND="" - -src_install() { - dobin ${PN} - doman man/${PN}.1 - dodoc doc/* - docinto matrices - dodoc matrices/* -} diff --git a/media-video/h264enc/metadata.xml b/media-video/h264enc/metadata.xml index 3a904dcc63d8..a98f0fb605ac 100644 --- a/media-video/h264enc/metadata.xml +++ b/media-video/h264enc/metadata.xml @@ -4,9 +4,6 @@ media-video@gentoo.org - - Support for OGM container format - h264enc -- cgit v1.2.3