1 |
commit: e52fb5f0180b62a7f47d0a6cd728df10553fc616 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Dec 28 12:42:53 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 12:42:53 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e52fb5f0 |
7 |
|
8 |
media-sound/dvda-author: Port to EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706918 |
11 |
Closes: https://bugs.gentoo.org/740342 |
12 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
13 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
14 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
15 |
|
16 |
.../dvda-author/dvda-author-10.06-r1.ebuild | 36 ++++++++++++---------- |
17 |
.../files/dvda-author-10.06-desktop-QA.patch | 11 +++++++ |
18 |
.../files/dvda-author-10.06-fno-common.patch | 22 +++++++++++++ |
19 |
3 files changed, 53 insertions(+), 16 deletions(-) |
20 |
|
21 |
diff --git a/media-sound/dvda-author/dvda-author-10.06-r1.ebuild b/media-sound/dvda-author/dvda-author-10.06-r1.ebuild |
22 |
index 965f73db2aa..28e830dfa8d 100644 |
23 |
--- a/media-sound/dvda-author/dvda-author-10.06-r1.ebuild |
24 |
+++ b/media-sound/dvda-author/dvda-author-10.06-r1.ebuild |
25 |
@@ -1,7 +1,9 @@ |
26 |
# Copyright 1999-2020 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
-EAPI="5" |
30 |
+EAPI=7 |
31 |
+ |
32 |
+inherit desktop |
33 |
|
34 |
DESCRIPTION="Author a DVD-Audio DVD" |
35 |
HOMEPAGE="http://dvd-audio.sourceforge.net" |
36 |
@@ -12,12 +14,20 @@ SLOT="0" |
37 |
KEYWORDS="~amd64 ~x86" |
38 |
IUSE="debug" |
39 |
|
40 |
-RDEPEND=">=media-sound/sox-14.1[png] |
41 |
- >=media-libs/flac-1.2.1[ogg]" |
42 |
-DEPEND="${RDEPEND} |
43 |
- >=sys-devel/libtool-2" |
44 |
+RDEPEND=" |
45 |
+ media-sound/sox[png] |
46 |
+ media-libs/flac[ogg]" |
47 |
+DEPEND="${RDEPEND}" |
48 |
+BDEPEND="sys-devel/libtool" |
49 |
+ |
50 |
+PATCHES=( |
51 |
+ "${FILESDIR}"/${P}-fno-common.patch |
52 |
+ "${FILESDIR}"/${P}-desktop-QA.patch |
53 |
+) |
54 |
|
55 |
src_prepare() { |
56 |
+ default |
57 |
+ |
58 |
# Fix parallel make |
59 |
sed -i -e 's:^\(\tcd ${MAYBE_CDRTOOLS}\):@HAVE_CDRTOOLS_BUILD_TRUE@\1:' \ |
60 |
Makefile.in || die "sed failed" |
61 |
@@ -33,19 +43,13 @@ src_prepare() { |
62 |
|
63 |
src_configure() { |
64 |
econf \ |
65 |
- --with-config=/etc \ |
66 |
+ --with-config="${EPREFIX}/etc" \ |
67 |
$(use_with debug debug full) |
68 |
} |
69 |
|
70 |
-src_compile() { |
71 |
- # make[1]: warning: jobserver unavailable: using -j1. |
72 |
- # Add '+' to parent make rule. |
73 |
- emake -j1 |
74 |
-} |
75 |
- |
76 |
src_install() { |
77 |
- newbin src/dvda ${PN} |
78 |
- insinto /etc |
79 |
- doins ${PN}.conf |
80 |
- dodoc AUTHORS BUGS ChangeLog EXAMPLES HOWTO.conf LIMITATIONS NEWS TODO |
81 |
+ default |
82 |
+ |
83 |
+ domenu "${ED}"/etc/dvda-author.desktop |
84 |
+ rm -r "${ED}"/etc/{menu,dvda-author.desktop} || die |
85 |
} |
86 |
|
87 |
diff --git a/media-sound/dvda-author/files/dvda-author-10.06-desktop-QA.patch b/media-sound/dvda-author/files/dvda-author-10.06-desktop-QA.patch |
88 |
new file mode 100644 |
89 |
index 00000000000..adb2d1c53b0 |
90 |
--- /dev/null |
91 |
+++ b/media-sound/dvda-author/files/dvda-author-10.06-desktop-QA.patch |
92 |
@@ -0,0 +1,11 @@ |
93 |
+--- a/dvda-author.desktop.in |
94 |
++++ b/dvda-author.desktop.in |
95 |
+@@ -7,7 +7,5 @@ |
96 |
+ Icon=@prefix@/share/pixmaps/dvda-author.png |
97 |
+ Terminal=false |
98 |
+ Type=Application |
99 |
+-Categories=Application;AudioVideo;Audio |
100 |
+-GenericName[en_EN]=Terminal Program |
101 |
++Categories=AudioVideo;Audio |
102 |
+ StartupNotify=true |
103 |
+-GenericName[fr_FR]= |
104 |
|
105 |
diff --git a/media-sound/dvda-author/files/dvda-author-10.06-fno-common.patch b/media-sound/dvda-author/files/dvda-author-10.06-fno-common.patch |
106 |
new file mode 100644 |
107 |
index 00000000000..2f549f02ddb |
108 |
--- /dev/null |
109 |
+++ b/media-sound/dvda-author/files/dvda-author-10.06-fno-common.patch |
110 |
@@ -0,0 +1,22 @@ |
111 |
+--- a/src/command_line_parsing.c |
112 |
++++ b/src/command_line_parsing.c |
113 |
+@@ -33,7 +33,7 @@ |
114 |
+ /* #define _GNU_SOURCE must appear before <string.h> and <getopt.h> for strndup and getopt_long*/ |
115 |
+ |
116 |
+ |
117 |
+-globalData globals; |
118 |
++extern globalData globals; |
119 |
+ unsigned int startsector; |
120 |
+ extern char* OUTDIR, *LOGFILE, *WORKDIR, *TEMPDIR; |
121 |
+ static fileinfo_t ** files; |
122 |
+--- a/src/menu.c |
123 |
++++ b/src/menu.c |
124 |
+@@ -30,7 +30,7 @@ extern globalData globals; |
125 |
+ |
126 |
+ uint16_t norm_x=PAL_X, norm_y=PAL_Y; // TODO: adjust for ntsc #define NTSC_Y 480 |
127 |
+ extern uint16_t totntracks; |
128 |
+-uint8_t maxbuttons, resbuttons; |
129 |
++extern uint8_t maxbuttons, resbuttons; |
130 |
+ |
131 |
+ |
132 |
+ |