@@ -1,4 +1,9 @@

 -------------------------------------------------------------------

+Tue Dec  8 20:59:51 UTC 2015 - avvissu@yandex.ru

+

+- Fix build errors with ffmpeg: define ffmpeg_includedir

+

+-------------------------------------------------------------------

 Sun Nov 29 12:31:27 UTC 2015 - avvissu@yandex.ru

 - Update to 15.11:

​

@@ -18,6 +18,7 @@

 %define src_ver 15_11

 %define src_name sView

+%define ffmpeg_includedir %(pkg-config --variable=includedir libavcodec)

 Name:           sview

 Version:        15.11

 Release:        0

@@ -37,7 +38,6 @@

 BuildRequires:  pkgconfig(gtk+-2.0)

 BuildRequires:  pkgconfig(freetype2)

 BuildRequires:  pkgconfig(libavcodec)

-BuildRequires:  pkgconfig(libavdevice)

 BuildRequires:  pkgconfig(libavformat)

 BuildRequires:  pkgconfig(libavutil)

 BuildRequires:  pkgconfig(libconfig++)

@@ -45,6 +45,7 @@

 BuildRequires:  pkgconfig(openal)

 BuildRequires:  pkgconfig(xpm)

 BuildRequires:  pkgconfig(xrandr)

+Requires:       xdg-utils

 #Recommends:     mongoose

 ExclusiveArch:  %{ix86} x86_64

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

@@ -58,9 +59,12 @@

 dos2unix -k license-gpl* license-lgpl*

 %build

-sed -i '/^CXXFLAGS/s/$/\ %{optflags}/' Makefile

+sed -e '/^INC/s|$|\ -I%{ffmpeg_includedir}|' \

+    -e '/^CFLAGS/s/$/\ %{optflags}/' \

+    -e '/^CXXFLAGS/s/$/\ %{optflags}/' \

+    -i Makefile

 # Remove %%_smp_mflags to avoid compilation errors

-make V=1 -j1 EXTRA_LDFLAGS="-Wl,-rpath,%{_libdir}/%{src_name}"

+make -j1 EXTRA_LDFLAGS="-Wl,-rpath,%{_libdir}/%{src_name}"

 %install

 %make_install USR_LIB=%{_lib}

​