- added SDL_gfx patch (use SDL include dir); release 3

diff --git a/mjpegtools-SDL_gfx.patch b/mjpegtools-SDL_gfx.patch
new file mode 100644 (file)
index 0000000..f63d5d4
--- /dev/null
+++ b/mjpegtools-SDL_gfx.patch
@@ -0,0 +1,10 @@
+--- mjpegtools-2.1.0/y4mutils/Makefile.am.orig 2012-04-01 10:43:35.000000000 +0200
++++ mjpegtools-2.1.0/y4mutils/Makefile.am      2017-07-13 21:32:08.502982119 +0200
+@@ -43,6 +43,7 @@
+ y4mspatialfilter_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
+ 
+ y4mhist_SOURCES = y4mhist.c
++y4mhist_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS)
+ y4mhist_LDADD = $(SDL_LIBS) $(SDLgfx_LIBS) $(LIBMJPEGUTILS)
+ 
+ y4mblack_SOURCES = y4mblack.c

diff --git a/mjpegtools.spec b/mjpegtools.spec
index f4677bcc0b01f7494615febf61db711292e553d2..24a10b969cebf5cafe9516b09455204d6debdf0c 100644 (file)
--- a/mjpegtools.spec
+++ b/mjpegtools.spec
@@ -6,7 +6,7 @@ Summary:        Tools for recording, editing, playing back and MPEG-encoding video unde
 Summary(pl.UTF-8):     Narzędzia do nagrywania, edycji, odtwarzania i kodowania do MPEG obrazu
 Name:          mjpegtools
 Version:       2.1.0
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Applications/Graphics
 Source0:       http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@ Patch0:               %{name}-opt.patch
 Patch1:                %{name}-pthread.patch
 Patch2:                %{name}-sec.patch
 Patch3:                x32.patch
+Patch4:                %{name}-SDL_gfx.patch
 URL:           http://mjpeg.sourceforge.net/
 BuildRequires: SDL-devel >= 1.1.3
 BuildRequires: SDL_gfx-devel
@@ -103,6 +104,7 @@ Statyczne biblioteki mjpegtools.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}