From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gRBXt-0000kR-9A for ptxdist@pengutronix.de; Mon, 26 Nov 2018 08:43:05 +0100 Received: from mgr by ptx.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1gRBXt-0001gY-1C for ptxdist@pengutronix.de; Mon, 26 Nov 2018 08:43:05 +0100 Date: Mon, 26 Nov 2018 08:43:05 +0100 From: Michael Grzeschik Message-ID: <20181126074304.idlsnprxdmqjmhfg@pengutronix.de> References: <20181123171057.6206-1-m.grzeschik@pengutronix.de> <20181123171057.6206-2-m.grzeschik@pengutronix.de> <20181126052735.4hkvc6w6jo7ds2uf@pengutronix.de> MIME-Version: 1.0 In-Reply-To: <20181126052735.4hkvc6w6jo7ds2uf@pengutronix.de> Subject: Re: [ptxdist] [PATCH 1/3] sdl2: version bump to 2.0.9 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: multipart/mixed; boundary="===============1396424799==" Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de --===============1396424799== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uqkvusougdcqdll2" Content-Disposition: inline --uqkvusougdcqdll2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Nov 26, 2018 at 06:27:35AM +0100, Michael Olbrich wrote: > On Fri, Nov 23, 2018 at 06:10:55PM +0100, Michael Grzeschik wrote: > > Update to 2.0.9 and remove already mainlined patch. > >=20 > > Signed-off-by: Michael Grzeschik >=20 > There are some new configure options. And please reorder the options to > match the output of 'configure --help'. Use configure_helper.py to check. I will add the options in v2. > Michael >=20 > > --- > > ...-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 =3D> 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-avail= able-card-if-called-witho.patch > > delete mode 100644 patches/SDL2-2.0.8/series > > rename patches/{SDL2-2.0.8 =3D> SDL2-2.0.9}/0001-sdl-2.0.8-add-egl-cfl= ags-to-test.patch (92%) > > rename patches/{SDL2-2.0.8 =3D> SDL2-2.0.9}/autogen.sh (100%) > > create mode 100644 patches/SDL2-2.0.9/series > > rename patches/{SDL2_test-2.0.8 =3D> SDL2_test-2.0.9}/0001-sdl-2.0.8-t= ests-configure-opengl.patch (100%) > > rename patches/{SDL2_test-2.0.8 =3D> SDL2_test-2.0.9}/autogen.sh (100%) > > rename patches/{SDL2_test-2.0.8 =3D> SDL2_test-2.0.9}/series (100%) > >=20 > > diff --git a/patches/SDL2-2.0.8/0002-sdl-2.0.8-KMSDRM-find-available-ca= rd-if-called-witho.patch b/patches/SDL2-2.0.8/0002-sdl-2.0.8-KMSDRM-find-av= ailable-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-c= alled-witho.patch > > +++ /dev/null > > @@ -1,129 +0,0 @@ > > -From 212c7c68ec228a1058f39497d18c65e9312d00df Mon Sep 17 00:00:00 2001 > > -From: Michael Grzeschik > > -Date: Thu, 12 Jul 2018 13:48:54 +0200 > > -Subject: [PATCH] sdl-2.0.8: KMSDRM: find available card if called with= out > > - index > > - > > -Signed-off-by: Michael Grzeschik > > ---- > > - 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 > > -+#include > > -+#include > > -=20 > > --#define KMSDRM_DRI_CARD_0 "/dev/dri/card0" > > -+#define KMSDRM_DRI_PATH "/dev/dri/" > > -=20 > > - static int > > --KMSDRM_Available(void) > > -+check_modestting(int devindex) > > - { > > - int available =3D 0; > > -+ char device[512]; > > -+ int drm_fd; > > -+ > > -+ sprintf(device, "%scard%d", KMSDRM_DRI_PATH, devindex); > > -=20 > > -- int drm_fd =3D open(KMSDRM_DRI_CARD_0, O_RDWR | O_CLOEXEC); > > -+ drm_fd =3D open(device, O_RDWR | O_CLOEXEC); > > - if (drm_fd >=3D 0) { > > - if (SDL_KMSDRM_LoadSymbols()) { > > - drmModeRes *resources =3D KMSDRM_drmModeGetResources(drm_= fd); > > -@@ -65,6 +72,72 @@ KMSDRM_Available(void) > > - return available; > > - } > > -=20 > > -+static int get_dricount(void) > > -+{ > > -+ int devcount =3D 0; > > -+ struct dirent *res; > > -+ struct stat sb; > > -+ DIR *folder; > > -+ > > -+ if (!(stat(KMSDRM_DRI_PATH, &sb) =3D=3D 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) =3D=3D -1) { > > -+ printf("The path %s cannot be opened\n", > > -+ KMSDRM_DRI_PATH); > > -+ return 0; > > -+ } > > -+ > > -+ folder =3D opendir(KMSDRM_DRI_PATH); > > -+ if (!folder) > > -+ return 0; > > -+ > > -+ while ((res =3D readdir(folder))) { > > -+ if (res->d_type =3D=3D DT_CHR) > > -+ devcount++; > > -+ } > > -+ > > -+ closedir(folder); > > -+ > > -+ return devcount; > > -+} > > -+ > > -+static int > > -+get_driindex(void) > > -+{ > > -+ int i =3D 0; > > -+ int available =3D 0; > > -+ int devcount =3D get_dricount(); > > -+ > > -+ for (i =3D 0; i < devcount; i++) { > > -+ if (check_modestting(i)) { > > -+ available =3D 1; > > -+ break; > > -+ } > > -+ } > > -+ > > -+ if (available) > > -+ return i; > > -+ > > -+ return -ENOENT; > > -+} > > -+ > > -+static int > > -+KMSDRM_Available(void) > > -+{ > > -+ int ret =3D -ENOENT; > > -+ > > -+ ret =3D get_driindex(); > > -+ if (ret >=3D 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; > > -=20 > > -- if (devindex < 0 || devindex > 99) { > > -+ if (!devindex || devindex > 99) > > -+ devindex =3D get_driindex(); > > -+ > > -+ if (devindex < 0) { > > - SDL_SetError("devindex (%d) must be between 0 and 99.\n", dev= index); > > - return NULL; > > - } > > ---=20 > > -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.p= atch 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.pa= tch > > 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=3Dtrue= ; 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 =3D xyes -a x$enable_video_opengles =3D xy= es; then > > @@ -43,7 +43,7 @@ index 1c7e79338a88..06e37a1b7f98 100644 > > AC_MSG_CHECKING(for EGL support) > > video_opengl_egl=3Dno > > AC_TRY_COMPILE([ > > -@@ -2347,6 +2355,9 @@ CheckOpenGLESX11() > > +@@ -2361,6 +2369,9 @@ CheckOpenGLESX11() > > video_opengl_egl=3Dyes > > ]) > > AC_MSG_RESULT($video_opengl_egl) > > diff --git a/patches/SDL2-2.0.8/autogen.sh b/patches/SDL2-2.0.9/autogen= =2Esh > > 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-ope= ngl.patch b/patches/SDL2_test-2.0.9/0001-sdl-2.0.8-tests-configure-opengl.p= atch > > similarity index 100% > > rename from patches/SDL2_test-2.0.8/0001-sdl-2.0.8-tests-configure-open= gl.patch > > rename to patches/SDL2_test-2.0.9/0001-sdl-2.0.8-tests-configure-opengl= =2Epatch > > diff --git a/patches/SDL2_test-2.0.8/autogen.sh b/patches/SDL2_test-2.0= =2E9/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/s= eries > > 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) +=3D sdl2 > > # > > # Paths and names > > # > > -SDL2_VERSION :=3D 2.0.8 > > -SDL2_MD5 :=3D 3800d705cef742c6a634f202c37f263f > > +SDL2_VERSION :=3D 2.0.9 > > +SDL2_MD5 :=3D f2ecfba915c54f7200f504d8b48a5dfe > > SDL2 :=3D SDL2-$(SDL2_VERSION) > > SDL2_SUFFIX :=3D tar.gz > > SDL2_URL :=3D https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) > > --=20 > > 2.19.1 > >=20 > >=20 > > _______________________________________________ > > ptxdist mailing list > > ptxdist@pengutronix.de >=20 > --=20 > 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 | >=20 > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de --=20 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 | --uqkvusougdcqdll2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEElXvEUs6VPX6mDPT8C+njFXoeLGQFAlv7pAgACgkQC+njFXoe LGQmJg//QHqbZPTAdUJwt5Whpx5D3PEw/zVD/5KS+GiGkLMxpWZKyv9yd8dMgLiC eUfecaEpqtAiyvJDk3e8dHo01xGy/Lul9uyVG9WAGIXTJO2Dc5pElt9ipT5vLUge QXo0L3DN2ZbOKlmahxUJ4gZ0QOEz1Np8YSik5VXoNjtMN5MR8EHMsEvk355FfFf2 v8l5aZ8EEySmyLWBRl5pDxbQi6Jj9xs9YDWQgXbi67WytlM/kpuzOB8l9z7sPEQF OOLPtC5Q4IJAC8ZxvRT1TRF/9XqHGtTi5McjOq+NIPj1aqJvYcGbkxAFz8cS8xio zVADlFQ8QcUeiO9htJtwfg3lf7eXrvJLrjo2k+XAF4Ngvpn2/qp/CJgsF584LiQ2 9SGguEi1qGbI2cfa5OjI+ip42TIe51aQwcFOs4RdBxpKl7fjKpB+JRqo52pck46f CnAVbBDeNhVyVw0Gh+dVY9QzLAZfjNSKeM/ZJt7QRuXGWjLquvBMYGThOuEdxE4x LXCty7QKbkX26g4/ZkAHWNnC2RbDfLK53TPNrTKf4iQJlUeBx2CV6tQ/beEFFPOR eJ6rGw68UKof/83Z5UmBNhBnCy0NahvIbPhQ5PqXLCqGZj6ClJC1WJ9spEPvJI/z 4+uZMQmVhysMR21qjJtr5Y3WSztBAH9/A+FJ84QvAUMnuZicDSg= =UhFn -----END PGP SIGNATURE----- --uqkvusougdcqdll2-- --===============1396424799== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KcHR4ZGlzdCBt YWlsaW5nIGxpc3QKcHR4ZGlzdEBwZW5ndXRyb25peC5kZQ== --===============1396424799==--