aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Caramelli <caramelli.devel@gmail.com>2020-12-15 18:41:11 +0100
committerNicolas Caramelli <caramelli.devel@gmail.com>2020-12-15 18:41:29 +0100
commit55e830c642a3d9e25a49c055e5abbfa922cf3742 (patch)
tree673bf7b8b4d12a53e0fdb9e8361e3aa9f69114e3
parente1a7db60716c9a1e2999748b78abaa345e29da28 (diff)
downloadfbida-55e830c642a3d9e25a49c055e5abbfa922cf3742.tar.gz
Drop gbm / epoxy / egl dependencies
Signed-off-by: Nicolas Caramelli <caramelli.devel@gmail.com>
-rw-r--r--.travis.yml4
-rw-r--r--drmtools.h3
-rw-r--r--fbida.spec3
-rw-r--r--fbpdf.c2
-rw-r--r--meson.build5
5 files changed, 1 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index 03d61ce..09e05a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,6 @@ addons:
- python3-setuptools
- ninja-build
- libdrm-dev
- - libgbm-dev
- - libepoxy-dev
- - libegl1-mesa-dev
- - libgl1-mesa-dev
- libcairo2-dev
- libpixman-1-dev
- libsystemd-dev
diff --git a/drmtools.h b/drmtools.h
index 169157e..2429e10 100644
--- a/drmtools.h
+++ b/drmtools.h
@@ -13,6 +13,3 @@ int drm_init_dev(const char *dev, const char *output, const char *mode);
gfxstate *drm_init(const char *device, const char *output,
const char *mode, bool pageflip);
void drm_info(const char *device);
-
-/* drmtools-egl.c */
-gfxstate *drm_init_egl(const char *device, const char *output, const char *mode);
diff --git a/fbida.spec b/fbida.spec
index f7d2d7e..59d92ed 100644
--- a/fbida.spec
+++ b/fbida.spec
@@ -30,9 +30,6 @@ BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(poppler-glib)
-BuildRequires: pkgconfig(gbm)
-BuildRequires: pkgconfig(egl)
-BuildRequires: pkgconfig(epoxy)
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libinput)
diff --git a/fbpdf.c b/fbpdf.c
index 995bf53..c5fe5a9 100644
--- a/fbpdf.c
+++ b/fbpdf.c
@@ -29,8 +29,6 @@
#include <poppler.h>
#include <cairo.h>
-#include <epoxy/egl.h>
-
#include "vt.h"
#include "kbd.h"
#include "fbtools.h"
diff --git a/meson.build b/meson.build
index e09b6f4..e4c2852 100644
--- a/meson.build
+++ b/meson.build
@@ -17,8 +17,6 @@ pixman_dep = dependency('pixman-1')
poppler_dep = dependency('poppler-glib')
cairo_dep = dependency('cairo')
drm_dep = dependency('libdrm')
-gbm_dep = dependency('gbm')
-epoxy_dep = dependency('epoxy')
exif_dep = dependency('libexif')
png_dep = dependency('libpng')
tiff_dep = dependency('libtiff-4')
@@ -128,8 +126,7 @@ executable('thumbnail.cgi',
fbpdf_srcs = [ 'fbpdf.c', 'parseconfig.c', 'fbiconfig.c',
'vt.c', 'kbd.c', 'logind.c',
'fbtools.c', 'drmtools.c', 'gfx.c' ]
-fbpdf_deps = [ drm_dep, gbm_dep, epoxy_dep,
- pixman_dep, poppler_dep, cairo_dep,
+fbpdf_deps = [ drm_dep, pixman_dep, poppler_dep, cairo_dep,
udev_dep, input_dep, xkb_dep, systemd_dep ]
executable('fbpdf',