Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Chromaprint to 1.3.2 and ffmpeg to 3.3.3 and dependencies #2865

Merged

Conversation

ymartin59
Copy link
Contributor

@ymartin59 ymartin59 commented Aug 7, 2017

Depends on ffmpeg package instead of Chromaprint specific cross/ffmpeg-2.2.1
Dependencies updates:

  • expat 2.2.2
  • fdk-acc 0.1.5
  • ffmpeg 3.3.3
  • fontconfig 2.12.4
  • freetype 2.8
  • gmp 6.1.2
  • libbluray 1.0.1
  • opus 1.2.1
  • x264 20170730-2245-stable
  • x265 2.1 for PPC and 2.5 for others

Motivation: Security update https://nvd.nist.gov/vuln/detail/CVE-2017-9993
Linked issues: #2812 #2775 #2834

Checklist

  • Build rule all-supported completed successfully - for both spk/chromaprint and spk/ffmpeg
  • Package upgrade completed successfully - for both spk/chromaprint and spk/ffmpeg
  • New installation of package completed successfully - for both spk/chromaprint and spk/ffmpeg
xpenology52> /usr/local/ffmpeg/bin/ffmpeg -version  
ffmpeg version 3.3.3 Copyright (c) 2000-2017 the FFmpeg developers
built with gcc 4.7.3 (crosstool-NG 1.18.0) 20130102 (prerelease)
configuration: --target-os=linux --cross-prefix=/spksrc/toolchains/syno-bromolow-5.2/work/x86_64-pc-linux-gnu/bin/x86_64-pc-linux-gnu- --prefix=/usr/local/ffmpeg --extra-cflags=-I/spksrc/spk/ffmpeg/work-bromolow-5.2/install/usr/local/ffmpeg/include --extra-ldflags=-L/spksrc/spk/ffmpeg/work-bromolow-5.2/install/usr/local/ffmpeg/lib --extra-libs='-lxml2 -ldl' --pkg-config=/usr/bin/pkg-config --ranlib=/spksrc/toolchains/syno-bromolow-5.2/work/x86_64-pc-linux-gnu/bin/x86_64-pc-linux-gnu-ranlib --enable-cross-compile --enable-rpath --enable-pic --enable-shared --enable-optimizations --enable-pthreads --enable-gpl --enable-version3 --enable-nonfree --enable-fontconfig --enable-libass --enable-libbluray --enable-avresample --enable-libfdk-aac --enable-libfreetype --enable-libfribidi --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopenjpeg --enable-libopus --enable-librtmp --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libvo-amrwbenc --enable-libvorbis --enable-libvpx --enable-libx264 --enable-libx265 --enable-gnutls --disable-debug --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-static --disable-txtpages --arch=x86_64 --enable-thumb
libavutil      55. 58.100 / 55. 58.100
libavcodec     57. 89.100 / 57. 89.100
libavformat    57. 71.100 / 57. 71.100
libavdevice    57.  6.100 / 57.  6.100
libavfilter     6. 82.100 /  6. 82.100
libavresample   3.  5.  0 /  3.  5.  0
libswscale      4.  6.100 /  4.  6.100
libswresample   2.  7.100 /  2.  7.100
libpostproc    54.  5.100 / 54.  5.100

xpenology52> /usr/local/chromaprint/bin/fpcalc -version
fpcalc version 1.3.2

@ymartin59 ymartin59 changed the title Update Chromaprint to 1.3.2 and ffmpeg to 3.3.3 and dependencies WIP Update Chromaprint to 1.3.2 and ffmpeg to 3.3.3 and dependencies Aug 7, 2017
@m4tt075
Copy link
Contributor

m4tt075 commented Aug 8, 2017

@ymartin59 : Great. Thanks for this! First successes with compiling TVH against your ffmpeg-3.3.3. Testing ongoing. Will report back...

@ymartin59
Copy link
Contributor Author

I still have troubles with chromaprint dynamic linkage to ffmpeg libraries, in progress...

@m4tt075
Copy link
Contributor

m4tt075 commented Aug 9, 2017

@ymartin59 : I have just successfully re-compiled TVH with all 6.1 toolchains against your ffmpeg-3.3.3 package. Have not been able to runtime-test though. That will have to wait for next week when I'm back home.

P.S.: There is some interesting information on dynamically linking ffmpeg in #1900. FWIW...

@m4tt075
Copy link
Contributor

m4tt075 commented Aug 11, 2017

@ymartin59 : I have successfully re-compiled TVH with all 5.2 toolchains against your ffmpeg-3.3.3 package too. Still looking good from here. Runtime-tests pending...

@gravelld
Copy link

@ymartin59 Could you get in touch with me about this, maybe via direct message on Twitter - https://twitter.com/dan_gravell or email is fine: https://www.blisshq.com/contact.html ?

I failed to use BountySource to attach bounty to #2812 and want to discuss with you...

Depends on ffmpeg package instead of Chromaprint specific cross/ffmpeg-2.2.1
Dependencies updates:
- expat 2.2.2
- fdk-acc 0.1.5
- ffmpeg 3.3.3
- fontconfig 2.12.4
- freetype 2.8
- gmp 6.1.2
- libbluray 1.0.1
- opus 1.2.1
- x264 20170730-2245-stable
- x265 2.1 for PPC and 2.5 for others
@ymartin59 ymartin59 force-pushed the master-2812-ffmpeg-chromaprint132 branch from 3fbc8d6 to a42f956 Compare August 13, 2017 07:11
@ymartin59 ymartin59 changed the title WIP Update Chromaprint to 1.3.2 and ffmpeg to 3.3.3 and dependencies Update Chromaprint to 1.3.2 and ffmpeg to 3.3.3 and dependencies Aug 13, 2017
@ymartin59
Copy link
Contributor Author

@cytec @KaraokeStu May you please review this ffmpeg/chromaprint upgrade so that I may publish packages ?

@m4tt075
Copy link
Contributor

m4tt075 commented Aug 14, 2017

@ymartin59 : Just a quick follow-up: Runtime test of TVH compiled against your ffmpeg-3.3.3 on evansport with 6.1 toolchains has been successful too. Will PR the transition to the general ffmpeg package for TVH, once your PR here has been merged. Thanks again!

@gravelld
Copy link

@ymartin59 When you say "publish packages" to where do you mean? I thought the repo only provided DSM 5.x packages right now?

@ymartin59
Copy link
Contributor Author

@gravelld That is right. I expect to publish new ffmpeg/chromaprint versions into SynoCommunity public repository for DSM 5.2 platforms.

@gravelld
Copy link

Oh, apologise, realise now that this is mostly about Chromaprint upgrade for all DSM versions...

@ymartin59
Copy link
Contributor Author

@cytec @KaraokeStu May you please review this ffmpeg/chromaprint upgrade so that I may publish packages ?

@KaraokeStu KaraokeStu merged commit 01a1c63 into SynoCommunity:master Aug 19, 2017
@ymartin59 ymartin59 deleted the master-2812-ffmpeg-chromaprint132 branch August 19, 2017 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants