From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- media-plugins/gst-plugins-libav/Manifest | 7 +- .../gst-plugins-libav/files/fix-negative-pts.patch | 40 ++++++++ ...gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild | 103 -------------------- ...gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild | 104 +++++++++++++++++++++ .../gst-plugins-libav-1.14.4.4.1_p20181115.ebuild | 102 -------------------- 5 files changed, 147 insertions(+), 209 deletions(-) create mode 100644 media-plugins/gst-plugins-libav/files/fix-negative-pts.patch delete mode 100644 media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild create mode 100644 media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild delete mode 100644 media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild (limited to 'media-plugins/gst-plugins-libav') diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest index e0bd18d79e0e..8f5d7d87105d 100644 --- a/media-plugins/gst-plugins-libav/Manifest +++ b/media-plugins/gst-plugins-libav/Manifest @@ -1,11 +1,10 @@ AUX AVOptionsRanges-leak-fix.patch 1181 BLAKE2B 112c55b0b96d2223fef39380f0e53e21be5adaf5c24acb33ef4bcef6f62a8ffdf981ab4166cfc4b777220f828d675801608ffed958de6c44190913085f95d476 SHA512 caea8b2ba2fcadeebd30689ac380a97ba0047c25a98fdde0a8c2591cf85eac52ba2327fb30a14c152bb100c7f764e7034969b2978eebeee67e2783f257132f98 AUX external-ffmpeg4-dep.patch 672 BLAKE2B f6abd0913ce1dbd26d3c75fab15537f582605d21b6eb7e49cfffe6390a870bac13dc440f1ed319940c216e5a789a87309e20016649388d3b689dc0e602641c55 SHA512 11f9e7e4c96ffebaeb8b3e29934f1dd01ae8794bc6401a8fe3e999110a64949d282c41da1c2145f72a394b45f5c6d62cf1d9af7634e1dc9c4a67a507a9a575ee +AUX fix-negative-pts.patch 1462 BLAKE2B 1f661913eef1d7d2827c95107473556213152e7a4e2c25ff0c9368cfb8933da2cb3c60f9132129e882238c0351179d11ce0ee5273d4a1bf6eee2f7971a52b53e SHA512 dbe9ce45154ab9d6d88faa4507b03e76026dc82236ad1075cf21b3b9d867c273be7aaab8d8c3eb103ac1cd2fbbc5ddcfd6a18ed6d4538c8c087e8755ca875cf7 DIST ffmpeg-3.4.5.tar.bz2 10183082 BLAKE2B f72157baefcd6a0ca8f389309bbe947ad21996e0f2eb3c46c6bfc90f1ebbb14bfd007d001e46ea51efef5db5f9fcee24b1a90b6862136aeebecdc95bb61b23a5 SHA512 e12707d47404a9ce02790b77d2852fc1a1573c8108e980c7355fa48ba891d1649464d4fe4d08394ecd6d871f651ac4388486b7654cb54a7aaeedaf05c55513ec -DIST ffmpeg-4.1.1.tar.bz2 10686360 BLAKE2B 47f4716d7e184d7318eb1a99ab1cdc188009464e973162e583f7ca4ae79fa3b103f9d5329c8993b72d20667e42e5a749123709a4640f07762568300b5c3c897f SHA512 0241c44e1dffd0d890a3d30a1b2387ea167d578bb39ba0c804fb417e132d343a9e43da9247b205e18b893d8cf75d8528e9971569be67ac380b88618ef0a75ed4 -DIST ffmpeg-4.1.tar.bz2 10687291 BLAKE2B 07293af1b13c6c6cad72e368207db21bdbc4b991931166c24ff40b00c3b3c8e1242be1876af8e3f154cc840fcd90d87b762fe77faccf06936dd096478d5d074b SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417 +DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1feaa4f292f14021e0b6bfb3957b13ddacfa87db361e677ae0583cc2bd1d402a66b0c8507cbed79a001c9b8462100bf SHA512 d0f8b3ee7b55e67b1c7ad9610a7b19a15acfc35dc843683502e536ebcc2e8678b55325532c0039b764cc978e95f83afb48bd24304abaee26f26d3247a8310bfe DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d1d16514401fef4bb988ba3d1f306b647ba0cd6e89f0205cc33e6d144889d6b2f7fab9e4fae946e03821a85009fa95c68f3cedf25068a SHA512 1347424ed342f00c25ac4780670611a24eeaf708426b6efc6d9f6c6fa7bf91ef292302a5363afe9523c497265b8c0d7ad81374364cbecb2924b749e716819745 DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717 EBUILD gst-plugins-libav-1.14.4.3.4.5.ebuild 2440 BLAKE2B 61c9b14b905aefdac17cffc297fd6e2e6ef850ea7f0b980c468dbdb3f12b52d192134a51c623ed3294872fe74153d66d766dd0cdf8e8fa6eb2275ac4341c14d3 SHA512 b26cca92978671ac18d713c751a2087e0e86d6a05169626ce36b668920a58d98f354a3c151e00af408bf2cd09a02d46fec85ac7d01597b47ecd30eb6e3a3e328 -EBUILD gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild 3047 BLAKE2B f81b29eaa48d938337497f1b17124f5677cfb682cfdc0a765f1ec61d1ee2820ff364d60d9bf99aedd9faef35aa39fa87356a08391357f8088ce880c772bb68f1 SHA512 f7b103d2c81a8201a102b88066d3a1771897f4cb0302989eaa4369b7276bcb135f849f3235ed28e5f8ce91695a7e388f1d836c00b0fc2fddb13909c764d87f87 -EBUILD gst-plugins-libav-1.14.4.4.1_p20181115.ebuild 2951 BLAKE2B c103597c9ead48bf9335486f109da27cc0401ed8471dfebf06d47815568948393404a5ef4948d00183120c26b03e285fc04d02b37350237f618349a3d78c8ad7 SHA512 a1c3e103488a67e5293aa3a06198f28bea6fd0b2ee84b3f55914210fe7b94eb9544fd930b9f8c67e42c03f86f9e916ed36e01cf2dc5ac4a272d9e3635ebea008 +EBUILD gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild 3169 BLAKE2B 48d4165e5f751789093ea17bc754331b525263141718f633340a232a93c7b12f309c3d720fd129f5b2fda4879f9eb7e2904f7d58a19e229072562bfbf934a37a SHA512 b586a1360e7baecf931896ff59b8bc94c949d10b2530e26c52528a217d9b2567253fa9fd30874ee417ca35c22b8b867165bd8f79e66411a7f1be434bb59570c4 MISC metadata.xml 435 BLAKE2B 8ee96f01d191e918656c2a80e8cacee47237740f7639d34f0205417815a06ae8dd5b0a27bd7bffac668f3a74ce8fc377112e3cbc369ad4fb34089b2975f3c733 SHA512 5c65497b650587ba929108974a18116b9fdea3ae175fc637c470725a39375defbaf962323f7062ce4287655fc47e8fd28ce4a1d8608fe7ea243bc6999a1bf753 diff --git a/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch b/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch new file mode 100644 index 000000000000..d5be422e781d --- /dev/null +++ b/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch @@ -0,0 +1,40 @@ +From 1d293764e55fb9c3901c9dfa903fa5ae0021ab10 Mon Sep 17 00:00:00 2001 +From: Guillaume Desmottes +Date: Thu, 21 Feb 2019 08:48:31 +0100 +Subject: [PATCH] avdemux: fix negative pts if start_time is bigger than the ts + +The start time is supposed to be the ts of the first frame. +FFmpeg uses fractions to represent timestamps and the start time may use a +different base than the frame pts. So we may end up having the start +time bigger than the pts because of rounding when converting to gst ts. + +See https://gitlab.freedesktop.org/gstreamer/gst-libav/issues/51 +for details. +--- + ext/libav/gstavdemux.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c +index 30e0360..3b74f92 100644 +--- a/ext/libav/gstavdemux.c ++++ b/ext/libav/gstavdemux.c +@@ -1473,8 +1473,14 @@ gst_ffmpegdemux_loop (GstFFMpegDemux * demux) + goto drop; + #endif + +- if (GST_CLOCK_TIME_IS_VALID (timestamp)) +- timestamp -= demux->start_time; ++ if (GST_CLOCK_TIME_IS_VALID (timestamp)) { ++ /* start_time should be the ts of the first frame but it may actually be ++ * higher because of rounding when converting to gst ts. */ ++ if (demux->start_time >= timestamp) ++ timestamp = 0; ++ else ++ timestamp -= demux->start_time; ++ } + + /* check if we ran outside of the segment */ + if (demux->segment.stop != -1 && timestamp > demux->segment.stop) +-- +2.17.0 + diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild deleted file mode 100644 index 22bb5b192043..000000000000 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eapi7-ver multilib-minimal - -MY_PN="gst-libav" -MY_PV="$(ver_cut 1-3)" -MY_P="${MY_PN}-${MY_PV}" -FFMPEG_PV="$(ver_cut 4- ${PV%_*})" - -DESCRIPTION="FFmpeg based gstreamer plugin" -HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html" -SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz - https://dev.gentoo.org/~leio/distfiles/${MY_P}-ffmpeg4-patchset.tar.xz - libav? ( https://ffmpeg.org/releases/ffmpeg-${FFMPEG_PV}.tar.bz2 )" - -LICENSE="LGPL-2+" -SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="libav +orc" - -RDEPEND=" - >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-${MY_PV}:1.0[${MULTILIB_USEDEP}] - !libav? ( >=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}] ) - libav? ( - app-arch/bzip2[${MULTILIB_USEDEP}] - app-arch/xz-utils[${MULTILIB_USEDEP}] - ) - orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.12 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${WORKDIR}"/patches # ffmpeg-4 compat and more from git up to 20181115; requires eautoreconf - "${FILESDIR}"/AVOptionsRanges-leak-fix.patch # extra patch from Jan 2019 for a leak fix - "${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes -) - -RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly - -src_unpack() { - default - - if use libav; then - # Use newer version of bundled FFmpeg. - rm -r "${S}/gst-libs/ext/libav" || die - ln -s ../../../ffmpeg-${FFMPEG_PV} "${S}/gst-libs/ext/libav" || die - fi -} - -src_prepare() { - default - eautoreconf # remove with a proper release without build system touching patchset -} - -multilib_src_configure() { - GST_PLUGINS_BUILD="" - # Upstream dropped support for system libav and won't work - # for preserving its compat anymore, forcing us to rely on internal - # ffmpeg copy if we don't want to cause unresolvable blockers for - # libav setups. - # https://bugzilla.gnome.org/show_bug.cgi?id=758183 - # Prefer system ffmpeg for -libav - local myconf=() - - if use libav; then - ewarn "Using bundled ffmpeg copy as upstream dropped" - ewarn "the support for compiling against system libav" - ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183" - - myconf+=(--with-libav-extra-configure="--disable-debug --optflags=\\\"${CFLAGS}\\\"") - else - myconf+=("--with-system-libav") - fi - - ECONF_SOURCE=${S} \ - econf \ - --disable-maintainer-mode \ - --with-package-name="Gentoo GStreamer ebuild" \ - --with-package-origin="https://www.gentoo.org" \ - --disable-fatal-warnings \ - $(use_enable orc) \ - "${myconf[@]}" -} - -multilib_src_compile() { - # Don't build with -Werror; verbose build - emake ERROR_CFLAGS= V=1 -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild new file mode 100644 index 000000000000..e9c44dd1b7b1 --- /dev/null +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eapi7-ver multilib-minimal + +MY_PN="gst-libav" +MY_PV="$(ver_cut 1-3)" +MY_P="${MY_PN}-${MY_PV}" +FFMPEG_PV="$(ver_cut 4- ${PV%_*})" + +DESCRIPTION="FFmpeg based gstreamer plugin" +HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html" +SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz + https://dev.gentoo.org/~leio/distfiles/${MY_P}-ffmpeg4-patchset.tar.xz + libav? ( https://ffmpeg.org/releases/ffmpeg-${FFMPEG_PV}.tar.bz2 )" + +LICENSE="LGPL-2+" +SLOT="1.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="libav +orc" + +RDEPEND=" + >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-base-${MY_PV}:1.0[${MULTILIB_USEDEP}] + !libav? ( >=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}] ) + libav? ( + app-arch/bzip2[${MULTILIB_USEDEP}] + app-arch/xz-utils[${MULTILIB_USEDEP}] + ) + orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.12 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${WORKDIR}"/patches # ffmpeg-4 compat and more from git up to 20181115; requires eautoreconf + "${FILESDIR}"/AVOptionsRanges-leak-fix.patch # extra patch from Jan 2019 for a leak fix + "${FILESDIR}"/fix-negative-pts.patch # extra patch from Feb 2019 to fix negative pts if start_time is bigger than the ts + "${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes +) + +RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly + +src_unpack() { + default + + if use libav; then + # Use newer version of bundled FFmpeg. + rm -r "${S}/gst-libs/ext/libav" || die + ln -s ../../../ffmpeg-${FFMPEG_PV} "${S}/gst-libs/ext/libav" || die + fi +} + +src_prepare() { + default + eautoreconf # remove with a proper release without build system touching patchset +} + +multilib_src_configure() { + GST_PLUGINS_BUILD="" + # Upstream dropped support for system libav and won't work + # for preserving its compat anymore, forcing us to rely on internal + # ffmpeg copy if we don't want to cause unresolvable blockers for + # libav setups. + # https://bugzilla.gnome.org/show_bug.cgi?id=758183 + # Prefer system ffmpeg for -libav + local myconf=() + + if use libav; then + ewarn "Using bundled ffmpeg copy as upstream dropped" + ewarn "the support for compiling against system libav" + ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183" + + myconf+=(--with-libav-extra-configure="--disable-debug --optflags=\\\"${CFLAGS}\\\"") + else + myconf+=("--with-system-libav") + fi + + ECONF_SOURCE=${S} \ + econf \ + --disable-maintainer-mode \ + --with-package-name="Gentoo GStreamer ebuild" \ + --with-package-origin="https://www.gentoo.org" \ + --disable-fatal-warnings \ + $(use_enable orc) \ + "${myconf[@]}" +} + +multilib_src_compile() { + # Don't build with -Werror; verbose build + emake ERROR_CFLAGS= V=1 +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild deleted file mode 100644 index 2df068ec20c0..000000000000 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eapi7-ver multilib-minimal - -MY_PN="gst-libav" -MY_PV="$(ver_cut 1-3)" -MY_P="${MY_PN}-${MY_PV}" -FFMPEG_PV="$(ver_cut 4- ${PV%_*})" - -DESCRIPTION="FFmpeg based gstreamer plugin" -HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html" -SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz - https://dev.gentoo.org/~leio/distfiles/${MY_P}-ffmpeg4-patchset.tar.xz - libav? ( https://ffmpeg.org/releases/ffmpeg-${FFMPEG_PV}.tar.bz2 )" - -LICENSE="LGPL-2+" -SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="libav +orc" - -RDEPEND=" - >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] - >=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-${MY_PV}:1.0[${MULTILIB_USEDEP}] - !libav? ( >=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}] ) - libav? ( - app-arch/bzip2[${MULTILIB_USEDEP}] - app-arch/xz-utils[${MULTILIB_USEDEP}] - ) - orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.12 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${WORKDIR}"/patches # ffmpeg-4 compat and more from git up to 20181115; requires eautoreconf - "${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes -) - -RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly - -src_unpack() { - default - - if use libav; then - # Use newer version of bundled FFmpeg. - rm -r "${S}/gst-libs/ext/libav" || die - ln -s ../../../ffmpeg-${FFMPEG_PV} "${S}/gst-libs/ext/libav" || die - fi -} - -src_prepare() { - default - eautoreconf # remove with a proper release without build system touching patchset -} - -multilib_src_configure() { - GST_PLUGINS_BUILD="" - # Upstream dropped support for system libav and won't work - # for preserving its compat anymore, forcing us to rely on internal - # ffmpeg copy if we don't want to cause unresolvable blockers for - # libav setups. - # https://bugzilla.gnome.org/show_bug.cgi?id=758183 - # Prefer system ffmpeg for -libav - local myconf=() - - if use libav; then - ewarn "Using bundled ffmpeg copy as upstream dropped" - ewarn "the support for compiling against system libav" - ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183" - - myconf+=(--with-libav-extra-configure="--disable-debug --optflags=\\\"${CFLAGS}\\\"") - else - myconf+=("--with-system-libav") - fi - - ECONF_SOURCE=${S} \ - econf \ - --disable-maintainer-mode \ - --with-package-name="Gentoo GStreamer ebuild" \ - --with-package-origin="https://www.gentoo.org" \ - --disable-fatal-warnings \ - $(use_enable orc) \ - "${myconf[@]}" -} - -multilib_src_compile() { - # Don't build with -Werror; verbose build - emake ERROR_CFLAGS= V=1 -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} -- cgit v1.2.3