1 |
aballier 13/12/30 07:35:05 |
2 |
|
3 |
Modified: ChangeLog openal-1.15.1-r1.ebuild |
4 |
Log: |
5 |
fix multilib ebuild by Michael Mair-Keimberger (iamnr3) in bug #484060 and slat it for emul-sdl -r1 |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
8 |
|
9 |
Revision Changes Path |
10 |
1.169 media-libs/openal/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openal/ChangeLog?rev=1.169&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openal/ChangeLog?rev=1.169&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openal/ChangeLog?r1=1.168&r2=1.169 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v |
19 |
retrieving revision 1.168 |
20 |
retrieving revision 1.169 |
21 |
diff -u -r1.168 -r1.169 |
22 |
--- ChangeLog 6 Sep 2013 21:14:10 -0000 1.168 |
23 |
+++ ChangeLog 30 Dec 2013 07:35:05 -0000 1.169 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-libs/openal |
26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.168 2013/09/06 21:14:10 axs Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.169 2013/12/30 07:35:05 aballier Exp $ |
29 |
+ |
30 |
+ 30 Dec 2013; Alexis Ballier <aballier@g.o> openal-1.15.1-r1.ebuild: |
31 |
+ fix multilib ebuild by Michael Mair-Keimberger (iamnr3) in bug #484060 and |
32 |
+ slat it for emul-sdl -r1 |
33 |
|
34 |
06 Sep 2013; Ian Stakenvicius <axs@g.o> openal-1.15.1-r1.ebuild: |
35 |
dropped some unnecessary emul-linux blocker atoms |
36 |
|
37 |
|
38 |
|
39 |
1.3 media-libs/openal/openal-1.15.1-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openal/openal-1.15.1-r1.ebuild?rev=1.3&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openal/openal-1.15.1-r1.ebuild?rev=1.3&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openal/openal-1.15.1-r1.ebuild?r1=1.2&r2=1.3 |
44 |
|
45 |
Index: openal-1.15.1-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.15.1-r1.ebuild,v |
48 |
retrieving revision 1.2 |
49 |
retrieving revision 1.3 |
50 |
diff -u -r1.2 -r1.3 |
51 |
--- openal-1.15.1-r1.ebuild 6 Sep 2013 21:14:10 -0000 1.2 |
52 |
+++ openal-1.15.1-r1.ebuild 30 Dec 2013 07:35:05 -0000 1.3 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2013 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.15.1-r1.ebuild,v 1.2 2013/09/06 21:14:10 axs Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.15.1-r1.ebuild,v 1.3 2013/12/30 07:35:05 aballier Exp $ |
58 |
|
59 |
EAPI=5 |
60 |
inherit cmake-multilib |
61 |
@@ -19,12 +19,10 @@ |
62 |
RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
63 |
alstream? ( virtual/ffmpeg ) |
64 |
portaudio? ( >=media-libs/portaudio-19_pre[${MULTILIB_USEDEP}] ) |
65 |
- pulseaudio? ( media-sound/pulseaudio ) |
66 |
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
67 |
abi_x86_32? ( |
68 |
- amd64? ( |
69 |
- alstream? ( app-emulation/emul-linux-x86-medialibs ) |
70 |
- pulseaudio? ( app-emulation/emul-linux-x86-soundlibs ) |
71 |
- ) |
72 |
+ !<app-emulation/emul-linux-x86-sdl-20131008-r1 |
73 |
+ !app-emulation/emul-linux-x86-sdl[abi_x86_32(-)] |
74 |
)" |
75 |
DEPEND="${RDEPEND} |
76 |
oss? ( virtual/os-headers )" |
77 |
@@ -37,7 +35,6 @@ |
78 |
local mycmakeargs=( |
79 |
$(cmake-utils_use alsa) |
80 |
$(cmake-utils_use coreaudio) |
81 |
- $(cmake-utils_use alstream EXAMPLES) |
82 |
$(cmake-utils_use neon) |
83 |
$(cmake-utils_use oss) |
84 |
$(cmake-utils_use portaudio) |
85 |
@@ -45,5 +42,7 @@ |
86 |
$(cmake-utils_use sse) |
87 |
) |
88 |
|
89 |
+ multilib_is_native_abi && mymakeargs+=( $(cmake-utils_use alstream EXAMPLES) ) |
90 |
+ |
91 |
cmake-multilib_src_configure |
92 |
} |