1 |
mr_bones_ 12/06/06 17:45:11 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: libsdl-1.2.15-r2.ebuild |
5 |
Log: |
6 |
Add upstream patch to fix regression in joystick axis detection (bug #413839) |
7 |
|
8 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.190 media-libs/libsdl/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/ChangeLog?rev=1.190&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/ChangeLog?rev=1.190&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/ChangeLog?r1=1.189&r2=1.190 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v |
20 |
retrieving revision 1.189 |
21 |
retrieving revision 1.190 |
22 |
diff -u -r1.189 -r1.190 |
23 |
--- ChangeLog 9 May 2012 13:15:36 -0000 1.189 |
24 |
+++ ChangeLog 6 Jun 2012 17:45:11 -0000 1.190 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for media-libs/libsdl |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.189 2012/05/09 13:15:36 aballier Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.190 2012/06/06 17:45:11 mr_bones_ Exp $ |
30 |
+ |
31 |
+*libsdl-1.2.15-r2 (06 Jun 2012) |
32 |
+ |
33 |
+ 06 Jun 2012; Michael Sterrett <mr_bones_@g.o> |
34 |
+ +libsdl-1.2.15-r2.ebuild, +files/libsdl-1.2.15-joystick.patch: |
35 |
+ Add upstream patch to fix regression in joystick axis detection (bug #413839) |
36 |
|
37 |
09 May 2012; Alexis Ballier <aballier@g.o> libsdl-1.2.15-r1.ebuild: |
38 |
keyword ~amd64-fbsd |
39 |
|
40 |
|
41 |
|
42 |
1.1 media-libs/libsdl/libsdl-1.2.15-r2.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r2.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r2.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: libsdl-1.2.15-r2.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2012 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r2.ebuild,v 1.1 2012/06/06 17:45:11 mr_bones_ Exp $ |
52 |
|
53 |
EAPI=2 |
54 |
inherit flag-o-matic multilib toolchain-funcs eutils libtool |
55 |
|
56 |
DESCRIPTION="Simple Direct Media Layer" |
57 |
HOMEPAGE="http://www.libsdl.org/" |
58 |
SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz" |
59 |
|
60 |
LICENSE="LGPL-2.1" |
61 |
SLOT="0" |
62 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
63 |
# WARNING: |
64 |
# If you turn on the custom-cflags use flag in USE and something breaks, |
65 |
# you pick up the pieces. Be prepared for bug reports to be marked INVALID. |
66 |
IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio ps3 static-libs" |
67 |
|
68 |
RDEPEND="audio? ( >=media-libs/audiofile-0.1.9 ) |
69 |
alsa? ( media-libs/alsa-lib ) |
70 |
nas? ( |
71 |
media-libs/nas |
72 |
x11-libs/libXt |
73 |
x11-libs/libXext |
74 |
x11-libs/libX11 |
75 |
) |
76 |
X? ( |
77 |
x11-libs/libXt |
78 |
x11-libs/libXext |
79 |
x11-libs/libX11 |
80 |
x11-libs/libXrandr |
81 |
) |
82 |
directfb? ( >=dev-libs/DirectFB-0.9.19 ) |
83 |
ggi? ( >=media-libs/libggi-2.0_beta3 ) |
84 |
svga? ( >=media-libs/svgalib-1.4.2 ) |
85 |
aalib? ( media-libs/aalib ) |
86 |
libcaca? ( >=media-libs/libcaca-0.9-r1 ) |
87 |
opengl? ( virtual/opengl virtual/glu ) |
88 |
ppc64? ( ps3? ( sys-libs/libspe2 ) ) |
89 |
tslib? ( x11-libs/tslib ) |
90 |
pulseaudio? ( media-sound/pulseaudio )" |
91 |
DEPEND="${RDEPEND} |
92 |
nas? ( |
93 |
x11-proto/xextproto |
94 |
x11-proto/xproto |
95 |
) |
96 |
X? ( |
97 |
x11-proto/xextproto |
98 |
x11-proto/xproto |
99 |
) |
100 |
x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )" |
101 |
|
102 |
S=${WORKDIR}/SDL-${PV} |
103 |
|
104 |
pkg_setup() { |
105 |
if use custom-cflags ; then |
106 |
ewarn "Since you've chosen to use possibly unsafe CFLAGS," |
107 |
ewarn "don't bother filing libsdl-related bugs until trying to remerge" |
108 |
ewarn "libsdl without the custom-cflags use flag in USE." |
109 |
epause 10 |
110 |
fi |
111 |
} |
112 |
|
113 |
src_prepare() { |
114 |
epatch \ |
115 |
"${FILESDIR}"/${P}-sdl-config.patch \ |
116 |
"${FILESDIR}"/${P}-resizing.patch \ |
117 |
"${FILESDIR}"/${P}-joystick.patch |
118 |
|
119 |
elibtoolize |
120 |
} |
121 |
|
122 |
src_configure() { |
123 |
local myconf= |
124 |
if [[ $(tc-arch) != "x86" ]] ; then |
125 |
myconf="${myconf} --disable-nasm" |
126 |
else |
127 |
myconf="${myconf} --enable-nasm" |
128 |
fi |
129 |
use custom-cflags || strip-flags |
130 |
use audio || myconf="${myconf} --disable-audio" |
131 |
use video \ |
132 |
&& myconf="${myconf} --enable-video-dummy" \ |
133 |
|| myconf="${myconf} --disable-video" |
134 |
use joystick || myconf="${myconf} --disable-joystick" |
135 |
|
136 |
local directfbconf="--disable-video-directfb" |
137 |
if use directfb ; then |
138 |
# since DirectFB can link against SDL and trigger a |
139 |
# dependency loop, only link against DirectFB if it |
140 |
# isn't broken #61592 |
141 |
echo 'int main(){}' > directfb-test.c |
142 |
$(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \ |
143 |
&& directfbconf="--enable-video-directfb" \ |
144 |
|| ewarn "Disabling DirectFB since libdirectfb.so is broken" |
145 |
fi |
146 |
|
147 |
myconf="${myconf} ${directfbconf}" |
148 |
|
149 |
econf \ |
150 |
--disable-rpath \ |
151 |
--disable-arts \ |
152 |
--disable-esd \ |
153 |
--enable-events \ |
154 |
--enable-cdrom \ |
155 |
--enable-threads \ |
156 |
--enable-timers \ |
157 |
--enable-file \ |
158 |
--enable-cpuinfo \ |
159 |
--disable-alsa-shared \ |
160 |
--disable-esd-shared \ |
161 |
--disable-pulseaudio-shared \ |
162 |
--disable-arts-shared \ |
163 |
--disable-nas-shared \ |
164 |
--disable-osmesa-shared \ |
165 |
$(use_enable oss) \ |
166 |
$(use_enable alsa) \ |
167 |
$(use_enable pulseaudio) \ |
168 |
$(use_enable nas) \ |
169 |
$(use_enable X video-x11) \ |
170 |
$(use_enable dga) \ |
171 |
$(use_enable xv video-x11-xv) \ |
172 |
$(use_enable xinerama video-x11-xinerama) \ |
173 |
$(use_enable X video-x11-xrandr) \ |
174 |
$(use_enable dga video-dga) \ |
175 |
$(use_enable fbcon video-fbcon) \ |
176 |
$(use_enable ggi video-ggi) \ |
177 |
$(use_enable svga video-svga) \ |
178 |
$(use_enable aalib video-aalib) \ |
179 |
$(use_enable libcaca video-caca) \ |
180 |
$(use_enable opengl video-opengl) \ |
181 |
$(use_enable ps3 video-ps3) \ |
182 |
$(use_enable tslib input-tslib) \ |
183 |
$(use_with X x) \ |
184 |
$(use_enable static-libs static) \ |
185 |
--disable-video-x11-xme \ |
186 |
${myconf} |
187 |
} |
188 |
|
189 |
src_install() { |
190 |
emake DESTDIR="${D}" install || die "emake install failed" |
191 |
use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la |
192 |
dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew |
193 |
dohtml -r ./ |
194 |
} |