Skip to content

Commit

Permalink
* drop support for older lib versions
Browse files Browse the repository at this point in the history
* make x264 optional (just warn if there is no vpx and no x264)
* only check for "vpx" and not "libvpx" (no longer used by any supported distro)

git-svn-id: https://xpra.org/svn/Xpra/trunk@11580 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jan 4, 2016
1 parent 5043af0 commit 2f09fc4
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ def is_msvc():
printing_ENABLED = DEFAULT

enc_proxy_ENABLED = DEFAULT
enc_x264_ENABLED = DEFAULT #too important to detect
enc_x264_ENABLED = DEFAULT and pkg_config_ok("--exists", "x264")
enc_x265_ENABLED = DEFAULT and pkg_config_ok("--exists", "x265")
pillow_ENABLED = DEFAULT
webp_ENABLED = DEFAULT and pkg_config_ok("--atleast-version=0.3", "libwebp", fallback=WIN32)
vpx_ENABLED = DEFAULT and (pkg_config_ok("--atleast-version=1.0", "vpx", fallback=WIN32) or pkg_config_ok("--atleast-version=1.0", "libvpx", fallback=WIN32))
webp_ENABLED = DEFAULT and pkg_config_ok("--atleast-version=0.4", "libwebp", fallback=WIN32)
vpx_ENABLED = DEFAULT and pkg_config_ok("--atleast-version=1.3", "vpx", fallback=WIN32)
#ffmpeg 2 onwards:
dec_avcodec2_ENABLED = DEFAULT and pkg_config_ok("--atleast-version=55", "libavcodec", fallback=WIN32)
dec_avcodec2_ENABLED = DEFAULT and pkg_config_ok("--atleast-version=56", "libavcodec", fallback=WIN32)
# some version strings I found:
# Fedora:
# * 19: 54.92.100
Expand Down Expand Up @@ -272,7 +272,9 @@ def is_msvc():
if memoryview_ENABLED and sys.version<"2.7":
print("Error: memoryview support requires Python version 2.7 or greater")
exit(1)

if not enc_x264_ENABLED and not vpx_ENABLED:
print("Warning: no x264 and no vpx support!")
print(" you should enable at least one of these two video encodings")

#*******************************************************************************
# default sets:
Expand Down

0 comments on commit 2f09fc4

Please sign in to comment.