[packages/CGAL] - up to 4.6
arekm
arekm at pld-linux.org
Thu Apr 30 15:05:07 CEST 2015
commit b2d9afe8fe118b4e7a3cbd7fc3b7dfeeffc1e8bf
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Apr 30 15:05:00 2015 +0200
- up to 4.6
CGAL-build-library.patch | 95 ----------
CGAL-install_cgal-SUPPORT_REQUIRED.patch | 13 --
...all_cgal-no_versions_in_compiler_config.h.patch | 21 ---
CGAL.spec | 200 ++++-----------------
4 files changed, 31 insertions(+), 298 deletions(-)
---
diff --git a/CGAL.spec b/CGAL.spec
index 1fe2065..048e1b1 100644
--- a/CGAL.spec
+++ b/CGAL.spec
@@ -1,18 +1,16 @@
%define boost_version 1.32
Summary: Computational Geometry Algorithms Library
Name: CGAL
-Version: 3.3.1
+Version: 4.6
Release: 1
-License: QPL and LGPLv2 and LGPLv2+
+License: GPLv3+ and LGPLv3+
Group: Libraries
URL: http://www.cgal.org/
-Source0: ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/%{name}-%{version}.tar.gz
-# Source0-md5: 733339b6b05b48d4c7934a6e735b6fc0
-Patch1: %{name}-install_cgal-SUPPORT_REQUIRED.patch
-Patch2: %{name}-build-library.patch
-Patch4: %{name}-install_cgal-no_versions_in_compiler_config.h.patch
+Source0: https://gforge.inria.fr/frs/download.php/file/34705/%{name}-%{version}.tar.xz
+# Source0-md5: 65fa7e17cd654ef68da47df608000007
BuildRequires: blas-devel
BuildRequires: boost-devel >= %{boost_version}
+BuildRequires: cmake
BuildRequires: gmp-c++-devel
BuildRequires: gmp-devel
BuildRequires: lapack-devel
@@ -60,158 +58,24 @@ demos of CGAL algorithms.
%prep
%setup -q
-%patch1 -p0 -b .support-required.bak
-%patch2 -p1 -b .build-library.bak
-%patch4 -p1 -b .no_versions.bak
-
-chmod a-x examples/Nef_3/handling_double_coordinates.cin
-# fix end-of-lines of several files
-for f in demo/Straight_skeleton_2/data/vertex_event_9.poly \
- demo/Straight_skeleton_2/data/vertex_event_0.poly \
- examples/Surface_mesh_parameterization/data/mask_cone.off \
- examples/Boolean_set_operations_2/test.dxf; do
- if [ -r $f ]; then
- sed -i -e 's/\r//' $f
- fi
-done
%build
-export QTDIR=%{_prefix}
-./install_cgal -ni g++ --CUSTOM_CXXFLAGS "$RPM_OPT_FLAGS" \
- --without-autofind \
- --with-ZLIB \
- --with-BOOST \
- --with-BOOST_PROGRAM_OPTIONS \
- --with-X11 \
- --with-GMP \
- --with-GMPXX \
- --with-MPFR \
- --with-QT3MT \
- --with-REFBLASSHARED \
- --with-DEFAULTLAPACK \
- --with-OPENGL \
- --QT_INCL_DIR=%{_includedir}/qt \
- --QT_LIB_DIR=%{_libdir} \
- --disable-static
+install -d build
+cd build
+%cmake \
+ -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
+ -DCGAL_INSTALL_LIB_DIR=%{_lib} \
+ -DCGAL_INSTALL_DOC_DIR= ${CHANGE_SOVERSION} \
+ ..
+
+%{__make}
%install
+
rm -rf $RPM_BUILD_ROOT
-case "%{_arch}" in
-*64* | s390)
- SUFFIX=64 ;;
-*)
- SUFFIX=32 ;;
-esac
-
-# Install headers
-install -d $RPM_BUILD_ROOT%{_includedir}
-cp -a include/* $RPM_BUILD_ROOT%{_includedir}
-rm -rf $RPM_BUILD_ROOT%{_includedir}/CGAL/config/msvc*
-mv $RPM_BUILD_ROOT%{_includedir}/CGAL/config/*/CGAL/compiler_config.h $RPM_BUILD_ROOT%{_includedir}/CGAL/compiler_config.h
-
-# remove the arch-specific comment
-%{__sed} -i -e '/System: / d' $RPM_BUILD_ROOT%{_includedir}/CGAL/compiler_config.h
-
-# use the timestamp of install_cgal
-touch -r install_cgal $RPM_BUILD_ROOT%{_includedir}/CGAL/compiler_config.h
-rm -rf $RPM_BUILD_ROOT%{_includedir}/CGAL/config
-
-# Install scripts (only those prefixed with "cgal_").
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -p scripts/cgal_* $RPM_BUILD_ROOT%{_bindir}
-
-# Install libraries
-install -d $RPM_BUILD_ROOT%{_libdir}
-cp -a lib/*/lib* $RPM_BUILD_ROOT%{_libdir}
-
-# Install makefile:
-install -d $RPM_BUILD_ROOT%{_datadir}/CGAL
-touch -r make $RPM_BUILD_ROOT%{_datadir}/CGAL
-install -p make/makefile_* $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk
-
-# Install demos and examples
-install -d $RPM_BUILD_ROOT%{_datadir}/CGAL/
-touch -r demo $RPM_BUILD_ROOT%{_datadir}/CGAL/
-cp -a demo $RPM_BUILD_ROOT%{_datadir}/CGAL/demo
-cp -a examples $RPM_BUILD_ROOT%{_datadir}/CGAL/examples
-
-# Modify makefile
-cat > makefile.sed <<'EOF'
-s,CGAL_INCL_DIR *=.*,CGAL_INCL_DIR = %{_includedir},;
-s,CGAL_LIB_DIR *=.*,CGAL_LIB_DIR = %{_libdir},;
-/CUSTOM_CXXFLAGS/ s/-O2 //;
-/CUSTOM_CXXFLAGS/ s/-g //;
-/CGAL_INCL_DIR/ s,/CGAL/config/.*,,;
-s,/$(CGAL_OS_COMPILER),,g;
-/-I.*CGAL_INCL_CONF_DIR/ d
-EOF
-
-# use -i.bak to generate cgal-${SUFFIX}.mk.bak with right timestamp
-# used below to restore the timestamp
-sed -i.bak -f makefile.sed $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk
-
-# check if the sed script above has worked:
-grep -q %{_builddir} $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-grep -q $RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-grep -q CGAL/config $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-grep -q -E 'CUSTOM_CXXFLAGS.*(-O2|-g )' $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-
-# Remove -L and -R flags from the makefile
-cat > makefile-noprefix.sed <<'EOF'
-/'-L$(CGAL_LIB_DIR)'/ d;
-/-R$(CGAL_LIB_DIR)/ d;
-/'-I$(CGAL_INCL_DIR)'/ d;
-EOF
-
-sed -i -f makefile-noprefix.sed $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk
-
-# restore the timestamp and remove the .bak file
-touch -r $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk.bak $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk
-rm -f $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk.bak
-
-# check that the sed script has worked
-grep -q -E -- '-[LI]\$' $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-grep -q -E -- '-R' $RPM_BUILD_ROOT%{_datadir}/CGAL/cgal-${SUFFIX}.mk && false
-
-# Create %{_sysconfdir}/profile.d/ scripts
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/cgal.sh <<EOF
-ARCH=`uname -m`
-
-case \$ARCH in
- x86_64|ia64|s390)
- SUFFIX=64 ;;
- *)
- SUFFIX=32 ;;
-esac
-
-if [ -z "\$CGAL_MAKEFILE" ] ; then
- CGAL_MAKEFILE="%{_datadir}/CGAL/cgal-${SUFFIX}.mk"
- export CGAL_MAKEFILE
-fi
-EOF
-
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/cgal.csh <<EOF
-set ARCH=`uname -m`
-
-switch (\$ARCH)
-case x86_64:
-case ia64:
-case s390:
- set SUFFIX=64;
- breaksw;
-default:
- set SUFFIX=62;
-endsw
-
-if (! \$?CGAL_MAKEFILE ) then
- setenv CGAL_MAKEFILE "%{_datadir}/CGAL/cgal-${SUFFIX}.mk"
-endif
-EOF
-
-# use the timestamp of install_cgal
-touch -r install_cgal $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/cgal.*sh
+%{__make} -C build install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -221,23 +85,21 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL CHANGES
-%attr(755,root,root) %{_libdir}/libCGAL*.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCGAL*.so.2
+%doc AUTHORS LICENSE LICENSE.FREE_USE LICENSE.LGPL CHANGES
+%attr(755,root,root) %{_libdir}/libCGAL.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCGAL.so.11
+%attr(755,root,root) %{_libdir}/libCGAL_Core.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCGAL_Core.so.11
+%attr(755,root,root) %{_libdir}/libCGAL_ImageIO.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCGAL_ImageIO.so.11
+%attr(755,root,root) %{_libdir}/libCGAL_Qt4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCGAL_Qt4.so.11
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/cgal_create_CMakeLists
+%attr(755,root,root) %{_bindir}/cgal_create_cmake_script
%{_includedir}/CGAL
-%{_libdir}/libCGAL*.so
-%dir %{_datadir}/CGAL
-%{_datadir}/CGAL/cgal*.mk
-%attr(755,root,root) %{_bindir}/*
-%exclude %{_bindir}/cgal_make_macosx_app
-%config(noreplace,missingok) %verify(not md5 mtime size) %attr(755,root,root) /etc/profile.d/cgal.*
-
-%files demos-source
-%defattr(644,root,root,755)
-%{_datadir}/CGAL/demo
-%{_datadir}/CGAL/examples
-%exclude %{_datadir}/CGAL/*/*/*.vcproj
-%exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation
+%{_libdir}/CGAL
+%attr(755,root,root) %{_libdir}/libCGAL*.so
+%{_mandir}/man1/cgal_create_cmake_script.1*
diff --git a/CGAL-build-library.patch b/CGAL-build-library.patch
deleted file mode 100644
index 24cf2f2..0000000
--- a/CGAL-build-library.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- CGAL-3.3/install_cgal.build-library.bak 2007-05-30 14:05:18.000000000 +0200
-+++ CGAL-3.3/install_cgal 2007-05-30 14:14:10.000000000 +0200
-@@ -937,7 +937,6 @@
- #### settings for sgi mipspro compiler on irix5
- CGAL_SHARED_LIB_CXXFLAGS=
- CGAL_SHARED_LIB_LDFLAGS="-lm"
-- RUNTIME_LINKER_FLAG="-rpath "
- PRINT_STACKTRACE_PROGRAM="dbx"
- ;;
- *IRIX*6.*CC*7.3*)
-@@ -946,14 +945,12 @@
- ADDITIONAL_LDFLAGS="-LANG:std"
- CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''"
- CGAL_SHARED_LIB_CXXFLAGS=
-- RUNTIME_LINKER_FLAG="-rpath "
- PRINT_STACKTRACE_PROGRAM="dbx"
- ;;
- *IRIX*6.*CC*)
- #### settings for sgi mipspro compiler on irix6
- CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''"
- CGAL_SHARED_LIB_CXXFLAGS=
-- RUNTIME_LINKER_FLAG="-rpath "
- PRINT_STACKTRACE_PROGRAM="dbx"
- ;;
- *IRIX*g++*)
-@@ -961,7 +958,6 @@
- ADDITIONAL_CXXFLAGS="-Wall"
- LONG_NAME_PROBLEM_LDFLAGS="-U -s"
- CGAL_SHARED_LIB_LDFLAGS="-lm"
-- RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker "
- CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
- CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
- CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
-@@ -973,7 +969,6 @@
- CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''"
- CGAL_SHARED_LIB_CXXFLAGS="-PIC"
- CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
-- RUNTIME_LINKER_FLAG="-R "
- PRINT_STACKTRACE_PROGRAM="dbx"
- CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
- CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
-@@ -986,7 +981,6 @@
- LONG_NAME_PROBLEM_CXXFLAGS="-g"
- LONG_NAME_PROBLEM_LDFLAGS="-z nodefs -s"
- CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
-- RUNTIME_LINKER_FLAG="-R "
- CGAL_SHARED_LIB_SONAME="-h \$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
- CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
- CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
-@@ -995,7 +989,6 @@
- #### settings for g++ on alpha-linux (special FPU handling)
- #### LONG_NAME_PROBLEM is cured by disabling debugging
- ADDITIONAL_CXXFLAGS="-Wall -mieee -mfp-rounding-mode=d"
-- RUNTIME_LINKER_FLAG='-Wl,-R'
- CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
- CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
- CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
-@@ -1003,7 +996,6 @@
- *Linux*g++*)
- #### settings for g++ on linux
- ADDITIONAL_CXXFLAGS="-Wall"
-- RUNTIME_LINKER_FLAG='-Wl,-R'
- CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
- CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
- CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
-@@ -1013,12 +1005,10 @@
- # -mp is required for correct enough floating point operations
- # necessary for interval arithmetic.
- ADDITIONAL_CXXFLAGS="-mp"
-- RUNTIME_LINKER_FLAG='-Wl,-R'
- PRINT_STACKTRACE_PROGRAM="idb"
- ;;
- *Linux*pgCC*|*Linux*pgcpp*)
- #### settings for Portland Group Compiler on linux
-- RUNTIME_LINKER_FLAG='-Wl,-R'
- # PGCC has long name problems with "-g".
- DEBUG_OPT=""
- ;;
-@@ -1029,7 +1019,6 @@
- CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''"
- CGAL_SHARED_LIB_CXXFLAGS="-PIC"
- CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
-- RUNTIME_LINKER_FLAG="-R "
- PRINT_STACKTRACE_PROGRAM="dbx"
- CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
- CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
-@@ -4335,7 +4319,7 @@
- _buildlog_marker="log for $1 $2 shown"
-
- ${_printf} "%s %s\n" "${MAKE}" "${MAKE_OPTION}" > "${COMPILE_LOGFILE}"
-- if ${MAKE} ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then
-+ if ${MAKE} ${MAKE_OPTION} | tee "${COMPILE_LOGFILE}" 2>&1; then
- log_print "Compilation of $1 $2 ${_libname} succeeded."
- log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv"
- eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION}
diff --git a/CGAL-install_cgal-SUPPORT_REQUIRED.patch b/CGAL-install_cgal-SUPPORT_REQUIRED.patch
deleted file mode 100644
index 879211e..0000000
--- a/CGAL-install_cgal-SUPPORT_REQUIRED.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: install_cgal
-===================================================================
---- install_cgal (revision 30283)
-+++ install_cgal (working copy)
-@@ -92,7 +92,7 @@
-
- # ---------------------------------------------
- # Required support options
--SUPPORT_REQUIRED='BOOST'
-+SUPPORT_REQUIRED='BOOST BOOST_PROGRAM_OPTIONS X11 GMP MPFR GMPXX ZLIB QT'
-
- # ---------------------------------------------------------------------
- # internal variables
diff --git a/CGAL-install_cgal-no_versions_in_compiler_config.h.patch b/CGAL-install_cgal-no_versions_in_compiler_config.h.patch
deleted file mode 100644
index ca077b9..0000000
--- a/CGAL-install_cgal-no_versions_in_compiler_config.h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- CGAL-3.2.1/install_cgal.orig 2006-08-17 15:47:05.000000000 +0200
-+++ CGAL-3.2.1/install_cgal 2006-08-17 16:06:47.000000000 +0200
-@@ -3161,7 +3161,6 @@
- "----------------" \
- >> ${_file}
- ${_printf} "%s\n" "#ifndef CGAL_NO_${totest}" >> ${_file}
-- ${_printf} "%s\n" "#define CGAL_${totest}_VERSION 0" >> ${_file}
- ${_printf} "%s\n" "//#define CGAL_USE_${totest} 1" >> ${_file}
- ${_printf} "%s\n\n" "#endif // ! CGAL_NO_${totest}" >> ${_file}
- done
-@@ -3221,10 +3220,6 @@
- else
- replace_line "${_file}" "${_tmp2}" "${_tmp3}"
- fi
-- _tmp2="${totest}_VERSION"
-- _tmp3="`value_of ${_tmp2}`"
-- replace_line "${_file}" "#define CGAL_${_tmp2}" \
-- "#define CGAL_${_tmp2} ${_tmp3:-0}"
- done
-
- cd "${CGAL_DIR}"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/CGAL.git/commitdiff/b2d9afe8fe118b4e7a3cbd7fc3b7dfeeffc1e8bf
More information about the pld-cvs-commit
mailing list