[FFmpeg-soc] [soc]: r525 - in libavfilter: Makefile ffmpeg.diff

[koorogi]

Author: koorogi
Date: Tue Jul 24 19:59:16 2007
New Revision: 525

Log:
work into the ffmpeg build system


Added:
   libavfilter/ffmpeg.diff
Modified:
   libavfilter/Makefile

Modified: libavfilter/Makefile
==============================================================================
--- libavfilter/Makefile	(original)
+++ libavfilter/Makefile	Tue Jul 24 19:59:16 2007
@@ -1,24 +1,36 @@
-CC = gcc
-CFLAGS = -g -I../libavcodec -I../libavutil
-LIBS = ../libavcodec/libavcodec.a ../libavutil/libavutil.a -lm -lSDL
+include ../config.mak
 
-OBJECTS = avfilter.o          \
-          avfiltergraph.o     \
-          vsrc_dummy.o        \
-		  vsrc_ppm.o          \
-		  vo_sdl.o            \
-		  vf_crop.o           \
-		  vf_passthrough.o    \
-		  vf_rgb2bgr.o        \
-		  vf_slicify.o        \
+CFLAGS+=-I$(SRC_PATH)/libavcodec
 
-all: filter_test
+OBJS = avfilter.o \
+       avfiltergraph.o \
 
-clean:
-	rm -f filter_test $(OBJECTS)
+# TODO: real conditional compilation
+OBJS-yes = vsrc_dummy.o \
+           vsrc_ppm.o \
+           vo_sdl.o \
+           vf_crop.o \
+           vf_passthrough.o \
+           vf_rgb2bgr.o \
+           vf_slicify.o \
 
-filter_test: $(OBJECTS) filter_test.c
-	$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
+HEADERS = avfilter.h
 
-$(OBJECTS): %.o: %.c
-	$(CC) $(CFLAGS) -c $<
+EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+
+NAME=avfilter
+LIBVERSION=$(LAVFILTERVERSION)
+LIBMAJOR=$(LAVFILTERMAJOR)
+
+include ../common.mak
+
+clean::
+	rm -f \
+	   filter_test $(TESTS)
+
+tests: filter_test
+
+filter_test: filter_test.o $(LIB)
+	$(CC) $(CFLAGS) $< -o $@ $(LIB) -lm -lSDL
+
+.PHONY: tests

Added: libavfilter/ffmpeg.diff
==============================================================================
--- (empty file)
+++ libavfilter/ffmpeg.diff	Tue Jul 24 19:59:16 2007
@@ -0,0 +1,115 @@
+Index: configure
+===================================================================
+--- configure	(revision 9790)
++++ configure	(working copy)
+@@ -70,6 +70,7 @@
+   echo "                           and ffmpeg will be under GPL [default=no]"
+   echo "  --enable-pp              enable GPLed postprocessing support [default=no]"
+   echo "  --enable-swscaler        software scaler support [default=no]"
++  echo "  --enable-avfilter        video filter support (replaces vhook) [default=no]"
+   echo "  --enable-beosthreads     use BeOS threads [default=no]"
+   echo "  --enable-pthreads        use pthreads [default=no]"
+   echo "  --enable-w32threads      use Win32 threads [default=no]"
+@@ -568,6 +569,7 @@
+     demuxers
+     audio_beos
+     audio_oss
++    avfilter
+     avisynth
+     beos_netserver
+     bktr
+@@ -1807,6 +1809,7 @@
+ echo "shared                    ${shared-no}"
+ echo "postprocessing support    ${pp-no}"
+ echo "software scaler enabled   ${swscaler-no}"
++echo "new filter support        ${avfilter-no}"
+ echo "video hooking             ${vhook-no}"
+ if enabled vhook; then
+     echo "Imlib2 support            ${imlib2-no}"
+@@ -2089,3 +2092,8 @@
+   apply libswscale.pc sed s/^Libs:.*$/Libs:/
+   apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
+ fi
++
++if enabled avfilter; then
++  pkgconfig_generate libavfilter "FFmpeg video filtering library" "$avfilter_version" "-lavfilter $extralibs" "$pkg_requires libavutil = $lavu=version" ffmpeg
++  pkgconfig_generate_uninstalled libavfilter "FFmpeg video filtering library" "$avfilter_version" "$extralibs" "$pkg_requires libavutil = $libavu_version"
++fi
+Index: Makefile
+===================================================================
+--- Makefile	(revision 9790)
++++ Makefile	(working copy)
+@@ -65,6 +65,11 @@
+ EXTRALIBS+=-lswscale$(BUILDSUF)
+ endif
+ 
++ifeq ($(CONFIG_AVFILTER),yes)
++LDFLAGS+=-L$(BUILD_ROOT)/libavfilter
++EXTRALIBS+=-lavfilter$(BUILDSUF)
++endif
++
+ all: lib $(PROGS) $(ALL_TARGETS-yes)
+ 
+ lib:
+@@ -76,7 +81,10 @@
+ endif
+ ifeq ($(CONFIG_SWSCALER),yes)
+ 	$(MAKE) -C libswscale  all
++ifeq ($(CONFIG_AVFILTER),yes)
++	$(MAKE) -C libavfilter all
+ endif
++endif
+ 
+ ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
+ 	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
+@@ -181,6 +189,9 @@
+ 	$(MAKE) -C libpostproc install-headers
+ endif
+ 	$(MAKE) -C libswscale  install-headers
++ifeq ($(CONFIG_AVFILTER),yes)
++	$(MAKE) -C libavfilter install-headers
++endif
+ 
+ uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
+ 
+@@ -199,12 +210,14 @@
+ 	$(MAKE) -C libavcodec  uninstall-libs
+ 	$(MAKE) -C libavformat uninstall-libs
+ 	$(MAKE) -C libpostproc uninstall-libs
++	$(MAKE) -C libavfilter uninstall-libs
+ 
+ uninstall-headers:
+ 	$(MAKE) -C libavutil   uninstall-headers
+ 	$(MAKE) -C libavcodec  uninstall-headers
+ 	$(MAKE) -C libavformat uninstall-headers
+ 	$(MAKE) -C libpostproc uninstall-headers
++	$(MAKE) -C libavfilter uninstall-headers
+ 	-rmdir "$(INCDIR)"
+ 
+ depend dep: .depend .vhookdep
+@@ -217,6 +230,9 @@
+ ifeq ($(CONFIG_SWSCALER),yes)
+ 	$(MAKE) -C libswscale  depend
+ endif
++ifeq ($(CONFIG_AVFILTER),yes)
++	$(MAKE) -C libavfilter depend
++endif
+ 
+ .depend: $(SRCS) version.h
+ 	$(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
+@@ -236,6 +252,7 @@
+ 	$(MAKE) -C libavformat clean
+ 	$(MAKE) -C libpostproc clean
+ 	$(MAKE) -C libswscale  clean
++	$(MAKE) -C libavfilter clean
+ 	rm -f *.o *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
+ 	   output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(EXESUF)
+ 	rm -f doc/*.html doc/*.pod doc/*.1
+@@ -249,6 +266,7 @@
+ 	$(MAKE) -C libavformat distclean
+ 	$(MAKE) -C libpostproc distclean
+ 	$(MAKE) -C libswscale  distclean
++	$(MAKE) -C libavfilter distclean
+ 	rm -f .depend version.h config.* *.pc
+ 
+ TAGS: