History

Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'

* commit '11a9320de54759340531177c9f2b1e31e6112cc2': build: Move build-system-related helper files to a separate subdirectory "ffbuild" directory name is used instead of "avbuild".

Clément Bœsch committed 9 years ago

Commit 3f177512 parents c3e0854 11a932019 files · +47 −38Browse files

Unified · Split

19 files
  1. .gitignore +2 −1
  2. Makefile +11 −8
  3. configure +13 −12
  4. doc/Makefile +1 −1
  5. doc/writing_filters.txt +4 −4
  6. ffbuild/.gitignore +4 −0
  7. ffbuild/arch.mak +0 −0
  8. ffbuild/common.mak +1 −1
  9. ffbuild/library.mak +1 −1
  10. ffbuild/version.sh +0 −0
  11. libavcodec/Makefile +1 −1
  12. libavdevice/Makefile +1 −1
  13. libavfilter/Makefile +1 −1
  14. libavformat/Makefile +1 −1
  15. libavutil/Makefile +1 −1
  16. libpostproc/Makefile +1 −1
  17. libswresample/Makefile +1 −1
  18. libswscale/Makefile +1 −1
  19. tests/fate.sh +2 −2
.gitignore+2−1
@@ -27,7 +27,8 @@ · 26 unmodified lines
27/ffplay27/ffplay
28/ffprobe28/ffprobe
29/ffserver29/ffserver
30/config.*30/config.asm
31/config.h
31/coverage.info32/coverage.info
32/avversion.h33/avversion.h
33/lcov/34/lcov/
Makefile+11−8
@@ -1,5 +1,5 @@
1MAIN_MAKEFILE=11MAIN_MAKEFILE=1
2include config.mak2include ffbuild/config.mak
3 3
4vpath %.c $(SRC_PATH)4vpath %.c $(SRC_PATH)
5vpath %.cpp $(SRC_PATH)5vpath %.cpp $(SRC_PATH)
@@ -66,7 +66,7 @@ SKIPHEADERS = cmdutils_common_opts.h \ · 60 unmodified lines
66all: all-yes66all: all-yes
67 67
68include $(SRC_PATH)/tools/Makefile68include $(SRC_PATH)/tools/Makefile
69include $(SRC_PATH)/common.mak69include $(SRC_PATH)/ffbuild/common.mak
70 70
71FF_EXTRALIBS := $(FFEXTRALIBS)71FF_EXTRALIBS := $(FFEXTRALIBS)
72FF_DEP_LIBS := $(DEP_LIBS)72FF_DEP_LIBS := $(DEP_LIBS)
@@ -91,8 +91,8 @@ CONFIGURABLE_COMPONENTS = \ · 18 unmodified lines
91 $(SRC_PATH)/libavcodec/bitstream_filters.c \91 $(SRC_PATH)/libavcodec/bitstream_filters.c \
92 $(SRC_PATH)/libavformat/protocols.c \92 $(SRC_PATH)/libavformat/protocols.c \
93 93
94config.h: .config94config.h: ffbuild/.config
95.config: $(CONFIGURABLE_COMPONENTS)95ffbuild/.config: $(CONFIGURABLE_COMPONENTS)
96 @-tput bold 2>/dev/null96 @-tput bold 2>/dev/null
97 @-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n'97 @-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n'
98 @-tput sgr0 2>/dev/null98 @-tput sgr0 2>/dev/null
@@ -115,7 +115,7 @@ SUBDIR := $(1)/ · 16 unmodified lines
115include $(SRC_PATH)/$(1)/Makefile115include $(SRC_PATH)/$(1)/Makefile
116-include $(SRC_PATH)/$(1)/$(ARCH)/Makefile116-include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
117-include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile117-include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
118include $(SRC_PATH)/library.mak118include $(SRC_PATH)/ffbuild/library.mak
119endef119endef
120 120
121$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))121$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
@@ -142,10 +142,10 @@ $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) · 20 unmodified lines
142%$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS)142%$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS)
143 $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)143 $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
144 144
145VERSION_SH = $(SRC_PATH)/version.sh145VERSION_SH = $(SRC_PATH)/ffbuild/version.sh
146GIT_LOG = $(SRC_PATH)/.git/logs/HEAD146GIT_LOG = $(SRC_PATH)/.git/logs/HEAD
147 147
148.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak148.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) ffbuild/config.mak
149.version: M=@149.version: M=@
150 150
151libavutil/ffversion.h .version:151libavutil/ffversion.h .version:
@@ -194,7 +194,10 @@ clean:: · 42 unmodified lines
194 194
195distclean::195distclean::
196 $(RM) $(DISTCLEANSUFFIXES)196 $(RM) $(DISTCLEANSUFFIXES)
197 $(RM) config.* .config libavutil/avconfig.h .version mapfile avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h libavcodec/bsf_list.c libavformat/protocol_list.c197 $(RM) .version avversion.h config.asm config.h mapfile \
198 ffbuild/.config ffbuild/config.* libavutil/avconfig.h \
199 version.h libavutil/ffversion.h libavcodec/codec_names.h \
200 libavcodec/bsf_list.c libavformat/protocol_list.c
198ifeq ($(SRC_LINK),src)201ifeq ($(SRC_LINK),src)
199 $(RM) src202 $(RM) src
200endif203endif
configure+13−12
@@ -77,7 +77,7 @@ Help options: · 76 unmodified lines
77 --list-filters show all available filters77 --list-filters show all available filters
78 78
79Standard options:79Standard options:
80 --logfile=FILE log tests and output to FILE [config.log]80 --logfile=FILE log tests and output to FILE [ffbuild/config.log]
81 --disable-logging do not log configure debug information81 --disable-logging do not log configure debug information
82 --fatal-warnings fail if any configure warning is generated82 --fatal-warnings fail if any configure warning is generated
83 --prefix=PREFIX install in PREFIX [$prefix_default]83 --prefix=PREFIX install in PREFIX [$prefix_default]
@@ -3224,7 +3224,7 @@ doc_deps_any="manpages htmlpages podpages txtpages" · 3140 unmodified lines
3224 3224
3225# default parameters3225# default parameters
3226 3226
3227logfile="config.log"3227logfile="ffbuild/config.log"
3228 3228
3229# installation paths3229# installation paths
3230prefix_default="/usr/local"3230prefix_default="/usr/local"
@@ -3581,6 +3581,7 @@ disable_components(){ · 350 unmodified lines
3581 3581
3582map 'disable_components $v' $LIBRARY_LIST3582map 'disable_components $v' $LIBRARY_LIST
3583 3583
3584mkdir -p ffbuild
3584echo "# $0 $FFMPEG_CONFIGURATION" > $logfile3585echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
3585set >> $logfile3586set >> $logfile
3586 3587
@@ -5152,7 +5153,7 @@ esc(){ · 1565 unmodified lines
5152 echo "$*" | sed 's/%/%25/g;s/:/%3a/g'5153 echo "$*" | sed 's/%/%25/g;s/:/%3a/g'
5153}5154}
5154 5155
5155echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" >config.fate5156echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" > ffbuild/config.fate
5156 5157
5157check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic5158check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
5158 5159
@@ -6619,9 +6620,9 @@ test -e Makefile || echo "include $source_path/Makefile" > Makefile · 1460 unmodified lines
6619 6620
6620enabled stripping || strip="echo skipping strip"6621enabled stripping || strip="echo skipping strip"
6621 6622
6622config_files="$TMPH config.mak doc/config.texi"6623config_files="$TMPH ffbuild/config.mak doc/config.texi"
6623 6624
6624cat > config.mak <<EOF6625cat > ffbuild/config.mak <<EOF
6625# Automatically generated by configure - do not modify!6626# Automatically generated by configure - do not modify!
6626ifndef FFMPEG_CONFIG_MAK6627ifndef FFMPEG_CONFIG_MAK
6627FFMPEG_CONFIG_MAK=16628FFMPEG_CONFIG_MAK=1
@@ -6755,18 +6756,18 @@ get_version(){ · 127 unmodified lines
6755 eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")6756 eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")
6756 enabled raise_major && eval ${name}_VERSION_MAJOR=$((${name}_VERSION_MAJOR+100))6757 enabled raise_major && eval ${name}_VERSION_MAJOR=$((${name}_VERSION_MAJOR+100))
6757 eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO6758 eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
6758 eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak6759 eval echo "${lcname}_VERSION=\$${name}_VERSION" >> ffbuild/config.mak
6759 eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak6760 eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> ffbuild/config.mak
6760 eval echo "${lcname}_VERSION_MINOR=\$${name}_VERSION_MINOR" >> config.mak6761 eval echo "${lcname}_VERSION_MINOR=\$${name}_VERSION_MINOR" >> ffbuild/config.mak
6761}6762}
6762 6763
6763map 'get_version $v' $LIBRARY_LIST6764map 'get_version $v' $LIBRARY_LIST
6764 6765
6765map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> config.mak' $LIBRARY_LIST6766map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> ffbuild/config.mak' $LIBRARY_LIST
6766 6767
6767print_program_extralibs(){6768print_program_extralibs(){
6768 eval "program_extralibs=\$${1}_extralibs"6769 eval "program_extralibs=\$${1}_extralibs"
6769 eval echo "EXTRALIBS-${1}=${program_extralibs}" >> config.mak6770 eval echo "EXTRALIBS-${1}=${program_extralibs}" >> ffbuild/config.mak
6770}6771}
6771 6772
6772map 'print_program_extralibs $v' $PROGRAM_LIST6773map 'print_program_extralibs $v' $PROGRAM_LIST
@@ -6816,11 +6817,11 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \ · 43 unmodified lines
6816 $ALL_COMPONENTS \6817 $ALL_COMPONENTS \
6817 6818
6818echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH6819echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
6819echo "endif # FFMPEG_CONFIG_MAK" >> config.mak6820echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak
6820 6821
6821# Do not overwrite an unchanged config.h to avoid superfluous rebuilds.6822# Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
6822cp_if_changed $TMPH config.h6823cp_if_changed $TMPH config.h
6823touch .config6824touch ffbuild/.config
6824 6825
6825enabled yasm && cp_if_changed $TMPASM config.asm6826enabled yasm && cp_if_changed $TMPASM config.asm
6826 6827
doc/Makefile+1−1
@@ -128,7 +128,7 @@ $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples · 127 unmodified lines
128OBJDIRS += doc/examples128OBJDIRS += doc/examples
129 129
130DOXY_INPUT = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c)130DOXY_INPUT = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c)
131DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) config.mak131DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT)) ffbuild/config.mak
132 132
133doc/doxy/html: TAG = DOXY133doc/doxy/html: TAG = DOXY
134doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS)134doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS)
doc/writing_filters.txt+4−4
@@ -38,14 +38,14 @@ the build system and the C: · 37 unmodified lines
38 38
39 --- after running configure ---39 --- after running configure ---
40 40
41 $ grep FOOBAR config.mak41 $ grep FOOBAR ffbuild/config.mak
42 CONFIG_FOOBAR_FILTER=yes42 CONFIG_FOOBAR_FILTER=yes
43 $ grep FOOBAR config.h43 $ grep FOOBAR config.h
44 #define CONFIG_FOOBAR_FILTER 144 #define CONFIG_FOOBAR_FILTER 1
45 45
46CONFIG_FOOBAR_FILTER=yes from the config.mak is later used to enable the filter in46CONFIG_FOOBAR_FILTER=yes from the ffbuild/config.mak is later used to enable
47libavfilter/Makefile and CONFIG_FOOBAR_FILTER=1 from the config.h will be used47the filter in libavfilter/Makefile and CONFIG_FOOBAR_FILTER=1 from the config.h
48for registering the filter in libavfilter/allfilters.c.48will be used for registering the filter in libavfilter/allfilters.c.
49 49
50Filter code layout50Filter code layout
51==================51==================
ffbuild/.gitignore+4−0
@@ -0,0 +1,4 @@
1/.config
2/config.fate
3/config.log
4/config.mak
ffbuild/arch.makrenamed from arch.mak+0−0

File renamed without changes.

ffbuild/common.makrenamed from common.mak+1−1
@@ -103,7 +103,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC) · 102 unmodified lines
103$(OBJS):103$(OBJS):
104endif104endif
105 105
106include $(SRC_PATH)/arch.mak106include $(SRC_PATH)/ffbuild/arch.mak
107 107
108OBJS += $(OBJS-yes)108OBJS += $(OBJS-yes)
109SLIBOBJS += $(SLIBOBJS-yes)109SLIBOBJS += $(SLIBOBJS-yes)
ffbuild/library.makrenamed from library.mak+1−1
@@ -1,4 +1,4 @@
1include $(SRC_PATH)/common.mak1include $(SRC_PATH)/ffbuild/common.mak
2 2
3LIBVERSION := $(lib$(NAME)_VERSION)3LIBVERSION := $(lib$(NAME)_VERSION)
4LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)4LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
ffbuild/version.shrenamed from version.sh+0−0

File renamed without changes.

libavcodec/Makefile+1−1
@@ -1,4 +1,4 @@
1include $(SUBDIR)../config.mak1include $(SUBDIR)../ffbuild/config.mak
2 2
3NAME = avcodec3NAME = avcodec
4 4
libavdevice/Makefile+1−1
@@ -1,4 +1,4 @@
1include $(SUBDIR)../config.mak1include $(SUBDIR)../ffbuild/config.mak
2 2
3NAME = avdevice3NAME = avdevice
4 4
libavfilter/Makefile+1−1
@@ -1,4 +1,4 @@
1include $(SUBDIR)../config.mak1include $(SUBDIR)../ffbuild/config.mak
2 2
3NAME = avfilter3NAME = avfilter
4 4
libavformat/Makefile+1−1
@@ -1,4 +1,4 @@
1include $(SUBDIR)../config.mak1include $(SUBDIR)../ffbuild/config.mak
2 2
3NAME = avformat3NAME = avformat
4 4
libavutil/Makefile+1−1
@@ -1,4 +1,4 @@
1include $(SUBDIR)../config.mak1include $(SUBDIR)../ffbuild/config.mak
2 2
3NAME = avutil3NAME = avutil
4 4
libpostproc/Makefile+1−1
@@ -1,4 +1,4 @@
1include $(SUBDIR)../config.mak1include $(SUBDIR)../ffbuild/config.mak
2 2
3NAME = postproc3NAME = postproc
4FFLIBS = avutil4FFLIBS = avutil
libswresample/Makefile+1−1
@@ -1,4 +1,4 @@
1include $(SUBDIR)../config.mak1include $(SUBDIR)../ffbuild/config.mak
2 2
3NAME = swresample3NAME = swresample
4FFLIBS = avutil4FFLIBS = avutil
libswscale/Makefile+1−1
@@ -1,4 +1,4 @@
1include $(SUBDIR)../config.mak1include $(SUBDIR)../ffbuild/config.mak
2 2
3NAME = swscale3NAME = swscale
4 4
tests/fate.sh+2−2
@@ -85,7 +85,7 @@ clean(){ · 84 unmodified lines
85report(){85report(){
86 date=$(date -u +%Y%m%d%H%M%S)86 date=$(date -u +%Y%m%d%H%M%S)
87 echo "fate:1:${date}:${slot}:${version}:$1:$2:${branch}:${comment}" >report87 echo "fate:1:${date}:${slot}:${version}:$1:$2:${branch}:${comment}" >report
88 cat ${build}/config.fate >>report88 cat ${build}/ffbuild/config.fate >>report
89 cat ${build}/tests/data/fate/*.rep >>report 2>/dev/null || for i in ${build}/tests/data/fate/*.rep ; do cat "$i" >>report 2>/dev/null; done89 cat ${build}/tests/data/fate/*.rep >>report 2>/dev/null || for i in ${build}/tests/data/fate/*.rep ; do cat "$i" >>report 2>/dev/null; done
90 test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv90 test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv
91}91}
@@ -108,7 +108,7 @@ test -d "$src" && update || checkout || die "Error fetching source" · 16 unmodified lines
108 108
109cd ${workdir}109cd ${workdir}
110 110
111version=$(${src}/version.sh ${src})111version=$(${src}/ffbuild/version.sh ${src})
112test "$version" = "$(cat version-$slot 2>/dev/null)" && exit 0112test "$version" = "$(cat version-$slot 2>/dev/null)" && exit 0
113echo ${version} >version-$slot113echo ${version} >version-$slot
114 114

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t