From 7c10d8f03c8b5cd1212e0611a136f44ac6b1e90fa8affa7b074b991273e4ffca Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 23 Apr 2008 23:29:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=10 --- hugin-0.5-autoconf.diff | 20 ---------- hugin-0.7_beta4.tar.bz2 | 3 -- hugin-CVE-2007-5200.patch | 34 ---------------- hugin-fftw.patch | 32 --------------- hugin-includes.patch | 38 ------------------ hugin-jpe.patch | 67 ------------------------------- hugin-lib64.patch | 15 ------- hugin-string-compare.patch | 13 ------ hugin-svn20080422.tar.bz2 | 3 ++ hugin.changes | 12 ++++++ hugin.spec | 81 +++++++++++++++++--------------------- 11 files changed, 52 insertions(+), 266 deletions(-) delete mode 100644 hugin-0.5-autoconf.diff delete mode 100644 hugin-0.7_beta4.tar.bz2 delete mode 100644 hugin-CVE-2007-5200.patch delete mode 100644 hugin-fftw.patch delete mode 100644 hugin-includes.patch delete mode 100644 hugin-jpe.patch delete mode 100644 hugin-lib64.patch delete mode 100644 hugin-string-compare.patch create mode 100644 hugin-svn20080422.tar.bz2 diff --git a/hugin-0.5-autoconf.diff b/hugin-0.5-autoconf.diff deleted file mode 100644 index 3f12d2b..0000000 --- a/hugin-0.5-autoconf.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- bootstrap -+++ bootstrap -@@ -42,7 +42,7 @@ - gettextize_version=`$GETTEXTIZE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` - # echo gettextize version: $gettextize_version - case $gettextize_version in -- 0.11*|0.12*|0.13*|0.14*|0.15*|0.16*) -+ 0.11*|0.12*|0.13*|0.14*|0.15*|0.16*|0.1[1-9]*) - have_gettextize=true - ;; - esac -@@ -79,7 +79,7 @@ - automake_version=`$AUTOMAKE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` - # echo automake version: $automake_version - case $automake_version in -- 1.7*|1.8*|1.9*) -+ 1.7*|1.8*|1.9*|1.[1-9][0-9]*) - have_automake=true - ;; - esac diff --git a/hugin-0.7_beta4.tar.bz2 b/hugin-0.7_beta4.tar.bz2 deleted file mode 100644 index 64d9318..0000000 --- a/hugin-0.7_beta4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4527d40ae56a6ef67583a350ab67505e86054c0b297b2d18cf892c2751cabcfd -size 2319243 diff --git a/hugin-CVE-2007-5200.patch b/hugin-CVE-2007-5200.patch deleted file mode 100644 index 60df390..0000000 --- a/hugin-CVE-2007-5200.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- src/hugin/AutoCtrlPointCreator.cpp -+++ src/hugin/AutoCtrlPointCreator.cpp -@@ -224,8 +224,7 @@ - wxSetWorkingDirectory(apDir); - } - #endif -- -- wxString ptofile(wxT("autopano_result_tempfile.pto")); -+ wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res")); - autopanoArgs.Replace(wxT("%o"), ptofile); - wxString tmp; - tmp.Printf(wxT("%d"), nFeatures); -@@ -415,7 +414,7 @@ - imgNr++; - } - -- wxString ptofile(wxT("autopano_result_tempfile")); -+ wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res")); - autopanoArgs.Replace(wxT("%o"), ptofile); - wxString tmp; - tmp.Printf(wxT("%d"), nFeatures); ---- src/Panorama/PTOptimise.cpp -+++ src/Panorama/PTOptimise.cpp -@@ -36,8 +36,8 @@ - #include - #include - --#define DEBUG_WRITE_OPTIM_OUTPUT --#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt" -+//#define DEBUG_WRITE_OPTIM_OUTPUT -+//#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt" - - using namespace std; - using namespace PT; diff --git a/hugin-fftw.patch b/hugin-fftw.patch deleted file mode 100644 index 802c674..0000000 --- a/hugin-fftw.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- m4/ax_fftw.m4 -+++ m4/ax_fftw.m4 -@@ -1,6 +1,6 @@ - AC_DEFUN([AC_PATH_FFTW], - [ --LIBFFTW="-lrfftw -lfftw" -+LIBFFTW="-ldrfftw -ldfftw" - - AC_MSG_CHECKING([for fftw]) - -@@ -62,7 +62,7 @@ - test=NONE - fftw_libdir=NONE - for dir in $fftw_libdirs; do -- try="ls -1 $dir/libfftw*" -+ try="ls -1 $dir/libdfftw*" - if test=`eval $try 2> /dev/null`; then fftw_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi - done - -@@ -128,10 +128,10 @@ - - if test "$fftw_libraries" = "/usr/lib" || test "$fftw_libraries" = "/usr/lib64" || test "$fftw_libraries" = "$x_libraries" || test -z "$fftw_libraries"; then - FFTW_LDFLAGS="" -- LIB_FFTW='-lrfftw -lfftw' -+ LIB_FFTW='-ldrfftw -ldfftw' - else - FFTW_LDFLAGS="-L$fftw_libraries" -- LIB_FFTW='-lrfftw -lfftw' -+ LIB_FFTW='-ldrfftw -ldfftw' - all_libraries="$FFTW_LDFLAGS $all_libraries" - fi - diff --git a/hugin-includes.patch b/hugin-includes.patch deleted file mode 100644 index f55b9ee..0000000 --- a/hugin-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- src/foreign/vigra/imageinfo.hxx -+++ src/foreign/vigra/imageinfo.hxx -@@ -52,6 +52,7 @@ - - #include - #include -+#include - #include "vigra/utilities.hxx" - #include "vigra/codec.hxx" - ---- src/include/common/utils.h -+++ src/include/common/utils.h -@@ -29,6 +29,8 @@ - #include - #include - #include -+#include -+#include - - #include "platform.h" - ---- src/tools/color_correct_tiff.cpp -+++ src/tools/color_correct_tiff.cpp -@@ -1,4 +1,4 @@ --/** -+ /** - * @file one.cc - * @author Philippe Thomin - * @date 200511 -@@ -22,6 +22,8 @@ - #include - #include - #include -+#include -+#include - #include - - /** diff --git a/hugin-jpe.patch b/hugin-jpe.patch deleted file mode 100644 index 6aaede0..0000000 --- a/hugin-jpe.patch +++ /dev/null @@ -1,67 +0,0 @@ -This patch adds support for JPEG files named "*.jpe". ---- src/Panorama/PanoramaMemento.cpp -+++ src/Panorama/PanoramaMemento.cpp -@@ -270,7 +270,7 @@ - } - setImageSize(vigra::Size2D(width, height)); - -- if (ext != "JPG" && ext != "JPEG") { -+ if (ext != "JPG" && ext != "JPEG" && ext != "JPE") { - return false; - } - ---- src/foreign/vigra_impex/jpeg.cxx -+++ src/foreign/vigra_impex/jpeg.cxx -@@ -81,9 +81,10 @@ - desc.magicStrings[0][2] = '\377'; - - // init file extensions -- desc.fileExtensions.resize(2); -+ desc.fileExtensions.resize(3); - desc.fileExtensions[0] = "jpg"; - desc.fileExtensions[1] = "jpeg"; -+ desc.fileExtensions[2] = "jpe"; - - desc.bandNumbers.resize(2); - desc.bandNumbers[0] = 1; ---- src/hugin/LensPanel.cpp -+++ src/hugin/LensPanel.cpp -@@ -700,7 +700,8 @@ - // check file extension - wxFileName file(wxString(pano.getImage(imgNr).getFilename().c_str(), *wxConvCurrent)); - if (file.GetExt().CmpNoCase(wxT("jpg")) == 0 || -- file.GetExt().CmpNoCase(wxT("jpeg")) == 0 ) -+ file.GetExt().CmpNoCase(wxT("jpeg")) == 0 || -+ file.GetExt().CmpNoCase(wxT("jpe")) == 0 ) - { - double cropFactor = 0; - double focalLength = 0; -@@ -782,7 +783,8 @@ - // try to read the exif data and add that to the lens ini file - wxFileName file(wxString(pano.getImage(imgNr).getFilename().c_str(), *wxConvCurrent)); - if (file.GetExt().CmpNoCase(wxT("jpg")) == 0 || -- file.GetExt().CmpNoCase(wxT("jpeg")) == 0 ) -+ file.GetExt().CmpNoCase(wxT("jpeg")) == 0 || -+ file.GetExt().CmpNoCase(wxT("jpe")) == 0 ) - { - - ImageInfo_t exif; ---- src/hugin/MainFrame.cpp -+++ src/hugin/MainFrame.cpp -@@ -98,6 +98,7 @@ - - if (file.GetExt().CmpNoCase(wxT("jpg")) == 0 || - file.GetExt().CmpNoCase(wxT("jpeg")) == 0 || -+ file.GetExt().CmpNoCase(wxT("jpe")) == 0 || - file.GetExt().CmpNoCase(wxT("tif")) == 0 || - file.GetExt().CmpNoCase(wxT("tiff")) == 0 || - file.GetExt().CmpNoCase(wxT("png")) == 0 || -@@ -704,7 +705,7 @@ - // get the global config object - wxConfigBase* config = wxConfigBase::Get(); - -- wxString wildcard (_("All Image files|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|All files (*)|*")); -+ wxString wildcard (_("All Image files|*.jpg;*.JPG;*.jpeg;*.JPEG;*.jpe;*.JPE;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg,*.jpeg,*.jpe)|*.jpg;*.JPG;*.jpeg;*.JPEG;*.jpe;*.JPE|All files (*)|*")); - - wxString path = config->Read(wxT("actualPath"), wxT("")); - wxFileDialog dlg(this,_("Add images"), diff --git a/hugin-lib64.patch b/hugin-lib64.patch deleted file mode 100644 index 686103e..0000000 --- a/hugin-lib64.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- m4/ax_check_panotools.m4 -+++ m4/ax_check_panotools.m4 -@@ -57,11 +57,7 @@ - passed=0; - PANO_OLD_LDFLAGS=$LDFLAGS - PANO_OLD_CPPFLAGS=$CPPFLAGS -- if test "x$HCPU" = 'xamd64' ; then -- LDFLAGS="$LDFLAGS -L$PANO_HOME/lib64" -- else -- LDFLAGS="$LDFLAGS -L$PANO_HOME/lib" -- fi -+ LDFLAGS="$LDFLAGS -L$PANO_HOME/lib64" - CPPFLAGS="$CPPFLAGS -I$PANO_HOME/include" - AC_LANG_SAVE - AC_LANG_C diff --git a/hugin-string-compare.patch b/hugin-string-compare.patch deleted file mode 100644 index cb7fd7d..0000000 --- a/hugin-string-compare.patch +++ /dev/null @@ -1,13 +0,0 @@ -autooptimiser.cpp: In function 'int main(int, char**)': -autooptimiser.cpp:136: warning: comparison with string literal results in unspecified behaviour ---- src/tools/autooptimiser.cpp -+++ src/tools/autooptimiser.cpp -@@ -133,7 +133,7 @@ - - Panorama pano; - PanoramaMemento newPano; -- if (scriptFile == "-") { -+ if (strcmp(scriptFile,"-") == 0) { - if (newPano.loadPTScript(cin)) { - pano.setMemento(newPano); - } else { diff --git a/hugin-svn20080422.tar.bz2 b/hugin-svn20080422.tar.bz2 new file mode 100644 index 0000000..d136ba6 --- /dev/null +++ b/hugin-svn20080422.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2055f0a86c4b09434a83923a2622684ce824cdfab19cea10181f924cc2a1453 +size 6746328 diff --git a/hugin.changes b/hugin.changes index 51e3ea4..95c629e 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Apr 23 16:44:45 CEST 2008 - sbrabec@suse.cz + +- Updated to SVN snapshot 0.7.0.3032: + * Support for HDR images. + * Large reorganization of the code. + * Build moved to cmake. + * Many code and algorithm fixes. + * Many crash fixes. + * Uses exiv2. + * OpenGL support. + ------------------------------------------------------------------- Mon Apr 7 16:50:59 CEST 2008 - sbrabec@suse.cz diff --git a/hugin.spec b/hugin.spec index 9605a62..f0ee1fd 100644 --- a/hugin.spec +++ b/hugin.spec @@ -1,5 +1,5 @@ # -# spec file for package hugin (Version 0.6.99.4) +# spec file for package hugin (Version 0.7.0.3032) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,28 +12,20 @@ Name: hugin -BuildRequires: SDL-devel boost-devel fdupes fftw-devel gcc-c++ libpano-devel libxml2 licenses python-wxGTK update-desktop-files vigra wxGTK-devel zip +BuildRequires: OpenEXR-devel SDL-devel boost-devel cmake fdupes fftw-devel gcc-c++ libexiv2-devel libpano-devel libxml2 licenses python-wxGTK subversion update-desktop-files vigra wxGTK-devel zip License: GPL v2 or later Group: Productivity/Graphics/Bitmap Editors Summary: Front-End for Panorama Tools -Version: 0.6.99.4 -Release: 107 -%define _version 0.7_beta4 -Source: %{name}-%{_version}.tar.bz2 -Patch2: hugin-fftw.patch -Patch4: hugin-jpe.patch -Patch64: hugin-lib64.patch -Patch11: hugin-0.5-autoconf.diff -Patch12: hugin-string-compare.patch -Patch13: hugin-CVE-2007-5200.patch -Patch14: hugin-includes.patch +Version: 0.7.0.3032 +Release: 1 +Source: %{name}-svn20080422.tar.bz2 Url: http://hugin.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: licenses # Optional package, if missing, it could cause unexpected errors: -Requires: enblend +Requires: enblend > 3.0.99 # Optional third party package: -Recommends: autopano-sift +Recommends: autopano-sift exiftool %description hugin can be used to stitch multiple images together. The resulting @@ -54,41 +46,31 @@ Authors: Lyndon Hill %prep -%setup -q -n %{name}-%{_version} -%patch2 -%patch4 -%if %_lib == lib64 -%patch64 -%endif -%patch11 -%patch12 -%patch13 -%patch14 -# Rename Spanish Catalan to Catalan. -mv src/hugin/po/ca_ES.po src/hugin/po/ca.po -# Rename Czech Czech Republic to Czech. -mv src/hugin/po/cs_CZ.po src/hugin/po/cs.po -sed -i "s/ca_ES/ca/;s/cs_CZ/cs/" src/hugin/po/LINGUAS -iconv -f shift-jis -t utf-8 README_JP.new -touch -r README_JP.new README_JP -mv README_JP.new README_JP +%setup -q -n %{name} +# Rename Catalan in Spain to Catalan. +mv src/translations/ca_ES.po src/translations/ca.po +# Rename Czech in Czech Republic to Czech. +mv src/translations/cs_CZ.po src/translations/cs.po +#sed -i "s/ca_ES/ca/;s/cs_CZ/cs/" src/hugin/po/LINGUAS +# Convert Japanese documentation to UTF-8 and delete note about Shift-JIS: +iconv -f shift-jis -t utf-8 README_JP.new +sed 1,4d README_JP.new2 +touch -r README_JP README_JP.new2 +mv README_JP.new2 README_JP +rm README_JP.new %build -./bootstrap -# Needed for hugin-0.6.1: -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure\ - --enable-shared\ - --disable-static\ - --with-unicode=yes +LIB_SUFFIX=%{_lib} +LIB_SUFFIX=${LIB_SUFFIX#lib} +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX=$LIB_SUFFIX . make %{?jobs:-j%jobs} %install %makeinstall -%suse_update_desktop_file %{name} Graphics 2DGraphics +%suse_update_desktop_file hugin Graphics 2DGraphics +%suse_update_desktop_file hugin_stitch_project Graphics 2DGraphics # locales %{find_lang} %{name} -%{find_lang} nona_gui %{name}.lang # Use better place for MIME icons. mv $RPM_BUILD_ROOT%{_datadir}/icons/gnome $RPM_BUILD_ROOT%{_datadir}/icons/hicolor %fdupes $RPM_BUILD_ROOT%{_datadir} @@ -114,16 +96,27 @@ fi %files -f %{name}.lang %defattr(-,root,root) -%doc BUGS AUTHORS COPYING HACKING LICENCE LICENCE_JHEAD LICENCE_VIGRA README README_JP TODO +%doc AUTHORS COPYING ChangeLog LICENCE LICENCE_JHEAD LICENCE_VIGRA README README_JP TODO %{_bindir}/* %{_datadir}/hugin -%{_datadir}/applications/hugin.desktop +%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/48x48/mimetypes/*.png %{_datadir}/mime/packages/*.xml %{_datadir}/pixmaps/*.png +%{_libdir}/*.so +%{_libdir}/*.so.* %doc %{_mandir}/man?/* %changelog +* Wed Apr 23 2008 sbrabec@suse.cz +- Updated to SVN snapshot 0.7.0.3032: + * Support for HDR images. + * Large reorganization of the code. + * Build moved to cmake. + * Many code and algorithm fixes. + * Many crash fixes. + * Uses exiv2. + * OpenGL support. * Mon Apr 07 2008 sbrabec@suse.cz - Recommend optional packages providing additional functionality. - Package README_JP.