summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Thomas Anderson <tanderson@exherbo.org> 2015-07-07 17:54:58 -0700
committerAvatar Thomas G. Anderson <tanderson@exherbo.org> 2015-07-09 19:42:20 +0200
commit985b72ed113bd6146480ec481161397c3f9cc6f3 (patch)
tree8dabd173b5f28f3ce3391804ac6b03de6a753563
parentd3760e88b92bab632a4a1586c4c47a581f5eaa5a (diff)
downloadenlightenment-985b72ed113bd6146480ec481161397c3f9cc6f3.tar.gz
enlightenment-985b72ed113bd6146480ec481161397c3f9cc6f3.tar.xz
efl: version bump to 1.14.2
Change-Id: Ia8811dc480f8f762efa4480f6427229475540e3f Reviewed-on: https://galileo.mailstation.de/gerrit/2819 Reviewed-by: Jenkins <philantrop@gmail.com> Reviewed-by: Thomas G. Anderson <tanderson@exherbo.org>
-rw-r--r--packages/enlightenment-platform/efl/efl-1.14.2.exheres-0 (renamed from packages/enlightenment-platform/efl/efl-1.13.0-r1.exheres-0)4
-rw-r--r--packages/enlightenment-platform/efl/efl.exlib26
-rw-r--r--packages/enlightenment-platform/efl/files/efl-1.13.0-libinput-compat.patch91
3 files changed, 13 insertions, 108 deletions
diff --git a/packages/enlightenment-platform/efl/efl-1.13.0-r1.exheres-0 b/packages/enlightenment-platform/efl/efl-1.14.2.exheres-0
index 30b6077..bdcca6e 100644
--- a/packages/enlightenment-platform/efl/efl-1.13.0-r1.exheres-0
+++ b/packages/enlightenment-platform/efl/efl-1.14.2.exheres-0
@@ -2,7 +2,7 @@
# Copyright 2014 Thomas G. Anderson
# Distributed under the terms of the GNU General Public License v2
-require efl autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 1.14 1.13 ] ]
+require efl
SLOT="1"
PLATFORMS="~amd64"
@@ -12,5 +12,3 @@ DEPENDENCIES="
sdl? ( media-libs/SDL:2 )
"
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PNV}-libinput-compat.patch )
-
diff --git a/packages/enlightenment-platform/efl/efl.exlib b/packages/enlightenment-platform/efl/efl.exlib
index e071271..926f020 100644
--- a/packages/enlightenment-platform/efl/efl.exlib
+++ b/packages/enlightenment-platform/efl/efl.exlib
@@ -13,15 +13,11 @@ LICENCES="BSD-2"
MYOPTIONS="
avahi
drm [[ description = [ Enable Direct Rendering Manager for hardware-based acceleration ] ]]
- gif
glib [[ description = [ Integrate glib ] ]]
harfbuzz [[ description = [ Enable complex text shaping with HarfBuzz ] ]]
- jpeg
opengl
- png
sdl
systemd
- tiff
v4l
webp [[ description = [ Enables image rendering with Google's WebP format ] ]]
X
@@ -38,7 +34,14 @@ DEPENDENCIES="
build+run:
dev-libs/fribidi
dev-lang/LuaJIT
+ media-libs/fontconfig
+ media-libs/freetype
media-libs/gstreamer:1.0
+ media-libs/giflib:=
+ media-libs/jpeg:=
+ media-libs/libpng:=
+ media-libs/libsndfile
+ media-libs/tiff
media-plugins/gst-plugins-base:1.0
media-sound/pulseaudio
net-misc/curl
@@ -50,14 +53,10 @@ DEPENDENCIES="
avahi? ( net-dns/avahi )
drm? ( x11-dri/libdrm[>=2.4]
x11-libs/libxkbcommon[>=0.3.0] )
- gif? ( media-libs/giflib )
glib? ( dev-libs/glib:2 )
harfbuzz? ( x11-libs/harfbuzz )
- jpeg? ( media-libs/jpeg )
opengl? ( x11-dri/mesa )
- png? ( media-libs/libpng:1.5 )
systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff )
webp? ( media-libs/libwebp )
X? ( x11-libs/libX11
x11-libs/libXau
@@ -106,6 +105,10 @@ RESTRICT="test"
# tests need X, upstream heavily warns against using gnutls over openssl, pixman is EVIL
DEFAULT_SRC_CONFIGURE_PARAMS=(
+ '--enable-image-loader-gif'
+ '--enable-image-loader-jpeg'
+ '--enable-image-loader-png'
+ '--enable-image-loader-tiff'
'--with-crypto=openssl'
'--enable-pulseaudio'
'--disable-tslib'
@@ -114,20 +117,15 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
DEFAULT_SRC_CONFIGURE_OPTIONS=(
'opengl --with-opengl=full --with-opengl=none'
- 'X --with-x=xcb --with-x=none'
+ 'X --with-x11=xlib --with-x11=none'
)
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
'avahi'
'drm'
- 'drm drm-hw-accel'
- 'gif image-loader-gif'
'harfbuzz'
- 'jpeg image-loader-jpeg'
- 'png image-loader-jpeg'
'sdl'
'systemd'
- 'tiff image-loader-tiff'
'v4l v4l2'
'webp image-loader-webp'
'xine'
diff --git a/packages/enlightenment-platform/efl/files/efl-1.13.0-libinput-compat.patch b/packages/enlightenment-platform/efl/files/efl-1.13.0-libinput-compat.patch
deleted file mode 100644
index 6ed933d..0000000
--- a/packages/enlightenment-platform/efl/files/efl-1.13.0-libinput-compat.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 52c48cfc214a9fb36db90748cfdf8095fd23db30 Mon Sep 17 00:00:00 2001
-From: Stefan Schmidt <s.schmidt@samsung.com>
-Date: Thu, 12 Feb 2015 18:01:55 +0100
-Subject: [PATCH] ecore/drm: Add support for changed libinput API since 0.8
-
-We check for libinput 06 or higher. In version 0.8 they got an API break
-(hopefully the last one before 1.0) which we did not support so far. I have
-seen libinput 0.9 used on gentoo and newer ubuntu systems so we should
-definitely support them.
-
-Adding a LIBINPUT_HIGHER_08 define to check for this. So far we have only one
-location where we need it. Once there is a libinput 1.0 we should remove the
-support for older versions.
-
-http://lists.freedesktop.org/archives/wayland-devel/2015-January/019383.html
----
- configure.ac | 15 +++++++++++++++
- src/lib/ecore_drm/ecore_drm_evdev.c | 15 ++++++++++++++-
- 2 files changed, 29 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 57c267a..97b8828 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3058,6 +3058,7 @@ AM_CONDITIONAL([HAVE_EEZE_TIZEN], [test "x${want_tizen}" = "xyes"])
-
-
- #### Ecore_Drm
-+have_libinput_new="no"
- EFL_LIB_START_OPTIONAL([Ecore_Drm], [test "${want_drm}" = "yes"])
-
- ### Additional options to configure
-@@ -3081,6 +3082,20 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eina])
- EFL_DEPEND_PKG([ECORE_DRM], [DRM], [libdrm >= 2.4 xkbcommon >= 0.3.0 gbm])
- EFL_DEPEND_PKG([ECORE_DRM], [LIBINPUT], [libinput >= 0.6.0])
-
-+# API change from 0.7 to 0.8. So we define this to support both for now.
-+PKG_CHECK_EXISTS([libinput >= 0.8.0],
-+ [have_libinput_new="yes"],
-+ [have_libinput_new="no"])
-+AC_MSG_CHECKING([Use new libinput API (newer than 0.8.0)])
-+AC_MSG_RESULT([${have_libinput_new}])
-+if test "x${have_libinput_new}" = "xyes";then
-+ AC_DEFINE_UNQUOTED([LIBINPUT_HIGHER_08], [1], [libinput version >= 0.8])
-+fi
-+if test "x${have_libinput_new}" = "xno";then
-+ AC_DEFINE_UNQUOTED([LIBINPUT_HIGHER_08], [0], [libinput version >= 0.8])
-+fi
-+
-+
- EFL_EVAL_PKGS([ECORE_DRM])
-
- ### Checks for header files
-diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c b/src/lib/ecore_drm/ecore_drm_evdev.c
-index 8d6bbed..42b61f4 100644
---- a/src/lib/ecore_drm/ecore_drm_evdev.c
-+++ b/src/lib/ecore_drm/ecore_drm_evdev.c
-@@ -503,7 +503,6 @@ _device_handle_axis(struct libinput_device *device, struct libinput_event_pointe
-
- if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Wheel)))) return;
-
-- axis = libinput_event_pointer_get_axis(event);
- timestamp = libinput_event_pointer_get_time(event);
-
- ev->window = (Ecore_Window)input->dev->window;
-@@ -522,8 +521,22 @@ _device_handle_axis(struct libinput_device *device, struct libinput_event_pointe
- ev->root.x = ev->x;
- ev->root.y = ev->y;
-
-+#ifdef LIBINPUT_HIGHER_08
-+ axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL;
-+ if (libinput_event_pointer_has_axis(event, axis)) {
-+ ev->z = libinput_event_pointer_get_axis_value(event, axis);
-+ }
-+
-+ axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL;
-+ if (libinput_event_pointer_has_axis(event, axis)) {
-+ ev->direction = 1;
-+ ev->z = libinput_event_pointer_get_axis_value(event, axis);
-+ }
-+#else
-+ axis = libinput_event_pointer_get_axis(event);
- if (axis == LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL) ev->direction = 1;
- ev->z = libinput_event_pointer_get_axis_value(event);
-+#endif
-
- ecore_event_add(ECORE_EVENT_MOUSE_WHEEL, ev, NULL, NULL);
- }
---
-2.3.1
-