[SCM] kodi/experimental: Use OpenGL ES and no VAAPI/VDAPU on arm64

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Sun Sep 25 12:55:50 UTC 2016


The following commit has been merged in the experimental branch:
commit 9a4a934a18ea1b8ba2fd2d4cb3446c0e4451b28b
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sun Sep 25 13:52:08 2016 +0200

    Use OpenGL ES and no VAAPI/VDAPU on arm64
    
    This fixes FTBFS on arm64

diff --git a/debian/control b/debian/control
index 53a5278..e735c59 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,7 @@ Build-Depends: autoconf,
  libfreetype6-dev,
  libfribidi-dev,
  libgif-dev,
- libgles2-mesa-dev [armel armhf] | libgl1-mesa-dev | libgl-dev,
+ libgles2-mesa-dev [armel armhf arm64] | libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev,
  libgtest-dev,
  libiso9660-dev,
@@ -62,7 +62,7 @@ Build-Depends: autoconf,
  libmodplug-dev,
  libmysqlclient-dev,
  libnfs-dev,
- libomxil-bellagio-dev [armel armhf mipsel mips],
+ libomxil-bellagio-dev [armel armhf arm64 mipsel mips],
  libpcre3-dev,
  libplist-dev,
  libpng-dev,
@@ -81,8 +81,8 @@ Build-Depends: autoconf,
  libtinyxml-dev (>= 2.6.2),
  libtool,
  libudev-dev,
- libva-dev [!armel !armhf !mipsel !mips],
- libvdpau-dev [!armel !armhf !mipsel !mips],
+ libva-dev [!armel !armhf !arm64 !mipsel !mips],
+ libvdpau-dev [!armel !armhf !arm64 !mipsel !mips],
  libxmu-dev,
  libxrandr-dev,
  libxslt1-dev,
diff --git a/debian/rules b/debian/rules
index 7c119cf..f8062a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,9 @@ else
 DEBUG_CONFIG_OPTIONS += --disable-debug
 endif
 
-# Enable gles for armel, armhf
+# Enable gles for armel, armhf and arm64
 # Also disable VDPAU and VAAPI there since they break the build with gles
-ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
+ifneq (,$(filter armel armhf arm64,$(DEB_HOST_ARCH)))
 GL_CONFIG_OPTIONS = --disable-gl --enable-gles --disable-vdpau --disable-vaapi
 ARCH_SPECIFIC_LIB_RECOMMENDS_ADD =
 else

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list