summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-07-26 08:58:19 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-07-26 08:58:19 +0100
commit34ce8f465101950c92cb66c657d3244b5a8397db (patch)
tree5df8a8c3a293be4942f5df9f9cd81babb70fac96 /media-video
parent24162508832f37f873ab12dfdfb191cf99318055 (diff)
gentoo auto-resync : 26:07:2022 - 08:58:19
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin26190 -> 26197 bytes
-rw-r--r--media-video/ffmpeg/Manifest6
-rw-r--r--media-video/ffmpeg/ffmpeg-4.4.2.ebuild6
-rw-r--r--media-video/ffmpeg/ffmpeg-5.0.1.ebuild6
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild6
-rw-r--r--media-video/harvid/Manifest4
-rw-r--r--media-video/harvid/files/harvid-0.9.0-ffmpeg.patch21
-rw-r--r--media-video/harvid/files/harvid-0.9.0-parallel-build.patch40
-rw-r--r--media-video/harvid/harvid-0.9.0.ebuild55
9 files changed, 132 insertions, 12 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4af3da7fe149..54f99ee4cc7d 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 2b5935de8546..68a7458b17e2 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -10,7 +10,7 @@ DIST ffmpeg-4.4.2.tar.xz.asc 520 BLAKE2B 1ff4a886c7703a05a19499ae5b2b6207df24e05
DIST ffmpeg-5.0.1.tar.xz 9812524 BLAKE2B 0a37d425780f7e15836848048214411829bceb0de12bb7089803feb3dda07a077be9c8e8174b72792558ed86d92224bee9d4db20cc74690ea54312fbf2f10e83 SHA512 e5810c7379748a6bbe1a903bf36b4372b67cb3973179727b6af6f0118eef46f4c990155961cc37255e08a5bafdc4b4683503ad410ebb7afe7a35b891c01fa602
DIST ffmpeg-5.0.1.tar.xz.asc 520 BLAKE2B 686a8c372d26bd0158a0e79f6cbe8d9c46127bd200df7f4f6e2a4285bfd412cfa9aff865eca125a27a7204f32ba0cca86bcbf769ee4874e5202cc700b0eb4449 SHA512 9c4bd404196c3a3808bae92873aefc77f8c26a9419cc6130a3f2359a75c8e83189d206e9aee8ff85c5a7fe4a98da24e11cf607ec351386c18979ec2d5ad3b3ad
EBUILD ffmpeg-4.2.4-r2.ebuild 17868 BLAKE2B e78ee4ec8c2b6ed7132f4a7b61d71df2c8a8af22f6b1206dea5d6a8f988922293827b5f3fd56dfc039933af849db58f7eeedb9531ba5c7a16a03806ec7e78e68 SHA512 f8eb67f028d2d062a11550e8e55446e6956bb88e9c5c50f0ee4fb2941b797777e4f6ba304fcabc99854456d439619e4f1d3cf0c74214214ae2d388279fb2d557
-EBUILD ffmpeg-4.4.2.ebuild 18887 BLAKE2B 4adc1872b5df2a306ad4f230359aa2261c3211410a6eef7446c3dafc9f9c6349faf4e9ecaf598e308d63f01248ca42f240e2135c26abb09cc3350715a20f01a6 SHA512 aa663faa996b4fb4b76a2c169f6a66a04cc4d27f91f6b2efda2aeda238322f3e02cfb6e69fe112ba43f234c8a0e170bb2abea860ae51f0015e6feea07da1a9f9
-EBUILD ffmpeg-5.0.1.ebuild 18983 BLAKE2B 45de0f2010ab8e1996d14d3614565f257fe2c7f13c229353eff69af64b35246681ff474f0e7de9b5b1c26860f674dbf6c4c52b916e0c4f7c159ae2942603861c SHA512 0435e99befe17495a217633f92e8b763411830098ad45eaf4081594e6a834b8aa767cbaeac22cf7ee88f4b3349d5368c6a41edf1a666c3d7b4d9f9ea7108d452
-EBUILD ffmpeg-9999.ebuild 18860 BLAKE2B 36e3fad1ad002150d1464edc7df21bb3414e6ff73298d18f88d8c8cc0cb5d576920bdfcad0a309c85c21083ea359df320a84208804396c434abb6ab7d2a9b697 SHA512 2cb7ac3423acd5daf364af027ff77c372069f71659d56ad62cd29b446d5427d43156c9ffb6a6883e7a495b074256f3e2e972e73a9fb145f3301d858ffa6d68c5
+EBUILD ffmpeg-4.4.2.ebuild 18912 BLAKE2B aa3bff38d1be5fd199fd2b4b58edd57093b9432390e02581606fb5f5aaf065cb96877480653d07839663b50ee4a432c62ae51264041b187a32e7cdba05df4102 SHA512 82f807718901e4dfabbb1ae1302fa40ff735c6824c13ba83cf1803bb21867b15a0c6e1a929497dce4162515b8b12bf6406f10fa22cad187b9eff41981b981fb0
+EBUILD ffmpeg-5.0.1.ebuild 19008 BLAKE2B 038624992189463e2e2ec040a3b40a42e11eb112619d091284cd4c8450656b0c5f4540702920078bc88ce90f5dcd205b8bdb53387ee9143acbe2f5c69781e9e6 SHA512 c06bff583f9779c318ca3f7a7e8ec65334592291429146696e326797e140003361e059ff20b86067b4c1ec748b7db9f99f66cc8beb63c515fa688ac089116f1f
+EBUILD ffmpeg-9999.ebuild 18885 BLAKE2B 3a106b2308f49c0b115351fc238e258974eeb72b4e2bd57a59f9c1d2bf937e71b541a755108093d171285534c15f408b3934797ce032f044c489ae46220b5cce SHA512 62fc2ff67c82eed4bb6e38bc4577ee02b74c5ca2d82ec553d9193962f04d4f2b0b8dbc8a3acb14774ad1134677d1027486f1073d3232f1160976ef559078ac6c
MISC metadata.xml 6269 BLAKE2B 5d7f3a5376927ddf9d9c95c7465bc2b8df451be3c2ba62be38cce88449222fb6b9d6c30d88e89c403a2d60eb3b3d3f95f762ac85f85f07d54712a24d2712e40f SHA512 fbd108f665076751db688ddd0bf05b9d1fd004eff547a6a3707be369e6919efe989d82f43c09775456fa0035699ec249c8a9941dbdbf7952b1c6be11cd26acda
diff --git a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
index aa24bd41cead..1a4bbf4e4830 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
@@ -443,9 +443,9 @@ multilib_src_configure() {
break
done
- # LTO support, bug #566282, bug #754654
- is-flagq "-flto*" && myconf+=( "--enable-lto" )
- filter-flags "-flto*"
+ # LTO support, bug #566282, bug #754654, bug #772854
+ [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" )
+ filter-lto
# Mandatory configuration
myconf=(
diff --git a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
index e56d6421adff..d3e7c93b04de 100644
--- a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
@@ -444,9 +444,9 @@ multilib_src_configure() {
break
done
- # LTO support, bug #566282, bug #754654
- is-flagq "-flto*" && myconf+=( "--enable-lto" )
- filter-flags "-flto*"
+ # LTO support, bug #566282, bug #754654, bug #772854
+ [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" )
+ filter-lto
# Mandatory configuration
myconf=(
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 5ea93957661b..28afbd6ce4a2 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -441,9 +441,9 @@ multilib_src_configure() {
break
done
- # LTO support, bug #566282, bug #754654
- is-flagq "-flto*" && myconf+=( "--enable-lto" )
- filter-flags "-flto*"
+ # LTO support, bug #566282, bug #754654, bug #772854
+ [[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" )
+ filter-lto
# Mandatory configuration
myconf=(
diff --git a/media-video/harvid/Manifest b/media-video/harvid/Manifest
index 351eb6325d64..5daf9b117214 100644
--- a/media-video/harvid/Manifest
+++ b/media-video/harvid/Manifest
@@ -1,4 +1,8 @@
+AUX harvid-0.9.0-ffmpeg.patch 706 BLAKE2B f50246bfe6c912e6c368b44fb4250032fdc3641f559eecaafc44f2b7c6aa93bbb7bda5247660e92bed165ae235040aca09130702a4a6cf71a45034f63c8557f8 SHA512 9dda13f1552e02db1336e074c9de70c8ab368890173427c32117301ffbe8e0bdc42064978b8947021ea00f389accb1346ec669af4da8f71e5cd9c587fb66c98f
+AUX harvid-0.9.0-parallel-build.patch 1456 BLAKE2B ccf2cf918996fc29928fdd5980033e3583a3e61b2017b83c6c7c1d3eef0bdea7f598e91ce2acbdd5756e323c917d9fc8069ed46b37b2aaacd15e2cb8c5616a87 SHA512 0567160d9a56bfe022046a0c9a56132b0c5bfac4e273c9eb496cc7ba0098ad4b19ca1eedd4b42955e613fea6663c9665582e1477b4a309d32832cc225a3a6274
AUX jpeg.patch 921 BLAKE2B 321213241c8160a5f06438f5740c795e69797858f33eab0a9a294cba7b006028f0f5d961d84f114b85089c3419c1c5dbcd137a7b213569a926af1f7a1dca0a91 SHA512 c9bc0f20f118955ed31feedbf24f10a3f988e658d2b248db9fdfdc23cabef1e68139ba6d532e0515fc7bb1830bc1c31d15799568a9871800f31fe27191794951
DIST harvid-0.8.3.tar.gz 116446 BLAKE2B b245166ab2244a7afdddabb463296974c0d995d70ad8af6e93f549f045245597cb4ca3abf47c608eea15089ac5e6f82972b789d9a3f268b8be98f3080fd6e5e7 SHA512 748475602c7279f10790523cbd5cbf34c9cd283ca9e959ac0535fbb5b4ee6d2fcab976c5ddba3fa40862552b49d73df7145f36d26c9fe708063505812537a8ac
+DIST harvid-0.9.0.tar.gz 116909 BLAKE2B 94b194c475aa402d750d2930c19402157674c5e629bf6212d0fbf0bfe9516f6272850ebca4fb9c6bb1c899418c48ac2b76ec6c04def35671df37ca0b44550e42 SHA512 cba47a9ad70633fbbc5a939819b7ad3c46f01b199b23c938b26092d731664bcfef05b4f03bf83433ddc63d191fef72d0cab09ae4c35efd2e1b2b37c4b2689e82
EBUILD harvid-0.8.3-r1.ebuild 961 BLAKE2B 5b1bee007a966f65d47483c7efe7bf424829e61be7219355b62a794d68602fdf08bfa862ae8e7445caaf9416dc44a48ffe09bffa66c3714af5aef5926585d52b SHA512 b908f8cf7d649fad9723b89380d29b85470de8ed5aa4e684f75a014f2dbfce092de9cd263115eb002c30376788c7cf921ef7860d4dd80c1fefcd873dfa65258d
+EBUILD harvid-0.9.0.ebuild 1012 BLAKE2B 52a18b62e812b9b9ffe125cd46452a704bab6b42466c327f5367798f9cf6e98dfa1102da146ca8a1ff6298587d8b466ee239fd1e871d910bf2212d7aea514ce6 SHA512 121889845a80fce35bd07696543a172e2147f1f8f53733c433728ebe58f89ae84879da46f6628dde4e33d13a2bb343925b9d7c9c1124ac2156434eb7816f8b6d
MISC metadata.xml 307 BLAKE2B fef3e2278027f2fc6961477d066bf154d20f8efc39bede108d9aad5fd524550c490eb5cb6d42e98c26ab560c1ce05b844c8db1cadd4eb40d310935bac7de6db0 SHA512 aebb19473f8546e0ec8bc30bb0e3657fabb56933e7214ca0e5a4d01e01d5bbbd7968a957e0a168eae4db540aa285fc9ffea7b5a44ccec82562335ca939bdcc36
diff --git a/media-video/harvid/files/harvid-0.9.0-ffmpeg.patch b/media-video/harvid/files/harvid-0.9.0-ffmpeg.patch
new file mode 100644
index 000000000000..6422f7503cff
--- /dev/null
+++ b/media-video/harvid/files/harvid-0.9.0-ffmpeg.patch
@@ -0,0 +1,21 @@
+https://github.com/x42/harvid/commit/5da512c504e6d1cef9546a33f16d2b466289b1f6
+
+From: Robin Gareus <robin@gareus.org>
+Date: Sat, 23 Apr 2022 02:30:59 +0200
+Subject: [PATCH] Fix ffmpeg compatibility
+
+--- a/libharvid/ffcompat.h
++++ b/libharvid/ffcompat.h
+@@ -75,8 +75,10 @@ static inline void av_packet_unref (AVPacket *pkt)
+ #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 63, 100)
+ static inline int av_image_get_buffer_size (enum AVPixelFormat pix_fmt, int width, int height, int align)
+ {
+- return avpicture_get_size (pix_fmt, width, height)
++ return avpicture_get_size (pix_fmt, width, height);
+ }
++#else
++#include <libavutil/imgutils.h>
+ #endif
+
+ #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 2, 0)
+
diff --git a/media-video/harvid/files/harvid-0.9.0-parallel-build.patch b/media-video/harvid/files/harvid-0.9.0-parallel-build.patch
new file mode 100644
index 000000000000..c45ce7a70a84
--- /dev/null
+++ b/media-video/harvid/files/harvid-0.9.0-parallel-build.patch
@@ -0,0 +1,40 @@
+https://github.com/x42/harvid/commit/a3f85c57ad2559558706d9b22989de36452704d9
+
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Wed, 22 Jun 2022 23:18:16 +0100
+Subject: [PATCH] Makefile: add a missing target libharvid dependency of src
+
+Without the change parallel build fails sometimes by linking
+too early on non-existent file:
+
+ make -C src
+ make[1]: Entering directory '/build/harvid/src'
+ ld -r -b binary -o seek.o ../doc/seek.js
+ ld -r -b binary -o logo.o ../doc/harvid.jpg
+ make[1]: *** No rule to make target '../libharvid/libharvid.a', needed by 'harvid'. Stop.
+
+It's nest reproducible in `make --shuffle` mode:
+ https://savannah.gnu.org/bugs/index.php?62100
+
+The change makes sure 'libharvid' is built before 'src'.
+--- a/Makefile
++++ b/Makefile
+@@ -3,12 +3,15 @@ SUBDIRS = libharvid src doc
+
+ default: all
+
+-$(SUBDIRS)::
++$(SUBDIRS):
+ $(MAKE) -C $@ $(MAKECMDGOALS)
+
+ all clean man install uninstall install-bin install-man uninstall-bin uninstall-man install-lib uninstall-lib: $(SUBDIRS)
+
++# final binary links against a library
++src: libharvid
++
+ dist:
+ git archive --format=tar --prefix=harvid-$(VERSION)/ HEAD | gzip -9 > harvid-$(VERSION).tar.gz
+
+-.PHONY: clean all subdirs install uninstall dist install-bin install-man uninstall-bin uninstall-man install-lib uninstall-lib
++.PHONY: clean all subdirs install uninstall dist install-bin install-man uninstall-bin uninstall-man install-lib uninstall-lib $(SUBDIRS)
+
diff --git a/media-video/harvid/harvid-0.9.0.ebuild b/media-video/harvid/harvid-0.9.0.ebuild
new file mode 100644
index 000000000000..e99f97aa56f7
--- /dev/null
+++ b/media-video/harvid/harvid-0.9.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="HTTP Ardour Video Daemon"
+HOMEPAGE="https://x42.github.io/harvid/"
+SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=media-video/ffmpeg-2.6:=
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-editors/vim-core
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-ffmpeg.patch
+ "${FILESDIR}"/${P}-parallel-build.patch
+)
+
+hv_make() {
+ emake \
+ CC="$(tc-getCC)" \
+ RANLIB="$(tc-getRANLIB)" \
+ STRIP="true" \
+ NM="$(tc-getNM) -B" \
+ LD="$(tc-getLD)" \
+ AR="$(tc-getAR)" \
+ PREFIX="${EPREFIX}/usr" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ hdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+ "${@}"
+}
+
+src_compile() {
+ hv_make -C libharvid
+ hv_make -C src
+ hv_make
+}
+
+src_install() {
+ hv_make DESTDIR="${D}" install
+ dodoc ChangeLog README.md
+}