[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/30: gnu: sdl2: Update to 2.0.12.
From: |
guix-commits |
Subject: |
03/30: gnu: sdl2: Update to 2.0.12. |
Date: |
Thu, 2 Apr 2020 14:55:43 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 43b176f36c57aa53883a1e623bd77f399babd788
Author: Timotej Lazar <address@hidden>
AuthorDate: Tue Mar 24 15:10:37 2020 +0100
gnu: sdl2: Update to 2.0.12.
* gnu/packages/patches/sdl2-mesa-compat.patch: Delete file.
* gnu/packages/sdl.scm (sdl2): Update to 2.0.12.
[source]: Drop patch that was included in this release.
Signed-off-by: Marius Bakke <address@hidden>
---
gnu/local.mk | 1 -
gnu/packages/patches/sdl2-mesa-compat.patch | 21 ---------------------
gnu/packages/sdl.scm | 5 ++---
3 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index d490869..7769663 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1415,7 +1415,6 @@ dist_patch_DATA =
\
%D%/packages/patches/scotch-build-parallelism.patch \
%D%/packages/patches/scotch-integer-declarations.patch \
%D%/packages/patches/sdl-libx11-1.6.patch \
- %D%/packages/patches/sdl2-mesa-compat.patch \
%D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \
%D%/packages/patches/seq24-rename-mutex.patch \
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
diff --git a/gnu/packages/patches/sdl2-mesa-compat.patch
b/gnu/packages/patches/sdl2-mesa-compat.patch
deleted file mode 100644
index 8182e58..0000000
--- a/gnu/packages/patches/sdl2-mesa-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Do not include GLES header when OpenGL headers are already included.
-
-Taken from upstream:
-https://hg.libsdl.org/SDL/rev/369b01006eb2
-
-diff -r 4cbaffd0083b -r 369b01006eb2 src/video/SDL_video.c
---- a/src/video/SDL_video.c Fri Oct 11 06:18:24 2019 +0200
-+++ b/src/video/SDL_video.c Sat Oct 12 18:47:56 2019 +0200
-@@ -37,9 +37,9 @@
- #include "SDL_opengl.h"
- #endif /* SDL_VIDEO_OPENGL */
-
--#if SDL_VIDEO_OPENGL_ES
-+#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL
- #include "SDL_opengles.h"
--#endif /* SDL_VIDEO_OPENGL_ES */
-+#endif /* SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL */
-
- /* GL and GLES2 headers conflict on Linux 32 bits */
- #if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL
-
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 8b21f81..7b36d55 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -115,16 +115,15 @@ joystick, and graphics hardware.")
(define-public sdl2
(package (inherit sdl)
(name "sdl2")
- (version "2.0.10")
+ (version "2.0.12")
(source (origin
(method url-fetch)
(uri
(string-append "https://libsdl.org/release/SDL2-"
version ".tar.gz"))
- (patches (search-patches "sdl2-mesa-compat.patch"))
(sha256
(base32
- "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl"))))
+ "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il"))))
(arguments
(substitute-keyword-arguments (package-arguments sdl)
((#:configure-flags flags)
- branch master updated (8549e47 -> 70c128d), guix-commits, 2020/04/02
- 01/30: gnu: python-pyasn1: Update to 0.4.8., guix-commits, 2020/04/02
- 02/30: gnu: sdl2: Use udev to discover input devices., guix-commits, 2020/04/02
- 04/30: gnu: Add emacs-ac-geiser., guix-commits, 2020/04/02
- 05/30: gnu: Add r-oenb., guix-commits, 2020/04/02
- 06/30: gnu: cedille: Fix emacs outputs., guix-commits, 2020/04/02
- 03/30: gnu: sdl2: Update to 2.0.12.,
guix-commits <=
- 07/30: gnu: cedille: Install the info pages., guix-commits, 2020/04/02
- 10/30: gnu: proof-general: Update to 4.4., guix-commits, 2020/04/02
- 11/30: gnu: proof-general: Update home-page., guix-commits, 2020/04/02
- 08/30: gnu: Add xwallpaper., guix-commits, 2020/04/02
- 12/30: gnu: Add font-iosevka-term-slab., guix-commits, 2020/04/02
- 09/30: gnu: gnome-default-applications: Change defaults.list to gnome-mimeapps.list., guix-commits, 2020/04/02
- 17/30: gnu: Add python-canonicaljson., guix-commits, 2020/04/02
- 14/30: services: murmur: Add missing newline in murmur-configuration., guix-commits, 2020/04/02
- 16/30: gnu: Add python-unpaddedbase64., guix-commits, 2020/04/02
- 18/30: gnu: Add python-signedjson., guix-commits, 2020/04/02