diff options
| -rw-r--r-- | config/windows.config | 6 | ||||
| -rw-r--r-- | recipes/custom.py | 1 | ||||
| -rw-r--r-- | recipes/gdk-pixbuf.recipe | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/config/windows.config b/config/windows.config index 4fe24102..c9affbb6 100644 --- a/config/windows.config +++ b/config/windows.config @@ -88,9 +88,9 @@ if platform == Platform.WINDOWS: os.environ['ACLOCAL'] = 'aclocal-1.11' - # We use Visual Studio by default on Windows - if 'novisualstudio' not in variants: - variants.append('visualstudio') + # We currently don't use Visual Studio by default on Windows + if 'visualstudio' not in variants: + variants.append('novisualstudio') from cerbero.ide.vs.env import get_msvc_env, append_path # Contains only the env vars that MSVC needs, including any existing vars diff --git a/recipes/custom.py b/recipes/custom.py index a4189a49..0323175c 100644 --- a/recipes/custom.py +++ b/recipes/custom.py @@ -13,7 +13,6 @@ from cerbero.utils import shell, to_unixpath class GStreamer(recipe.Recipe): licenses = [License.LGPLv2Plus] version = '1.15.0.1' - can_msvc = False tagged_for_release = False # Always define `commit`, used by gst-validate if int(version.split('.')[1]) % 2 == 0: diff --git a/recipes/gdk-pixbuf.recipe b/recipes/gdk-pixbuf.recipe index ae8e38ea..cb9e9077 100644 --- a/recipes/gdk-pixbuf.recipe +++ b/recipes/gdk-pixbuf.recipe @@ -17,10 +17,6 @@ class Recipe(recipe.Recipe): 'gio_sniffing' : 'false', 'x11' : 'false'} deps = ['libjpeg-turbo', 'glib', 'libpng', 'tiff', 'zlib' ] - # gdk-pixbuf loads files with fopen() and passes the FILE handle directly - # to the image loader. You can't pass FILE handles between MinGW and MSVC, - # so build with MinGW till all the image loaders can be built with MSVC. - can_msvc = False patches = ['gdk-pixbuf/0001-meson-add-option-for-disabling-GIO-sniffing.patch', 'gdk-pixbuf/0001-meson-Don-t-generate-the-loader-cache-when-cross-com.patch', |