From 271e35ef492137fff371fdca51629a7cb0946d1e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 2 Jun 2008 03:31:46 +0000 Subject: [PATCH 1/5] Initialize branch F-8 for ale --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From b57c85c41f510ebe898bc835a9cad6a9f2af54d2 Mon Sep 17 00:00:00 2001 From: "Douglas E. Warner" Date: Wed, 18 Jun 2008 17:59:31 +0000 Subject: [PATCH 2/5] adding ale --- .cvsignore | 1 + ale-0.9.0-gcc-4.3.patch | 11 ++++++ ale.spec | 87 +++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 100 insertions(+) create mode 100644 ale-0.9.0-gcc-4.3.patch create mode 100644 ale.spec diff --git a/.cvsignore b/.cvsignore index e69de29..de30d24 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +ale-0.9.0.1.tar.gz diff --git a/ale-0.9.0-gcc-4.3.patch b/ale-0.9.0-gcc-4.3.patch new file mode 100644 index 0000000..248d29a --- /dev/null +++ b/ale-0.9.0-gcc-4.3.patch @@ -0,0 +1,11 @@ +diff -ruN ale-0.9.0/ui/ui.h ale-0.9.0-new/ui/ui.h +--- ale-0.9.0/ui/ui.h 2008-04-14 19:55:21.000000000 -0400 ++++ ale-0.9.0-new/ui/ui.h 2008-04-21 13:27:28.000000000 -0400 +@@ -21,6 +21,7 @@ + #ifndef __ui_h__ + #define __ui_h__ + ++#include + #include + #include + #include diff --git a/ale.spec b/ale.spec new file mode 100644 index 0000000..f5d0c0a --- /dev/null +++ b/ale.spec @@ -0,0 +1,87 @@ +Name: ale +Version: 0.9.0.1 +Release: 1%{?dist} +Summary: Combines multiple inputs of the same scene + +Group: Applications/Multimedia +License: GPLv3 +URL: http://auricle.dyndns.org/ALE/ +Source0: http://auricle.dyndns.org/ALE/download/%{name}-%{version}.tar.gz +Patch0: ale-0.9.0-gcc-4.3.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: ImageMagick-devel +BuildRequires: fftw-devel >= 3.0.0 +Requires: perl-Image-ExifTool +Requires: dcraw + +%description +ALE is an image-processing program used for tasks such as image mosaicking, +super-resolution, deblurring, noise reduction, anti-aliasing, and scene +reconstruction. Its principle of operation is synthetic capture, combining +multiple inputs representing the same scene. + + +%prep +%setup -q +%patch0 -p1 + + +%build +%configure \ + --enable-wmx \ + --with-hashmap=gnu \ + --with-imagemagick \ + --with-fftw3 +make %{_smp_mflags} + + +%install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install + +# install scripts +%{__install} -p -m 0755 scripts/ale-psf-calibrate %{buildroot}%{_bindir} +%{__install} -p -m 0755 scripts/cpfmerge %{buildroot}%{_bindir} +%{__install} -p -m 0755 scripts/sko2cpf %{buildroot}%{_bindir} +%{__install} -p -m 0755 scripts/transform %{buildroot}%{_bindir}/ale-transform + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-, root, root) +%doc AUTHORS COPYING ChangeLog NEWS README TODO +%{_bindir}/* +%{_mandir}/man1/*.1* + + +%changelog +* Wed Jun 18 2008 Douglas E. Warner 0.9.0.1-1 +- updating to ale 0.9.0.1 + +* Fri May 09 2008 Douglas E. Warner 0.9.0-3 +- adding Requires perl-Image-ExifTool, dcraw + +* Mon Apr 21 2008 Douglas E. Warner 0.9.0-2 +- adding additional configuration options (imagemagick, fftw3, wmx, + gnu hashmap) and build requires to satisfy them +- installing scripts + +* Mon Apr 21 2008 Douglas E. Warner 0.9.0-1 +- update to 0.9.0 +- added GCC 4.3 compilation patch + +* Wed Mar 19 2008 Douglas E. Warner 0.8.11-1 +- update to 0.8.11 +- updating spec to fedora standards +- updating License to GPLv3 +- removing Requires ldconfig +- shortened summary +- added dist tag + +* Mon Apr 30 2007 Douglas E. Warner 0.8.7-1 +- Initial RPM release. + diff --git a/sources b/sources index e69de29..99a9811 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +a4e595cfa52485eebd57e4de112b0609 ale-0.9.0.1.tar.gz From a3c1db8fc866f7e0d04ea61cce9ac68b8455c5b6 Mon Sep 17 00:00:00 2001 From: "Douglas E. Warner" Date: Wed, 24 Sep 2008 14:02:21 +0000 Subject: [PATCH 3/5] - updated gcc4.3 patch for 0.9.0.1 to compile w/ new fuzz settings --- ale-0.9.0-gcc-4.3.patch | 11 ----------- ale-0.9.0.1-gcc43.patch | 11 +++++++++++ ale.spec | 8 ++++++-- 3 files changed, 17 insertions(+), 13 deletions(-) delete mode 100644 ale-0.9.0-gcc-4.3.patch create mode 100644 ale-0.9.0.1-gcc43.patch diff --git a/ale-0.9.0-gcc-4.3.patch b/ale-0.9.0-gcc-4.3.patch deleted file mode 100644 index 248d29a..0000000 --- a/ale-0.9.0-gcc-4.3.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN ale-0.9.0/ui/ui.h ale-0.9.0-new/ui/ui.h ---- ale-0.9.0/ui/ui.h 2008-04-14 19:55:21.000000000 -0400 -+++ ale-0.9.0-new/ui/ui.h 2008-04-21 13:27:28.000000000 -0400 -@@ -21,6 +21,7 @@ - #ifndef __ui_h__ - #define __ui_h__ - -+#include - #include - #include - #include diff --git a/ale-0.9.0.1-gcc43.patch b/ale-0.9.0.1-gcc43.patch new file mode 100644 index 0000000..87c8e27 --- /dev/null +++ b/ale-0.9.0.1-gcc43.patch @@ -0,0 +1,11 @@ +diff -ruN ale-0.9.0.1-orig/ui/ui.h ale-0.9.0.1/ui/ui.h +--- ale-0.9.0.1-orig/ui/ui.h 2008-06-13 18:20:56.000000000 -0400 ++++ ale-0.9.0.1/ui/ui.h 2008-09-24 09:32:51.000000000 -0400 +@@ -21,6 +21,7 @@ + #ifndef __ui_h__ + #define __ui_h__ + ++#include + #include + #include + #include diff --git a/ale.spec b/ale.spec index f5d0c0a..d58e344 100644 --- a/ale.spec +++ b/ale.spec @@ -1,13 +1,14 @@ Name: ale Version: 0.9.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Combines multiple inputs of the same scene Group: Applications/Multimedia License: GPLv3 URL: http://auricle.dyndns.org/ALE/ Source0: http://auricle.dyndns.org/ALE/download/%{name}-%{version}.tar.gz -Patch0: ale-0.9.0-gcc-4.3.patch +# sent patch to upstream mailing list on 2008.09.23 +Patch0: ale-0.9.0.1-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ImageMagick-devel @@ -59,6 +60,9 @@ rm -rf %{buildroot} %changelog +* Wed Sep 23 2008 Douglas E. Warner 0.9.0.1-2 +- updated gcc4.3 patch for 0.9.0.1 to compile w/ new fuzz settings + * Wed Jun 18 2008 Douglas E. Warner 0.9.0.1-1 - updating to ale 0.9.0.1 From ed263421f2adc2540dfcd1830b6f97a7b8a760bc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:00 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6d5baef..0ea7c95 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: ale -# $Id$ +# $Id: Makefile,v 1.1 2008/06/02 03:31:07 kevin Exp $ NAME := ale SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 7924c522b808a3b822c5f27792e9cab544f8b5fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:41:10 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0ea7c95..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ale -# $Id: Makefile,v 1.1 2008/06/02 03:31:07 kevin Exp $ -NAME := ale -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8