From d0376e319c72cbd19a8b602510fbde4353d54f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Thu, 20 Jul 2017 10:50:35 +0200
Subject: [PATCH 2/2] Revert "Check whether VDPAU driver is installed"
This reverts commit 9e2e039f72fd5ff576a15b5d4dc67275624aadd3.
---
README.md | 2 -
.../formatsupport/FormatSupportCheck.vala | 11 ----
src/nuvolakit-runner/system/Dri.vala | 1 -
src/nuvolakit-runner/system/Graphics.vala | 75 ----------------------
src/tests/GraphicsTest.vala | 44 -------------
vapi/dri2.deps | 2 -
vapi/dri2.vapi | 22 -------
vapi/libdrm.vapi | 1 -
wscript | 6 +-
9 files changed, 2 insertions(+), 162 deletions(-)
delete mode 100644 src/nuvolakit-runner/system/Dri.vala
delete mode 100644 src/tests/GraphicsTest.vala
delete mode 100644 vapi/dri2.deps
delete mode 100644 vapi/dri2.vapi
delete mode 100644 vapi/libdrm.vapi
diff --git a/README.md b/README.md
index a0bb847..96bd2dc 100644
--- a/README.md
+++ b/README.md
@@ -117,8 +117,6 @@ Build and Install
* [javascriptcoregtk-4.0](http://webkitgtk.org/) >= 2.16.0 (2.16.1 recommended)
* [libnotify](https://git.gnome.org/browse/libnotify/) >= 0.7
* [gstreamer](https://gstreamer.freedesktop.org/) >= 1.8.3 (>= 1.12 for MSE)
- * [libdri2](https://github.com/robclark/libdri2) >= 1.0.0
- * [libdrm](https://dri.freedesktop.org/libdrm/) >= 2.2
* libuuid
* libsecret-1 >= 0.16
* optional unity >= 3.0
diff --git a/src/nuvolakit-runner/formatsupport/FormatSupportCheck.vala b/src/nuvolakit-runner/formatsupport/FormatSupportCheck.vala
index af04d7e..0cf7e90 100644
--- a/src/nuvolakit-runner/formatsupport/FormatSupportCheck.vala
+++ b/src/nuvolakit-runner/formatsupport/FormatSupportCheck.vala
@@ -109,17 +109,6 @@ public class FormatSupportCheck : GLib.Object
{
warning("Plugin listing error: %s", e.message);
}
-
- try
- {
- var dri2_driver = Graphics.dri2_get_driver_name();
- if (!Graphics.have_vdpau_driver(dri2_driver))
- warning("VDPAU Driver for %s not found. Flash plugin may suffer.", dri2_driver);
- }
- catch (Graphics.DriError e)
- {
- warning("Failed to get DRI2 driver name. %s", e.message);
- }
try
{
string? failed_requirements = null;
diff --git a/src/nuvolakit-runner/system/Dri.vala b/src/nuvolakit-runner/system/Dri.vala
deleted file mode 100644
index 8b13789..0000000
--- a/src/nuvolakit-runner/system/Dri.vala
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/nuvolakit-runner/system/Graphics.vala b/src/nuvolakit-runner/system/Graphics.vala
index d175b76..316ce1a 100644
--- a/src/nuvolakit-runner/system/Graphics.vala
+++ b/src/nuvolakit-runner/system/Graphics.vala
@@ -69,79 +69,4 @@ public void ensure_gl_extension_mounted(Gtk.Window? parent_window)
}
#endif
-const Dri2.EventOps DRI2_NO_OPS = {};
-
-public errordomain DriError
-{
- INIT_DISPLAY,
- EXTENSION_QUERY,
- VERSION_QUERY,
- CONNECT;
-}
-
-/**
- * Get the name of DRI2 driver
- *
- * @return driver name
- * @throws DriError on failure
- */
-public string dri2_get_driver_name() throws DriError
-{
- var dpy = new X.Display(null);
- int major, minor;
- string driver;
- dri2_connect(dpy, out major, out minor, out driver);
- debug("DRI %d.%d; driver %s", major, minor, driver);
- return driver;
-}
-
-private void dri2_connect(X.Display dpy, out int major, out int minor, out string driver) throws DriError
-{
- major = 0;
- minor = 0;
- int driverType = Dri2.DriverDRI;
- driver = null;
- int eventBase, errorBase;
- string? device = null;
-
- if (!Dri2.init_display(dpy, DRI2_NO_OPS))
- throw new DriError.INIT_DISPLAY("DRI2InitDisplay failed.");
-
- if (!Dri2.query_extension(dpy, out eventBase, out errorBase))
- throw new DriError.EXTENSION_QUERY("DRI2QueryExtension failed, %d, %d", eventBase, errorBase);
-
- if (!Dri2.query_version(dpy, out major, out minor))
- throw new DriError.VERSION_QUERY("DRI2QueryVersion failed");
-
- if (!Dri2.connect(dpy, dpy.default_root_window(), driverType, out driver, out device))
- throw new DriError.CONNECT("DRI2Connect failed");
-}
-
-/**
- * Check whether VDPAU driver is available
- *
- * @param name The driver name.
- * @return `true` if the corresponding `libvdpau_XXX.so` has been found, false otherwise.
- */
-public bool have_vdpau_driver(string name)
-{
- var filename = "/usr/lib/libvdpau_%s.so".printf(name);
- if (FileUtils.test(filename, FileTest.EXISTS))
- {
- debug("VDPAU driver found: %s", filename);
- return true;
- }
- var libdirs = Diorite.String.split_strip(Environment.get_variable("LD_LIBRARY_PATH"), ":");
- foreach (unowned string libdir in libdirs)
- {
- filename = "%s/libvdpau_%s.so".printf(libdir, name);
- if (FileUtils.test(filename, FileTest.EXISTS))
- {
- debug("VDPAU driver found: %s", filename);
- return true;
- }
- }
- return false;
-}
-
} // namespace Nuvola.Graphics
diff --git a/src/tests/GraphicsTest.vala b/src/tests/GraphicsTest.vala
deleted file mode 100644
index 848d530..0000000
--- a/src/tests/GraphicsTest.vala
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Author: Jiří Janoušek <janousek.jiri@gmail.com>
- *
- * To the extent possible under law, author has waived all
- * copyright and related or neighboring rights to this file.
- * http://creativecommons.org/publicdomain/zero/1.0/
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Tests are under public domain because they might contain useful sample code.
- */
-
-namespace Nuvola
-{
-
-public class GraphicsTest: Diorite.TestCase
-{
- public void test_dri2_get_driver_name()
- {
- string? name = null;
- expect_no_error(() => name = Graphics.dri2_get_driver_name(), "driver name");
- expect_false(Diorite.String.is_empty(name), "driver name not empty");
- }
-
- public void test_have_vdpau_driver()
- {
- var name = "i965";
- var result = Graphics.have_vdpau_driver(name);
- var expected = FileUtils.test("/usr/lib/libvdpau_i965.so", FileTest.EXISTS)
- || FileUtils.test("/app/lib/libvdpau_i965.so", FileTest.EXISTS);
- expect_true(expected == result, "have vdpau driver");
- }
-}
-
-} // namespace Nuvola
diff --git a/vapi/dri2.deps b/vapi/dri2.deps
deleted file mode 100644
index 39a1cf2..0000000
--- a/vapi/dri2.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-x11
-libdrm
diff --git a/vapi/dri2.vapi b/vapi/dri2.vapi
deleted file mode 100644
index 0be35a8..0000000
--- a/vapi/dri2.vapi
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Dri2
-{
- [CCode(cname="DRI2InitDisplay", cheader_filename="X11/extensions/dri2.h")]
- public bool init_display(X.Display dpy, EventOps ops);
-
- [CCode(cname="DRI2QueryExtension", cheader_filename="X11/extensions/dri2.h")]
- public bool query_extension(X.Display dpy, out int eventBase, out int errorBase);
-
- [CCode(cname="DRI2QueryVersion", cheader_filename="X11/extensions/dri2.h")]
- public bool query_version(X.Display dpy, out int major, out int minor);
-
- [CCode(cname="DRI2Connect", cheader_filename="X11/extensions/dri2.h")]
- public bool connect(X.Display dpy, X.Window root, int driverType, out string driver, out string device);
-
- [CCode(cname="DRI2DriverDRI", cheader_filename="X11/extensions/dri2.h")]
- public const int DriverDRI;
-
- [CCode(cname="DRI2EventOps", cheader_filename="X11/extensions/dri2.h")]
- public struct EventOps
- {
- }
-}
diff --git a/vapi/libdrm.vapi b/vapi/libdrm.vapi
deleted file mode 100644
index 8b13789..0000000
--- a/vapi/libdrm.vapi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/wscript b/wscript
index a205f07..d20d8f8 100644
--- a/wscript
+++ b/wscript
@@ -268,8 +268,6 @@ def configure(ctx):
pkgconfig(ctx, 'javascriptcoregtk-4.0', 'JSCORE', MIN_WEBKIT)
pkgconfig(ctx, 'uuid', 'UUID', '0') # Engine.io
pkgconfig(ctx, 'libsoup-2.4', 'SOUP', '0') # Engine.io
- pkgconfig(ctx, 'dri2', 'DRI2', '1.0')
- pkgconfig(ctx, 'libdrm', 'DRM', '2.2')
# For tests
ctx.find_program("diorite-testgen{}".format(TARGET_DIORITE), var="DIORITE_TESTGEN")
@@ -418,8 +416,8 @@ def build(ctx):
valalib(
target = NUVOLAKIT_RUNNER,
source_dir = 'src/nuvolakit-runner',
- packages = packages + ' webkit2gtk-4.0 javascriptcoregtk-4.0 gstreamer-1.0 libsecret-1 dri2 libdrm',
- uselib = uselib + ' JSCORE WEBKIT GST SECRET DRI2 DRM',
+ packages = packages + ' webkit2gtk-4.0 javascriptcoregtk-4.0 gstreamer-1.0 libsecret-1',
+ uselib = uselib + ' JSCORE WEBKIT GST SECRET',
use = [NUVOLAKIT_BASE, ENGINEIO],
lib = ['m'],
includes = ["build"],
--
2.13.2