pyrox.dev
lol
SDL: add patches from Fedora
Fixes several bugs (some of which were fixed in the official repository but no
release made).
+38
-23
+38
-23
pkgs/development/libraries/SDL/default.nix
+38
-23
pkgs/development/libraries/SDL/default.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, audiofile, libcap
1
+
{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
2
2
, openglSupport ? false, mesa ? null
3
3
, alsaSupport ? true, alsaLib ? null
4
4
, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
···
59
59
"--without-x"
60
60
] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib");
61
61
62
-
# Fix a build failure on OS X Mavericks
63
-
# Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085
64
-
patches = stdenv.lib.optional stdenv.isDarwin [ (fetchurl {
65
-
url = "http://bugzilla-attachments.libsdl.org/attachment.cgi?id=1320";
66
-
sha1 = "3137feb503a89a8d606405373905b92dcf7e293b";
67
-
}) ];
62
+
patches = [
63
+
# Fix window resizing issues, e.g. for xmonad
64
+
# Ticket: http://bugzilla.libsdl.org/show_bug.cgi?id=1430
65
+
(fetchpatch {
66
+
name = "fix_window_resizing.diff";
67
+
url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=fix_window_resizing.diff;att=2;bug=665779";
68
+
sha256 = "1z35azc73vvi19pzi6byck31132a8w1vzrghp1x3hy4a4f9z4gc6";
69
+
})
70
+
# Fix drops of keyboard events for SDL_EnableUNICODE
71
+
(fetchpatch {
72
+
url = "http://hg.libsdl.org/SDL/raw-rev/0aade9c0203f";
73
+
sha256 = "1y9izncjlqvk1mkz1pkl9lrk9s452cmg2izjjlqqrhbn8279xy50";
74
+
})
75
+
# Ignore insane joystick axis events
76
+
(fetchpatch {
77
+
url = "http://hg.libsdl.org/SDL/raw-rev/95abff7adcc2";
78
+
sha256 = "0i8x0kx0pw12ld5bfxhyzs466y3c0n9dscw1ijhq1b96r72xyhqq";
79
+
})
80
+
# Workaround X11 bug to allow changing gamma
81
+
# Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
82
+
(fetchpatch {
83
+
url = "http://pkgs.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d";
84
+
sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv";
85
+
})
86
+
# Fix a build failure on OS X Mavericks
87
+
# Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085
88
+
(fetchpatch {
89
+
url = "http://hg.libsdl.org/SDL/raw-rev/e9466ead70e5";
90
+
sha256 = "0mpwdi09h89df2wxqw87m1rdz7pr46k0w6alk691k8kwv970z6pl";
91
+
})
92
+
(fetchpatch {
93
+
url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87";
94
+
sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv";
95
+
})
96
+
];
68
97
69
-
crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
70
-
patches = let
71
-
f = rev: sha256: fetchurl {
72
-
url = "http://hg.libsdl.org/SDL/raw-rev/${rev}";
73
-
inherit sha256;
74
-
};
75
-
in [
76
-
(f "e9466ead70e5" "0ygir3k83d0vxp7s3k48jn3j8n2bnv9wm6613wpx3ybnjrxabrip")
77
-
(f "bbfb41c13a87" "17v29ybjifvka19m8qf14rjc43nfdwk9v9inaizznarhb17amlnv")
78
-
];
79
-
postPatch = ''
80
-
sed -i -e 's/ *-fpascal-strings//' configure
81
-
'';
82
-
};
83
-
84
-
passthru = {inherit openglSupport;};
98
+
passthru = { inherit openglSupport; };
85
99
86
100
meta = with stdenv.lib; {
87
101
description = "A cross-platform multimedia library";
88
102
homepage = http://www.libsdl.org/;
89
103
maintainers = with maintainers; [ lovek323 ];
90
104
platforms = platforms.unix;
105
+
license = licenses.lgpl21;
91
106
};
92
107
}