rpm/hugin
SHA256
1
0
Fork 0
forked from pool/hugin
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=1

Browse Source
This commit is contained in:
OBS User unknown 2007-04-16 02:31:26 +00:00 committed by Git OBS Bridge
commit 52a7d9f4a5
12 changed files with 566 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

20
hugin-0.5-autoconf.diff Normal file
View File

@ -0,0 +1,20 @@
--- 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
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

3
hugin-0.6.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:18546d42ef15154246d5b84ebde847aa2cf003c6305cc64a17cc5396db346ae7
size 2151921

32
hugin-fftw.patch Normal file
View File

@ -0,0 +1,32 @@
--- 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

59
hugin-jpe.patch Normal file
View File

@ -0,0 +1,59 @@
Index: src/Panorama/PanoramaMemento.cpp
================================================================================
--- 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
@@ -709,7 +709,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 c=0;
initLensFromFile(pano.getImage(imgNr).getFilename().c_str(), c, lens);
--- src/hugin/MainFrame.cpp
+++ src/hugin/MainFrame.cpp
@@ -93,6 +93,8 @@
wxFileName file(filenames[0]);
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 ||
@@ -614,7 +616,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 (*)|*"));
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;
}

28
hugin-lib64.patch Normal file
View File

@ -0,0 +1,28 @@
--- m4/ax_check_panotools.m4
+++ m4/ax_check_panotools.m4
@@ -44,11 +44,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
@@ -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))

16
hugin-mime-fix.patch Normal file
View File

@ -0,0 +1,16 @@
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; \

11
hugin-no-mono-autorun.patch Normal file
View File

@ -0,0 +1,11 @@
--- 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

182
hugin.changes Normal file
View File

@ -0,0 +1,182 @@
-------------------------------------------------------------------
Tue Jan 30 14:03:16 CET 2007 - sbrabec@suse.cz
- Removed references to /opt/gnome.
-------------------------------------------------------------------
Fri Jan 26 01:45:26 CET 2007 - ro@suse.de
- accept gettext 0.16 ...
-------------------------------------------------------------------
Sat Oct 21 13:21:34 CEST 2006 - schwab@suse.de
- Fix bogus version check.
-------------------------------------------------------------------
Wed Aug 23 12:47:12 CEST 2006 - postadal@suse.cz
- updated to version 0.6.1
* suport for HDR file (log or gamma mapping)
* reduced memory usage, better image caching strategy
* fixed crashes and hangs when using the preview auto update
* vignetting correction estimation speed up
* projection can be changed in preview
-------------------------------------------------------------------
Thu Aug 17 19:10:04 CEST 2006 - postadal@suse.cz
- updated to version 0.6
* copy ICC profiles from input images to output
* added vignetting correction and brighness correction during stitching
by addition or division with a flatfield image or an radial polynomial
* estimate the vignetting polynomial directly from the overlapping images
(experimental)
* multithreaded remapping for hugin and nona
* support for dcraw 16 bit .ppm files
* disabled PTOptimizer progress display on OSX
* added tool fulla (see man pages), for distortion, TCA and vignetting
correction (can use old version PTLens database)
* added Czech translation
- removed obsoleted patches: hugin-xqual.patch, filedialog-close-crash.patch
- added zip to Buildrequires
-------------------------------------------------------------------
Mon Aug 7 23:24:15 CEST 2006 - cthiel@suse.de
- fix build
-------------------------------------------------------------------
Tue Jul 4 08:02:23 CEST 2006 - cthiel@suse.de
- fix build
-------------------------------------------------------------------
Mon Mar 20 16:10:18 CET 2006 - sbrabec@suse.cz
- Fixed add images close dialog crash (#156487).
-------------------------------------------------------------------
Thu Mar 9 18:23:47 CET 2006 - bk@suse.de
- Use explicit gcc-c++ in BuildRequires (was implicit by SDL-devel)
-------------------------------------------------------------------
Wed Jan 25 21:36:30 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Thu Jan 19 16:40:44 CET 2006 - sbrabec@suse.cz
- Removed obsolete pywxrc patch (#143258).
-------------------------------------------------------------------
Thu Jan 12 13:02:13 CET 2006 - sbrabec@suse.cz
- Updated to version 0.5.
-------------------------------------------------------------------
Tue Nov 8 01:58:09 CET 2005 - ro@suse.de
- remove some extra qualifications to fix build with gcc-4.1
-------------------------------------------------------------------
Tue Oct 25 15:37:15 CEST 2005 - yxu@suse.de
- fixed missing part of function
-------------------------------------------------------------------
Thu Sep 22 16:11:32 CEST 2005 - sbrabec@suse.cz
- Updated to version 0.5-rc2.
-------------------------------------------------------------------
Wed Aug 17 16:49:24 CEST 2005 - sbrabec@suse.cz
- Work without binfmt mono bindings (#93498).
-------------------------------------------------------------------
Fri Aug 5 14:51:18 CEST 2005 - sbrabec@suse.cz
- Updated to version 0.5.cvs050602.
-------------------------------------------------------------------
Thu Jul 21 16:21:54 CEST 2005 - nadvornik@suse.cz
- added libpano-devel to nfb
-------------------------------------------------------------------
Wed May 25 14:30:27 CEST 2005 - mcihar@suse.cz
- fix build on lib64 systems
-------------------------------------------------------------------
Fri May 20 10:18:19 CEST 2005 - mcihar@suse.cz
- update to 0.5-rc1
-------------------------------------------------------------------
Mon Apr 18 11:39:21 CEST 2005 - mcihar@suse.de
- add missing build dependencies on SDL (due to wxGTK)
-------------------------------------------------------------------
Thu Apr 14 16:21:09 CEST 2005 - mcihar@suse.cz
- cvs update
- fix compilation
-------------------------------------------------------------------
Thu Feb 17 16:29:26 CET 2005 - mcihar@suse.cz
- cvs update
-------------------------------------------------------------------
Fri Feb 4 13:01:59 CET 2005 - mcihar@suse.cz
- cvs update
-------------------------------------------------------------------
Tue Jan 04 12:58:40 CET 2005 - mcihar@suse.cz
- fix build on lib64 arches
-------------------------------------------------------------------
Wed Dec 22 17:05:40 CET 2004 - mcihar@suse.cz
- cvs update and patches reorganisation
-------------------------------------------------------------------
Mon Nov 22 17:39:14 CET 2004 - ro@suse.de
- fix build with current wxGTK
-------------------------------------------------------------------
Thu Sep 30 12:48:14 CEST 2004 - mcihar@suse.cz
- removed also SIFT header files and license from tarball (bug #46504)
-------------------------------------------------------------------
Tue Sep 21 17:10:43 CEST 2004 - mskibbe@suse.de
- change desktopfile
-------------------------------------------------------------------
Wed Aug 11 11:29:07 CEST 2004 - mcihar@suse.cz
- removed keypoints, since it uses patented SIFT code
- fixed compilation on x86_64
- reorganised patches
- no more patching for wx-config, use wrapper instead
-------------------------------------------------------------------
Mon Aug 02 17:24:15 CEST 2004 - mcihar@suse.cz
- update to latest released snapshot
- make nona default stitcher as we can not ship PTStitcher
-------------------------------------------------------------------
Fri Jul 30 10:57:47 CEST 2004 - mcihar@suse.cz
- initial packaging

191
hugin.spec Normal file
View File

@ -0,0 +1,191 @@
#
# spec file for package hugin (Version 0.6.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: hugin
BuildRequires: SDL-devel boost-devel fftw-devel gcc-c++ gnome-icon-theme libpano-devel libxml2 python-wxGTK update-desktop-files vigra wxGTK-devel zip
License: Artistic License, GNU General Public License (GPL)
Group: Productivity/Graphics/Bitmap Editors
Autoreqprov: on
Summary: Front-End for Panorama Tools
Version: 0.6.1
Release: 39
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
URL: http://hugin.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
hugin can be used to stitch multiple images together. The resulting
image can span 360 degrees. Another common use is the creation of very
high resolution pictures by combining multiple images.
Authors:
--------
Pablo d'Angelo <pablo.dangelo@web.de>
Alexandre Jenny
Kai-Uwe Behrmann <ku.b@gmx.de>
Bruno Postle
Helmut Dersch
Ben Allfree
Stan Birchfield
Lyndon Hill
%prep
%setup -q
%patch2
%patch4
%patch5
%patch6
%if %_lib == lib64
%patch64
%endif
%patch11
# 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
%build
./bootstrap
# Needed for hugin-0.6.1:
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure\
--with-unicode=yes
make %{?jobs:-j%jobs}
%install
%makeinstall
%suse_update_desktop_file %{name} Graphics 2DGraphics
# locales
%{find_lang} %{name}
%{find_lang} nona_gui %{name}.lang
%clean
rm -rf $RPM_BUILD_ROOT
%post
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
%postun
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
%files -f %{name}.lang
%defattr(-,root,root)
%doc BUGS AUTHORS COPYING HACKING LICENCE LICENCE_JHEAD LICENCE_VIGRA README TODO
%{_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}/mime/packages/*.xml
%{_datadir}/pixmaps/*.png
%doc %{_mandir}/man?/*
%changelog -n hugin
* Tue Jan 30 2007 - sbrabec@suse.cz
- Removed references to /opt/gnome.
* Fri Jan 26 2007 - ro@suse.de
- accept gettext 0.16 ...
* Sat Oct 21 2006 - schwab@suse.de
- Fix bogus version check.
* Wed Aug 23 2006 - postadal@suse.cz
- updated to version 0.6.1
* suport for HDR file (log or gamma mapping)
* reduced memory usage, better image caching strategy
* fixed crashes and hangs when using the preview auto update
* vignetting correction estimation speed up
* projection can be changed in preview
* Thu Aug 17 2006 - postadal@suse.cz
- updated to version 0.6
* copy ICC profiles from input images to output
* added vignetting correction and brighness correction during stitching
by addition or division with a flatfield image or an radial polynomial
* estimate the vignetting polynomial directly from the overlapping images
(experimental)
* multithreaded remapping for hugin and nona
* support for dcraw 16 bit .ppm files
* disabled PTOptimizer progress display on OSX
* added tool fulla (see man pages), for distortion, TCA and vignetting
correction (can use old version PTLens database)
* added Czech translation
- removed obsoleted patches: hugin-xqual.patch, filedialog-close-crash.patch
- added zip to Buildrequires
* Mon Aug 07 2006 - cthiel@suse.de
- fix build
* Tue Jul 04 2006 - cthiel@suse.de
- fix build
* Mon Mar 20 2006 - sbrabec@suse.cz
- Fixed add images close dialog crash (#156487).
* Thu Mar 09 2006 - bk@suse.de
- Use explicit gcc-c++ in BuildRequires (was implicit by SDL-devel)
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Jan 19 2006 - sbrabec@suse.cz
- Removed obsolete pywxrc patch (#143258).
* Thu Jan 12 2006 - sbrabec@suse.cz
- Updated to version 0.5.
* Tue Nov 08 2005 - ro@suse.de
- remove some extra qualifications to fix build with gcc-4.1
* Tue Oct 25 2005 - yxu@suse.de
- fixed missing part of function
* Thu Sep 22 2005 - sbrabec@suse.cz
- Updated to version 0.5-rc2.
* Wed Aug 17 2005 - sbrabec@suse.cz
- Work without binfmt mono bindings (#93498).
* Fri Aug 05 2005 - sbrabec@suse.cz
- Updated to version 0.5.cvs050602.
* Thu Jul 21 2005 - nadvornik@suse.cz
- added libpano-devel to nfb
* Wed May 25 2005 - mcihar@suse.cz
- fix build on lib64 systems
* Fri May 20 2005 - mcihar@suse.cz
- update to 0.5-rc1
* Mon Apr 18 2005 - mcihar@suse.de
- add missing build dependencies on SDL (due to wxGTK)
* Thu Apr 14 2005 - mcihar@suse.cz
- cvs update
- fix compilation
* Thu Feb 17 2005 - mcihar@suse.cz
- cvs update
* Fri Feb 04 2005 - mcihar@suse.cz
- cvs update
* Tue Jan 04 2005 - mcihar@suse.cz
- fix build on lib64 arches
* Wed Dec 22 2004 - mcihar@suse.cz
- cvs update and patches reorganisation
* Mon Nov 22 2004 - ro@suse.de
- fix build with current wxGTK
* Thu Sep 30 2004 - mcihar@suse.cz
- removed also SIFT header files and license from tarball (bug #46504)
* Tue Sep 21 2004 - mskibbe@suse.de
- change desktopfile
* Wed Aug 11 2004 - mcihar@suse.cz
- removed keypoints, since it uses patented SIFT code
- fixed compilation on x86_64
- reorganised patches
- no more patching for wx-config, use wrapper instead
* Mon Aug 02 2004 - mcihar@suse.cz
- update to latest released snapshot
- make nona default stitcher as we can not ship PTStitcher
* Fri Jul 30 2004 - mcihar@suse.cz
- initial packaging

0
ready Normal file
View File