Skip to content

Commit

Permalink
(#11836) zbar: bump reqs
Browse files Browse the repository at this point in the history
* zbar: bump reqs

* Update conanfile.py
  • Loading branch information
ericLemanissier authored Jul 22, 2022
1 parent 9e3615b commit cd873f2
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions recipes/zbar/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from conans import ConanFile, tools, AutoToolsBuildEnvironment
from conans import tools, AutoToolsBuildEnvironment
from conans.errors import ConanInvalidConfiguration
from conan import ConanFile
from conan.tools.build import cross_building
import os
import shutil

Expand Down Expand Up @@ -68,16 +70,16 @@ def requirements(self):
if self.options.with_imagemagick:
self.requires("imagemagick/7.0.11-14")
if self.options.with_gtk:
self.requires("gtk/4.4.0")
self.requires("gtk/4.7.0")
if self.options.with_qt:
self.requires("qt/5.15.2")
self.requires("qt/5.15.5")
if tools.Version(self.version) >= "0.22":
self.requires("libiconv/1.16")
self.requires("libiconv/1.17")

def build_requirements(self):
self.build_requires("gnu-config/cci.20210814")
if tools.Version(self.version) >= "0.22":
self.build_requires("automake/1.16.4")
self.build_requires("automake/1.16.5")
self.build_requires("gettext/0.21")
self.build_requires("pkgconf/1.7.4")
self.build_requires("libtool/2.4.6")
Expand All @@ -89,7 +91,7 @@ def validate(self):
raise ConanInvalidConfiguration("Zbar can't be built static on macOS")
if self.options.with_xv: #TODO add when available
self.output.warn("There is no Xvideo package available on Conan (yet). This recipe will use the one present on the system (if available).")
if tools.Version(self.version) >= "0.22" and tools.cross_building(self.settings):
if tools.Version(self.version) >= "0.22" and cross_building(self):
raise ConanInvalidConfiguration("{} can't be built on cross building environment currently because autopoint(part of gettext) doesn't execute correctly.".format(self.name))

def source(self):
Expand Down

0 comments on commit cd873f2

Please sign in to comment.