From f7679c54dd1de0ebb1aa4adda8863d33ff4ca5c3 Mon Sep 17 00:00:00 2001 From: Vitor Sessak Date: Tue, 26 Feb 2008 21:32:56 +0000 Subject: Build system changes for libavfilter addition. Add --enable-avfilter configure option. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by myself, Bobby Bingham and Víctor Paesa. Originally committed as revision 12249 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 14 +++++++++++++- configure | 32 +++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 77e2deffd3..8191165ac8 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ VPATH=$(SRC_PATH_BARE) CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \ -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \ - -I$(SRC_PATH)/libavdevice \ + -I$(SRC_PATH)/libavdevice -I$(SRC_PATH)/libavfilter \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE -DHAVE_AV_CONFIG_H LDFLAGS+= -g @@ -69,6 +69,11 @@ LDFLAGS+=-L$(BUILD_ROOT)/libswscale EXTRALIBS+=-lswscale$(BUILDSUF) endif +ifeq ($(CONFIG_AVFILTER),yes) +LDFLAGS+=-L$(BUILD_ROOT)/libavfilter +EXTRALIBS := -lavfilter$(BUILDSUF) $(EXTRALIBS) +endif + MAKE-yes = $(MAKE) MAKE- = : $(MAKE) @@ -81,6 +86,7 @@ lib: $(MAKE) -C libavdevice all $(MAKE-$(CONFIG_PP)) -C libpostproc all $(MAKE-$(CONFIG_SWSCALER)) -C libswscale all + $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS) @@ -174,6 +180,7 @@ install-headers: $(MAKE) -C libavdevice install-headers $(MAKE-$(CONFIG_PP)) -C libpostproc install-headers $(MAKE) -C libswscale install-headers + $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter install-headers uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook @@ -194,6 +201,7 @@ uninstall-libs: $(MAKE) -C libavdevice uninstall-libs $(MAKE) -C libpostproc uninstall-libs $(MAKE) -C libswscale uninstall-libs + $(MAKE) -C libavfilter uninstall-libs uninstall-headers: $(MAKE) -C libavutil uninstall-headers @@ -202,6 +210,7 @@ uninstall-headers: $(MAKE) -C libavdevice uninstall-headers $(MAKE) -C libpostproc uninstall-headers $(MAKE) -C libswscale uninstall-headers + $(MAKE) -C libavfilter uninstall-headers -rmdir "$(INCDIR)" depend dep: .depend .vhookdep @@ -211,6 +220,7 @@ depend dep: .depend .vhookdep $(MAKE) -C libavdevice depend $(MAKE-$(CONFIG_PP)) -C libpostproc depend $(MAKE-$(CONFIG_SWSCALER)) -C libswscale depend + $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend .depend: $(SRCS) version.h $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend @@ -231,6 +241,7 @@ clean: $(MAKE) -C libavdevice 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) rm -f doc/*.html doc/*.pod doc/*.1 @@ -246,6 +257,7 @@ distclean: clean $(MAKE) -C libavdevice distclean $(MAKE) -C libpostproc distclean $(MAKE) -C libswscale distclean + $(MAKE) -C libavfilter distclean rm -f .depend .vhookdep version.h config.* *.pc TAGS: diff --git a/configure b/configure index 3c8e5a16d7..388512dc29 100755 --- a/configure +++ b/configure @@ -72,6 +72,8 @@ show_help(){ echo " and ffmpeg will be unredistributable [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-avfilter-lavf video filters dependant on avformat [default=no]" echo " --enable-beosthreads use BeOS threads [default=no]" echo " --enable-os2threads use OS/2 threads [default=no]" echo " --enable-pthreads use pthreads [default=no]" @@ -620,10 +622,13 @@ COMPONENT_LIST=" outdevs parsers protocols + filters " CONFIG_LIST=" $COMPONENT_LIST + avfilter + avfilter_lavf avisynth beos_netserver ffmpeg @@ -851,6 +856,9 @@ rtp_protocol_deps="udp_protocol" tcp_protocol_deps="network" udp_protocol_deps="network" +# filters +vsrc_movie_deps="avfilter_lavf" + # programs ffplay_deps="sdl" ffserver_deps="ffm_muxer rtp_protocol rtsp_demuxer" @@ -965,6 +973,9 @@ DEMUXER_LIST=$(find_things demuxer DEMUX libavformat/allformats.c) OUTDEV_LIST=$(find_things muxer _MUX libavdevice/alldevices.c) INDEV_LIST=$(find_things demuxer DEMUX libavdevice/alldevices.c) PROTOCOL_LIST=$(find_things protocol PROTOCOL libavformat/allformats.c) +VIDEO_FILTER_LIST=$(find_things vf_ VF_ libavfilter/allfilters.c) +SRC_FILTER_LIST=$(find_things vsrc_ VSRC_ libavfilter/allfilters.c) +FILTER_LIST="$SRC_FILTER_LIST $VIDEO_FILTER_LIST" enable $ARCH_EXT_LIST \ $DECODER_LIST \ @@ -973,6 +984,7 @@ enable $ARCH_EXT_LIST \ $BSF_LIST \ $DEMUXER_LIST \ $MUXER_LIST \ + $FILTER_LIST \ $PROTOCOL_LIST \ $INDEV_LIST \ $OUTDEV_LIST \ @@ -1041,6 +1053,8 @@ for opt do ;; --disable-muxers) disable $MUXER_LIST ;; + --disable-filters) disable $FILTER_LIST + ;; --disable-demuxers) disable $DEMUXER_LIST ;; --disable-parsers) disable $PARSER_LIST @@ -1055,6 +1069,7 @@ for opt do eval `echo "$opt" | sed 's/=/-/;s/--/action=/;s/-/ thing=/;s/-/ name=/'` case "$thing" in encoder|decoder|muxer|demuxer|parser|bsf|protocol) $action ${optval}_${thing} ;; + filter) $action ${optval} ;; *) die_unknown "$opt" ;; esac ;; @@ -1838,6 +1853,7 @@ enabled_any $ENCODER_LIST && enable encoders enabled_any $BSF_LIST && enable bsfs enabled_any $DEMUXER_LIST && enable demuxers enabled_any $MUXER_LIST && enable muxers +enabled_any $FILTER_LIST && enable filters enabled_any $INDEV_LIST && enable demuxers enabled_any $OUTDEV_LIST && enable muxers enabled_any $PROTOCOL_LIST && enable protocols @@ -1852,6 +1868,7 @@ check_deps $CONFIG_LIST \ $BSF_LIST \ $DEMUXER_LIST \ $MUXER_LIST \ + $FILTER_LIST \ $INDEV_LIST \ $OUTDEV_LIST \ $PROTOCOL_LIST \ @@ -1897,6 +1914,8 @@ echo "static ${static-no}" echo "shared ${shared-no}" echo "postprocessing support ${pp-no}" echo "software scaler enabled ${swscaler-no}" +echo "new filter support ${avfilter-no}" +echo "filters using lavformat ${avfilter-lavf-no}" echo "video hooking ${vhook-no}" if enabled vhook; then echo "Imlib2 support ${imlib2-no}" @@ -1930,7 +1949,7 @@ echo "x264 enabled ${libx264-no}" echo "XviD enabled ${libxvid-no}" echo "zlib enabled ${zlib-no}" -for type in decoder encoder parser demuxer muxer protocol bsf indev outdev; do +for type in decoder encoder parser demuxer muxer protocol filter bsf indev outdev; do echo "Enabled ${type}s:" ucname="\$`toupper $type`_LIST" list="`eval echo $ucname`" @@ -2019,6 +2038,7 @@ get_version LIBAVCODEC libavcodec/avcodec.h get_version LIBAVDEVICE libavdevice/avdevice.h get_version LIBAVFORMAT libavformat/avformat.h get_version LIBAVUTIL libavutil/avutil.h +lavfi_version=$(get_version LIBAVFILTER libavfilter/avfilter.h) if enabled shared; then echo "BUILD_SHARED=yes" >> config.mak @@ -2033,6 +2053,8 @@ if enabled shared; then echo "LAVFVERSION=$LIBAVFORMAT_VERSION" >> config.mak echo "LAVUMAJOR=$LIBAVUTIL_VERSION_MAJOR" >> config.mak echo "LAVUVERSION=$LIBAVUTIL_VERSION" >> config.mak + echo "LAVFIMAJOR=$LIBAVFILTER_VERSION_MAJOR" >> config.mak + echo "LAVFIVERSION=$LIBAVFILTER_VERSION" >> config.mak echo "SWSMAJOR=$LIBSWSCALE_VERSION_MAJOR" >> config.mak echo "SWSVERSION=$LIBSWSCALE_VERSION" >> config.mak echo "SLIBNAME=${SLIBNAME}" >> config.mak @@ -2055,6 +2077,7 @@ print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \ $BSF_LIST \ $DEMUXER_LIST \ $MUXER_LIST \ + $FILTER_LIST \ $PROTOCOL_LIST \ $INDEV_LIST \ $OUTDEV_LIST \ @@ -2098,6 +2121,7 @@ if enabled source_path_used; then libavcodec/sh4 \ libavcodec/sparc \ libavdevice \ + libavfilter \ libavformat \ libavutil \ libpostproc \ @@ -2112,6 +2136,7 @@ if enabled source_path_used; then doc/texi2pod.pl \ libavcodec/Makefile \ libavdevice/Makefile \ + libavfilter/Makefile \ libavformat/Makefile \ libavutil/Makefile \ libpostproc/Makefile \ @@ -2199,3 +2224,8 @@ else 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 -- cgit v1.2.3