[Buildroot] [PATCH 1/8] package/mesa3d-demos: bump version to 8.3.0

[Buildroot] [PATCH 1/8] package/mesa3d-demos: bump version to 8.3.0

[Bernd Kuhls]

Currently buildroot lacks glut support so add configure options to
disable glut support, also disable osmesa support because it also
depends on glut.

Re-numbered and rebased 0001-demos-optional-gl.patch

Removed patches:
- 0001-demos-non-mesa-impl.patch
All files related to this patch have been removed upstream:
http://cgit.freedesktop.org/mesa/demos/commit/?id=74443c6ee79f3251f643ea05e94df58183e37d0d

- 0003-demos-x11-fix.patch
Applied upstream:
http://cgit.freedesktop.org/mesa/demos/commit/?id=6f7ad3f242943242021d1c42c6ed6933b76137fd

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../mesa3d-demos/0001-demos-non-mesa-impl.patch    | 244 ---------------------
 ...ional-gl.patch => 0001-demos-optional-gl.patch} |  22 +-
 package/mesa3d-demos/0003-demos-x11-fix.patch      |  30 ---
 package/mesa3d-demos/mesa3d-demos.hash             |   4 +-
 package/mesa3d-demos/mesa3d-demos.mk               |   4 +-
 5 files changed, 17 insertions(+), 287 deletions(-)
 delete mode 100644 package/mesa3d-demos/0001-demos-non-mesa-impl.patch
 rename package/mesa3d-demos/{0002-demos-optional-gl.patch => 0001-demos-optional-gl.patch} (81%)
 delete mode 100644 package/mesa3d-demos/0003-demos-x11-fix.patch

diff --git a/package/mesa3d-demos/0001-demos-non-mesa-impl.patch b/package/mesa3d-demos/0001-demos-non-mesa-impl.patch
deleted file mode 100644
index d370929..0000000
--- a/package/mesa3d-demos/0001-demos-non-mesa-impl.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-This makes it possible to build the demos against opengl
-implementations other than Mesa 
-
-Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
----
-Index: mesa3d-demos-8.1.0/src/egl/eglut/eglut.c
-===================================================================
---- mesa3d-demos-8.1.0.orig/src/egl/eglut/eglut.c
-+++ mesa3d-demos-8.1.0/src/egl/eglut/eglut.c
-@@ -76,8 +76,9 @@ _eglutNow(void)
- static void
- _eglutDestroyWindow(struct eglut_window *win)
- {
--   if (_eglut->surface_type != EGL_PBUFFER_BIT &&
--       _eglut->surface_type != EGL_SCREEN_BIT_MESA)
-+
-+   if (_eglut->surface_type == EGL_WINDOW_BIT ||
-+       _eglut->surface_type == EGL_PIXMAP_BIT)
-       eglDestroySurface(_eglut->dpy, win->surface);
- 
-    _eglutNativeFiniWindow(win);
-@@ -175,7 +176,9 @@ _eglutCreateWindow(const char *title, in
-             win->config, win->native.u.pixmap, NULL);
-       break;
-    case EGL_PBUFFER_BIT:
-+#ifdef EGL_MESA_screen_surface
-    case EGL_SCREEN_BIT_MESA:
-+#endif
-       win->surface = win->native.u.surface;
-       break;
-    default:
-@@ -289,8 +292,10 @@ eglutDestroyWindow(int win)
-    if (window->index != win)
-       return;
- 
-+#ifdef EGL_MESA_screen_surface
-    /* XXX it causes some bug in st/egl KMS backend */
-    if ( _eglut->surface_type != EGL_SCREEN_BIT_MESA)
-+#endif
-       eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
- 
-    _eglutDestroyWindow(_eglut->current);
-Index: mesa3d-demos-8.1.0/src/egl/eglut/eglut_screen.c
-===================================================================
---- mesa3d-demos-8.1.0.orig/src/egl/eglut/eglut_screen.c
-+++ mesa3d-demos-8.1.0/src/egl/eglut/eglut_screen.c
-@@ -35,26 +35,33 @@
- 
- #define MAX_MODES 100
- 
-+#ifdef EGL_MESA_screen_surface
- static EGLScreenMESA kms_screen;
- static EGLModeMESA kms_mode;
- static EGLint kms_width, kms_height;
-+#endif
- 
- void
- _eglutNativeInitDisplay(void)
- {
-+#ifdef EGL_MESA_screen_surface
-    _eglut->native_dpy = EGL_DEFAULT_DISPLAY;
-    _eglut->surface_type = EGL_SCREEN_BIT_MESA;
-+#endif
- }
- 
- void
- _eglutNativeFiniDisplay(void)
- {
-+#ifdef EGL_MESA_screen_surface
-    kms_screen = 0;
-    kms_mode = 0;
-    kms_width = 0;
-    kms_height = 0;
-+#endif
- }
- 
-+#ifdef EGL_MESA_screen_surface
- static void
- init_kms(void)
- {
-@@ -94,19 +101,23 @@ init_kms(void)
-    kms_width = width;
-    kms_height = height;
- }
-+#endif
- 
- void
- _eglutNativeInitWindow(struct eglut_window *win, const char *title,
-                        int x, int y, int w, int h)
- {
-+#ifdef EGL_MESA_screen_surface
-    EGLint surf_attribs[16];
-    EGLint i;
-+#endif
-    const char *exts;
- 
-    exts = eglQueryString(_eglut->dpy, EGL_EXTENSIONS);
-    if (!exts || !strstr(exts, "EGL_MESA_screen_surface"))
-       _eglutFatal("EGL_MESA_screen_surface is not supported\n");
- 
-+#ifdef EGL_MESA_screen_surface
-    init_kms();
- 
-    i = 0;
-@@ -128,14 +139,17 @@ _eglutNativeInitWindow(struct eglut_wind
- 
-    win->native.width = kms_width;
-    win->native.height = kms_height;
-+#endif
- }
- 
- void
- _eglutNativeFiniWindow(struct eglut_window *win)
- {
-+#ifdef EGL_MESA_screen_surface
-    eglShowScreenSurfaceMESA(_eglut->dpy,
-          kms_screen, EGL_NO_SURFACE, 0);
-    eglDestroySurface(_eglut->dpy, win->native.u.surface);
-+#endif
- }
- 
- void
-Index: mesa3d-demos-8.1.0/src/egl/opengl/demo1.c
-===================================================================
---- mesa3d-demos-8.1.0.orig/src/egl/opengl/demo1.c
-+++ mesa3d-demos-8.1.0/src/egl/opengl/demo1.c
-@@ -18,6 +18,7 @@
- static void
- TestScreens(EGLDisplay dpy)
- {
-+#ifdef EGL_MESA_screen_surface
- #define MAX 8
-    EGLScreenMESA screens[MAX];
-    EGLint numScreens;
-@@ -28,6 +29,7 @@ TestScreens(EGLDisplay dpy)
-    for (i = 0; i < numScreens; i++) {
-       printf(" Screen %d handle: %d\n", i, (int) screens[i]);
-    }
-+#endif
- }
- 
- /**
-Index: mesa3d-demos-8.1.0/src/egl/opengl/demo2.c
-===================================================================
---- mesa3d-demos-8.1.0.orig/src/egl/opengl/demo2.c
-+++ mesa3d-demos-8.1.0/src/egl/opengl/demo2.c
-@@ -16,6 +16,7 @@
- 
- /*#define FRONTBUFFER*/
- 
-+#ifdef EGL_MESA_screen_surface
- static void _subset_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2,
-                           GLfloat r, GLfloat g, GLfloat b)
- {
-@@ -95,12 +96,13 @@ TestScreens(EGLDisplay dpy)
-       printf(" Screen %d handle: %d\n", i, (int) screens[i]);
-    }
- }
--
-+#endif
- 
- int
- main(int argc, char *argv[])
- {
-    int maj, min;
-+#ifdef EGL_MESA_screen_surface
-    EGLContext ctx;
-    EGLSurface pbuffer, screen_surf;
-    EGLConfig configs[10];
-@@ -115,6 +117,7 @@ main(int argc, char *argv[])
-    EGLModeMESA mode;
-    EGLScreenMESA screen;
-    EGLint count;
-+#endif
- 
-    EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    assert(d);
-@@ -132,6 +135,7 @@ main(int argc, char *argv[])
-       exit(1);
-    }
- 
-+#ifdef EGL_MESA_screen_surface
-    eglGetConfigs(d, configs, 10, &numConfigs);
-    printf("Got %d EGL configs:\n", numConfigs);
-    for (i = 0; i < numConfigs; i++) {
-@@ -211,6 +215,7 @@ main(int argc, char *argv[])
-    eglDestroySurface(d, pbuffer);
-    eglDestroyContext(d, ctx);
-    eglTerminate(d);
-+#endif
- 
-    return 0;
- }
-Index: mesa3d-demos-8.1.0/src/egl/opengl/demo3.c
-===================================================================
---- mesa3d-demos-8.1.0.orig/src/egl/opengl/demo3.c
-+++ mesa3d-demos-8.1.0/src/egl/opengl/demo3.c
-@@ -46,7 +46,7 @@ GLubyte OpenGL_bits[] = {
-    0x3e, 0x00, 0x00, 0xf8, 0x0c, 0x00, 
- };
- 
--
-+#ifdef EGL_MESA_screen_surface
- static void Init(void)
- {
- 
-@@ -551,11 +551,13 @@ write_ppm(const char *filename, const GL
-       fclose(f);
-    }
- }
-+#endif
- 
- int
- main(int argc, char *argv[])
- {
-    int maj, min;
-+#ifdef EGL_MESA_screen_surface
-    EGLContext ctx;
-    EGLSurface screen_surf;
-    EGLConfig configs[10];
-@@ -566,6 +568,7 @@ main(int argc, char *argv[])
-    const GLubyte *bitmap;
-    EGLint screenAttribs[32];
-    EGLint i;
-+#endif
- 
-    EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    assert(d);
-@@ -583,6 +586,7 @@ main(int argc, char *argv[])
-       exit(1);
-    }
- 
-+#ifdef EGL_MESA_screen_surface
-    eglGetConfigs(d, configs, 10, &numConfigs);
-    eglGetScreensMESA(d, &screen, 1, &count);
-    eglGetModesMESA(d, screen, &mode, 1, &count);
-@@ -642,6 +646,7 @@ main(int argc, char *argv[])
-    eglDestroySurface(d, screen_surf);
-    eglDestroyContext(d, ctx);
-    eglTerminate(d);
-+#endif
- 
-    return 0;
- }
diff --git a/package/mesa3d-demos/0002-demos-optional-gl.patch b/package/mesa3d-demos/0001-demos-optional-gl.patch
similarity index 81%
rename from package/mesa3d-demos/0002-demos-optional-gl.patch
rename to package/mesa3d-demos/0001-demos-optional-gl.patch
index b198531..0415bbc 100644
--- a/package/mesa3d-demos/0002-demos-optional-gl.patch
+++ b/package/mesa3d-demos/0001-demos-optional-gl.patch
@@ -6,7 +6,7 @@ Index: mesa3d-demos-8.1.0/configure.ac
 ===================================================================
 --- mesa3d-demos-8.1.0.orig/configure.ac
 +++ mesa3d-demos-8.1.0/configure.ac
-@@ -51,6 +51,14 @@ m4_ifndef([PKG_PROG_PKG_CONFIG],
+@@ -51,6 +51,14 @@
    ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])
  PKG_PROG_PKG_CONFIG()
  
@@ -21,7 +21,7 @@ Index: mesa3d-demos-8.1.0/configure.ac
  dnl Get the pkg-config definitions for libGL.  We include a fallback
  dnl path for GL implementation that don't provide a .pc file
  PKG_CHECK_MODULES(GL, [gl], [], [
-@@ -103,6 +111,8 @@ PKG_CHECK_MODULES(GLU, [glu], [],
+@@ -113,6 +121,8 @@
  DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS"
  DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
  
@@ -29,8 +29,8 @@ Index: mesa3d-demos-8.1.0/configure.ac
 +
  AC_ARG_ENABLE([egl],
      [AS_HELP_STRING([--enable-egl],
-         [enable EGL library @<:@default=no@:>@])],
-@@ -287,7 +297,7 @@ AC_SUBST([MESA_GLAPI])
+         [enable EGL library @<:@default=auto@:>@])],
+@@ -303,7 +313,7 @@
  AC_SUBST([WAYLAND_CFLAGS])
  AC_SUBST([WAYLAND_LIBS])
  
@@ -43,22 +43,21 @@ Index: mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am
 ===================================================================
 --- mesa3d-demos-8.1.0.orig/src/egl/opengl/Makefile.am
 +++ mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am
-@@ -50,6 +50,7 @@ endif
+@@ -50,12 +50,14 @@
  endif
  
  if HAVE_EGL
 +if HAVE_GL
  noinst_PROGRAMS = \
- 	demo1 \
- 	demo2 \
-@@ -61,6 +62,7 @@ noinst_PROGRAMS = \
+ 	eglinfo \
+ 	peglgears \
  	$(EGL_DRM_DEMOS) \
  	$(EGL_X11_DEMOS)
  endif
 +endif
  
- egltri_screen_SOURCES = egltri.c
- eglgears_screen_SOURCES = eglgears.c
+ egltri_x11_SOURCES = egltri.c
+ eglgears_x11_SOURCES = eglgears.c
 Index: mesa3d-demos-8.1.0/src/util/Makefile.am
 ===================================================================
 --- mesa3d-demos-8.1.0.orig/src/util/Makefile.am
@@ -73,3 +72,6 @@ Index: mesa3d-demos-8.1.0/src/util/Makefile.am
  
  if HAVE_GLUT
  AM_CFLAGS += \
+diff -uNr mesa-demos-8.3.0.org/configure.ac mesa-demos-8.3.0/configure.ac
+--- mesa-demos-8.3.0.org/configure.ac	2015-12-09 22:06:44.000000000 +0100
++++ mesa-demos-8.3.0/configure.ac	2015-12-12 17:06:10.484295811 +0100
diff --git a/package/mesa3d-demos/0003-demos-x11-fix.patch b/package/mesa3d-demos/0003-demos-x11-fix.patch
deleted file mode 100644
index f6b3b0c..0000000
--- a/package/mesa3d-demos/0003-demos-x11-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This patch ensures that programs which depend on x11 are not build if x11
-is not available.
-
-Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
----
-Index: mesa3d-demos-8.1.0/src/egl/opengles2/Makefile.am
-===================================================================
---- mesa3d-demos-8.1.0.orig/src/egl/opengles2/Makefile.am
-+++ mesa3d-demos-8.1.0/src/egl/opengles2/Makefile.am
-@@ -35,9 +35,10 @@ AM_LDFLAGS = \
- 
- if HAVE_EGL
- if HAVE_GLESV2
--bin_PROGRAMS = \
-+bin_PROGRAMS = es2gears_screen
-+if HAVE_X11
-+bin_PROGRAMS += \
- 	es2_info \
--	es2gears_screen \
- 	es2gears_x11 \
- 	es2tri
- if HAVE_WAYLAND
-@@ -45,6 +46,7 @@ bin_PROGRAMS += es2gears_wayland
- endif
- endif
- endif
-+endif
- 
- es2_info_LDADD = $(X11_LIBS)
- es2tri_LDADD = $(X11_LIBS)
diff --git a/package/mesa3d-demos/mesa3d-demos.hash b/package/mesa3d-demos/mesa3d-demos.hash
index 17db1b0..a50a3a1 100644
--- a/package/mesa3d-demos/mesa3d-demos.hash
+++ b/package/mesa3d-demos/mesa3d-demos.hash
@@ -1,2 +1,2 @@
-# Locally calculated after checking pgp signature
-sha256	e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92	mesa-demos-8.2.0.tar.bz2
+# From http://lists.freedesktop.org/archives/mesa-announce/2015-December/000191.html
+sha256	c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef	mesa-demos-8.3.0.tar.bz2
diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk
index 2db7f56..c0f889a 100644
--- a/package/mesa3d-demos/mesa3d-demos.mk
+++ b/package/mesa3d-demos/mesa3d-demos.mk
@@ -4,13 +4,15 @@
 #
 ################################################################################
 
-MESA3D_DEMOS_VERSION = 8.2.0
+MESA3D_DEMOS_VERSION = 8.3.0
 MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2
 MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos/$(MESA3D_DEMOS_VERSION)
 MESA3D_DEMOS_AUTORECONF = YES
 MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
 MESA3D_DEMOS_LICENSE = MIT
 
+MESA3D_DEMOS_CONF_OPTS += --without-glut --disable-osmesa
+
 ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)
 MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext
 MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11
-- 
2.6.2

[Buildroot] [PATCH 2/8] package/tvheadend: bump version

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/tvheadend/tvheadend.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 60ca524..8177057 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = 8902dcbcc48b6a76168882a856111237f13e60ea
+TVHEADEND_VERSION = 676a34f24b182928770cef5d4ba2903a6a25323d
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md
-- 
2.6.2

[Buildroot] [PATCH 3/8] package/znc: bump version to 1.6.2

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/znc/znc.hash | 2 +-
 package/znc/znc.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/znc/znc.hash b/package/znc/znc.hash
index 9d2b4a2..a0b27aa 100644
--- a/package/znc/znc.hash
+++ b/package/znc/znc.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	ba49397364f48d6d32ae5242bc1166f21d972f85dd390d6bbe68a63ecbb6c140	znc-1.6.1.tar.gz
+sha256	eef17727c0c6433fed1affba0ea76ec7fd60198d2f3c234d8529bd5fb26f0593	znc-1.6.2.tar.gz
diff --git a/package/znc/znc.mk b/package/znc/znc.mk
index 106be2d..0844b0f 100644
--- a/package/znc/znc.mk
+++ b/package/znc/znc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZNC_VERSION = 1.6.1
+ZNC_VERSION = 1.6.2
 ZNC_SITE = http://znc.in/releases
 ZNC_LICENSE = Apache-2.0
 ZNC_LICENSE_FILES = LICENSE
-- 
2.6.2

[Buildroot] [PATCH 4/8] package/{mesa3d, mesa3d-headers}: bump version to 11.0.7

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mesa3d-headers/mesa3d-headers.mk | 2 +-
 package/mesa3d/mesa3d.hash               | 4 ++--
 package/mesa3d/mesa3d.mk                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index 6db845d..03b596f 100644
--- a/package/mesa3d-headers/mesa3d-headers.mk
+++ b/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,7 +12,7 @@ endif
 
 # Not possible to directly refer to mesa3d variables, because of
 # first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 11.0.6
+MESA3D_HEADERS_VERSION = 11.0.7
 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
 MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION)
 MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos
diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index 6eaa5d6..22ee25b 100644
--- a/package/mesa3d/mesa3d.hash
+++ b/package/mesa3d/mesa3d.hash
@@ -1,2 +1,2 @@
-# From http://lists.freedesktop.org/archives/mesa-announce/2015-November/000184.html
-sha256	8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760	mesa-11.0.6.tar.xz
+# From http://lists.freedesktop.org/archives/mesa-announce/2015-November/000190.html
+sha256	e7e90a332ede6c8fd08eff90786a3fd1605a4e62ebf3a9b514047838194538cb	mesa-11.0.7.tar.xz
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 457babc..a082216 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 11.0.6
+MESA3D_VERSION = 11.0.7
 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
 MESA3D_LICENSE = MIT, SGI, Khronos
-- 
2.6.2

[Buildroot] [PATCH 5/8] package/dovecot-pigeonhole: bum version to 0.4.10.rc2

[Bernd Kuhls]

Needed for Dovecot 2.2.21

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +-
 package/dovecot-pigeonhole/dovecot-pigeonhole.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
index 1371492..58f4196 100644
--- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
+++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	82892f876d26008a076973dfddf1cffaf5a0451825fd44e06287e94b89078649	dovecot-2.2-pigeonhole-0.4.9.tar.gz
+sha256	7fd01d731b264703fb6d965400f8e3e660841cd51cf7cec1fd648c1326fe0b77	dovecot-2.2-pigeonhole-0.4.10.rc2.tar.gz
diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
index 06ff2f1..e65a2a9 100644
--- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
+++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-DOVECOT_PIGEONHOLE_VERSION = 0.4.9
+DOVECOT_PIGEONHOLE_VERSION = 0.4.10.rc2
 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
-DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2
+DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2/rc
 DOVECOT_PIGEONHOLE_LICENSE = LGPLv2.1
 DOVECOT_PIGEONHOLE_LICENSE_FILES = COPYING
 DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot
-- 
2.6.2

[Buildroot] [PATCH 6/8] package/dovecot: bump version to 2.2.21

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/dovecot/dovecot.hash | 2 +-
 package/dovecot/dovecot.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash
index 9386df0..42a187a 100644
--- a/package/dovecot/dovecot.hash
+++ b/package/dovecot/dovecot.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f  dovecot-2.2.19.tar.gz
+sha256	7ab7139e59e1f0353bf9c24251f13c893cf1a6ef4bcc47e2d44de437108d0b20	dovecot-2.2.21.tar.gz
diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk
index 69f722f..8451e52 100644
--- a/package/dovecot/dovecot.mk
+++ b/package/dovecot/dovecot.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 DOVECOT_VERSION_MAJOR = 2.2
-DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).19
+DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).21
 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
 DOVECOT_INSTALL_STAGING = YES
 DOVECOT_LICENSE = LGPLv2.1
-- 
2.6.2

[Buildroot] [PATCH 7/8] package/libfreeglut: new package

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/Config.in                    |  1 +
 package/libfreeglut/Config.in        | 19 +++++++++++++++++++
 package/libfreeglut/libfreeglut.hash |  2 ++
 package/libfreeglut/libfreeglut.mk   | 17 +++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 package/libfreeglut/Config.in
 create mode 100644 package/libfreeglut/libfreeglut.hash
 create mode 100644 package/libfreeglut/libfreeglut.mk

diff --git a/package/Config.in b/package/Config.in
index 4ebc964..3b0e989 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -831,6 +831,7 @@ menu "Graphics"
 	source "package/libevas-generic-loaders/Config.in"
 	source "package/libfm/Config.in"
 	source "package/libfm-extra/Config.in"
+	source "package/libfreeglut/Config.in"
 	source "package/libfreeimage/Config.in"
 	source "package/libgail/Config.in"
 	source "package/libgeotiff/Config.in"
diff --git a/package/libfreeglut/Config.in b/package/libfreeglut/Config.in
new file mode 100644
index 0000000..e67fdae
--- /dev/null
+++ b/package/libfreeglut/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_LIBFREEGLUT
+	bool "libfreeglut"
+	select BR2_PACKAGE_LIBGLU
+	select BR2_PACKAGE_XLIB_LIBXI
+	select BR2_PACKAGE_XLIB_LIBXRANDR
+	depends on BR2_PACKAGE_HAS_LIBGL
+	depends on BR2_PACKAGE_XORG7
+	help
+	  FreeGLUT is a free-software/open-source alternative to the
+	  OpenGL Utility Toolkit (GLUT) library. GLUT (and hence
+	  FreeGLUT) takes care of all the system-specific chores required
+	  for creating windows, initializing OpenGL contexts, and
+	  handling input events, to allow for trully portable OpenGL
+	  programs.
+
+	  http://freeglut.sourceforge.net
+
+comment "libfreeglut depends on X.org and needs an OpenGL backend"
+	depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash
new file mode 100644
index 0000000..a69a0b4
--- /dev/null
+++ b/package/libfreeglut/libfreeglut.hash
@@ -0,0 +1,2 @@
+# From http://sourceforge.net/projects/freeglut/files/freeglut/3.0.0/
+sha1	fca52242f9344627a30f11487ee42002e6b0dacd	freeglut-3.0.0.tar.gz
diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk
new file mode 100644
index 0000000..893afba
--- /dev/null
+++ b/package/libfreeglut/libfreeglut.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# libfreeglut
+#
+################################################################################
+
+LIBFREEGLUT_VERSION = 3.0.0
+LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz
+LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut
+LIBFREEGLUT_LICENSE = MIT
+LIBFREEGLUT_LICENSE_FILES = COPYING
+LIBFREEGLUT_INSTALL_STAGING = YES
+LIBFREEGLUT_DEPENDENCIES = libgl libglu xlib_libXi xlib_libXrandr
+
+LIBFREEGLUT_CONF_OPTS += -DFREEGLUT_BUILD_DEMOS=OFF
+
+$(eval $(cmake-package))
-- 
2.6.2

[Buildroot] [PATCH 8/8] package/mesa3d-demos: add glut support

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mesa3d-demos/mesa3d-demos.mk | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk
index c0f889a..016095b 100644
--- a/package/mesa3d-demos/mesa3d-demos.mk
+++ b/package/mesa3d-demos/mesa3d-demos.mk
@@ -11,8 +11,6 @@ MESA3D_DEMOS_AUTORECONF = YES
 MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
 MESA3D_DEMOS_LICENSE = MIT
 
-MESA3D_DEMOS_CONF_OPTS += --without-glut --disable-osmesa
-
 ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)
 MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext
 MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11
@@ -55,6 +53,19 @@ else
 MESA3D_DEMOS_CONF_OPTS += --disable-freetype2
 endif
 
+ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y)
+MESA3D_DEMOS_DEPENDENCIES += libfreeglut
+MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr
+# osmesa support depends on glut
+ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y)
+MESA3D_DEMOS_CONF_OPTS += --enable-osmesa
+else
+MESA3D_DEMOS_CONF_OPTS += --disable-osmesa
+endif
+else
+MESA3D_DEMOS_CONF_OPTS += --without-glut --disable-osmesa
+endif
+
 ifeq ($(BR2_PACKAGE_WAYLAND),y)
 MESA3D_DEMOS_DEPENDENCIES += wayland
 MESA3D_DEMOS_CONF_OPTS += --enable-wayland
-- 
2.6.2

[Buildroot] [PATCH 1/8] package/mesa3d-demos: bump version to 8.3.0

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 12 Dec 2015 19:31:36 +0100, Bernd Kuhls wrote:
> Currently buildroot lacks glut support so add configure options to
> disable glut support, also disable osmesa support because it also
> depends on glut.
> 
> Re-numbered and rebased 0001-demos-optional-gl.patch
> 
> Removed patches:
> - 0001-demos-non-mesa-impl.patch
> All files related to this patch have been removed upstream:
> http://cgit.freedesktop.org/mesa/demos/commit/?id=74443c6ee79f3251f643ea05e94df58183e37d0d
> 
> - 0003-demos-x11-fix.patch
> Applied upstream:
> http://cgit.freedesktop.org/mesa/demos/commit/?id=6f7ad3f242943242021d1c42c6ed6933b76137fd
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  .../mesa3d-demos/0001-demos-non-mesa-impl.patch    | 244 ---------------------
>  ...ional-gl.patch => 0001-demos-optional-gl.patch} |  22 +-
>  package/mesa3d-demos/0003-demos-x11-fix.patch      |  30 ---
>  package/mesa3d-demos/mesa3d-demos.hash             |   4 +-
>  package/mesa3d-demos/mesa3d-demos.mk               |   4 +-
>  5 files changed, 17 insertions(+), 287 deletions(-)
>  delete mode 100644 package/mesa3d-demos/0001-demos-non-mesa-impl.patch
>  rename package/mesa3d-demos/{0002-demos-optional-gl.patch => 0001-demos-optional-gl.patch} (81%)
>  delete mode 100644 package/mesa3d-demos/0003-demos-x11-fix.patch

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/8] package/tvheadend: bump version

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 12 Dec 2015 19:31:37 +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/tvheadend/tvheadend.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks. Could you send a patch adding a hash file for this
package?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/8] package/znc: bump version to 1.6.2

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 12 Dec 2015 19:31:38 +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/znc/znc.hash | 2 +-
>  package/znc/znc.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 4/8] package/{mesa3d, mesa3d-headers}: bump version to 11.0.7

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 12 Dec 2015 19:31:39 +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/mesa3d-headers/mesa3d-headers.mk | 2 +-
>  package/mesa3d/mesa3d.hash               | 4 ++--
>  package/mesa3d/mesa3d.mk                 | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 5/8] package/dovecot-pigeonhole: bum version to 0.4.10.rc2

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 12 Dec 2015 19:31:40 +0100, Bernd Kuhls wrote:

> -DOVECOT_PIGEONHOLE_VERSION = 0.4.9
> +DOVECOT_PIGEONHOLE_VERSION = 0.4.10.rc2
>  DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
> -DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2
> +DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2/rc

We normally don't package release candidate versions. But since it's
needed by the new dovecot version, and I guess there will be a final
release soon, I've applied.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 6/8] package/dovecot: bump version to 2.2.21

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 12 Dec 2015 19:31:41 +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/dovecot/dovecot.hash | 2 +-
>  package/dovecot/dovecot.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 7/8] package/libfreeglut: new package

[Thomas Petazzoni]

Bernd,

On Sat, 12 Dec 2015 19:31:42 +0100, Bernd Kuhls wrote:

> diff --git a/package/libfreeglut/Config.in b/package/libfreeglut/Config.in
> new file mode 100644
> index 0000000..e67fdae
> --- /dev/null
> +++ b/package/libfreeglut/Config.in
> @@ -0,0 +1,19 @@
> +config BR2_PACKAGE_LIBFREEGLUT
> +	bool "libfreeglut"
> +	select BR2_PACKAGE_LIBGLU
> +	select BR2_PACKAGE_XLIB_LIBXI

Are you sure about this dependency? I don't see any reference to libXi
in the libfreeglut source code? However, I do see a reference to
libXxf86vm:

  SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL -lm")

> +	select BR2_PACKAGE_XLIB_LIBXRANDR
> +	depends on BR2_PACKAGE_HAS_LIBGL

There seems to be provisions for using OpenGLES and not only full
OpenGL:

# OpenGL ES support
OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF)

Also, have you test static/shared build ? There are some options to
control this:

OPTION(FREEGLUT_BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON)
OPTION(FREEGLUT_BUILD_STATIC_LIBS "Build FreeGLUT static library." ON)

But it's true you depend on BR2_PACKAGE_XORG7, so a pure static lib
build is not possible. But what about BR2_STATIC_SHARED_LIBS vs.
BR2_SHARED_LIBS ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 7/8] package/libfreeglut: new package

[Bernd Kuhls]

Hi Thomas,

Am Sun, 13 Dec 2015 14:46:26 +0100 schrieb Thomas Petazzoni:

> Bernd,
> 
> On Sat, 12 Dec 2015 19:31:42 +0100, Bernd Kuhls wrote:
> 
>> diff --git a/package/libfreeglut/Config.in
>> b/package/libfreeglut/Config.in new file mode 100644 index
>> 0000000..e67fdae --- /dev/null +++ b/package/libfreeglut/Config.in @@
>> -0,0 +1,19 @@
>> +config BR2_PACKAGE_LIBFREEGLUT +	bool "libfreeglut"
>> +	select BR2_PACKAGE_LIBGLU +	select BR2_PACKAGE_XLIB_LIBXI
> 
> Are you sure about this dependency? I don't see any reference to libXi
> in the libfreeglut source code? However, I do see a reference to
> libXxf86vm:
> 
>   SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL -lm")

Yes, libXi is needed:
http://sourceforge.net/p/freeglut/code/HEAD/tree/tags/FG_3_0_0/
README.cmake#l45
http://sourceforge.net/p/freeglut/code/HEAD/tree/tags/FG_3_0_0/src/x11/
fg_internal_x11.h#l42

V2 of the patch added libXxf86vm as dependency.

>> +	select BR2_PACKAGE_XLIB_LIBXRANDR +	depends on 
BR2_PACKAGE_HAS_LIBGL
> 
> There seems to be provisions for using OpenGLES and not only full
> OpenGL:
> 
> # OpenGL ES support OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)"
> OFF)

After seeing this note in the Gentoo package
https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/freeglut/
freeglut-3.0.0.ebuild#n17
I did not bother to handle OpenGLES support atm.

> Also, have you test static/shared build ? There are some options to
> control this:
> 
> OPTION(FREEGLUT_BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON)
> OPTION(FREEGLUT_BUILD_STATIC_LIBS "Build FreeGLUT static library." ON)
> 
> But it's true you depend on BR2_PACKAGE_XORG7, so a pure static lib
> build is not possible. But what about BR2_STATIC_SHARED_LIBS vs.
> BR2_SHARED_LIBS ?

I just sent v2 of the patch handling the shared-only case:
http://patchwork.ozlabs.org/patch/556195/

Thanks for the review!

Regards, Bernd