Hello community,
here is the log from the commit of package cgal for openSUSE:Factory checked in
at 2017-09-29 11:55:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cgal (Old)
and /work/SRC/openSUSE:Factory/.cgal.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cgal"
Fri Sep 29 11:55:55 2017 rev:11 rq:528980 version:4.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/cgal/cgal.changes 2017-02-09
11:16:54.320132022 +0100
+++ /work/SRC/openSUSE:Factory/.cgal.new/cgal.changes 2017-09-29
11:56:09.168318218 +0200
@@ -1,0 +2,23 @@
+Wed Sep 27 14:58:36 UTC 2017 - mvet...@suse.com
+
+- Always use Qt5
+
+-------------------------------------------------------------------
+Wed Sep 27 13:48:30 UTC 2017 - mvet...@suse.com
+
+- boo#1060631: Add cgal-4.11-opengl-es-arm.patch
+ On armv7 Qt uses OpenGL ES headers.
+ cgal included GL/gl.h desktop header, but they cannot be mixed.
+
+-------------------------------------------------------------------
+Wed Sep 27 09:54:34 UTC 2017 - mvet...@suse.com
+
+- Remove boost conditionals. They are handled in prj conf.
+
+-------------------------------------------------------------------
+Tue Sep 26 13:35:19 UTC 2017 - mvet...@suse.com
+
+- Update to 4.11
+ * details can be found in CHANGES file
+
+-------------------------------------------------------------------
Old:
----
CGAL-4.7-doc_html.tar.xz
CGAL-4.7.tar.xz
New:
----
CGAL-4.11-doc_html.tar.xz
CGAL-4.11.tar.xz
cgal-4.11-opengl-es-arm.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cgal.spec ++++++
--- /var/tmp/diff_new_pack.0uoc2h/_old 2017-09-29 11:56:13.351728329 +0200
+++ /var/tmp/diff_new_pack.0uoc2h/_new 2017-09-29 11:56:13.355727765 +0200
@@ -22,49 +22,39 @@
#@TODO : split package in coherent parts
#@TODO : rename parts (inspirated by sfcgal packaging)
#@TODO : ask for rename and take into account the obsolete existant thing.
like libcgal deps
-%define _sover 11
+%define _sover 13
%define _sourcename CGAL
%define _libname libCGAL%{_sover}
-%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 &&
0%{?is_opensuse} )
-%define have_qt5 1
-%else
-%define have_qt5 0
-%endif
Name: cgal
-Version: 4.7
+Version: 4.11
Release: 0
Summary: Computational Geometry Algorithms Library
-License: GPL-3.0+ and LGPL-3.0+
+License: GPL-3.0+ AND LGPL-3.0+
Group: Productivity/Graphics/CAD
Url: http://www.cgal.org/
# You will need to update the magic numbers from the download urls on updating
Source0:
https://github.com/CGAL/cgal/releases/download/releases%%2FCGAL-%{version}/CGAL-%{version}.tar.xz
Source1:
https://github.com/CGAL/cgal/releases/download/releases%%2FCGAL-%{version}/CGAL-%{version}-doc_html.tar.xz
Source2: cgal-rpmlintrc
+Patch0: cgal-4.11-opengl-es-arm.patch
BuildRequires: blas-devel
-%if 0%{?suse_version} > 1325
-BuildRequires: libboost_system-devel
-BuildRequires: libboost_thread-devel
-%else
-BuildRequires: boost-devel >= 1.39
-%endif
-BuildRequires: cmake
+BuildRequires: cmake >= 2.8.11
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glu-devel
BuildRequires: gmp-devel
BuildRequires: lapack-devel
-%if %{have_qt5}
-BuildRequires: libqt5-qtbase-devel
-BuildRequires: libqt5-qtscript-devel
-BuildRequires: libqt5-qtsvg-devel
-BuildRequires: libqt5-qttools-devel
-%endif
BuildRequires: mpfr-devel
BuildRequires: xz
BuildRequires: zlib-devel
Requires: libcgal-devel = %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: libQt5OpenGL-devel >= 5.3
+BuildRequires: libboost_system-devel
+BuildRequires: libboost_thread-devel
+BuildRequires: libqt5-qtbase-devel >= 5.3
+BuildRequires: libqt5-qtscript-devel >= 5.3
+BuildRequires: libqt5-qtsvg-devel >= 5.3
+BuildRequires: libqt5-qttools-devel >= 5.3
%description
CGAL provides geometric algorithms in a C++ library.
@@ -77,7 +67,7 @@
%package -n %{_libname}
Summary: Computational Geometry Algorithms Library
-License: GPL-3.0+ and LGPL-3.0+
+License: GPL-3.0+ AND LGPL-3.0+
Group: System/Libraries
%description -n %{_libname}
@@ -91,7 +81,7 @@
%package devel
Summary: Development files and tools for CGAL applications
-License: GPL-3.0+ and LGPL-3.0+ and BSL-1.0
+License: GPL-3.0+ AND LGPL-3.0+ AND BSL-1.0
Group: Development/Libraries/C and C++
Requires: %{_libname} = %{version}
Requires: blas
@@ -111,7 +101,7 @@
%package demo-examples-devel
Summary: Example & demo files for CGAL library usage
-License: GPL-3.0+ and LGPL-3.0+ and BSL-1.0 and MIT
+License: GPL-3.0+ AND LGPL-3.0+ AND BSL-1.0 AND MIT
Group: Development/Libraries/C and C++
Requires: %{name}-devel = %{version}
BuildArch: noarch
@@ -123,7 +113,7 @@
%package doc
Summary: Documentation CGAL algorithms
-License: GPL-3.0+ and LGPL-3.0+
+License: GPL-3.0+ AND LGPL-3.0+
Group: Documentation/HTML
BuildArch: noarch
@@ -133,6 +123,7 @@
%prep
%setup -q -n CGAL-%{version}
tar -xJf %{SOURCE1}
+%patch0 -p1
%build
export LDFLAGS="-Wl,-z,relro,-z,now -pie"
@@ -167,40 +158,31 @@
%fdupes %{buildroot}/%{_datadir}
%post -n %{_libname} -p /sbin/ldconfig
-
%postun -n %{_libname} -p /sbin/ldconfig
%files -n %{_libname}
-%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE*
%{_libdir}/libCGAL.so.%{_sover}*
%{_libdir}/libCGAL_Core.so.%{_sover}*
%{_libdir}/libCGAL_ImageIO.so.%{_sover}*
-%if %{have_qt5}
%{_libdir}/libCGAL_Qt5.so.%{_sover}*
-%endif
%files devel
-%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE*
%{_includedir}/CGAL
%{_libdir}/libCGAL.so
%{_libdir}/libCGAL_Core.so
%{_libdir}/libCGAL_ImageIO.so
-%if %{have_qt5}
%{_libdir}/libCGAL_Qt5.so
-%endif
%{_libdir}/CGAL
%{_bindir}/*
%{_mandir}/man1/cgal_create_cmake_script.1*
%files demo-examples-devel
-%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE*
%{_datadir}/CGAL
%files doc
-%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE*
%doc doc_html
++++++ CGAL-4.7-doc_html.tar.xz -> CGAL-4.11-doc_html.tar.xz ++++++
/work/SRC/openSUSE:Factory/cgal/CGAL-4.7-doc_html.tar.xz
/work/SRC/openSUSE:Factory/.cgal.new/CGAL-4.11-doc_html.tar.xz differ: char 26,
line 1
++++++ CGAL-4.7-doc_html.tar.xz -> CGAL-4.11.tar.xz ++++++
/work/SRC/openSUSE:Factory/cgal/CGAL-4.7-doc_html.tar.xz
/work/SRC/openSUSE:Factory/.cgal.new/CGAL-4.11.tar.xz differ: char 25, line 1
++++++ cgal-4.11-opengl-es-arm.patch ++++++
diff -urEbwB CGAL-4.11/include/CGAL/gl.h CGAL-4.11.new/include/CGAL/gl.h
--- CGAL-4.11/include/CGAL/gl.h 2017-09-20 21:00:13.000000000 +0200
+++ CGAL-4.11.new/include/CGAL/gl.h 2017-09-27 15:30:53.796623426 +0200
@@ -30,7 +30,12 @@
# include <OpenGL/gl.h>
# endif
#else
+# ifdef __arm__
+# include <GLES3/gl3.h>
+# else
# include <GL/gl.h>
#endif
+#endif
+
#endif // CGAL_GL_H
diff -urEbwB CGAL-4.11/include/CGAL/Qt/debug_impl.h
CGAL-4.11.new/include/CGAL/Qt/debug_impl.h
--- CGAL-4.11/include/CGAL/Qt/debug_impl.h 2017-09-20 21:00:13.000000000
+0200
+++ CGAL-4.11.new/include/CGAL/Qt/debug_impl.h 2017-09-27 15:15:39.959768555
+0200
@@ -75,10 +75,14 @@
std::cerr << "The framebuffer object is not complete." << "@" << line <<
std::endl;
if(error == GL_OUT_OF_MEMORY)
std::cerr << "There is not enough memory left to execute the command." <<
"@" << line << std::endl;
+#ifdef GL_STACK_UNDERFLOW
if(error == GL_STACK_UNDERFLOW)
std::cerr << "An attempt has been made to perform an operation that would
cause an internal stack to underflow." << "@" << line << std::endl;
+#endif
+#ifdef GL_STACK_OVERFLOW
if(error == GL_STACK_OVERFLOW)
std::cerr << "An attempt has been made to perform an operation that would
cause an internal stack to overflow." << "@" << line << std::endl;
+#endif
error = ::glGetError();
}
}
++++++ cgal-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.0uoc2h/_old 2017-09-29 11:56:13.443715359 +0200
+++ /var/tmp/diff_new_pack.0uoc2h/_new 2017-09-29 11:56:13.443715359 +0200
@@ -7,5 +7,6 @@
addFilter("W: zero-length
/usr/share/CGAL/examples/Surface_mesher/skip_vcproj_auto_generation")
addFilter("W: zero-length
/usr/share/CGAL/examples/Ridges_3/skip_vcproj_auto_generation")
+
# Add a filter cause we don't know why after having done 2x %fdupes there's
still those
addFilter("W: files-duplicate")
