Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24'

* commit '535a742c2695a9e0c586b50d7fa76e318232ff24':
  build: Change structure of the linker version script templates

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

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/:/:\
+	$(M)sed 's/MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
-/' -e 's/; /;\
-/g' > $@
 
 %.c %.h %.ver: TAG = GEN
 

libavcodec/libavcodec.v

@@ -1,7 +1,9 @@
-LIBAVCODEC_$MAJOR {
+LIBAVCODEC_MAJOR {
-        global: av*;
+    global:
-                #deprecated, remove after next bump
+        av*;
-                audio_resample;
+        #deprecated, remove after next bump
-                audio_resample_close;
+        audio_resample;
-        local:  *;
+        audio_resample_close;
+    local:
+        *;
 };

libavdevice/libavdevice.v

@@ -1,4 +1,7 @@
-LIBAVDEVICE_$MAJOR {
+LIBAVDEVICE_MAJOR {
-        global: avdevice_*; av_*;
+    global:
-        local: *;
+        avdevice_*;
+        av_*;
+    local:
+        *;
 };

libavfilter/libavfilter.v

@@ -1,4 +1,7 @@
-LIBAVFILTER_$MAJOR {
+LIBAVFILTER_MAJOR {
-        global: avfilter_*; av_*;
+    global:
-        local: *;
+        avfilter_*;
+        av_*;
+    local:
+        *;
 };

libavformat/libavformat.v

@@ -1,17 +1,19 @@
-LIBAVFORMAT_$MAJOR {
+LIBAVFORMAT_MAJOR {
-        global: av*;
+    global:
-                #FIXME those are for ffserver
+        av*;
-                ff_inet_aton;
+        #FIXME those are for ffserver
-                ff_socket_nonblock;
+        ff_inet_aton;
-                ff_rtsp_parse_line;
+        ff_socket_nonblock;
-                ff_rtp_get_local_rtp_port;
+        ff_rtsp_parse_line;
-                ff_rtp_get_local_rtcp_port;
+        ff_rtp_get_local_rtp_port;
-                ffio_open_dyn_packet_buf;
+        ff_rtp_get_local_rtcp_port;
-                ffio_set_buf_size;
+        ffio_open_dyn_packet_buf;
-                ffurl_close;
+        ffio_set_buf_size;
-                ffurl_open;
+        ffurl_close;
-                ffurl_write;
+        ffurl_open;
-                #those are deprecated, remove on next bump
+        ffurl_write;
-                url_feof;
+        #those are deprecated, remove on next bump
-        local: *;
+        url_feof;
+    local:
+        *;
 };

libavresample/libavresample.v

@@ -1,4 +1,6 @@
-LIBAVRESAMPLE_$MAJOR {
+LIBAVRESAMPLE_MAJOR {
-        global: av*;
+    global:
-        local:  *;
+        av*;
+    local:
+        *;
 };

libavutil/libavutil.v

@@ -1,4 +1,6 @@
-LIBAVUTIL_$MAJOR {
+LIBAVUTIL_MAJOR {
-        global: av*;
+    global:
-        local: *;
+        av*;
+    local:
+        *;
 };

libpostproc/libpostproc.v

@@ -1,4 +1,7 @@
-LIBPOSTPROC_$MAJOR {
+LIBPOSTPROC_MAJOR {
-        global: postproc_*; pp_*;
+    global:
-        local: *;
+        postproc_*;
+        pp_*;
+    local:
+        *;
 };

libswresample/libswresample.v

@@ -1,4 +1,7 @@
-LIBSWRESAMPLE_$MAJOR {
+LIBSWRESAMPLE_MAJOR {
-        global: swr_*; swresample_*;
+    global:
-        local: *;
+        swr_*;
+        swresample_*;
+    local:
+        *;
 };

libswscale/libswscale.v

@@ -1,4 +1,7 @@
-LIBSWSCALE_$MAJOR {
+LIBSWSCALE_MAJOR {
-        global: swscale_*; sws_*;
+    global:
-        local: *;
+        swscale_*;
+        sws_*;
+    local:
+        *;
 };