diff --git a/.editorconfig b/.editorconfig index a0c12e28..698c666d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,7 @@ trim_trailing_whitespace = true [*.py] max_line_length = 200 +quote_type = double [*.yml] tab_width = 2 diff --git a/recipes/wxwidgets/all/conanfile.py b/recipes/wxwidgets/all/conanfile.py index ac96e5f1..ddf4bcd3 100644 --- a/recipes/wxwidgets/all/conanfile.py +++ b/recipes/wxwidgets/all/conanfile.py @@ -102,9 +102,6 @@ def system_requirements(self): 'libwebkitgtk-dev']) # TODO : GTK3 # 'libwebkitgtk-3.0-dev']) - if self.options.mediactrl: - packages.extend(['libgstreamer0.10-dev', - 'libgstreamer-plugins-base0.10-dev']) for package in packages: installer.install(package) @@ -133,6 +130,9 @@ def requirements(self): self.requires('expat/2.2.7') if self.options.cairo: self.requires("cairo/1.17.4") + if self.options.mediactrl: + self.requires("gstreamer/1.19.2") + self.requires("gst-plugins-base/1.19.2") def source(self): tools.get(**self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder)