[Pkg-sdl-commits] r238 - in unstable/libsdl1.2/debian: . patches
Barry deFreese
bdefreese at alioth.debian.org
Thu Oct 1 09:12:32 UTC 2009
Author: bdefreese
Date: 2009-10-01 21:12:32 +0000 (Thu, 01 Oct 2009)
New Revision: 238
Added:
unstable/libsdl1.2/debian/patches/050_altivec_detection.diff
unstable/libsdl1.2/debian/patches/310_segfault_noGLX.diff
Modified:
unstable/libsdl1.2/debian/changelog
Log:
* 310_segfault_noGLX.diff - Don't segfault when no GLX. (Closes: 541365).
+ Thanks to Gonéri Le Bouder for the fix.
* 050_altivec_detection.diff - Detect Altivec machines. (Closes: #502993).
+ Thanks to Michel Dänzer for the fix.
+ Update 100_libtoolize.diff. (Closes: #549240).
Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog 2009-10-01 20:50:12 UTC (rev 237)
+++ unstable/libsdl1.2/debian/changelog 2009-10-01 21:12:32 UTC (rev 238)
@@ -5,6 +5,11 @@
* Add watch file.
* Add Homepage: field to source stanza.
* Fix Vcs-Browser path.
+ * 310_segfault_noGLX.diff - Don't segfault when no GLX. (Closes: 541365).
+ + Thanks to Gonéri Le Bouder for the fix.
+ * 050_altivec_detection.diff - Detect Altivec machines. (Closes: #502993).
+ + Thanks to Michel Dänzer for the fix.
+ + Update 100_libtoolize.diff. (Closes: #549240).
* Bump debhelper build-dep version and compat to 5.
* Bump Standards Version to 3.8.3
Added: unstable/libsdl1.2/debian/patches/050_altivec_detection.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/050_altivec_detection.diff (rev 0)
+++ unstable/libsdl1.2/debian/patches/050_altivec_detection.diff 2009-10-01 21:12:32 UTC (rev 238)
@@ -0,0 +1,120 @@
+Index: libsdl1.2-1.2.13/configure.in
+===================================================================
+--- libsdl1.2-1.2.13.orig/configure.in 2008-10-21 16:19:05.000000000 +0200
++++ libsdl1.2-1.2.13/configure.in 2008-10-21 16:27:11.000000000 +0200
+@@ -749,64 +749,66 @@
+ AC_HELP_STRING([--enable-altivec], [use altivec assembly blitters on PPC [[default=yes]]]),
+ , enable_altivec=yes)
+ if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_altivec = xyes; then
+- have_altivec_h_hdr=no
+- AC_CHECK_HEADER(altivec.h, have_altivec_h_hdr=yes)
+-
+ save_CFLAGS="$CFLAGS"
+ have_gcc_altivec=no
+- AC_MSG_CHECKING(for Altivec with GCC -maltivec option)
++ have_altivec_h_hdr=no
+ altivec_CFLAGS="-maltivec"
+ CFLAGS="$save_CFLAGS $altivec_CFLAGS"
+
+- if test x$have_altivec_h_hdr = xyes; then
+- AC_TRY_COMPILE([
+- #include <altivec.h>
+- vector unsigned int vzero() {
+- return vec_splat_u32(0);
+- }
+- ],[
+- ],[
+- have_gcc_altivec=yes
+- ])
+- AC_MSG_RESULT($have_gcc_altivec)
+- else
+- AC_TRY_COMPILE([
+- vector unsigned int vzero() {
+- return vec_splat_u32(0);
+- }
+- ],[
+- ],[
+- have_gcc_altivec=yes
+- ])
+- AC_MSG_RESULT($have_gcc_altivec)
++ AC_MSG_CHECKING(for Altivec with GCC altivec.h and -maltivec option)
++ AC_TRY_COMPILE([
++ #include <altivec.h>
++ vector unsigned int vzero() {
++ return vec_splat_u32(0);
++ }
++ ],[
++ ],[
++ have_gcc_altivec=yes
++ have_altivec_h_hdr=yes
++ ])
++ AC_MSG_RESULT($have_gcc_altivec)
++
++ if test x$have_gcc_altivec = xno; then
++ AC_MSG_CHECKING(for Altivec with GCC -maltivec option)
++ AC_TRY_COMPILE([
++ vector unsigned int vzero() {
++ return vec_splat_u32(0);
++ }
++ ],[
++ ],[
++ have_gcc_altivec=yes
++ ])
++ AC_MSG_RESULT($have_gcc_altivec)
+ fi
+
+ if test x$have_gcc_altivec = xno; then
+- AC_MSG_CHECKING(for Altivec with GCC -faltivec option)
++ AC_MSG_CHECKING(for Altivec with GCC altivec.h and -faltivec option)
+ altivec_CFLAGS="-faltivec"
+ CFLAGS="$save_CFLAGS $altivec_CFLAGS"
+- if test x$have_altivec_h_hdr = xyes; then
+- AC_TRY_COMPILE([
+- #include <altivec.h>
+- vector unsigned int vzero() {
+- return vec_splat_u32(0);
+- }
+- ],[
+- ],[
+- have_gcc_altivec=yes
+- ])
+- AC_MSG_RESULT($have_gcc_altivec)
+- else
+- AC_TRY_COMPILE([
+- vector unsigned int vzero() {
+- return vec_splat_u32(0);
+- }
+- ],[
+- ],[
+- have_gcc_altivec=yes
+- ])
+- AC_MSG_RESULT($have_gcc_altivec)
+- fi
++ AC_TRY_COMPILE([
++ #include <altivec.h>
++ vector unsigned int vzero() {
++ return vec_splat_u32(0);
++ }
++ ],[
++ ],[
++ have_gcc_altivec=yes
++ have_altivec_h_hdr=yes
++ ])
++ AC_MSG_RESULT($have_gcc_altivec)
++ fi
++
++ if test x$have_gcc_altivec = xno; then
++ AC_MSG_CHECKING(for Altivec with GCC -faltivec option)
++ AC_TRY_COMPILE([
++ vector unsigned int vzero() {
++ return vec_splat_u32(0);
++ }
++ ],[
++ ],[
++ have_gcc_altivec=yes
++ ])
++ AC_MSG_RESULT($have_gcc_altivec)
+ fi
+ CFLAGS="$save_CFLAGS"
+
+
Added: unstable/libsdl1.2/debian/patches/310_segfault_noGLX.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/310_segfault_noGLX.diff (rev 0)
+++ unstable/libsdl1.2/debian/patches/310_segfault_noGLX.diff 2009-10-01 21:12:32 UTC (rev 238)
@@ -0,0 +1,16 @@
+Index: libsdl1.2-1.2.13/src/video/x11/SDL_x11gl.c
+===================================================================
+--- libsdl1.2-1.2.13.orig/src/video/x11/SDL_x11gl.c 2009-10-01 16:53:43.000000000 -0400
++++ libsdl1.2-1.2.13/src/video/x11/SDL_x11gl.c 2009-10-01 16:55:39.000000000 -0400
+@@ -70,6 +70,11 @@
+ /* It takes a bit of care to be fool-proof about parsing the
+ * OpenGL extensions string. Don't be fooled by sub-strings, etc.
+ */
++
++ /* http://bugs.debian.org/537487 */
++ if (extensions == NULL) {
++ return 0;
++ }
+
+ start = extensions;
+
More information about the pkg-sdl-commits
mailing list