[FFmpeg-cvslog] Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24'
Matthieu Bouron
git at videolan.org
Mon Jun 27 18:03:21 CEST 2016
ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at stupeflix.com> | Mon Jun 27 17:51:57 2016 +0200| [0acc170aad995012da9610063b1f39e8f10eccf8] | committer: Matthieu Bouron
Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24'
* commit '535a742c2695a9e0c586b50d7fa76e318232ff24':
build: Change structure of the linker version script templates
Merged-by: Matthieu Bouron <matthieu.bouron at stupeflix.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0acc170aad995012da9610063b1f39e8f10eccf8
---
common.mak | 4 +---
libavcodec/libavcodec.v | 14 ++++++++------
libavdevice/libavdevice.v | 9 ++++++---
libavfilter/libavfilter.v | 9 ++++++---
libavformat/libavformat.v | 34 ++++++++++++++++++----------------
libavresample/libavresample.v | 8 +++++---
libavutil/libavutil.v | 8 +++++---
libpostproc/libpostproc.v | 9 ++++++---
libswresample/libswresample.v | 9 ++++++---
libswscale/libswscale.v | 9 ++++++---
10 files changed, 67 insertions(+), 46 deletions(-)
diff --git a/common.mak b/common.mak
index 5eec8cc..fbe57d5 100644
--- a/common.mak
+++ b/common.mak
@@ -84,9 +84,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
$(Q)echo '#include "$*.h"' >$@
%.ver: %.v
- $(M)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ | sed -e 's/:/:\
-/' -e 's/; /;\
-/g' > $@
+ $(M)sed 's/MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
%.c %.h %.ver: TAG = GEN
diff --git a/libavcodec/libavcodec.v b/libavcodec/libavcodec.v
index c923cd3..304c2ef 100644
--- a/libavcodec/libavcodec.v
+++ b/libavcodec/libavcodec.v
@@ -1,7 +1,9 @@
-LIBAVCODEC_$MAJOR {
- global: av*;
- #deprecated, remove after next bump
- audio_resample;
- audio_resample_close;
- local: *;
+LIBAVCODEC_MAJOR {
+ global:
+ av*;
+ #deprecated, remove after next bump
+ audio_resample;
+ audio_resample_close;
+ local:
+ *;
};
diff --git a/libavdevice/libavdevice.v b/libavdevice/libavdevice.v
index de7278c..9761617 100644
--- a/libavdevice/libavdevice.v
+++ b/libavdevice/libavdevice.v
@@ -1,4 +1,7 @@
-LIBAVDEVICE_$MAJOR {
- global: avdevice_*; av_*;
- local: *;
+LIBAVDEVICE_MAJOR {
+ global:
+ avdevice_*;
+ av_*;
+ local:
+ *;
};
diff --git a/libavfilter/libavfilter.v b/libavfilter/libavfilter.v
index 83e8887..6518e5f 100644
--- a/libavfilter/libavfilter.v
+++ b/libavfilter/libavfilter.v
@@ -1,4 +1,7 @@
-LIBAVFILTER_$MAJOR {
- global: avfilter_*; av_*;
- local: *;
+LIBAVFILTER_MAJOR {
+ global:
+ avfilter_*;
+ av_*;
+ local:
+ *;
};
diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v
index a00a309..c961cd8 100644
--- a/libavformat/libavformat.v
+++ b/libavformat/libavformat.v
@@ -1,17 +1,19 @@
-LIBAVFORMAT_$MAJOR {
- global: av*;
- #FIXME those are for ffserver
- ff_inet_aton;
- ff_socket_nonblock;
- ff_rtsp_parse_line;
- ff_rtp_get_local_rtp_port;
- ff_rtp_get_local_rtcp_port;
- ffio_open_dyn_packet_buf;
- ffio_set_buf_size;
- ffurl_close;
- ffurl_open;
- ffurl_write;
- #those are deprecated, remove on next bump
- url_feof;
- local: *;
+LIBAVFORMAT_MAJOR {
+ global:
+ av*;
+ #FIXME those are for ffserver
+ ff_inet_aton;
+ ff_socket_nonblock;
+ ff_rtsp_parse_line;
+ ff_rtp_get_local_rtp_port;
+ ff_rtp_get_local_rtcp_port;
+ ffio_open_dyn_packet_buf;
+ ffio_set_buf_size;
+ ffurl_close;
+ ffurl_open;
+ ffurl_write;
+ #those are deprecated, remove on next bump
+ url_feof;
+ local:
+ *;
};
diff --git a/libavresample/libavresample.v b/libavresample/libavresample.v
index b8c7c7d..d6fc751 100644
--- a/libavresample/libavresample.v
+++ b/libavresample/libavresample.v
@@ -1,4 +1,6 @@
-LIBAVRESAMPLE_$MAJOR {
- global: av*;
- local: *;
+LIBAVRESAMPLE_MAJOR {
+ global:
+ av*;
+ local:
+ *;
};
diff --git a/libavutil/libavutil.v b/libavutil/libavutil.v
index e9f04cb..fb17058 100644
--- a/libavutil/libavutil.v
+++ b/libavutil/libavutil.v
@@ -1,4 +1,6 @@
-LIBAVUTIL_$MAJOR {
- global: av*;
- local: *;
+LIBAVUTIL_MAJOR {
+ global:
+ av*;
+ local:
+ *;
};
diff --git a/libpostproc/libpostproc.v b/libpostproc/libpostproc.v
index e65d76f..27381c6 100644
--- a/libpostproc/libpostproc.v
+++ b/libpostproc/libpostproc.v
@@ -1,4 +1,7 @@
-LIBPOSTPROC_$MAJOR {
- global: postproc_*; pp_*;
- local: *;
+LIBPOSTPROC_MAJOR {
+ global:
+ postproc_*;
+ pp_*;
+ local:
+ *;
};
diff --git a/libswresample/libswresample.v b/libswresample/libswresample.v
index 0d5efe4..3b3508d 100644
--- a/libswresample/libswresample.v
+++ b/libswresample/libswresample.v
@@ -1,4 +1,7 @@
-LIBSWRESAMPLE_$MAJOR {
- global: swr_*; swresample_*;
- local: *;
+LIBSWRESAMPLE_MAJOR {
+ global:
+ swr_*;
+ swresample_*;
+ local:
+ *;
};
diff --git a/libswscale/libswscale.v b/libswscale/libswscale.v
index 8b9a96a..96170a1 100644
--- a/libswscale/libswscale.v
+++ b/libswscale/libswscale.v
@@ -1,4 +1,7 @@
-LIBSWSCALE_$MAJOR {
- global: swscale_*; sws_*;
- local: *;
+LIBSWSCALE_MAJOR {
+ global:
+ swscale_*;
+ sws_*;
+ local:
+ *;
};
======================================================================
diff --cc common.mak
index 5eec8cc,d62f899..fbe57d5
--- a/common.mak
+++ b/common.mak
@@@ -5,103 -5,6 +5,101 @@@
# first so "all" becomes default target
all: all-yes
+DEFAULT_YASMD=.dbg
+
+ifeq ($(DBG),1)
+YASMD=$(DEFAULT_YASMD)
+else
+YASMD=
+endif
+
+ifndef SUBDIR
+
+ifndef V
+Q = @
+ECHO = printf "$(1)\t%s\n" $(2)
+BRIEF = CC CXX OBJCC HOSTCC HOSTLD AS YASM AR LD STRIP CP WINDRES
+SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM
+
+MSG = $@
+M = @$(call ECHO,$(TAG),$@);
+$(foreach VAR,$(BRIEF), \
+ $(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
+$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
+$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL))
+endif
+
+ALLFFLIBS = avcodec avdevice avfilter avformat avresample avutil postproc swscale swresample
+
+# NASM requires -I path terminated with /
+IFLAGS := -I. -I$(SRC_LINK)/
+CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
+CFLAGS += $(ECFLAGS)
+CCFLAGS = $(CPPFLAGS) $(CFLAGS)
+OBJCFLAGS += $(EOBJCFLAGS)
+OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
+ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
+CXXFLAGS := $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS)
+YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
+
+HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
+LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
+
+define COMPILE
+ $(call $(1)DEP,$(1))
+ $($(1)) $($(1)FLAGS) $($(1)_DEPFLAGS) $($(1)_C) $($(1)_O) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<)
+endef
+
+COMPILE_C = $(call COMPILE,CC)
+COMPILE_CXX = $(call COMPILE,CXX)
+COMPILE_S = $(call COMPILE,AS)
+COMPILE_M = $(call COMPILE,OBJCC)
+COMPILE_HOSTC = $(call COMPILE,HOSTCC)
+
+%.o: %.c
+ $(COMPILE_C)
+
+%.o: %.cpp
+ $(COMPILE_CXX)
+
+%.o: %.m
+ $(COMPILE_M)
+
+%.s: %.c
+ $(CC) $(CCFLAGS) -S -o $@ $<
+
+%.o: %.S
+ $(COMPILE_S)
+
+%_host.o: %.c
+ $(COMPILE_HOSTC)
+
+%.o: %.rc
+ $(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<
+
+%.i: %.c
+ $(CC) $(CCFLAGS) $(CC_E) $<
+
+%.h.c:
+ $(Q)echo '#include "$*.h"' >$@
+
+%.ver: %.v
- $(M)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ | sed -e 's/:/:\
- /' -e 's/; /;\
- /g' > $@
++ $(M)sed 's/MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
+
+%.c %.h %.ver: TAG = GEN
+
+# Dummy rule to stop make trying to rebuild removed or renamed headers
+%.h:
+ @:
+
+# Disable suffix rules. Most of the builtin rules are suffix rules,
+# so this saves some time on slow systems.
+.SUFFIXES:
+
+# Do not delete intermediate files from chains of implicit rules
+$(OBJS):
+endif
+
include $(SRC_PATH)/arch.mak
OBJS += $(OBJS-yes)
diff --cc libavcodec/libavcodec.v
index c923cd3,f1d5e5b..304c2ef
--- a/libavcodec/libavcodec.v
+++ b/libavcodec/libavcodec.v
@@@ -1,7 -1,6 +1,9 @@@
- LIBAVCODEC_$MAJOR {
- global: av*;
- #deprecated, remove after next bump
- audio_resample;
- audio_resample_close;
- local: *;
+ LIBAVCODEC_MAJOR {
+ global:
+ av*;
++ #deprecated, remove after next bump
++ audio_resample;
++ audio_resample_close;
+ local:
+ *;
};
diff --cc libavdevice/libavdevice.v
index de7278c,33042e5..9761617
--- a/libavdevice/libavdevice.v
+++ b/libavdevice/libavdevice.v
@@@ -1,4 -1,6 +1,7 @@@
- LIBAVDEVICE_$MAJOR {
- global: avdevice_*; av_*;
- local: *;
+ LIBAVDEVICE_MAJOR {
+ global:
+ avdevice_*;
++ av_*;
+ local:
+ *;
};
diff --cc libavformat/libavformat.v
index a00a309,47d5ddc..c961cd8
--- a/libavformat/libavformat.v
+++ b/libavformat/libavformat.v
@@@ -1,17 -1,6 +1,19 @@@
- LIBAVFORMAT_$MAJOR {
- global: av*;
- #FIXME those are for ffserver
- ff_inet_aton;
- ff_socket_nonblock;
- ff_rtsp_parse_line;
- ff_rtp_get_local_rtp_port;
- ff_rtp_get_local_rtcp_port;
- ffio_open_dyn_packet_buf;
- ffio_set_buf_size;
- ffurl_close;
- ffurl_open;
- ffurl_write;
- #those are deprecated, remove on next bump
- url_feof;
- local: *;
+ LIBAVFORMAT_MAJOR {
+ global:
+ av*;
++ #FIXME those are for ffserver
++ ff_inet_aton;
++ ff_socket_nonblock;
++ ff_rtsp_parse_line;
++ ff_rtp_get_local_rtp_port;
++ ff_rtp_get_local_rtcp_port;
++ ffio_open_dyn_packet_buf;
++ ffio_set_buf_size;
++ ffurl_close;
++ ffurl_open;
++ ffurl_write;
++ #those are deprecated, remove on next bump
++ url_feof;
+ local:
+ *;
};
diff --cc libpostproc/libpostproc.v
index e65d76f,0000000..27381c6
mode 100644,000000..100644
--- a/libpostproc/libpostproc.v
+++ b/libpostproc/libpostproc.v
@@@ -1,4 -1,0 +1,7 @@@
- LIBPOSTPROC_$MAJOR {
- global: postproc_*; pp_*;
- local: *;
++LIBPOSTPROC_MAJOR {
++ global:
++ postproc_*;
++ pp_*;
++ local:
++ *;
+};
diff --cc libswresample/libswresample.v
index 0d5efe4,0000000..3b3508d
mode 100644,000000..100644
--- a/libswresample/libswresample.v
+++ b/libswresample/libswresample.v
@@@ -1,4 -1,0 +1,7 @@@
- LIBSWRESAMPLE_$MAJOR {
- global: swr_*; swresample_*;
- local: *;
++LIBSWRESAMPLE_MAJOR {
++ global:
++ swr_*;
++ swresample_*;
++ local:
++ *;
+};
More information about the ffmpeg-cvslog
mailing list