Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gvsbuild/patches/ffmpeg/build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ configure_cmd[idx++]="--enable-nvdec"
configure_cmd[idx++]="--enable-hwaccel=av1_nvdec"
configure_cmd[idx++]="--enable-hwaccel=h264_nvdec"
configure_cmd[idx++]="--enable-hwaccel=hevc_nvdec"
configure_cmd[idx++]="--enable-swresample"
configure_cmd[idx++]="--disable-programs"
configure_cmd[idx++]="--disable-avdevice"
configure_cmd[idx++]="--disable-swresample"
configure_cmd[idx++]="--disable-postproc"

if [ "$build_type" = "debug" ]; then
Expand Down
15 changes: 15 additions & 0 deletions gvsbuild/patches/ffmpeg/pc-files/libswresample.pc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# On windows, the prefix is automagically build from the location of the .pc file
prefix=@prefix@
exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include

Name: libswresample
Description: FFmpeg codec library
Version: 61.19.101
Requires:
Requires.private: libavutil
Conflicts:
Libs: -L${libdir} -lswresample
Libs.private: iconv.lib dav1d.lib ole32.lib user32.lib
Cflags: -I${includedir}
2 changes: 2 additions & 0 deletions gvsbuild/projects/ffmpeg.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ def build(self):
self.install(r".\libavformat\avformat-61.pdb bin")
self.install(r".\libavutil\avutil-58.pdb bin")
self.install(r".\libswscale\libswscale-7.pdb bin")
self.install(r".\libswresample\swresample-4.pdb bin")

self.install_pc_files()
self.install(r".\COPYING.LGPLv2.1 " r".\COPYING.LGPLv3 " r"share\doc\ffmpeg")
Expand All @@ -78,6 +79,7 @@ def post_install(self):
"avformat.lib",
"avutil.lib",
"swscale.lib",
"swresample.lib",
]:
self.builder.exec_msys(
["mv", lib, "../lib/"],
Expand Down
6 changes: 3 additions & 3 deletions gvsbuild/projects/freerdp.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ def __init__(self):
Project.__init__(
self,
"freerdp",
version="2.11.2",
archive_url="https://github.com/FreeRDP/FreeRDP/files/12670558/freerdp-{version}.tar.gz",
hash="17e36553065cb59126f8fee987ec74783db50232b361574dac86b7a768dea3b4",
version="3.15.0",
archive_url="https://github.com/FreeRDP/FreeRDP/releases/download/{version}/freerdp-{version}.tar.gz",
hash="e8cd58decef4c970faea2fbea675970eea60e440ebe8033c54889acb83787371",
dependencies=[
"cmake",
"ninja",
Expand Down