Giter Club home page Giter Club logo

vcpkg-ffmpeg's Introduction

VCPKG repository for modified FFmpeg port

This repository contains the vcpkg port for FFmpeg, which is modified to include additional features required by Resolume.

Versions

master branch contains the latest version that might still be in internal development

date tags rever to the version from vcpkg that was pulled and modified, version number tags report the first version of Resolume to include this version of FFmpeg. This does not update with every release of the Resolume software.

Superseeded repositories

This superseeds the vcpkg-public-registry repository, which was used to host the FFmpeg port before we changed our maintence mode. That repo was in use up until Resolume 7.20.x.

Notes on how this repo is upgraded by team Resolume

Upgrade vcpkg and FFmpeg

As we use a custom modified version of FFmpeg, we need to upgrade this port manually. We still like to use the updates from upstream vcpkg so we need to extract those changes and apply our changes on top of that.

Extract changes from vcpkg

# Inside the vcpkg repo
git subtree split -P ports/ffmpeg -b ffmpeg-port

# checkout our public registry
git clone https://github.com/resolume/vcpkg-public-registry.git
cd vcpkg-public-registry

# assuming our modifications on ffmpeg are latest commit on master
git checkout -B ffmpeg-port master^1
git subtree pull <path-to-vcpkg-repo> ffmpeg-port --prefix ports/ffmpeg
git checkout -B ffmpeg-update master
git rebase -i --autosquash ffmpeg-port

### Fix conflicts (probably version in vcpkg.json)

# update version files
git rev-parse HEAD:ports/ffmpeg

# copy this commit and update `versions/f-/ffmpeg.json` to include this version (with new port file version)

# update baseline.json port-version to match

# Then commit these changes
git commit --amend --no-edit versions
git remote add forpr [email protected]/sandercox/vcpkg-public-registry.git
git push forpr ffmpeg-update

# Head over to github to start a PR with these changes

vcpkg-ffmpeg's People

Contributors

mcmtroffaes avatar sibras avatar sandercox avatar ras0219-msft avatar cenit avatar neumann-a avatar ptahmose avatar jackboosy avatar omartijn avatar lemourin avatar cbezault avatar nancyli1013 avatar billyoneal avatar rastaban avatar emptyvoid avatar grdowns avatar koprok avatar autoantwort avatar endrift avatar rkitover avatar lilywangl avatar fran6co avatar daschuer avatar cheney-w avatar mkroening avatar vejmartin avatar nirvn avatar scovetta avatar monicaliu0311 avatar quyykk avatar

Watchers

Bart van der Ploeg avatar  avatar  avatar

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    ๐Ÿ–– Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. ๐Ÿ“Š๐Ÿ“ˆ๐ŸŽ‰

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google โค๏ธ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.