Title: [219820] trunk
Revision
219820
Author
zandober...@gmail.com
Date
2017-07-24 07:27:52 -0700 (Mon, 24 Jul 2017)

Log Message

[WPE] Add libepoxy to the Jhbuild moduleset
https://bugs.webkit.org/show_bug.cgi?id=174711

Reviewed by Carlos Alberto Lopez Perez.

.:

libepoxy 1.3.1 that's widely available in current stable distributions (Debian stable,
Ubuntu LTS) does suffice our needs, but also contains a bug that incorrectly determines
the current EGL context and the API version of OpenGL that's bound to that context.
Focusing on experiences on Debian systems, while the current stable Debian release has
this bug patched, the package for the testing distribution of Debian removed that same
patch for whatever reason, despite using the 1.3.1 version as the package basis.

To avoid this, libepoxy 1.4.3 is now added to WPE's Jhbuild moduleset. The WPE port
also now demands at least the 1.4.0 version to be available when configuring.

We should revisit the minimum version for libepoxy in the future if the 1.3 release
branch gets updated with the proper fix.

* Source/cmake/FindLibEpoxy.cmake:
* Source/cmake/OptionsWPE.cmake:

Tools:

* wpe/jhbuild.modules: Add libepoxy 1.4.3 to WPE's Jhbuild moduleset.

Modified Paths

Diff

Modified: trunk/ChangeLog (219819 => 219820)


--- trunk/ChangeLog	2017-07-24 14:24:38 UTC (rev 219819)
+++ trunk/ChangeLog	2017-07-24 14:27:52 UTC (rev 219820)
@@ -1,3 +1,26 @@
+2017-07-24  Zan Dobersek  <zdober...@igalia.com>
+
+        [WPE] Add libepoxy to the Jhbuild moduleset
+        https://bugs.webkit.org/show_bug.cgi?id=174711
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        libepoxy 1.3.1 that's widely available in current stable distributions (Debian stable,
+        Ubuntu LTS) does suffice our needs, but also contains a bug that incorrectly determines
+        the current EGL context and the API version of OpenGL that's bound to that context.
+        Focusing on experiences on Debian systems, while the current stable Debian release has
+        this bug patched, the package for the testing distribution of Debian removed that same
+        patch for whatever reason, despite using the 1.3.1 version as the package basis.
+
+        To avoid this, libepoxy 1.4.3 is now added to WPE's Jhbuild moduleset. The WPE port
+        also now demands at least the 1.4.0 version to be available when configuring.
+
+        We should revisit the minimum version for libepoxy in the future if the 1.3 release
+        branch gets updated with the proper fix.
+
+        * Source/cmake/FindLibEpoxy.cmake:
+        * Source/cmake/OptionsWPE.cmake:
+
 2017-07-21  Konstantin Tokarev  <annu...@yandex.ru>
 
        [cmake] Unreviewed, add definitions necessary to use ICU shipped with macOS

Modified: trunk/Source/cmake/FindLibEpoxy.cmake (219819 => 219820)


--- trunk/Source/cmake/FindLibEpoxy.cmake	2017-07-24 14:24:38 UTC (rev 219819)
+++ trunk/Source/cmake/FindLibEpoxy.cmake	2017-07-24 14:27:52 UTC (rev 219820)
@@ -43,4 +43,5 @@
 mark_as_advanced(LIBEPOXY_INCLUDE_DIRS LIBEPOXY_LIBRARIES)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBEPOXY REQUIRED_VARS LIBEPOXY_INCLUDE_DIRS LIBEPOXY_LIBRARIES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBEPOXY REQUIRED_VARS LIBEPOXY_INCLUDE_DIRS LIBEPOXY_LIBRARIES
+                                           VERSION_VAR   PC_LIBEPOXY_VERSION)

Modified: trunk/Source/cmake/OptionsWPE.cmake (219819 => 219820)


--- trunk/Source/cmake/OptionsWPE.cmake	2017-07-24 14:24:38 UTC (rev 219819)
+++ trunk/Source/cmake/OptionsWPE.cmake	2017-07-24 14:27:52 UTC (rev 219820)
@@ -70,7 +70,7 @@
 find_package(Freetype2 2.4.2 REQUIRED)
 find_package(HarfBuzz 0.9.18 REQUIRED)
 find_package(JPEG REQUIRED)
-find_package(LibEpoxy REQUIRED)
+find_package(LibEpoxy 1.4.0 REQUIRED)
 find_package(LibGcrypt 1.6.0 REQUIRED)
 find_package(LibSoup 2.42.0 REQUIRED)
 find_package(LibXml2 2.8.0 REQUIRED)

Modified: trunk/Tools/ChangeLog (219819 => 219820)


--- trunk/Tools/ChangeLog	2017-07-24 14:24:38 UTC (rev 219819)
+++ trunk/Tools/ChangeLog	2017-07-24 14:27:52 UTC (rev 219820)
@@ -1,5 +1,14 @@
 2017-07-24  Zan Dobersek  <zdober...@igalia.com>
 
+        [WPE] Add libepoxy to the Jhbuild moduleset
+        https://bugs.webkit.org/show_bug.cgi?id=174711
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * wpe/jhbuild.modules: Add libepoxy 1.4.3 to WPE's Jhbuild moduleset.
+
+2017-07-24  Zan Dobersek  <zdober...@igalia.com>
+
         [WPE] libepoxy headers can use EGL_CAST, which might not be defined by eglplatform.h
         https://bugs.webkit.org/show_bug.cgi?id=174780
 

Modified: trunk/Tools/wpe/jhbuild.modules (219819 => 219820)


--- trunk/Tools/wpe/jhbuild.modules	2017-07-24 14:24:38 UTC (rev 219819)
+++ trunk/Tools/wpe/jhbuild.modules	2017-07-24 14:27:52 UTC (rev 219820)
@@ -24,6 +24,7 @@
       <dep package="wpe-mesa"/>
       <dep package="libgpg-error"/>
       <dep package="libgcrypt"/>
+      <dep package="libepoxy"/>
       <dep package="dyz"/>
     </dependencies>
   </metamodule>
@@ -41,6 +42,8 @@
       href=""
   <repository type="git" name="github.com"
       href=""
+  <repository type="tarball" name="github-tarball"
+      href=""
   <repository type="tarball" name="gstreamer"
       href=""
   <repository type="tarball" name="xkbcommon.org"
@@ -266,6 +269,11 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libepoxy" autogen-sh="configure" autogenargs="--enable-glx=no">
+    <branch module="anholt/libepoxy/releases/download/1.4.3/libepoxy-1.4.3.tar.xz"
+            version="1.4.3" repo="github-tarball"/>
+  </autotools>
+
   <autotools id="dyz" supports-non-srcdir-builds="no">
     <branch repo="github.com" module="Igalia/dyz" tag="0880252bac243add39ea54c0797ceb167d775ce9"/>
   </autotools>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to