rpmfusion-commits
January 2012
rpmfusion-commits@lists.rpmfusion.org
- 21 participants
- 364 discussions
rpms/avidemux/F-15 avidemux-2.5.6-ffmpeg_aac.patch, NONE, 1.1 avidemux-2.5.6-ffmpeg_parallel_build.patch, NONE, 1.1 avidemux.spec, 1.57, 1.58 branch, 1.1, 1.2 sources, 1.9, 1.10
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22323
Modified Files:
avidemux.spec branch sources
Added Files:
avidemux-2.5.6-ffmpeg_aac.patch
avidemux-2.5.6-ffmpeg_parallel_build.patch
Log Message:
* Sat Jan 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-3
- Install icon files to preferred location.
- Reenable FFmpeg based AAC encoding.
- Update to latest release.
avidemux-2.5.6-ffmpeg_aac.patch:
cmake/admFFmpegBuild.cmake | 2 -
plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt | 9 ++++
plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp | 21 ++++++++---
3 files changed, 26 insertions(+), 6 deletions(-)
--- NEW FILE avidemux-2.5.6-ffmpeg_aac.patch ---
diff -Naur avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake avidemux_2.5.6/cmake/admFFmpegBuild.cmake
--- avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake 2012-01-27 15:05:15.029793577 -0600
+++ avidemux_2.5.6/cmake/admFFmpegBuild.cmake 2012-01-27 15:06:00.663291081 -0600
@@ -14,7 +14,7 @@
set(FFMPEG_DECODERS adpcm_ima_amv amv bmp cinepak cyuv dca dvbsub dvvideo ffv1 ffvhuff flac flv fraps h263 h264 huffyuv
mjpeg mjpegb mpeg2video mpeg4 msmpeg4v2 msmpeg4v3 msvideo1 nellymoser png qdm2 rawvideo snow svq3
theora tscc vc1 vp3 vp6 vp6a vp6f wmav2 wmv1 wmv2 wmv3)
-set(FFMPEG_ENCODERS ac3_fixed dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow)
+set(FFMPEG_ENCODERS aac ac3_fixed dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow)
set(FFMPEG_MUXERS flv matroska mpeg1vcd mpeg2dvd mpeg2svcd mpegts mov mp4 psp)
set(FFMPEG_PARSERS ac3 h263 h264 mpeg4video)
set(FFMPEG_PROTOCOLS file)
diff -Naur avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp
--- avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2011-12-28 08:51:49.000000000 -0600
+++ avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2012-01-27 15:05:39.672982290 -0600
@@ -25,13 +25,16 @@
#include "ADM_lavcodec.h"
#define Join(x,y) x##_##y
-#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3)
+#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
#define makeName(x) Join(x,MP2)
#define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_MP2
#else
- #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3)
+ #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
#define makeName(x) Join(x,AC3)
#define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AC3
+ #elif !defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && defined(ADM_LAV_AAC)
+ #define makeName(x) Join(x,AAC)
+ #define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AAC
#else
#error
#endif
@@ -60,13 +63,19 @@
2, // Max channels
1,0,0, // Version
#else
-
-
+#ifdef ADM_LAV_AC3
"LavAC3",
"AC3 (lav)",
"AC3 LavEncoder encoder plugin Mean 2008",
6, // Max channels
1,0,0, // Version
+#else
+ "LavAAC",
+ "AAC (lav)",
+ "AAC LavEncoder encoder plugin Mean 2008",
+ 6, // Max channels
+ 1,0,0, // Version
+#endif
#endif
makeName(WAV),
@@ -132,7 +141,9 @@
#endif
_wavheader->byterate=(lavConfig.bitrate*1000)>>3;
-#ifdef ADM_LAV_MP2
+#if defined(ADM_LAV_AAC)
+ _chunk = 1024*_wavheader->channels;
+#elif defined(ADM_LAV_MP2)
_chunk = 1152*_wavheader->channels;
#else
_chunk = 1536*_wavheader->channels; // AC3
diff -Naur avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt
--- avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2010-05-25 15:48:57.000000000 -0500
+++ avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2012-01-27 15:05:39.673982248 -0600
@@ -27,3 +27,12 @@
INIT_AUDIO_ENCODER(ADM_ae_lav_ac3)
INSTALL_AUDIOENCODER(ADM_ae_lav_ac3)
+
+ SET(ADM_ae_lav_aac_SRCS audioencoder_lavcodec.cpp)
+
+ ADD_LIBRARY(ADM_ae_lav_aac SHARED ${ADM_ae_lav_aac_SRCS})
+ ADD_TARGET_CFLAGS(ADM_ae_lav_aac "-DADM_LAV_AAC")
+ TARGET_LINK_LIBRARIES(ADM_ae_lav_aac ADM_core ADM_coreAudio ADM_coreUI ADM_libavcodec ADM_libavutil)
+
+ INIT_AUDIO_ENCODER(ADM_ae_lav_aac)
+ INSTALL_AUDIOENCODER(ADM_ae_lav_aac)
avidemux-2.5.6-ffmpeg_parallel_build.patch:
admFFmpegBuild.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE avidemux-2.5.6-ffmpeg_parallel_build.patch ---
diff -Naur avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake avidemux_2.5.6/cmake/admFFmpegBuild.cmake
--- avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake 2011-12-28 08:51:49.000000000 -0600
+++ avidemux_2.5.6/cmake/admFFmpegBuild.cmake 2012-01-26 14:07:41.928167845 -0600
@@ -167,7 +167,7 @@
# Build FFmpeg
add_custom_command(OUTPUT "${FFMPEG_BINARY_DIR}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}"
- COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TOOL=${CMAKE_BUILD_TOOL} -P "${CMAKE_SOURCE_DIR}/cmake/admFFmpegMake.cmake"
+ COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TOOL=$(MAKE) -P "${CMAKE_SOURCE_DIR}/cmake/admFFmpegMake.cmake"
WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
add_custom_target(ffmpeg ALL
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-15/avidemux.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- avidemux.spec 7 Oct 2011 20:58:04 -0000 1.57
+++ avidemux.spec 28 Jan 2012 17:24:35 -0000 1.58
@@ -1,8 +1,8 @@
%define _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
-Version: 2.5.5
-Release: 6%{?dist}.1
+Version: 2.5.6
+Release: 3%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -12,22 +12,17 @@
Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
Source1: %{name}-gtk.desktop
Source2: %{name}-qt.desktop
-# Patch0 obtained from avidemux-2.5.0-patches-1.tar.bz2:
-# http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/avidemux-2.5...
-Patch0: 2.5.0-coreImage-parallel-build.patch
+
Patch1: avidemux-2.5-pulseaudio-default.patch
Patch2: avidemux-2.4-qt4.patch
# Prevents avidemux from creating the symlinks for .so files, which we do below
Patch3: avidemux-2.5.3-tmplinktarget.patch
# libADM_xvidRateCtl.so and libADM_vidEnc_pluginOptions.so are supposed to be
-# build statically according to upstream... Let's get them installed instead
+# built statically according to upstream... Let's get them installed instead
Patch4: avidemux-2.5.3-mpeg2enc.patch
Patch5: avidemux-2.5.3-pluginlibs.patch
-# Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/00...
-#Patch6: avidemux_2.5.4-ffmpeg-aac.patch
-Patch6: avidemux_2.5.5-ffmpeg_aac.patch
+Patch6: avidemux-2.5.6-ffmpeg_aac.patch
Patch7: avidemux-2.5.5-gcc46_tmp_fix.patch
-# Patch needed for version of x264 in F15/rawhide.
# Use system libraries
Patch8: avidemux-2.5.4-libass.patch
Patch9: avidemux-2.5.4-liba52.patch
@@ -36,8 +31,7 @@
Patch12: avidemux-2.5.5_fix_lav_audio_encoder.patch
# Patch for ABI change in x264 115.
Patch13: avidemux-2.5.5-x264_i_to_b_open_gop.patch
-# Uses a header file not found in the standard package
-#Patch16: avidemux-2.5.4-mpeg2enc.patch
+Patch14: avidemux-2.5.6-ffmpeg_parallel_build.patch
# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
ExcludeArch: ppc ppc64
@@ -45,7 +39,6 @@
Requires: %{name}-cli = %{version}-%{release}
Requires: %{name}-gui = %{version}
Requires: %{name}-plugins = %{version}
-Obsoletes: %{name}-devel
# Compiling
BuildRequires: cmake
@@ -81,7 +74,6 @@
BuildRequires: libvorbis-devel >= 1.0.1
BuildRequires: libdca-devel
BuildRequires: opencore-amr-devel
-# VP8 support, decoding only?
BuildRequires: libvpx-devel
BuildRequires: twolame-devel
@@ -95,6 +87,7 @@
# Finally...
BuildRequires: desktop-file-utils
+Requires: hicolor-icon-theme
%description
@@ -170,28 +163,21 @@
sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp
%endif
-# Fix build with js 1.8.5 introduced in F15.
-#find avidemux/ADM_script -name '*.h' -exec \
-#sed -i -e '/#include "jsapi.h"/ i\
-##undef malloc \
-##undef calloc \
-##undef realloc \
-##undef free' {} \;
-
-%patch0 -p1 -b .parallel
+#patch0 -p1 -b .parallel
%patch1 -p1 -b .pulse
%patch2 -p1 -b .qt4
%patch3 -p1 -b .tmplinktarget
%patch4 -p1 -b .mpeg2enc
%patch5 -p1 -b .pluginlibs
-#%patch6 -p1 -b .ffmpegaac
+%patch6 -p1 -b .ffmpegaac
%patch7 -p1 -b .gcc46tmpfix
%patch8 -p1 -b .libass
%patch9 -p1 -b .liba52
%patch10 -p1 -b .libmad
%patch11 -p1 -b .libtwolame
-%patch12 -p1 -b .lavencode
-%patch13 -p1 -b .x264
+#patch12 -p1 -b .lavencode
+#patch13 -p1 -b .x264
+%patch14 -p1 -b .ffmpegbuild
%build
@@ -223,8 +209,14 @@
make -C build install DESTDIR=%{buildroot}
make -C build_plugins install DESTDIR=%{buildroot}
-install -d -m755 %{buildroot}%{_datadir}/pixmaps
-install -pm0644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
+#install -d -m755 %{buildroot}%{_datadir}/pixmaps
+#install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
+
+# Install icons
+install -pDm 0644 avidemux/ADM_icons/avidemux_icon_small.png \
+ %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/avidemux.png
+install -pDm 0644 avidemux_icon.png \
+ %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/avidemux.png
# Find and remove all la files
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
@@ -255,9 +247,19 @@
%find_lang %{name}
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun libs
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
-%postun libs -p /sbin/ldconfig
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
@@ -265,7 +267,8 @@
%files libs
%{_datadir}/ADM_scripts/
-%{_datadir}/pixmaps/avidemux.png
+%{_datadir}/icons/hicolor/48x48/apps/avidemux.png
+%{_datadir}/icons/hicolor/64x64/apps/avidemux.png
%{_libdir}/libADM*
%exclude %{_libdir}/libADM_UI*
%exclude %{_libdir}/libADM_render*
@@ -282,6 +285,7 @@
%{_libdir}/libADM_render_cli.so
%{_libdir}/ADM_plugins/videoFilter/*cli.so
+
%files gtk -f %{name}.lang
%{_bindir}/avidemux2_gtk
%{_libdir}/libADM_UIGtk.so
@@ -303,15 +307,17 @@
%changelog
-* Fri Oct 07 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.5-6.1
-- Rebuilt for x264 update in F15
+* Sat Jan 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-3
+- Install icon files to preferred location.
+- Reenable FFmpeg based AAC encoding.
+- Update to latest release.
* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-6
- Obsolete useless devel subpackage which has multilib issues.
* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
-- Moved UI specific libraries and plugins to their respective sub-package to
- prevent unneeded dependencies from being installed.
+- Moved UI specific libraries and plugins to their respective sub-package to prevent
+ unneeded dependencies from being installed.
- Obsoleted plugins sub-package and combined with libs sub-package.
* Fri Jul 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-2
Index: branch
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-15/branch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- branch 24 May 2011 20:35:52 -0000 1.1
+++ branch 28 Jan 2012 17:24:35 -0000 1.2
@@ -1 +1 @@
-F-15
+F-16
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-15/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 27 Jun 2011 14:54:35 -0000 1.9
+++ sources 28 Jan 2012 17:24:35 -0000 1.10
@@ -1 +1 @@
-33bbe210c6826cea1987ed18a41d57a7 avidemux_2.5.5.tar.gz
+00e479dd806b94a98d3f0f40639e88a9 avidemux_2.5.6.tar.gz
12 years, 10 months
- 1
- 0
rpms/avidemux/F-16 avidemux.spec,1.56,1.57
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22187
Modified Files:
avidemux.spec
Log Message:
* Sat Jan 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-3
- Install icon files to preferred location.
- Reenable FFmpeg based AAC encoding.
- Update to latest release.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-16/avidemux.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- avidemux.spec 28 Jan 2012 16:10:02 -0000 1.56
+++ avidemux.spec 28 Jan 2012 17:23:41 -0000 1.57
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -12,9 +12,7 @@
Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
Source1: %{name}-gtk.desktop
Source2: %{name}-qt.desktop
-# Patch0 obtained from avidemux-2.5.0-patches-1.tar.bz2:
-# http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/avidemux-2.5...
-#Patch0: avidemux-2.5.6-parallel_build.patch
+
Patch1: avidemux-2.5-pulseaudio-default.patch
Patch2: avidemux-2.4-qt4.patch
# Prevents avidemux from creating the symlinks for .so files, which we do below
@@ -23,11 +21,8 @@
# built statically according to upstream... Let's get them installed instead
Patch4: avidemux-2.5.3-mpeg2enc.patch
Patch5: avidemux-2.5.3-pluginlibs.patch
-# Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/00...
-#Patch6: avidemux_2.5.4-ffmpeg-aac.patch
Patch6: avidemux-2.5.6-ffmpeg_aac.patch
Patch7: avidemux-2.5.5-gcc46_tmp_fix.patch
-# Patch needed for version of x264 in F15/rawhide.
# Use system libraries
Patch8: avidemux-2.5.4-libass.patch
Patch9: avidemux-2.5.4-liba52.patch
@@ -36,8 +31,6 @@
Patch12: avidemux-2.5.5_fix_lav_audio_encoder.patch
# Patch for ABI change in x264 115.
Patch13: avidemux-2.5.5-x264_i_to_b_open_gop.patch
-# Uses a header file not found in the standard package
-#Patch16: avidemux-2.5.4-mpeg2enc.patch
Patch14: avidemux-2.5.6-ffmpeg_parallel_build.patch
# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
@@ -94,6 +87,7 @@
# Finally...
BuildRequires: desktop-file-utils
+Requires: hicolor-icon-theme
%description
@@ -149,14 +143,6 @@
%description qt
This package contains the Qt graphical interface for %{name}.
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-This package contains files required to develop with or extend %{name}.
-
%prep
%setup -q -n %{name}_%{version}
@@ -220,16 +206,17 @@
%install
-rm -rf %{buildroot}
-
make -C build install DESTDIR=%{buildroot}
make -C build_plugins install DESTDIR=%{buildroot}
-# Install the build configuration for devel package
-install -d -m755 %{buildroot}%{_includedir}
-install -m644 build/config/ADM_coreConfig.h %{buildroot}%{_includedir}/ADM_coreConfig.h
-install -d -m755 %{buildroot}%{_datadir}/pixmaps
-install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
+#install -d -m755 %{buildroot}%{_datadir}/pixmaps
+#install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
+
+# Install icons
+install -pDm 0644 avidemux/ADM_icons/avidemux_icon_small.png \
+ %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/avidemux.png
+install -pDm 0644 avidemux_icon.png \
+ %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/avidemux.png
# Find and remove all la files
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
@@ -259,13 +246,20 @@
# Gettext-style translations
%find_lang %{name}
-%clean
-rm -rf %{buildroot}
-
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun libs
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
-%postun libs -p /sbin/ldconfig
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
@@ -273,7 +267,8 @@
%files libs
%{_datadir}/ADM_scripts/
-%{_datadir}/pixmaps/avidemux.png
+%{_datadir}/icons/hicolor/48x48/apps/avidemux.png
+%{_datadir}/icons/hicolor/64x64/apps/avidemux.png
%{_libdir}/libADM*
%exclude %{_libdir}/libADM_UI*
%exclude %{_libdir}/libADM_render*
@@ -310,15 +305,11 @@
%{_datadir}/applications/*qt*.desktop
%dir %{_datadir}/%{name}/i18n
-%files devel
-%{_includedir}/ADM_coreConfig.h
-
%changelog
-* Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-2
+* Sat Jan 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-3
+- Install icon files to preferred location.
- Reenable FFmpeg based AAC encoding.
-
-* Wed Jan 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-1
- Update to latest release.
* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-6
12 years, 10 months
- 1
- 0
rpms/avidemux/devel avidemux.spec,1.60,1.61
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20931
Modified Files:
avidemux.spec
Log Message:
* Sat Jan 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-3
- Install icon files to preferred location.
- Reenable FFmpeg based AAC encoding.
- Update to latest release.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- avidemux.spec 28 Jan 2012 15:33:00 -0000 1.60
+++ avidemux.spec 28 Jan 2012 17:12:14 -0000 1.61
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -12,9 +12,7 @@
Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
Source1: %{name}-gtk.desktop
Source2: %{name}-qt.desktop
-# Patch0 obtained from avidemux-2.5.0-patches-1.tar.bz2:
-# http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/avidemux-2.5...
-#Patch0: avidemux-2.5.6-parallel_build.patch
+
Patch1: avidemux-2.5-pulseaudio-default.patch
Patch2: avidemux-2.4-qt4.patch
# Prevents avidemux from creating the symlinks for .so files, which we do below
@@ -23,11 +21,8 @@
# built statically according to upstream... Let's get them installed instead
Patch4: avidemux-2.5.3-mpeg2enc.patch
Patch5: avidemux-2.5.3-pluginlibs.patch
-# Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/00...
-#Patch6: avidemux_2.5.4-ffmpeg-aac.patch
Patch6: avidemux-2.5.6-ffmpeg_aac.patch
Patch7: avidemux-2.5.5-gcc46_tmp_fix.patch
-# Patch needed for version of x264 in F15/rawhide.
# Use system libraries
Patch8: avidemux-2.5.4-libass.patch
Patch9: avidemux-2.5.4-liba52.patch
@@ -36,8 +31,6 @@
Patch12: avidemux-2.5.5_fix_lav_audio_encoder.patch
# Patch for ABI change in x264 115.
Patch13: avidemux-2.5.5-x264_i_to_b_open_gop.patch
-# Uses a header file not found in the standard package
-#Patch16: avidemux-2.5.4-mpeg2enc.patch
Patch14: avidemux-2.5.6-ffmpeg_parallel_build.patch
# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
@@ -94,6 +87,7 @@
# Finally...
BuildRequires: desktop-file-utils
+Requires: hicolor-icon-theme
%description
@@ -149,14 +143,6 @@
%description qt
This package contains the Qt graphical interface for %{name}.
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-This package contains files required to develop with or extend %{name}.
-
%prep
%setup -q -n %{name}_%{version}
@@ -220,16 +206,17 @@
%install
-rm -rf %{buildroot}
-
make -C build install DESTDIR=%{buildroot}
make -C build_plugins install DESTDIR=%{buildroot}
-# Install the build configuration for devel package
-install -d -m755 %{buildroot}%{_includedir}
-install -m644 build/config/ADM_coreConfig.h %{buildroot}%{_includedir}/ADM_coreConfig.h
-install -d -m755 %{buildroot}%{_datadir}/pixmaps
-install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
+#install -d -m755 %{buildroot}%{_datadir}/pixmaps
+#install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
+
+# Install icons
+install -pDm 0644 avidemux/ADM_icons/avidemux_icon_small.png \
+ %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/avidemux.png
+install -pDm 0644 avidemux_icon.png \
+ %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/avidemux.png
# Find and remove all la files
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
@@ -259,13 +246,20 @@
# Gettext-style translations
%find_lang %{name}
-%clean
-rm -rf %{buildroot}
+%post libs
+/sbin/ldconfig
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun libs
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
@@ -273,7 +267,8 @@
%files libs
%{_datadir}/ADM_scripts/
-%{_datadir}/pixmaps/avidemux.png
+%{_datadir}/icons/hicolor/48x48/apps/avidemux.png
+%{_datadir}/icons/hicolor/64x64/apps/avidemux.png
%{_libdir}/libADM*
%exclude %{_libdir}/libADM_UI*
%exclude %{_libdir}/libADM_render*
@@ -310,18 +305,17 @@
%{_datadir}/applications/*qt*.desktop
%dir %{_datadir}/%{name}/i18n
-%files devel
-%{_includedir}/ADM_coreConfig.h
-
%changelog
-* Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-2
+* Sat Jan 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-3
+- Install icon files to preferred location.
- Reenable FFmpeg based AAC encoding.
-
-* Wed Jan 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-1
- Update to latest release.
-* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-3
+* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-6
+- Obsolete useless devel subpackage which has multilib issues.
+
+* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
- Moved UI specific libraries and plugins to their respective sub-package to prevent
unneeded dependencies from being installed.
- Obsoleted plugins sub-package and combined with libs sub-package.
12 years, 10 months
- 1
- 0
rpms/avidemux/F-16 avidemux-2.5.6-ffmpeg_aac.patch, NONE, 1.1 avidemux-2.5.6-ffmpeg_parallel_build.patch, NONE, 1.1 avidemux.spec, 1.55, 1.56 sources, 1.9, 1.10
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13817
Modified Files:
avidemux.spec sources
Added Files:
avidemux-2.5.6-ffmpeg_aac.patch
avidemux-2.5.6-ffmpeg_parallel_build.patch
Log Message:
* Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-2
- Reenable FFmpeg based AAC encoding.
avidemux-2.5.6-ffmpeg_aac.patch:
cmake/admFFmpegBuild.cmake | 2 -
plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt | 9 ++++
plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp | 21 ++++++++---
3 files changed, 26 insertions(+), 6 deletions(-)
--- NEW FILE avidemux-2.5.6-ffmpeg_aac.patch ---
diff -Naur avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake avidemux_2.5.6/cmake/admFFmpegBuild.cmake
--- avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake 2012-01-27 15:05:15.029793577 -0600
+++ avidemux_2.5.6/cmake/admFFmpegBuild.cmake 2012-01-27 15:06:00.663291081 -0600
@@ -14,7 +14,7 @@
set(FFMPEG_DECODERS adpcm_ima_amv amv bmp cinepak cyuv dca dvbsub dvvideo ffv1 ffvhuff flac flv fraps h263 h264 huffyuv
mjpeg mjpegb mpeg2video mpeg4 msmpeg4v2 msmpeg4v3 msvideo1 nellymoser png qdm2 rawvideo snow svq3
theora tscc vc1 vp3 vp6 vp6a vp6f wmav2 wmv1 wmv2 wmv3)
-set(FFMPEG_ENCODERS ac3_fixed dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow)
+set(FFMPEG_ENCODERS aac ac3_fixed dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow)
set(FFMPEG_MUXERS flv matroska mpeg1vcd mpeg2dvd mpeg2svcd mpegts mov mp4 psp)
set(FFMPEG_PARSERS ac3 h263 h264 mpeg4video)
set(FFMPEG_PROTOCOLS file)
diff -Naur avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp
--- avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2011-12-28 08:51:49.000000000 -0600
+++ avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2012-01-27 15:05:39.672982290 -0600
@@ -25,13 +25,16 @@
#include "ADM_lavcodec.h"
#define Join(x,y) x##_##y
-#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3)
+#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
#define makeName(x) Join(x,MP2)
#define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_MP2
#else
- #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3)
+ #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
#define makeName(x) Join(x,AC3)
#define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AC3
+ #elif !defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && defined(ADM_LAV_AAC)
+ #define makeName(x) Join(x,AAC)
+ #define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AAC
#else
#error
#endif
@@ -60,13 +63,19 @@
2, // Max channels
1,0,0, // Version
#else
-
-
+#ifdef ADM_LAV_AC3
"LavAC3",
"AC3 (lav)",
"AC3 LavEncoder encoder plugin Mean 2008",
6, // Max channels
1,0,0, // Version
+#else
+ "LavAAC",
+ "AAC (lav)",
+ "AAC LavEncoder encoder plugin Mean 2008",
+ 6, // Max channels
+ 1,0,0, // Version
+#endif
#endif
makeName(WAV),
@@ -132,7 +141,9 @@
#endif
_wavheader->byterate=(lavConfig.bitrate*1000)>>3;
-#ifdef ADM_LAV_MP2
+#if defined(ADM_LAV_AAC)
+ _chunk = 1024*_wavheader->channels;
+#elif defined(ADM_LAV_MP2)
_chunk = 1152*_wavheader->channels;
#else
_chunk = 1536*_wavheader->channels; // AC3
diff -Naur avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt
--- avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2010-05-25 15:48:57.000000000 -0500
+++ avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2012-01-27 15:05:39.673982248 -0600
@@ -27,3 +27,12 @@
INIT_AUDIO_ENCODER(ADM_ae_lav_ac3)
INSTALL_AUDIOENCODER(ADM_ae_lav_ac3)
+
+ SET(ADM_ae_lav_aac_SRCS audioencoder_lavcodec.cpp)
+
+ ADD_LIBRARY(ADM_ae_lav_aac SHARED ${ADM_ae_lav_aac_SRCS})
+ ADD_TARGET_CFLAGS(ADM_ae_lav_aac "-DADM_LAV_AAC")
+ TARGET_LINK_LIBRARIES(ADM_ae_lav_aac ADM_core ADM_coreAudio ADM_coreUI ADM_libavcodec ADM_libavutil)
+
+ INIT_AUDIO_ENCODER(ADM_ae_lav_aac)
+ INSTALL_AUDIOENCODER(ADM_ae_lav_aac)
avidemux-2.5.6-ffmpeg_parallel_build.patch:
admFFmpegBuild.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE avidemux-2.5.6-ffmpeg_parallel_build.patch ---
diff -Naur avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake avidemux_2.5.6/cmake/admFFmpegBuild.cmake
--- avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake 2011-12-28 08:51:49.000000000 -0600
+++ avidemux_2.5.6/cmake/admFFmpegBuild.cmake 2012-01-26 14:07:41.928167845 -0600
@@ -167,7 +167,7 @@
# Build FFmpeg
add_custom_command(OUTPUT "${FFMPEG_BINARY_DIR}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}"
- COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TOOL=${CMAKE_BUILD_TOOL} -P "${CMAKE_SOURCE_DIR}/cmake/admFFmpegMake.cmake"
+ COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TOOL=$(MAKE) -P "${CMAKE_SOURCE_DIR}/cmake/admFFmpegMake.cmake"
WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
add_custom_target(ffmpeg ALL
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-16/avidemux.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- avidemux.spec 23 Sep 2011 16:00:16 -0000 1.55
+++ avidemux.spec 28 Jan 2012 16:10:02 -0000 1.56
@@ -1,8 +1,8 @@
%define _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
-Version: 2.5.5
-Release: 6%{?dist}
+Version: 2.5.6
+Release: 2%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -14,18 +14,18 @@
Source2: %{name}-qt.desktop
# Patch0 obtained from avidemux-2.5.0-patches-1.tar.bz2:
# http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/avidemux-2.5...
-Patch0: 2.5.0-coreImage-parallel-build.patch
+#Patch0: avidemux-2.5.6-parallel_build.patch
Patch1: avidemux-2.5-pulseaudio-default.patch
Patch2: avidemux-2.4-qt4.patch
# Prevents avidemux from creating the symlinks for .so files, which we do below
Patch3: avidemux-2.5.3-tmplinktarget.patch
# libADM_xvidRateCtl.so and libADM_vidEnc_pluginOptions.so are supposed to be
-# build statically according to upstream... Let's get them installed instead
+# built statically according to upstream... Let's get them installed instead
Patch4: avidemux-2.5.3-mpeg2enc.patch
Patch5: avidemux-2.5.3-pluginlibs.patch
# Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/00...
#Patch6: avidemux_2.5.4-ffmpeg-aac.patch
-Patch6: avidemux_2.5.5-ffmpeg_aac.patch
+Patch6: avidemux-2.5.6-ffmpeg_aac.patch
Patch7: avidemux-2.5.5-gcc46_tmp_fix.patch
# Patch needed for version of x264 in F15/rawhide.
# Use system libraries
@@ -38,6 +38,7 @@
Patch13: avidemux-2.5.5-x264_i_to_b_open_gop.patch
# Uses a header file not found in the standard package
#Patch16: avidemux-2.5.4-mpeg2enc.patch
+Patch14: avidemux-2.5.6-ffmpeg_parallel_build.patch
# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
ExcludeArch: ppc ppc64
@@ -45,7 +46,6 @@
Requires: %{name}-cli = %{version}-%{release}
Requires: %{name}-gui = %{version}
Requires: %{name}-plugins = %{version}
-Obsoletes: %{name}-devel
# Compiling
BuildRequires: cmake
@@ -81,7 +81,6 @@
BuildRequires: libvorbis-devel >= 1.0.1
BuildRequires: libdca-devel
BuildRequires: opencore-amr-devel
-# VP8 support, decoding only?
BuildRequires: libvpx-devel
BuildRequires: twolame-devel
@@ -150,6 +149,14 @@
%description qt
This package contains the Qt graphical interface for %{name}.
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+
+%description devel
+This package contains files required to develop with or extend %{name}.
+
%prep
%setup -q -n %{name}_%{version}
@@ -170,28 +177,21 @@
sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp
%endif
-# Fix build with js 1.8.5 introduced in F15.
-#find avidemux/ADM_script -name '*.h' -exec \
-#sed -i -e '/#include "jsapi.h"/ i\
-##undef malloc \
-##undef calloc \
-##undef realloc \
-##undef free' {} \;
-
-%patch0 -p1 -b .parallel
+#patch0 -p1 -b .parallel
%patch1 -p1 -b .pulse
%patch2 -p1 -b .qt4
%patch3 -p1 -b .tmplinktarget
%patch4 -p1 -b .mpeg2enc
%patch5 -p1 -b .pluginlibs
-#%patch6 -p1 -b .ffmpegaac
+%patch6 -p1 -b .ffmpegaac
%patch7 -p1 -b .gcc46tmpfix
%patch8 -p1 -b .libass
%patch9 -p1 -b .liba52
%patch10 -p1 -b .libmad
%patch11 -p1 -b .libtwolame
-%patch12 -p1 -b .lavencode
-%patch13 -p1 -b .x264
+#patch12 -p1 -b .lavencode
+#patch13 -p1 -b .x264
+%patch14 -p1 -b .ffmpegbuild
%build
@@ -220,11 +220,16 @@
%install
+rm -rf %{buildroot}
+
make -C build install DESTDIR=%{buildroot}
make -C build_plugins install DESTDIR=%{buildroot}
+# Install the build configuration for devel package
+install -d -m755 %{buildroot}%{_includedir}
+install -m644 build/config/ADM_coreConfig.h %{buildroot}%{_includedir}/ADM_coreConfig.h
install -d -m755 %{buildroot}%{_datadir}/pixmaps
-install -pm0644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
+install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
# Find and remove all la files
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
@@ -254,6 +259,9 @@
# Gettext-style translations
%find_lang %{name}
+%clean
+rm -rf %{buildroot}
+
%post libs -p /sbin/ldconfig
@@ -282,6 +290,7 @@
%{_libdir}/libADM_render_cli.so
%{_libdir}/ADM_plugins/videoFilter/*cli.so
+
%files gtk -f %{name}.lang
%{_bindir}/avidemux2_gtk
%{_libdir}/libADM_UIGtk.so
@@ -301,14 +310,23 @@
%{_datadir}/applications/*qt*.desktop
%dir %{_datadir}/%{name}/i18n
+%files devel
+%{_includedir}/ADM_coreConfig.h
+
%changelog
+* Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-2
+- Reenable FFmpeg based AAC encoding.
+
+* Wed Jan 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-1
+- Update to latest release.
+
* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-6
- Obsolete useless devel subpackage which has multilib issues.
* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
-- Moved UI specific libraries and plugins to their respective sub-package to
- prevent unneeded dependencies from being installed.
+- Moved UI specific libraries and plugins to their respective sub-package to prevent
+ unneeded dependencies from being installed.
- Obsoleted plugins sub-package and combined with libs sub-package.
* Fri Jul 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-16/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 27 Jun 2011 14:09:10 -0000 1.9
+++ sources 28 Jan 2012 16:10:02 -0000 1.10
@@ -1 +1 @@
-33bbe210c6826cea1987ed18a41d57a7 avidemux_2.5.5.tar.gz
+00e479dd806b94a98d3f0f40639e88a9 avidemux_2.5.6.tar.gz
12 years, 10 months
- 1
- 0
rpms/avidemux/devel avidemux.spec,1.59,1.60
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8510
Modified Files:
avidemux.spec
Log Message:
* Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-2
- Attempt to fix FFmpeg based AAC encoding.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- avidemux.spec 28 Jan 2012 15:31:02 -0000 1.59
+++ avidemux.spec 28 Jan 2012 15:33:00 -0000 1.60
@@ -14,7 +14,7 @@
Source2: %{name}-qt.desktop
# Patch0 obtained from avidemux-2.5.0-patches-1.tar.bz2:
# http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/avidemux-2.5...
-Patch0: avidemux-2.5.6-parallel_build.patch
+#Patch0: avidemux-2.5.6-parallel_build.patch
Patch1: avidemux-2.5-pulseaudio-default.patch
Patch2: avidemux-2.4-qt4.patch
# Prevents avidemux from creating the symlinks for .so files, which we do below
12 years, 10 months
- 1
- 0
rpms/avidemux/devel avidemux.spec,1.58,1.59
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8365
Modified Files:
avidemux.spec
Log Message:
* Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-2
- Attempt to fix FFmpeg based AAC encoding.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- avidemux.spec 28 Jan 2012 15:30:25 -0000 1.58
+++ avidemux.spec 28 Jan 2012 15:31:02 -0000 1.59
@@ -316,7 +316,7 @@
%changelog
* Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-2
-- Attempt to fix FFmpeg based AAC encoding.
+- Reenable FFmpeg based AAC encoding.
* Wed Jan 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-1
- Update to latest release.
12 years, 10 months
- 1
- 0
rpms/avidemux/devel avidemux-2.5.6-ffmpeg_aac.patch, NONE, 1.1 avidemux.spec, 1.57, 1.58
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8029
Modified Files:
avidemux.spec
Added Files:
avidemux-2.5.6-ffmpeg_aac.patch
Log Message:
* Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-2
- Attempt to fix FFmpeg based AAC encoding.
avidemux-2.5.6-ffmpeg_aac.patch:
cmake/admFFmpegBuild.cmake | 2 -
plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt | 9 ++++
plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp | 21 ++++++++---
3 files changed, 26 insertions(+), 6 deletions(-)
--- NEW FILE avidemux-2.5.6-ffmpeg_aac.patch ---
diff -Naur avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake avidemux_2.5.6/cmake/admFFmpegBuild.cmake
--- avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake 2012-01-27 15:05:15.029793577 -0600
+++ avidemux_2.5.6/cmake/admFFmpegBuild.cmake 2012-01-27 15:06:00.663291081 -0600
@@ -14,7 +14,7 @@
set(FFMPEG_DECODERS adpcm_ima_amv amv bmp cinepak cyuv dca dvbsub dvvideo ffv1 ffvhuff flac flv fraps h263 h264 huffyuv
mjpeg mjpegb mpeg2video mpeg4 msmpeg4v2 msmpeg4v3 msvideo1 nellymoser png qdm2 rawvideo snow svq3
theora tscc vc1 vp3 vp6 vp6a vp6f wmav2 wmv1 wmv2 wmv3)
-set(FFMPEG_ENCODERS ac3_fixed dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow)
+set(FFMPEG_ENCODERS aac ac3_fixed dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow)
set(FFMPEG_MUXERS flv matroska mpeg1vcd mpeg2dvd mpeg2svcd mpegts mov mp4 psp)
set(FFMPEG_PARSERS ac3 h263 h264 mpeg4video)
set(FFMPEG_PROTOCOLS file)
diff -Naur avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp
--- avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2011-12-28 08:51:49.000000000 -0600
+++ avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2012-01-27 15:05:39.672982290 -0600
@@ -25,13 +25,16 @@
#include "ADM_lavcodec.h"
#define Join(x,y) x##_##y
-#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3)
+#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
#define makeName(x) Join(x,MP2)
#define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_MP2
#else
- #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3)
+ #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
#define makeName(x) Join(x,AC3)
#define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AC3
+ #elif !defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && defined(ADM_LAV_AAC)
+ #define makeName(x) Join(x,AAC)
+ #define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AAC
#else
#error
#endif
@@ -60,13 +63,19 @@
2, // Max channels
1,0,0, // Version
#else
-
-
+#ifdef ADM_LAV_AC3
"LavAC3",
"AC3 (lav)",
"AC3 LavEncoder encoder plugin Mean 2008",
6, // Max channels
1,0,0, // Version
+#else
+ "LavAAC",
+ "AAC (lav)",
+ "AAC LavEncoder encoder plugin Mean 2008",
+ 6, // Max channels
+ 1,0,0, // Version
+#endif
#endif
makeName(WAV),
@@ -132,7 +141,9 @@
#endif
_wavheader->byterate=(lavConfig.bitrate*1000)>>3;
-#ifdef ADM_LAV_MP2
+#if defined(ADM_LAV_AAC)
+ _chunk = 1024*_wavheader->channels;
+#elif defined(ADM_LAV_MP2)
_chunk = 1152*_wavheader->channels;
#else
_chunk = 1536*_wavheader->channels; // AC3
diff -Naur avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt
--- avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2010-05-25 15:48:57.000000000 -0500
+++ avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2012-01-27 15:05:39.673982248 -0600
@@ -27,3 +27,12 @@
INIT_AUDIO_ENCODER(ADM_ae_lav_ac3)
INSTALL_AUDIOENCODER(ADM_ae_lav_ac3)
+
+ SET(ADM_ae_lav_aac_SRCS audioencoder_lavcodec.cpp)
+
+ ADD_LIBRARY(ADM_ae_lav_aac SHARED ${ADM_ae_lav_aac_SRCS})
+ ADD_TARGET_CFLAGS(ADM_ae_lav_aac "-DADM_LAV_AAC")
+ TARGET_LINK_LIBRARIES(ADM_ae_lav_aac ADM_core ADM_coreAudio ADM_coreUI ADM_libavcodec ADM_libavutil)
+
+ INIT_AUDIO_ENCODER(ADM_ae_lav_aac)
+ INSTALL_AUDIOENCODER(ADM_ae_lav_aac)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- avidemux.spec 27 Jan 2012 17:01:04 -0000 1.57
+++ avidemux.spec 28 Jan 2012 15:30:25 -0000 1.58
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -14,7 +14,7 @@
Source2: %{name}-qt.desktop
# Patch0 obtained from avidemux-2.5.0-patches-1.tar.bz2:
# http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/avidemux-2.5...
-#Patch0: avidemux-2.5.6-parallel_build.patch
+Patch0: avidemux-2.5.6-parallel_build.patch
Patch1: avidemux-2.5-pulseaudio-default.patch
Patch2: avidemux-2.4-qt4.patch
# Prevents avidemux from creating the symlinks for .so files, which we do below
@@ -25,7 +25,7 @@
Patch5: avidemux-2.5.3-pluginlibs.patch
# Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/00...
#Patch6: avidemux_2.5.4-ffmpeg-aac.patch
-Patch6: avidemux_2.5.5-ffmpeg_aac.patch
+Patch6: avidemux-2.5.6-ffmpeg_aac.patch
Patch7: avidemux-2.5.5-gcc46_tmp_fix.patch
# Patch needed for version of x264 in F15/rawhide.
# Use system libraries
@@ -183,7 +183,7 @@
%patch3 -p1 -b .tmplinktarget
%patch4 -p1 -b .mpeg2enc
%patch5 -p1 -b .pluginlibs
-#patch6 -p1 -b .ffmpegaac
+%patch6 -p1 -b .ffmpegaac
%patch7 -p1 -b .gcc46tmpfix
%patch8 -p1 -b .libass
%patch9 -p1 -b .liba52
@@ -315,6 +315,9 @@
%changelog
+* Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-2
+- Attempt to fix FFmpeg based AAC encoding.
+
* Wed Jan 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-1
- Update to latest release.
12 years, 10 months
- 1
- 0
rpms/mlt/devel mlt-gcc47_1.patch,NONE,1.1 mlt.spec,1.18,1.19
by Ryan Rix
Author: rrix
Update of /cvs/free/rpms/mlt/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13054
Modified Files:
mlt.spec
Added Files:
mlt-gcc47_1.patch
Log Message:
* Fri Jan 27 2012 Ryan Rix <ry(a)n.rix.si> 0.7.6-5
- Include patch to fix building on gcc47 (upstreaming)
mlt-gcc47_1.patch:
qimage_wrapper.cpp | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE mlt-gcc47_1.patch ---
diff --git a/src/modules/qimage/qimage_wrapper.cpp b/src/modules/qimage/qimage_wrapper.cpp
index abcef45..d7b2903 100644
--- a/src/modules/qimage/qimage_wrapper.cpp
+++ b/src/modules/qimage/qimage_wrapper.cpp
@@ -48,6 +48,7 @@
#endif
#include <cmath>
+#include <unistd.h>
extern "C" {
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/mlt.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mlt.spec 25 Jan 2012 14:52:08 -0000 1.18
+++ mlt.spec 27 Jan 2012 21:23:48 -0000 1.19
@@ -9,12 +9,13 @@
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
Version: 0.7.6
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.mltframework.org/twiki/bin/view/MLT/
Group: System Environment/Libraries
Source: http://downloads.sourceforge.net/mlt/%{name}-%{version}.tar.gz
+Patch0: mlt-gcc47_1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: frei0r-devel
@@ -85,6 +86,7 @@
%prep
%setup -q
+%patch0 -p1
find ./ -name configure -exec chmod 755 {} \;
chmod 755 src/modules/lumas/create_lumas
chmod 644 src/modules/qimage/kdenlivetitle_wrapper.cpp
@@ -183,6 +185,9 @@
%changelog
+* Fri Jan 27 2012 Ryan Rix <ry(a)n.rix.si> 0.7.6-5
+- Include patch to fix building on gcc47 (upstreaming)
+
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 10 months
- 1
- 0
rpms/smesh/F-15 smesh-cmake_fixes.patch, NONE, 1.1 smesh.patch, NONE, 1.1 smesh.spec, NONE, 1.1 sources, 1.1, 1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/smesh/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3367
Modified Files:
sources
Added Files:
smesh-cmake_fixes.patch smesh.patch smesh.spec
Log Message:
* Thu Jan 19 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-2.svn54
- Minor updates to spec file.
smesh-cmake_fixes.patch:
CMakeLists.txt | 34 ++++++
doc/src/Doxyfile | 254 ----------------------------------------------------
doc/src/Doxyfile.in | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 285 insertions(+), 257 deletions(-)
--- NEW FILE smesh-cmake_fixes.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 2010-01-25 09:01:13.000000000 -0600
+++ smesh-5.1.2.2/CMakeLists.txt 2011-12-27 11:51:18.818641905 -0600
@@ -8,7 +8,9 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-SET(CMAKE_BUILD_TYPE "Release") # By default, build in release mode
+IF(NOT CMAKE_BUILD_TYPE)
+ SET(CMAKE_BUILD_TYPE "Release") # By default, build in release mode
+ENDIF()
SET(BUILD_SHARED_LIBS ON)
SET(LIBRARY_OUTPUT_PATH cmake-build)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@@ -79,6 +81,21 @@
ENDIF(WIN32)
ENDIF(UNIX)
+#
+# Build doxygen API documentation #
+#
+
+FIND_PACKAGE(Doxygen)
+if(DOXYGEN_FOUND)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/src/Doxyfile.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/doc/src/Doxyfile @ONLY)
+ add_custom_target(doc ${DOXYGEN_EXECUTABLE}
+ ${CMAKE_CURRENT_SOURCE_DIR}/doc/src/Doxyfile
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/src
+ COMMENT "Generating API documentation with Doxygen" VERBATIM
+ )
+endif(DOXYGEN_FOUND)
+
#########
# SMDS #
#########
@@ -153,12 +170,23 @@
SET(INSTALL_PATH_NAME SMESH-${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK})
IF(UNIX)
+ # Setup install paths
+ IF(NOT LIB_INSTALL_DIR)
+ SET(LIB_INSTALL_DIR /usr/local/lib${LIB_SUFFIX})
+ ENDIF()
+ IF(NOT INCLUDE_INSTALL_DIR)
+ SET(INCLUDE_INSTALL_DIR /usr/local/include)
+ ENDIF()
+ # Set soname version
+ SET_TARGET_PROPERTIES(SMDS Driver DriverSTL DriverDAT DriverUNV
+ SMESHDS SMESH StdMeshers
+ PROPERTIES SOVERSION ${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR})
# Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7
INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV
SMESHDS SMESH StdMeshers
- DESTINATION /usr/local/lib/${INSTALL_PATH_NAME})
+ DESTINATION ${LIB_INSTALL_DIR})
# Headers are installed by default in /usr/local/include/SMESH-5.1.2.7
INSTALL(DIRECTORY inc/
- DESTINATION /usr/local/include/${INSTALL_PATH_NAME}
+ DESTINATION ${INCLUDE_INSTALL_DIR}
FILES_MATCHING PATTERN "*.h*")
ENDIF(UNIX)
diff -Naur smesh-5.1.2.2.orig/doc/src/Doxyfile smesh-5.1.2.2/doc/src/Doxyfile
--- smesh-5.1.2.2.orig/doc/src/Doxyfile 2008-11-26 01:34:11.000000000 -0600
+++ smesh-5.1.2.2/doc/src/Doxyfile 1969-12-31 18:00:00.000000000 -0600
@@ -1,254 +0,0 @@
-# Doxyfile 1.5.7.1
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = "SALOME - SMESH"
-PROJECT_NUMBER =
-OUTPUT_DIRECTORY = ../
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF =
-ALWAYS_DETAILED_SEC = YES
-INLINE_INHERITED_MEMB = YES
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = YES
-QT_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = YES
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 5
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = YES
-OPTIMIZE_OUTPUT_JAVA = YES
-OPTIMIZE_FOR_FORTRAN = NO
-OPTIMIZE_OUTPUT_VHDL = NO
-BUILTIN_STL_SUPPORT = YES
-CPP_CLI_SUPPORT = NO
-SIP_SUPPORT = NO
-IDL_PROPERTY_SUPPORT = YES
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-TYPEDEF_HIDES_STRUCT = NO
-SYMBOL_CACHE_SIZE = 0
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = YES
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = NO
-EXTRACT_ANON_NSPACES = NO
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = YES
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = NO
-SORT_BRIEF_DOCS = NO
-SORT_GROUP_NAMES = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 25
-SHOW_USED_FILES = NO
-SHOW_DIRECTORIES = NO
-SHOW_FILES = YES
-SHOW_NAMESPACES = NO
-FILE_VERSION_FILTER =
-LAYOUT_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE = log.txt
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = ../../inc
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.hxx \
- *.h
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = YES
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 3
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET = doxygen.css
-HTML_ALIGN_MEMBERS = YES
-HTML_DYNAMIC_SECTIONS = NO
-GENERATE_DOCSET = NO
-DOCSET_FEEDNAME = "Doxygen generated docs"
-DOCSET_BUNDLE_ID = org.doxygen.Project
-GENERATE_HTMLHELP = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-CHM_INDEX_ENCODING =
-BINARY_TOC = YES
-TOC_EXPAND = YES
-GENERATE_QHP = NO
-QCH_FILE =
-QHP_NAMESPACE = org.doxygen.Project
-QHP_VIRTUAL_FOLDER = doc
-QHG_LOCATION =
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = ALL
-TREEVIEW_WIDTH = 250
-FORMULA_FONTSIZE = 10
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = YES
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH = $(CASROOT)/inc
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = NO
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = YES
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = NO
-HAVE_DOT = YES
-DOT_FONTNAME = FreeSans
-DOT_FONTSIZE = 10
-DOT_FONTPATH =
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = YES
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = YES
-CALLER_GRAPH = YES
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = jpg
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 50
-MAX_DOT_GRAPH_DEPTH = 0
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = NO
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = YES
diff -Naur smesh-5.1.2.2.orig/doc/src/Doxyfile.in smesh-5.1.2.2/doc/src/Doxyfile.in
--- smesh-5.1.2.2.orig/doc/src/Doxyfile.in 1969-12-31 18:00:00.000000000 -0600
+++ smesh-5.1.2.2/doc/src/Doxyfile.in 2011-12-27 11:51:18.773643400 -0600
@@ -0,0 +1,254 @@
+# Doxyfile 1.5.7.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING = UTF-8
+PROJECT_NAME = "SALOME - SMESH"
+PROJECT_NUMBER =
+OUTPUT_DIRECTORY = ../
+CREATE_SUBDIRS = NO
+OUTPUT_LANGUAGE = English
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF =
+ALWAYS_DETAILED_SEC = YES
+INLINE_INHERITED_MEMB = YES
+FULL_PATH_NAMES = NO
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = YES
+QT_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = YES
+INHERIT_DOCS = YES
+SEPARATE_MEMBER_PAGES = NO
+TAB_SIZE = 5
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = YES
+OPTIMIZE_OUTPUT_JAVA = YES
+OPTIMIZE_FOR_FORTRAN = NO
+OPTIMIZE_OUTPUT_VHDL = NO
+BUILTIN_STL_SUPPORT = YES
+CPP_CLI_SUPPORT = NO
+SIP_SUPPORT = NO
+IDL_PROPERTY_SUPPORT = YES
+DISTRIBUTE_GROUP_DOC = NO
+SUBGROUPING = YES
+TYPEDEF_HIDES_STRUCT = NO
+SYMBOL_CACHE_SIZE = 0
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = YES
+EXTRACT_STATIC = YES
+EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_METHODS = NO
+EXTRACT_ANON_NSPACES = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = YES
+CASE_SENSE_NAMES = YES
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = NO
+SORT_BRIEF_DOCS = NO
+SORT_GROUP_NAMES = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 25
+SHOW_USED_FILES = NO
+SHOW_DIRECTORIES = NO
+SHOW_FILES = YES
+SHOW_NAMESPACES = NO
+FILE_VERSION_FILTER =
+LAYOUT_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE = log.txt
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = @CMAKE_CURRENT_SOURCE_DIR@/inc
+INPUT_ENCODING = UTF-8
+FILE_PATTERNS = *.hxx \
+ *.h
+RECURSIVE = YES
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXCLUDE_SYMBOLS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = YES
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = YES
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = YES
+REFERENCES_LINK_SOURCE = YES
+USE_HTAGS = NO
+VERBATIM_HEADERS = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = YES
+COLS_IN_ALPHA_INDEX = 3
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = YES
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET = doxygen.css
+HTML_ALIGN_MEMBERS = YES
+HTML_DYNAMIC_SECTIONS = NO
+GENERATE_DOCSET = NO
+DOCSET_FEEDNAME = "Doxygen generated docs"
+DOCSET_BUNDLE_ID = org.doxygen.Project
+GENERATE_HTMLHELP = NO
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+CHM_INDEX_ENCODING =
+BINARY_TOC = YES
+TOC_EXPAND = YES
+GENERATE_QHP = NO
+QCH_FILE =
+QHP_NAMESPACE = org.doxygen.Project
+QHP_VIRTUAL_FOLDER = doc
+QHG_LOCATION =
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = ALL
+TREEVIEW_WIDTH = 250
+FORMULA_FONTSIZE = 10
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = NO
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = YES
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH = $(CASROOT)/inc
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = NO
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+MSCGEN_PATH =
+HIDE_UNDOC_RELATIONS = NO
+HAVE_DOT = YES
+DOT_FONTNAME = FreeSans
+DOT_FONTSIZE = 10
+DOT_FONTPATH =
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = YES
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = YES
+CALLER_GRAPH = YES
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = jpg
+DOT_PATH =
+DOTFILE_DIRS =
+DOT_GRAPH_MAX_NODES = 50
+MAX_DOT_GRAPH_DEPTH = 0
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = NO
+GENERATE_LEGEND = NO
+DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = YES
smesh.patch:
inc/SMESHDS_DataMapOfShape.hxx | 2 +-
inc/SMESH_IndexedMap.hxx | 4 ++--
src/MEFISTO2/aptrte.cpp | 9 +++++++++
src/SMESH/SMESH_MeshEditor.cpp | 6 ++++++
src/SMESH/SMESH_Pattern.cpp | 6 ++++++
src/SMESHDS/SMESHDS_Mesh.cpp | 8 ++++----
6 files changed, 28 insertions(+), 7 deletions(-)
--- NEW FILE smesh.patch ---
diff -Naur smesh-5.1.2.2/inc/SMESHDS_DataMapOfShape.hxx salomesmesh/inc/SMESHDS_DataMapOfShape.hxx
--- smesh-5.1.2.2/inc/SMESHDS_DataMapOfShape.hxx 2011-09-27 03:33:02.000000000 -0500
+++ salomesmesh/inc/SMESHDS_DataMapOfShape.hxx 2011-12-20 13:31:11.887317557 -0600
@@ -32,7 +32,7 @@
* This method needed for instance NCollection_DataMap with TopoDS_Shape as key
*/
-inline Standard_Boolean SMESH_IsEqual(const TopoDS_Shape& S1,
+inline Standard_Boolean IsEqual(const TopoDS_Shape& S1,
const TopoDS_Shape& S2)
{
return S1.IsSame(S2);
diff -Naur smesh-5.1.2.2/inc/SMESH_IndexedMap.hxx salomesmesh/inc/SMESH_IndexedMap.hxx
--- smesh-5.1.2.2/inc/SMESH_IndexedMap.hxx 2011-09-27 03:33:02.000000000 -0500
+++ salomesmesh/inc/SMESH_IndexedMap.hxx 2011-12-20 13:31:11.819319791 -0600
@@ -226,7 +226,7 @@
pNode = (IndexedMapNode *) myData1[iK1];
while (pNode)
{
- if (SMESH_IsEqual (pNode->Key1(), theKey1))
+ if (IsEqual (pNode->Key1(), theKey1))
return pNode->Key2();
pNode = (IndexedMapNode *) pNode->Next();
}
@@ -249,7 +249,7 @@
pNode1 = (IndexedMapNode *) myData1[iK1];
while (pNode1)
{
- if (SMESH_IsEqual(pNode1->Key1(), theKey1))
+ if (IsEqual(pNode1->Key1(), theKey1))
return Standard_True;
pNode1 = (IndexedMapNode *) pNode1->Next();
}
diff -Naur smesh-5.1.2.2/src/MEFISTO2/aptrte.cpp salomesmesh/src/MEFISTO2/aptrte.cpp
--- smesh-5.1.2.2/src/MEFISTO2/aptrte.cpp 2009-12-17 02:32:26.000000000 -0600
+++ salomesmesh/src/MEFISTO2/aptrte.cpp 2011-12-20 13:31:11.641325642 -0600
@@ -847,3 +847,12 @@
MESSAGE(" ");
return;
}
+
+// Weird workaround needed to solve problem with libf2c
+#if defined(__GNUC__)
+extern "C" {
+int MAIN__( )
+{ return 0;}
+}
+#endif
+
diff -Naur smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
--- smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp 2011-03-09 12:47:47.000000000 -0600
+++ salomesmesh/src/SMESH/SMESH_MeshEditor.cpp 2011-12-20 13:31:11.755321896 -0600
@@ -56,6 +56,7 @@
#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
#include <Precision.hxx>
+#include <Standard_Version.hxx>
#include <TColStd_ListOfInteger.hxx>
#include <TopAbs_State.hxx>
#include <TopExp.hxx>
@@ -2205,8 +2206,13 @@
if ( projector.IsDone() ) {
double u, v, minVal = DBL_MAX;
for ( int i = projector.NbExt(); i > 0; i-- )
+#if OCC_VERSION_HEX >= 0x060500
if ( projector.SquareDistance( i ) < minVal ) {
minVal = projector.SquareDistance( i );
+#else
+ if ( projector.Value( i ) < minVal ) {
+ minVal = projector.Value( i );
+#endif
projector.Point( i ).Parameter( u, v );
}
result.SetCoord( u, v );
diff -Naur smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp salomesmesh/src/SMESH/SMESH_Pattern.cpp
--- smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp 2011-03-09 12:47:47.000000000 -0600
+++ salomesmesh/src/SMESH/SMESH_Pattern.cpp 2011-12-20 13:31:11.766321534 -0600
@@ -39,6 +39,7 @@
#include <GeomAdaptor_Surface.hxx>
#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
+#include <Standard_Version.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
@@ -436,8 +437,13 @@
}
double u, v, minVal = DBL_MAX;
for ( int i = theProjectorPS.NbExt(); i > 0; i-- )
+#if OCC_VERSION_HEX >= 0x060500
if ( theProjectorPS.SquareDistance( i ) < minVal ) {
minVal = theProjectorPS.SquareDistance( i );
+#else
+ if ( theProjectorPS.Value( i ) < minVal ) {
+ minVal = theProjectorPS.Value( i );
+#endif
theProjectorPS.Point( i ).Parameter( u, v );
}
return gp_XY( u, v );
diff -Naur smesh-5.1.2.2/src/SMESHDS/SMESHDS_Mesh.cpp salomesmesh/src/SMESHDS/SMESHDS_Mesh.cpp
--- smesh-5.1.2.2/src/SMESHDS/SMESHDS_Mesh.cpp 2011-09-27 03:33:02.000000000 -0500
+++ salomesmesh/src/SMESHDS/SMESHDS_Mesh.cpp 2011-12-20 13:31:11.619326365 -0600
@@ -42,10 +42,10 @@
using namespace std;
-Standard_Boolean IsEqual( const TopoDS_Shape& S1, const TopoDS_Shape& S2 )
-{
- return S1.IsSame( S2 );
-}
+/*Standard_Boolean IsEqual( const TopoDS_Shape& S1, const TopoDS_Shape& S2 )
+ {
+ return S1.IsSame( S2 );
+ }*/
//=======================================================================
//function : Create
--- NEW FILE smesh.spec ---
Name: smesh
Version: 5.1.2.2
Release: 2.svn54%{?dist}
Summary: OpenCascade based MESH framework
# This library is LGPLv2+ but links against the non-free library OCE.
License: GPLv2 with exception
URL: https://sourceforge.net/projects/salomesmesh
# 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
# Patch emailed upstream to Fotios Sioutis <sfotis(a)gmail.com>
# on 12/21/11.
Patch0: smesh.patch
Patch1: smesh-cmake_fixes.patch
BuildRequires: cmake doxygen
BuildRequires: OCE-devel
BuildRequires: boost-devel
BuildRequires: gcc-gfortran
BuildRequires: f2c
BuildRequires: dos2unix
%description
A complete OpenCascade based MESH framework.
%package doc
Summary: Development documentation for %{name}
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description doc
Development documentation for %{name}.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
Development files and headers for %{name}.
%prep
%setup -q -c %{name}-%{version}
%patch0 -p1
%patch1 -p1 -b .cmakefix
dos2unix -k LICENCE.lgpl.txt
%build
rm -rf build && mkdir build && pushd build
LDFLAGS='-Wl,--as-needed'; export LDFLAGS
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DOCC_INCLUDE_PATH=%{_includedir}/oce \
..
make %{?_smp_mflags}
# Build documentation
make doc
popd
# Remove install script since we don't need it.
rm -f doc/html/installdox
%install
pushd build
make install DESTDIR=%{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%doc LICENCE.lgpl.txt
%{_libdir}/*.so.*
%files doc
%doc doc/html
%files devel
%{_includedir}/*
%{_libdir}/*.so
%changelog
* Thu Jan 19 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-2.svn54
- Minor updates to spec file.
* Tue Dec 20 2011 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-1.svn54
- Initial release.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/smesh/F-15/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 24 Jan 2012 22:13:06 -0000 1.1
+++ sources 27 Jan 2012 20:09:54 -0000 1.2
@@ -0,0 +1 @@
+00ed8a488d1ddeb05d1777430094df80 smesh-5.1.2.2-svn54.tar.gz
12 years, 10 months
- 1
- 0
rpms/smesh/F-16 smesh-cmake_fixes.patch, NONE, 1.1 smesh.patch, NONE, 1.1 smesh.spec, NONE, 1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/smesh/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3201
Added Files:
smesh-cmake_fixes.patch smesh.patch smesh.spec
Log Message:
* Thu Jan 19 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-2.svn54
- Minor updates to spec file.
smesh-cmake_fixes.patch:
CMakeLists.txt | 34 ++++++
doc/src/Doxyfile | 254 ----------------------------------------------------
doc/src/Doxyfile.in | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 285 insertions(+), 257 deletions(-)
--- NEW FILE smesh-cmake_fixes.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 2010-01-25 09:01:13.000000000 -0600
+++ smesh-5.1.2.2/CMakeLists.txt 2011-12-27 11:51:18.818641905 -0600
@@ -8,7 +8,9 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-SET(CMAKE_BUILD_TYPE "Release") # By default, build in release mode
+IF(NOT CMAKE_BUILD_TYPE)
+ SET(CMAKE_BUILD_TYPE "Release") # By default, build in release mode
+ENDIF()
SET(BUILD_SHARED_LIBS ON)
SET(LIBRARY_OUTPUT_PATH cmake-build)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@@ -79,6 +81,21 @@
ENDIF(WIN32)
ENDIF(UNIX)
+#
+# Build doxygen API documentation #
+#
+
+FIND_PACKAGE(Doxygen)
+if(DOXYGEN_FOUND)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/src/Doxyfile.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/doc/src/Doxyfile @ONLY)
+ add_custom_target(doc ${DOXYGEN_EXECUTABLE}
+ ${CMAKE_CURRENT_SOURCE_DIR}/doc/src/Doxyfile
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/src
+ COMMENT "Generating API documentation with Doxygen" VERBATIM
+ )
+endif(DOXYGEN_FOUND)
+
#########
# SMDS #
#########
@@ -153,12 +170,23 @@
SET(INSTALL_PATH_NAME SMESH-${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK})
IF(UNIX)
+ # Setup install paths
+ IF(NOT LIB_INSTALL_DIR)
+ SET(LIB_INSTALL_DIR /usr/local/lib${LIB_SUFFIX})
+ ENDIF()
+ IF(NOT INCLUDE_INSTALL_DIR)
+ SET(INCLUDE_INSTALL_DIR /usr/local/include)
+ ENDIF()
+ # Set soname version
+ SET_TARGET_PROPERTIES(SMDS Driver DriverSTL DriverDAT DriverUNV
+ SMESHDS SMESH StdMeshers
+ PROPERTIES SOVERSION ${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR})
# Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7
INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV
SMESHDS SMESH StdMeshers
- DESTINATION /usr/local/lib/${INSTALL_PATH_NAME})
+ DESTINATION ${LIB_INSTALL_DIR})
# Headers are installed by default in /usr/local/include/SMESH-5.1.2.7
INSTALL(DIRECTORY inc/
- DESTINATION /usr/local/include/${INSTALL_PATH_NAME}
+ DESTINATION ${INCLUDE_INSTALL_DIR}
FILES_MATCHING PATTERN "*.h*")
ENDIF(UNIX)
diff -Naur smesh-5.1.2.2.orig/doc/src/Doxyfile smesh-5.1.2.2/doc/src/Doxyfile
--- smesh-5.1.2.2.orig/doc/src/Doxyfile 2008-11-26 01:34:11.000000000 -0600
+++ smesh-5.1.2.2/doc/src/Doxyfile 1969-12-31 18:00:00.000000000 -0600
@@ -1,254 +0,0 @@
-# Doxyfile 1.5.7.1
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = "SALOME - SMESH"
-PROJECT_NUMBER =
-OUTPUT_DIRECTORY = ../
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF =
-ALWAYS_DETAILED_SEC = YES
-INLINE_INHERITED_MEMB = YES
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = YES
-QT_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = YES
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 5
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = YES
-OPTIMIZE_OUTPUT_JAVA = YES
-OPTIMIZE_FOR_FORTRAN = NO
-OPTIMIZE_OUTPUT_VHDL = NO
-BUILTIN_STL_SUPPORT = YES
-CPP_CLI_SUPPORT = NO
-SIP_SUPPORT = NO
-IDL_PROPERTY_SUPPORT = YES
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-TYPEDEF_HIDES_STRUCT = NO
-SYMBOL_CACHE_SIZE = 0
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = YES
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = NO
-EXTRACT_ANON_NSPACES = NO
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = YES
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = NO
-SORT_BRIEF_DOCS = NO
-SORT_GROUP_NAMES = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 25
-SHOW_USED_FILES = NO
-SHOW_DIRECTORIES = NO
-SHOW_FILES = YES
-SHOW_NAMESPACES = NO
-FILE_VERSION_FILTER =
-LAYOUT_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE = log.txt
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = ../../inc
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.hxx \
- *.h
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = YES
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 3
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET = doxygen.css
-HTML_ALIGN_MEMBERS = YES
-HTML_DYNAMIC_SECTIONS = NO
-GENERATE_DOCSET = NO
-DOCSET_FEEDNAME = "Doxygen generated docs"
-DOCSET_BUNDLE_ID = org.doxygen.Project
-GENERATE_HTMLHELP = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-CHM_INDEX_ENCODING =
-BINARY_TOC = YES
-TOC_EXPAND = YES
-GENERATE_QHP = NO
-QCH_FILE =
-QHP_NAMESPACE = org.doxygen.Project
-QHP_VIRTUAL_FOLDER = doc
-QHG_LOCATION =
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = ALL
-TREEVIEW_WIDTH = 250
-FORMULA_FONTSIZE = 10
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = YES
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH = $(CASROOT)/inc
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = NO
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = YES
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = NO
-HAVE_DOT = YES
-DOT_FONTNAME = FreeSans
-DOT_FONTSIZE = 10
-DOT_FONTPATH =
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = YES
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = YES
-CALLER_GRAPH = YES
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = jpg
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 50
-MAX_DOT_GRAPH_DEPTH = 0
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = NO
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = YES
diff -Naur smesh-5.1.2.2.orig/doc/src/Doxyfile.in smesh-5.1.2.2/doc/src/Doxyfile.in
--- smesh-5.1.2.2.orig/doc/src/Doxyfile.in 1969-12-31 18:00:00.000000000 -0600
+++ smesh-5.1.2.2/doc/src/Doxyfile.in 2011-12-27 11:51:18.773643400 -0600
@@ -0,0 +1,254 @@
+# Doxyfile 1.5.7.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING = UTF-8
+PROJECT_NAME = "SALOME - SMESH"
+PROJECT_NUMBER =
+OUTPUT_DIRECTORY = ../
+CREATE_SUBDIRS = NO
+OUTPUT_LANGUAGE = English
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF =
+ALWAYS_DETAILED_SEC = YES
+INLINE_INHERITED_MEMB = YES
+FULL_PATH_NAMES = NO
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = YES
+QT_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = YES
+INHERIT_DOCS = YES
+SEPARATE_MEMBER_PAGES = NO
+TAB_SIZE = 5
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = YES
+OPTIMIZE_OUTPUT_JAVA = YES
+OPTIMIZE_FOR_FORTRAN = NO
+OPTIMIZE_OUTPUT_VHDL = NO
+BUILTIN_STL_SUPPORT = YES
+CPP_CLI_SUPPORT = NO
+SIP_SUPPORT = NO
+IDL_PROPERTY_SUPPORT = YES
+DISTRIBUTE_GROUP_DOC = NO
+SUBGROUPING = YES
+TYPEDEF_HIDES_STRUCT = NO
+SYMBOL_CACHE_SIZE = 0
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = YES
+EXTRACT_STATIC = YES
+EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_METHODS = NO
+EXTRACT_ANON_NSPACES = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = YES
+CASE_SENSE_NAMES = YES
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = NO
+SORT_BRIEF_DOCS = NO
+SORT_GROUP_NAMES = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 25
+SHOW_USED_FILES = NO
+SHOW_DIRECTORIES = NO
+SHOW_FILES = YES
+SHOW_NAMESPACES = NO
+FILE_VERSION_FILTER =
+LAYOUT_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE = log.txt
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = @CMAKE_CURRENT_SOURCE_DIR@/inc
+INPUT_ENCODING = UTF-8
+FILE_PATTERNS = *.hxx \
+ *.h
+RECURSIVE = YES
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXCLUDE_SYMBOLS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = YES
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = YES
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = YES
+REFERENCES_LINK_SOURCE = YES
+USE_HTAGS = NO
+VERBATIM_HEADERS = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = YES
+COLS_IN_ALPHA_INDEX = 3
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = YES
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET = doxygen.css
+HTML_ALIGN_MEMBERS = YES
+HTML_DYNAMIC_SECTIONS = NO
+GENERATE_DOCSET = NO
+DOCSET_FEEDNAME = "Doxygen generated docs"
+DOCSET_BUNDLE_ID = org.doxygen.Project
+GENERATE_HTMLHELP = NO
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+CHM_INDEX_ENCODING =
+BINARY_TOC = YES
+TOC_EXPAND = YES
+GENERATE_QHP = NO
+QCH_FILE =
+QHP_NAMESPACE = org.doxygen.Project
+QHP_VIRTUAL_FOLDER = doc
+QHG_LOCATION =
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = ALL
+TREEVIEW_WIDTH = 250
+FORMULA_FONTSIZE = 10
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = NO
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = YES
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH = $(CASROOT)/inc
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = NO
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+MSCGEN_PATH =
+HIDE_UNDOC_RELATIONS = NO
+HAVE_DOT = YES
+DOT_FONTNAME = FreeSans
+DOT_FONTSIZE = 10
+DOT_FONTPATH =
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = YES
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = YES
+CALLER_GRAPH = YES
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = jpg
+DOT_PATH =
+DOTFILE_DIRS =
+DOT_GRAPH_MAX_NODES = 50
+MAX_DOT_GRAPH_DEPTH = 0
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = NO
+GENERATE_LEGEND = NO
+DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = YES
smesh.patch:
inc/SMESHDS_DataMapOfShape.hxx | 2 +-
inc/SMESH_IndexedMap.hxx | 4 ++--
src/MEFISTO2/aptrte.cpp | 9 +++++++++
src/SMESH/SMESH_MeshEditor.cpp | 6 ++++++
src/SMESH/SMESH_Pattern.cpp | 6 ++++++
src/SMESHDS/SMESHDS_Mesh.cpp | 8 ++++----
6 files changed, 28 insertions(+), 7 deletions(-)
--- NEW FILE smesh.patch ---
diff -Naur smesh-5.1.2.2/inc/SMESHDS_DataMapOfShape.hxx salomesmesh/inc/SMESHDS_DataMapOfShape.hxx
--- smesh-5.1.2.2/inc/SMESHDS_DataMapOfShape.hxx 2011-09-27 03:33:02.000000000 -0500
+++ salomesmesh/inc/SMESHDS_DataMapOfShape.hxx 2011-12-20 13:31:11.887317557 -0600
@@ -32,7 +32,7 @@
* This method needed for instance NCollection_DataMap with TopoDS_Shape as key
*/
-inline Standard_Boolean SMESH_IsEqual(const TopoDS_Shape& S1,
+inline Standard_Boolean IsEqual(const TopoDS_Shape& S1,
const TopoDS_Shape& S2)
{
return S1.IsSame(S2);
diff -Naur smesh-5.1.2.2/inc/SMESH_IndexedMap.hxx salomesmesh/inc/SMESH_IndexedMap.hxx
--- smesh-5.1.2.2/inc/SMESH_IndexedMap.hxx 2011-09-27 03:33:02.000000000 -0500
+++ salomesmesh/inc/SMESH_IndexedMap.hxx 2011-12-20 13:31:11.819319791 -0600
@@ -226,7 +226,7 @@
pNode = (IndexedMapNode *) myData1[iK1];
while (pNode)
{
- if (SMESH_IsEqual (pNode->Key1(), theKey1))
+ if (IsEqual (pNode->Key1(), theKey1))
return pNode->Key2();
pNode = (IndexedMapNode *) pNode->Next();
}
@@ -249,7 +249,7 @@
pNode1 = (IndexedMapNode *) myData1[iK1];
while (pNode1)
{
- if (SMESH_IsEqual(pNode1->Key1(), theKey1))
+ if (IsEqual(pNode1->Key1(), theKey1))
return Standard_True;
pNode1 = (IndexedMapNode *) pNode1->Next();
}
diff -Naur smesh-5.1.2.2/src/MEFISTO2/aptrte.cpp salomesmesh/src/MEFISTO2/aptrte.cpp
--- smesh-5.1.2.2/src/MEFISTO2/aptrte.cpp 2009-12-17 02:32:26.000000000 -0600
+++ salomesmesh/src/MEFISTO2/aptrte.cpp 2011-12-20 13:31:11.641325642 -0600
@@ -847,3 +847,12 @@
MESSAGE(" ");
return;
}
+
+// Weird workaround needed to solve problem with libf2c
+#if defined(__GNUC__)
+extern "C" {
+int MAIN__( )
+{ return 0;}
+}
+#endif
+
diff -Naur smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp salomesmesh/src/SMESH/SMESH_MeshEditor.cpp
--- smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp 2011-03-09 12:47:47.000000000 -0600
+++ salomesmesh/src/SMESH/SMESH_MeshEditor.cpp 2011-12-20 13:31:11.755321896 -0600
@@ -56,6 +56,7 @@
#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
#include <Precision.hxx>
+#include <Standard_Version.hxx>
#include <TColStd_ListOfInteger.hxx>
#include <TopAbs_State.hxx>
#include <TopExp.hxx>
@@ -2205,8 +2206,13 @@
if ( projector.IsDone() ) {
double u, v, minVal = DBL_MAX;
for ( int i = projector.NbExt(); i > 0; i-- )
+#if OCC_VERSION_HEX >= 0x060500
if ( projector.SquareDistance( i ) < minVal ) {
minVal = projector.SquareDistance( i );
+#else
+ if ( projector.Value( i ) < minVal ) {
+ minVal = projector.Value( i );
+#endif
projector.Point( i ).Parameter( u, v );
}
result.SetCoord( u, v );
diff -Naur smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp salomesmesh/src/SMESH/SMESH_Pattern.cpp
--- smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp 2011-03-09 12:47:47.000000000 -0600
+++ salomesmesh/src/SMESH/SMESH_Pattern.cpp 2011-12-20 13:31:11.766321534 -0600
@@ -39,6 +39,7 @@
#include <GeomAdaptor_Surface.hxx>
#include <Geom_Curve.hxx>
#include <Geom_Surface.hxx>
+#include <Standard_Version.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
@@ -436,8 +437,13 @@
}
double u, v, minVal = DBL_MAX;
for ( int i = theProjectorPS.NbExt(); i > 0; i-- )
+#if OCC_VERSION_HEX >= 0x060500
if ( theProjectorPS.SquareDistance( i ) < minVal ) {
minVal = theProjectorPS.SquareDistance( i );
+#else
+ if ( theProjectorPS.Value( i ) < minVal ) {
+ minVal = theProjectorPS.Value( i );
+#endif
theProjectorPS.Point( i ).Parameter( u, v );
}
return gp_XY( u, v );
diff -Naur smesh-5.1.2.2/src/SMESHDS/SMESHDS_Mesh.cpp salomesmesh/src/SMESHDS/SMESHDS_Mesh.cpp
--- smesh-5.1.2.2/src/SMESHDS/SMESHDS_Mesh.cpp 2011-09-27 03:33:02.000000000 -0500
+++ salomesmesh/src/SMESHDS/SMESHDS_Mesh.cpp 2011-12-20 13:31:11.619326365 -0600
@@ -42,10 +42,10 @@
using namespace std;
-Standard_Boolean IsEqual( const TopoDS_Shape& S1, const TopoDS_Shape& S2 )
-{
- return S1.IsSame( S2 );
-}
+/*Standard_Boolean IsEqual( const TopoDS_Shape& S1, const TopoDS_Shape& S2 )
+ {
+ return S1.IsSame( S2 );
+ }*/
//=======================================================================
//function : Create
--- NEW FILE smesh.spec ---
Name: smesh
Version: 5.1.2.2
Release: 2.svn54%{?dist}
Summary: OpenCascade based MESH framework
# This library is LGPLv2+ but links against the non-free library OCE.
License: GPLv2 with exception
URL: https://sourceforge.net/projects/salomesmesh
# 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
# Patch emailed upstream to Fotios Sioutis <sfotis(a)gmail.com>
# on 12/21/11.
Patch0: smesh.patch
Patch1: smesh-cmake_fixes.patch
BuildRequires: cmake doxygen
BuildRequires: OCE-devel
BuildRequires: boost-devel
BuildRequires: gcc-gfortran
BuildRequires: f2c
BuildRequires: dos2unix
%description
A complete OpenCascade based MESH framework.
%package doc
Summary: Development documentation for %{name}
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description doc
Development documentation for %{name}.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
Development files and headers for %{name}.
%prep
%setup -q -c %{name}-%{version}
%patch0 -p1
%patch1 -p1 -b .cmakefix
dos2unix -k LICENCE.lgpl.txt
%build
rm -rf build && mkdir build && pushd build
LDFLAGS='-Wl,--as-needed'; export LDFLAGS
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DOCC_INCLUDE_PATH=%{_includedir}/oce \
..
make %{?_smp_mflags}
# Build documentation
make doc
popd
# Remove install script since we don't need it.
rm -f doc/html/installdox
%install
pushd build
make install DESTDIR=%{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%doc LICENCE.lgpl.txt
%{_libdir}/*.so.*
%files doc
%doc doc/html
%files devel
%{_includedir}/*
%{_libdir}/*.so
%changelog
* Thu Jan 19 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-2.svn54
- Minor updates to spec file.
* Tue Dec 20 2011 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-1.svn54
- Initial release.
12 years, 10 months
- 1
- 0