diff --git a/common.mak b/common.mak index 5eec8cc99d..fbe57d5c4a 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 c923cd378f..304c2ef427 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 de7278c193..9761617185 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 83e8887080..6518e5fc09 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 a00a3093c7..c961cd8f19 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 b8c7c7d2e5..d6fc7512ba 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 e9f04cba65..fb17058df5 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 e65d76f4f6..27381c6aca 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 0d5efe4706..3b3508d707 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 8b9a96ae66..96170a16a0 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: + *; };