| 1 |
commit: c06f102948f0b9c21f8870d2a1361e018d80ac77 |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Sat Nov 28 23:08:54 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 28 23:08:54 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06f1029 |
| 7 |
|
| 8 |
media-tv/w_scan: port to EAPI 7 |
| 9 |
|
| 10 |
* Thanks to Sam James for providing the patch link |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/707718 |
| 13 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
| 14 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 15 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 16 |
|
| 17 |
.../w_scan/files/w_scan-20170107-fno-common.patch | 24 ++++++++++++++++++++++ |
| 18 |
media-tv/w_scan/w_scan-20170107.ebuild | 11 +++++----- |
| 19 |
2 files changed, 29 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-tv/w_scan/files/w_scan-20170107-fno-common.patch b/media-tv/w_scan/files/w_scan-20170107-fno-common.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..43bd7144eeb |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-tv/w_scan/files/w_scan-20170107-fno-common.patch |
| 26 |
@@ -0,0 +1,24 @@ |
| 27 |
+Taken from: https://git.buildroot.net/buildroot/tree/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch?id=2e8bf36dc4421f2213f8fa6de91b2c9bf3d64e45 |
| 28 |
+Author: Fabrice Fontaine <fontaine.fabrice@×××××.com> |
| 29 |
+ |
| 30 |
+--- w_scan-20170107.orig/si_types.h 2020-09-20 11:09:56.776963441 +0200 |
| 31 |
++++ w_scan-20170107/si_types.h 2020-09-20 11:13:13.149232478 +0200 |
| 32 |
+@@ -114,7 +114,7 @@ |
| 33 |
+ uint32_t logical_channel_number; |
| 34 |
+ uint8_t running; |
| 35 |
+ void * priv; |
| 36 |
+-} service_t, * p_service_t; |
| 37 |
++}; |
| 38 |
+ |
| 39 |
+ /******************************************************************************* |
| 40 |
+ /* transponder type. |
| 41 |
+@@ -201,7 +201,7 @@ |
| 42 |
+ /*----------------------------*/ |
| 43 |
+ char * network_name; |
| 44 |
+ network_change_t network_change; |
| 45 |
+-} __attribute__((packed)) transponder_t, * p_transponder_t; |
| 46 |
++} __attribute__((packed)); |
| 47 |
+ |
| 48 |
+ /******************************************************************************* |
| 49 |
+ /* satellite channel routing type. |
| 50 |
+ |
| 51 |
|
| 52 |
diff --git a/media-tv/w_scan/w_scan-20170107.ebuild b/media-tv/w_scan/w_scan-20170107.ebuild |
| 53 |
index 0b7e605bf66..926e92f2c2c 100644 |
| 54 |
--- a/media-tv/w_scan/w_scan-20170107.ebuild |
| 55 |
+++ b/media-tv/w_scan/w_scan-20170107.ebuild |
| 56 |
@@ -1,7 +1,7 @@ |
| 57 |
-# Copyright 1999-2019 Gentoo Authors |
| 58 |
+# Copyright 1999-2020 Gentoo Authors |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
|
| 61 |
-EAPI=5 |
| 62 |
+EAPI=7 |
| 63 |
|
| 64 |
DESCRIPTION="Scan DVB-C/DVB-T/DVB-S channels" |
| 65 |
HOMEPAGE="http://wirbel.htpc-forum.de/w_scan/index2.html" |
| 66 |
@@ -13,12 +13,11 @@ KEYWORDS="~amd64 ~x86" |
| 67 |
IUSE="doc examples" |
| 68 |
|
| 69 |
DEPEND=">=virtual/linuxtv-dvb-headers-5.8" |
| 70 |
-RDEPEND="" |
| 71 |
|
| 72 |
-src_install() { |
| 73 |
- emake DESTDIR="${D}" install |
| 74 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
| 75 |
|
| 76 |
- dodoc ChangeLog README |
| 77 |
+src_install() { |
| 78 |
+ default |
| 79 |
|
| 80 |
if use doc; then |
| 81 |
dodoc doc/README.file_formats doc/README_VLC_DVB |
Archives