+- Kodi Community Forum (https://forum.kodi.tv)
+-- Forum: Development (https://forum.kodi.tv/forumdisplay.php?fid=32)
+--- Forum: Kodi Application (https://forum.kodi.tv/forumdisplay.php?fid=93)
+--- Thread: How to apply changes for FFmpeg version bump to 1.1? (/showthread.php?tid=156427)
How to apply changes for FFmpeg version bump to 1.1? - flyingrat - 2013-02-16
Most work on the FFmpeg version bump to v1.1 is done. I need some advice here:
- What's the normal way of working with xbmc and git (e.g: "fork, apply ffmpeg 1.1 changes, test, change, test, pull request") ?
- Which branch shall I fork, current master or the frodo release?
- How do I find and invite developers that can test the fork on other platforms?
- What is the best way to find a "buildable" version of the master branch for osx?
RE: How to apply changes for FFmpeg version bump to 1.1? - davilla - 2013-02-16
1) "fork, apply ffmpeg 1.1 changes, test, change, test, pull request"
2) current master, this will never go into frodo
3) you don't, we see all PRs.
4) eh ? same as the others, current master
make sure the patches in lib/ffmpeg/patches are up to date.
RE: How to apply changes for FFmpeg version bump to 1.1? - flyingrat - 2013-02-16
Hi Davilla, thanks for the update! Some follow-up questions:
Quote:"3. How do I find and invite developers that can test the fork on other platforms?"Ok, so there is no need to test other platforms before the PR then?
you don't, we see all PRs.
Quote:"4. What is the best way to find a "buildable" version of the master branch for osx?"Sorry, forgot to explain. I've had quite some trouble in the past with some branches that didn't build correctly on osx. I was wondering if xbmc has a build-server with nightly builds you can check for a particular platform (osx in my case) ?
eh ? same as the others, current master
Quote:"make sure the patches in lib/ffmpeg/patches are up to date."Sorry, no exiting lib/ffmpeg/patches directory. Maybe it was created by a xbmc maintainer?
--
Regards, Lars.
RE: How to apply changes for FFmpeg version bump to 1.1? - davilla - 2013-02-16
Well testing on all platforms is mandatory before the PR will be injected. Once this becomes a real PR then I'm sure some XBMC will jump in to test on various platforms.
We go have a buildbot that builds the nightlies and we can tell it to target any github repo/branch.
see the existing lib/ffmpeg/patches ( https://github.com/xbmc/xbmc/tree/master/lib/ffmpeg/patches ) if this is not addressed, then the PR will get ponked
This dir is all the XBMC patches we make to ffmpeg. It MUST be current and kept up to date.
RE: How to apply changes for FFmpeg version bump to 1.1? - flyingrat - 2013-02-18
> We go have a buildbot that builds the nightlies and we can tell it to target any github repo/branch.
Great, where do you find the status page for the nightlies?
> This dir is all the XBMC patches we make to ffmpeg. It MUST be current and kept up to date.
Well, I presume the directory only includes ffmpeg patches and since we are starting out with a fresh version of ffmpeg, the directory will be empty for now.
Btw, here is the fork with the FFmpeg version 1.1.2: https://github.com/FlyingRat/xbmc-ffmpeg-v1.1-bump.git
RE: How to apply changes for FFmpeg version bump to 1.1? - davilla - 2013-02-18
(2013-02-18, 00:08)flyingrat Wrote: > This dir is all the XBMC patches we make to ffmpeg. It MUST be current and kept up to date.
Well, I presume the directory only includes ffmpeg patches and since we are starting out with a fresh version of ffmpeg, the directory will be empty for now.
Wrong assumption, that ASSumes that all those patches are in fact in the updated ffmpeg which is not true.
RE: How to apply changes for FFmpeg version bump to 1.1? - Memphiz - 2013-02-18
Life could be so easy
RE: How to apply changes for FFmpeg version bump to 1.1? - flyingrat - 2013-02-18
(2013-02-18, 12:42)Memphiz Wrote: Life could be so easyYes, it would be if Mr. Murphy didn't hang around...
