Changeset 236195 in webkit

Timestamp:

Sep 19, 2018 6:29:41 AM (6 years ago)

Author:

Michael Catanzaro

Message:

Unreviewed, rolling out r235500.

Time to switch back to master runtime

Reverted changeset:

"Unreviewed, rolling out r235114."
​https://bugs.webkit.org/show_bug.cgi?id=188731
​https://trac.webkit.org/changeset/235500

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• flatpak/files/httpd-autogen.sh (deleted)
• flatpak/flatpakutils.py (modified) (1 diff)
• flatpak/org.webkit.GTK.yaml (modified) (1 diff)
• flatpak/org.webkit.WebKit.yaml (modified) (4 diffs)
• flatpak/patches/httpd-0001-configure-use-pkg-config-for-PCRE-detection.patch (deleted)
• flatpak/patches/libgcrypt-0001-Use-pkg-config-to-detect-gpg-error.patch (deleted)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-09-19  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, rolling out r235500.
+
+        Time to switch back to master runtime
+
+        Reverted changeset:
+
+        "Unreviewed, rolling out r235114."
+        https://bugs.webkit.org/show_bug.cgi?id=188731
+        https://trac.webkit.org/changeset/235500
+
 2018-09-19  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -613 +613 @@
         repos = FlatpakRepos()
         self.sdk_repo = repos.add(
-            FlatpakRepo("flathub",
-                        url="https://dl.flathub.org/repo/",
-                        repo_file="https://dl.flathub.org/repo/flathub.flatpakrepo"))
+            FlatpakRepo("gnome-nightly",
+                        url="https://sdk.gnome.org/nightly/repo/",
+                        repo_file="https://sdk.gnome.org/gnome-nightly.flatpakrepo"))
 
         manifest = load_manifest(self.manifest_path)

trunk/Tools/flatpak/org.webkit.GTK.yaml

@@ -2 +2 @@
   sources:
     - type: archive
-      url: https://mesa.freedesktop.org/archive/mesa-18.0.3.tar.xz
-      sha256: 099d9667327a76a61741a533f95067d76ea71a656e66b91507b3c0caf1d49e30
+      url: https://mesa.freedesktop.org/archive/mesa-18.0.5.tar.xz
+      sha256: 5187bba8d72aea78f2062d134ec6079a508e8216062dce9ec9048b5eb2c4fc6b
   config-opts:
     - --prefix=/app/softGL

trunk/Tools/flatpak/org.webkit.WebKit.yaml

@@ -1 +1 @@
 app-id: %(PORTNAME)s
 runtime: org.gnome.Platform
-runtime-version: "3.28"
+runtime-version: "master"
 # Control the exact version of the Sdk/Runtime that is being used.
-sdk-hash: cea71fe86d6961b4fe58046170f8dc8f8d4d04141ddf211e7cc6db44a18a0c49
-runtime-hash: 9785cf7dc62290d76eef4bf0f5d25240fc5bb3d73128c25e95c4e4cb90bb3560
+sdk-hash: 381c97c2d71033d9b09b15da363af75a49500b691245396adbc85ddca548410c
+runtime-hash: 235289b568ff0fe78771eeae45562c1415104821abbffe6559380aae58f06c58
 sdk: org.gnome.Sdk
 command: %(COMMAND)s
 finish-args:
   # Basically no sandboxing, the goal here is to make it flexible
-  # for developers, not really to isolate (openning all devices
+  # for developers, not really to isolate (opening all devices
   # to allow acces video cameras until we have a portal at least).
   - --share=ipc
@@ -43 +43 @@
   - name: httpd
     sources:
-      - type: git
-        url: https://github.com/apache/httpd.git
-        branch: 2.4.33
-      - type : file
-        path : files/httpd-autogen.sh
-        dest-filename : autogen.sh
-      # The version embedded in the sandbox doesn't have a working pcre-config
-      - type: patch
-        path: patches/httpd-0001-configure-use-pkg-config-for-PCRE-detection.patch
+      - type: archive
+        url: http://mirror.metrocast.net/apache//httpd/httpd-2.4.34.tar.gz
+        sha256: 6eaef0313b071d105eb3ca49289fc0f1431392e1061e1df420ca5775caed2211
     config-opts:
       - --enable-mpms-shared=all
@@ -57 +51 @@
       - --with-apr=/app/bin/apr-1-config
       - --with-apr-util=/app/bin/apu-1-config
-      - --with-pcre=/app
       - --enable-authnz-fcgi
       - --enable-cgi
@@ -111 +104 @@
       sha256: 66623c52f34d83a2c0fc963e08e8b9d0c13d88404e3b43b1852ef71eda19afa3
 
-  # GStreamer modules
-  - name: libvpx
-    no-autogen: true
-    sources:
-      - type: git
-        url: https://chromium.googlesource.com/webm/libvpx
-        branch: v1.7.0
-    config-opts:
-      - --enable-pic
-      - --as=yasm
-      - --disable-unit-tests
-      - --size-limit=16384x16384
-      - --enable-postproc
-      - --enable-multi-res-encoding
-      - --enable-temporal-denoising
-      - --enable-vp9-temporal-denoising
-      - --enable-vp9-postproc
-      - --enable-shared
-  - name: libopenh264
-    buildsystem: meson
-    sources:
-      - type: git
-        url: https://github.com/cisco/openh264.git
-        branch: a1b3f07c5271f312997fcc3451237031444c4475 # 1.8.0 + fix for gcc 8
-  - name: gstreamer
-    buildsystem: meson
-    sources:
-      - type: git
-        url: https://anongit.freedesktop.org/git/gstreamer/gstreamer
-        branch: 1.14.1
-    config-opts:
-      - -Ddisable_gtkdoc=true
-  - name: gst-plugins-base
-    buildsystem: meson
-    sources:
-      - type: git
-        url: https://anongit.freedesktop.org/git/gstreamer/gst-plugins-base
-        branch: 1.14.1
-    config-opts:
-      - -Ddisable_gtkdoc=true
-  - name: gst-plugins-good
-    buildsystem: meson
-    sources:
-      - type: git
-        url: https://anongit.freedesktop.org/git/gstreamer/gst-plugins-good
-        branch: 1.14.1
-      - type: patch
-        path: ../gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch
-      - type: patch
-        path: ../gstreamer/patches/gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch
-      - type: patch
-        path: ../gstreamer/patches/gst-plugins-good-0001-qtdemux-Do-not-run-the-preferred-decryptor-context-q.patch
-      - type: patch
-        path: ../gstreamer/patches/gst-plugins-good-0002-qtdemux-Do-not-unref-a-NULL-stream_tags.patch
-      - type: patch
-        path: ../gstreamer/patches/gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch
-    config-opts:
-      - -Ddisable_gtkdoc=true
-  - name: gst-plugins-ugly
-    buildsystem: meson
-    sources:
-      - type: git
-        url: https://anongit.freedesktop.org/git/gstreamer/gst-plugins-ugly
-        branch: 1.14.1
-    config-opts:
-      - -Ddisable_gtkdoc=true
-  - name: gst-plugins-bad
-    buildsystem: meson
-    sources:
-      - type: git
-        url: https://anongit.freedesktop.org/git/gstreamer/gst-plugins-bad
-        branch: 1.14.1
-    config-opts:
-      - -Ddisable_gtkdoc=true
-  - name: gst-libav
-    buildsystem: meson
-    sources:
-      - type: archive
-        url: https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.1.tar.xz
-        sha256: eff80a02d2f2fb9f34b67e9a26e9954d3218c7aa18e863f2a47805fa7066029d
-    config-opts:
-      - -Ddisable_gtkdoc=true
-
-  - name: libgcrypt # Speedup libgrcypt
+  # Speed up libgcrypt for testing.
+  # (You'd better not be using this flatpak environment for real use!)
+  - name: libgcrypt
     sources:
       - type: git
         url: https://dev.gnupg.org/source/libgcrypt.git
-        branch: libgcrypt-1.7.6
-      - type: patch
-        path: patches/libgcrypt-0001-Use-pkg-config-to-detect-gpg-error.patch
+        branch: libgcrypt-1.8.3
       - type: patch
         path: ../gtk/patches/libgcrypt-use-only-dev-urandom-for-testing.patch