rpms/GREYCstoration/F-7 GREYCstoration-2.5.2-fixmakefile.patch, NONE, 1.1 GREYCstoration.png, NONE, 1.1 GREYCstoration.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thu Oct 11 01:13:01 UTC 2007

Author: deebs

Update of /cvs/pkgs/rpms/GREYCstoration/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13932/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	GREYCstoration-2.5.2-fixmakefile.patch GREYCstoration.png 
	GREYCstoration.spec 
Log Message:
new package


GREYCstoration-2.5.2-fixmakefile.patch:

--- NEW FILE GREYCstoration-2.5.2-fixmakefile.patch ---
diff -urN GREYCstoration-2.5.2.orig/src/Makefile GREYCstoration-2.5.2/src/Makefile
--- GREYCstoration-2.5.2.orig/src/Makefile	2007-03-30 22:06:54.000000000 +1000
+++ GREYCstoration-2.5.2/src/Makefile	2007-10-03 11:38:00.000000000 +1000
@@ -36,21 +36,22 @@
 CIMG_XRANDR_FLAGS = -Dcimg_use_xrandr -lXrandr
 
 # Uncomment to enable native support for PNG image files, using the PNG library.
-#CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz
+CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz
 
 # Uncomment to enable native support for JPEG image files, using the JPEG library.
-#CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg
+CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg
 
 # Uncomment to enable native support for TIFF image files, using the TIFF library.
-#CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff
+CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff
 
 # Uncomment to enable native support of most classical image file formats, using the Magick++ library.
 #CIMG_MAGICK_FLAGS = -Dcimg_use_magick `Magick++-config --cppflags` `Magick++-config --cxxflags` `Magick++-config --ldflags` `Magick++-config --libs`
 
 # Uncomment to enable faster Discrete Fourier Transform computation, using the FFTW3 library
-#CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
+CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
 
 EXTRA_FLAGS = $(CIMG_X11_FLAGS) $(CIMG_STRICT_FLAGS) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS)
+ARCHFLAGS = $(CIMG_X11_FLAGS) $(CIMG_STRICT_FLAGS) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS)
 
 # Compilation rules
 .cpp:
@@ -58,7 +59,6 @@
 	@echo "** Compiling '$* ($(CIMG_VERSION))' with '`$(CC) -v 2>&1 | grep version`'"
 	@echo
 	$(CC) -o $* $< $(CFLAGS) $(LDFLAGS) $(ARCHFLAGS)
-	strip $*
 menu:
 	@echo
 	@echo "CImg Library $(CIMG_VERSION) : Examples"
@@ -93,7 +93,6 @@
 	@echo "** Compiling 'greycstoration4gimp ($(CIMG_VERSION))' with '`$(CC) -v 2>&1 | grep version`'"
 	@echo
 	$(CC) -o greycstoration4gimp greycstoration4gimp.cpp `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread -O3
-	strip greycstoration4gimp
 # Linux/Mac OSX targets
 linux:
 	make "ARCHFLAGS=$(EXTRA_FLAGS)" all


--- NEW FILE GREYCstoration.spec ---
Name:           GREYCstoration
Version:        2.5.2
Release:        6%{?dist}
Summary:        An image denoising and interpolation tool
Group:          Applications/Multimedia
License:        CeCILL
URL:            http://www.greyc.ensicaen.fr/~dtschump/greycstoration/index.html
Source0:        http://www.greyc.ensicaen.fr/~dtschump/greycstoration/data/%{name}-%{version}.zip
Source1:        %{name}.png
Patch0:         GREYCstoration-2.5.2-fixmakefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gimp-devel gimp
BuildRequires:  desktop-file-utils
BuildRequires:  libpng-devel libjpeg-devel libtiff-devel fftw-devel

%description
GREYCstoration is an image regularization algorithm which is able to process
a color image by locally removing small variations of pixel intensities while
preserving significant global image features, such as edges and corners. The
most direct application of image regularization is image denoising. By
extension, it can also be used to inpaint or resize images.


%package gimp
Summary:        GREYCstoration image denoising and interpolation plugin for gimp
Group:          Applications/Multimedia
Requires:       gimp %{name}


%description gimp
GREYCstoration is an image regularization algorithm which is able to process
a color image by locally removing small variations of pixel intensities while
preserving significant global image features, such as edges and corners. The
most direct application of image regularization is image denoising. By
extension, it can also be used to inpaint or resize images.

This package contains the GREYCstoration plugin for gimp.


%package gui
Summary:        GREYCstoration image denoising and interpolation tool
Group:          Applications/Multimedia
Requires:       %{name} hicolor-icon-theme tcl


%description gui
GREYCstoration is an image regularization algorithm which is able to process
a color image by locally removing small variations of pixel intensities while
preserving significant global image features, such as edges and corners. The
most direct application of image regularization is image denoising. By
extension, it can also be used to inpaint or resize images.

This package contains the GREYCstoration GUI.


%prep
%setup -q
%patch0 -p1
# Include path for CImg.h is wrong, fix it.
sed -i -r "s|#include \"../CImg.h\"|#include \"CImg.h\"|" src/greycstoration*.cpp
iconv -f iso-8859-1 -t utf-8 Licence_CeCILL_V2-en.txt > Licence_CeCILL_V2-en.txt.conv
mv Licence_CeCILL_V2-en.txt.conv Licence_CeCILL_V2-en.txt
# Fix lib path on lib64 systems
%ifarch ppc64 x86_64
  sed -ir "s|/lib|/lib64|" src/Makefile
%endif


%build
make -C src %{?_smp_mflags} CFLAGS="%{optflags}" all

# Build desktop icon
cat >%{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=GREYCstoration
GenericName=(Image noise tool)
Comment=%{summary}
Exec=%{_bindir}/%{name}_gui.tcl
Icon=%{name}.png
Terminal=false
Type=Application
StartupNotify=false
Categories=Graphics;2DGraphics;RasterGraphics;
EOF


%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_libdir}/gimp/2.0/plug-ins/
mkdir -p %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/96x96/apps
install -m0755 src/greycstoration %{buildroot}%{_bindir}/
install -m0755 src/greycstoration4integration %{buildroot}%{_bindir}/
install -m0755 src/greycstoration4gimp %{buildroot}%{_libdir}/gimp/2.0/plug-ins/
install -m0755 GREYCstoration_gui.tcl %{buildroot}%{_bindir}
install -m0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/96x96/apps
desktop-file-install \
        --vendor fedora \
        --dir %{buildroot}%{_datadir}/applications \
        %{name}.desktop

%clean
rm -rf %{buildroot}


%post gui
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun gui
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root)
%doc README.txt
%doc Licence_CeCILL_V2-en.txt
%{_bindir}/greycstoration
%{_bindir}/greycstoration4integration

%files gimp
%{_libdir}/gimp/2.0/plug-ins/greycstoration4gimp

%files gui
%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop
%{_bindir}/%{name}_gui.tcl

%changelog
* Tue Oct 11 2007 Marc Bradshaw <packages at marcbradshaw.co.uk> 2.5.2-6
- Source URL Change

* Mon Oct 10 2007 Marc Bradshaw <packages at marcbradshaw.co.uk> 2.5.2-5
- Specfile fixes

* Thu Oct 04 2007 Marc Bradshaw <packages at marcbradshaw.co.uk> 2.5.2-4
- Fixed Buildroot, Patch, Build and Setup
- Added GUI
- Added support for more image formats in Makefile
- Fixed build on systems with lib64

* Sun Sep 30 2007 Marc Bradshaw <packages at marcbradshaw.co.uk> 2.5.2-3
- Patch makefile regarding stripped binaries

* Fri Sep 28 2007 Marc Bradshaw <packages at marcbradshaw.co.uk> 2.5.2-2
- Missing build require added for gimp

* Fri Sep 28 2007 Marc Bradshaw <packages at marcbradshaw.co.uk> 2.5.2-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GREYCstoration/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Oct 2007 00:59:59 -0000	1.1
+++ .cvsignore	11 Oct 2007 01:12:29 -0000	1.2
@@ -0,0 +1 @@
+GREYCstoration-2.5.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GREYCstoration/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Oct 2007 00:59:59 -0000	1.1
+++ sources	11 Oct 2007 01:12:29 -0000	1.2
@@ -0,0 +1 @@
+83a64253424f06753e17c00163e41ffc  GREYCstoration-2.5.2.zip


