February 2013 - rpmfusion-commits

by Richard Shaw

Author: hobbes1069 Update of /cvs/nonfree/rpms/OCE/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22957 Modified Files: OCE.spec Log Message: Change tbb BuildRequires to match tbb package arches. Index: OCE.spec =================================================================== RCS file: /cvs/nonfree/rpms/OCE/devel/OCE.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- OCE.spec 18 Feb 2013 21:23:26 -0000 1.5 +++ OCE.spec 19 Feb 2013 12:52:15 -0000 1.6 @@ -44,7 +44,7 @@ BuildRequires: libgomp BuildRequires: tcl-devel BuildRequires: tk-devel -%ifnarch %arm +%ifarch %{ix86} x86_64 ia64 ppc ppc64 BuildRequires: tbb-devel %endif

11 years, 8 months

1
0
0 / 0

rpms/smesh/F-18 smesh-5.1.2.2-pi_to_m_pi.patch, NONE, 1.1 smesh-5.1.2.2-rm_f2c.patch, NONE, 1.1 smesh.spec, 1.4, 1.5 sources, 1.2, 1.3

by Richard Shaw

Author: hobbes1069 Update of /cvs/nonfree/rpms/smesh/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29237 Modified Files: smesh.spec sources Added Files: smesh-5.1.2.2-pi_to_m_pi.patch smesh-5.1.2.2-rm_f2c.patch Log Message: * Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-1.svn55 - Update for compatibility with new OCE. smesh-5.1.2.2-pi_to_m_pi.patch: Controls/SMESH_Controls.cpp | 5 +++++ SMESH/SMESH_MeshEditor.cpp | 4 ++++ SMESH/SMESH_Pattern.cpp | 5 +++++ StdMeshers/StdMeshers_AutomaticLength.cpp | 5 +++++ StdMeshers/StdMeshers_CompositeHexa_3D.cpp | 4 ++++ StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp | 5 +++++ StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp | 4 ++++ 7 files changed, 32 insertions(+) --- NEW FILE smesh-5.1.2.2-pi_to_m_pi.patch --- diff -Naur smesh-5.1.2.2.orig/src/Controls/SMESH_Controls.cpp smesh-5.1.2.2/src/Controls/SMESH_Controls.cpp --- smesh-5.1.2.2.orig/src/Controls/SMESH_Controls.cpp 2009-12-16 09:01:21.000000000 -0600 +++ smesh-5.1.2.2/src/Controls/SMESH_Controls.cpp 2013-02-15 14:58:28.357147721 -0600 @@ -64,6 +64,11 @@ #include "SMESHDS_Mesh.hxx" #include "SMESHDS_GroupBase.hxx" +#ifndef PI +# include <math.h> +# define PI M_PI +#endif + /* AUXILIARY METHODS */ diff -Naur smesh-5.1.2.2.orig/src/SMESH/SMESH_MeshEditor.cpp smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp --- smesh-5.1.2.2.orig/src/SMESH/SMESH_MeshEditor.cpp 2013-02-15 14:42:44.453062739 -0600 +++ smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp 2013-02-15 14:51:15.754435891 -0600 @@ -84,6 +84,10 @@ #define cast2Node(elem) static_cast<const SMDS_MeshNode*>( elem ) +#ifndef PI +# define PI M_PI +#endif + using namespace std; using namespace SMESH::Controls; diff -Naur smesh-5.1.2.2.orig/src/SMESH/SMESH_Pattern.cpp smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp --- smesh-5.1.2.2.orig/src/SMESH/SMESH_Pattern.cpp 2013-02-15 14:42:44.457062609 -0600 +++ smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp 2013-02-15 14:55:31.929960525 -0600 @@ -75,6 +75,11 @@ #include "utilities.h" +#ifndef PI +# include <math.h> +# define PI M_PI +#endif + using namespace std; typedef map< const SMDS_MeshElement*, int > TNodePointIDMap; diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_AutomaticLength.cpp smesh-5.1.2.2/src/StdMeshers/StdMeshers_AutomaticLength.cpp --- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_AutomaticLength.cpp 2009-12-16 09:01:21.000000000 -0600 +++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_AutomaticLength.cpp 2013-02-15 15:00:49.259529380 -0600 @@ -38,6 +38,11 @@ #include <TopoDS.hxx> #include <TopoDS_Edge.hxx> +#ifndef PI +# include <math.h> +# define PI M_PI +#endif + using namespace std; //============================================================================= diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp smesh-5.1.2.2/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp --- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp 2009-12-16 09:01:21.000000000 -0600 +++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp 2013-02-15 15:03:10.805901650 -0600 @@ -57,6 +57,10 @@ #include <set> #include <vector> +#ifndef PI +# include <math.h> +# define PI M_PI +#endif #ifdef _DEBUG_ diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp smesh-5.1.2.2/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp --- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp 2009-12-16 09:01:21.000000000 -0600 +++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp 2013-02-15 15:05:12.937914205 -0600 @@ -40,6 +40,11 @@ #include <gp_Lin.hxx> #include <gp_Pln.hxx> +#ifndef PI +# include <math.h> +# define PI M_PI +#endif + #ifndef __BORLANDC__ #include <NCollection_Array1.hxx> typedef NCollection_Array1<TColStd_SequenceOfInteger> StdMeshers_Array1OfSequenceOfInteger; diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp smesh-5.1.2.2/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp --- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp 2009-12-16 09:01:21.000000000 -0600 +++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp 2013-02-15 15:09:28.717572007 -0600 @@ -55,6 +55,10 @@ #include <TopExp_Explorer.hxx> #include <TopoDS.hxx> +#ifndef PI +# include <math.h> +# define PI M_PI +#endif using namespace std; smesh-5.1.2.2-rm_f2c.patch: CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE smesh-5.1.2.2-rm_f2c.patch --- diff -Naur smesh-5.1.2.2.orig/CMakeLists.txt smesh-5.1.2.2/CMakeLists.txt --- smesh-5.1.2.2.orig/CMakeLists.txt 2012-07-05 10:03:58.241643809 -0500 +++ smesh-5.1.2.2/CMakeLists.txt 2012-07-05 10:04:37.340404971 -0500 @@ -160,7 +160,7 @@ INCLUDE_DIRECTORIES(src/StdMeshers) ADD_LIBRARY(StdMeshers SHARED ${StdMeshers_source_files}) -TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c) +TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools) ########### # INSTALL # Index: smesh.spec =================================================================== RCS file: /cvs/nonfree/rpms/smesh/F-18/smesh.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- smesh.spec 22 Oct 2012 20:34:39 -0000 1.4 +++ smesh.spec 18 Feb 2013 21:25:33 -0000 1.5 @@ -3,9 +3,11 @@ %global cmake %cmake28 %endif +%global svnrev 55 + Name: smesh Version: 5.1.2.2 -Release: 5.svn54%{?dist} +Release: 6.svn%{svnrev}%{?dist} Summary: OpenCascade based MESH framework # This library is LGPLv2+ but links against the non-free library OCE. @@ -14,13 +16,14 @@ # Source is svn checkout since the last release is too old: # https://salomesmesh.svn.sourceforge.net/svnroot/salomesmesh/trunk -Source0: smesh-5.1.2.2-svn54.tar.gz +Source0: %{name}-%{version}.svn%{svnrev}.tar.gz # Patch emailed upstream to Fotios Sioutis <sfotis(a)gmail.com> # on 12/21/11. Patch0: smesh.patch Patch1: smesh-cmake_fixes.patch Patch2: smesh-5.1.2.2-rm_f2c.patch +Patch3: smesh-5.1.2.2-pi_to_m_pi.patch %if 0%{?rhel} BuildRequires: cmake28 @@ -61,10 +64,11 @@ %prep -%setup -q -c %{name}-%{version} +%setup -q -n %{name}-%{version}.svn%{svnrev} %patch0 -p1 %patch1 -p1 -b .cmakefix %patch2 -p1 -b .f2c +%patch3 -p1 -b .pi dos2unix -k LICENCE.lgpl.txt @@ -108,6 +112,9 @@ %changelog +* Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-1.svn55 +- Update for compatibility with new OCE. + * Mon Oct 22 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-5.svn54 - Remove build requirement for fortran (f2c). - Initial packaging for EPEL 6. Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/smesh/F-18/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jan 2012 19:48:26 -0000 1.2 +++ sources 18 Feb 2013 21:25:33 -0000 1.3 @@ -1 +1 @@ -00ed8a488d1ddeb05d1777430094df80 smesh-5.1.2.2-svn54.tar.gz +2b8ae645c029715737265561ccfa3551 smesh-5.1.2.2.svn55.tar.gz

11 years, 8 months

1
0
0 / 0

rpms/OCE/devel OCE.spec,1.4,1.5

by Richard Shaw

Author: hobbes1069 Update of /cvs/nonfree/rpms/OCE/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29040 Modified Files: OCE.spec Log Message: * Mon Feb 18 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.11-2 - Add tbb-devel as build requirement. Index: OCE.spec =================================================================== RCS file: /cvs/nonfree/rpms/OCE/devel/OCE.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- OCE.spec 18 Feb 2013 14:41:48 -0000 1.4 +++ OCE.spec 18 Feb 2013 21:23:26 -0000 1.5 @@ -7,7 +7,7 @@ Name: OCE Version: 0.11 -Release: 1%{?relcan:.rc%{relcan}}%{?dist} +Release: 2%{?relcan:.rc%{relcan}}%{?dist} Summary: OpenCASCADE Community Edition License: Open CASCADE Technology Public License @@ -44,6 +44,9 @@ BuildRequires: libgomp BuildRequires: tcl-devel BuildRequires: tk-devel +%ifnarch %arm +BuildRequires: tbb-devel +%endif %description @@ -302,6 +305,9 @@ %changelog +* Mon Feb 18 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.11-2 +- Add tbb-devel as build requirement. + * Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.11-1 - Update to latest upstream release.

11 years, 8 months

1
0
0 / 0

rpms/libva-vdpau-driver/devel libva-vdpau-driver.spec,1.4,1.5

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/libva-vdpau-driver/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28432 Modified Files: libva-vdpau-driver.spec Log Message: Update spec Index: libva-vdpau-driver.spec =================================================================== RCS file: /cvs/free/rpms/libva-vdpau-driver/devel/libva-vdpau-driver.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libva-vdpau-driver.spec 11 Jan 2013 20:25:42 -0000 1.4 +++ libva-vdpau-driver.spec 18 Feb 2013 21:04:32 -0000 1.5 @@ -2,14 +2,14 @@ Name: libva-vdpau-driver Version: 0.7.4 -Release: 2%{?preversion}%{?dist} +Release: 3%{?preversion}%{?dist} Summary: HW video decode support for VDPAU platforms Group: System Environment/Libraries License: GPLv2+ URL: http://cgit.freedesktop.org/vaapi/vdpau-driver Source0: http://www.freedesktop.org/software/vaapi/releases/%{name}/%{name}-%{vers... Patch0: 0001-Fix-libva-vdpau-driver-with-GL_GLEXT_VERSION-85.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + #BuildRequires: libtool BuildRequires: libva-devel BuildRequires: libvdpau-devel @@ -28,23 +28,26 @@ %patch0 -p1 %build -%configure --enable-glx +%configure \ + --disable-silent-rules \ + --enable-glx + make %{?_smp_mflags} %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} find %{buildroot} -name '*.la' -exec rm -f {} ';' -%clean -rm -rf %{buildroot} %files -%defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %{_libdir}/dri/*.so %changelog +* Mon Feb 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.4-3 +- Add --disable-silent-rules +- Clean-up spec + * Fri Jan 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.4-2 - Fix build with recent mesa

11 years, 8 months

1
0
0 / 0

rpms/freecad/devel freecad-0.13-pycxx.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 freecad.spec, 1.4, 1.5 sources, 1.2, 1.3 freecad-0.12-OpenCASCADE-option.patch, 1.1, NONE freecad-0.12-pycxx.patch, 1.1, NONE freecad-0.12-rm_f2c.patch, 1.1, NONE freecad-0.12-zipios.patch, 1.1, NONE freecad-StartPage.patch, 1.1, NONE freecad-cmake_Mod_fix.patch, 1.1, NONE freecad-gcc-4.7.patch, 1.1, NONE freecad-glu.patch, 1.1, NONE freecad-system_inst.patch, 1.1, NONE

by Richard Shaw

Author: hobbes1069 Update of /cvs/nonfree/rpms/freecad/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18976 Modified Files: .cvsignore freecad.spec sources Added Files: freecad-0.13-pycxx.patch Removed Files: freecad-0.12-OpenCASCADE-option.patch freecad-0.12-pycxx.patch freecad-0.12-rm_f2c.patch freecad-0.12-zipios.patch freecad-StartPage.patch freecad-cmake_Mod_fix.patch freecad-gcc-4.7.patch freecad-glu.patch freecad-system_inst.patch Log Message: * Mon Feb 18 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.13-1 - Update to latest upstream release. freecad-0.13-pycxx.patch: FreeCAD-0.12.5284/cMake/FindPyCXX.cmake | 107 +++++++++++++++++++++++++++ freecad-0.13.a057590/CMakeLists.txt | 11 ++ freecad-0.13.a057590/src/Base/CMakeLists.txt | 18 ---- 3 files changed, 121 insertions(+), 15 deletions(-) --- NEW FILE freecad-0.13-pycxx.patch --- diff -Naur freecad-0.13.a057590.orig/CMakeLists.txt freecad-0.13.a057590/CMakeLists.txt --- freecad-0.13.a057590.orig/CMakeLists.txt 2013-01-12 08:10:36.000000000 -0600 +++ freecad-0.13.a057590/CMakeLists.txt 2013-01-17 16:04:52.117940071 -0600 @@ -73,6 +73,13 @@ SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files") SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files") +SET(PYCXX_INCLUDE_DIR + "${CMAKE_CURRENT_LIST_DIR}/src" CACHE PATH + "Path to the directory containing PyCXX's CXX/Config.hxx include file") +SET(PYCXX_SOURCE_DIR + "${CMAKE_CURRENT_LIST_DIR}/src/CXX" CACHE PATH + "Path to the directory containing PyCXX's cxxextensions.c source file") + # used as compiler defines SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}") SET(DOCDIR "${CMAKE_INSTALL_DOCDIR}") @@ -201,6 +208,10 @@ find_package(ZLIB REQUIRED) +# -------------------------------- PyCXX -------------------------------- + + find_package(PyCXX REQUIRED) + # -------------------------------- OpenCasCade -------------------------------- #first, look for OpenCASCADE Community Edition (OCE) diff -Naur freecad-0.13.a057590.orig/src/Base/CMakeLists.txt freecad-0.13.a057590/src/Base/CMakeLists.txt --- freecad-0.13.a057590.orig/src/Base/CMakeLists.txt 2013-01-12 08:10:36.000000000 -0600 +++ freecad-0.13.a057590/src/Base/CMakeLists.txt 2013-01-17 16:06:36.985515701 -0600 @@ -124,20 +124,6 @@ SOURCE_GROUP("zipios" FILES ${zipios_SRCS}) endif () -SET(pycxx_SRCS - ../CXX/Config.hxx - ../CXX/cxxextensions.c - ../CXX/cxx_extensions.cxx - ../CXX/cxxsupport.cxx - ../CXX/Exception.hxx - ../CXX/Extensions.hxx - ../CXX/IndirectPythonInterface.cxx - ../CXX/IndirectPythonInterface.hxx - ../CXX/Objects.hxx - ../CXX/Version.hxx - ../CXX/WrapPython.h -) -SOURCE_GROUP("pycxx" FILES ${pycxx_SRCS}) SET(FreeCADBase_XML_SRCS AxisPy.xml @@ -279,7 +265,6 @@ ) SET(FreeCADBase_SRCS - ${pycxx_SRCS} ${FreeCADBase_CPP_SRCS} ${FreeCADBase_HPP_SRCS} ${FreeCADBase_XML_SRCS} @@ -310,6 +295,9 @@ list(APPEND FreeCADBase_SRCS ${zipios_SRCS}) endif(FREECAD_USE_EXTERNAL_ZIPIOS) +include_directories(${PYCXX_INCLUDE_DIR}) +list(APPEND FreeCADBase_SRCS ${PYCXX_SOURCES}) +SOURCE_GROUP("pycxx" FILES ${PYCXX_SOURCES}) if(MSVC) add_definitions(-D_PreComp_) This patch adds an option to FreeCAD's cmake to specify an external PyCXX. PyCXX doesn't really have a standard location, so this will try to guess a couple of places, but best is to specify on the cmake command line: cmake -DPYCXX_INCLUDE_DIR=/usr/include/python2.7 \ -DPYCXX_SOURCE_DIR=/usr/share/python2.7/CXX diff -ruN FreeCAD-0.12.5284.orig/cMake/FindPyCXX.cmake FreeCAD-0.12.5284/cMake/FindPyCXX.cmake --- FreeCAD-0.12.5284.orig/cMake/FindPyCXX.cmake 1969-12-31 18:00:00.000000000 -0600 +++ FreeCAD-0.12.5284/cMake/FindPyCXX.cmake 2012-06-25 01:30:25.000000000 -0500 @@ -0,0 +1,107 @@ +# Locate PyCXX headers and source files + +# This module defines +# PYCXX_INCLUDE_DIR +# PYCXX_SOURCE_DIR +# PYCXX_FOUND +# PYCXX_SOURCES +# +# The PYCXX_*_DIR variables can be set to tell this module where +# the files are. + + +# There's no standard location for PyCXX. +# +# The authors' example is to put it in "~\" [sic]. +# +# Ubuntu puts the includes into /usr/include/python2.7/CXX and sources into +# /usr/share/python2.7/CXX. +# +# The Zultron Fedora RPM does the same as Ubuntu. + +set(PYCXX_FOUND "YES") + +# find the header directory +if(PYCXX_INCLUDE_DIR) + # headers better be in there + if(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx") + if(PYCXX_FIND_REQUIRED) + MESSAGE(FATAL_ERROR + "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR " + "${PYCXX_INCLUDE_DIR}") + else(PYCXX_FIND_REQUIRED) + MESSAGE(WARNING + "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR " + "${PYCXX_INCLUDE_DIR}") + unset(PYCXX_FOUND) + endif(PYCXX_FIND_REQUIRED) + endif(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx") +else(PYCXX_INCLUDE_DIR) + # check in 'standard' places + find_path(PYCXX_INCLUDE_DIR CXX/Config.hxx + ${PYTHON_INCLUDE_DIR} + "${CMAKE_CURRENT_LIST_DIR}/..") + if(NOT PYCXX_INCLUDE_DIR) + if(PYCXX_FIND_REQUIRED) + MESSAGE(FATAL_ERROR + "PyCXX not found; please set PYCXX_INCLUDE_DIR to " + "the location of CXX/Config.hxx") + else(PYCXX_FIND_REQUIRED) + MESSAGE(STATUS "PyCXX not found") + unset(PYCXX_FOUND) + endif(PYCXX_FIND_REQUIRED) + endif(NOT PYCXX_INCLUDE_DIR) +endif(PYCXX_INCLUDE_DIR) + +# find the sources directory +if(PYCXX_SOURCE_DIR) + # source directory specified, they'd better be there + if(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c") + if(PYCXX_FIND_REQUIRED) + MESSAGE(FATAL_ERROR + "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR " + "${PYCXX_INCLUDE_DIR}") + else(PYCXX_FIND_REQUIRED) + MESSAGE(WARNING + "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR " + "${PYCXX_INCLUDE_DIR}") + unset(PYCXX_FOUND) + endif(PYCXX_FIND_REQUIRED) + endif(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c") +else(PYCXX_SOURCE_DIR) + # check in 'standard' places + find_path(PYCXX_SOURCE_DIR cxxextensions.c + "${PYCXX_INCLUDE_DIR}/CXX" + "${PYCXX_INCLUDE_DIR}/Src" + "${PYTHON_INCLUDE_DIR}/CXX" + "${PYTHON_INCLUDE_DIR}/Src" + "${CMAKE_CURRENT_LIST_DIR}/../Src" + "${CMAKE_CURRENT_LIST_DIR}/../CXX") + if(NOT PYCXX_SOURCE_DIR) + if(PYCXX_FIND_REQUIRED) + MESSAGE(FATAL_ERROR + "PyCXX not found; please set PYCXX_SOURCE_DIR to " + "the location of cxxextensions.c") + else(PYCXX_FIND_REQUIRED) + MESSAGE(STATUS "PyCXX not found") + unset(PYCXX_FOUND) + endif(PYCXX_FIND_REQUIRED) + endif(NOT PYCXX_SOURCE_DIR) +endif(PYCXX_SOURCE_DIR) + +# see what we've got +if(PYCXX_FOUND) + MESSAGE(STATUS "PyCXX found:") + MESSAGE(STATUS " Headers: ${PYCXX_INCLUDE_DIR}") + MESSAGE(STATUS " Sources: ${PYCXX_SOURCE_DIR}") + + # Build the list of sources for convenience + set(PYCXX_SOURCES + ${PYCXX_SOURCE_DIR}/cxxextensions.c + ${PYCXX_SOURCE_DIR}/cxx_extensions.cxx + ${PYCXX_SOURCE_DIR}/cxxsupport.cxx + ${PYCXX_SOURCE_DIR}/IndirectPythonInterface.cxx + ) +else(PYCXX_FOUND) + MESSAGE(STATUS "PyCXX not found") +endif(PYCXX_FOUND) Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/freecad/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jul 2012 03:15:42 -0000 1.2 +++ .cvsignore 18 Feb 2013 18:20:09 -0000 1.3 @@ -1 +1 @@ -freecad-0.12.5284.tar.gz +freecad-0.13.1830.tar.gz Index: freecad.spec =================================================================== RCS file: /cvs/nonfree/rpms/freecad/devel/freecad.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- freecad.spec 23 Oct 2012 19:14:07 -0000 1.4 +++ freecad.spec 18 Feb 2013 18:20:09 -0000 1.5 @@ -1,12 +1,17 @@ # Maintainers: keep this list of plugins up to date # List plugins in %%{_libdir}/freecad/lib, less '.so' and 'Gui.so', here -%global plugins Complete Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part PartDesign Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web +%global plugins Assembly Complete Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web + +# Some plugins go in the Mod folder instead of lib. Deal with those here: +%global mod_plugins Mod/PartDesign # This revision is 0.12 final. -%global svnrev 5284 +%global rev 1830 # Use updated cmake package on EL builds. -%if 0%{?rhel} +# Temporary workaround for cmake/boost bug: +# http://public.kitware.com/Bug/view.php?id=13446 +%if 0%{?el6} %global cmake %cmake28 -DBoost_NO_BOOST_CMAKE=ON %endif @@ -22,8 +27,8 @@ Name: freecad -Version: 0.12 -Release: 9%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: A general purpose 3D CAD modeler Group: Applications/Engineering @@ -31,45 +36,26 @@ # on OCE which is considered non-free. License: GPLv3+ with exception URL: http://sourceforge.net/apps/mediawiki/free-cad/ -Source0: http://downloads.sourceforge.net/free-cad/%{name}-%{version}.%{svnrev}.ta... +Source0: http://downloads.sourceforge.net/free-cad/%{name}-%{version}.%{rev}.tar.gz Source101: freecad.desktop Source102: freecad.1 -# Patches 0 & 2 accepted upstream. -# https://sourceforge.net/apps/mantisbt/free-cad/view.php?id=519 -# Fix a bunch of rpath issues and other tweaks. -Patch0: freecad-system_inst.patch -# Remove bundled libs from cmake configuration. -Patch1: freecad-3rdParty.patch -# Fix incomplete cmake config. -Patch2: freecad-StartPage.patch -# Fixed in svn -Patch3: freecad-glu.patch -# Disable unfinished modules. -Patch4: freecad-cmake_Mod_fix.patch -# Unbundle zipios++ -Patch5: freecad-0.12-zipios.patch -# Patch for gcc 4.7 -Patch6: freecad-gcc-4.7.patch -# Add build option for OpenCASCADE -Patch7: freecad-0.12-OpenCASCADE-option.patch -# Unbundle PyCXX -Patch8: freecad-0.12-pycxx.patch -# f2c is only needed for smesh, and maybe not even there -Patch9: freecad-0.12-rm_f2c.patch +Patch0: freecad-3rdParty.patch +Patch1: freecad-0.13-pycxx.patch # Utilities -%if (0%{?rhel} == 6) +%if 0%{?rhel} BuildRequires: cmake28 %else BuildRequires: cmake %endif -BuildRequires: doxygen graphviz swig +BuildRequires: doxygen swig graphviz BuildRequires: gcc-gfortran BuildRequires: gettext BuildRequires: dos2unix BuildRequires: desktop-file-utils +BuildRequires: tbb-devel # Development Libraries BuildRequires: freeimage-devel BuildRequires: libXmu-devel @@ -102,11 +88,15 @@ %if ! %{bundled_pycxx} BuildRequires: python-pycxx-devel %endif +BuildRequires: libicu-devel +BuildRequires: python-matplotlib # Needed for plugin support and is not a soname dependency. Requires: python-pivy Requires: PyQt4 Requires: hicolor-icon-theme +Requires: python-matplotlib +Requires: python-collada # plugins and private shared libs in %%{_libdir}/freecad/lib are private; # prevent private capabilities being advertised in Provides/Requires @@ -115,6 +105,8 @@ %filter_provides_in %{_libdir}/%{name}/lib %filter_from_requires %{plugin_regexp} %filter_from_provides %{plugin_regexp} +%filter_provides_in %{_libdir}/%{name}/Mod +%filter_requires_in %{_libdir}/%{name}/Mod %filter_setup } @@ -140,22 +132,18 @@ %prep -%setup -q -n FreeCAD-%{version}.%{svnrev} - -%patch0 -p1 -b .sysinst -%patch1 -p1 -b .3rdparty -%patch2 -p1 -b .startpage -%patch3 -p1 -b .glufix -%patch4 -p1 -b .modfix -%patch5 -p1 -b .zipios -%patch6 -p1 -b .gcc47 -%patch7 -p1 -b .OCC +#setup -q -n FreeCAD-%{version}.%{svnrev} +%setup -q -n freecad-%{version}.%{rev} +%patch0 -p1 -b .3rdparty # Remove bundled pycxx if we're not using it %if ! %{bundled_pycxx} -%patch8 -p1 -b .pycxx +%patch1 -p1 -b .pycxx rm -rf src/CXX %endif -%patch9 -p1 -b .f2c + +%if ! %{bundled_zipios} +rm -rf src/zipios++ +%endif # Fix encodings dos2unix -k src/Mod/Test/unittestgui.py \ @@ -171,11 +159,14 @@ rm -rf build && mkdir build && pushd build LDFLAGS='-Wl,--as-needed'; export LDFLAGS -%cmake -DCMAKE_INSTALL_PREFIX=%{_libdir}/freecad \ +%cmake -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \ + -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \ + -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DRESOURCEDIR=%{_libdir}/freecad \ - -DDOCDIR=%{_docdir}/%{name} \ -DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin2 \ -DCOIN3D_DOC_PATH=%{_datadir}/Coin2/Coin \ + -DFREECAD_USE_EXTERNAL_PIVY=TRUE \ %if %{occ} -DUSE_OCC=TRUE \ %endif @@ -183,7 +174,7 @@ -DSMESH_INCLUDE_DIR=%{_includedir} \ %endif %if ! %{bundled_zipios} - -DUSE_EXTERNAL_ZIPIOS=TRUE \ + -DFREECAD_USE_EXTERNAL_ZIPIOS=TRUE \ %endif %if ! %{bundled_pycxx} -DPYCXX_INCLUDE_DIR=$(pkg-config --variable=includedir PyCXX) \ @@ -193,6 +184,8 @@ make %{?_smp_mflags} +make doc + %install pushd build @@ -207,7 +200,7 @@ popd # Fix problems with unittestgui.py -chmod +x %{buildroot}%{_libdir}/%{name}/Mod/Test/unittestgui.py +#chmod +x %{buildroot}%{_libdir}/%{name}/Mod/Test/unittestgui.py # Install desktop file desktop-file-install \ @@ -278,9 +271,9 @@ %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %dir %{_libdir}/%{name} %{_libdir}/%{name}/bin/ -%{_libdir}/%{name}/data/ %{_libdir}/%{name}/lib/ %{_libdir}/%{name}/Mod/ +%{_datadir}/%{name}/ %{_mandir}/man1/*.1.gz %files doc @@ -288,9 +281,14 @@ %changelog +* Mon Feb 18 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.13-1 +- Update to latest upstream release. + * Sat Oct 20 2012 John Morris <john(a)zultron.com> - 0.12-9 - Use cmake28 package on el6 - Remove COIN3D_DOC_PATH cmake def (one less warning during build) +- Add PyQt as requirement. +- Add libicu-devel as build requirement. * Wed Sep 26 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-8 - Rebuild for boost 1.50. @@ -305,6 +303,12 @@ * Mon Jun 25 2012 <john(a)zultron.com> - 0.12-6 - Filter out automatically generated Provides/Requires of private libraries - freecad.desktop not passing 'desktop-file-validate'; fixed +- Remove BuildRequires: tbb-devel and gts-devel +- Update license tag to GPLv3+ only. +- Add missing license files to %%doc. +- Add missing build requirement for hicolor-icon-theme. +- Fix excessive linking issue. +- Other minor spec updates. * Mon Jun 25 2012 <john(a)zultron.com> - 0.12-5 - New patch to unbundle PyCXX Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/freecad/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jul 2012 03:15:42 -0000 1.2 +++ sources 18 Feb 2013 18:20:09 -0000 1.3 @@ -1 +1 @@ -fcd91286c578a219491ffebb2111bddf freecad-0.12.5284.tar.gz +13b8fddef12f5f8419dcf4adbab596eb freecad-0.13.1830.tar.gz --- freecad-0.12-OpenCASCADE-option.patch DELETED --- --- freecad-0.12-pycxx.patch DELETED --- --- freecad-0.12-rm_f2c.patch DELETED --- --- freecad-0.12-zipios.patch DELETED --- --- freecad-StartPage.patch DELETED --- --- freecad-cmake_Mod_fix.patch DELETED --- --- freecad-gcc-4.7.patch DELETED --- --- freecad-glu.patch DELETED --- --- freecad-system_inst.patch DELETED ---

11 years, 8 months

1
0
0 / 0

rpms/smesh/devel smesh.spec,1.6,1.7

by Richard Shaw

Author: hobbes1069 Update of /cvs/nonfree/rpms/smesh/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16489 Modified Files: smesh.spec Log Message: Fix source references. Index: smesh.spec =================================================================== RCS file: /cvs/nonfree/rpms/smesh/devel/smesh.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- smesh.spec 18 Feb 2013 15:06:29 -0000 1.6 +++ smesh.spec 18 Feb 2013 17:28:43 -0000 1.7 @@ -3,9 +3,11 @@ %global cmake %cmake28 %endif +%global svnrev 55 + Name: smesh Version: 5.1.2.2 -Release: 6.svn55%{?dist} +Release: 6.svn%{svnrev}%{?dist} Summary: OpenCascade based MESH framework # This library is LGPLv2+ but links against the non-free library OCE. @@ -14,7 +16,7 @@ # Source is svn checkout since the last release is too old: # https://salomesmesh.svn.sourceforge.net/svnroot/salomesmesh/trunk -Source0: smesh-5.1.2.2-svn54.tar.gz +Source0: %{name}-%{version}.svn%{svnrev}.tar.gz # Patch emailed upstream to Fotios Sioutis <sfotis(a)gmail.com> # on 12/21/11. @@ -62,7 +64,7 @@ %prep -%setup -q -c %{name}-%{version} +%setup -q -n %{name}-%{version}.svn%{svnrev} %patch0 -p1 %patch1 -p1 -b .cmakefix %patch2 -p1 -b .f2c

11 years, 8 months

1
0
0 / 0

rpms/OCE/F-18 OCE-0.11-freeimage.patch, NONE, 1.1 OCE.spec, 1.3, 1.4 sources, 1.2, 1.3 OCE-0.8.0-env.patch, 1.1, NONE

by Richard Shaw

Author: hobbes1069 Update of /cvs/nonfree/rpms/OCE/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16080 Modified Files: OCE.spec sources Added Files: OCE-0.11-freeimage.patch Removed Files: OCE-0.8.0-env.patch Log Message: * Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.11-1 - Update to latest upstream release. OCE-0.11-freeimage.patch: CMakeLists.txt | 17 +++++++++++++++-- adm/cmake/TKOpenGl/CMakeLists.txt | 14 ++++++++++++++ src/OpenGl/OpenGl_Workspace_2.cxx | 5 ----- 3 files changed, 29 insertions(+), 7 deletions(-) --- NEW FILE OCE-0.11-freeimage.patch --- >From 1f952ba08554b522b129f8a562dfc6fe7c19a16c Mon Sep 17 00:00:00 2001 From: Denis Barbier <bouzim(a)gmail.com> Date: Mon, 18 Feb 2013 12:16:29 +0100 Subject: [PATCH] Link against FreeImage (instead of FreeImagePlus) on non-Windows FreeImage support is available in TKService and TKOpenGl. In TKService, only the C API is used, so we can link against freeimage. This is better because on some platforms (Fedora for instance), symbols of freeimage are not duplicated into freeimageplus, which causes unresolved symbols when linking with --as-needed. In TKOpenGl, the FreeImage support was not enabled, copy it from TKService. It is used only in OpenGl_Workspace::Print, and this method works only on Windows. Remove #pragma from src/OpenGl/OpenGl_Workspace_2.cxx. --- CMakeLists.txt | 17 +++++++++++++++-- adm/cmake/TKOpenGl/CMakeLists.txt | 14 ++++++++++++++ src/OpenGl/OpenGl_Workspace_2.cxx | 4 ---- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9ddb85..bdbd5e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,13 +307,22 @@ IF(${PROJECT_NAME}_VISUALISATION) IF(${PROJECT_NAME}_WITH_FREEIMAGE) FIND_PATH(FREEIMAGE_INCLUDE_DIR FreeImagePlus.h DOC "Location of header files for FreeImage" ${CMAKE_SYSTEM_INCLUDE_PATH}) IF(FREEIMAGE_INCLUDE_DIR) - FIND_LIBRARY( FREEIMAGE_LIBRARY freeimageplus "Path to the freeimage library" ) + FIND_LIBRARY( FREEIMAGE_LIBRARY freeimage "Path to the freeimage library" ) IF(CMAKE_CONFIGURATION_TYPES OR NMAKE) - FIND_LIBRARY( FREEIMAGE_LIBRARY_DEBUG freeimageplusd "Path to the freeimage debug library" ) + FIND_LIBRARY( FREEIMAGE_LIBRARY_DEBUG freeimaged "Path to the freeimage debug library" ) ENDIF(CMAKE_CONFIGURATION_TYPES OR NMAKE) ENDIF(FREEIMAGE_INCLUDE_DIR) MARK_AS_ADVANCED(FREEIMAGE_INCLUDE_DIR FREEIMAGE_LIBRARY) + IF(WIN32) + IF(FREEIMAGE_INCLUDE_DIR) + FIND_LIBRARY( FREEIMAGEPLUS_LIBRARY freeimageplus "Path to the freeimageplus library" ) + IF(CMAKE_CONFIGURATION_TYPES OR NMAKE) + FIND_LIBRARY( FREEIMAGEPLUS_LIBRARY_DEBUG freeimageplusd "Path to the freeimageplus debug library" ) + ENDIF(CMAKE_CONFIGURATION_TYPES OR NMAKE) + ENDIF(FREEIMAGE_INCLUDE_DIR) + MARK_AS_ADVANCED(FREEIMAGEPLUS_LIBRARY) + ENDIF(WIN32) ENDIF(${PROJECT_NAME}_WITH_FREEIMAGE) IF (NOT WIN32) @@ -452,6 +461,8 @@ IF (${PROJECT_NAME}_USE_BUNDLE AND ${PROJECT_NAME}_BUNDLE_ROOT_PATH) IF(${PROJECT_NAME}_WITH_FREEIMAGE) SET(FREEIMAGE_LIBRARY ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/lib/FreeImage.lib CACHE FILEPATH "" FORCE) SET(FREEIMAGE_LIBRARY_DEBUG ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/libd/FreeImaged.lib CACHE FILEPATH "" FORCE) + SET(FREEIMAGEPLUS_LIBRARY ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/lib/FreeImagePlus.lib CACHE FILEPATH "" FORCE) + SET(FREEIMAGEPLUS_LIBRARY_DEBUG ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/libd/FreeImagePlusd.lib CACHE FILEPATH "" FORCE) SET(FREEIMAGE_INCLUDE_DIR ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/include/FreeImage CACHE PATH "" FORCE) ENDIF(${PROJECT_NAME}_WITH_FREEIMAGE) ENDIF (${PROJECT_NAME}_VISUALISATION) @@ -1114,6 +1125,8 @@ IF (${PROJECT_NAME}_BUNDLE_AUTOINSTALL) IF (${PROJECT_NAME}_VISU_DEP AND ${PROJECT_NAME}_WITH_FREEIMAGE) INSTALL(FILES ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/bind/FreeImaged.dll DESTINATION ${${PROJECT_NAME}_INSTALL_BIN_DIR} CONFIGURATIONS Debug) INSTALL(FILES ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/bin/FreeImage.dll DESTINATION ${${PROJECT_NAME}_INSTALL_BIN_DIR} CONFIGURATIONS Release RelWithDebInfo MinSizeRel) + INSTALL(FILES ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/bind/FreeImagePlusd.dll DESTINATION ${${PROJECT_NAME}_INSTALL_BIN_DIR} CONFIGURATIONS Debug) + INSTALL(FILES ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/bin/FreeImagePlus.dll DESTINATION ${${PROJECT_NAME}_INSTALL_BIN_DIR} CONFIGURATIONS Release RelWithDebInfo MinSizeRel) ENDIF(${PROJECT_NAME}_VISU_DEP AND ${PROJECT_NAME}_WITH_FREEIMAGE) # Install TCL diff --git a/adm/cmake/TKOpenGl/CMakeLists.txt b/adm/cmake/TKOpenGl/CMakeLists.txt index aed0f9f..4c3b574 100644 --- a/adm/cmake/TKOpenGl/CMakeLists.txt +++ b/adm/cmake/TKOpenGl/CMakeLists.txt @@ -19,6 +19,20 @@ ENDIF(CMAKE_CONFIGURATION_TYPES OR NMAKE) SET(TOOLKIT_INCLUDE_DIRECTORIES ${OPENGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${FTGL_INCLUDE_DIR}) +# OpenGl_Workspace::Print is available only on Windows +IF(WIN32 AND FREEIMAGE_LIBRARY AND ${PROJECT_NAME}_WITH_FREEIMAGE) + ADD_DEFINITIONS(-DHAVE_FREEIMAGE) + + IF(CMAKE_CONFIGURATION_TYPES OR NMAKE) + SET(TOOLKIT_LIBS_DEBUG ${TOOLKIT_LIBS_DEBUG} ${FREEIMAGEPLUS_LIBRARY_DEBUG} ${FREEIMAGE_LIBRARY_DEBUG}) + SET(TOOLKIT_LIBS_OPTIMIZED ${TOOLKIT_LIBS_OPTIMIZED} ${FREEIMAGEPLUS_LIBRARY} ${FREEIMAGE_LIBRARY}) + ELSE (CMAKE_CONFIGURATION_TYPES OR NMAKE) + SET(TOOLKIT_LIBS ${TOOLKIT_LIBS} ${FREEIMAGEPLUS_LIBRARY} ${FREEIMAGE_LIBRARY}) + ENDIF(CMAKE_CONFIGURATION_TYPES OR NMAKE) + + SET(TOOLKIT_INCLUDE_DIRECTORIES ${TOOLKIT_INCLUDE_DIRECTORIES} ${FREEIMAGE_INCLUDE_DIR}) +ENDIF(FREEIMAGE_LIBRARY AND ${PROJECT_NAME}_WITH_FREEIMAGE) + IF(GL2PS_LIBRARY AND ${PROJECT_NAME}_WITH_GL2PS) ADD_DEFINITIONS(-DHAVE_GL2PS) diff --git a/src/OpenGl/OpenGl_Workspace_2.cxx b/src/OpenGl/OpenGl_Workspace_2.cxx index bff24b7..79910d1 100644 --- a/src/OpenGl/OpenGl_Workspace_2.cxx +++ b/src/OpenGl/OpenGl_Workspace_2.cxx @@ -31,10 +31,6 @@ #ifdef HAVE_FREEIMAGE #include <NCollection_Handle.hxx> #include <FreeImagePlus.h> - #ifdef _MSC_VER - #pragma comment( lib, "FreeImage.lib" ) - #pragma comment( lib, "FreeImagePlus.lib" ) - #endif typedef NCollection_Handle<fipImage> FipHandle; #endif -- 1.7.10 Index: OCE.spec =================================================================== RCS file: /cvs/nonfree/rpms/OCE/F-18/OCE.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- OCE.spec 5 Jul 2012 13:31:31 -0000 1.3 +++ OCE.spec 18 Feb 2013 17:17:11 -0000 1.4 @@ -1,5 +1,3 @@ -%global githash1 gc4c7d83 -%global githash2 de78904 #global relcan 1 # Use newer cmake on EL-6. @@ -8,17 +6,17 @@ %endif Name: OCE -Version: 0.8.0 -Release: 3%{?relcan:.rc%{relcan}}%{?dist} +Version: 0.11 +Release: 1%{?relcan:.rc%{relcan}}%{?dist} Summary: OpenCASCADE Community Edition License: Open CASCADE Technology Public License URL: https://github.com/tpaviot/oce # Github source! Archive was generated on the fly with the following URL: -# https://github.com/tpaviot/oce/tarball/OCE-0.8.0 -Source0: tpaviot-oce-%{name}-%{version}%{?relcan:-rc%{relcan}}-0-%{githash1}.tar.gz +# https://github.com/tpaviot/oce/archive/OCE-0.11.tar.gz +Source0: oce-%{name}-%{version}%{?relcan:-rc%{relcan}}.tar.gz -Patch0: OCE-0.8.0-env.patch +Patch0: OCE-0.11-freeimage.patch Source1: DRAWEXE.1 Source2: opencascade-draw.desktop @@ -34,12 +32,14 @@ BuildRequires: cmake %endif BuildRequires: desktop-file-utils -# Librraies +# Libraries BuildRequires: xorg-x11-proto-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: libXmu-devel -BuildRequires: ftgl-devel +BuildRequires: ftgl-devel +%if ! 0%{?el6} BuildRequires: freeimage-devel +%endif BuildRequires: gl2ps-devel BuildRequires: libgomp BuildRequires: tcl-devel @@ -129,8 +129,8 @@ %prep -%setup -q -n tpaviot-oce-%{githash2} -%patch0 -p1 +%setup -q -n oce-%{name}-%{version} +%patch0 -p1 -b .cmake_freeimage # Convert files to utf8 iconv --from=ISO-8859-1 --to=UTF-8 LICENSE.txt > LICENSE.txt.new && \ @@ -140,13 +140,14 @@ %build rm -rf build && mkdir build && pushd build +# Stop excessive linking that cmake projects are prone to. LDFLAGS="-Wl,--as-needed";export LDFLAGS %cmake -DOCE_BUILD_TYPE=RelWithDebInfo \ -DOCE_INSTALL_PREFIX=%{_prefix} \ -DOCE_INSTALL_LIB_DIR=%{_lib} \ -DOCE_WITH_FREEIMAGE=ON \ -DOCE_WITH_GL2PS=ON \ - -DOCE_MULTITHREAD_LIBRARY:STRING=OPENMP \ + -DOCE_MULTITHREAD_LIBRARY:STRING=TBB \ -DOCE_DRAW=on \ ../ @@ -277,7 +278,7 @@ %{_libdir}/libTKStdSchema.so.* %files draw -# Draw +# Draw Libraries %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKDraw.so.* %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKTopTest.so.* %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKViewerTest.so.* @@ -285,6 +286,7 @@ %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKDCAF.so.* %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKXDEDRAW.so.* %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKTObjDRAW.so.* +%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKQADraw.so.* # DRAWEXE application %{_bindir}/DRAWEXE %{_mandir}/man1/DRAWEXE.1.gz @@ -295,11 +297,14 @@ %doc examples %{_includedir}/* %{_libdir}/*.so -%exclude %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/*.so.* -%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/ +%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/*.so +%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/*.cmake %changelog +* Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.11-1 +- Update to latest upstream release. + * Wed May 02 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.8.0-3 - Update icons. Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/OCE/F-18/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Dec 2011 20:05:00 -0000 1.2 +++ sources 18 Feb 2013 17:17:11 -0000 1.3 @@ -1 +1 @@ -1ba89636b120b07bd72f18cf699425cd tpaviot-oce-OCE-0.8.0-0-gc4c7d83.tar.gz +5d3f12abade78a69cd6734c1fdeb83b7 oce-OCE-0.11.tar.gz --- OCE-0.8.0-env.patch DELETED ---

11 years, 8 months

1
0
0 / 0

rpms/smesh/devel smesh-5.1.2.2-pi_to_m_pi.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 smesh.spec, 1.5, 1.6 sources, 1.2, 1.3

by Richard Shaw

Author: hobbes1069 Update of /cvs/nonfree/rpms/smesh/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13049 Modified Files: .cvsignore smesh.spec sources Added Files: smesh-5.1.2.2-pi_to_m_pi.patch Log Message: * Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-1.svn55 - Update for compatibility with new OCE. smesh-5.1.2.2-pi_to_m_pi.patch: Controls/SMESH_Controls.cpp | 5 +++++ SMESH/SMESH_MeshEditor.cpp | 4 ++++ SMESH/SMESH_Pattern.cpp | 5 +++++ StdMeshers/StdMeshers_AutomaticLength.cpp | 5 +++++ StdMeshers/StdMeshers_CompositeHexa_3D.cpp | 4 ++++ StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp | 5 +++++ StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp | 4 ++++ 7 files changed, 32 insertions(+) --- NEW FILE smesh-5.1.2.2-pi_to_m_pi.patch --- diff -Naur smesh-5.1.2.2.orig/src/Controls/SMESH_Controls.cpp smesh-5.1.2.2/src/Controls/SMESH_Controls.cpp --- smesh-5.1.2.2.orig/src/Controls/SMESH_Controls.cpp 2009-12-16 09:01:21.000000000 -0600 +++ smesh-5.1.2.2/src/Controls/SMESH_Controls.cpp 2013-02-15 14:58:28.357147721 -0600 @@ -64,6 +64,11 @@ #include "SMESHDS_Mesh.hxx" #include "SMESHDS_GroupBase.hxx" +#ifndef PI +# include <math.h> +# define PI M_PI +#endif + /* AUXILIARY METHODS */ diff -Naur smesh-5.1.2.2.orig/src/SMESH/SMESH_MeshEditor.cpp smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp --- smesh-5.1.2.2.orig/src/SMESH/SMESH_MeshEditor.cpp 2013-02-15 14:42:44.453062739 -0600 +++ smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp 2013-02-15 14:51:15.754435891 -0600 @@ -84,6 +84,10 @@ #define cast2Node(elem) static_cast<const SMDS_MeshNode*>( elem ) +#ifndef PI +# define PI M_PI +#endif + using namespace std; using namespace SMESH::Controls; diff -Naur smesh-5.1.2.2.orig/src/SMESH/SMESH_Pattern.cpp smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp --- smesh-5.1.2.2.orig/src/SMESH/SMESH_Pattern.cpp 2013-02-15 14:42:44.457062609 -0600 +++ smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp 2013-02-15 14:55:31.929960525 -0600 @@ -75,6 +75,11 @@ #include "utilities.h" +#ifndef PI +# include <math.h> +# define PI M_PI +#endif + using namespace std; typedef map< const SMDS_MeshElement*, int > TNodePointIDMap; diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_AutomaticLength.cpp smesh-5.1.2.2/src/StdMeshers/StdMeshers_AutomaticLength.cpp --- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_AutomaticLength.cpp 2009-12-16 09:01:21.000000000 -0600 +++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_AutomaticLength.cpp 2013-02-15 15:00:49.259529380 -0600 @@ -38,6 +38,11 @@ #include <TopoDS.hxx> #include <TopoDS_Edge.hxx> +#ifndef PI +# include <math.h> +# define PI M_PI +#endif + using namespace std; //============================================================================= diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp smesh-5.1.2.2/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp --- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp 2009-12-16 09:01:21.000000000 -0600 +++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp 2013-02-15 15:03:10.805901650 -0600 @@ -57,6 +57,10 @@ #include <set> #include <vector> +#ifndef PI +# include <math.h> +# define PI M_PI +#endif #ifdef _DEBUG_ diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp smesh-5.1.2.2/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp --- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp 2009-12-16 09:01:21.000000000 -0600 +++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp 2013-02-15 15:05:12.937914205 -0600 @@ -40,6 +40,11 @@ #include <gp_Lin.hxx> #include <gp_Pln.hxx> +#ifndef PI +# include <math.h> +# define PI M_PI +#endif + #ifndef __BORLANDC__ #include <NCollection_Array1.hxx> typedef NCollection_Array1<TColStd_SequenceOfInteger> StdMeshers_Array1OfSequenceOfInteger; diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp smesh-5.1.2.2/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp --- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp 2009-12-16 09:01:21.000000000 -0600 +++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp 2013-02-15 15:09:28.717572007 -0600 @@ -55,6 +55,10 @@ #include <TopExp_Explorer.hxx> #include <TopoDS.hxx> +#ifndef PI +# include <math.h> +# define PI M_PI +#endif using namespace std; Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/smesh/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Jan 2012 19:48:26 -0000 1.2 +++ .cvsignore 18 Feb 2013 15:06:29 -0000 1.3 @@ -1 +1 @@ -smesh-5.1.2.2-svn54.tar.gz +smesh-5.1.2.2.svn55.tar.gz Index: smesh.spec =================================================================== RCS file: /cvs/nonfree/rpms/smesh/devel/smesh.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- smesh.spec 22 Oct 2012 19:48:37 -0000 1.5 +++ smesh.spec 18 Feb 2013 15:06:29 -0000 1.6 @@ -5,7 +5,7 @@ Name: smesh Version: 5.1.2.2 -Release: 5.svn54%{?dist} +Release: 6.svn55%{?dist} Summary: OpenCascade based MESH framework # This library is LGPLv2+ but links against the non-free library OCE. @@ -21,6 +21,7 @@ Patch0: smesh.patch Patch1: smesh-cmake_fixes.patch Patch2: smesh-5.1.2.2-rm_f2c.patch +Patch3: smesh-5.1.2.2-pi_to_m_pi.patch %if 0%{?rhel} BuildRequires: cmake28 @@ -65,6 +66,7 @@ %patch0 -p1 %patch1 -p1 -b .cmakefix %patch2 -p1 -b .f2c +%patch3 -p1 -b .pi dos2unix -k LICENCE.lgpl.txt @@ -108,6 +110,9 @@ %changelog +* Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-1.svn55 +- Update for compatibility with new OCE. + * Mon Oct 22 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-5.svn54 - Remove build requirement for fortran (f2c). - Initial packaging for EPEL 6. Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/smesh/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jan 2012 19:48:26 -0000 1.2 +++ sources 18 Feb 2013 15:06:29 -0000 1.3 @@ -1 +1 @@ -00ed8a488d1ddeb05d1777430094df80 smesh-5.1.2.2-svn54.tar.gz +2b8ae645c029715737265561ccfa3551 smesh-5.1.2.2.svn55.tar.gz

11 years, 8 months

1
0
0 / 0

rpms/OCE/devel OCE-0.11-freeimage.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 OCE.spec, 1.3, 1.4 sources, 1.2, 1.3 OCE-0.8.0-env.patch, 1.1, NONE

by Richard Shaw

Author: hobbes1069 Update of /cvs/nonfree/rpms/OCE/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12315 Modified Files: .cvsignore OCE.spec sources Added Files: OCE-0.11-freeimage.patch Removed Files: OCE-0.8.0-env.patch Log Message: * Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.11-1 - Update to latest upstream release. OCE-0.11-freeimage.patch: CMakeLists.txt | 17 +++++++++++++++-- adm/cmake/TKOpenGl/CMakeLists.txt | 14 ++++++++++++++ src/OpenGl/OpenGl_Workspace_2.cxx | 5 ----- 3 files changed, 29 insertions(+), 7 deletions(-) --- NEW FILE OCE-0.11-freeimage.patch --- >From 1f952ba08554b522b129f8a562dfc6fe7c19a16c Mon Sep 17 00:00:00 2001 From: Denis Barbier <bouzim(a)gmail.com> Date: Mon, 18 Feb 2013 12:16:29 +0100 Subject: [PATCH] Link against FreeImage (instead of FreeImagePlus) on non-Windows FreeImage support is available in TKService and TKOpenGl. In TKService, only the C API is used, so we can link against freeimage. This is better because on some platforms (Fedora for instance), symbols of freeimage are not duplicated into freeimageplus, which causes unresolved symbols when linking with --as-needed. In TKOpenGl, the FreeImage support was not enabled, copy it from TKService. It is used only in OpenGl_Workspace::Print, and this method works only on Windows. Remove #pragma from src/OpenGl/OpenGl_Workspace_2.cxx. --- CMakeLists.txt | 17 +++++++++++++++-- adm/cmake/TKOpenGl/CMakeLists.txt | 14 ++++++++++++++ src/OpenGl/OpenGl_Workspace_2.cxx | 4 ---- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9ddb85..bdbd5e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,13 +307,22 @@ IF(${PROJECT_NAME}_VISUALISATION) IF(${PROJECT_NAME}_WITH_FREEIMAGE) FIND_PATH(FREEIMAGE_INCLUDE_DIR FreeImagePlus.h DOC "Location of header files for FreeImage" ${CMAKE_SYSTEM_INCLUDE_PATH}) IF(FREEIMAGE_INCLUDE_DIR) - FIND_LIBRARY( FREEIMAGE_LIBRARY freeimageplus "Path to the freeimage library" ) + FIND_LIBRARY( FREEIMAGE_LIBRARY freeimage "Path to the freeimage library" ) IF(CMAKE_CONFIGURATION_TYPES OR NMAKE) - FIND_LIBRARY( FREEIMAGE_LIBRARY_DEBUG freeimageplusd "Path to the freeimage debug library" ) + FIND_LIBRARY( FREEIMAGE_LIBRARY_DEBUG freeimaged "Path to the freeimage debug library" ) ENDIF(CMAKE_CONFIGURATION_TYPES OR NMAKE) ENDIF(FREEIMAGE_INCLUDE_DIR) MARK_AS_ADVANCED(FREEIMAGE_INCLUDE_DIR FREEIMAGE_LIBRARY) + IF(WIN32) + IF(FREEIMAGE_INCLUDE_DIR) + FIND_LIBRARY( FREEIMAGEPLUS_LIBRARY freeimageplus "Path to the freeimageplus library" ) + IF(CMAKE_CONFIGURATION_TYPES OR NMAKE) + FIND_LIBRARY( FREEIMAGEPLUS_LIBRARY_DEBUG freeimageplusd "Path to the freeimageplus debug library" ) + ENDIF(CMAKE_CONFIGURATION_TYPES OR NMAKE) + ENDIF(FREEIMAGE_INCLUDE_DIR) + MARK_AS_ADVANCED(FREEIMAGEPLUS_LIBRARY) + ENDIF(WIN32) ENDIF(${PROJECT_NAME}_WITH_FREEIMAGE) IF (NOT WIN32) @@ -452,6 +461,8 @@ IF (${PROJECT_NAME}_USE_BUNDLE AND ${PROJECT_NAME}_BUNDLE_ROOT_PATH) IF(${PROJECT_NAME}_WITH_FREEIMAGE) SET(FREEIMAGE_LIBRARY ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/lib/FreeImage.lib CACHE FILEPATH "" FORCE) SET(FREEIMAGE_LIBRARY_DEBUG ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/libd/FreeImaged.lib CACHE FILEPATH "" FORCE) + SET(FREEIMAGEPLUS_LIBRARY ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/lib/FreeImagePlus.lib CACHE FILEPATH "" FORCE) + SET(FREEIMAGEPLUS_LIBRARY_DEBUG ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/libd/FreeImagePlusd.lib CACHE FILEPATH "" FORCE) SET(FREEIMAGE_INCLUDE_DIR ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/include/FreeImage CACHE PATH "" FORCE) ENDIF(${PROJECT_NAME}_WITH_FREEIMAGE) ENDIF (${PROJECT_NAME}_VISUALISATION) @@ -1114,6 +1125,8 @@ IF (${PROJECT_NAME}_BUNDLE_AUTOINSTALL) IF (${PROJECT_NAME}_VISU_DEP AND ${PROJECT_NAME}_WITH_FREEIMAGE) INSTALL(FILES ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/bind/FreeImaged.dll DESTINATION ${${PROJECT_NAME}_INSTALL_BIN_DIR} CONFIGURATIONS Debug) INSTALL(FILES ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/bin/FreeImage.dll DESTINATION ${${PROJECT_NAME}_INSTALL_BIN_DIR} CONFIGURATIONS Release RelWithDebInfo MinSizeRel) + INSTALL(FILES ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/bind/FreeImagePlusd.dll DESTINATION ${${PROJECT_NAME}_INSTALL_BIN_DIR} CONFIGURATIONS Debug) + INSTALL(FILES ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/bin/FreeImagePlus.dll DESTINATION ${${PROJECT_NAME}_INSTALL_BIN_DIR} CONFIGURATIONS Release RelWithDebInfo MinSizeRel) ENDIF(${PROJECT_NAME}_VISU_DEP AND ${PROJECT_NAME}_WITH_FREEIMAGE) # Install TCL diff --git a/adm/cmake/TKOpenGl/CMakeLists.txt b/adm/cmake/TKOpenGl/CMakeLists.txt index aed0f9f..4c3b574 100644 --- a/adm/cmake/TKOpenGl/CMakeLists.txt +++ b/adm/cmake/TKOpenGl/CMakeLists.txt @@ -19,6 +19,20 @@ ENDIF(CMAKE_CONFIGURATION_TYPES OR NMAKE) SET(TOOLKIT_INCLUDE_DIRECTORIES ${OPENGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${FTGL_INCLUDE_DIR}) +# OpenGl_Workspace::Print is available only on Windows +IF(WIN32 AND FREEIMAGE_LIBRARY AND ${PROJECT_NAME}_WITH_FREEIMAGE) + ADD_DEFINITIONS(-DHAVE_FREEIMAGE) + + IF(CMAKE_CONFIGURATION_TYPES OR NMAKE) + SET(TOOLKIT_LIBS_DEBUG ${TOOLKIT_LIBS_DEBUG} ${FREEIMAGEPLUS_LIBRARY_DEBUG} ${FREEIMAGE_LIBRARY_DEBUG}) + SET(TOOLKIT_LIBS_OPTIMIZED ${TOOLKIT_LIBS_OPTIMIZED} ${FREEIMAGEPLUS_LIBRARY} ${FREEIMAGE_LIBRARY}) + ELSE (CMAKE_CONFIGURATION_TYPES OR NMAKE) + SET(TOOLKIT_LIBS ${TOOLKIT_LIBS} ${FREEIMAGEPLUS_LIBRARY} ${FREEIMAGE_LIBRARY}) + ENDIF(CMAKE_CONFIGURATION_TYPES OR NMAKE) + + SET(TOOLKIT_INCLUDE_DIRECTORIES ${TOOLKIT_INCLUDE_DIRECTORIES} ${FREEIMAGE_INCLUDE_DIR}) +ENDIF(FREEIMAGE_LIBRARY AND ${PROJECT_NAME}_WITH_FREEIMAGE) + IF(GL2PS_LIBRARY AND ${PROJECT_NAME}_WITH_GL2PS) ADD_DEFINITIONS(-DHAVE_GL2PS) diff --git a/src/OpenGl/OpenGl_Workspace_2.cxx b/src/OpenGl/OpenGl_Workspace_2.cxx index bff24b7..79910d1 100644 --- a/src/OpenGl/OpenGl_Workspace_2.cxx +++ b/src/OpenGl/OpenGl_Workspace_2.cxx @@ -31,10 +31,6 @@ #ifdef HAVE_FREEIMAGE #include <NCollection_Handle.hxx> #include <FreeImagePlus.h> - #ifdef _MSC_VER - #pragma comment( lib, "FreeImage.lib" ) - #pragma comment( lib, "FreeImagePlus.lib" ) - #endif typedef NCollection_Handle<fipImage> FipHandle; #endif -- 1.7.10 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/OCE/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Dec 2011 20:04:59 -0000 1.2 +++ .cvsignore 18 Feb 2013 14:41:48 -0000 1.3 @@ -1 +1 @@ -tpaviot-oce-OCE-0.8.0-0-gc4c7d83.tar.gz +oce-OCE-0.11.tar.gz Index: OCE.spec =================================================================== RCS file: /cvs/nonfree/rpms/OCE/devel/OCE.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- OCE.spec 5 Jul 2012 13:31:31 -0000 1.3 +++ OCE.spec 18 Feb 2013 14:41:48 -0000 1.4 @@ -1,5 +1,3 @@ -%global githash1 gc4c7d83 -%global githash2 de78904 #global relcan 1 # Use newer cmake on EL-6. @@ -8,17 +6,17 @@ %endif Name: OCE -Version: 0.8.0 -Release: 3%{?relcan:.rc%{relcan}}%{?dist} +Version: 0.11 +Release: 1%{?relcan:.rc%{relcan}}%{?dist} Summary: OpenCASCADE Community Edition License: Open CASCADE Technology Public License URL: https://github.com/tpaviot/oce # Github source! Archive was generated on the fly with the following URL: -# https://github.com/tpaviot/oce/tarball/OCE-0.8.0 -Source0: tpaviot-oce-%{name}-%{version}%{?relcan:-rc%{relcan}}-0-%{githash1}.tar.gz +# https://github.com/tpaviot/oce/archive/OCE-0.11.tar.gz +Source0: oce-%{name}-%{version}%{?relcan:-rc%{relcan}}.tar.gz -Patch0: OCE-0.8.0-env.patch +Patch0: OCE-0.11-freeimage.patch Source1: DRAWEXE.1 Source2: opencascade-draw.desktop @@ -34,12 +32,14 @@ BuildRequires: cmake %endif BuildRequires: desktop-file-utils -# Librraies +# Libraries BuildRequires: xorg-x11-proto-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: libXmu-devel -BuildRequires: ftgl-devel +BuildRequires: ftgl-devel +%if ! 0%{?el6} BuildRequires: freeimage-devel +%endif BuildRequires: gl2ps-devel BuildRequires: libgomp BuildRequires: tcl-devel @@ -129,8 +129,8 @@ %prep -%setup -q -n tpaviot-oce-%{githash2} -%patch0 -p1 +%setup -q -n oce-%{name}-%{version} +%patch0 -p1 -b .cmake_freeimage # Convert files to utf8 iconv --from=ISO-8859-1 --to=UTF-8 LICENSE.txt > LICENSE.txt.new && \ @@ -140,13 +140,14 @@ %build rm -rf build && mkdir build && pushd build +# Stop excessive linking that cmake projects are prone to. LDFLAGS="-Wl,--as-needed";export LDFLAGS %cmake -DOCE_BUILD_TYPE=RelWithDebInfo \ -DOCE_INSTALL_PREFIX=%{_prefix} \ -DOCE_INSTALL_LIB_DIR=%{_lib} \ -DOCE_WITH_FREEIMAGE=ON \ -DOCE_WITH_GL2PS=ON \ - -DOCE_MULTITHREAD_LIBRARY:STRING=OPENMP \ + -DOCE_MULTITHREAD_LIBRARY:STRING=TBB \ -DOCE_DRAW=on \ ../ @@ -277,7 +278,7 @@ %{_libdir}/libTKStdSchema.so.* %files draw -# Draw +# Draw Libraries %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKDraw.so.* %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKTopTest.so.* %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKViewerTest.so.* @@ -285,6 +286,7 @@ %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKDCAF.so.* %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKXDEDRAW.so.* %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKTObjDRAW.so.* +%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKQADraw.so.* # DRAWEXE application %{_bindir}/DRAWEXE %{_mandir}/man1/DRAWEXE.1.gz @@ -295,11 +297,14 @@ %doc examples %{_includedir}/* %{_libdir}/*.so -%exclude %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/*.so.* -%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/ +%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/*.so +%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/*.cmake %changelog +* Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.11-1 +- Update to latest upstream release. + * Wed May 02 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.8.0-3 - Update icons. Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/OCE/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Dec 2011 20:05:00 -0000 1.2 +++ sources 18 Feb 2013 14:41:48 -0000 1.3 @@ -1 +1 @@ -1ba89636b120b07bd72f18cf699425cd tpaviot-oce-OCE-0.8.0-0-gc4c7d83.tar.gz +5d3f12abade78a69cd6734c1fdeb83b7 oce-OCE-0.11.tar.gz --- OCE-0.8.0-env.patch DELETED ---

11 years, 8 months

1
0
0 / 0

rpms/nvidia-kmod/devel conftest.patch, NONE, 1.1 nvidia-kmod.spec, 1.112, 1.113

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14553 Modified Files: nvidia-kmod.spec Added Files: conftest.patch Log Message: * Sun Feb 17 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:313.18-2 - Fix with a better patch from gentoo conftest.patch: conftest.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- NEW FILE conftest.patch --- the nvidia drivers are trying to test for version 2.6.6, but fail to take into account the first digit. so 3.7.0+ ends up failing the test. https://bugs.gentoo.org/447566 --- a/kernel/conftest.sh +++ b/kernel/conftest.sh @@ -1697,13 +1697,15 @@ # kernel older than 2.6.6, that's all we require to # build the module. # + VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ + if [ -n "$VERSION" -a $VERSION -ge 3 ] || \ + [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then SELECTED_MAKEFILE=Makefile.kbuild RET=0 fi fi fi Index: nvidia-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- nvidia-kmod.spec 16 Jan 2013 13:57:24 -0000 1.112 +++ nvidia-kmod.spec 17 Feb 2013 09:19:43 -0000 1.113 @@ -9,7 +9,7 @@ Epoch: 1 Version: 313.18 # Taken over by kmodtool -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -25,6 +25,7 @@ Source11: nvidia-kmodtool-excludekernel-filterfile Patch0: 3.8_kernel.patch +Patch1: conftest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +53,7 @@ do pushd nvidiapkg-${arch} %patch0 -p1 +%patch1 -p1 popd done @@ -85,6 +87,9 @@ %changelog +* Sun Feb 17 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:313.18-2 +- Fix with a better patch from gentoo + * Wed Jan 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:313.18-1 - Update to 313.18 (adds xorg-server 1.14 ABI support) - patch for 3.8rc kernel

11 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits February 2013