- rel 9; fix build with new libcaca

diff --git a/xine-lib-build.patch b/xine-lib-build.patch
new file mode 100644 (file)
index 0000000..9f0aa8b
--- /dev/null
+++ b/xine-lib-build.patch
@@ -0,0 +1,32 @@
+--- xine-lib-1.2.3/./src/demuxers/demux_mod.c~ 2012-02-05 20:17:02.000000000 +0100
++++ xine-lib-1.2.3/./src/demuxers/demux_mod.c  2014-10-07 19:13:38.738115012 +0200
+@@ -46,7 +46,7 @@
+ #include <xine/xineutils.h>
+ #include <xine/compat.h>
+ #include <xine/demux.h>
+-#include "modplug.h"
++#include <libmodplug/modplug.h>
+ #include "bswap.h"
+ 
+ #define MOD_SAMPLERATE 44100
+--- xine-lib-1.2.3/m4/video_out.m4~    2013-03-21 18:59:49.000000000 +0100
++++ xine-lib-1.2.3/m4/video_out.m4     2014-10-07 19:26:40.365551398 +0200
+@@ -77,7 +77,7 @@
+     dnl Color AsCii Art
+     XINE_ARG_WITH([caca], [enable support for CACA])
+     if test x"$with_caca" != x"no"; then
+-        PKG_CHECK_MODULES([CACA], [caca >= 0.99beta14 cucul >= 0.99beta14], [have_caca="yes"], [have_caca="no"])
++        PKG_CHECK_MODULES([CACA], [caca >= 0.99beta14], [have_caca="yes"], [have_caca="no"])
+         if test x"$hard_with_caca" = x"yes" && test x"$have_caca" != x"yes"; then
+             AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found])
+         fi
+--- xine-lib-1.2.3/src/video_out/video_out_caca.c~     2012-09-05 03:02:12.000000000 +0200
++++ xine-lib-1.2.3/src/video_out/video_out_caca.c      2014-10-07 19:28:12.671270113 +0200
+@@ -34,7 +34,6 @@
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <sys/time.h>
+-#include <cucul.h>
+ #include <caca.h>
+ 
+ #ifdef HAVE_FFMPEG_AVUTIL_H

diff --git a/xine-lib.spec b/xine-lib.spec
index 83f4d568708701a09b6bd917a01d35322ba2e546..78d282e5478dc29c528eafea974b488d8fc92604 100644 (file)
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -40,7 +40,7 @@ Summary(pl.UTF-8):    Odtwarzacz filmów
 Summary(pt_BR.UTF-8):  Xine, um player de video
 Name:          xine-lib
 Version:       1.2.3
-Release:       8
+Release:       9
 Epoch:         2
 License:       GPL v2+
 Group:         Libraries
@@ -54,6 +54,7 @@ Patch3:               %{name}-ac.patch
 Patch4:                %{name}-vdpau-hooks.patch
 Patch5:                %{name}-missing.patch
 Patch6:                smbclient.patch
+Patch7:                %{name}-build.patch
 URL:           http://xine.sourceforge.net/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.22}
 %{?with_fusionsound:BuildRequires:     FusionSound-devel >= 0.9.23}
@@ -954,6 +955,7 @@ XINE - wtyczka postprocessingu oparta na libpostproc z pakietu FFmpeg.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %{__gettextize}