[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 268cdcd5b13fd164a1a27461e2a2f266784f2ab7

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 268cdcd5b13fd164a1a27461e2a2f266784f2ab7

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3243 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  268cdcd5b13fd164a1a27461e2a2f266784f2ab7 (commit)
      from  b33473414dc9cfe3c51fba782355b187b8813d5c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 268cdcd5b13fd164a1a27461e2a2f266784f2ab7
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu May 6 18:32:40 2021 +0200

    ffmpeg: disable static libraries
    
    - Added --disable-static to lfs configure statement
    - Updated rootfile with removal of static library entries
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/packages/ffmpeg | 9 ---------
 lfs/ffmpeg                       | 3 ++-
 2 files changed, 2 insertions(+), 10 deletions(-)

Difference in files:
diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg
index 633706172..b388d18f1 100644
--- a/config/rootfiles/packages/ffmpeg
+++ b/config/rootfiles/packages/ffmpeg
@@ -137,39 +137,30 @@ usr/bin/ffprobe
 #usr/include/libswscale
 #usr/include/libswscale/swscale.h
 #usr/include/libswscale/version.h
-#usr/lib/libavcodec.a
 #usr/lib/libavcodec.so
 usr/lib/libavcodec.so.58
 usr/lib/libavcodec.so.58.134.100
-#usr/lib/libavdevice.a
 #usr/lib/libavdevice.so
 usr/lib/libavdevice.so.58
 usr/lib/libavdevice.so.58.13.100
-#usr/lib/libavfilter.a
 #usr/lib/libavfilter.so
 usr/lib/libavfilter.so.7
 usr/lib/libavfilter.so.7.110.100
-#usr/lib/libavformat.a
 #usr/lib/libavformat.so
 usr/lib/libavformat.so.58
 usr/lib/libavformat.so.58.76.100
-#usr/lib/libavresample.a
 #usr/lib/libavresample.so
 usr/lib/libavresample.so.4
 usr/lib/libavresample.so.4.0.0
-#usr/lib/libavutil.a
 #usr/lib/libavutil.so
 usr/lib/libavutil.so.56
 usr/lib/libavutil.so.56.70.100
-#usr/lib/libpostproc.a
 #usr/lib/libpostproc.so
 usr/lib/libpostproc.so.55
 usr/lib/libpostproc.so.55.9.100
-#usr/lib/libswresample.a
 #usr/lib/libswresample.so
 usr/lib/libswresample.so.3
 usr/lib/libswresample.so.3.9.100
-#usr/lib/libswscale.a
 #usr/lib/libswscale.so
 usr/lib/libswscale.so.5
 usr/lib/libswscale.so.5.9.100
diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index dbc2e933e..a01189d9f 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 11
+PAK_VER    = 12
 
 DEPS       = sdl lame libvorbis xvid
 
@@ -92,6 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		./configure \
 		--prefix=/usr \
 		--enable-shared \
+		--disable-static \
 		--enable-gpl \
 		--enable-version3 \
 		--enable-avfilter \


hooks/post-receive
--
IPFire 2.x development tree