Hello community, here is the log from the commit of package tulip for openSUSE:Factory checked in at 2013-04-23 17:37:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tulip (Old) and /work/SRC/openSUSE:Factory/.tulip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tulip", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/tulip/tulip.changes 2012-09-21 13:48:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tulip.new/tulip.changes 2013-04-23 17:37:46.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Apr 19 20:03:16 UTC 2013 - [email protected] + +- build against system ftgl + +------------------------------------------------------------------- +Tue Apr 9 08:57:50 UTC 2013 - [email protected] + +- builds also with libpng16 + * libpng16.patch + +------------------------------------------------------------------- New: ---- tulip-libpng16.patch tulip-system-ftgl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tulip.spec ++++++ --- /var/tmp/diff_new_pack.cLrZa3/_old 2013-04-23 17:37:58.000000000 +0200 +++ /var/tmp/diff_new_pack.cLrZa3/_new 2013-04-23 17:37:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tulip # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -37,6 +37,12 @@ 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 +# 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel BuildRequires: cmake @@ -195,6 +201,8 @@ %endif %patch5 -p1 %patch6 -p1 +%patch7 +%patch8 %build @@ -204,7 +212,7 @@ 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 + -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" @@ -272,7 +280,6 @@ %files -n libtulip %defattr(-,root,root) %{_bindir}/tulip-config -%{_libdir}/libftgl.so %{_libdir}/libgzstream.so %{_libdir}/libtulip-%{tulip_version}.* %dir %{_libdir}/tulip ++++++ tulip-libpng16.patch ++++++ --- library/tulip-ogl/src/GlTextureManager.cpp.old 2013-04-09 09:11:38.541469488 +0200 +++ library/tulip-ogl/src/GlTextureManager.cpp 2013-04-09 09:11:54.557541872 +0200 @@ -31,6 +31,7 @@ extern "C" { #include <jpeglib.h> #include <png.h> +#include <string.h> }; //==================================================== ++++++ tulip-system-ftgl.patch ++++++ Index: CMakeLists.txt =================================================================== --- CMakeLists.txt.orig +++ CMakeLists.txt @@ -238,11 +238,13 @@ SET(GZStreamInclude ${PROJECT_SOURCE_DIR SET(GZStreamLibrary gzstream) SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) SET(OGDFLibrary OGDF) -IF(UBUNTU_PPA_BUILD) +IF(SYSTEM_FTGL) FIND_PACKAGE(FTGL) SET(FTGLInclude ${FTGL_INCLUDE_DIR}) + SET(FTGLLibrary ${FTGL_LIBRARY}) ELSE() SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) + SET(FTGLLibrary ftgl) ENDIF() SET(TulipInclude ${PROJECT_SOURCE_DIR}/library/tulip/include/) Index: FindFTGL.cmake =================================================================== --- FindFTGL.cmake.orig +++ FindFTGL.cmake @@ -135,4 +135,6 @@ IF(NOT FTGL_FOUND) MESSAGE(STATUS "${FTGL_DIR_MESSAGE}") ELSE(NOT FTGL_FIND_QUIETLY) ENDIF(FTGL_FIND_REQUIRED) +ELSE(NOT FTGL_FOUND) + MESSAGE(STATUS "Found FTGL: ${FTGL_LIBRARY}") ENDIF(NOT FTGL_FOUND) Index: library/tulip-ogl/src/CMakeLists.txt =================================================================== --- library/tulip-ogl/src/CMakeLists.txt.orig +++ library/tulip-ogl/src/CMakeLists.txt @@ -87,7 +87,7 @@ IF(ENABLE_RENDERING_TIME_DISPLAY) ENDIF(ENABLE_RENDERING_TIME_DISPLAY) ADD_LIBRARY (${LibTulipOglName} SHARED ${tulip-ogl_LIB_SRCS}) -TARGET_LINK_LIBRARIES(${LibTulipOglName} ftgl) +TARGET_LINK_LIBRARIES(${LibTulipOglName} ${FTGLLibrary}) TARGET_LINK_LIBRARIES(${LibTulipOglName} ${GLEW_LIBRARY}) TARGET_LINK_LIBRARIES(${LibTulipOglName} ${LibTulipName}) TARGET_LINK_LIBRARIES(${LibTulipOglName} ${OPENGL_glu_LIBRARY}) Index: library/tulip/include/tulip/SimpleVector.h =================================================================== --- library/tulip/include/tulip/SimpleVector.h.orig +++ library/tulip/include/tulip/SimpleVector.h @@ -21,6 +21,8 @@ #ifndef _SIMPLE_VECTOR_H_ #define _SIMPLE_VECTOR_H_ +#include <stdlib.h> + namespace tlp { // SimpleVector Index: thirdparty/CMakeLists.txt =================================================================== --- thirdparty/CMakeLists.txt.orig +++ thirdparty/CMakeLists.txt @@ -1,7 +1,7 @@ ADD_SUBDIRECTORY(gzstream) ADD_SUBDIRECTORY(OGDF) -IF(NOT UBUNTU_PPA_BUILD) +IF(NOT SYSTEM_FTGL) ADD_SUBDIRECTORY(ftgl) ENDIF() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
