gentoo resync : 25.11.2020

3 files changed, 69 insertions, 0 deletions

diff --git a/media-video/harvid/Manifest b/media-video/harvid/Manifest
index c2f04ad5e115..b066279f8a88 100644
--- a/media-video/harvid/Manifest
+++ b/media-video/harvid/Manifest
@@ -1,8 +1,11 @@
 AUX ffmpeg29.patch 11613 BLAKE2B 3ec6dcdf43cfefc26ce9e0fb94f66bb33251430ac5636289726364cd6d7abb1e240d34b2d87fb1ffcd39110ef2bb01eb863d91ff71b1236f519310ca17c6fa5f SHA512 40ddf43ea18912ff8bcf73925ac846a4c96a2b4269f4bb1ca6cdc7a314070bea338c8a4a181018781a6036090c67a1622c1b7968ebad0be290e3a60ce01cba53
+AUX jpeg.patch 921 BLAKE2B 321213241c8160a5f06438f5740c795e69797858f33eab0a9a294cba7b006028f0f5d961d84f114b85089c3419c1c5dbcd137a7b213569a926af1f7a1dca0a91 SHA512 c9bc0f20f118955ed31feedbf24f10a3f988e658d2b248db9fdfdc23cabef1e68139ba6d532e0515fc7bb1830bc1c31d15799568a9871800f31fe27191794951
 DIST harvid-0.8.0.tar.gz 116079 BLAKE2B 17e92f9100d4874604d524b31d3bfd50f2b4f1bbd4d53ab82b05e65f4ff7d43176bad2cf57e197d54d4fb1281dc863d6afae50f8b312933014b92def51538dea SHA512 8e999e91e36708df7264fc351e5b6cac6c47fa5e0e612d0917bbfa02e98d13f9758f43312e6febebe56e7b8f2f72b80b6c47598de7100d3b5479b80720b91568
 DIST harvid-0.8.1.tar.gz 116277 BLAKE2B 1382625d241e63f3733817e57be4ad6cc57411aca6fbb7ba472e1b2959362fd384b1e2d1a35594656c30778fae4f54a1c89d1bb6565d006ad801e29c6d657d7d SHA512 b425eca844bb9eec3ec8caa324f783132a3e83938b258a5f8e92ce6dc47108ae491a009223b7e3c8051d965a1ff1b5e5509a804d1462641128a8524cde5ae60a
 DIST harvid-0.8.2.tar.gz 116541 BLAKE2B e3f82ad0b30fa0c1eefe84b85ba658c1897890d2b35aef355dfc029c26140ee5809a42d4e82a2ea515a277f4cc8cd24fdc032f6a42875bcddcb5bd4a77b6282a SHA512 fde352124008cd3d6230950c79a3a2b8d581803f952c7313c941226b00e80f8078053d941f2c5ead04672639a8db696f0c33482f69dab78187801d7ebce23fce
+DIST harvid-0.8.3.tar.gz 116446 BLAKE2B b245166ab2244a7afdddabb463296974c0d995d70ad8af6e93f549f045245597cb4ca3abf47c608eea15089ac5e6f82972b789d9a3f268b8be98f3080fd6e5e7 SHA512 748475602c7279f10790523cbd5cbf34c9cd283ca9e959ac0535fbb5b4ee6d2fcab976c5ddba3fa40862552b49d73df7145f36d26c9fe708063505812537a8ac
 EBUILD harvid-0.8.0.ebuild 961 BLAKE2B e4357dc555a4dbc0a071cdb1aacae0236f6fbf4bc95c9a7f036b0dc02a707aa6c10b68fdfd1f4c6ab32f17f89870b5b1899a7919308404ea3faee37b5efaf6c5 SHA512 77429081faeccf5bf2f36ee9e28ca972256eb2b85762bef355a478c11885885b9145ab4f34ea681186abdb6872554b61f15820361d8ebbfb40809ecd489ac43f
 EBUILD harvid-0.8.1.ebuild 905 BLAKE2B 025184861535e8073613e1be3a4daf26a534ee1ce84885c25ade482607bc3c511990755f5d81807dccc4f4bbabf9ab3cf7e32949fd76034ae105ff2431b79ed0 SHA512 a00c58f253a040b927198d96591229c660832b9406cd373e3cc45831a4ce691a19e2662468d8efc2caca2f30f4654a4ef4cd6a085936b5e12f88b7ddfb68e70f
 EBUILD harvid-0.8.2.ebuild 905 BLAKE2B 025184861535e8073613e1be3a4daf26a534ee1ce84885c25ade482607bc3c511990755f5d81807dccc4f4bbabf9ab3cf7e32949fd76034ae105ff2431b79ed0 SHA512 a00c58f253a040b927198d96591229c660832b9406cd373e3cc45831a4ce691a19e2662468d8efc2caca2f30f4654a4ef4cd6a085936b5e12f88b7ddfb68e70f
+EBUILD harvid-0.8.3-r1.ebuild 968 BLAKE2B b5ea60fdb804cca1dffd2cefd5becab6ed2bf18dcb8a46087fd6d23bbaa7d20cbcbe7c3ce4e8f672553ef25b7a3e592e16f11a6a5b5ad5346205ba86a1fc8e3d SHA512 5979b29c1632798d9efe1e6dbf9c2678ecc9dcec38d9b02891218814d542fcc424dc15013ebf1487360947d1a0c2f6049ce5295cf24a2dff87bf87a67df6017a
 MISC metadata.xml 306 BLAKE2B 5c1fba580f975a8cbd2247e002f0565de5a1f406f4361e312865e9e7b6fdd406a3e128fee109fddcf37b5978e865850a7de3abbe656f50d3c1642650d8f371f2 SHA512 4fa6b478e09481b73a9c1743c79b108e115a9452c31f3a37134d9ef939f4118c27690e9e7f33fcd0fa7a558d73840b84b944e14344d1ebffc10febc16cbf2315
diff --git a/media-video/harvid/files/jpeg.patch b/media-video/harvid/files/jpeg.patch
new file mode 100644
index 000000000000..3c0d53bf5d8a
--- /dev/null
+++ b/media-video/harvid/files/jpeg.patch
@@ -0,0 +1,13 @@
+Index: harvid-0.8.3/src/Makefile
+===================================================================
+--- harvid-0.8.3.orig/src/Makefile
++++ harvid-0.8.3/src/Makefile
+@@ -16,7 +16,7 @@ ifeq ($(shell PKG_CONFIG_PATH=$(PKG_CONF
+   $(error "libpng is required - install libpng-dev")
+ endif
+ 
+-ifeq ($(shell $(ECHO) "\#include <stdio.h>\n\#include <jpeglib.h>\nint main() { struct jpeg_error_mgr jerr; jpeg_std_error(&jerr); return 0; }" | $(CC) -pipe -x c -o $(CONFIGTEMP) $(ARCHINCLUDES) $(LDFLAGS) - -ljpeg 2>/dev/null || echo no; $(RM) -f $(CONFIGTEMP)), no)
++ifeq ($(shell printf "#include <stdio.h>\n#include <jpeglib.h>\nint main() { struct jpeg_error_mgr jerr; jpeg_std_error(&jerr); return 0; }" | $(CC) -pipe -x c -o $(CONFIGTEMP) $(ARCHINCLUDES) $(LDFLAGS) - -ljpeg 2>/dev/null || echo no; $(RM) -f $(CONFIGTEMP)), no)
+   $(error "libjpeg is required - install libjpeg-dev, libjpeg8-dev or libjpeg62-dev")
+ endif
+ 
diff --git a/media-video/harvid/harvid-0.8.3-r1.ebuild b/media-video/harvid/harvid-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..e8896dbe474c
--- /dev/null
+++ b/media-video/harvid/harvid-0.8.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="HTTP Ardour Video Daemon"
+HOMEPAGE="http://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:0=
+	media-libs/libpng:0=
+	virtual/jpeg:0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+BDEPEND="
+	app-editors/vim-core
+"
+
+PATCHES=( "${FILESDIR}/jpeg.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
+}