Skip to content
Snippets Groups Projects
Unverified Commit 1157bee4 authored by Efraim Flashner's avatar Efraim Flashner
Browse files

gnu: efl: Update to 1.24.1.

* gnu/packages/enlightenment.scm (efl): Update to 1.24.1.
[propagated-inputs]: Remove bullet. Add libpng. Move libtiff, libwebp,
util-linux:lib ...
[inputs]: ... to here. Add openjpeg. Remove libxp.
[arguments]: In configure-flags disable scim, enable avahi, glib. Use
setuid mount/umount binaries. Rename hardcode-libcurl-location to
hardcode-dynamic-libraries and add pulseaudio, libsndfile.

squash! efl-1.24.1
parent bdc7f72f
No related branches found
No related tags found
No related merge requests found
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org> ;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de> ;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
...@@ -69,7 +69,7 @@ (define-module (gnu packages enlightenment) ...@@ -69,7 +69,7 @@ (define-module (gnu packages enlightenment)
(define-public efl (define-public efl
(package (package
(name "efl") (name "efl")
(version "1.23.3") (version "1.24.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
...@@ -77,7 +77,7 @@ (define-public efl ...@@ -77,7 +77,7 @@ (define-public efl
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"00b9lp3h65254kdb1ys15fv7p3ln7qsvf15jkw4kli5ymagadkjk")))) "1xsbz5kl74cgzyzwmjy3p50m0iigvi53lklkp92v49k4j99zpak7"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("check" ,check) `(("check" ,check)
...@@ -93,6 +93,7 @@ (define-public efl ...@@ -93,6 +93,7 @@ (define-public efl
("libraw" ,libraw) ("libraw" ,libraw)
("librsvg" ,librsvg) ("librsvg" ,librsvg)
("libspectre" ,libspectre) ("libspectre" ,libspectre)
("libtiff" ,libtiff)
("libxau" ,libxau) ("libxau" ,libxau)
("libxcomposite" ,libxcomposite) ("libxcomposite" ,libxcomposite)
("libxcursor" ,libxcursor) ("libxcursor" ,libxcursor)
...@@ -102,18 +103,19 @@ (define-public efl ...@@ -102,18 +103,19 @@ (define-public efl
("libxi" ,libxi) ("libxi" ,libxi)
("libxfixes" ,libxfixes) ("libxfixes" ,libxfixes)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxp" ,libxp)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("libxrender" ,libxrender) ("libxrender" ,libxrender)
("libxss" ,libxscrnsaver) ("libxss" ,libxscrnsaver)
("libxtst" ,libxtst) ("libxtst" ,libxtst)
("libwebp" ,libwebp)
("openjpeg" ,openjpeg)
("poppler" ,poppler) ("poppler" ,poppler)
("util-linux" ,util-linux "lib")
("wayland-protocols" ,wayland-protocols))) ("wayland-protocols" ,wayland-protocols)))
(propagated-inputs (propagated-inputs
;; All these inputs are in package config files in section ;; All these inputs are in package config files in section
;; Requires.private. ;; Requires.private.
`(("avahi" ,avahi) `(("avahi" ,avahi)
("bullet" ,bullet)
("dbus" ,dbus) ("dbus" ,dbus)
("elogind" ,elogind) ("elogind" ,elogind)
("eudev" ,eudev) ("eudev" ,eudev)
...@@ -122,30 +124,32 @@ (define-public efl ...@@ -122,30 +124,32 @@ (define-public efl
("fribidi" ,fribidi) ("fribidi" ,fribidi)
("glib" ,glib) ("glib" ,glib)
("harfbuzz" ,harfbuzz) ("harfbuzz" ,harfbuzz)
("luajit" ,luajit)
("libinput" ,libinput-minimal) ("libinput" ,libinput-minimal)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libsndfile" ,libsndfile) ("libsndfile" ,libsndfile)
("libtiff" ,libtiff) ("libpng" ,libpng)
("libwebp" ,libwebp)
("libx11" ,libx11) ("libx11" ,libx11)
("libxkbcommon" ,libxkbcommon) ("libxkbcommon" ,libxkbcommon)
("luajit" ,luajit)
("lz4" ,lz4) ("lz4" ,lz4)
("openssl" ,openssl) ("openssl" ,openssl)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("util-linux" ,util-linux "lib")
("wayland" ,wayland) ("wayland" ,wayland)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:configure-flags '("-Dsystemd=false" `(#:configure-flags '("-Dsystemd=false"
"-Delogind=true"
"-Dembedded-lz4=false" "-Dembedded-lz4=false"
"-Devas-loaders-disabler=json" "-Devas-loaders-disabler=json"
"-Dbuild-examples=false" "-Dbuild-examples=false"
"-Decore-imf-loaders-disabler=scim"
"-Davahi=true"
"-Dglib=true"
"-Dmount-path=/run/setuid-programs/mount"
"-Dunmount-path=/run/setuid-programs/umount"
;(string-append "-Ddictionaries-hyphen-dir=" ;(string-append "-Ddictionaries-hyphen-dir="
; (assoc-ref %build-inputs "hyphen") ; (assoc-ref %build-inputs "hyphen")
; "/share/hyphen") ; "/share/hyphen")
"-Delogind=true"
"-Dnetwork-backend=connman" "-Dnetwork-backend=connman"
,@(match (%current-system) ,@(match (%current-system)
("armhf-linux" ("armhf-linux"
...@@ -153,22 +157,27 @@ (define-public efl ...@@ -153,22 +157,27 @@ (define-public efl
(_ (_
'("-Dopengl=full"))) '("-Dopengl=full")))
;; for wayland ;; for wayland
"-Dwl-deprecated=true" ; ecore_wayland
"-Ddrm-deprecated=true" ; ecore_drm
"-Dwl=true" "-Dwl=true"
"-Ddrm=true") "-Ddrm=true")
#:tests? #f ; Many tests fail due to timeouts and network requests. #:tests? #f ; Many tests fail due to timeouts and network requests.
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; If we don't hardcode the location of libcurl.so then we ;; If we don't hardcode the location of libcurl.so and others then we
;; have to wrap the outputs of efl's dependencies in curl. ;; have to wrap the outputs of efl's dependencies in those libraries.
(add-after 'unpack 'hardcode-libcurl-location (add-after 'unpack 'hardcode-dynamic-libraries
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((curl (assoc-ref inputs "curl")) (let ((curl (assoc-ref inputs "curl"))
(lib (string-append curl "/lib/"))) (pulse (assoc-ref inputs "pulseaudio"))
(sndfile (assoc-ref inputs "libsndfile"))
(lib "/lib/"))
(substitute* "src/lib/ecore_con/ecore_con_url_curl.c" (substitute* "src/lib/ecore_con/ecore_con_url_curl.c"
(("libcurl.so.?" libcurl) ; libcurl.so.[45] (("libcurl.so.?" libcurl) ; libcurl.so.[45]
(string-append lib libcurl))) (string-append curl lib libcurl)))
(substitute* "src/lib/ecore_audio/ecore_audio.c"
(("libpulse.so.0" libpulse)
(string-append pulse lib libpulse))
(("libsndfile.so.1" libsnd)
(string-append sndfile lib libsnd)))
#t))) #t)))
(add-after 'unpack 'fix-install-paths (add-after 'unpack 'fix-install-paths
(lambda _ (lambda _
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment