From b11cf99ff5f6a02814cc6c56a248a78d5caeaaeb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Sep 2016 16:14:10 +0300 Subject: gnu: rage: Update to 0.2.1. * gnu/packages/enlightenment.scm (rage): Update to 0.2.1. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 818dbac942..d465da9d71 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -262,7 +262,7 @@ contents and more.") (define-public rage (package (name "rage") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri @@ -271,7 +271,7 @@ contents and more.") version ".tar.xz")) (sha256 (base32 - "07mfh0k83nrm557x72qafxawxizilqgkr6sngbia3ikprc8556zy")))) + "06kbgcnbhl9clhdl7k983m4d0n6ggsl4qvizzi1nrp8c7np87fix")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 35b380648b063db9a8b11352b1ae85d8f1ff7c70 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 5 Sep 2016 13:13:30 +0300 Subject: gnu: Remove elementary, evas-generic-loaders, emotion-generic-players. * gnu/packages/enlightenment.scm (elementary, evas-generic-loaders) (emotion-generic-players): Remove variables. These packages were absorbed by efl-1.18.0. --- gnu/packages/enlightenment.scm | 84 ------------------------------------------ 1 file changed, 84 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index d465da9d71..7cd11b59a2 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -149,90 +149,6 @@ removable devices or support for multimedia.") ;; Different parts are under different licenses. (license (list license:bsd-2 license:lgpl2.1 license:zlib)))) -(define-public elementary - (package - (name "elementary") - (version "1.17.1") - (source (origin - (method url-fetch) - (uri - (string-append "https://download.enlightenment.org/rel/libs/" - "elementary/elementary-" version ".tar.xz")) - (sha256 - (base32 - "149xjq4z71l44w1kd8zks9b2g0wjc9656w46hzd27b58afj1dqc5")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (propagated-inputs - `(("efl" ,efl))) ; elementary.pc, elementary-cxx.pc - (home-page "https://www.enlightenment.org") - (synopsis "Widget library of Enlightenment world") - (description - "Elementary is a widget library/toolkit, part of the Enlightenment -Foundation Libraries. It is build upon Edje and Evas libraries and uses -full capabilities of EFL.") - (license license:lgpl2.1))) - -(define-public evas-generic-loaders - (package - (name "evas-generic-loaders") - (version "1.17.0") - (source (origin - (method url-fetch) - (uri - (string-append - "https://download.enlightenment.org/rel/libs/" - "evas_generic_loaders/evas_generic_loaders-" - version ".tar.xz")) - (sha256 - (base32 - "0ynq1nx0bfgg19p4vki1fap36yyip53zaxpzncx2slr6jcx1kxf2")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("efl" ,efl) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("librsvg" ,librsvg) - ("libspectre" ,libspectre) - ("poppler" ,poppler))) - (home-page "https://www.enlightenment.org") - (synopsis "Plugins for integration of various file types into Evas") - (description - "Evas-generic-loaders is a collection of interfaces to outside libraries -and applications allowing to natively open pictures, documents and media -files in Evas (EFL canvas library).") - (license license:gpl2+))) - -(define-public emotion-generic-players - (package - (name "emotion-generic-players") - (version "1.17.0") - (source (origin - (method url-fetch) - (uri - (string-append "https://download.enlightenment.org/rel/libs/" - "emotion_generic_players/emotion_generic_players" - "-" version ".tar.xz")) - (sha256 - (base32 - "03kaql95mk0c5j50v3c5i5lmlr3gz7xlh8p8q87xz8zf9j5h1pp7")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("efl" ,efl) - ("vlc" ,vlc))) - (home-page "https://www.enlightenment.org") - (synopsis "Plugins for integrating media players in EFL based applications") - (description - "Emotion-generic-players is a collection of interfaces to outside libraries -and applications allowing to natively play video files through Emotion. -The only supported now is VLC.") - (license license:bsd-2))) - (define-public terminology (package (name "terminology") -- cgit v1.2.3 From 0e790a7ce0410dc7f991bca4e566fb73004ddd39 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 10 Sep 2016 22:48:50 +0300 Subject: gnu: Add edi. * gnu/packages/enlightenment.scm (edi): New variable. --- gnu/packages/enlightenment.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 7cd11b59a2..9de21ad50f 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -26,6 +26,8 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages bash) + #:use-module (gnu packages check) + #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) @@ -40,6 +42,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages pdf) #:use-module (gnu packages photo) @@ -275,3 +278,33 @@ Libraries stack (eo, evas, ecore, edje, emotion, ethumb and elementary).") (define-public python2-efl (package-with-python2 python-efl)) + +(define-public edi + (package + (name "edi") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/ajwillia-ms/edi/releases/" + "download/v" version "/edi-" version ".tar.bz2")) + (sha256 + (base32 + "0qczz5psryxasphg5km95845h510237rf0k1dy8f0dad52ii90j1")))) + (build-system gnu-build-system) + (arguments '(#:configure-flags '("--with-tests=coverage"))) + (native-inputs + `(("check" ,check) + ("lcov" ,lcov) + ("pkg-config" ,pkg-config))) + (inputs + `(("clang" ,clang) + ("efl" ,efl))) + (home-page "https://www.enlightenment.org/about-edi") + (synopsis "Development environment for Enlightenment") + (description "EDI is a development environment designed for and built using +the EFL. It's aim is to create a new, native development environment for Linux +that tries to lower the barrier to getting involved in Enlightenment development +and in creating applications based on the Enlightenment Foundation Library suite.") + (license (list license:public-domain ; data/extra/skeleton + license:gpl2)))) ; edi -- cgit v1.2.3 From 5de2a99e794a4effde6c7817608e70b47a95e724 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 19 Sep 2016 12:33:06 +0300 Subject: gnu: efl: Update to 1.18.1. * gnu/packages/enlightenment.scm (efl): Update to 1.18.1. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 9de21ad50f..8eb43a7cd9 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -56,7 +56,7 @@ (define-public efl (package (name "efl") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (string-append @@ -64,7 +64,7 @@ version ".tar.xz")) (sha256 (base32 - "17mzbjmz8d2vs8p63r1sk3mppl3l2fhxy2jv24dp75lgqbsvp806")))) + "08njx6wd505as1vn0yp4mnmf6mb2v28jsipxxx4zhf78v18d2sqc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From bf307a7a54eeca405e5c6ad50a9cbe6b9e10190d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 19 Sep 2016 13:35:53 +0300 Subject: gnu: efl: Add recommended build flags. * gnu/packages/enlightenment.scm (efl)[inputs]: Add libwebp. [arguments]: Add configure-flags to enable xinput22, image-loader-webp, multisense, opengl with egl support. --- gnu/packages/enlightenment.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 8eb43a7cd9..a1df1367a5 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -82,6 +82,7 @@ ("librsvg" ,librsvg) ("libspectre" ,libspectre) ("libtiff" ,libtiff) + ("libwebp" ,libwebp) ("libx11" ,libx11) ("libxcomposite" ,libxcomposite) ("libxcursor" ,libxcursor) @@ -125,6 +126,11 @@ (arguments `(#:configure-flags '("--disable-silent-rules" "--enable-liblz4" + "--enable-xinput22" + "--enable-image-loader-webp" + "--enable-multisense" + "--with-opengl=es" + "--enable-egl" "--enable-harfbuzz") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 92330ba90d782b3b215b4521d93f5869a70e51e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 20 Sep 2016 11:32:08 +0300 Subject: gnu: efl: Remove hardcoding pulseaudio and libsndfile. * gnu/packages/enlightenment.scm (efl)[arguments]: Remove custom phase to hardlink to the locations of pulseaudio and libsndfile. --- gnu/packages/enlightenment.scm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index a1df1367a5..e8bd387ef3 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -131,23 +131,7 @@ "--enable-multisense" "--with-opengl=es" "--enable-egl" - "--enable-harfbuzz") - #:phases - (modify-phases %standard-phases - ;; ecore_audio cannot find pulseaudio or libsndfile when compiled. - ;; Starting in version 1.18.0, these two libraries are dlopened so - ;; we hardcode their locations as a temporary workaround. - (add-after 'configure 'hardlink-dlopen-files - (lambda _ - (substitute* "src/lib/ecore_audio/ecore_audio.c" - (("libpulse.so.0") - (string-append (assoc-ref %build-inputs "pulseaudio") - "/lib/libpulse.so.0"))) - (substitute* "src/lib/ecore_audio/ecore_audio.c" - (("libsndfile.so.1") - (string-append (assoc-ref %build-inputs "libsndfile") - "/lib/libsndfile.so.1"))) - #t))))) + "--enable-harfbuzz"))) (home-page "https://www.enlightenment.org") (synopsis "Enlightenment Foundation Libraries") (description -- cgit v1.2.3