Hello community, here is the log from the commit of package tulip for openSUSE:Factory checked in at 2015-01-20 12:32:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tulip (Old) and /work/SRC/openSUSE:Factory/.tulip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tulip" Changes: -------- --- /work/SRC/openSUSE:Factory/tulip/tulip.changes 2014-11-11 01:11:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tulip.new/tulip.changes 2015-01-20 12:34:16.000000000 +0100 @@ -1,0 +2,43 @@ +Wed Jan 14 09:06:42 UTC 2015 - [email protected] + +- Update to 4.6.1 + This is a minor maintenance release with bug fixes and improvements + mainly in: + - the OpenGL rendering engine, + - the Python components, + - the Qt5 build, + - the Geographic view. + +- drop libtulip-qt4 package + +- Add use-libbfd.patch + +------------------------------------------------------------------- +Tue Nov 11 09:24:05 UTC 2014 - [email protected] + +- Update to 4.6.0 + +- New patches + - 0006-Find-system-ftgl.patch + +- Patches redone + tulip-lib64-install.patch + -> 0001-Install-to-lib64.patch + tulip-enable-tlprender.patch + -> 0002-Enable-tlprender.patch + tulip-ppc64.patch + -> 0003-Enable-PPC-and-PPC64.patch + tulip-libpng16.patch + -> 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch + tulip-system-ftgl.patch + -> 0005-Use-system-ftgl-lib-if-available.patch + +- Patches upstreamed or obsolete + - add-return-to-nonvoid-functions.patch + - tulip-3.7.0-src-fix-bashisms.patch + - tulip-cmake-2.8.12.patch + - tulip-crash-handler.patch + - tulip-gcc-4.7.patch + - tulip-3.7.0-src-fix-bashisms.patch + +------------------------------------------------------------------- @@ -11 +54 @@ -- Add tulip-cmake-2.8.12.patch: Fix build with cmake 2.8,12. +- Add tulip-cmake-2.8.12.patch: Fix build with cmake 2.8.12. Old: ---- add-return-to-nonvoid-functions.patch tulip-3.7.0-html.tar.bz2 tulip-3.7.0-src-fix-bashisms.patch tulip-3.7.0-src.tar.bz2 tulip-cmake-2.8.12.patch tulip-crash-handler.patch tulip-enable-tlprender.patch tulip-gcc-4.7.patch tulip-lib64-install.patch tulip-libpng16.patch tulip-ppc64.patch tulip-system-ftgl.patch New: ---- 0001-Install-to-lib64.patch 0002-Enable-tlprender.patch 0003-Enable-PPC-and-PPC64.patch 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch 0005-Use-system-ftgl-lib-if-available.patch 0006-Find-system-ftgl.patch tulip-4.6.1_src.tar.gz use-libbfd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tulip.spec ++++++ --- /var/tmp/diff_new_pack.SlNPby/_old 2015-01-20 12:34:21.000000000 +0100 +++ /var/tmp/diff_new_pack.SlNPby/_new 2015-01-20 12:34:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tulip # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,33 +20,30 @@ Summary: Visualization of huge graphs License: GPL-2.0+ Group: Productivity/Graphics/Visualization/Graph -Version: 3.7.0 +Version: 4.6.1 Release: 0 Url: http://www.tulip-software.org/ # .so version -%define tulip_version 3.7 -Source: %{name}-%{version}-src.tar.bz2 +%define tulip_version 4.6 +Source: %{name}-%{version}_src.tar.gz Source1: %{name}.desktop -Source2: %{name}-%{version}-html.tar.bz2 Source4: %{name}-rpmlintrc -Patch1: %{name}-lib64-install.patch -Patch2: %{name}-enable-tlprender.patch -# add return statements to nonvoid function without return -# upstream #3490918 -Patch3: add-return-to-nonvoid-functions.patch -Patch4: %{name}-gcc-4.7.patch -Patch5: tulip-ppc64.patch -Patch6: tulip-crash-handler.patch -# libpng16.patch emailed to [email protected] -Patch7: tulip-libpng16.patch + +Patch1: 0001-Install-to-lib64.patch +Patch2: 0002-Enable-tlprender.patch +Patch3: 0003-Enable-PPC-and-PPC64.patch +Patch4: 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch # link against system ftgl; if not applied, tulip builds it's own # copy and store it into /usr/lib64/libftgl.so, which conflicts # with ftgl-devel -Patch8: tulip-system-ftgl.patch -Patch9: tulip-cmake-2.8.12.patch -Patch10: tulip-3.7.0-src-fix-bashisms.patch +Patch5: 0005-Use-system-ftgl-lib-if-available.patch +# Fix FindFTGL.cmake +Patch6: 0006-Find-system-ftgl.patch +Patch7: use-libbfd.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel +BuildRequires: binutils-devel BuildRequires: cmake BuildRequires: dos2unix BuildRequires: doxygen @@ -54,15 +51,22 @@ BuildRequires: freefont BuildRequires: ftgl-devel BuildRequires: glew-devel +BuildRequires: graphviz +BuildRequires: libQtWebKit-devel BuildRequires: libdrm-devel BuildRequires: libjpeg-devel BuildRequires: libqt4-devel BuildRequires: libtool BuildRequires: libxml2-devel +BuildRequires: python-Sphinx +BuildRequires: python-devel +BuildRequires: quazip-devel +# BuildRequires: sphinx-devel BuildRequires: update-alternatives BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel %if 0%{?suse_version} > 1130 +BuildRequires: python-qt4-devel BuildRequires: qt4-assistant-adp-devel BuildRequires: pkgconfig(glu) %endif @@ -71,9 +75,6 @@ %else BuildRequires: gle %endif -# These are for (cd docs; make html) below -# To speed up build time, this is pre-generated -#BuildRequires: graphviz-gd xmltex passivetex texlive texlive-bin java libqt4-devel-doc-data %description Tulip software is a system dedicated to the visualization of huge @@ -94,9 +95,6 @@ Summary: Visualization of huge graphs - development files Group: Development/Libraries/Other Requires: tulip = %{version} -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif %description devel Tulip software is a system dedicated to the visualization of huge @@ -166,14 +164,25 @@ %description -n libtulip See package 'tulip' for details. -%package -n tulip-ogdf +%package ogdf Summary: A library for displaying graph in a GL context Group: Productivity/Graphics/Visualization/Graph Requires: Mesa -%description -n tulip-ogdf +%description ogdf See package 'tulip' for details. +%package python +Summary: Python bindings for tulip +Group: Development/Libraries/Python +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?py_requires: %define py_requires Requires: python} +%{py_requires} + +%description python +This package allows to control tulip with Python + %package -n libtulip-ogl Summary: A library for displaying graph in a GL context Group: Productivity/Graphics/Visualization/Graph @@ -182,80 +191,58 @@ %description -n libtulip-ogl See package 'tulip' for details. -%package -n libtulip-qt4 -Provides: libtulip-qt3 -Obsoletes: libtulip-qt3 -Summary: A set of Qt Widgets for tulip/tulip-ogl -Group: Productivity/Graphics/Visualization/Graph - -%description -n libtulip-qt4 -See package 'tulip' for details. - %prep -%setup -q -n %{name}-%{version}-src +%setup -q -n %{name} dos2unix CMakeLists.txt %patch1 -p1 -# tlprender disabled until OSmesa is available -##%patch2 -p1 +# not yet %patch2 -p1 %patch3 -p1 -%if 0%{?suse_version} > 1210 %patch4 -p1 -%endif %patch5 -p1 %patch6 -p1 -%patch7 -%patch8 -%if 0%{suse_version} > 1310 -# For cmake >= 2.8.12 -%patch9 -%endif -%patch10 -p1 +%patch7 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-deprecated" - -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=TRUE \ +# ensure we link against the dynamic libbfd, not the static one +export LIBBFD_SO_PATH=`ls /usr/lib*/libbfd*.so` +export LIBBFD_SO_NAME=`basename $LIBBFD_SO_PATH .so` +%{cmake} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing -Wall -O2 -g" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-deprecated -Wall -O2 -g" \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=1 -DSYSTEM_FTGL=1 - -# parallel make is not working, do not use it. -Marcus 20091115 -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" + -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=1 -DSYSTEM_FTGL=1 \ + -DLIBBFD_NAME=`echo $LIBBFD_SO_NAME | cut -b 4-` \ + -DBUILD_DOC=yes .. +# help python-Sphinx to find libtulip-core +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/build/library/tulip-core/src +make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" -k %{?_smp_mflags} # generating docs during build is disabled -#(cd docs; make html) +#(cd doc; make html) # copy pre-generated docs instead %install -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT%{_datadir}/tulip -(cd $RPM_BUILD_ROOT%{_datadir}/tulip; tar xf %{S:2}; mv %{name}-%{version}-html html) -%fdupes $RPM_BUILD_ROOT%{_datadir}/tulip/html -chmod -x NEWS -#cd docs -#sh gen-profile.sh -#make DESTDIR=${RPM_BUILD_ROOT} install -#cd .. +%cmake_install + +# move python files +mkdir -p $RPM_BUILD_ROOT%{python_sitearch} +mv $RPM_BUILD_ROOT%{_libdir}/python/* $RPM_BUILD_ROOT%{python_sitearch} + %suse_update_desktop_file -i tulip Graphics 3DGraphics find $RPM_BUILD_ROOT%{_libdir} -name *.la | xargs rm -f +rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a +rm -f $RPM_BUILD_ROOT/%{_datadir}/tulip/doc/tulip-user/html/.buildinfo +rm -f $RPM_BUILD_ROOT/%{_datadir}/tulip/doc/tulip-python/html/.buildinfo +%fdupes $RPM_BUILD_ROOT%{_datadir}/tulip/doc %fdupes $RPM_BUILD_ROOT%{_docdir}/tulip %fdupes $RPM_BUILD_ROOT%{_includedir}/tulip -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a - -%clean -rm -rf $RPM_BUILD_ROOT - %post -n libtulip -p /sbin/ldconfig %postun -n libtulip -p /sbin/ldconfig -%post -n libtulip-qt4 -p /sbin/ldconfig - -%postun -n libtulip-qt4 -p /sbin/ldconfig - %post -n libtulip-ogl -p /sbin/ldconfig %postun -n libtulip-ogl -p /sbin/ldconfig @@ -263,132 +250,76 @@ %files %defattr(-,root,root) %{_bindir}/tulip -%{_bindir}/tulip_app -%{_bindir}/tulip_need_restart -%{_bindir}/tulip_check_pl -# tlprender disabled until OSmesa is available -##%{_bindir}/tlprender +%{_bindir}/tulip_perspective %{_datadir}/applications/*.desktop -#%dir %{_libdir}/tlp -#%{_libdir}/libtulip-pluginsmanager-%{tulip_version}.so* %dir %{_datadir}/tulip %dir %{_datadir}/tulip/bitmaps %{_datadir}/tulip/bitmaps/* -%{_datadir}/tulip/tulip* -%doc NEWS +%doc AUTHORS COPYING COPYING.LESSER NEWS README -%files -n tulip-ogdf +%files ogdf %defattr(-,root,root) -%{_libdir}/libOGDF.so %dir %{_libdir}/tulip %{_libdir}/tulip/libogdf* %{_libdir}/libtulip-ogdf-%{tulip_version}.so +%files python +%defattr(-,root,root) +%{_libdir}/libtulip-python-%{tulip_version}.so +%{python_sitearch}/*.so +%{python_sitearch}/*.py* +%dir %{_datadir}/tulip/apiFiles +%{_datadir}/tulip/apiFiles/* + %files -n libtulip %defattr(-,root,root) -%{_bindir}/tulip-config -%{_libdir}/libgzstream.so -%{_libdir}/libtulip-%{tulip_version}.* +%{_libdir}/lib*-tulip-%{tulip_version}.so.* +%{_libdir}/libtulip-core-%{tulip_version}.so +%{_libdir}/libtulip-gui-%{tulip_version}.so %dir %{_libdir}/tulip -%dir %{_libdir}/tulip/interactors -%{_libdir}/tulip/interactors/lib*so -%{_libdir}/tulip/libAdjacencyMatrixImport-%{version}.* -%{_libdir}/tulip/libAutoSize-%{version}.* -%{_libdir}/tulip/libBetweennessCentrality-%{version}.* -%{_libdir}/tulip/libBiconnectedComponent-%{version}.* -%{_libdir}/tulip/libBubbleTree-%{version}.* -%{_libdir}/tulip/libCircular-%{version}.* -%{_libdir}/tulip/libClusterMetric-%{version}.* -%{_libdir}/tulip/libColorMapping-%{version}.so -%{_libdir}/tulip/libCompleteGraph-%{version}.* -%{_libdir}/tulip/libCompleteTree-%{version}.* -%{_libdir}/tulip/libConeTreeExtended-%{version}.* -%{_libdir}/tulip/libConnectedComponent-%{version}.* -%{_libdir}/tulip/libConnectedComponentPacking-%{version}.* -%{_libdir}/tulip/libDagLevelMetric-%{version}.* -%{_libdir}/tulip/libDegreeMetric-%{version}.so -%{_libdir}/tulip/libdelaunay-%{version}.so -%{_libdir}/tulip/libDendrogram-%{version}.* -%{_libdir}/tulip/libDepthMetric-%{version}.* -%{_libdir}/tulip/libDotImport-%{version}.* -%{_libdir}/tulip/libEccentricity-%{version}.* -%{_libdir}/tulip/libEqualValueClustering-%{version}.* -%{_libdir}/tulip/libGemLayout-%{version}.* -%{_libdir}/tulip/libHierarchicalGraph-%{version}.* -%{_libdir}/tulip/libGMLExport-%{version}.* -%{_libdir}/tulip/libGMLImport-%{version}.* -%{_libdir}/tulip/libGrid-%{version}.* -%{_libdir}/tulip/libHierarchicalClustering-%{version}.* -%{_libdir}/tulip/libIdMetric-%{version}.* -%{_libdir}/tulip/libImportPajek-%{version}.so -%{_libdir}/tulip/libImportUCINET-%{version}.so -%{_libdir}/tulip/libImprovedWalker-%{version}.* -%{_libdir}/tulip/libInducedSubGraphSelection-%{version}.* -%{_libdir}/tulip/libKruskal-%{version}.* -%{_libdir}/tulip/libLeafMetric-%{version}.* -%{_libdir}/tulip/libLoopSelection-%{version}.* -%{_libdir}/tulip/libMetricSizeMapping-%{version}.* -%{_libdir}/tulip/libMixedModel-%{version}.* -%{_libdir}/tulip/libMultipleSelection-%{version}.* -%{_libdir}/tulip/libNodeMetric-%{version}.* -%{_libdir}/tulip/libPathLengthMetric-%{version}.* -%{_libdir}/tulip/libPlanarGraph-%{version}.* -%{_libdir}/tulip/libQuotientClustering-%{version}.* -%{_libdir}/tulip/libRandom-%{version}.* -%{_libdir}/tulip/libRandomGraph-%{version}.* -%{_libdir}/tulip/libRandomMetric-%{version}.* -%{_libdir}/tulip/libRandomSimpleGraph-%{version}.* -%{_libdir}/tulip/libRandomTree-%{version}.* -%{_libdir}/tulip/libRandomTreeGeneral-%{version}.* -%{_libdir}/tulip/libReachableSubGraphSelection-%{version}.* -%{_libdir}/tulip/libSmallWorldGraph-%{version}.* -%{_libdir}/tulip/libSpanningDagSelection-%{version}.* -%{_libdir}/tulip/libSpanningTreeSelection-%{version}.* -%{_libdir}/tulip/libSquarifiedTreeMap-%{version}.* -%{_libdir}/tulip/libStrahlerMetric-%{version}.* -%{_libdir}/tulip/libStrengthClustering-%{version}.* -%{_libdir}/tulip/libStrengthMetric-%{version}.* -%{_libdir}/tulip/libStrongComponent-%{version}.* -%{_libdir}/tulip/libTreeLeaf-%{version}.* -%{_libdir}/tulip/libTreeRadial-%{version}.* -%{_libdir}/tulip/libTreeReingoldAndTilforExtended-%{version}.* -%{_libdir}/tulip/libTutte-%{version}.* +%{_libdir}/tulip/lib*-%{version}.so +%exclude %{_libdir}/tulip/libogdf* +%dir %{_libdir}/tulip/interactor +%{_libdir}/tulip/interactor/*.so +%dir %{_libdir}/tulip/perspective +%{_libdir}/tulip/perspective/*.so +%dir %{_libdir}/tulip/view +%{_libdir}/tulip/view/*.so +%exclude %{_libdir}/tulip/glyph/lib*-%{version}.* +%exclude %{_libdir}/tulip/libToLabels-%{version}.* %files -n libtulip-ogl %defattr(-,root,root) %{_libdir}/libtulip-ogl-%{tulip_version}.so -%dir %{_libdir}/tulip/glyphs -%{_libdir}/tulip/glyphs/lib*-%{version}.* -%{_libdir}/tulip/libFitToLabels-%{version}.* - -%files -n libtulip-qt4 -%defattr(-,root,root) -%{_libdir}/libtulip-qt4-%{tulip_version}.so -%{_libdir}/tulip/libConvolutionClustering-%{version}.* -%{_libdir}/tulip/libFileSystem-%{version}.* -%{_libdir}/tulip/libWebImport-%{version}.* -%dir %{_libdir}/tulip/view -%{_libdir}/tulip/view/libSpreadSheet-%{version}.* +%dir %{_libdir}/tulip/glyph +%{_libdir}/tulip/glyph/lib*-%{version}.* +%{_libdir}/tulip/libToLabels-%{version}.* %files doc %defattr(-,root,root) -%doc %dir %{_datadir}/tulip/html -%doc %dir %{_datadir}/tulip/html/common -%doc %{_datadir}/tulip/html/common -%doc %dir %{_datadir}/tulip/html/userHandbook -%doc %{_datadir}/tulip/html/userHandbook +%doc doc/Tulip_quickstart.pdf +%doc %dir %{_datadir}/tulip/doc +%doc %{_datadir}/tulip/doc/tulip-user +%doc %{_datadir}/tulip/doc/tulip-python +%exclude %{_datadir}/tulip/doc/doxygen +%exclude %{_datadir}/tulip/doc/tulip-dev %files devel %defattr(-,root,root) +%{_bindir}/tulip-config %dir %{_includedir}/tulip +%dir %{_includedir}/tulip2ogdf %{_includedir}/tulip/* +%{_includedir}/tulip2ogdf/* %{_datadir}/tulip/*.cmake +%dir %{_datadir}/tulip/wizards +%{_datadir}/tulip/wizards/* + +%{_libdir}/lib*-tulip-%{tulip_version}.so %files devel-doc %defattr(-,root,root) -%doc %dir %{_datadir}/tulip/html/doxygen -%doc %{_datadir}/tulip/html/doxygen -%doc %dir %{_datadir}/tulip/html/developerHandbook -%doc %{_datadir}/tulip/html/developerHandbook +%doc %dir %{_datadir}/tulip/doc/doxygen +%doc %dir %{_datadir}/tulip/doc/tulip-dev %changelog ++++++ 0001-Install-to-lib64.patch ++++++ >From fa04a6b0252f7b6dbc0897c2042cc46eb742f49c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 09:51:21 +0100 Subject: [PATCH 1/5] Install to lib64 --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 019dc9ada559..bdbba2b56502 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -418,7 +418,12 @@ SET(TulipPythonInclude ${PROJECT_SOURCE_DIR}/library/tulip-python/include) ## ======================================================== ## Install paths ## ======================================================== -SET(TulipLibInstallDir lib/) +# Library +IF (CMAKE_SIZEOF_VOID_P MATCHES "8") + SET(TulipLibInstallDir lib64/) +ELSE(CMAKE_SIZEOF_VOID_P MATCHES "8") + SET(TulipLibInstallDir lib/) +ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") SET(TulipPluginsInstallDir ${TulipLibInstallDir}/tulip/) SET(TulipGlyphPluginsInstallDir ${TulipPluginsInstallDir}/glyph/) SET(TulipViewPluginsInstallDir ${TulipPluginsInstallDir}/view/) -- 2.1.2 ++++++ 0002-Enable-tlprender.patch ++++++ >From 6d28369492823696fa029f21fb66764ae62152e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 09:52:57 +0100 Subject: [PATCH 2/5] Enable tlprender --- software/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/software/CMakeLists.txt b/software/CMakeLists.txt index a4195deb69a9..98d6bbe4a030 100644 --- a/software/CMakeLists.txt +++ b/software/CMakeLists.txt @@ -10,3 +10,4 @@ ADD_SUBDIRECTORY(plugin_server) IF(APPLE) ADD_SUBDIRECTORY(mac_launcher) ENDIF(APPLE) +ADD_SUBDIRECTORY(tlprender) -- 2.1.2 ++++++ 0003-Enable-PPC-and-PPC64.patch ++++++ >From 03e59382512020fa305800d5593365776358b416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 09:56:52 +0100 Subject: [PATCH 3/5] Enable PPC and PPC64 --- library/tulip-core/include/tulip/SystemDefinition.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/library/tulip-core/include/tulip/SystemDefinition.h b/library/tulip-core/include/tulip/SystemDefinition.h index e30d2afb3ee6..7629d3baafc8 100644 --- a/library/tulip-core/include/tulip/SystemDefinition.h +++ b/library/tulip-core/include/tulip/SystemDefinition.h @@ -35,6 +35,10 @@ #define OS_ARCHITECTURE "x86_64" #elif defined(__i386__) || defined(_M_IX86) #define OS_ARCHITECTURE "x86" +#elif defined(__powerpc__) +#define OS_ARCHITECTURE "ppc" +#elif defined(__powerpc64__) +#define OS_ARCHITECTURE "ppc64" #else #define OS_ARCHITECTURE "other" #endif -- 2.1.2 ++++++ 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch ++++++ >From 89b939b71193a63708cf5104814893989e6ed602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 10:03:05 +0100 Subject: [PATCH 4/5] Include string.h for libpng16 in GlTextureManager.cpp --- library/tulip-ogl/src/GlTextureManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/library/tulip-ogl/src/GlTextureManager.cpp b/library/tulip-ogl/src/GlTextureManager.cpp index e301250269a6..649bf3bffd79 100644 --- a/library/tulip-ogl/src/GlTextureManager.cpp +++ b/library/tulip-ogl/src/GlTextureManager.cpp @@ -26,6 +26,7 @@ #endif #include <jpeglib.h> #include <png.h> +#include <string.h> #include <GL/glew.h> #include <tulip/GlTextureManager.h> -- 2.1.2 ++++++ 0005-Use-system-ftgl-lib-if-available.patch ++++++ >From 305a77d0995b3b5bafbcfb057c1e07efd80d5ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 10:15:54 +0100 Subject: [PATCH 5/5] Use system ftgl lib if available --- CMakeLists.txt | 10 ++++++++-- thirdparty/CMakeLists.txt | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdbba2b56502..c52dcc564c48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -397,8 +397,14 @@ endif(QUAZIP_FOUND) SET(QxtInclude ${PROJECT_SOURCE_DIR}/thirdparty/qxt/src) SET(QxtLibrary qxt-tulip-${TulipMMVersion}) -SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) -SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) +IF(SYSTEM_FTGL) + FIND_PACKAGE(FTGL) + SET(FTGLInclude ${FTGL_INCLUDE_DIR}) + SET(FTGLLibrary ${FTGL_LIBRARIES}) +ELSE() + SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) + SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) +ENDIF() ENDIF(NOT BUILD_CORE_ONLY) SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index f05f780c3939..349fbf6f5ede 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -8,7 +8,9 @@ ADD_SUBDIRECTORY(libqhull) ADD_SUBDIRECTORY(yajl) IF(NOT BUILD_CORE_ONLY) +IF(NOT SYSTEM_FTGL) ADD_SUBDIRECTORY(ftgl) +ENDIF(NOT SYSTEM_FTGL) IF(NOT QUAZIP_FOUND) ADD_SUBDIRECTORY(quazip) ENDIF(NOT QUAZIP_FOUND) -- 2.1.2 ++++++ 0006-Find-system-ftgl.patch ++++++ >From cf20689d0f513863b7fef37c812d3938baee7756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 11 Nov 2014 11:04:20 +0100 Subject: [PATCH 6/6] Find system ftgl --- FindFTGL.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/FindFTGL.cmake b/FindFTGL.cmake index 613c659341bf..e484cfe9cdf0 100644 --- a/FindFTGL.cmake +++ b/FindFTGL.cmake @@ -45,13 +45,13 @@ # Once done this will define # # FTGL_FOUND - system has ftgl -# FTGL_INCLUDE_DIR - path to FTGL/FTGL.h +# FTGL_INCLUDE_DIR - path to FTGL/ftgl.h # FTGL_LIBRARIES - the library that must be included # # -FIND_PATH(FTGL_INCLUDE_DIR FTGL/FTGL.h +FIND_PATH(FTGL_INCLUDE_DIR FTGL/ftgl.h ${ADDITIONAL_INCLUDE_PATH} /usr/include /usr/X11/include @@ -61,8 +61,9 @@ FIND_PATH(FTGL_INCLUDE_DIR FTGL/FTGL.h IF (NOT WIN32) -FIND_FILE(FTGL_LIBRARIES libftgl.a +FIND_FILE(FTGL_LIBRARIES libftgl.so ${ADDITIONAL_LIBRARY_PATH} + /usr/lib64 /usr/lib /usr/X11/lib /usr/X11R6/lib -- 2.1.2 ++++++ use-libbfd.patch ++++++ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-tulip/software/crash_handling/CMakeLists.txt ./software/crash_handling/CMakeLists.txt --- ../orig-tulip/software/crash_handling/CMakeLists.txt 2015-01-11 22:16:08.000000000 +0100 +++ ./software/crash_handling/CMakeLists.txt 2015-01-14 14:24:20.760963420 +0100 @@ -41,7 +41,13 @@ TARGET_LINK_LIBRARIES(crash_handling ${CMAKE_DL_LIBS}) IF(HAVE_BFD) - TARGET_LINK_LIBRARIES(crash_handling bfd) + IF(LIBBFD_NAME) + set(BFD_LIBRARY_NAME ${LIBBFD_NAME}) + ELSE(LIBBFD_NAME) + set(BFD_LIBRARY_NAME bfd) + ENDIF(LIBBFD_NAME) + MESSAGE("Linking against bfd ${BFD_LIBRARY_NAME}") + TARGET_LINK_LIBRARIES(crash_handling ${BFD_LIBRARY_NAME}) ENDIF(HAVE_BFD) IF(MINGW) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
