From bc875a54a09d09c3a2029a8c2f8e5b6f3a2e31fa Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 17 Aug 2016 19:35:44 +0200 Subject: [PATCH] efl: update to 1.18.0 (provides/replaces elementary). --- common/shlibs | 2 +- srcpkgs/efl/patches/egl-types-fixup.patch | 16 ---------------- srcpkgs/efl/template | 13 ++++++++----- 3 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/efl/patches/egl-types-fixup.patch diff --git a/common/shlibs b/common/shlibs index f5ba7a702e..9f4dffbe6e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1472,7 +1472,7 @@ libefl.so.1 efl-1.12.0_1 libecore_drm.so.1 efl-1.13.0_1 libelua.so.1 efl-1.13.0_1 libelocation.so.1 efl-1.13.0_1 -libelementary.so.1 elementary-1.8.0_1 +libelementary.so.1 efl-1.18.0_1 libcjs.so.0 cjs-2.0.0_1 libcjs-dbus.so.0 cjs-2.0.0_1 libmuffin.so.0 muffin-2.0.5_1 diff --git a/srcpkgs/efl/patches/egl-types-fixup.patch b/srcpkgs/efl/patches/egl-types-fixup.patch deleted file mode 100644 index 499e64f804..0000000000 --- a/srcpkgs/efl/patches/egl-types-fixup.patch +++ /dev/null @@ -1,16 +0,0 @@ -Not sure what's going on here, but to fix enlightenment build I've -switched the data types to the ones defined in khrplatform.h. - ---- src/lib/evas/Evas_GL.h.orig 2014-11-11 11:26:36.753709613 +0100 -+++ src/lib/evas/Evas_GL.h 2014-11-11 11:27:01.946647835 +0100 -@@ -843,8 +843,8 @@ EAPI Evas_GL_Surface *evas_gl_cu - *-----------------------------------------------------------------------*/ - - #ifndef KHRONOS_SUPPORT_INT64 --typedef unsigned long long khronos_uint64_t; --typedef signed long long khronos_int64_t; -+typedef uint64_t khronos_uint64_t; -+typedef int64_t khronos_int64_t; - #endif - - // Due to build conflicts on various platforms, we can't use GL[u]int64 directly diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 93dfbedd15..6eb6c821a9 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,6 +1,6 @@ # Template file for 'efl' pkgname=efl -version=1.17.2 +version=1.18.0 revision=1 build_style=gnu-configure configure_args="CXX= --enable-multisense --enable-image-loader-webp @@ -8,16 +8,19 @@ configure_args="CXX= --enable-multisense --enable-image-loader-webp $(vopt_enable harfbuzz)" hostmakedepends="pkg-config" makedepends="libressl-devel glib-devel libjpeg-turbo-devel fontconfig-devel - fribidi-devel giflib-devel libpng-devel tiff-devel libwebp-devel - gst-plugins-base1-devel avahi-libs-devel eudev-libudev-devel bullet-devel - alsa-lib-devel libsndfile-devel libmount-devel LuaJIT-devel + fribidi-devel giflib-devel libpng-devel tiff-devel libwebp-devel libspectre-devel + gst-plugins-base1-devel avahi-libs-devel eudev-libudev-devel bullet-devel libraw-devel + alsa-lib-devel libsndfile-devel libmount-devel LuaJIT-devel poppler-cpp-devel librsvg-devel $(vopt_if harfbuzz harfbuzz-devel) $(vopt_if pulseaudio pulseaudio-devel)" homepage="http://enlightenment.org" short_desc="Enlightenment Foundation Libraries" maintainer="Juan RP " license="BSD" distfiles="http://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.gz" -checksum=81c4662cfeb8de3675329f92d6c117588b4a0a37c94e4731dc342db438f23ca2 +checksum=a90255e97f6b768883276d3e04946798c31bc9bf57da12702ca7c3f4a401ec9f + +provides="elementary-${version}_${revision}" +replaces="elementary>=0" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake gettext-devel libtool efl-devel"