xine-lib-1.2 vs Fedora 18

Hi,

I am trying to compile xine-lib-1.2.2 under Fedora 18 since I have just
upgraded to the current kernel 3.10 GIT and Mesa 9.2 GIT so I have shiny new
VDPAU support via UVD and xine-lib-1.2 has VDPAU support.

What I noticed is that the configure script doesn't find the ffmpeg headers
and cannot compile a lot of stuff that way. After some digging, it turned out
that ffmpeg-devel under Fedora 18 has its headers under /usr/include/ffmpeg/libav*.

The attached patch is needed for me against decoders.m4.

Best regards,
Zoltán Böszörményi

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and 
their applications. This 200-page book is written by three acclaimed 
leaders in the field. The early access version is available now. 
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may

_______________________________________________
xine-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-devel

--- xine-lib-1.2.2/m4/decoders.m4.ffmpeg	2012-02-05 20:17:01.000000000 +0100
+++ xine-lib-1.2.2/m4/decoders.m4	2013-05-07 19:49:40.489465790 +0200
@@ -92,10 +92,13 @@
 
 	dnl Check presence of ffmpeg/avutil.h to see if it's old or new
 	dnl style for headers. The new style would be preferred actually...
+	ac_save_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CFLAGS $FFMPEG_CFLAGS $AVUTIL_CFLAGS"
 	AC_CHECK_HEADERS([ffmpeg/avutil.h])
 	AC_CHECK_HEADERS([libavutil/avutil.h])
 	AC_CHECK_HEADERS([libavutil/sha1.h])
 	AC_CHECK_HEADERS([libavutil/sha.h])
+	CPPFLAGS="$ac_save_CPPFLAGS"
 	if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then
 	    AC_MSG_ERROR([old & new ffmpeg headers found - you need to clean up!])
 	fi