Update of /cvsroot/xine/xine-lib/src/post/planar
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5335/src/post/planar
Modified Files:
Tag: ffmpeg_integration
Makefile.am
Log Message:
Start working on a branch where FFmpeg is not copied, patched and carved to be
built with automake but instead imported inline and built using its own build
system. This is an import of a slightly modified FFmpeg current tree. xine-lib
builds, install and run fine with it, but there are of course plenty of things
that needs to be fixed before it can even be considered for a 1.2.x series.
Work will continue in the next days of course.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/post/planar/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- Makefile.am 12 Sep 2006 00:06:05 -0000 1.19
+++ Makefile.am 2 Dec 2006 01:20:18 -0000 1.19.2.1
@@ -6,9 +6,11 @@
postproc_lib = $(FFMPEG_POSTPROC_LIBS)
ff_cflags = $(FFMPEG_POSTPROC_CFLAGS)
else
-ff_cflags = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc
-postproc_lib = $(POSTPROC_INT_LIB)
-postproc_dep = $(postproc_lib)
+ff_cflags = -I$(top_srcdir)/contrib/ffmpeg/libpostproc
+postproc_lib = $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a
+
+$(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a:
+ $(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine
libpostproc/libpostproc.a
endif
# -fomit-frame-pointer is always needed. it might cause debug to not
@@ -21,7 +23,6 @@
xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \
denoise3d.c eq.c eq2.c unsharp.c pp.c noise.c
-xineplug_post_planar_la_DEPENDENCIES = $(postproc_dep)
xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(postproc_lib) -lm $(THREAD_LIBS)
xineplug_post_planar_la_LDFLAGS = -avoid-version -module \
@IMPURE_TEXT_LDFLAGS@
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
