rpms/enblend/FC-5 enblend-without-glew.patch, NONE, 1.1 enblend.spec, NONE, 1.1 sources, 1.1, 1.2

Bruno Postle (bpostle) fedora-extras-commits at redhat.com
Mon Mar 26 20:39:25 UTC 2007 

Author: bpostle

Update of /cvs/extras/rpms/enblend/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26858/FC-5

Modified Files:
	sources 
Added Files:
	enblend-without-glew.patch enblend.spec 
Log Message:
Copied spec & patches from devel to FC-5 & FC-6


enblend-without-glew.patch:

--- NEW FILE enblend-without-glew.patch ---
Index: configure.in
===================================================================
RCS file: /cvsroot/enblend/enblend/configure.in,v
retrieving revision 1.29
diff -u -r1.29 configure.in
--- configure.in	27 Jan 2007 05:00:33 -0000	1.29
+++ configure.in	13 Mar 2007 23:46:31 -0000
@@ -21,7 +21,7 @@
 AC_CHECK_LIB(glut,glutInitDisplayMode,,AC_MSG_WARN([GLUT is required to compile enblend.]),[-lGL -lGLU])
 AC_CHECK_LIB(GLU,gluBeginCurve,,AC_MSG_WARN([libGLU is required to compile enblend.]),[])
 AC_CHECK_LIB(GL,glBegin,,AC_MSG_WARN([libGL is required to compile enblend.]),[])
-AC_CHECK_LIB(GLEW,glewInit,,AC_MSG_WARN([GLEW is required to compile enblend.]),[])
+AC_CHECK_LIB(GLEW,glewInit,,AC_MSG_WARN([GLEW not found gpu support disabled.]),[])
 #AC_CHECK_LIB(sh,main,,AC_MSG_WARN([libsh is required to compile enblend.]),[])
 #AC_CHECK_LIB(brook,main,,AC_MSG_WARN([BrookGPU runtime libraries are required to compile enblend.]),[-logl -lcpu -lgpu])
 
@@ -35,7 +35,7 @@
 AC_CHECK_HEADER(boost/pool/pool.hpp,,AC_MSG_WARN([boost header files are required to compile enblend.]))
 AC_CHECK_HEADER(lcms.h,,AC_MSG_WARN([lcms header files are required to compile enblend.]))
 AC_CHECK_HEADER(xmi.h,,AC_MSG_WARN([xmi header files are required to compile enblend.]))
-AC_CHECK_HEADER(GL/glew.h,,AC_MSG_WARN([glew header files are required to compile enblend.]))
+AC_CHECK_HEADER(GL/glew.h,,AC_MSG_WARN([glew header files not found gpu support disabled.]))
 AC_CHECK_HEADER(GL/glut.h,,AC_MSG_WARN([glut header files are required to compile enblend.]))
 #AC_CHECK_HEADER(GL/gl.h,,AC_MSG_WARN([OpenGL gl.h header file is required to compile enblend.]))
 #AC_CHECK_HEADER(GL/glx.h,,AC_MSG_WARN([OpenGL glx.h header file is required to compile enblend.]))
Index: src/anneal.h
===================================================================
RCS file: /cvsroot/enblend/enblend/src/anneal.h,v
retrieving revision 1.4
diff -u -r1.4 anneal.h
--- src/anneal.h	13 Feb 2007 04:05:50 -0000	1.4
+++ src/anneal.h	13 Mar 2007 23:46:32 -0000
@@ -42,7 +42,9 @@
 #include <math.h>
 #endif
 
+#ifdef HAVE_LIBGLEW
 #include "gpu.h"
+#endif
 #include "vigra/diff2d.hxx"
 #include "vigra/iteratoradapter.hxx"
 #include "vigra_ext/XMIWrapper.h"
@@ -260,7 +262,9 @@
         int iterationCount = 0;
         int iterationsPerTick = (numIterations+3) / 4;
 
+#ifdef HAVE_LIBGLEW
         if (UseGPU) configureGPUTextures(kMax, pointStateSpaces.size());
+#endif
 
         tCurrent = tInitial;
 
@@ -295,7 +299,9 @@
 
         }
 
+#ifdef HAVE_LIBGLEW
         if (UseGPU) clearGPUTextures();
+#endif
 
         if (visualizeStateSpaceImage) {
             // Remaining unconverged state space points
@@ -421,6 +427,7 @@
 
     }
 
+#ifdef HAVE_LIBGLEW
     //virtual void calculateStateProbabilitiesGPU() {
     inline void calculateStateProbabilitiesGPU() {
 
@@ -562,10 +569,12 @@
         }
 
     }
+#endif
 
     //virtual void iterate() {
     void iterate() {
 
+#ifdef HAVE_LIBGLEW
         if (UseGPU) {
             calculateStateProbabilitiesGPU();
 
@@ -592,8 +601,11 @@
             //}
 
         } else {
+#endif
             calculateStateProbabilities();
+#ifdef HAVE_LIBGLEW
         }
+#endif
 
         kMax = 1;
         for (unsigned int index = 0; index < pointStateSpaces.size(); ++index) {
Index: src/enblend.cc
===================================================================
RCS file: /cvsroot/enblend/enblend/src/enblend.cc,v
retrieving revision 1.62
diff -u -r1.62 enblend.cc
--- src/enblend.cc	27 Jan 2007 23:17:52 -0000	1.62
+++ src/enblend.cc	13 Mar 2007 23:46:33 -0000
@@ -119,7 +119,9 @@
 
 #include "common.h"
 #include "enblend.h"
+#ifdef HAVE_LIBGLEW
 #include "gpu.h"
+#endif
 
 #include "vigra/impex.hxx"
 #include "vigra/sized_int.hxx"
@@ -162,7 +164,9 @@
     cout << " -b kilobytes      Image cache block size (default=2MiB)" << endl;
     cout << " -c                Use CIECAM02 to blend colors" << endl;
     cout << " -g                Associated alpha hack for Gimp (ver. < 2) and Cinepaint" << endl;
+#ifdef HAVE_LIBGLEW
     cout << " --gpu             Use the graphics card to accelerate some computations." << endl;
+#endif
     cout << " -f WIDTHxHEIGHT   Manually set the size of the output image." << endl
          << "                   Useful for cropped and shifted input TIFF images," << endl
          << "                   such as those produced by Nona." << endl;
@@ -193,11 +197,13 @@
     // FIXME what if this occurs in a CFI atomic section?
     // This is no longer necessary, temp files are unlinked during creation.
     //CachedFileImageDirector::v().~CachedFileImageDirector();
+#ifdef HAVE_LIBGLEW
     if (UseGPU) {
         // FIXME what if this occurs in a GL atomic section?
         //cout << "Cleaning up GPU state..." << endl;
         wrapupGPU();
     }
+#endif
     #if !defined(__GW32C__) && !defined(_WIN32)
     struct sigaction action;
     action.sa_handler = SIG_DFL;
@@ -245,7 +251,9 @@
     list<char*>::iterator inputFileNameIterator;
 
     static struct option long_options[] = {
+#ifdef HAVE_LIBGLEW
             {"gpu", no_argument, &UseGPU, 1},
+#endif
             {"coarse-mask", no_argument, &CoarseMask, 1},
             {"fine-mask", no_argument, &CoarseMask, 0},
             {"optimize", no_argument, &OptimizeMask, 1},
@@ -473,9 +481,11 @@
         printUsageAndExit();
     }
 
+#ifdef HAVE_LIBGLEW
     if (UseGPU) {
         initGPU();
     }
+#endif
 
     if (MaskVectorizeDistance == 0) {
         MaskVectorizeDistance = CoarseMask ? 4 : 20;
@@ -829,9 +839,11 @@
     if (XYZProfile) cmsCloseProfile(XYZProfile);
     if (InputProfile) cmsCloseProfile(InputProfile);
 
+#ifdef HAVE_LIBGLEW
     if (UseGPU) {
         wrapupGPU();
     }
+#endif
 
     delete[] SaveMaskFileName;
     delete[] LoadMaskFileName;
Index: src/gpu.cc
===================================================================
RCS file: /cvsroot/enblend/enblend/src/gpu.cc,v
retrieving revision 1.2
diff -u -r1.2 gpu.cc
--- src/gpu.cc	27 Jan 2007 05:00:39 -0000	1.2
+++ src/gpu.cc	13 Mar 2007 23:46:33 -0000
@@ -21,6 +21,7 @@
 #include <iostream>
 
 #include "gpu.h"
+#ifdef HAVE_LIBGLEW
 
 using std::cerr;
 using std::cout;
@@ -288,3 +289,4 @@
     return true;
 }
 
+#endif
Index: src/gpu.h
===================================================================
RCS file: /cvsroot/enblend/enblend/src/gpu.h,v
retrieving revision 1.2
diff -u -r1.2 gpu.h
--- src/gpu.h	27 Jan 2007 05:00:39 -0000	1.2
+++ src/gpu.h	13 Mar 2007 23:46:33 -0000
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#ifdef HAVE_LIBGLEW
 #define GLEW_STATIC 1
 #include <GL/glew.h>
 #include <GL/glut.h>
@@ -39,5 +40,6 @@
 bool gpuGDAKernel(unsigned int k, unsigned int vars, double t, float *packedEData, float *packedPiData, float *packedOutData);
 bool clearGPUTextures();
 bool wrapupGPU(void);
+#endif
 
 #endif /* __GPU_H__ */


--- NEW FILE enblend.spec ---
Summary: Image Blending with Multiresolution Splines
Name: enblend
Version: 3.0
Release: 3%{?dist}
License: GPL
Group: Applications/Multimedia
Source: http://prdownloads.sourceforge.net/enblend/%{name}-%{version}.tar.gz
Patch0: enblend-without-glew.patch
URL: http://enblend.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtiff-devel boost-devel lcms-devel plotutils-devel
BuildRequires: freeglut-devel

%description
Enblend is a tool for compositing images. Given a set of images that overlap in
some irregular way, Enblend overlays them in such a way that the seam between
the images is invisible, or at least very difficult to see. Enblend does not
line up the images for you. Use a tool like Hugin to do that.

%prep
%setup -q
%patch0 -p0

%build
# one line fix for 64bit build
sed -i 's/kMax, stateProbabilities/kMax, (unsigned int)stateProbabilities/' src/anneal.h
%configure --disable-static
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO VIGRA_LICENSE
%{_bindir}/enblend
%{_mandir}/man1/enblend.1.gz

%changelog
* Tue Mar 20 2007 Bruno Postle <bruno at postle.net> 3.0-3
  - patch to build without glew library

* Sat Jan 28 2007 Bruno Postle <bruno at postle.net>
  - 3.0 release

* Tue Dec 13 2005 Bruno Postle <bruno at postle.net>
  - 2.5 release

* Tue Dec 06 2005 Bruno Postle <bruno at postle.net>
  - 2.4 release

* Mon Apr 18 2005 Bruno Postle <bruno at postle.net>
  - 2.3 release

* Mon Nov 15 2004 Bruno Postle <bruno at postle.net>
  - 2.1 release

* Mon Oct 18 2004 Bruno Postle <bruno at postle.net>
  - 2.0 release

* Wed Oct 13 2004 Bruno Postle <bruno at postle.net>
  - new build for fedora fc2

* Tue Jun 22 2004 Bruno Postle <bruno at postle.net>
  - found tarball of enblend-1.3 and updated to that

* Tue Jun 22 2004 Bruno Postle <bruno at postle.net>
  - added patch for reading nona multi-layer tiff files

* Tue Apr 27 2004 Bruno Postle <bruno at postle.net>
  - update to latest version

* Sat Apr 03 2004 Bruno Postle <bruno at postle.net>
  - update to latest version

* Tue Mar 09 2004 Bruno Postle <bruno at postle.net>
  - initial RPM

 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enblend/FC-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Mar 2007 23:14:32 -0000	1.1
+++ sources	26 Mar 2007 20:38:52 -0000	1.2
@@ -0,0 +1 @@
+f80a12ff91a6122c5ea0d102443929da  enblend-3.0.tar.gz

More information about the fedora-extras-commits mailing list