debian/patches-repack/00-win32helpers.patch

   1 diff a/Makefile.am b/Makefile.am
   2 --- a/Makefile.am
   3 +++ b/Makefile.am
   4 @@ -1,2 +1,2 @@
   5 -EXTRA_DIST = VIGRA_LICENSE README_WINDOWS.txt enblend.sln enblend_msvc2003.sln enblend_msvc2008.sln
   6 +EXTRA_DIST = VIGRA_LICENSE README_WINDOWS.txt
   7  SUBDIRS = include doc src
   8 diff a/configure.in b/configure.in
   9 --- a/configure.in
  10 +++ b/configure.in
  11 @@ -140,8 +140,7 @@
  12                   include/vigra/Makefile
  13                   include/vigra_ext/Makefile
  14                   src/Makefile
  15 -                 src/vigra_impex/Makefile
  16 -                 src/win32helpers/Makefile])
  17 +                 src/vigra_impex/Makefile])
  18  AC_OUTPUT
  19
  20  AC_MSG_RESULT([
  21 diff a/src/Makefile.am b/src/Makefile.am
  22 --- a/src/Makefile.am
  23 +++ b/src/Makefile.am
  24 @@ -1,5 +1,4 @@
  25 -EXTRA_DIST = enblend.vcproj enblend_msvc2003.vcproj enblend_msvc2008.vcproj enfuse.vcproj enfuse_msvc2003.vcproj enfuse_msvc2008.vcproj
  26 -SUBDIRS = vigra_impex win32helpers
  27 +SUBDIRS = vigra_impex
  28  bin_PROGRAMS = enblend enfuse
  29  enblend_SOURCES = anneal.h assemble.h blend.h bounds.h common.h enblend.h enblend.cc fixmath.h float_cast.h gpu.cc gpu.h mask.h nearest.h numerictraits.h path.h pyramid.h
  30  enblend_LDFLAGS = -ffast-math
  31 diff a/src/enblend.cc b/src/enblend.cc
  32 --- a/src/enblend.cc
  33 +++ b/src/enblend.cc
  34 @@ -21,11 +21,6 @@
  35  #include <config.h>
  36  #endif
  37
  38 -#ifdef _MSC_VER
  39 -#include <win32helpers\win32config.h>
  40 -#define isnan _isnan
  41 -#endif // _MSC_VER
  42 -
  43  // Defines lrint for fast fromRealPromotes
  44  #include "float_cast.h"
  45
  46 @@ -49,14 +44,7 @@
  47  #include <list>
  48  #include <vector>
  49
  50 -#ifndef _WIN32
  51  #include <getopt.h>
  52 -#else
  53 -//extern "C" int getopt(int nargc, char** nargv, char* ostr);
  54 -extern "C" {
  55 -#include <win32helpers/getopt_long.h>
  56 -}
  57 -#endif
  58
  59  extern "C" char *optarg;
  60  extern "C" int optind;
  61 diff a/src/enfuse.cc b/src/enfuse.cc
  62 --- a/src/enfuse.cc
  63 +++ b/src/enfuse.cc
  64 @@ -21,11 +21,6 @@
  65  #include <config.h>
  66  #endif
  67
  68 -#ifdef _MSC_VER
  69 -#include <win32helpers\win32config.h>
  70 -#define isnan _isnan
  71 -#endif // _MSC_VER
  72 -
  73  // Defines lrint for fast fromRealPromotes
  74  #include "float_cast.h"
  75
  76 @@ -49,14 +44,7 @@
  77  #include <list>
  78  #include <vector>
  79
  80 -#ifndef _WIN32
  81  #include <getopt.h>
  82 -#else
  83 -//extern "C" int getopt(int nargc, char** nargv, char* ostr);
  84 -extern "C" {
  85 -#include <win32helpers/getopt_long.h>
  86 -}
  87 -#endif
  88
  89  extern "C" char *optarg;
  90  extern "C" int optind;
  91 diff a/src/vigra_impex/Makefile.am b/src/vigra_impex/Makefile.am
  92 --- a/src/vigra_impex/Makefile.am
  93 +++ b/src/vigra_impex/Makefile.am
  94 @@ -1,4 +1,3 @@
  95 -EXTRA_DIST = vigra_impex.vcproj vigra_impex_msvc2003.vcproj vigra_impex_msvc2008.vcproj
  96  noinst_LIBRARIES = libvigra_impex.a
  97  libvigra_impex_a_SOURCES = auto_file.hxx bmp.cxx bmp.hxx byteorder.cxx byteorder.hxx codecmanager.cxx codecmanager.hxx error.hxx gif.cxx gif.hxx hdr.cxx hdr.hxx iccjpeg.c iccjpeg.h imageinfo.cxx jpeg.cxx jpeg.hxx png.cxx png.hxx pnm.cxx pnm.hxx rgbe.c rgbe.h sun.cxx sun.hxx tiff.cxx tiff.hxx viff.cxx viff.hxx void_vector.cxx void_vector.hxx exr.cxx exr.hxx
  98  #libvigra_impex_a_CXXFLAGS = -I${top_srcdir}/include -O3 -Wall -DHasPNG -DHasJPEG -DHasTIFF