Hello community, here is the log from the commit of package cogl for openSUSE:Factory checked in at 2015-12-25 13:05:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cogl (Old) and /work/SRC/openSUSE:Factory/.cogl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cogl" Changes: -------- --- /work/SRC/openSUSE:Factory/cogl/cogl.changes 2015-10-06 16:13:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cogl.new/cogl.changes 2015-12-25 13:05:18.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Oct 23 15:22:46 UTC 2015 - [email protected] + +- Pass --enable-cogl-gst to configure, we have clutter-gst-3.0, + shame on us, this should have been done for Leap too. +- Add new BuildRequires needed from above change: + - pkgconfig(gstreamer-audio-1.0) + - pkgconfig(gstreamer-base-1.0) + - pkgconfig(gstreamer-controller-1.0) + - pkgconfig(gstreamer-plugins-base-1.0) + - pkgconfig(gstreamer-tag-1.0) + - pkgconfig(gstreamer-video-1.0) +- Package new sub-packages typelib-1_0-CoglGst-2_0 and + gstreamer-plugins-cogl due to above change. Add Supplements: + packageand(libcogl20:gstreamer) for gstreamer-plugins-cogl. +- Flip enable gles2 define to 1, build gles2 support. +- Add cogl-GLES-Support-glMapBufferRange.patch: ES3 provides + glMapBufferRange as core, with the added bonus that it also + supports read mappings. Use this where possible. + +------------------------------------------------------------------- New: ---- cogl-GLES-Support-glMapBufferRange.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cogl.spec ++++++ --- /var/tmp/diff_new_pack.xSdvpV/_old 2015-12-25 13:05:19.000000000 +0100 +++ /var/tmp/diff_new_pack.xSdvpV/_new 2015-12-25 13:05:19.000000000 +0100 @@ -21,7 +21,7 @@ %else %define build_wayland_backend 1 %endif -%define with_GLES2 0 +%define with_GLES2 1 Name: cogl Version: 1.22.0 @@ -32,6 +32,8 @@ Url: http://clutter-project.org/ Source0: http://download.gnome.org/sources/cogl/1.22/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM cogl-GLES-Support-glMapBufferRange.patch [email protected] -- Support glmapbufferrange, patch from upstream git, stable branch. +Patch0: cogl-GLES-Support-glMapBufferRange.patch BuildRequires: fdupes BuildRequires: gtk-doc >= 1.13 BuildRequires: pkgconfig(cairo) >= 1.10 @@ -40,6 +42,12 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5 +BuildRequires: pkgconfig(gstreamer-audio-1.0) +BuildRequires: pkgconfig(gstreamer-base-1.0) +BuildRequires: pkgconfig(gstreamer-controller-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gstreamer-tag-1.0) +BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(pangocairo) >= 1.20 BuildRequires: pkgconfig(x11) @@ -103,6 +111,16 @@ This package provides the GObject Introspection bindings for Cogl. +%package -n typelib-1_0-CoglGst-2_0 +Summary: An object oriented GL/GLES Abstraction/Utility Layer -- Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-CoglGst-2_0 +Cogl is a small open source library for using 3D graphics hardware to draw +pretty pictures. + +This package provides the GObject Introspection bindings for CoglGst. + %package -n libcogl-pango20 Summary: An object oriented GL/GLES Abstraction/Utility Layer -- Pango Integration Group: System/Libraries @@ -133,6 +151,16 @@ This package provides the GObject Introspection bindings for the Pango integration in Cogl. +%package -n gstreamer-plugins-cogl +Summary: Gstreamer cogl plugins +Group: System/Libraries +Supplements: packageand(libcogl20:gstreamer) + +%description -n gstreamer-plugins-cogl +Cogl is a small open source library for using 3D graphics hardware to draw +pretty pictures. + +This package provides the Gstreamer plugings for Cogl. %package devel Summary: An object oriented GL/GLES Abstraction/Utility Layer -- Development Files @@ -142,10 +170,12 @@ %if %{with_GLES2} Requires: libcogl-gles2-20 = %{version} %endif +Requires: gstreamer-plugins-cogl = %{version} Requires: libcogl-pango20 = %{version} Requires: libcogl20 = %{version} Requires: typelib-1_0-Cogl-1_0 = %{version} Requires: typelib-1_0-Cogl-2_0 = %{version} +Requires: typelib-1_0-CoglGst-2_0 = %{version} Requires: typelib-1_0-CoglPango-1_0 = %{version} Requires: typelib-1_0-CoglPango-2_0 = %{version} @@ -156,12 +186,14 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %configure \ --disable-static \ --with-pic \ --enable-gtk-doc \ + --enable-cogl-gst \ %if %{build_wayland_backend} --enable-kms-egl-platform \ --enable-wayland-egl-platform \ @@ -177,6 +209,8 @@ %install %make_install rm %{buildroot}%{_libdir}/*.la +rm %{buildroot}%{_libdir}/gstreamer-1.0/*.la + %find_lang cogl %fdupes %{buildroot}%{_libdir}/pkgconfig/ %fdupes -s %{buildroot}%{_datadir}/gtk-doc/html @@ -201,6 +235,11 @@ %doc COPYING NEWS README ChangeLog %{_libdir}/libcogl.so.* %{_libdir}/libcogl-path.so.* +%{_libdir}/libcogl-gst.so.* + +%files -n gstreamer-plugins-cogl +%defattr(-,root,root) +%{_libdir}/gstreamer-1.0/*.so %if %{with_GLES2} %files -n libcogl-gles2-20 @@ -216,6 +255,10 @@ %defattr(-,root,root) %{_libdir}/girepository-1.0/Cogl-2.0.typelib +%files -n typelib-1_0-CoglGst-2_0 +%defattr(-,root,root) +%{_libdir}/girepository-1.0/CoglGst-2.0.typelib + %files -n libcogl-pango20 %defattr(-,root,root) %doc COPYING NEWS README ChangeLog @@ -238,15 +281,19 @@ %{_libdir}/pkgconfig/cogl-1.0.pc %{_libdir}/pkgconfig/cogl-2.0-experimental.pc %if %{with_GLES2} -%{_libdir}/pkgconfig/cogl-gles2-experimental.pc +%{_libdir}/pkgconfig/cogl-gles2-1.0.pc +%{_libdir}/pkgconfig/cogl-gles2-2.0-experimental.pc %endif %{_libdir}/pkgconfig/cogl-gl-1.0.pc +%{_libdir}/pkgconfig/cogl-gst-1.0.pc +%{_libdir}/pkgconfig/cogl-gst-2.0-experimental.pc %{_libdir}/pkgconfig/cogl-pango-1.0.pc %{_libdir}/pkgconfig/cogl-pango-2.0-experimental.pc %{_libdir}/pkgconfig/cogl-path-1.0.pc %{_libdir}/pkgconfig/cogl-path-2.0-experimental.pc %{_datadir}/gir-1.0/*.gir %doc %{_datadir}/gtk-doc/html/cogl/ +%doc %{_datadir}/gtk-doc/html/cogl-gst/ %doc %{_datadir}/gtk-doc/html/cogl-2.0-experimental/ %files lang -f cogl.lang ++++++ cogl-GLES-Support-glMapBufferRange.patch ++++++ >From d6f415d491533b3c6a69becfbbafc2f7592c3eb5 Mon Sep 17 00:00:00 2001 From: Daniel Stone <[email protected]> Date: Wed, 23 Sep 2015 12:20:43 +0100 Subject: Journal: Skip journal dumping when unsupported GLES2 does not support passing READ to glMapBuffer; attempting to call cogl_buffer_map for read on ES2 will bring it down with an assert. Make sure COGL_DEBUG=journal doesn't do this when it's not possible. Signed-off-by: Daniel Stone <[email protected]> https://bugzilla.gnome.org/show_bug.cgi?id=728355 --- cogl/cogl-journal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cogl/cogl-journal.c b/cogl/cogl-journal.c index dff34a0..8ffe25f 100644 --- a/cogl/cogl-journal.c +++ b/cogl/cogl-journal.c @@ -650,7 +650,8 @@ _cogl_journal_flush_vbo_offsets_and_entries (CoglJournalEntry *batch_start, */ state->current_vertex = 0; - if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_JOURNAL))) + if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_JOURNAL)) && + cogl_has_feature (ctx, COGL_FEATURE_ID_MAP_BUFFER_FOR_READ)) { uint8_t *verts; -- cgit v0.11.2 >From 5253264f2f76d1c5074e581f46a3326877a6930d Mon Sep 17 00:00:00 2001 From: Daniel Stone <[email protected]> Date: Wed, 23 Sep 2015 12:11:50 +0100 Subject: GLES: Support glMapBufferRange from ES3 ES3 provides glMapBufferRange as core, with the added bonus that it also supports read mappings. Use this where possible. Signed-off-by: Daniel Stone <[email protected]> https://bugzilla.gnome.org/show_bug.cgi?id=728355 --- cogl/driver/gl/gles/cogl-driver-gles.c | 11 +++++++++++ cogl/gl-prototypes/cogl-all-functions.h | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/driver/gl/gles/cogl-driver-gles.c index f144ba3..e94449f 100644 --- a/cogl/driver/gl/gles/cogl-driver-gles.c +++ b/cogl/driver/gl/gles/cogl-driver-gles.c @@ -404,6 +404,17 @@ _cogl_driver_update_features (CoglContext *context, COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE); } + if (context->glMapBufferRange) + { + /* MapBufferRange in ES3+ does support mapping for read */ + flags |= (COGL_FEATURE_MAP_BUFFER_FOR_WRITE | + COGL_FEATURE_MAP_BUFFER_FOR_READ); + COGL_FLAGS_SET(context->features, + COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE); + COGL_FLAGS_SET(context->features, + COGL_FEATURE_ID_MAP_BUFFER_FOR_READ, TRUE); + } + if (context->glEGLImageTargetTexture2D) COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE, TRUE); diff --git a/cogl/gl-prototypes/cogl-all-functions.h b/cogl/gl-prototypes/cogl-all-functions.h index dda08f7..7ac9022 100644 --- a/cogl/gl-prototypes/cogl-all-functions.h +++ b/cogl/gl-prototypes/cogl-all-functions.h @@ -295,7 +295,7 @@ COGL_EXT_FUNCTION (void, glGenVertexArrays, COGL_EXT_END () COGL_EXT_BEGIN (map_region, 3, 0, - 0, /* not in either GLES */ + COGL_EXT_IN_GLES3, "ARB:\0", "map_buffer_range\0") COGL_EXT_FUNCTION (GLvoid *, glMapBufferRange, -- cgit v0.11.2
