Re: [ptxdist] [PATCH v4 1/6] sdl2: add new package

2018-07-18 Thread Michael Olbrich 
On Tue, Jul 17, 2018 at 03:37:27PM +0200, Michael Grzeschik wrote:
> Signed-off-by: Michael Grzeschik 
> ---
> v1 -> v2: - added select to MESALIB_GL* on SDL2_OPENGL*
>   - padded prompt entry with extra spaces
> v2 -> v3: - added patch to add egl cflags on configure.in and enabled 
> autogen.sh
> v3 -> v4: - improved egl check with PKG_CHECK_MODULES
>   - removed extract stage and added custom autogen.sh
> 
>  ...001-sdl-2.0.8-add-egl-cflags-to-test.patch |  55 +
>  patches/SDL2-2.0.8/autogen.sh |   3 +
>  patches/SDL2-2.0.8/series |   4 +
>  rules/sdl2.in | 206 ++
>  rules/sdl2.make   | 153 +
>  5 files changed, 421 insertions(+)
>  create mode 100644 
> patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
>  create mode 100755 patches/SDL2-2.0.8/autogen.sh
>  create mode 100644 patches/SDL2-2.0.8/series
>  create mode 100644 rules/sdl2.in
>  create mode 100644 rules/sdl2.make
> 
> diff --git a/patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch 
> b/patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> new file mode 100644
> index 0..c86d48e5a
> --- /dev/null
> +++ b/patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> @@ -0,0 +1,55 @@
> +From: Sergey Zhuravlevich 
> +Date: Mon, 16 Jul 2018 12:03:42 +0200
> +Subject: [PATCH] sdl-2.0.8: add egl-cflags to test
> +
> +- also call aclocal to expand PKG_CHECK_MODULES
> +
> +Signed-off-by: Sergey Zhuravlevich 
> +Signed-off-by: Michael Grzeschik 
> +---
> + autogen.sh   |  2 +-
> + configure.in | 11 +++
> + 2 files changed, 12 insertions(+), 1 deletion(-)
> +
> +diff --git a/autogen.sh b/autogen.sh
> +index 9edfb8a7d913..2f1e2ef3d419 100755
> +--- a/autogen.sh
>  b/autogen.sh
> +@@ -8,7 +8,7 @@ test -z "$srcdir" && srcdir=.
> + cd "$srcdir"
> + 
> + # Regenerate configuration files
> +-cat acinclude/* >aclocal.m4
> ++aclocal
> + found=false
> + 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
> +--- a/configure.in
>  b/configure.in
> +@@ -2335,6 +2335,14 @@ dnl Find OpenGL ES
> + CheckOpenGLESX11()
> + {
> + if test x$enable_video = xyes -a x$enable_video_opengles = xyes; then
> ++PKG_CHECK_MODULES(EGL, [egl], [have_egl="yes"], [have_egl="no"])
> ++
> ++save_CFLAGS="$CFLAGS"
> ++if test x$have_egl = xyes; then
> ++  CFLAGS="$save_CFLAGS $EGL_CFLAGS"
> ++  EXTRA_CFLAGS="$EXTRA_CFLAGS $EGL_CFLAGS"
> ++fi
> ++
> + AC_MSG_CHECKING(for EGL support)
> + video_opengl_egl=no
> + AC_TRY_COMPILE([
> +@@ -2347,6 +2355,9 @@ CheckOpenGLESX11()
> + video_opengl_egl=yes
> + ])
> + AC_MSG_RESULT($video_opengl_egl)
> ++
> ++CFLAGS="$save_CFLAGS"
> ++
> + if test x$video_opengl_egl = xyes; then
> + AC_DEFINE(SDL_VIDEO_OPENGL_EGL, 1, [ ])
> + fi
> diff --git a/patches/SDL2-2.0.8/autogen.sh b/patches/SDL2-2.0.8/autogen.sh
> new file mode 100755
> index 0..a430a4eb7
> --- /dev/null
> +++ b/patches/SDL2-2.0.8/autogen.sh
> @@ -0,0 +1,3 @@
> +#!/bin/sh
> +
> +./autogen.sh
> diff --git a/patches/SDL2-2.0.8/series b/patches/SDL2-2.0.8/series
> new file mode 100644
> index 0..3693c2785
> --- /dev/null
> +++ b/patches/SDL2-2.0.8/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/rules/sdl2.in b/rules/sdl2.in
> new file mode 100644
> index 0..54edea6ab
> --- /dev/null
> +++ b/rules/sdl2.in
> @@ -0,0 +1,206 @@
> +## SECTION=multimedia_sdl
> +
> +menuconfig SDL2
> + tristate
> + prompt "SDL2  "
> + select LIBC_M
> + select LIBC_DL
> + select LIBC_PTHREAD
> + select GCCLIBS_GCC_S
> + select LIBUNWIND
> + select CROSS_NASM   if SDL2_VIDEO
> + select ALSA_LIB if SDL2_ALSA
> + select XORG_LIB_X11 if SDL2_XORG
> + select XORG_LIB_XT  if SDL2_XORG
> + select XORG_LIB_XVMCif SDL2_XORG && SDL2_VIDEO
> + select DIRECTFB if SDL2_DIRECTFB
> + select TSLIBif SDL2_TSLIB
> + select DBUS if SDL2_DBUS
> + select LIBDRM   if SDL2_WAYLAND
> + select MESALIB_GLX  if SDL2_OPENGL
> + select MESALIB_GLES1if SDL2_OPENGLES1
> + select MESALIB_GLES2if SDL2_OPENGLES2
> + select MESALIB  if SDL2_WAYLAND
> + select MESALIB_GBM  if SDL2_WAYLAND
> + select MESALIB_EGL  if SDL2_WAYLAND
> + select MESAL

[ptxdist] [PATCH v4 1/6] sdl2: add new package

2018-07-17 Thread Michael Grzeschik 
Signed-off-by: Michael Grzeschik 
---
v1 -> v2: - added select to MESALIB_GL* on SDL2_OPENGL*
  - padded prompt entry with extra spaces
v2 -> v3: - added patch to add egl cflags on configure.in and enabled autogen.sh
v3 -> v4: - improved egl check with PKG_CHECK_MODULES
  - removed extract stage and added custom autogen.sh

 ...001-sdl-2.0.8-add-egl-cflags-to-test.patch |  55 +
 patches/SDL2-2.0.8/autogen.sh |   3 +
 patches/SDL2-2.0.8/series |   4 +
 rules/sdl2.in | 206 ++
 rules/sdl2.make   | 153 +
 5 files changed, 421 insertions(+)
 create mode 100644 
patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
 create mode 100755 patches/SDL2-2.0.8/autogen.sh
 create mode 100644 patches/SDL2-2.0.8/series
 create mode 100644 rules/sdl2.in
 create mode 100644 rules/sdl2.make

diff --git a/patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch 
b/patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
new file mode 100644
index 0..c86d48e5a
--- /dev/null
+++ b/patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
@@ -0,0 +1,55 @@
+From: Sergey Zhuravlevich 
+Date: Mon, 16 Jul 2018 12:03:42 +0200
+Subject: [PATCH] sdl-2.0.8: add egl-cflags to test
+
+- also call aclocal to expand PKG_CHECK_MODULES
+
+Signed-off-by: Sergey Zhuravlevich 
+Signed-off-by: Michael Grzeschik 
+---
+ autogen.sh   |  2 +-
+ configure.in | 11 +++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 9edfb8a7d913..2f1e2ef3d419 100755
+--- a/autogen.sh
 b/autogen.sh
+@@ -8,7 +8,7 @@ test -z "$srcdir" && srcdir=.
+ cd "$srcdir"
+ 
+ # Regenerate configuration files
+-cat acinclude/* >aclocal.m4
++aclocal
+ found=false
+ 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
+--- a/configure.in
 b/configure.in
+@@ -2335,6 +2335,14 @@ dnl Find OpenGL ES
+ CheckOpenGLESX11()
+ {
+ if test x$enable_video = xyes -a x$enable_video_opengles = xyes; then
++PKG_CHECK_MODULES(EGL, [egl], [have_egl="yes"], [have_egl="no"])
++
++save_CFLAGS="$CFLAGS"
++if test x$have_egl = xyes; then
++  CFLAGS="$save_CFLAGS $EGL_CFLAGS"
++  EXTRA_CFLAGS="$EXTRA_CFLAGS $EGL_CFLAGS"
++fi
++
+ AC_MSG_CHECKING(for EGL support)
+ video_opengl_egl=no
+ AC_TRY_COMPILE([
+@@ -2347,6 +2355,9 @@ CheckOpenGLESX11()
+ video_opengl_egl=yes
+ ])
+ AC_MSG_RESULT($video_opengl_egl)
++
++CFLAGS="$save_CFLAGS"
++
+ if test x$video_opengl_egl = xyes; then
+ AC_DEFINE(SDL_VIDEO_OPENGL_EGL, 1, [ ])
+ fi
diff --git a/patches/SDL2-2.0.8/autogen.sh b/patches/SDL2-2.0.8/autogen.sh
new file mode 100755
index 0..a430a4eb7
--- /dev/null
+++ b/patches/SDL2-2.0.8/autogen.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./autogen.sh
diff --git a/patches/SDL2-2.0.8/series b/patches/SDL2-2.0.8/series
new file mode 100644
index 0..3693c2785
--- /dev/null
+++ b/patches/SDL2-2.0.8/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/rules/sdl2.in b/rules/sdl2.in
new file mode 100644
index 0..54edea6ab
--- /dev/null
+++ b/rules/sdl2.in
@@ -0,0 +1,206 @@
+## SECTION=multimedia_sdl
+
+menuconfig SDL2
+   tristate
+   prompt "SDL2  "
+   select LIBC_M
+   select LIBC_DL
+   select LIBC_PTHREAD
+   select GCCLIBS_GCC_S
+   select LIBUNWIND
+   select CROSS_NASM   if SDL2_VIDEO
+   select ALSA_LIB if SDL2_ALSA
+   select XORG_LIB_X11 if SDL2_XORG
+   select XORG_LIB_XT  if SDL2_XORG
+   select XORG_LIB_XVMCif SDL2_XORG && SDL2_VIDEO
+   select DIRECTFB if SDL2_DIRECTFB
+   select TSLIBif SDL2_TSLIB
+   select DBUS if SDL2_DBUS
+   select LIBDRM   if SDL2_WAYLAND
+   select MESALIB_GLX  if SDL2_OPENGL
+   select MESALIB_GLES1if SDL2_OPENGLES1
+   select MESALIB_GLES2if SDL2_OPENGLES2
+   select MESALIB  if SDL2_WAYLAND
+   select MESALIB_GBM  if SDL2_WAYLAND
+   select MESALIB_EGL  if SDL2_WAYLAND
+   select MESALIB_EGL_DRM  if SDL2_WAYLAND
+   select MESALIB_EGL_WAYLAND  if SDL2_WAYLAND
+   select LIBXKBCOMMON if SDL2_WAYLAND
+   select UDEV if SDL2_UDEV
+   select UDEV_LIBUDEV if SDL2_UDEV
+   select PULSEAUDIO   i