@@ -23,9 +23,7 @@

 Source2:        Licence_CeCILL_V2-en.txt

 Patch1:         %{name}-fix_no_return_in_nonvoid_function.patch

 Patch2:         wxcam-fix_desktop_file.patch

-%if 0%{?suse_version} <= 1140

-Patch3:         remove-libv4l1-videdev.h.patch

-%endif

+Patch4:         CImg-139.h.patch

 Buildrequires:  gcc-c++ pkg-config perl-XML-Parser update-desktop-files

 BuildRequires:  gtk2-devel libglade2-devel libtiff-devel libjpeg-devel 

 Buildrequires:  xvid-devel intltool alsa-devel 

@@ -56,15 +54,18 @@

 %patch1 -p1

 %patch2 -p0

-%if 0%{?suse_version} <= 1140

-%patch3 -p1

-%endif

+%patch4 -p0

 # set some reasonable permissions for documentation files

 chmod 0644 COPYING 

 %build

+%if 0%{?suse_version} > 1140

+%else

+export CFLAGS="$RPM_OPT_FLAGS -DHAVE_CAMV4L"

+export CXXFLAGS="$RPM_OPT_FLAGS -DHAVE_CAMV4L"

+%endif

 %configure --docdir=%{_defaultdocdir}

 %__make %{?_smp_mflags} V=1

​

@@ -1,28 +0,0 @@

---- wxcam-1.1/src/v4l.h.bak    2012-03-07 22:04:36.850877420 +0100

-+++ wxcam-1.1/src/v4l.h    2012-03-07 22:04:53.200831746 +0100

-@@ -24,11 +24,7 @@

- #include <unistd.h>

- #include <fcntl.h>

- #include <sys/mman.h>

--#ifdef HAVE_CAMV4L 

- #include <linux/videodev.h>

--#else

--#include <libv4l1-videodev.h>

--#endif

- #include <sys/ioctl.h>

- #include <sys/types.h>

- #include <sys/stat.h>

---- wxcam-1.1/src/device.h.bak 2012-03-07 22:04:29.855896961 +0100

-+++ wxcam-1.1/src/device.h 2012-03-07 22:05:03.023804303 +0100

-@@ -24,11 +24,7 @@

- #include <unistd.h>

- #include <fcntl.h>

- #include <sys/mman.h>

--#ifdef HAVE_CAMV4L 

- #include <linux/videodev.h>

--#else

--#include <libv4l1-videodev.h>

--#endif

- #include <sys/ioctl.h>

- #include <sys/types.h>

- #include <sys/stat.h>

​