[gentoo-commits] proj/musl:master commit in: media-libs/zvbi/, media-libs/zvbi/files/
commit: 76b049ae8d3d5e1ff37fdb4d6d0166638d30d013
Author: Jory Pratt gentoo org>
AuthorDate: Tue Jan 18 00:36:58 2022 +
Commit: Jory Pratt gentoo org>
CommitDate: Tue Jan 18 00:36:58 2022 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=76b049ae
media-libs/zvbi: sync eapi changes
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jory Pratt gentoo.org>
media-libs/zvbi/Manifest | 2 +-
media-libs/zvbi/files/tests-gcc7.patch | 22 +
...zvbi-0.2.35-r1.ebuild => zvbi-0.2.35-r2.ebuild} | 36 ++
3 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest
index 8b65f92c..8a4f4a33 100644
--- a/media-libs/zvbi/Manifest
+++ b/media-libs/zvbi/Manifest
@@ -1 +1 @@
-DIST zvbi-0.2.35.tar.bz2 1047761 SHA256
fc883c34111a487c4a783f91b1b2bb5610d8d8e58dcba80c7ab31e67e4765318 SHA512
3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d
WHIRLPOOL
e365d28db9834a5e9f8780d45f9fcb04c7b98e5a3122fe81336a42bb2de54505583a535908cabc0851b6753f589b758bf1d6e2831c88cfbeba9fe8d0633a42f0
+DIST zvbi-0.2.35.tar.bz2 1047761 BLAKE2B
5fa5fec7e39c9adc6590f3f6841a40ca723ffb6a017854f71f92f32232103672a6f48678b244a84f0cad742c378ffdb247fe33e5e3cdb1ee4d737e92f650a548
SHA512
3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d
diff --git a/media-libs/zvbi/files/tests-gcc7.patch
b/media-libs/zvbi/files/tests-gcc7.patch
new file mode 100644
index ..181285cf
--- /dev/null
+++ b/media-libs/zvbi/files/tests-gcc7.patch
@@ -0,0 +1,22 @@
+Index: zvbi-0.2.35/test/test-dvb_mux.cc
+===
+--- zvbi-0.2.35.orig/test/test-dvb_mux.cc
zvbi-0.2.35/test/test-dvb_mux.cc
+@@ -137,7 +137,7 @@ is_good_service(vbi_service_set
servi
+ static const vbi_service_set
+ all_services [] = {
+ 0,
+- -1,
++ (vbi_service_set)-1,
+ VBI_SLICED_2xCAPTION_525,
+ VBI_SLICED_CAPTION_525,
+ VBI_SLICED_CAPTION_525_F1,
+@@ -3237,7 +3237,7 @@ static void
+ test_dvb_mux_cor_pts (void)
+ {
+ static const int64_t ptss [] = {
+- 0x8000ll, -1, 0, 0x7FFFll,
++ (int64_t)0x8000ll, -1, 0, 0x7FFFll,
+ };
+ DVBPESMuxTest mx;
+ unsigned int i;
diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
b/media-libs/zvbi/zvbi-0.2.35-r2.ebuild
similarity index 58%
rename from media-libs/zvbi/zvbi-0.2.35-r1.ebuild
rename to media-libs/zvbi/zvbi-0.2.35-r2.ebuild
index f6c1bcc0..bd055b2e 100644
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35-r2.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils libtool multilib-minimal
+EAPI=8
+
+inherit libtool multilib-minimal
DESCRIPTION="VBI Decoding Library for Zapping"
-SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
HOMEPAGE="http://zapping.sourceforge.net;
+SRC_URI="mirror://sourceforge/project/zapping/${PN}/${PV}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-IUSE="doc dvb nls static-libs v4l X"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="doc dvb nls v4l X"
RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
@@ -19,18 +20,22 @@ RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]
X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
virtual/os-headers
- doc? ( app-doc/doxygen )
- nls? ( sys-devel/gettext )
X? ( x11-libs/libXt )"
+BDEPEND="doc? ( app-doc/doxygen )
+ nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/tests-gcc7.patch
+ "${FILESDIR}"/${PN}-va_copy.patch
+)
src_prepare() {
- epatch "${FILESDIR}/${PN}-va_copy.patch"
+ default
elibtoolize
}
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
- $(use_enable static-libs static) \
$(use_enable v4l) \
$(use_enable dvb) \
$(use_enable nls) \
@@ -41,11 +46,18 @@ multilib_src_configure() {
multilib_src_install() {
emake DESTDIR="${D}" install
- multilib_is_native_abi && use doc && dohtml -a png,gif,html,css
doc/html/*
+ if multilib_is_native_abi; then
+ if use doc; then
+ docinto html
+ dodoc doc/html/*.{png,gif,html,css}
+ fi
+ fi
}
multilib_src_install_all() {
+ # This may have been left pointing to "html"
+ docinto
dodoc AUTHORS BUGS ChangeLog NEWS README TODO
[gentoo-commits] proj/musl:master commit in: media-libs/zvbi/, media-libs/zvbi/files/
commit: d52da0b22df411be38c1e8a8414e5c6828dad44b
Author: Aric Belsito gmail com>
AuthorDate: Tue Dec 6 20:25:03 2016 +
Commit: Aric Belsito gmail com>
CommitDate: Tue Dec 6 20:25:03 2016 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=d52da0b2
media-libs/zvbi: Add current version
media-libs/zvbi/Manifest | 4 +++
media-libs/zvbi/files/zvbi-va_copy.patch | 12
media-libs/zvbi/metadata.xml | 8 +
media-libs/zvbi/zvbi-0.2.35-r1.ebuild| 52
4 files changed, 76 insertions(+)
diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest
new file mode 100644
index 000..0e78e57
--- /dev/null
+++ b/media-libs/zvbi/Manifest
@@ -0,0 +1,4 @@
+AUX zvbi-va_copy.patch 457 SHA256
528dc4e78add8c85bb536c199c460169964d638da57a459abf641e5458c0f5a1 SHA512
ec59b6888106db7fbd7ed83615ebc92571f10242cbfab86eae7b70a0e619e09cd187ca19ed5a1ae2a66f4b2e54cb4bd3e8f8d938d43ab4a72e16cf55a9bf7b0a
WHIRLPOOL
fac26141cd16b1da481165564d041cc44fc204b116b0683bda55095aff0a63336e0fd5f5960eca14fdbffe4cd36b6f2bbc316dc8c0f7b26172d6d754e16b2557
+DIST zvbi-0.2.35.tar.bz2 1047761 SHA256
fc883c34111a487c4a783f91b1b2bb5610d8d8e58dcba80c7ab31e67e4765318 SHA512
3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d
WHIRLPOOL
e365d28db9834a5e9f8780d45f9fcb04c7b98e5a3122fe81336a42bb2de54505583a535908cabc0851b6753f589b758bf1d6e2831c88cfbeba9fe8d0633a42f0
+EBUILD zvbi-0.2.35-r1.ebuild 1326 SHA256
ca4b75ff3a749f47d42306a939e2d02c3601596e0ceac962b082111683d394f8 SHA512
5a14938fce91e25ac4c7437dc879978b38bfd90ca2123718d512097bc1b82d2171e71fa0671b37c8a0f1d2fb90740fc4dace8545fcd7e6faf837a0e78515b8b6
WHIRLPOOL
e97096cd1fc72e1b886f5202e36dba56dc43b1ad817964098ba44b7e1122d930cc1666a4c6df96f1eca6e9c02ad6e11b0dbc1db708c861fe664f5a7150b19203
+MISC metadata.xml 244 SHA256
57770389847e9910fae48598bdb3ae71c9a3c662ebec0203da97e02a085904b4 SHA512
af9d2d89aee60846c292c11e0b2615eaedac9e3ff9ad6d4869892bd078ee0a16f8b87e17360d2c82561dd36c3c22bcd110e63835f4cba593e4f5f35db1a5
WHIRLPOOL
3ee4c8cebd8d8732593d2c2c830974c8105611341cc71db493af161a15f06724d5b0ac0dc869e31a86847bbcd76b8a7ad616b70e48232144db65c1aa0514b1f9
diff --git a/media-libs/zvbi/files/zvbi-va_copy.patch
b/media-libs/zvbi/files/zvbi-va_copy.patch
new file mode 100644
index 000..cb513df
--- /dev/null
+++ b/media-libs/zvbi/files/zvbi-va_copy.patch
@@ -0,0 +1,12 @@
+diff -Naur zvbi-0.2.35.orig/src/misc.h zvbi-0.2.35/src/misc.h
+--- zvbi-0.2.35.orig/src/misc.h2013-07-01 19:32:31.0 -0700
zvbi-0.2.35/src/misc.h 2016-05-02 19:15:03.874251498 -0700
+@@ -425,7 +425,7 @@
+
+ /* __va_copy is a GNU extension. */
+ #ifndef __va_copy
+-# define __va_copy(ap1, ap2) do { ap1 = ap2; } while (0)
++# define __va_copy(ap1, ap2) va_copy(ap1, ap2)
+ #endif
+
+ /* Use this instead of strncpy(). strlcpy() is a BSD extension. */
diff --git a/media-libs/zvbi/metadata.xml b/media-libs/zvbi/metadata.xml
new file mode 100644
index 000..39f3b52
--- /dev/null
+++ b/media-libs/zvbi/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+
+ zapping
+
+
diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
new file mode 100644
index 000..ed76e95
--- /dev/null
+++ b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="VBI Decoding Library for Zapping"
+SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
+HOMEPAGE="http://zapping.sourceforge.net;
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc dvb nls static-libs v4l X"
+
+RDEPEND=">=media-libs/libpng-1.5.18[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ virtual/os-headers
+ doc? ( app-doc/doxygen )
+ nls? ( sys-devel/gettext )
+ X? ( x11-libs/libXt )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-va_copy.patch"
+ elibtoolize
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable static-libs static) \
+ $(use_enable v4l) \
+ $(use_enable dvb) \
+ $(use_enable nls) \
+ $(use_with X x) \
+ $(multilib_native_use_with doc doxygen)
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ multilib_is_native_abi && use doc && dohtml -a png,gif,html,css
doc/html/*
+}
+
+multilib_src_install_all() {
+ dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+
+
