gentoo auto-resync : 26:07:2022 - 08:58:19

4 files changed, 120 insertions, 0 deletions

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
+}