diff --git a/hugin-0.5-autoconf.diff b/hugin-0.5-autoconf.diff index 008e9ed..bdc6bd2 100644 --- a/hugin-0.5-autoconf.diff +++ b/hugin-0.5-autoconf.diff @@ -1,14 +1,5 @@ --- 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.11*|0.12*|0.13*|0.14*|0.15*|0.16*) - 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 diff --git a/hugin-0.6.1.tar.bz2 b/hugin-0.6.1.tar.bz2 deleted file mode 100644 index 9a1f4ab..0000000 --- a/hugin-0.6.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18546d42ef15154246d5b84ebde847aa2cf003c6305cc64a17cc5396db346ae7 -size 2151921 diff --git a/hugin-0.7_beta4.tar.bz2 b/hugin-0.7_beta4.tar.bz2 new file mode 100644 index 0000000..64d9318 --- /dev/null +++ b/hugin-0.7_beta4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4527d40ae56a6ef67583a350ab67505e86054c0b297b2d18cf892c2751cabcfd +size 2319243 diff --git a/hugin-jpe.patch b/hugin-jpe.patch index 83d1aea..730f517 100644 --- a/hugin-jpe.patch +++ b/hugin-jpe.patch @@ -1,5 +1,15 @@ -Index: src/Panorama/PanoramaMemento.cpp -================================================================================ +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 @@ @@ -16,44 +26,42 @@ Index: src/Panorama/PanoramaMemento.cpp desc.bandNumbers[0] = 1; --- src/hugin/LensPanel.cpp +++ src/hugin/LensPanel.cpp -@@ -709,7 +709,8 @@ - // check file extension +@@ -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 ) +- file.GetExt().CmpNoCase(wxT("jpeg")) == 0 ) ++ file.GetExt().CmpNoCase(wxT("jpeg")) == 0 || ++ file.GetExt().CmpNoCase(wxT("jpe")) == 0 ) { - double c=0; - initLensFromFile(pano.getImage(imgNr).getFilename().c_str(), c, lens); + + ImageInfo_t exif; --- src/hugin/MainFrame.cpp +++ src/hugin/MainFrame.cpp -@@ -93,6 +93,8 @@ - wxFileName file(filenames[0]); +@@ -98,6 +98,7 @@ 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 || file.GetExt().CmpNoCase(wxT("tif")) == 0 || file.GetExt().CmpNoCase(wxT("tiff")) == 0 || file.GetExt().CmpNoCase(wxT("png")) == 0 || -@@ -614,7 +616,7 @@ +@@ -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)|*.jpg;*.JPG|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;*.JPG;*.jpeg;*.JPEG;*.jpe;*.JPE|All files (*)|*")); +- 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;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG;*.jpe;*.JPE|All files (*)|*")); + + wxString path = config->Read(wxT("actualPath"), wxT("")); wxFileDialog dlg(this,_("Add images"), - config->Read(wxT("actualPath"),wxT("")), wxT(""), - wildcard, wxOPEN|wxMULTIPLE , wxDefaultPosition); ---- src/Panorama/PanoramaMemento.cpp -+++ src/Panorama/PanoramaMemento.cpp -@@ -269,7 +269,7 @@ - } - setImageSize(vigra::Size2D(width, height)); - -- if (ext != "JPG" && ext != "JPEG") { -+ if (ext != "JPG" && ext != "JPEG" && ext != "JPE") { - return false; - } - diff --git a/hugin-lib64.patch b/hugin-lib64.patch index 1adc092..686103e 100644 --- a/hugin-lib64.patch +++ b/hugin-lib64.patch @@ -1,6 +1,6 @@ --- m4/ax_check_panotools.m4 +++ m4/ax_check_panotools.m4 -@@ -44,11 +44,7 @@ +@@ -57,11 +57,7 @@ passed=0; PANO_OLD_LDFLAGS=$LDFLAGS PANO_OLD_CPPFLAGS=$CPPFLAGS @@ -13,16 +13,3 @@ CPPFLAGS="$CPPFLAGS -I$PANO_HOME/include" AC_LANG_SAVE AC_LANG_C -@@ -76,11 +72,7 @@ - LIB_PANO="-lpano12" - PANO_FLAGS="-DHasPANO" - else -- if test "x$HCPU" = 'xamd64' ; then -- LIB_PANO="-L$PANO_HOME/lib64 -lpano12" -- else -- LIB_PANO="-L$PANO_HOME/lib -lpano12" -- fi -+ LIB_PANO="-L$PANO_HOME/lib64 -lpano12" - PANO_FLAGS="-I$PANO_HOME/include -DHasPANO" - fi - AC_DEFINE(HasPANO,1,Define if you have Panotools library (pano12)) diff --git a/hugin-mime-fix.patch b/hugin-mime-fix.patch deleted file mode 100644 index a0d857f..0000000 --- a/hugin-mime-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: src/hugin/Makefile.am -=================================================================== -RCS file: /cvsroot/hugin/hugin/src/hugin/Makefile.am,v -retrieving revision 1.14 -diff -u -r1.14 Makefile.am ---- src/hugin/Makefile.am 22 May 2005 02:35:23 -0000 1.14 -+++ src/hugin/Makefile.am 7 Jun 2005 19:43:43 -0000 -@@ -65,7 +65,7 @@ - if test -n "$(UPDATE_DESKTOP_DATABASE)"; then \ - if test -z "${DESTDIR}" ; then \ - echo "*** calling $(UPDATE_DESKTOP_DATABASE)"; \ -- $(UPDATE_DESKTOP_DATABASE) \"\"; \ -+ sh -c "$(UPDATE_DESKTOP_DATABASE)"; \ - else \ - echo "*** After installation call $(UPDATE_DESKTOP_DATABASE)"; \ - fi; \ diff --git a/hugin-no-mono-autorun.patch b/hugin-no-mono-autorun.patch deleted file mode 100644 index 0b2597c..0000000 --- a/hugin-no-mono-autorun.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/include/hugin/config_defaults.h -+++ src/include/hugin/config_defaults.h -@@ -97,7 +97,7 @@ - #define HUGIN_APKOLOR_EXE "" - #define HUGIN_APKOLOR_ARGS "" - --#define HUGIN_APSIFT_EXE "autopanog.exe" -+#define HUGIN_APSIFT_EXE "mono /usr/bin/autopanog.exe" - - - #endif diff --git a/hugin-string-compare.patch b/hugin-string-compare.patch new file mode 100644 index 0000000..f41f97d --- /dev/null +++ b/hugin-string-compare.patch @@ -0,0 +1,13 @@ +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 (scriptFile[0] == '-') { + if (newPano.loadPTScript(cin)) { + pano.setMemento(newPano); + } else { diff --git a/hugin.changes b/hugin.changes index 337f900..4fac427 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Jul 16 18:48:54 CEST 2007 - sbrabec@suse.cz + +- Updated to version 0.7_beta4. + * update panotools to latest version + * Albers equal area conic and Miller cylindrical projection + * Support for straight line control points + * Fixed running of Autopano-SIFT integration on windows + * work around bugs in wxWidgets (fixes double deletion of control + points when pressing the Del key) + * Force even values for width for 360 degree equirectangular + panoramas. + * Assistant panel, enables 3 click stitching (well, almost ;-) + * Center and rotate panorama by mouse clicks in preview window. + Also added a numerical transform dialog + * automatic straighten + * support for Lambert and Lambert Azimuthal projections + * separate crop tab replaces buggy crop dialog + * crop is saved in lens .ini files + * Rotated display of images in control point selector, depending + on the roll value + * allow images with and without alpha channels in the same + project + * option to open final panorama in image editor after stitching + * present output of command line utils in nice window + * many small bugfixes + * removed image center dialog + ------------------------------------------------------------------- Wed May 9 16:59:33 CEST 2007 - pgajdos@suse.cz diff --git a/hugin.spec b/hugin.spec index 5628dbf..e462ef6 100644 --- a/hugin.spec +++ b/hugin.spec @@ -1,5 +1,5 @@ # -# spec file for package hugin (Version 0.6.1) +# spec file for package hugin (Version 0.6.99.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,22 +11,22 @@ # norootforbuild Name: hugin -BuildRequires: SDL-devel boost-devel fftw-devel gcc-c++ libpano-devel libxml2 python-wxGTK update-desktop-files vigra wxGTK-devel zip -License: GNU General Public License (GPL) +BuildRequires: SDL-devel boost-devel fdupes fftw-devel gcc-c++ libpano-devel libxml2 licenses python-wxGTK update-desktop-files vigra wxGTK-devel zip +License: GPL v2 or later, The VIGRA Artistic License Group: Productivity/Graphics/Bitmap Editors -Autoreqprov: on Summary: Front-End for Panorama Tools -Version: 0.6.1 -Release: 60 -Source: %{name}-%{version}.tar.bz2 +Version: 0.6.99.4 +Release: 1 +%define _version 0.7_beta4 +Source: %{name}-%{_version}.tar.bz2 Patch2: hugin-fftw.patch Patch4: hugin-jpe.patch -Patch5: hugin-mime-fix.patch -Patch6: hugin-no-mono-autorun.patch Patch64: hugin-lib64.patch Patch11: hugin-0.5-autoconf.diff +Patch12: hugin-string-compare.patch URL: http://hugin.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: licenses %description hugin can be used to stitch multiple images together. The resulting @@ -47,24 +47,27 @@ Authors: Lyndon Hill %prep -%setup -q +%setup -q -n %{name}-%{_version} %patch2 %patch4 -%patch5 -%patch6 %if %_lib == lib64 %patch64 %endif %patch11 +%patch12 # Rename Spanish Catalan to Catalan. mv src/hugin/po/ca_ES.po src/hugin/po/ca.po -sed -i s/ca_ES/ca/ src/hugin/po/LINGUAS +# 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 %build ./bootstrap # Needed for hugin-0.6.1: export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure\ + --enable-shared\ + --disable-static\ --with-unicode=yes make %{?jobs:-j%jobs} @@ -74,6 +77,16 @@ make %{?jobs:-j%jobs} # 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} +for FILE in COPYING LICENCE LICENCE_JHEAD LICENCE_VIGRA ; do + MD5SUM=$(md5sum $FILE | sed 's/ .*//') + if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then + ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE + fi +done %clean rm -rf $RPM_BUILD_ROOT @@ -94,14 +107,37 @@ fi %{_bindir}/* %{_datadir}/hugin %{_datadir}/applications/hugin.desktop -# FIXME: Own directories to not depend on gnome-icon-theme -%{_datadir}/icons/* -#%{_datadir}/icons/gnome/48x48/mimetypes/*.png +%{_datadir}/icons/hicolor/48x48/mimetypes/*.png %{_datadir}/mime/packages/*.xml %{_datadir}/pixmaps/*.png %doc %{_mandir}/man?/* %changelog +* Mon Jul 16 2007 - sbrabec@suse.cz +- Updated to version 0.7_beta4. + * update panotools to latest version + * Albers equal area conic and Miller cylindrical projection + * Support for straight line control points + * Fixed running of Autopano-SIFT integration on windows + * work around bugs in wxWidgets (fixes double deletion of control + points when pressing the Del key) + * Force even values for width for 360 degree equirectangular + panoramas. + * Assistant panel, enables 3 click stitching (well, almost ;-) + * Center and rotate panorama by mouse clicks in preview window. + Also added a numerical transform dialog + * automatic straighten + * support for Lambert and Lambert Azimuthal projections + * separate crop tab replaces buggy crop dialog + * crop is saved in lens .ini files + * Rotated display of images in control point selector, depending + on the roll value + * allow images with and without alpha channels in the same + project + * option to open final panorama in image editor after stitching + * present output of command line utils in nice window + * many small bugfixes + * removed image center dialog * Wed May 09 2007 - pgajdos@suse.cz - removed gnome-icon-theme from BuildRequires [#247450] * Tue Jan 30 2007 - sbrabec@suse.cz