1 |
commit: 633ba8dd6e962cce120e36c8b7de882f291bd0b7 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 17 16:25:33 2020 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 17 16:27:01 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633ba8dd |
7 |
|
8 |
app-emulation/vice: Bump 3.4 to rev 38553 |
9 |
|
10 |
This now adds desktop icons. |
11 |
|
12 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
13 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
14 |
|
15 |
app-emulation/vice/Manifest | 1 + |
16 |
.../vice/files/vice-pkg-config-3.4_p38553.patch | 29 ++++ |
17 |
app-emulation/vice/vice-3.4_p38553.ebuild | 183 +++++++++++++++++++++ |
18 |
3 files changed, 213 insertions(+) |
19 |
|
20 |
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest |
21 |
index a4b74f25b8c..98153090bff 100644 |
22 |
--- a/app-emulation/vice/Manifest |
23 |
+++ b/app-emulation/vice/Manifest |
24 |
@@ -1,2 +1,3 @@ |
25 |
DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0 |
26 |
DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc SHA512 975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998 |
27 |
+DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86 |
28 |
|
29 |
diff --git a/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch b/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..557c0a92731 |
32 |
--- /dev/null |
33 |
+++ b/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch |
34 |
@@ -0,0 +1,29 @@ |
35 |
+https://sourceforge.net/p/vice-emu/patches/218/ |
36 |
+ |
37 |
+Index: configure.ac |
38 |
+=================================================================== |
39 |
+--- a/configure.ac (revision 38502) |
40 |
++++ b/configure.ac (working copy) |
41 |
+@@ -1275,6 +1275,14 @@ |
42 |
+ fi |
43 |
+ |
44 |
+ if test x"$found_sdl2" != "xyes"; then |
45 |
++ PKG_CHECK_MODULES(SDL2, sdl2, [ |
46 |
++ use_sdl_prefix=no |
47 |
++ use_sdl2_prefix=no |
48 |
++ found_sdl2=yes |
49 |
++ VICE_CFLAGS="$VICE_CFLAGS $SDL2_CFLAGS" |
50 |
++ VICE_CXXFLAGS="$VICE_CXXFLAGS $SDL2_CFLAGS" |
51 |
++ LIBS="$LIBS $SDL2_LIBS" |
52 |
++ ], [ |
53 |
+ dnl Check for sdl2-config |
54 |
+ if test x"$sdl2_config" != "xno"; then |
55 |
+ user_CFLAGS="$CFLAGS" |
56 |
+@@ -1311,6 +1319,7 @@ |
57 |
+ CFLAGS="$user_CFLAGS" |
58 |
+ CXXFLAGS="$user_CXXFLAGS" |
59 |
+ fi |
60 |
++ ]) |
61 |
+ fi |
62 |
+ |
63 |
+ dnl fail if SDL2 ui was requested, otherwise restore flags and continue |
64 |
|
65 |
diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild b/app-emulation/vice/vice-3.4_p38553.ebuild |
66 |
new file mode 100644 |
67 |
index 00000000000..825c3d61a1c |
68 |
--- /dev/null |
69 |
+++ b/app-emulation/vice/vice-3.4_p38553.ebuild |
70 |
@@ -0,0 +1,183 @@ |
71 |
+# Copyright 1999-2020 Gentoo Authors |
72 |
+# Distributed under the terms of the GNU General Public License v2 |
73 |
+ |
74 |
+EAPI=7 |
75 |
+ |
76 |
+inherit autotools multibuild xdg |
77 |
+ |
78 |
+MY_P="vice-emu-code-r${PV##*_p}-trunk-vice" |
79 |
+ |
80 |
+DESCRIPTION="The Versatile Commodore Emulator" |
81 |
+HOMEPAGE="https://vice-emu.sourceforge.io/" |
82 |
+#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz" |
83 |
+SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip" |
84 |
+ |
85 |
+LICENSE="GPL-2+" |
86 |
+SLOT="0" |
87 |
+KEYWORDS="~amd64 ~x86" |
88 |
+IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib" |
89 |
+REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )" |
90 |
+ |
91 |
+RDEPEND=" |
92 |
+ sys-libs/readline:0= |
93 |
+ virtual/libintl |
94 |
+ alsa? ( media-libs/alsa-lib ) |
95 |
+ ethernet? ( |
96 |
+ >=net-libs/libpcap-0.9.8 |
97 |
+ >=net-libs/libnet-1.1.2.1:1.1 |
98 |
+ ) |
99 |
+ ffmpeg? ( media-video/ffmpeg:= ) |
100 |
+ flac? ( media-libs/flac ) |
101 |
+ gif? ( media-libs/giflib:= ) |
102 |
+ gtk? ( |
103 |
+ dev-libs/glib:2 |
104 |
+ media-libs/fontconfig:1.0 |
105 |
+ x11-libs/cairo |
106 |
+ x11-libs/gtk+:3 |
107 |
+ x11-libs/pango |
108 |
+ opengl? ( |
109 |
+ media-libs/glew:0= |
110 |
+ virtual/opengl |
111 |
+ ) |
112 |
+ ) |
113 |
+ jpeg? ( virtual/jpeg ) |
114 |
+ lame? ( media-sound/lame ) |
115 |
+ mpg123? ( media-sound/mpg123 ) |
116 |
+ ogg? ( |
117 |
+ media-libs/libogg |
118 |
+ media-libs/libvorbis |
119 |
+ ) |
120 |
+ parport? ( sys-libs/libieee1284 ) |
121 |
+ pci? ( sys-apps/pciutils ) |
122 |
+ png? ( media-libs/libpng:0= ) |
123 |
+ portaudio? ( media-libs/portaudio ) |
124 |
+ pulseaudio? ( media-sound/pulseaudio ) |
125 |
+ sdl? ( media-libs/libsdl2[video] ) |
126 |
+ zlib? ( sys-libs/zlib ) |
127 |
+" |
128 |
+ |
129 |
+DEPEND=" |
130 |
+ ${RDEPEND} |
131 |
+ x11-base/xorg-proto |
132 |
+" |
133 |
+ |
134 |
+BDEPEND=" |
135 |
+ app-arch/unzip |
136 |
+ dev-embedded/xa |
137 |
+ dev-lang/perl |
138 |
+ sys-apps/texinfo |
139 |
+ sys-devel/flex |
140 |
+ sys-devel/gettext |
141 |
+ virtual/pkgconfig |
142 |
+ virtual/yacc |
143 |
+ doc? ( virtual/texi2dvi ) |
144 |
+" |
145 |
+ |
146 |
+S="${WORKDIR}/${MY_P}" |
147 |
+ECONF_SOURCE="${S}" |
148 |
+ |
149 |
+PATCHES=( |
150 |
+ "${FILESDIR}"/vice-pkg-config-${PV}.patch |
151 |
+) |
152 |
+ |
153 |
+src_prepare() { |
154 |
+ default |
155 |
+ |
156 |
+ # Delete some bundled libraries. |
157 |
+ rm -r src/lib/lib{ffmpeg,lame,x264} || die |
158 |
+ |
159 |
+ local DIR |
160 |
+ for DIR in src/resid src/resid-dtv .; do |
161 |
+ pushd "${DIR}" || die |
162 |
+ AT_NO_RECURSIVE=1 eautoreconf |
163 |
+ popd || die |
164 |
+ done |
165 |
+ |
166 |
+ # Strip the predefined C(XX)FLAGS. |
167 |
+ sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die |
168 |
+} |
169 |
+ |
170 |
+src_configure() { |
171 |
+ MULTIBUILD_VARIANTS=( |
172 |
+ $(usev gtk) |
173 |
+ $(usev headless) |
174 |
+ $(usev sdl) |
175 |
+ ) |
176 |
+ |
177 |
+ multibuild_foreach_variant run_in_build_dir multibuild_src_configure |
178 |
+} |
179 |
+ |
180 |
+multibuild_enable() { |
181 |
+ if [[ ${MULTIBUILD_VARIANT} == $1 ]]; then |
182 |
+ printf -- "--enable-%s\n" "$2" |
183 |
+ else |
184 |
+ printf -- "--disable-%s\n" "$2" |
185 |
+ fi |
186 |
+} |
187 |
+ |
188 |
+multibuild_src_configure() { |
189 |
+ # Some dependencies lack configure options so prevent them becoming |
190 |
+ # automagic by using configure cache variables. |
191 |
+ use pci || export ac_cv_header_pci_pci_h=no |
192 |
+ |
193 |
+ # Ensure we use giflib, not ungif. |
194 |
+ export ac_cv_lib_ungif_EGifPutLine=no |
195 |
+ |
196 |
+ # Append ".variant" to x* programs if building multiple variants. |
197 |
+ if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then |
198 |
+ xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/" |
199 |
+ else |
200 |
+ unset xform |
201 |
+ fi |
202 |
+ |
203 |
+ econf \ |
204 |
+ --program-transform-name="${xform}" \ |
205 |
+ --disable-arch \ |
206 |
+ $(use_enable debug) \ |
207 |
+ $(use_enable debug debug-gtk3ui) \ |
208 |
+ $(use_enable ffmpeg external-ffmpeg) \ |
209 |
+ $(multibuild_enable headless headlessui) \ |
210 |
+ --enable-html-docs \ |
211 |
+ $(use_enable ethernet) \ |
212 |
+ $(use_enable opengl hwscale) \ |
213 |
+ $(use_enable ipv6) \ |
214 |
+ $(use_enable lame) \ |
215 |
+ $(use_enable parport libieee1284) \ |
216 |
+ $(multibuild_enable gtk native-gtk3ui) \ |
217 |
+ $(use_enable doc pdf-docs) \ |
218 |
+ $(use_enable portaudio) \ |
219 |
+ --disable-sdlui \ |
220 |
+ $(multibuild_enable sdl sdlui2) \ |
221 |
+ --disable-shared-ffmpeg \ |
222 |
+ --disable-static-ffmpeg \ |
223 |
+ $(multibuild_enable gtk desktop-files) \ |
224 |
+ $(use_with alsa) \ |
225 |
+ $(use_with gif) \ |
226 |
+ $(use_with jpeg) \ |
227 |
+ $(use_with oss) \ |
228 |
+ $(use_with png) \ |
229 |
+ $(use_with pulseaudio pulse) \ |
230 |
+ $(use_with zlib) \ |
231 |
+ $(use_with mpg123) \ |
232 |
+ $(use_with ogg vorbis) \ |
233 |
+ $(use_with flac) |
234 |
+} |
235 |
+ |
236 |
+src_compile() { |
237 |
+ multibuild_foreach_variant run_in_build_dir emake |
238 |
+} |
239 |
+ |
240 |
+src_install() { |
241 |
+ # Get xdg-desktop-menu to play nicely while doing the install. |
242 |
+ dodir /etc/xdg/menus /usr/share/{applications,desktop-directories} |
243 |
+ XDG_UTILS_INSTALL_MODE=system \ |
244 |
+ XDG_DATA_DIRS="${ED}"/usr/share \ |
245 |
+ XDG_CONFIG_DIRS="${ED}"/etc/xdg \ |
246 |
+ multibuild_foreach_variant run_in_build_dir default |
247 |
+ rm -f "${ED}"/usr/share/applications/*.cache || die |
248 |
+ dodoc FEEDBACK |
249 |
+ |
250 |
+ # Delete the bundled fonts. These could be packaged separately but |
251 |
+ # they're only for the HTML documentation. |
252 |
+ rm -r "${ED}"/usr/share/doc/${PF}/html/fonts/ || die |
253 |
+} |