[Pkg-sdl-commits] [libsdl2] 04/05: Refresh patches and document SDL2_dont_propagate_lpthread.diff

[Manuel A. Fernandez Montecelo]

This is an automated email from the git hooks/post-receive script.

mafm pushed a commit to branch master
in repository libsdl2.

commit 4fb121e2ce0420335fb11effbb9f4fb0324247fc
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Sat Oct 19 22:05:29 2013 +0100

    Refresh patches and document SDL2_dont_propagate_lpthread.diff
---
 ...pthread.diff => SDL2_dont_propagate_lpthread.diff} |   17 +++++++++++++++++
 ...g-723797-false_positives_in_mouse_wheel_code.patch |    6 ++----
 debian/patches/fix_joystick_misc_axes.diff            |    8 +++-----
 debian/patches/series                                 |    2 +-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/debian/patches/300_dont_propagate_lpthread.diff b/debian/patches/SDL2_dont_propagate_lpthread.diff
similarity index 60%
rename from debian/patches/300_dont_propagate_lpthread.diff
rename to debian/patches/SDL2_dont_propagate_lpthread.diff
index fdfeb57..f28d59e 100644
--- a/debian/patches/300_dont_propagate_lpthread.diff
+++ b/debian/patches/SDL2_dont_propagate_lpthread.diff
@@ -1,3 +1,20 @@
+Description: Do not propagate -lpthread to sdl-config --libs (adapted for SDL2)
+ Introduced in 1.2.11-1 (Thu, 20 Jul 2006 14:17:18 +0200).
+ .
+ Upstream will not apply it at the moment:
+   Sam Lantinga 2012-01-22 10:54:21 PST
+ .
+   At some point it was required that multi-threaded programs using pthreads on
+   Linux link directly to the pthread library.  I don't remember all the details,
+   but it had something to do with initializing C runtime variables correctly.
+ .
+   I'm sure it's not an issue anymore, but I'd rather not apply this patch in 1.2.
+   I'll go ahead and make this change in 1.3 though.
+Author: Sam Hocevar <sam+deb at zoy.org>
+Last-Update: 2013-10-19
+Bug-Debian: http://bugs.debian.org/375822
+Forwarded: http://bugzilla.libsdl.org/show_bug.cgi?id=1392
+
 ---
  sdl2-config.in |    2 +-
  sdl2.pc.in     |    2 +-
diff --git a/debian/patches/bug-723797-false_positives_in_mouse_wheel_code.patch b/debian/patches/bug-723797-false_positives_in_mouse_wheel_code.patch
index 621b790..d8be80e 100644
--- a/debian/patches/bug-723797-false_positives_in_mouse_wheel_code.patch
+++ b/debian/patches/bug-723797-false_positives_in_mouse_wheel_code.patch
@@ -31,9 +31,8 @@ because the mouse doesn't signal release until the button is next pressed.
 (Also documents a false negative, observed with the horizontal scroll wheel
 on the same mouse.)
 
-diff -r 3c9889bf2626 -r 6073ad385c9b src/video/x11/SDL_x11events.c
---- a/src/video/x11/SDL_x11events.c	Fri Sep 27 23:29:05 2013 -0700
-+++ b/src/video/x11/SDL_x11events.c	Fri Sep 27 23:35:17 2013 -0700
+--- a/src/video/x11/SDL_x11events.c
++++ b/src/video/x11/SDL_x11events.c
 @@ -135,7 +135,9 @@
      XPointer arg)
  {
@@ -58,4 +57,3 @@ diff -r 3c9889bf2626 -r 6073ad385c9b src/video/x11/SDL_x11events.c
          if (XCheckIfEvent(display, &relevent, X11_IsWheelCheckIfEvent,
              (XPointer) event)) {
  
-
diff --git a/debian/patches/fix_joystick_misc_axes.diff b/debian/patches/fix_joystick_misc_axes.diff
index b8cad75..addcc9c 100644
--- a/debian/patches/fix_joystick_misc_axes.diff
+++ b/debian/patches/fix_joystick_misc_axes.diff
@@ -4,11 +4,9 @@ Last-Update: 2013-10-19
 Bug-Debian: http://bugs.debian.org/673324
 Forwarded: https://bugzilla.libsdl.org/show_bug.cgi?id=2165
 
-Index: libsdl2/src/joystick/linux/SDL_sysjoystick.c
-===================================================================
---- a/src/joystick/linux/SDL_sysjoystick.c	2012-05-18 00:51:07.758390396 +0200
-+++ b/src/joystick/linux/SDL_sysjoystick.c	2012-05-18 00:51:13.084998927 +0200
-@@ -703,7 +703,7 @@
+--- a/src/joystick/linux/SDL_sysjoystick.c
++++ b/src/joystick/linux/SDL_sysjoystick.c
+@@ -646,7 +646,7 @@
                  ++joystick->nbuttons;
              }
          }
diff --git a/debian/patches/series b/debian/patches/series
index d087830..ca8d102 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-300_dont_propagate_lpthread.diff
+SDL2_dont_propagate_lpthread.diff
 fix_joystick_misc_axes.diff
 bug-723797-false_positives_in_mouse_wheel_code.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2.git