Hello community, here is the log from the commit of package cogl for openSUSE:Factory checked in at 2018-03-14 19:26:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cogl (Old) and /work/SRC/openSUSE:Factory/.cogl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cogl" Wed Mar 14 19:26:36 2018 rev:42 rq:585840 version:1.22.2+20171013.d043a41d Changes: -------- --- /work/SRC/openSUSE:Factory/cogl/cogl.changes 2017-09-15 21:06:45.733975750 +0200 +++ /work/SRC/openSUSE:Factory/.cogl.new/cogl.changes 2018-03-14 19:26:41.947494350 +0100 @@ -1,0 +2,31 @@ +Sat Mar 10 00:15:06 UTC 2018 - [email protected] + +- Fix SRPM group. Update summaries. +- Remove idempotent %if..%endif guards. +- Remove duplicate .la cleanup. + +------------------------------------------------------------------- +Wed Feb 28 16:24:24 UTC 2018 - [email protected] + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- +Thu Jan 11 11:35:27 UTC 2018 - [email protected] + +- Update to version 1.22.2+20171013.d043a41d: + + Add precision for Sampler3D. + + wayland-winsys: Take possible pending resize into account. + + Fix an incorrect preprocessor conditional. + + Updated translations. +- Switch to git-checkout via source service, following this, add + libtool BuildRequires and run autogen.sh to bootstrap tarball. +- Drop 0001-fix-build-failure-with-Werror-undef.patch: Fixed + upstream. +- Add with_COGLGST define and set it to 0, add conditionals for + typelib-1_0-CoglGst-2_0 and gstreamer-plugins-cogl sub-packages, + no longer build these, follow upstream default. +- Add explicit pkgconfig(egl) BuildRequires: Align with what + configure looks for. +- Minor spec cleanup, use autosetup macro. + +------------------------------------------------------------------- Old: ---- 0001-fix-build-failure-with-Werror-undef.patch cogl-1.22.2.tar.xz New: ---- _service _servicedata cogl-1.22.2+20171013.d043a41d.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cogl.spec ++++++ --- /var/tmp/diff_new_pack.zNAgTv/_old 2018-03-14 19:26:42.791464382 +0100 +++ /var/tmp/diff_new_pack.zNAgTv/_new 2018-03-14 19:26:42.799464099 +0100 @@ -1,7 +1,7 @@ # # spec file for package cogl # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,33 +17,30 @@ %define with_GLES2 1 - +%define with_COGLGST 0 Name: cogl -Version: 1.22.2 +Version: 1.22.2+20171013.d043a41d Release: 0 Summary: An object oriented GL/GLES Abstraction/Utility Layer License: MIT -Group: System/Libraries +Group: Development/Libraries/GNOME Url: http://clutter-project.org/ -Source0: http://download.gnome.org/sources/cogl/1.22/%{name}-%{version}.tar.xz +#Source0: http://download.gnome.org/sources/cogl/1.22/%%{name}-%%{version}.tar.xz +Source: %{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-fix-build-failure-with-Werror-undef.patch bgo#770533 [email protected] -- Fix build failure for SLE. -Patch0: 0001-fix-build-failure-with-Werror-undef.patch BuildRequires: fdupes BuildRequires: gtk-doc >= 1.13 +# Needed as we are using a git-checkout +BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: pkgconfig(cairo) >= 1.10 +BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.0 BuildRequires: pkgconfig(gl) 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(wayland-client) @@ -56,7 +53,14 @@ BuildRequires: pkgconfig(xfixes) >= 3 BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xrandr) >= 1.2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with_COGLGST} +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) +%endif %description Cogl is a small open source library for using 3D graphics hardware to draw @@ -74,18 +78,16 @@ Cogl is a small open source library for using 3D graphics hardware to draw pretty pictures. -%if %{with_GLES2} %package -n libcogl-gles2-20 -Summary: An object oriented GL/GLES Abstraction/Utility Layer -- OpenGL ES 2 +Summary: OpenGL ES 2 support for the cogl GL/GLES abstraction/utility layer Group: System/Libraries %description -n libcogl-gles2-20 Cogl is a small open source library for using 3D graphics hardware to draw pretty pictures -%endif %package -n typelib-1_0-Cogl-1_0 -Summary: An object oriented GL/GLES Abstraction/Utility Layer -- Introspection bindings +Summary: Introspection bindings for the cogl GL/GLES abstraction/utility layer Group: System/Libraries %description -n typelib-1_0-Cogl-1_0 @@ -95,7 +97,7 @@ This package provides the GObject Introspection bindings for Cogl. %package -n typelib-1_0-Cogl-2_0 -Summary: An object oriented GL/GLES Abstraction/Utility Layer -- Introspection bindings +Summary: Introspection bindings for the cogl GL/GLES abstraction/utility layer Group: System/Libraries %description -n typelib-1_0-Cogl-2_0 @@ -105,7 +107,7 @@ 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 +Summary: Introspection bindings for the cogl GL/GLES abstraction/utility layer Group: System/Libraries %description -n typelib-1_0-CoglGst-2_0 @@ -115,7 +117,7 @@ This package provides the GObject Introspection bindings for CoglGst. %package -n libcogl-pango20 -Summary: An object oriented GL/GLES Abstraction/Utility Layer -- Pango Integration +Summary: Pango integration for the cogl GL/GLES abstraction/utility layer Group: System/Libraries %description -n libcogl-pango20 @@ -123,7 +125,7 @@ pretty pictures. %package -n typelib-1_0-CoglPango-1_0 -Summary: An object oriented GL/GLES Abstraction/Utility Layer -- Pango Integration, Introspection bindings +Summary: Pango Integration, Introspection bindings for cogl Group: System/Libraries %description -n typelib-1_0-CoglPango-1_0 @@ -134,7 +136,7 @@ integration in Cogl. %package -n typelib-1_0-CoglPango-2_0 -Summary: An object oriented GL/GLES Abstraction/Utility Layer -- Pango Integration, Introspection bindings +Summary: Pango Integration, Introspection bindings for cogl Group: System/Libraries %description -n typelib-1_0-CoglPango-2_0 @@ -156,37 +158,45 @@ This package provides the Gstreamer plugings for Cogl. %package devel -Summary: An object oriented GL/GLES Abstraction/Utility Layer -- Development Files +Summary: Development files for the cogl GL/GLES abstraction/utility layer # cogl-defines.h includes GL/gl.h Group: Development/Libraries/GNOME Requires: Mesa-devel -%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} +%if %{with_GLES2} +Requires: libcogl-gles2-20 = %{version} +%endif +%if %{with_COGLGST} +Requires: gstreamer-plugins-cogl = %{version} +%endif +%if %{with_COGLGST} +Requires: typelib-1_0-CoglGst-2_0 = %{version} +%endif %description devel Cogl is a small open source library for using 3D graphics hardware to draw pretty pictures. %lang_package + %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build +# Needed as we are using a git-checkout +NOCONFIGURE=1 ./autogen.sh %configure \ --disable-static \ --with-pic \ --enable-gtk-doc \ +%if %{with_COGLGST} --enable-cogl-gst \ +%endif --enable-kms-egl-platform \ --enable-wayland-egl-platform \ --enable-wayland-egl-server \ @@ -199,8 +209,7 @@ %install %make_install -rm %{buildroot}%{_libdir}/*.la -rm %{buildroot}%{_libdir}/gstreamer-1.0/*.la +find %{buildroot} -type f -name "*.la" -delete -print %find_lang cogl %fdupes %{buildroot}%{_libdir}/pkgconfig/ @@ -208,63 +217,58 @@ %fdupes -s %{buildroot}%{_includedir}/cogl/cogl/ %post -n libcogl20 -p /sbin/ldconfig - %postun -n libcogl20 -p /sbin/ldconfig %if %{with_GLES2} %post -n libcogl-gles2-20 -p /sbin/ldconfig - %postun -n libcogl-gles2-20 -p /sbin/ldconfig %endif %post -n libcogl-pango20 -p /sbin/ldconfig - %postun -n libcogl-pango20 -p /sbin/ldconfig %files -n libcogl20 -%defattr(-,root,root) -%doc COPYING NEWS README ChangeLog +%license COPYING +%doc NEWS README ChangeLog %{_libdir}/libcogl.so.* %{_libdir}/libcogl-path.so.* +%if %{with_COGLGST} %{_libdir}/libcogl-gst.so.* +%endif +%if %{with_COGLGST} %files -n gstreamer-plugins-cogl -%defattr(-,root,root) %{_libdir}/gstreamer-1.0/*.so +%endif %if %{with_GLES2} %files -n libcogl-gles2-20 -%defattr(-,root,root) %{_libdir}/libcogl-gles2.so.* %endif %files -n typelib-1_0-Cogl-1_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/Cogl-1.0.typelib %files -n typelib-1_0-Cogl-2_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/Cogl-2.0.typelib +%if %{with_COGLGST} %files -n typelib-1_0-CoglGst-2_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/CoglGst-2.0.typelib +%endif %files -n libcogl-pango20 -%defattr(-,root,root) -%doc COPYING NEWS README ChangeLog +%license COPYING +%doc NEWS README ChangeLog %{_libdir}/libcogl-pango.so.* %files -n typelib-1_0-CoglPango-1_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/CoglPango-1.0.typelib %files -n typelib-1_0-CoglPango-2_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/CoglPango-2.0.typelib %files devel -%defattr(-,root,root) %{_libdir}/*.so %{_includedir}/cogl/ %dir %{_datadir}/cogl/ @@ -276,15 +280,19 @@ %{_libdir}/pkgconfig/cogl-gles2-2.0-experimental.pc %endif %{_libdir}/pkgconfig/cogl-gl-1.0.pc +%if %{with_COGLGST} %{_libdir}/pkgconfig/cogl-gst-1.0.pc %{_libdir}/pkgconfig/cogl-gst-2.0-experimental.pc +%endif %{_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/ +%if %{with_COGLGST} %doc %{_datadir}/gtk-doc/html/cogl-gst/ +%endif %doc %{_datadir}/gtk-doc/html/cogl-2.0-experimental/ %files lang -f cogl.lang ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">git://git.gnome.org/cogl</param> <param name="scm">git</param> <param name="revision">cogl-1.22</param> <param name="versionformat">1.22.2+%cd.%h</param> <param name="changesgenerate">enable</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version" /> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://git.gnome.org/cogl</param> <param name="changesrevision">d043a41d86ab762b42b1e2396f8732a353fb8bc2</param></service></servicedata>
