| 1 |
commit: 76b049ae8d3d5e1ff37fdb4d6d0166638d30d013 |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 18 00:36:58 2022 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 18 00:36:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=76b049ae |
| 7 |
|
| 8 |
media-libs/zvbi: sync eapi changes |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/zvbi/Manifest | 2 +- |
| 14 |
media-libs/zvbi/files/tests-gcc7.patch | 22 +++++++++++++ |
| 15 |
...zvbi-0.2.35-r1.ebuild => zvbi-0.2.35-r2.ebuild} | 36 ++++++++++++++-------- |
| 16 |
3 files changed, 47 insertions(+), 13 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest |
| 19 |
index 8b65f92c..8a4f4a33 100644 |
| 20 |
--- a/media-libs/zvbi/Manifest |
| 21 |
+++ b/media-libs/zvbi/Manifest |
| 22 |
@@ -1 +1 @@ |
| 23 |
-DIST zvbi-0.2.35.tar.bz2 1047761 SHA256 fc883c34111a487c4a783f91b1b2bb5610d8d8e58dcba80c7ab31e67e4765318 SHA512 3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d WHIRLPOOL e365d28db9834a5e9f8780d45f9fcb04c7b98e5a3122fe81336a42bb2de54505583a535908cabc0851b6753f589b758bf1d6e2831c88cfbeba9fe8d0633a42f0 |
| 24 |
+DIST zvbi-0.2.35.tar.bz2 1047761 BLAKE2B 5fa5fec7e39c9adc6590f3f6841a40ca723ffb6a017854f71f92f32232103672a6f48678b244a84f0cad742c378ffdb247fe33e5e3cdb1ee4d737e92f650a548 SHA512 3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d |
| 25 |
|
| 26 |
diff --git a/media-libs/zvbi/files/tests-gcc7.patch b/media-libs/zvbi/files/tests-gcc7.patch |
| 27 |
new file mode 100644 |
| 28 |
index 00000000..181285cf |
| 29 |
--- /dev/null |
| 30 |
+++ b/media-libs/zvbi/files/tests-gcc7.patch |
| 31 |
@@ -0,0 +1,22 @@ |
| 32 |
+Index: zvbi-0.2.35/test/test-dvb_mux.cc |
| 33 |
+=================================================================== |
| 34 |
+--- zvbi-0.2.35.orig/test/test-dvb_mux.cc |
| 35 |
++++ zvbi-0.2.35/test/test-dvb_mux.cc |
| 36 |
+@@ -137,7 +137,7 @@ is_good_service (vbi_service_set servi |
| 37 |
+ static const vbi_service_set |
| 38 |
+ all_services [] = { |
| 39 |
+ 0, |
| 40 |
+- -1, |
| 41 |
++ (vbi_service_set)-1, |
| 42 |
+ VBI_SLICED_2xCAPTION_525, |
| 43 |
+ VBI_SLICED_CAPTION_525, |
| 44 |
+ VBI_SLICED_CAPTION_525_F1, |
| 45 |
+@@ -3237,7 +3237,7 @@ static void |
| 46 |
+ test_dvb_mux_cor_pts (void) |
| 47 |
+ { |
| 48 |
+ static const int64_t ptss [] = { |
| 49 |
+- 0x8000000000000000ll, -1, 0, 0x7FFFFFFFFFFFFFFFll, |
| 50 |
++ (int64_t)0x8000000000000000ll, -1, 0, 0x7FFFFFFFFFFFFFFFll, |
| 51 |
+ }; |
| 52 |
+ DVBPESMuxTest mx; |
| 53 |
+ unsigned int i; |
| 54 |
|
| 55 |
diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r2.ebuild |
| 56 |
similarity index 58% |
| 57 |
rename from media-libs/zvbi/zvbi-0.2.35-r1.ebuild |
| 58 |
rename to media-libs/zvbi/zvbi-0.2.35-r2.ebuild |
| 59 |
index f6c1bcc0..bd055b2e 100644 |
| 60 |
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild |
| 61 |
+++ b/media-libs/zvbi/zvbi-0.2.35-r2.ebuild |
| 62 |
@@ -1,17 +1,18 @@ |
| 63 |
-# Copyright 1999-2017 Gentoo Foundation |
| 64 |
+# Copyright 1999-2022 Gentoo Authors |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
-EAPI=5 |
| 68 |
-inherit eutils libtool multilib-minimal |
| 69 |
+EAPI=8 |
| 70 |
+ |
| 71 |
+inherit libtool multilib-minimal |
| 72 |
|
| 73 |
DESCRIPTION="VBI Decoding Library for Zapping" |
| 74 |
-SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2" |
| 75 |
HOMEPAGE="http://zapping.sourceforge.net" |
| 76 |
+SRC_URI="mirror://sourceforge/project/zapping/${PN}/${PV}/${P}.tar.bz2" |
| 77 |
|
| 78 |
LICENSE="GPL-2 LGPL-2" |
| 79 |
SLOT="0" |
| 80 |
-KEYWORDS="amd64 arm arm64 ppc x86" |
| 81 |
-IUSE="doc dvb nls static-libs v4l X" |
| 82 |
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86" |
| 83 |
+IUSE="doc dvb nls v4l X" |
| 84 |
|
| 85 |
RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}] |
| 86 |
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
| 87 |
@@ -19,18 +20,22 @@ RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}] |
| 88 |
X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )" |
| 89 |
DEPEND="${RDEPEND} |
| 90 |
virtual/os-headers |
| 91 |
- doc? ( app-doc/doxygen ) |
| 92 |
- nls? ( sys-devel/gettext ) |
| 93 |
X? ( x11-libs/libXt )" |
| 94 |
+BDEPEND="doc? ( app-doc/doxygen ) |
| 95 |
+ nls? ( sys-devel/gettext )" |
| 96 |
+ |
| 97 |
+PATCHES=( |
| 98 |
+ "${FILESDIR}"/tests-gcc7.patch |
| 99 |
+ "${FILESDIR}"/${PN}-va_copy.patch |
| 100 |
+) |
| 101 |
|
| 102 |
src_prepare() { |
| 103 |
- epatch "${FILESDIR}/${PN}-va_copy.patch" |
| 104 |
+ default |
| 105 |
elibtoolize |
| 106 |
} |
| 107 |
|
| 108 |
multilib_src_configure() { |
| 109 |
ECONF_SOURCE="${S}" econf \ |
| 110 |
- $(use_enable static-libs static) \ |
| 111 |
$(use_enable v4l) \ |
| 112 |
$(use_enable dvb) \ |
| 113 |
$(use_enable nls) \ |
| 114 |
@@ -41,11 +46,18 @@ multilib_src_configure() { |
| 115 |
multilib_src_install() { |
| 116 |
emake DESTDIR="${D}" install |
| 117 |
|
| 118 |
- multilib_is_native_abi && use doc && dohtml -a png,gif,html,css doc/html/* |
| 119 |
+ if multilib_is_native_abi; then |
| 120 |
+ if use doc; then |
| 121 |
+ docinto html |
| 122 |
+ dodoc doc/html/*.{png,gif,html,css} |
| 123 |
+ fi |
| 124 |
+ fi |
| 125 |
} |
| 126 |
|
| 127 |
multilib_src_install_all() { |
| 128 |
+ # This may have been left pointing to "html" |
| 129 |
+ docinto |
| 130 |
dodoc AUTHORS BUGS ChangeLog NEWS README TODO |
| 131 |
|
| 132 |
- find "${D}" -name '*.la' -delete |
| 133 |
+ find "${ED}" -name '*.la' -delete |
| 134 |
} |
Archives