Skip to content

Commit

Permalink
Update ffmpeg to 3.3.2 and enable AC3 encoder
Browse files Browse the repository at this point in the history
  • Loading branch information
ymartin59 committed Jul 23, 2017
1 parent 40e9201 commit 83382e2
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
3 changes: 2 additions & 1 deletion cross/ffmpeg/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = ffmpeg
PKG_VERS = 3.2.2
PKG_VERS = 3.3.2
PKG_EXT = tar.bz2
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://www.ffmpeg.org/releases
Expand Down Expand Up @@ -31,6 +31,7 @@ CONFIGURE_ARGS += --enable-libtheora --enable-libvo-amrwbenc --enable-libvorbis
CONFIGURE_ARGS += --enable-libvpx --enable-libx264 --enable-libx265 --enable-openssl
CONFIGURE_ARGS += --disable-debug --disable-doc --disable-htmlpages --disable-manpages
CONFIGURE_ARGS += --disable-podpages --disable-static --disable-txtpages
CONFIGURE_ARGS += --enable-encoder=ac3

include ../../mk/spksrc.cross-cc.mk

Expand Down
16 changes: 8 additions & 8 deletions cross/ffmpeg/PLIST
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@ bin:bin/ffprobe
bin:bin/ffserver
lnk:lib/libavcodec.so
lnk:lib/libavcodec.so.57
lib:lib/libavcodec.so.57.64.101
lib:lib/libavcodec.so.57.89.100
lnk:lib/libavdevice.so
lnk:lib/libavdevice.so.57
lib:lib/libavdevice.so.57.1.100
lib:lib/libavdevice.so.57.6.100
lnk:lib/libavfilter.so
lnk:lib/libavfilter.so.6
lib:lib/libavfilter.so.6.65.100
lib:lib/libavfilter.so.6.82.100
lnk:lib/libavformat.so
lnk:lib/libavformat.so.57
lib:lib/libavformat.so.57.56.100
lib:lib/libavformat.so.57.71.100
lnk:lib/libavutil.so
lnk:lib/libavutil.so.55
lib:lib/libavutil.so.55.34.100
lib:lib/libavutil.so.55.58.100
lnk:lib/libpostproc.so
lnk:lib/libpostproc.so.54
lib:lib/libpostproc.so.54.1.100
lib:lib/libpostproc.so.54.5.100
lnk:lib/libswresample.so
lnk:lib/libswresample.so.2
lib:lib/libswresample.so.2.3.100
lib:lib/libswresample.so.2.7.100
lnk:lib/libswscale.so
lnk:lib/libswscale.so.4
lib:lib/libswscale.so.4.2.100
lib:lib/libswscale.so.4.6.100
shr:share/ffmpeg/ffprobe.xsd
shr:share/ffmpeg/libvpx-1080p50_60.ffpreset
shr:share/ffmpeg/libvpx-1080p.ffpreset
Expand Down
6 changes: 3 additions & 3 deletions cross/ffmpeg/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ffmpeg-3.2.2.tar.bz2 SHA1 1fdf3a0e5f1700067ab8b8f0c77c5a4e4505b606
ffmpeg-3.2.2.tar.bz2 SHA256 0b129a56d1b8d06101b1fcbfaa9f4f5eee3182d1ad6e44f511a84c12113a366b
ffmpeg-3.2.2.tar.bz2 MD5 82cf25d36df70ee995bbdb3efc079934
ffmpeg-3.3.2.tar.bz2 SHA1 584544ced449e4a05f17711da33d7c46fd72f2e4
ffmpeg-3.3.2.tar.bz2 SHA256 216900d5c0af9017bb8f76b0ad23f0ac53cf7fc618cf04b40d989bd99b088e6a
ffmpeg-3.3.2.tar.bz2 MD5 e6e3b5f85eb5cb5448501fe4d8ca5bd0
6 changes: 3 additions & 3 deletions spk/ffmpeg/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
SPK_NAME = ffmpeg
SPK_VERS = 3.2.2
SPK_REV = 5
SPK_VERS = 3.3.2
SPK_REV = 6
SPK_ICON = src/ffmpeg.png
CHANGELOG = "1. Update ffmpeg to 3.2.2"
CHANGELOG = "1. Update ffmpeg to 3.3.2 2. Enable AC3 encoder"

DEPENDS = cross/$(SPK_NAME)

Expand Down

4 comments on commit 83382e2

@Nexius2
Copy link

@Nexius2 Nexius2 commented on 83382e2 Aug 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello,
how can we have this version available on the Repo?

@ymartin59
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please wait... I have work still in progress to update all dependencies (openssl, ogg...) for both ffmpeg 3.3.3 and chromaprint. When over, I still have to confirm it builds for all platforms and install/update properly. \cc @KaraokeStu

By the way, on repo you will only find packages built for DSM 5.2.

@Nexius2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works for me on DSM 6.1

@ymartin59
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Nexius2 OK thanks. Now I have just updated to ffmpeg 3.3.3 as #2865

Please sign in to comment.