Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24'

* commit '535a742c2695a9e0c586b50d7fa76e318232ff24': build: Change structure of the linker version script templates Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-27 17:51:57 +02:00 · 2016-06-27 17:51:57 +02:00 · 0acc170aad
commit 0acc170aad
parent d956171813 535a742c26
10 changed files with 67 additions and 46 deletions
--- 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

--- a/libavcodec/libavcodec.v
+++ b/libavcodec/libavcodec.v
@ -1,7 +1,9 @@
-LIBAVCODEC_$MAJOR {
-        global: av*;
+LIBAVCODEC_MAJOR {
+    global:
+        av*;
        #deprecated, remove after next bump
        audio_resample;
        audio_resample_close;
-        local:  *;
+    local:
+        *;
 };
--- a/libavdevice/libavdevice.v
+++ b/libavdevice/libavdevice.v
@ -1,4 +1,7 @@
-LIBAVDEVICE_$MAJOR {
-        global: avdevice_*; av_*;
-        local: *;
+LIBAVDEVICE_MAJOR {
+    global:
+        avdevice_*;
+        av_*;
+    local:
+        *;
 };
--- a/libavfilter/libavfilter.v
+++ b/libavfilter/libavfilter.v
@ -1,4 +1,7 @@
-LIBAVFILTER_$MAJOR {
-        global: avfilter_*; av_*;
-        local: *;
+LIBAVFILTER_MAJOR {
+    global:
+        avfilter_*;
+        av_*;
+    local:
+        *;
 };
--- a/libavformat/libavformat.v
+++ b/libavformat/libavformat.v
@ -1,5 +1,6 @@
-LIBAVFORMAT_$MAJOR {
-        global: av*;
+LIBAVFORMAT_MAJOR {
+    global:
+        av*;
        #FIXME those are for ffserver
        ff_inet_aton;
        ff_socket_nonblock;
@ -13,5 +14,6 @@ LIBAVFORMAT_$MAJOR {
        ffurl_write;
        #those are deprecated, remove on next bump
        url_feof;
-        local: *;
+    local:
+        *;
 };
--- a/libavresample/libavresample.v
+++ b/libavresample/libavresample.v
@ -1,4 +1,6 @@
-LIBAVRESAMPLE_$MAJOR {
-        global: av*;
-        local:  *;
+LIBAVRESAMPLE_MAJOR {
+    global:
+        av*;
+    local:
+        *;
 };
--- a/libavutil/libavutil.v
+++ b/libavutil/libavutil.v
@ -1,4 +1,6 @@
-LIBAVUTIL_$MAJOR {
-        global: av*;
-        local: *;
+LIBAVUTIL_MAJOR {
+    global:
+        av*;
+    local:
+        *;
 };
--- a/libpostproc/libpostproc.v
+++ b/libpostproc/libpostproc.v
@ -1,4 +1,7 @@
-LIBPOSTPROC_$MAJOR {
-        global: postproc_*; pp_*;
-        local: *;
+LIBPOSTPROC_MAJOR {
+    global:
+        postproc_*;
+        pp_*;
+    local:
+        *;
 };
--- a/libswresample/libswresample.v
+++ b/libswresample/libswresample.v
@ -1,4 +1,7 @@
-LIBSWRESAMPLE_$MAJOR {
-        global: swr_*; swresample_*;
-        local: *;
+LIBSWRESAMPLE_MAJOR {
+    global:
+        swr_*;
+        swresample_*;
+    local:
+        *;
 };
--- a/libswscale/libswscale.v
+++ b/libswscale/libswscale.v
@ -1,4 +1,7 @@
-LIBSWSCALE_$MAJOR {
-        global: swscale_*; sws_*;
-        local: *;
+LIBSWSCALE_MAJOR {
+    global:
+        swscale_*;
+        sws_*;
+    local:
+        *;
 };