From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH 1/3] sdl2: version bump to 2.0.9
Date: Mon, 26 Nov 2018 06:27:35 +0100 [thread overview]
Message-ID: <20181126052735.4hkvc6w6jo7ds2uf@pengutronix.de> (raw)
In-Reply-To: <20181123171057.6206-2-m.grzeschik@pengutronix.de>
On Fri, Nov 23, 2018 at 06:10:55PM +0100, Michael Grzeschik wrote:
> Update to 2.0.9 and remove already mainlined patch.
>
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
There are some new configure options. And please reorder the options to
match the output of 'configure --help'. Use configure_helper.py to check.
Michael
> ---
> ...-find-available-card-if-called-witho.patch | 129 ------------------
> patches/SDL2-2.0.8/series | 5 -
> ...001-sdl-2.0.8-add-egl-cflags-to-test.patch | 6 +-
> patches/{SDL2-2.0.8 => SDL2-2.0.9}/autogen.sh | 0
> patches/SDL2-2.0.9/series | 4 +
> ...001-sdl-2.0.8-tests-configure-opengl.patch | 0
> .../autogen.sh | 0
> .../series | 0
> rules/sdl2.make | 4 +-
> 9 files changed, 9 insertions(+), 139 deletions(-)
> delete mode 100644 patches/SDL2-2.0.8/0002-sdl-2.0.8-KMSDRM-find-available-card-if-called-witho.patch
> delete mode 100644 patches/SDL2-2.0.8/series
> rename patches/{SDL2-2.0.8 => SDL2-2.0.9}/0001-sdl-2.0.8-add-egl-cflags-to-test.patch (92%)
> rename patches/{SDL2-2.0.8 => SDL2-2.0.9}/autogen.sh (100%)
> create mode 100644 patches/SDL2-2.0.9/series
> rename patches/{SDL2_test-2.0.8 => SDL2_test-2.0.9}/0001-sdl-2.0.8-tests-configure-opengl.patch (100%)
> rename patches/{SDL2_test-2.0.8 => SDL2_test-2.0.9}/autogen.sh (100%)
> rename patches/{SDL2_test-2.0.8 => SDL2_test-2.0.9}/series (100%)
>
> diff --git a/patches/SDL2-2.0.8/0002-sdl-2.0.8-KMSDRM-find-available-card-if-called-witho.patch b/patches/SDL2-2.0.8/0002-sdl-2.0.8-KMSDRM-find-available-card-if-called-witho.patch
> deleted file mode 100644
> index e889f87ae..000000000
> --- a/patches/SDL2-2.0.8/0002-sdl-2.0.8-KMSDRM-find-available-card-if-called-witho.patch
> +++ /dev/null
> @@ -1,129 +0,0 @@
> -From 212c7c68ec228a1058f39497d18c65e9312d00df Mon Sep 17 00:00:00 2001
> -From: Michael Grzeschik <m.grzeschik@pengutronix.de>
> -Date: Thu, 12 Jul 2018 13:48:54 +0200
> -Subject: [PATCH] sdl-2.0.8: KMSDRM: find available card if called without
> - index
> -
> -Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> ----
> - src/video/kmsdrm/SDL_kmsdrmvideo.c | 84 ++++++++++++++++++++++++++++--
> - 1 file changed, 80 insertions(+), 4 deletions(-)
> -
> -diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c
> -index 7855eeddb..f63c91b0a 100644
> ---- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
> -+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
> -@@ -41,15 +41,22 @@
> - #include "SDL_kmsdrmopengles.h"
> - #include "SDL_kmsdrmmouse.h"
> - #include "SDL_kmsdrmdyn.h"
> -+#include <sys/stat.h>
> -+#include <dirent.h>
> -+#include <errno.h>
> -
> --#define KMSDRM_DRI_CARD_0 "/dev/dri/card0"
> -+#define KMSDRM_DRI_PATH "/dev/dri/"
> -
> - static int
> --KMSDRM_Available(void)
> -+check_modestting(int devindex)
> - {
> - int available = 0;
> -+ char device[512];
> -+ int drm_fd;
> -+
> -+ sprintf(device, "%scard%d", KMSDRM_DRI_PATH, devindex);
> -
> -- int drm_fd = open(KMSDRM_DRI_CARD_0, O_RDWR | O_CLOEXEC);
> -+ drm_fd = open(device, O_RDWR | O_CLOEXEC);
> - if (drm_fd >= 0) {
> - if (SDL_KMSDRM_LoadSymbols()) {
> - drmModeRes *resources = KMSDRM_drmModeGetResources(drm_fd);
> -@@ -65,6 +72,72 @@ KMSDRM_Available(void)
> - return available;
> - }
> -
> -+static int get_dricount(void)
> -+{
> -+ int devcount = 0;
> -+ struct dirent *res;
> -+ struct stat sb;
> -+ DIR *folder;
> -+
> -+ if (!(stat(KMSDRM_DRI_PATH, &sb) == 0
> -+ && S_ISDIR(sb.st_mode))) {
> -+ printf("The path %s cannot be opened or is not available\n",
> -+ KMSDRM_DRI_PATH);
> -+ return 0;
> -+ }
> -+
> -+ if (access(KMSDRM_DRI_PATH, F_OK) == -1) {
> -+ printf("The path %s cannot be opened\n",
> -+ KMSDRM_DRI_PATH);
> -+ return 0;
> -+ }
> -+
> -+ folder = opendir(KMSDRM_DRI_PATH);
> -+ if (!folder)
> -+ return 0;
> -+
> -+ while ((res = readdir(folder))) {
> -+ if (res->d_type == DT_CHR)
> -+ devcount++;
> -+ }
> -+
> -+ closedir(folder);
> -+
> -+ return devcount;
> -+}
> -+
> -+static int
> -+get_driindex(void)
> -+{
> -+ int i = 0;
> -+ int available = 0;
> -+ int devcount = get_dricount();
> -+
> -+ for (i = 0; i < devcount; i++) {
> -+ if (check_modestting(i)) {
> -+ available = 1;
> -+ break;
> -+ }
> -+ }
> -+
> -+ if (available)
> -+ return i;
> -+
> -+ return -ENOENT;
> -+}
> -+
> -+static int
> -+KMSDRM_Available(void)
> -+{
> -+ int ret = -ENOENT;
> -+
> -+ ret = get_driindex();
> -+ if (ret >= 0)
> -+ return 1;
> -+
> -+ return ret;
> -+}
> -+
> - static void
> - KMSDRM_Destroy(SDL_VideoDevice * device)
> - {
> -@@ -83,7 +156,10 @@ KMSDRM_Create(int devindex)
> - SDL_VideoDevice *device;
> - SDL_VideoData *vdata;
> -
> -- if (devindex < 0 || devindex > 99) {
> -+ if (!devindex || devindex > 99)
> -+ devindex = get_driindex();
> -+
> -+ if (devindex < 0) {
> - SDL_SetError("devindex (%d) must be between 0 and 99.\n", devindex);
> - return NULL;
> - }
> ---
> -2.18.0
> -
> diff --git a/patches/SDL2-2.0.8/series b/patches/SDL2-2.0.8/series
> deleted file mode 100644
> index e4e931f38..000000000
> --- a/patches/SDL2-2.0.8/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> -0002-sdl-2.0.8-KMSDRM-find-available-card-if-called-witho.patch
> -# b803bb470cfcfd4d04f208304b9fd212 - git-ptx-patches magic
> diff --git a/patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch b/patches/SDL2-2.0.9/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> similarity index 92%
> rename from patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> rename to patches/SDL2-2.0.9/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> index c86d48e5a..573499644 100644
> --- a/patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> +++ b/patches/SDL2-2.0.9/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> @@ -25,10 +25,10 @@ index 9edfb8a7d913..2f1e2ef3d419 100755
> for autoconf in autoconf autoconf259 autoconf-2.59
> do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
> diff --git a/configure.in b/configure.in
> -index 1c7e79338a88..06e37a1b7f98 100644
> +index ae866ff0c55c..23d4ee2d8fad 100644
> --- a/configure.in
> +++ b/configure.in
> -@@ -2335,6 +2335,14 @@ dnl Find OpenGL ES
> +@@ -2349,6 +2349,14 @@ dnl Find OpenGL ES
> CheckOpenGLESX11()
> {
> if test x$enable_video = xyes -a x$enable_video_opengles = xyes; then
> @@ -43,7 +43,7 @@ index 1c7e79338a88..06e37a1b7f98 100644
> AC_MSG_CHECKING(for EGL support)
> video_opengl_egl=no
> AC_TRY_COMPILE([
> -@@ -2347,6 +2355,9 @@ CheckOpenGLESX11()
> +@@ -2361,6 +2369,9 @@ CheckOpenGLESX11()
> video_opengl_egl=yes
> ])
> AC_MSG_RESULT($video_opengl_egl)
> diff --git a/patches/SDL2-2.0.8/autogen.sh b/patches/SDL2-2.0.9/autogen.sh
> similarity index 100%
> rename from patches/SDL2-2.0.8/autogen.sh
> rename to patches/SDL2-2.0.9/autogen.sh
> diff --git a/patches/SDL2-2.0.9/series b/patches/SDL2-2.0.9/series
> new file mode 100644
> index 000000000..3693c2785
> --- /dev/null
> +++ b/patches/SDL2-2.0.9/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> +# 57d72a951bd7f961008ad5274d82876a - git-ptx-patches magic
> diff --git a/patches/SDL2_test-2.0.8/0001-sdl-2.0.8-tests-configure-opengl.patch b/patches/SDL2_test-2.0.9/0001-sdl-2.0.8-tests-configure-opengl.patch
> similarity index 100%
> rename from patches/SDL2_test-2.0.8/0001-sdl-2.0.8-tests-configure-opengl.patch
> rename to patches/SDL2_test-2.0.9/0001-sdl-2.0.8-tests-configure-opengl.patch
> diff --git a/patches/SDL2_test-2.0.8/autogen.sh b/patches/SDL2_test-2.0.9/autogen.sh
> similarity index 100%
> rename from patches/SDL2_test-2.0.8/autogen.sh
> rename to patches/SDL2_test-2.0.9/autogen.sh
> diff --git a/patches/SDL2_test-2.0.8/series b/patches/SDL2_test-2.0.9/series
> similarity index 100%
> rename from patches/SDL2_test-2.0.8/series
> rename to patches/SDL2_test-2.0.9/series
> diff --git a/rules/sdl2.make b/rules/sdl2.make
> index 441620789..95d4284e2 100644
> --- a/rules/sdl2.make
> +++ b/rules/sdl2.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2
> #
> # Paths and names
> #
> -SDL2_VERSION := 2.0.8
> -SDL2_MD5 := 3800d705cef742c6a634f202c37f263f
> +SDL2_VERSION := 2.0.9
> +SDL2_MD5 := f2ecfba915c54f7200f504d8b48a5dfe
> SDL2 := SDL2-$(SDL2_VERSION)
> SDL2_SUFFIX := tar.gz
> SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX)
> --
> 2.19.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2018-11-26 5:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-23 17:10 [ptxdist] [PATCH 0/3] sdl2: update packages to latest versions Michael Grzeschik
2018-11-23 17:10 ` [ptxdist] [PATCH 1/3] sdl2: version bump to 2.0.9 Michael Grzeschik
2018-11-26 5:27 ` Michael Olbrich [this message]
2018-11-26 7:43 ` Michael Grzeschik
2018-11-23 17:10 ` [ptxdist] [PATCH 2/3] sdl2-image: version bump to 2.0.4 Michael Grzeschik
2018-11-23 17:10 ` [ptxdist] [PATCH 3/3] sdl2-mixer: " Michael Grzeschik
2018-11-26 5:29 ` Michael Olbrich
2018-11-26 7:41 ` Michael Grzeschik
2018-11-26 12:45 ` [ptxdist] [PATCH v2 0/3] sdl2: update packages to latest versions Michael Grzeschik
2018-11-26 12:45 ` [ptxdist] [PATCH v2 1/3] sdl2: version bump to 2.0.9 Michael Grzeschik
2018-11-26 12:45 ` [ptxdist] [PATCH v2 2/3] sdl2-image: version bump to 2.0.4 Michael Grzeschik
2018-11-26 12:45 ` [ptxdist] [PATCH v2 3/3] sdl2-mixer: " Michael Grzeschik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181126052735.4hkvc6w6jo7ds2uf@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox