rpms/buildsys-build-rpmfusion/F-17 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.75, 1.76 buildsys-build-rpmfusion.spec, 1.89, 1.90
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28545
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Tue Feb 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-45
- rebuild for kernel 3.7.9-101.fc17
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- buildsys-build-rpmfusion-kerneldevpkgs-current 16 Feb 2013 09:24:49 -0000 1.75
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 19 Feb 2013 19:46:02 -0000 1.76
@@ -1,3 +1,3 @@
-3.7.8-102.fc17
-3.7.8-102.fc17smp
-3.7.8-102.fc17PAE
+3.7.9-101.fc17
+3.7.9-101.fc17smp
+3.7.9-101.fc17PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-17/buildsys-build-rpmfusion.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- buildsys-build-rpmfusion.spec 16 Feb 2013 09:24:49 -0000 1.89
+++ buildsys-build-rpmfusion.spec 19 Feb 2013 19:46:02 -0000 1.90
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 17
-Release: 44
+Release: 45
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Tue Feb 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-45
+- rebuild for kernel 3.7.9-101.fc17
+
* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:17-44
- rebuild for kernel 3.7.8-102.fc17
11 years, 3 months
rpms/buildsys-build-rpmfusion/F-18 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.38, 1.39 buildsys-build-rpmfusion.spec, 1.53, 1.54
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28393
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Tue Feb 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:18-10
- rebuild for kernel 3.7.9-201.fc18
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-18/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- buildsys-build-rpmfusion-kerneldevpkgs-current 16 Feb 2013 09:24:03 -0000 1.38
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 19 Feb 2013 19:45:07 -0000 1.39
@@ -1,3 +1,3 @@
-3.7.8-202.fc18
-3.7.8-202.fc18smp
-3.7.8-202.fc18PAE
+3.7.9-201.fc18
+3.7.9-201.fc18smp
+3.7.9-201.fc18PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-18/buildsys-build-rpmfusion.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- buildsys-build-rpmfusion.spec 16 Feb 2013 09:24:03 -0000 1.53
+++ buildsys-build-rpmfusion.spec 19 Feb 2013 19:45:07 -0000 1.54
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 18
-Release: 9
+Release: 10
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Tue Feb 19 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:18-10
+- rebuild for kernel 3.7.9-201.fc18
+
* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:18-9
- rebuild for kernel 3.7.8-202.fc18
11 years, 3 months
rpms/freecad/F-17 freecad-0.13-pycxx.patch, NONE, 1.1 freecad.spec, 1.1, 1.2 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/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27563
Modified Files:
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: freecad.spec
===================================================================
RCS file: /cvs/nonfree/rpms/freecad/F-17/freecad.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freecad.spec 7 Jul 2012 13:48:36 -0000 1.1
+++ freecad.spec 19 Feb 2013 19:07:12 -0000 1.2
@@ -1,13 +1,18 @@
# 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 update cmake package on EL builds.
+# Use updated cmake package on EL builds.
+# Temporary workaround for cmake/boost bug:
+# http://public.kitware.com/Bug/view.php?id=13446
%if 0%{?el6}
-%global cmake %cmake28
+%global cmake %cmake28 -DBoost_NO_BOOST_CMAKE=ON
%endif
# Some configuration options for other environments
@@ -22,8 +27,8 @@
Name: freecad
-Version: 0.12
-Release: 7%{?dist}
+Version: 0.13
+Release: 1%{?dist}
Summary: A general purpose 3D CAD modeler
Group: Applications/Engineering
@@ -31,40 +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
-BuildRequires: cmake doxygen swig
+%if 0%{?rhel}
+BuildRequires: cmake28
+%else
+BuildRequires: cmake
+%endif
+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
@@ -97,10 +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
@@ -109,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
}
@@ -134,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 \
@@ -165,19 +159,22 @@
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 \
- %if %{occ}
+ -DFREECAD_USE_EXTERNAL_PIVY=TRUE \
+%if %{occ}
-DUSE_OCC=TRUE \
%endif
%if ! %{bundled_smesh}
-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) \
@@ -187,6 +184,8 @@
make %{?_smp_mflags}
+make doc
+
%install
pushd build
@@ -201,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 \
@@ -272,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
@@ -282,16 +281,34 @@
%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.
+
* Thu Jul 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-7
- Remove BuildRequires: tbb-devel and gts-devel
- Add missing license files to %%doc.
-- Add missing build requirement for hicolor-icon-theme.
+- Add missing requirement for hicolor-icon-theme.
- Fix excessive linking issue.
- Other minor spec updates.
* 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/F-17/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Jul 2012 13:48:36 -0000 1.2
+++ sources 19 Feb 2013 19:07:12 -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, 3 months
rpms/vdr-burn/F-17 sources, 1.3, 1.4 vdr-burn-0.2.1-config.patch, NONE, 1.1 vdr-burn.conf, 1.2, 1.3 vdr-burn.spec, 1.7, 1.8 dead.package, 1.1, NONE
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-burn/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26981/F-17
Added Files:
sources vdr-burn-0.2.1-config.patch vdr-burn.conf
vdr-burn.spec
Removed Files:
dead.package
Log Message:
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 19 Feb 2013 18:53:02 -0000 1.4
@@ -0,0 +1,2 @@
+da67b1ae819bf9c064af49ab64dbf27b genindex-0.1.3.tar.gz
+50d349d36bdcf2b341dfab2fa43a31a9 vdr-burn-0.2.1.tgz
vdr-burn-0.2.1-config.patch:
README | 2 +-
chain-archive.c | 2 +-
jobs.c | 2 +-
vdrburn-archive.sh | 6 +++---
vdrburn-dvd.sh | 13 +++++++------
5 files changed, 13 insertions(+), 12 deletions(-)
--- NEW FILE vdr-burn-0.2.1-config.patch ---
Index: README
===================================================================
--- README.orig 2012-10-07 17:31:04.771395847 +0200
+++ README 2012-10-07 17:31:55.124400166 +0200
@@ -77,7 +77,7 @@
3b.(optional) Change the default temporary folder, the default DVD writer device
and the default ISO directory with TMPDIR (default: /tmp),
- DVDDEV (default: /dev/dvdrw) and ISODIR (default: /pub/export)
+ DVDDEV (default: /dev/dvdrw) and ISODIR (default: video dir)
# make DVDDEV=/dev/cdrecorder ISODIR=/export plugins
Index: chain-archive.c
===================================================================
RCS file: /var/cvsroot/burn/chain-archive.c,v
retrieving revision 1.13
diff -u -r1.13 chain-archive.c
--- chain-archive.c 16 Sep 2006 18:33:36 -0000 1.13
+++ chain-archive.c 12 Dec 2006 20:31:14 -0000
@@ -64,7 +64,7 @@
bind( &recording::get_graft_point, _2 ),
" "
)));
- graftPoints = format("{0} /dvd.vdr={1}/counters/standard") % graftPoints % plugin::get_config_path();
+ graftPoints = format("{0} /dvd.vdr=/var/lib/vdr/burn/counters/standard") % graftPoints;
switch (get_job().get_store_mode()) {
case storemode_create:
Index: jobs.c
===================================================================
RCS file: /var/cvsroot/burn/jobs.c,v
retrieving revision 1.35
diff -u -r1.35 jobs.c
--- jobs.c 1 Oct 2006 21:22:27 -0000 1.35
+++ jobs.c 12 Dec 2006 20:31:14 -0000
@@ -389,7 +389,7 @@
std::string job::get_archive_id()
{
std::string archive_id = "";
- std::string counter_path = format("{0}/counters/standard") % plugin::get_config_path();
+ std::string counter_path = "/var/lib/vdr/burn/counters/standard";
std::ifstream f(counter_path.c_str());
if (!f) {
proctools::logger::error(proctools::format("couldn't read {0}") % counter_path);
Index: vdrburn-archive.sh
===================================================================
--- vdrburn-archive.sh.orig 2012-10-07 17:35:46.210420545 +0200
+++ vdrburn-archive.sh 2012-10-07 17:38:38.421435235 +0200
@@ -53,7 +53,7 @@
RECORDING_DMH="$RECPATH"/"$UPPERRECDIR"_DVD/"$RECDIR"
mkdir -p "$RECORDING_DMH"
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_DMH"/dvd.vdr
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH/dvd.vdr"
# Old style Records ("index.vdr"/"info.vdr")
if [ -f "$RECORDING_PATH"/index.vdr ]; then
cp "$RECORDING_PATH"/info.vdr "$RECORDING_DMH"/info.vdr
@@ -66,8 +66,8 @@
;;
archivemark)
- ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1))
- printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
+ (DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
;;
*)
Index: vdrburn-dvd.sh
===================================================================
--- vdrburn-dvd.sh.orig 2012-10-07 17:40:01.859441567 +0200
+++ vdrburn-dvd.sh 2012-10-07 17:48:54.861488725 +0200
@@ -78,7 +78,7 @@
;;
demux)
- [ -r $CONFIG_PATH/vdrburn-dvd.conf ] && . $CONFIG_PATH/vdrburn-dvd.conf
+ [ -r /etc/vdr/plugins/burn/vdrburn-dvd.conf ] && . /etc/vdr/plugins/burn/vdrburn-dvd.conf
[ -z "$JAVA_EXE" ] && JAVA_EXE=$(which java)
[ ! -x "$JAVA_EXE" ] && echo "ERROR: java executable \"$JAVA_EXE\" not found" && exit 1
@@ -94,7 +94,7 @@
$IO_NICE $JAVA_EXE -Djava.awt.headless=true \
-jar $PROJECTX_JAR \
- -ini $CONFIG_PATH/ProjectX.ini \
+ -ini /etc/vdr/plugins/burn/ProjectX.ini \
$TTXT_OPTS \
$CUT -id $USED_TRACKS \
-demux -out "$MPEG_DATA_PATH" -name vdrsync \
@@ -245,15 +245,16 @@
echo "Deleting $TEMP_PATH/INDEX_${TRACK_ON_DVD}"
rm -rf "$TEMP_PATH/INDEX_${TRACK_ON_DVD}"
echo "Creating "$RECORDING_DMH"/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_DMH"/dvd.vdr
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH/dvd.vdr"
printf "%04d\n" $(echo ${TRACK_ON_DVD} | sed 's/^0*//') >> "$RECORDING_DMH"/dvd.vdr
;;
archivemark)
echo "Creating $DVDAUTHOR_PATH/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
- ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1))
- printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
+ cp "/var/lib/vdr/burn/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
+ ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
+
;;
mkiso)
Index: vdr-burn.conf
===================================================================
RCS file: vdr-burn.conf
diff -N vdr-burn.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vdr-burn.conf 19 Feb 2013 18:53:02 -0000 1.3
@@ -0,0 +1,7 @@
+# Configuration snippet for vdr-burn -*- sh -*-
+#
+# Add command line options to pass to the burn plugin to PLUGIN_OPTIONS.
+# See /usr/share/doc/vdr-burn-*/README and "vdr --help" for info about
+# available options for this plugin.
+
+PLUGIN_OPTIONS="-d /tmp"
Index: vdr-burn.spec
===================================================================
RCS file: vdr-burn.spec
diff -N vdr-burn.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vdr-burn.spec 19 Feb 2013 18:53:02 -0000 1.8
@@ -0,0 +1,262 @@
+%define pname burn
+%define gver 0.1.3
+
+Name: vdr-%{pname}
+Version: 0.2.1
+Release: 1%{?dist}
+Summary: DVD writing plugin for VDR
+
+Group: Applications/Multimedia
+# genindex is GPLv2+, rest GPL+
+License: GPL+ and GPLv2+
+URL: http://projects.vdr-developer.org/projects/plg-burn
+Source0: http://projects.vdr-developer.org/attachments/download/832/%{name}-%{vers...
+Source1: %{name}.conf
+Source2: http://www.muempf.de/down/genindex-%{gver}.tar.gz
+Patch0: %{name}-%{version}-config.patch
+
+BuildRequires: vdr-devel >= 1.7.30
+BuildRequires: boost-devel
+BuildRequires: gd-devel
+Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
+Requires: vdrsync
+Requires: ProjectX
+Requires: m2vrequantiser
+Requires: dvdauthor
+Requires: mjpegtools
+Requires: dvd+rw-tools
+Requires: dejavu-lgc-sans-fonts
+Conflicts: ProjectX < 0.90.4.00.b29
+
+%description
+This plugin enables VDR to write compliant DVDs from VDR recordings
+while being able to control the process and to watch progress from
+inside VDRs on-screen-display. If the selected recordings don't fit
+the DVD, the video tracks are requantized (shrinked) automatically.
+The created menus support multipage descriptions (in case the
+recording summary exceeds one page).
+
+
+%prep
+%setup -q -c -a 2
+
+cd burn-0.2.1
+find -name CVS | xargs rm -rf
+chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README
+%patch0 -p0
+
+sed -i -e 's|/var/lib/vdr/|%{vdr_vardir}/|g' chain-archive.c jobs.c vdrburn-*.sh
+sed -i -e 's|"Vera"|"DejaVuLGCSans"|g' skins.c
+
+cd ../genindex-%{gver}
+sed -i -e 's/-g -O2/$(RPM_OPT_FLAGS)/' Makefile
+f=README ; iconv -f iso-8859-1 -t utf-8 -o ../README.genindex $f
+cd ..
+
+
+%build
+make -C burn-%{version} %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr all
+make -C genindex-%{gver} %{?_smp_mflags}
+
+
+%install
+install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}/bin
+install -pm 755 burn-%{version}/libvdr-%{pname}.so.%{vdr_apiversion} $RPM_BUILD_ROOT%{vdr_plugindir}
+install -pm 755 burn-%{version}/*.sh genindex-%{gver}/genindex \
+ $RPM_BUILD_ROOT%{vdr_plugindir}/bin
+install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/skins
+cp -pR burn-%{version}/burn/* $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn
+rm -rf $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/{counters,fonts/*}
+ln -s %{_datadir}/fonts/dejavu/DejaVuLGCSans.ttf \
+ $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/fonts/
+install -Dpm 644 burn-%{version}/burn/counters/standard \
+ $RPM_BUILD_ROOT%{vdr_vardir}/burn/counters/standard
+install -Dpm 644 %{SOURCE1} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+
+
+%post
+if [ $1 -gt 1 ] ; then # maybe upgrading from < 0.1.0?
+ %{__perl} -pi -e 's/^.*(burnmark|handlearchived)\.sh.*\n$//' \
+ %{vdr_configdir}/reccmds.conf >/dev/null 2>&1 || :
+fi
+
+
+%files
+%defattr(-,root,root,-)
+%doc burn-%{version}/COPYING burn-%{version}/HISTORY burn-%{version}/README README.genindex
+%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+%config(noreplace) %{vdr_configdir}/plugins/%{pname}/
+%{vdr_plugindir}/bin/genindex
+%{vdr_plugindir}/bin/vdrburn-archive.sh
+%{vdr_plugindir}/bin/vdrburn-dvd.sh
+%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
+%defattr(-,%{vdr_user},root)
+%config(noreplace) %{vdr_vardir}/burn/
+
+
+%changelog
+* Mon Feb 18 2013 Martin Gansser <martinkg(a)fedoraproject.org> - 0.2.1-1
+- rebuild for new release
+- specfile cleanups
+
+* Thu Oct 11 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-3
+- rebuild for Fedora 18.
+
+* Wed Oct 10 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-2
+- removed vdrsync Requirenment
+- removed no-subtitle patch
+
+* Sun Oct 07 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-1
+- spec file cleanup
+- rebuild for new release
+- Adapt to VDR 1.7.30.
+- added priority header patch for Fedora 18.
+
+* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.1.0-0.20.pre21
+- Rebuilt for c++ ABI breakage
+
+* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.1.0-0.19.pre21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Mar 27 2009 Felix Kaechele <felix at fetzig dot org> - 0.1.0-0.18.pre21
+- and again
+
+* Sat Jan 03 2009 Felix Kaechele <felix at fetzig dot org> - 0.1.0-0.17.pre21
+- fixed font deps (once again)
+
+* Mon Dec 15 2008 Felix Kaechele <felix at fetzig dot org> - 0.1.0-0.16.pre21
+- fixed dejavu-lgc-* deps
+
+* Thu Nov 27 2008 Felix Kaechele <felix at fetzig dot org> - 0.1.0-0.15.pre21
+- rebuilt due to path adjustments in vdr main package
+
+* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.1.0-0.14.pre21
+- rebuild
+
+* Tue Apr 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.13.pre21
+- Use UTF-8 with VDR 1.6.x.
+- Disable subtitles with VDR 1.6.x and ProjectX by default (demux problems).
+
+* Tue Apr 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.12.pre21
+- Patch to fix build with GCC 4.3's cleaned up C++ headers.
+
+* Tue Apr 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.11.pre21
+- Rebuild for VDR 1.6.0.
+
+* Sat Dec 1 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.10.pre21
+- Use /dev/dvdrw as the default writer device, udev >= 115 no longer creates
+ /dev/dvdwriter.
+
+* Sun Nov 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.9.pre21
+- Adjust font paths for dejavu-lgc-fonts 2.21+.
+- Drop old gd-devel missing dependency workaround.
+
+* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.8.pre21
+- Use DejaVu LGC fonts instead of Bitstream Vera.
+- Improve comments in burn.conf.
+- License: GPL+ and GPLv2+
+
+* Sun Jan 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.7.pre21
+- Rebuild for VDR 1.4.5.
+
+* Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.6.pre21
+- 0.1.0-pre21, include private copy of genindex (0.1.3) for now.
+
+* Sat Nov 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-16
+- Rebuild for VDR 1.4.4.
+
+* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.0.009-15
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-14
+- Rebuild for VDR 1.4.3.
+
+* Sun Aug 6 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-13
+- Rebuild for VDR 1.4.1-3.
+
+* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-12
+- Rebuild for VDR 1.4.1.
+
+* Sun Apr 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-11
+- Rebuild for VDR 1.4.0.
+
+* Mon Apr 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-10
+- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
+- Trim pre-RLO %%changelog entries.
+
+* Sun Mar 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-9
+- Rebuild for VDR 1.3.45.
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.0.009-8
+- drop 0.lvn
+
+* Wed Mar 1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.8
+- Decrease default DVD size to 4420 to accommodate more requant inaccuracy.
+- Rebuild for VDR 1.3.44.
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Sun Feb 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.7
+- Rebuild for VDR 1.3.43.
+
+* Sun Feb 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.6
+- Rebuild for VDR 1.3.42.
+
+* Sun Jan 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.5
+- Rebuild for VDR 1.3.40.
+
+* Sun Jan 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.4
+- Rebuild for VDR 1.3.39.
+
+* Sun Jan 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.3
+- Rebuild for VDR 1.3.38.
+
+* Sat Dec 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.2
+- Q'n'd fix for ISO creation with recordings whose title contain "/".
+- Fix storing of the "clean up after # jobs" configuration option.
+- Don't chmod everything in results to 0777 in author only mode.
+- Use tcmplex-panteltje by default again.
+- Translation improvements.
+- Fix up some paths in README.
+- Ship TODO.
+
+* Sun Nov 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.1
+- 0.0.009 + Finnish translations from Rolf Ahrenberg, config patch
+ applied upstream.
+
+* Sat Nov 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.007-0.lvn.1
+- 0.0.007, endstatus and burndefault patches applied/obsoleted upstream.
+
+* Sun Nov 6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6k-0.lvn.2
+- Rebuild for VDR 1.3.36.
+
+* Tue Nov 1 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6k-0.lvn.1
+- 0.0.6k, commands and VDR >= 1.3.25 patches applied upstream.
+- Improve default burn settings.
+- Fix burn status at end when not verifying.
+
+* Mon Oct 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.8.pre3
+- Rebuild for VDR 1.3.34.
+
+* Sun Sep 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.7.pre3
+- Rebuild for VDR 1.3.33.
+
+* Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.6.pre3
+- Rebuild for VDR 1.3.32.
+
+* Tue Aug 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.5.pre3
+- Rebuild for VDR 1.3.31.
+
+* Sun Aug 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.4.pre3
+- Rebuild for VDR 1.3.30.
+
+* Fri Aug 19 2005 Dams <anvil[AT]livna.org> - 0.0.6g-1.lvn.3.pre3
+- Redirected vdr-config invocation standard error to /dev/null
+
+* Tue Aug 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.2.pre3
+- Try to avoid build system problems by not using %%expand with vdr-config.
+
+* Fri Aug 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.1.pre3
+- Update URLs.
--- dead.package DELETED ---
11 years, 3 months
rpms/smesh/F-17 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.3, 1.4 sources, 1.2, 1.3
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/smesh/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30728
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-17/smesh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smesh.spec 22 Oct 2012 20:34:51 -0000 1.3
+++ smesh.spec 19 Feb 2013 18:16:58 -0000 1.4
@@ -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-17/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 19 Feb 2013 18:16:58 -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, 3 months
rpms/vdr-burn/F-18 vdr-burn-0.2.1-config.patch, NONE, 1.1 sources, 1.4, 1.5 vdr-burn.spec, 1.11, 1.12 vdr-1.7.27-burn-0.2.0.diff, 1.1, NONE vdr-burn-0.2.0-PRIO_PGRP.patch, 1.1, NONE vdr-burn-0.2.0-config.patch, 1.1, NONE vdr-burn-0.2.0-fsf-fix.patch, 1.1, NONE
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-burn/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30521/F-18
Modified Files:
sources vdr-burn.spec
Added Files:
vdr-burn-0.2.1-config.patch
Removed Files:
vdr-1.7.27-burn-0.2.0.diff vdr-burn-0.2.0-PRIO_PGRP.patch
vdr-burn-0.2.0-config.patch vdr-burn-0.2.0-fsf-fix.patch
Log Message:
vdr-burn-0.2.1-config.patch:
README | 2 +-
chain-archive.c | 2 +-
jobs.c | 2 +-
vdrburn-archive.sh | 6 +++---
vdrburn-dvd.sh | 13 +++++++------
5 files changed, 13 insertions(+), 12 deletions(-)
--- NEW FILE vdr-burn-0.2.1-config.patch ---
Index: README
===================================================================
--- README.orig 2012-10-07 17:31:04.771395847 +0200
+++ README 2012-10-07 17:31:55.124400166 +0200
@@ -77,7 +77,7 @@
3b.(optional) Change the default temporary folder, the default DVD writer device
and the default ISO directory with TMPDIR (default: /tmp),
- DVDDEV (default: /dev/dvdrw) and ISODIR (default: /pub/export)
+ DVDDEV (default: /dev/dvdrw) and ISODIR (default: video dir)
# make DVDDEV=/dev/cdrecorder ISODIR=/export plugins
Index: chain-archive.c
===================================================================
RCS file: /var/cvsroot/burn/chain-archive.c,v
retrieving revision 1.13
diff -u -r1.13 chain-archive.c
--- chain-archive.c 16 Sep 2006 18:33:36 -0000 1.13
+++ chain-archive.c 12 Dec 2006 20:31:14 -0000
@@ -64,7 +64,7 @@
bind( &recording::get_graft_point, _2 ),
" "
)));
- graftPoints = format("{0} /dvd.vdr={1}/counters/standard") % graftPoints % plugin::get_config_path();
+ graftPoints = format("{0} /dvd.vdr=/var/lib/vdr/burn/counters/standard") % graftPoints;
switch (get_job().get_store_mode()) {
case storemode_create:
Index: jobs.c
===================================================================
RCS file: /var/cvsroot/burn/jobs.c,v
retrieving revision 1.35
diff -u -r1.35 jobs.c
--- jobs.c 1 Oct 2006 21:22:27 -0000 1.35
+++ jobs.c 12 Dec 2006 20:31:14 -0000
@@ -389,7 +389,7 @@
std::string job::get_archive_id()
{
std::string archive_id = "";
- std::string counter_path = format("{0}/counters/standard") % plugin::get_config_path();
+ std::string counter_path = "/var/lib/vdr/burn/counters/standard";
std::ifstream f(counter_path.c_str());
if (!f) {
proctools::logger::error(proctools::format("couldn't read {0}") % counter_path);
Index: vdrburn-archive.sh
===================================================================
--- vdrburn-archive.sh.orig 2012-10-07 17:35:46.210420545 +0200
+++ vdrburn-archive.sh 2012-10-07 17:38:38.421435235 +0200
@@ -53,7 +53,7 @@
RECORDING_DMH="$RECPATH"/"$UPPERRECDIR"_DVD/"$RECDIR"
mkdir -p "$RECORDING_DMH"
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_DMH"/dvd.vdr
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH/dvd.vdr"
# Old style Records ("index.vdr"/"info.vdr")
if [ -f "$RECORDING_PATH"/index.vdr ]; then
cp "$RECORDING_PATH"/info.vdr "$RECORDING_DMH"/info.vdr
@@ -66,8 +66,8 @@
;;
archivemark)
- ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1))
- printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
+ (DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
;;
*)
Index: vdrburn-dvd.sh
===================================================================
--- vdrburn-dvd.sh.orig 2012-10-07 17:40:01.859441567 +0200
+++ vdrburn-dvd.sh 2012-10-07 17:48:54.861488725 +0200
@@ -78,7 +78,7 @@
;;
demux)
- [ -r $CONFIG_PATH/vdrburn-dvd.conf ] && . $CONFIG_PATH/vdrburn-dvd.conf
+ [ -r /etc/vdr/plugins/burn/vdrburn-dvd.conf ] && . /etc/vdr/plugins/burn/vdrburn-dvd.conf
[ -z "$JAVA_EXE" ] && JAVA_EXE=$(which java)
[ ! -x "$JAVA_EXE" ] && echo "ERROR: java executable \"$JAVA_EXE\" not found" && exit 1
@@ -94,7 +94,7 @@
$IO_NICE $JAVA_EXE -Djava.awt.headless=true \
-jar $PROJECTX_JAR \
- -ini $CONFIG_PATH/ProjectX.ini \
+ -ini /etc/vdr/plugins/burn/ProjectX.ini \
$TTXT_OPTS \
$CUT -id $USED_TRACKS \
-demux -out "$MPEG_DATA_PATH" -name vdrsync \
@@ -245,15 +245,16 @@
echo "Deleting $TEMP_PATH/INDEX_${TRACK_ON_DVD}"
rm -rf "$TEMP_PATH/INDEX_${TRACK_ON_DVD}"
echo "Creating "$RECORDING_DMH"/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_DMH"/dvd.vdr
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH/dvd.vdr"
printf "%04d\n" $(echo ${TRACK_ON_DVD} | sed 's/^0*//') >> "$RECORDING_DMH"/dvd.vdr
;;
archivemark)
echo "Creating $DVDAUTHOR_PATH/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
- ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1))
- printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
+ cp "/var/lib/vdr/burn/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
+ ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
+
;;
mkiso)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-18/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 11 Oct 2012 08:59:54 -0000 1.4
+++ sources 19 Feb 2013 18:16:10 -0000 1.5
@@ -1,2 +1,2 @@
da67b1ae819bf9c064af49ab64dbf27b genindex-0.1.3.tar.gz
-6a0b5e8d68c06e8db441039a62ca2c01 vdr-burn-0.2.0.tgz
+50d349d36bdcf2b341dfab2fa43a31a9 vdr-burn-0.2.1.tgz
Index: vdr-burn.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-18/vdr-burn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vdr-burn.spec 11 Oct 2012 17:04:52 -0000 1.11
+++ vdr-burn.spec 19 Feb 2013 18:16:10 -0000 1.12
@@ -2,8 +2,8 @@
%define gver 0.1.3
Name: vdr-%{pname}
-Version: 0.2.0
-Release: 3%{?dist}
+Version: 0.2.1
+Release: 1%{?dist}
Summary: DVD writing plugin for VDR
Group: Applications/Multimedia
@@ -13,16 +13,7 @@
Source0: http://projects.vdr-developer.org/attachments/download/832/%{name}-%{vers...
Source1: %{name}.conf
Source2: http://www.muempf.de/down/genindex-%{gver}.tar.gz
-# upstream patch >= vdr-1.7.27
-# http://projects.vdr-developer.org/news/172
-Patch0: vdr-1.7.27-burn-0.2.0.diff
-Patch1: %{name}-%{version}-config.patch
-# upstream patch for Fedora 18
-# http://projects.vdr-developer.org/issues/1085
-Patch2: %{name}-%{version}-PRIO_PGRP.patch
-# upstream fsf-fix patch
-# http://projects.vdr-developer.org/issues/1086
-Patch3: %{name}-%{version}-fsf-fix.patch
+Patch0: %{name}-%{version}-config.patch
BuildRequires: vdr-devel >= 1.7.30
BuildRequires: boost-devel
@@ -49,13 +40,10 @@
%prep
%setup -q -c -a 2
-cd burn-0.2.0
+cd burn-0.2.1
find -name CVS | xargs rm -rf
chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README
%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
sed -i -e 's|/var/lib/vdr/|%{vdr_vardir}/|g' chain-archive.c jobs.c vdrburn-*.sh
sed -i -e 's|"Vera"|"DejaVuLGCSans"|g' skins.c
@@ -108,6 +96,10 @@
%changelog
+* Mon Feb 18 2013 Martin Gansser <martinkg(a)fedoraproject.org> - 0.2.1-1
+- rebuild for new release
+- specfile cleanups
+
* Thu Oct 11 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-3
- rebuild for Fedora 18.
--- vdr-1.7.27-burn-0.2.0.diff DELETED ---
--- vdr-burn-0.2.0-PRIO_PGRP.patch DELETED ---
--- vdr-burn-0.2.0-config.patch DELETED ---
--- vdr-burn-0.2.0-fsf-fix.patch DELETED ---
11 years, 3 months
rpms/freecad/F-18 freecad-0.13-pycxx.patch, NONE, 1.1 freecad.spec, 1.2, 1.3 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/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27489
Modified Files:
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: freecad.spec
===================================================================
RCS file: /cvs/nonfree/rpms/freecad/F-18/freecad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freecad.spec 27 Oct 2012 03:31:27 -0000 1.2
+++ freecad.spec 19 Feb 2013 16:06:11 -0000 1.3
@@ -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/F-18/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 19 Feb 2013 16:06:11 -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, 3 months
rpms/OCE/F-17 OCE-0.11-freeimage.patch,NONE,1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/OCE/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25876
Added Files:
OCE-0.11-freeimage.patch
Log Message:
Commit patch.
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
11 years, 3 months
rpms/OCE/F-17 OCE.spec, 1.2, 1.3 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-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25687
Modified Files:
OCE.spec sources
Removed Files:
OCE-0.8.0-env.patch
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/F-17/OCE.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OCE.spec 2 May 2012 20:46:36 -0000 1.2
+++ OCE.spec 19 Feb 2013 15:02:13 -0000 1.3
@@ -1,19 +1,22 @@
-%global githash1 gc4c7d83
-%global githash2 de78904
#global relcan 1
+# Use newer cmake on EL-6.
+%if 0%{?el6}
+%global cmake %cmake28
+%endif
+
Name: OCE
-Version: 0.8.0
-Release: 3%{?relcan:.rc%{relcan}}%{?dist}
+Version: 0.11
+Release: 2%{?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
@@ -23,18 +26,27 @@
Source6: oce-48.png
# Utilities
+%if 0%{?el6}
+BuildRequires: cmake28
+%else
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
BuildRequires: tk-devel
+%ifarch %{ix86} x86_64 ia64 ppc ppc64
+BuildRequires: tbb-devel
+%endif
%description
@@ -120,8 +132,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 && \
@@ -131,13 +143,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 \
../
@@ -268,7 +281,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.*
@@ -276,6 +289,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
@@ -286,11 +300,17 @@
%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
+* 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.
+
* 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-17/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 19 Feb 2013 15:02:13 -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, 3 months
rpms/OCE/F-18 OCE.spec,1.4,1.5
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/OCE/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24174
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/F-18/OCE.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OCE.spec 18 Feb 2013 17:17:11 -0000 1.4
+++ OCE.spec 19 Feb 2013 13:54:27 -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
+%ifarch %{ix86} x86_64 ia64 ppc ppc64
+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, 3 months