Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Azamat H. Hackimov" <winterheart@××××××.ru>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/
Date: Tue, 02 Jul 2013 17:01:00
Message-Id: 1372784403.bc763c7b3dd040a63650215da7f501989e6dc605.winterheart@gentoo
1 commit: bc763c7b3dd040a63650215da7f501989e6dc605
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Tue Jul 2 17:00:03 2013 +0000
4 Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
5 CommitDate: Tue Jul 2 17:00:03 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=bc763c7b
7
8 [media-libs/libsdl] Version bump to 2.0.0_pre7338, remove old.
9
10 Package-Manager: portage-2.1.12.2
11 Manifest-Sign-Key: A018DE8C
12
13 ---
14 .../files/libsdl-fix-compilation-libX11.patch | 126 ---------------------
15 media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild | 126 ---------------------
16 ..._pre7304.ebuild => libsdl-2.0.0_pre7338.ebuild} | 0
17 3 files changed, 252 deletions(-)
18
19 diff --git a/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch b/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch
20 deleted file mode 100644
21 index 077673e..0000000
22 --- a/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch
23 +++ /dev/null
24 @@ -1,126 +0,0 @@
25 -# HG changeset patch
26 -# User Azamat H. Hackimov <azamat.hackimov@×××××.com>
27 -# Date 1370182818 -21600
28 -# Node ID cb19a074e0b1c3e03a4eacca149c8a6599ed9bc5
29 -# Parent 23a5c8f4b312d0b285667e78b9038d403d94c240
30 -Fix compilation with libX11 >= 1.5.99.902.
31 -
32 -These changes fixes bug #1769 for SDL2
33 -(http://bugzilla.libsdl.org/show_bug.cgi?id=1769).
34 -
35 -diff -r 23a5c8f4b312 -r cb19a074e0b1 cmake/sdlchecks.cmake
36 ---- a/cmake/sdlchecks.cmake Sun Jun 02 14:27:54 2013 +0200
37 -+++ b/cmake/sdlchecks.cmake Sun Jun 02 20:20:18 2013 +0600
38 -@@ -356,6 +356,14 @@
39 - set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1)
40 - endif(HAVE_XGENERICEVENT)
41 -
42 -+ check_c_source_compiles("
43 -+ #include <X11/Xlibint.h>
44 -+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
45 -+ int main(int argc, char **argv) {}" HAVE_CONST_XDATA32)
46 -+ if(HAVE_CONST_XDATA32)
47 -+ set(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1)
48 -+ endif(HAVE_CONST_XDATA32)
49 -+
50 - check_function_exists(XkbKeycodeToKeysym SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM)
51 -
52 - if(VIDEO_X11_XCURSOR AND HAVE_XCURSOR_H)
53 -diff -r 23a5c8f4b312 -r cb19a074e0b1 configure
54 ---- a/configure Sun Jun 02 14:27:54 2013 +0200
55 -+++ b/configure Sun Jun 02 20:20:18 2013 +0600
56 -@@ -19492,6 +19492,35 @@
57 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_const_param_XextAddDisplay" >&5
58 - $as_echo "$have_const_param_XextAddDisplay" >&6; }
59 -
60 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for const parameter to _XData32" >&5
61 -+$as_echo_n "checking for const parameter to _XData32... " >&6; }
62 -+ have_const_param_xdata32=no
63 -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
64 -+/* end confdefs.h. */
65 -+
66 -+ #include <X11/Xlibint.h>
67 -+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
68 -+
69 -+int
70 -+main ()
71 -+{
72 -+
73 -+
74 -+ ;
75 -+ return 0;
76 -+}
77 -+_ACEOF
78 -+if ac_fn_c_try_compile "$LINENO"; then :
79 -+
80 -+ have_const_param_xdata32=yes
81 -+ $as_echo "#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1" >>confdefs.h
82 -+
83 -+
84 -+fi
85 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
86 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_const_param_xdata32" >&5
87 -+$as_echo "$have_const_param_xdata32" >&6; }
88 -+
89 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGenericEvent" >&5
90 - $as_echo_n "checking for XGenericEvent... " >&6; }
91 - have_XGenericEvent=no
92 -diff -r 23a5c8f4b312 -r cb19a074e0b1 configure.in
93 ---- a/configure.in Sun Jun 02 14:27:54 2013 +0200
94 -+++ b/configure.in Sun Jun 02 20:20:18 2013 +0600
95 -@@ -1144,6 +1144,18 @@
96 - ])
97 - AC_MSG_RESULT($have_const_param_XextAddDisplay)
98 -
99 -+ AC_MSG_CHECKING(for const parameter to _XData32)
100 -+ have_const_param_xdata32=no
101 -+ AC_TRY_COMPILE([
102 -+ #include <X11/Xlibint.h>
103 -+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
104 -+ ],[
105 -+ ],[
106 -+ have_const_param_xdata32=yes
107 -+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
108 -+ ])
109 -+ AC_MSG_RESULT($have_const_param_xdata32)
110 -+
111 - dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent]))
112 - AC_MSG_CHECKING([for XGenericEvent])
113 - have_XGenericEvent=no
114 -diff -r 23a5c8f4b312 -r cb19a074e0b1 include/SDL_config.h.cmake
115 ---- a/include/SDL_config.h.cmake Sun Jun 02 14:27:54 2013 +0200
116 -+++ b/include/SDL_config.h.cmake Sun Jun 02 20:20:18 2013 +0600
117 -@@ -266,6 +266,7 @@
118 - #cmakedefine SDL_VIDEO_DRIVER_X11_XSHAPE @SDL_VIDEO_DRIVER_X11_XSHAPE@
119 - #cmakedefine SDL_VIDEO_DRIVER_X11_XVIDMODE @SDL_VIDEO_DRIVER_X11_XVIDMODE@
120 - #cmakedefine SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS @SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS@
121 -+#cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32@
122 - #cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY@
123 - #cmakedefine SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM @SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM@
124 -
125 -diff -r 23a5c8f4b312 -r cb19a074e0b1 include/SDL_config.h.in
126 ---- a/include/SDL_config.h.in Sun Jun 02 14:27:54 2013 +0200
127 -+++ b/include/SDL_config.h.in Sun Jun 02 20:20:18 2013 +0600
128 -@@ -268,6 +268,7 @@
129 - #undef SDL_VIDEO_DRIVER_X11_XSHAPE
130 - #undef SDL_VIDEO_DRIVER_X11_XVIDMODE
131 - #undef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
132 -+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
133 - #undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY
134 - #undef SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
135 -
136 -diff -r 23a5c8f4b312 -r cb19a074e0b1 src/video/x11/SDL_x11sym.h
137 ---- a/src/video/x11/SDL_x11sym.h Sun Jun 02 14:27:54 2013 +0200
138 -+++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:20:18 2013 +0600
139 -@@ -203,7 +203,11 @@
140 - */
141 - #ifdef LONG64
142 - SDL_X11_MODULE(IO_32BIT)
143 -+#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
144 -+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
145 -+#else
146 - SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
147 -+#endif
148 - SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
149 - #endif
150 -
151
152 diff --git a/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild
153 deleted file mode 100644
154 index 14ff260..0000000
155 --- a/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild
156 +++ /dev/null
157 @@ -1,126 +0,0 @@
158 -# Copyright 1999-2013 Gentoo Foundation
159 -# Distributed under the terms of the GNU General Public License v2
160 -# $Header: $
161 -
162 -EAPI=5
163 -
164 -inherit cmake-multilib
165 -
166 -MY_PV=${PV/_pre/-}
167 -
168 -DESCRIPTION="Simple Direct Media Layer"
169 -HOMEPAGE="http://www.libsdl.org/"
170 -SRC_URI="http://www.libsdl.org/tmp/SDL-${MY_PV}.tar.gz"
171 -LICENSE="ZLIB"
172 -SLOT="2"
173 -KEYWORDS="~amd64 ~x86"
174 -IUSE="3dnow alsa altivec +asm aqua fusionsound gles mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib +video X xinerama xscreensaver"
175 -
176 -#FIXME: Replace "gles" deps with "virtual/opengles", after hitting Portage.
177 -#FIXME: media-libs/nas no have emul-* ebuild
178 -#FIXME: virtual/opengl for abi_x86_32 require additional handling
179 -RDEPEND="
180 - nas? (
181 - media-libs/nas
182 - x11-libs/libX11
183 - x11-libs/libXext
184 - x11-libs/libXt
185 - )
186 - X? (
187 - x11-libs/libX11
188 - x11-libs/libXcursor
189 - x11-libs/libXext
190 - x11-libs/libXi
191 - x11-libs/libXt
192 - x11-libs/libXrandr
193 - x11-libs/libXrender
194 - x11-libs/libXxf86vm
195 - )
196 - xinerama? ( x11-libs/libXinerama )
197 - xscreensaver? ( x11-libs/libXScrnSaver )
198 - alsa? ( media-libs/alsa-lib )
199 - fusionsound? ( >=media-libs/FusionSound-1.1.1 )
200 - pulseaudio? ( >=media-sound/pulseaudio-0.9 )
201 - gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) )
202 - opengl? ( virtual/opengl )
203 - tslib? ( x11-libs/tslib )
204 -"
205 -
206 -DEPEND="${RDEPEND}
207 - nas? (
208 - x11-proto/xextproto
209 - x11-proto/xproto
210 - )
211 - X? (
212 - x11-proto/inputproto
213 - x11-proto/xextproto
214 - x11-proto/xf86vidmodeproto
215 - x11-proto/xproto
216 - x11-proto/randrproto
217 - x11-proto/renderproto
218 - )
219 - xinerama? ( x11-proto/xineramaproto )
220 - xscreensaver? ( x11-proto/scrnsaverproto )
221 -"
222 -
223 -S="${WORKDIR}/SDL-${MY_PV}"
224 -
225 -DOCS=( BUGS.txt CREDITS.txt README.txt README-hg.txt README-SDL.txt TODO.txt WhatsNew.txt )
226 -
227 -src_prepare() {
228 - # Currently cmake produce libsdl2.so targets,
229 - # but libtool libsdl2-2.0.so, so many applications (e.g. Steam) fails to
230 - # find system libsdl. This patch workaround this problem.
231 - # See http://bugzilla.libsdl.org/show_bug.cgi?id=1743
232 - epatch "${FILESDIR}/${PN}-add-libtool-export-cmake-v2.patch"
233 - # Make headers more universal for 32/64 archs.
234 - # See http://bugzilla.libsdl.org/show_bug.cgi?id=1893
235 - epatch "${FILESDIR}/${PN}-universal_sizeof_voidp.patch"
236 -
237 - # libX11 1.5.99.902 compilation fix
238 - # See http://bugzilla.libsdl.org/show_bug.cgi?id=1769
239 - epatch "${FILESDIR}/${PN}-fix-compilation-libX11.patch"
240 - # Make headers more universal for 32/64 archs.
241 - # http://bugzilla.libsdl.org/show_bug.cgi?id=1893
242 - epatch "${FILESDIR}/${PN}-universal_xdata32_check.patch"
243 -}
244 -
245 -src_configure() {
246 - mycmakeargs=(
247 - # Disable assertion tests.
248 - -DASSERTIONS=disabled
249 - # Avoid hard-coding RPATH entries into dynamically linked SDL libraries.
250 - -DRPATH=NO
251 - # Disable obsolete and/or inapplicable libraries.
252 - -DARTS=NO
253 - -DESD=NO
254 - $(cmake-utils_use 3dnow 3DNOW)
255 - $(cmake-utils_use alsa ALSA)
256 - $(cmake-utils_use altivec ALTIVEC)
257 - $(cmake-utils_use asm ASSEMBLY)
258 - $(cmake-utils_use aqua VIDEO_COCOA)
259 - $(cmake-utils_use fusionsound FUSIONSOUND)
260 - $(cmake-utils_use gles VIDEO_OPENGLES)
261 - $(cmake-utils_use mmx MMX)
262 - $(cmake-utils_use nas NAS)
263 - $(cmake-utils_use opengl VIDEO_OPENGL)
264 - $(cmake-utils_use oss OSS)
265 - $(cmake-utils_use pulseaudio PULSEAUDIO)
266 - $(cmake-utils_use threads PTHREADS)
267 - $(cmake-utils_use sse SSE)
268 - $(cmake-utils_use sse SSEMATH)
269 - $(cmake-utils_use sse2 SSE2)
270 - $(cmake-utils_use static-libs SDL_STATIC)
271 - $(cmake-utils_use tslib INPUT_TSLIB)
272 - $(cmake-utils_use video VIDEO_DUMMY)
273 - $(cmake-utils_use X VIDEO_X11)
274 - $(cmake-utils_use X VIDEO_X11_XCURSOR)
275 - $(cmake-utils_use X VIDEO_X11_XINERAMA)
276 - $(cmake-utils_use X VIDEO_X11_XINPUT)
277 - $(cmake-utils_use X VIDEO_X11_XRANDR)
278 - $(cmake-utils_use xscreensaver VIDEO_X11_XSCRNSAVER)
279 - $(cmake-utils_use X VIDEO_X11_XVM)
280 - #$(cmake-utils_use joystick SDL_JOYSTICK)
281 - )
282 - cmake-multilib_src_configure
283 -}
284
285 diff --git a/media-libs/libsdl/libsdl-2.0.0_pre7304.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7338.ebuild
286 similarity index 100%
287 rename from media-libs/libsdl/libsdl-2.0.0_pre7304.ebuild
288 rename to media-libs/libsdl/libsdl-2.0.0_pre7338.ebuild
Report Message
Find on MARC Find on Google Groups