rpms/mpv/F-19 mpv-config.patch, 1.1, 1.2 mpv.spec, 1.2, 1.3 sources, 1.2, 1.3
by Miro Hrončok
Author: churchyard
Update of /cvs/free/rpms/mpv/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27040
Modified Files:
mpv-config.patch mpv.spec sources
Log Message:
* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-3
- Add desktop file
mpv-config.patch:
example.conf | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: mpv-config.patch
===================================================================
RCS file: /cvs/free/rpms/mpv/F-19/mpv-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mpv-config.patch 1 Sep 2013 11:43:17 -0000 1.1
+++ mpv-config.patch 12 Oct 2013 13:44:34 -0000 1.2
@@ -15,7 +15,7 @@
# Specify default video driver (see -vo help for a list).
#vo=vdpau
-+vo=xv
++#vo=xv
# Start in fullscreen mode by default.
#fs=yes
Index: mpv.spec
===================================================================
RCS file: /cvs/free/rpms/mpv/F-19/mpv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpv.spec 9 Sep 2013 11:52:51 -0000 1.2
+++ mpv.spec 12 Oct 2013 13:44:34 -0000 1.3
@@ -1,10 +1,11 @@
Name: mpv
-Version: 0.1.2
+Version: 0.1.7
Release: 3%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv3+
URL: http://%{name}.io/
Source0: https://github.com/%{name}-player/%{name}/archive/v%{version}.tar.gz
+Source1: %{name}.desktop
# set defaults for Fedora
Patch0: %{name}-config.patch
@@ -12,6 +13,7 @@
BuildRequires: aalib-devel
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
+BuildRequires: desktop-file-utils
BuildRequires: ffmpeg-devel
BuildRequires: ffmpeg-libs
BuildRequires: libass-devel
@@ -60,15 +62,29 @@
# Default config files
install -Dpm 644 etc/example.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+desktop-file-install %{SOURCE1}
%files
%doc AUTHORS LICENSE README.md Copyright
%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.*
%{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%changelog
+* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-3
+- Add desktop file
+
+* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-2
+- Do not use xv as default vo
+
+* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-1
+- New upstream release
+
+* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.1.2-4
+- Rebuilt
+
* Mon Sep 09 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.2-3
- Added BR ffmpeg-libs
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpv/F-19/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 1 Sep 2013 11:43:17 -0000 1.2
+++ sources 12 Oct 2013 13:44:34 -0000 1.3
@@ -1 +1 @@
-78cc945e7628d2f17f75bec18cc750e3 v0.1.2.tar.gz
+69185e255fe6e8b6b13dcf6ea9b2fefb v0.1.7.tar.gz
11 years, 1 month
rpms/mpv/devel mpv.spec,1.5,1.6
by Miro Hrončok
Author: churchyard
Update of /cvs/free/rpms/mpv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16758
Modified Files:
mpv.spec
Log Message:
* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-3
- Add desktop file
Index: mpv.spec
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/mpv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mpv.spec 12 Oct 2013 12:11:56 -0000 1.5
+++ mpv.spec 12 Oct 2013 12:33:22 -0000 1.6
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv3+
URL: http://%{name}.io/
@@ -67,11 +67,15 @@
%files
%doc AUTHORS LICENSE README.md Copyright
%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/%{name}.*
%{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%changelog
+* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-3
+- Add desktop file
+
* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-2
- Do not use xv as default vo
11 years, 1 month
rpms/mpv/devel mpv.spec,1.4,1.5
by Miro Hrončok
Author: churchyard
Update of /cvs/free/rpms/mpv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8962
Modified Files:
mpv.spec
Log Message:
* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-2
- Do not use xv as default vo
Index: mpv.spec
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/mpv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mpv.spec 12 Oct 2013 12:00:45 -0000 1.4
+++ mpv.spec 12 Oct 2013 12:11:56 -0000 1.5
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv3+
URL: http://%{name}.io/
@@ -72,6 +72,9 @@
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%changelog
+* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-2
+- Do not use xv as default vo
+
* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-1
- New upstream release
11 years, 1 month
rpms/mpv/devel mpv-config.patch,1.1,1.2
by Miro Hrončok
Author: churchyard
Update of /cvs/free/rpms/mpv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8793
Modified Files:
mpv-config.patch
Log Message:
Do not use xv as default
mpv-config.patch:
example.conf | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: mpv-config.patch
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/mpv-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mpv-config.patch 1 Sep 2013 11:36:10 -0000 1.1
+++ mpv-config.patch 12 Oct 2013 12:10:39 -0000 1.2
@@ -15,7 +15,7 @@
# Specify default video driver (see -vo help for a list).
#vo=vdpau
-+vo=xv
++#vo=xv
# Start in fullscreen mode by default.
#fs=yes
11 years, 1 month
rpms/mpv/devel mpv.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 mpv.spec, 1.3, 1.4 sources, 1.2, 1.3
by Miro Hrončok
Author: churchyard
Update of /cvs/free/rpms/mpv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5659
Modified Files:
.cvsignore mpv.spec sources
Added Files:
mpv.desktop
Log Message:
* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-1
- New upstream release
--- NEW FILE mpv.desktop ---
[Desktop Entry]
Name=mpv
Comment=Mpv Video Player
Comment[cs]=Přehrávač videí mpv
GenericName=Video Player
GenericName[cs]=Přehrávač videí
TryExec=mpv
Exec=mpv %F
Icon=applications-multimedia
NoDisplay=true
Terminal=true
StartupNotify=true
Type=Application
Categories=AudioVideo;Video;Player;
MimeType=application/mxf;application/ogg;application/ram;application/sdp;application/smil;application/smil+xml;application/vnd.apple.mpegurl;application/vnd.ms-wpl;application/vnd.rn-realmedia;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-flash-video;application/x-matroska;application/x-netshow-channel;application/x-ogg;application/x-quicktime-media-link;application/x-quicktimeplayer;application/x-shorten;application/x-smil;application/xspf+xml;audio/3gpp;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/flac;audio/midi;audio/mp2;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-win
dows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-s3m;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-stm;audio/x-tta;audio/x-wav;audio/x-wavpack;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-xm;image/vnd.rn-realpix;image/x-pict;misc/ultravox;text/google-video-pointer;text/x-google-video-pointer;video/3gp;video/3gpp;video/dv;video/divx;video/fli;video/flv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.mpegurl;video/vnd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-mpeg2;video/x-ms-asf;video/x-ms-asx;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;video/x-totem-stream;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;x-scheme-handler/pnm;x-scheme-handler/mms;x-scheme-handler/net;x-scheme-handler/rtp;x-sc
heme-handler/rtmp;x-scheme-handler/rtsp;x-scheme-handler/mmsh;x-scheme-handler/uvox;x-scheme-handler/icy;x-scheme-handler/icyx;
# vi:set encoding=UTF-8:
X-Desktop-File-Install-Version=0.21
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1 Sep 2013 11:36:10 -0000 1.2
+++ .cvsignore 12 Oct 2013 12:00:45 -0000 1.3
@@ -1 +1 @@
-v0.1.2.tar.gz
+v0.1.7.tar.gz
Index: mpv.spec
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/mpv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpv.spec 30 Sep 2013 08:40:47 -0000 1.3
+++ mpv.spec 12 Oct 2013 12:00:45 -0000 1.4
@@ -1,10 +1,11 @@
Name: mpv
-Version: 0.1.2
-Release: 4%{?dist}
+Version: 0.1.7
+Release: 1%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv3+
URL: http://%{name}.io/
Source0: https://github.com/%{name}-player/%{name}/archive/v%{version}.tar.gz
+Source1: %{name}.desktop
# set defaults for Fedora
Patch0: %{name}-config.patch
@@ -12,6 +13,7 @@
BuildRequires: aalib-devel
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
+BuildRequires: desktop-file-utils
BuildRequires: ffmpeg-devel
BuildRequires: ffmpeg-libs
BuildRequires: libass-devel
@@ -60,6 +62,7 @@
# Default config files
install -Dpm 644 etc/example.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+desktop-file-install %{SOURCE1}
%files
%doc AUTHORS LICENSE README.md Copyright
@@ -69,6 +72,9 @@
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%changelog
+* Sat Oct 12 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.7-1
+- New upstream release
+
* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.1.2-4
- Rebuilt
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 1 Sep 2013 11:36:11 -0000 1.2
+++ sources 12 Oct 2013 12:00:45 -0000 1.3
@@ -1 +1 @@
-78cc945e7628d2f17f75bec18cc750e3 v0.1.2.tar.gz
+69185e255fe6e8b6b13dcf6ea9b2fefb v0.1.7.tar.gz
11 years, 1 month
rpms/smesh/EL-6 smesh-5.1.2.2-pi_to_m_pi.patch,NONE,1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/smesh/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16237
Added Files:
smesh-5.1.2.2-pi_to_m_pi.patch
Log Message:
Add missing patch.
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;
11 years, 1 month
rpms/smesh/EL-6 sources,1.2,1.3
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/smesh/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15899
Modified Files:
sources
Log Message:
Setup new source.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/smesh/EL-6/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 11 Oct 2013 22:15:28 -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, 1 month
rpms/smesh/EL-6 smesh-OCE_0.13_port.patch, NONE, 1.1 smesh.spec, 1.4, 1.5
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/smesh/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15620
Modified Files:
smesh.spec
Added Files:
smesh-OCE_0.13_port.patch
Log Message:
* Thu Oct 10 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-8.svn55
- Rebuild for OCE-0.13.
smesh-OCE_0.13_port.patch:
StdMeshers_RadialPrism_3D.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE smesh-OCE_0.13_port.patch ---
diff -Naur smesh-5.1.2.2.svn55.orig/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp smesh-5.1.2.2.svn55/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp
--- smesh-5.1.2.2.svn55.orig/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp 2009-12-16 09:01:21.000000000 -0600
+++ smesh-5.1.2.2.svn55/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp 2013-09-22 21:30:43.995137618 -0500
@@ -46,6 +46,7 @@
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepTools.hxx>
#include <BRep_Tool.hxx>
+#include <BRepClass3d.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shell.hxx>
@@ -161,7 +163,7 @@
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
- TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
+ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
@@ -401,7 +403,7 @@
{
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
- TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
+ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
Index: smesh.spec
===================================================================
RCS file: /cvs/nonfree/rpms/smesh/EL-6/smesh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smesh.spec 22 Oct 2012 20:13:33 -0000 1.4
+++ smesh.spec 11 Oct 2013 22:13:54 -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: 8.svn%{svnrev}%{?dist}
Summary: OpenCascade based MESH framework
# This library is LGPLv2+ but links against the non-free library OCE.
@@ -14,13 +16,16 @@
# 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
+# http://tracker.dev.opencascade.org/view.php?id=23487
+Patch4: smesh-OCE_0.13_port.patch
%if 0%{?rhel}
BuildRequires: cmake28
@@ -61,10 +66,12 @@
%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
+%patch4 -p1 -b .oce-0.13
dos2unix -k LICENCE.lgpl.txt
@@ -108,6 +115,18 @@
%changelog
+* Thu Oct 10 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-8.svn55
+- Rebuild for OCE-0.13.
+
+* Mon Jul 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-7.svn55
+- Rebuild for updated OCE.
+
+* Fri Jun 21 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-6.svn55
+- Rebuild for OCE 0.12.
+
+* 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.
11 years, 1 month
rpms/smesh/F-18 smesh-OCE_0.13_port.patch, NONE, 1.1 smesh.spec, 1.5, 1.6
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/smesh/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15411
Modified Files:
smesh.spec
Added Files:
smesh-OCE_0.13_port.patch
Log Message:
* Thu Oct 10 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-8.svn55
- Rebuild for OCE-0.13.
smesh-OCE_0.13_port.patch:
StdMeshers_RadialPrism_3D.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE smesh-OCE_0.13_port.patch ---
diff -Naur smesh-5.1.2.2.svn55.orig/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp smesh-5.1.2.2.svn55/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp
--- smesh-5.1.2.2.svn55.orig/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp 2009-12-16 09:01:21.000000000 -0600
+++ smesh-5.1.2.2.svn55/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp 2013-09-22 21:30:43.995137618 -0500
@@ -46,6 +46,7 @@
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepTools.hxx>
#include <BRep_Tool.hxx>
+#include <BRepClass3d.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shell.hxx>
@@ -161,7 +163,7 @@
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
- TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
+ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
@@ -401,7 +403,7 @@
{
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
- TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
+ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
Index: smesh.spec
===================================================================
RCS file: /cvs/nonfree/rpms/smesh/F-18/smesh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smesh.spec 18 Feb 2013 21:25:33 -0000 1.5
+++ smesh.spec 11 Oct 2013 22:13:20 -0000 1.6
@@ -7,7 +7,7 @@
Name: smesh
Version: 5.1.2.2
-Release: 6.svn%{svnrev}%{?dist}
+Release: 8.svn%{svnrev}%{?dist}
Summary: OpenCascade based MESH framework
# This library is LGPLv2+ but links against the non-free library OCE.
@@ -24,6 +24,8 @@
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
+# http://tracker.dev.opencascade.org/view.php?id=23487
+Patch4: smesh-OCE_0.13_port.patch
%if 0%{?rhel}
BuildRequires: cmake28
@@ -69,6 +71,7 @@
%patch1 -p1 -b .cmakefix
%patch2 -p1 -b .f2c
%patch3 -p1 -b .pi
+%patch4 -p1 -b .oce-0.13
dos2unix -k LICENCE.lgpl.txt
@@ -112,6 +115,15 @@
%changelog
+* Thu Oct 10 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-8.svn55
+- Rebuild for OCE-0.13.
+
+* Mon Jul 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-7.svn55
+- Rebuild for updated OCE.
+
+* Fri Jun 21 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-6.svn55
+- Rebuild for OCE 0.12.
+
* Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-1.svn55
- Update for compatibility with new OCE.
11 years, 1 month
rpms/smesh/F-19 smesh-OCE_0.13_port.patch,NONE,1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/smesh/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15218
Added Files:
smesh-OCE_0.13_port.patch
Log Message:
Add patch.
smesh-OCE_0.13_port.patch:
StdMeshers_RadialPrism_3D.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE smesh-OCE_0.13_port.patch ---
diff -Naur smesh-5.1.2.2.svn55.orig/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp smesh-5.1.2.2.svn55/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp
--- smesh-5.1.2.2.svn55.orig/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp 2009-12-16 09:01:21.000000000 -0600
+++ smesh-5.1.2.2.svn55/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp 2013-09-22 21:30:43.995137618 -0500
@@ -46,6 +46,7 @@
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepTools.hxx>
#include <BRep_Tool.hxx>
+#include <BRepClass3d.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shell.hxx>
@@ -161,7 +163,7 @@
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
- TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
+ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
@@ -401,7 +403,7 @@
{
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
- TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
+ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
11 years, 1 month