aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
blob: b31f7fd74d457543fee1d2e3b6f3ef2303fa255d (about) (plain)
1
2
3
*.scm       diff=scheme
*.scm.in    diff=scheme
*.texi      diff=texinfo
0400'>2023-03-28gnu: jami: Update to 20230323.0....* gnu/packages/jami.scm (jami): Update to 20230323.0. (%ffmpeg-default-configure-flags): Update flags. (pjproject-jami): Update commit. (ffmpeg-jami) [version, source, outputs]: : Delete fields. [arguments]: Delete disable-problematic-tests phase. * gnu/packages/patches/jami-libjami-headers-search.patch: Rebase patch. Maxim Cournoyer 2023-03-28gnu: ffmpeg-5: Rename variable to ffmpeg....* gnu/packages/video.scm (ffmpeg-5): Rename to... (ffmpeg): ... this, replacing the old 'ffmpeg' alias. (ffmpeg-4): Adjust accordingly. * gnu/packages/jami.scm (ffmpeg-jami): Likewise. Maxim Cournoyer 2023-03-23Merge remote-tracking branch 'origin/master' into staging....With resolved conflicts in: gnu/packages/ibus.scm gnu/packages/image.scm gnu/packages/lisp.scm gnu/packages/virtualization.scm Maxim Cournoyer