[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7b93b62bc8d82ee08a395ecaf7c4bac468f52f51
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 7b93b62bc8d82ee08a395ecaf7c4bac468f52f51 (commit) via 63bc6600f863dc81b12277cc21ae3541e262f6c2 (commit) via 7dede5abef3fd1eaf84bb03aa7bf3c27fdadfc98 (commit) from 14d0e151b62aa5c2c1638c4ca357a26f50f786c4 (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 7b93b62bc8d82ee08a395ecaf7c4bac468f52f51 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 1 16:31:25 2017 +0000
strip: Explicitely call right binaries
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 63bc6600f863dc81b12277cc21ae3541e262f6c2 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 1 15:41:15 2017 +0000
ffmpeg: Update to 3.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7dede5abef3fd1eaf84bb03aa7bf3c27fdadfc98 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Nov 30 17:01:24 2017 +0000
nasm: Update to 2.13.02
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/packages/ffmpeg | 35 ++++++++++++++++++++++++++--------- lfs/cleanup-toolchain | 3 --- lfs/ffmpeg | 24 +++++++++++++----------- lfs/nasm | 4 ++-- lfs/strip | 11 ++++++++++- make.sh | 1 + 6 files changed, 52 insertions(+), 26 deletions(-)
Difference in files: diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index 7fc5e1494..75187a873 100644 --- a/config/rootfiles/packages/ffmpeg +++ b/config/rootfiles/packages/ffmpeg @@ -32,6 +32,9 @@ usr/bin/ffserver #usr/include/libavformat/avformat.h #usr/include/libavformat/avio.h #usr/include/libavformat/version.h +#usr/include/libavresample +#usr/include/libavresample/avresample.h +#usr/include/libavresample/version.h #usr/include/libavutil #usr/include/libavutil/adler32.h #usr/include/libavutil/aes.h @@ -67,10 +70,13 @@ usr/bin/ffserver #usr/include/libavutil/hmac.h #usr/include/libavutil/hwcontext.h #usr/include/libavutil/hwcontext_cuda.h +#usr/include/libavutil/hwcontext_d3d11va.h +#usr/include/libavutil/hwcontext_drm.h #usr/include/libavutil/hwcontext_dxva2.h #usr/include/libavutil/hwcontext_qsv.h #usr/include/libavutil/hwcontext_vaapi.h #usr/include/libavutil/hwcontext_vdpau.h +#usr/include/libavutil/hwcontext_videotoolbox.h #usr/include/libavutil/imgutils.h #usr/include/libavutil/intfloat.h #usr/include/libavutil/intreadwrite.h @@ -97,6 +103,7 @@ usr/bin/ffserver #usr/include/libavutil/samplefmt.h #usr/include/libavutil/sha.h #usr/include/libavutil/sha512.h +#usr/include/libavutil/spherical.h #usr/include/libavutil/stereo3d.h #usr/include/libavutil/tea.h #usr/include/libavutil/threadmessage.h @@ -119,39 +126,44 @@ usr/bin/ffserver #usr/lib/libavcodec.a #usr/lib/libavcodec.so #usr/lib/libavcodec.so.57 -#usr/lib/libavcodec.so.57.64.101 +usr/lib/libavcodec.so.57.107.100 #usr/lib/libavdevice.a #usr/lib/libavdevice.so #usr/lib/libavdevice.so.57 -#usr/lib/libavdevice.so.57.1.100 +usr/lib/libavdevice.so.57.10.100 #usr/lib/libavfilter.a #usr/lib/libavfilter.so #usr/lib/libavfilter.so.6 -#usr/lib/libavfilter.so.6.65.100 +usr/lib/libavfilter.so.6.107.100 #usr/lib/libavformat.a #usr/lib/libavformat.so #usr/lib/libavformat.so.57 -#usr/lib/libavformat.so.57.56.101 +usr/lib/libavformat.so.57.83.100 +#usr/lib/libavresample.a +#usr/lib/libavresample.so +usr/lib/libavresample.so.3 +usr/lib/libavresample.so.3.7.0 #usr/lib/libavutil.a #usr/lib/libavutil.so #usr/lib/libavutil.so.55 -#usr/lib/libavutil.so.55.34.101 +usr/lib/libavutil.so.55.78.100 #usr/lib/libpostproc.a #usr/lib/libpostproc.so #usr/lib/libpostproc.so.54 -#usr/lib/libpostproc.so.54.1.100 +usr/lib/libpostproc.so.54.7.100 #usr/lib/libswresample.a #usr/lib/libswresample.so #usr/lib/libswresample.so.2 -#usr/lib/libswresample.so.2.3.100 +usr/lib/libswresample.so.2.9.100 #usr/lib/libswscale.a #usr/lib/libswscale.so #usr/lib/libswscale.so.4 -#usr/lib/libswscale.so.4.2.100 +usr/lib/libswscale.so.4.8.100 #usr/lib/pkgconfig/libavcodec.pc #usr/lib/pkgconfig/libavdevice.pc #usr/lib/pkgconfig/libavfilter.pc #usr/lib/pkgconfig/libavformat.pc +#usr/lib/pkgconfig/libavresample.pc #usr/lib/pkgconfig/libavutil.pc #usr/lib/pkgconfig/libpostproc.pc #usr/lib/pkgconfig/libswresample.pc @@ -184,6 +196,7 @@ usr/bin/ffserver #usr/share/doc/ffmpeg/libavutil.html #usr/share/doc/ffmpeg/libswresample.html #usr/share/doc/ffmpeg/libswscale.html +#usr/share/doc/ffmpeg/mailing-list-faq.html #usr/share/doc/ffmpeg/nut.html #usr/share/doc/ffmpeg/platform.html #usr/share/ffmpeg @@ -192,13 +205,17 @@ usr/bin/ffserver #usr/share/ffmpeg/examples/README #usr/share/ffmpeg/examples/avio_dir_cmd.c #usr/share/ffmpeg/examples/avio_reading.c -#usr/share/ffmpeg/examples/decoding_encoding.c +#usr/share/ffmpeg/examples/decode_audio.c +#usr/share/ffmpeg/examples/decode_video.c #usr/share/ffmpeg/examples/demuxing_decoding.c +#usr/share/ffmpeg/examples/encode_audio.c +#usr/share/ffmpeg/examples/encode_video.c #usr/share/ffmpeg/examples/extract_mvs.c #usr/share/ffmpeg/examples/filter_audio.c #usr/share/ffmpeg/examples/filtering_audio.c #usr/share/ffmpeg/examples/filtering_video.c #usr/share/ffmpeg/examples/http_multiclient.c +#usr/share/ffmpeg/examples/hw_decode.c #usr/share/ffmpeg/examples/metadata.c #usr/share/ffmpeg/examples/muxing.c #usr/share/ffmpeg/examples/qsvdec.c diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain index 1c1fa8a50..436c7dd52 100644 --- a/lfs/cleanup-toolchain +++ b/lfs/cleanup-toolchain @@ -64,9 +64,6 @@ ifeq "$(TOOLCHAIN)" "1" # Remove man and info pages. rm -rfv $(TOOLS_DIR)/{,share}/{info,man}
- # Strip all binaries. - STRIP="/usr/bin/strip" $(DIR_SRC)/src/stripper $(TOOLS_DIR)/ - # Fix ownership of the toolchain. chown -R root:root $(TOOLS_DIR)/
diff --git a/lfs/ffmpeg b/lfs/ffmpeg index cd9e8b61f..d0dceec4b 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -24,14 +24,15 @@
include Config
-VER = 3.2.4 +VER = 3.4 + THISAPP = ffmpeg-$(VER) -DL_FILE = $(THISAPP).tar.xz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 6 +PAK_VER = 7
DEPS = "ffmpeg-libs sdl lame libvorbis xvid"
@@ -43,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 39fd71024ac76ba35f04397021af5606 +$(DL_FILE)_MD5 = 4d368db3431895d140e6f5f7b4987911
install : $(TARGET)
@@ -76,13 +77,14 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr \ - --enable-shared \ - --enable-postproc \ - --enable-pthreads \ - --enable-gpl - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-shared \ + --enable-gpl \ + --enable-version3 \ + --enable-avfilter \ + --enable-avresample + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - cd $(DIR_APP) && make install-libs @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/nasm b/lfs/nasm index b77e7cbfd..6eb34f101 100644 --- a/lfs/nasm +++ b/lfs/nasm @@ -24,7 +24,7 @@
include Config
-VER = 2.11.06 +VER = 2.13.02
THISAPP = nasm-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2b958e9f5d200641e6fc9564977aecc5 +$(DL_FILE)_MD5 = abb79a82fa30908217e30f76eca8a557
install : $(TARGET)
diff --git a/lfs/strip b/lfs/strip index 9fbdf7627..084082e7b 100644 --- a/lfs/strip +++ b/lfs/strip @@ -29,6 +29,15 @@ VER = ipfire THISAPP = strip TARGET = $(DIR_INFO)/$(THISAPP)
+ifeq "$(TOOLCHAIN)" "1" + SHELL = /bin/bash + STRIP = /usr/bin/strip + ROOT = $(TOOLS_DIR) +else + SHELL = $(TOOLS_DIR)/bin/bash + STRIP = $(TOOLS_DIR)/bin/strip +endif + ############################################################################### # Top-level Rules ############################################################################### @@ -49,6 +58,6 @@ $(TARGET) : # Don't strip VDR binaries, because they use a weird plugin system # which does not work when unneeded symbols get stripped from # /usr/sbin/vdr. - $(DIR_SRC)/src/stripper $(ROOT) \ + STRIP=$(STRIP) $(SHELL) $(DIR_SRC)/src/stripper $(ROOT) \ --exclude=/usr/src --exclude=$(TOOLS_DIR) \ --exclude=/usr/sbin/vdr --exclude=/usr/lib/vdr diff --git a/make.sh b/make.sh index 87125c0de..bb80f3c05 100755 --- a/make.sh +++ b/make.sh @@ -947,6 +947,7 @@ buildtoolchain() { lfsmake1 texinfo lfsmake1 xz lfsmake1 fake-environ + lfsmake1 strip lfsmake1 cleanup-toolchain }
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org