* [gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/, dev-libs/efl/files/
@ 2018-08-30 15:21 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2018-08-30 15:21 UTC (permalink / raw
To: gentoo-commits
commit: bd2ec3eedc2089e0f3b08aa00e25ed37cf26db93
Author: Joonas Niilola <juippis <AT> gmail <DOT> com>
AuthorDate: Thu Aug 30 12:47:21 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 30 15:04:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2ec3ee
dev-libs/efl: remove last-rited version 1.17.0-r1
Closes: https://bugs.gentoo.org/662510
Package-Manager: Portage[mgorny]-2.3.43.3
dev-libs/efl/Manifest | 1 -
dev-libs/efl/efl-1.17.0-r1.ebuild | 285 -------------------------
dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch | 39 ----
3 files changed, 325 deletions(-)
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 7c3174cf23a..b771e209b28 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,4 +1,3 @@
-DIST efl-1.17.0.tar.xz 43485360 BLAKE2B 97a79bda40658eac6e50886a01821bb8c98d6f56d18fcd51dc3827154506064bec3bf665c8f471919aedb03ae83ce4045293afa9a0bf8d3eaf947221ef7cba9e SHA512 e4f28f938daf4ec1cb3d761407a443e401b59c6bb0f9fa6cd771dbd256b95f4a32a5f9e6bd8ad8328708a382f732e67abd1a23c7be2ff222f08bc8135a2435da
DIST efl-1.18.4.tar.xz 64609944 BLAKE2B b36e5ee7c64a57772c5826e990a85110fffc3488e605d72515d4db7a6ec56eee25eb68c7136840f24cb8cdcdc8d7050e2825c17f0e4c5566db7d9ec2c96fd557 SHA512 2cfdcde8b5adb93310e75e4923e3845392bed97563ca1a68f4537e346b51f59acefaa85a425bdbb5619e5bfd6c9ff92b4bd1888b5d4ddd8db94c8a555e3934c9
DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
DIST efl-1.21.0.tar.xz 71030532 BLAKE2B 3480e261aef05b169a850d27f3d9fa6da0ad9bc9ac04548137829e662546cd7d85c87596576e561bba33f9f1be657d81f261595e34c711ff9e35d551ae5f09a8 SHA512 497735f518976d70b96023b013a6d821f6695fe56def2abf5bd1e1c7ad89d324428017d7909c7b73bfb332b811b5596592b105bb4c3d2f6a40929f1cefc2b789
diff --git a/dev-libs/efl/efl-1.17.0-r1.ebuild b/dev-libs/efl/efl-1.17.0-r1.ebuild
deleted file mode 100644
index 9ab0e9d1a1e..00000000000
--- a/dev-libs/efl/efl-1.17.0-r1.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_SUB_PROJECT="core"
- EGIT_URI_APPEND="${PN}"
-elif [[ *"${PV}" == *"_pre"* ]] ; then
- MY_P=${P%%_*}
- SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-else
- SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="release"
-fi
-
-inherit enlightenment pax-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-REQUIRED_USE="
- pulseaudio? ( sound )
- opengl? ( || ( X sdl wayland ) )
- gles? ( || ( X wayland ) )
- gles? ( !sdl )
- gles? ( egl )
- sdl? ( opengl )
- wayland? ( egl !opengl gles )
- xim? ( X )
-"
-
-RDEPEND="
- drm? (
- >=dev-libs/libinput-0.8
- media-libs/mesa[gbm]
- >=x11-libs/libdrm-2.4
- >=x11-libs/libxkbcommon-0.3.0
- )
- fontconfig? ( media-libs/fontconfig )
- fribidi? ( dev-libs/fribidi )
- gif? ( media-libs/giflib )
- glib? ( dev-libs/glib:2 )
- gnutls? ( net-libs/gnutls )
- !gnutls? (
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- harfbuzz? ( media-libs/harfbuzz )
- ibus? ( app-i18n/ibus )
- jpeg2k? ( media-libs/openjpeg:0 )
- !oldlua? ( >=dev-lang/luajit-2.0.0 )
- oldlua? ( dev-lang/lua:* )
- physics? ( >=sci-physics/bullet-2.80 )
- pixman? ( x11-libs/pixman )
- png? ( media-libs/libpng:0= )
- pulseaudio? ( media-sound/pulseaudio )
- scim? ( app-i18n/scim )
- sdl? (
- media-libs/libsdl2
- virtual/opengl
- )
- sound? ( media-libs/libsndfile )
- systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff:0= )
- tslib? ( x11-libs/tslib )
- unwind? ( sys-libs/libunwind )
- valgrind? ( dev-util/valgrind )
- wayland? (
- >=dev-libs/wayland-1.8.0
- >=x11-libs/libxkbcommon-0.3.1
- media-libs/mesa[gles2,wayland]
- )
- webp? ( media-libs/libwebp )
- X? (
- x11-libs/libXcursor
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
-
- opengl? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
-
- gles? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
- )
- xine? ( >=media-libs/xine-lib-1.1.1 )
- xpm? ( x11-libs/libXpm )
-
- sys-apps/dbus
- >=sys-apps/util-linux-2.20.0
- sys-libs/zlib
- virtual/jpeg:0=
-
- !dev-libs/ecore
- !dev-libs/edbus
- !dev-libs/eet
- !dev-libs/eeze
- !dev-libs/efreet
- !dev-libs/eina
- !dev-libs/eio
- !dev-libs/embryo
- !dev-libs/eobj
- !dev-libs/ephysics
- !media-libs/edje
- !media-libs/emotion
- !media-libs/ethumb
- !media-libs/evas
-"
-#external lz4 support currently broken because of unstable ABI/API
-# app-arch/lz4
-
-#soft blockers added above for binpkg users
-#hard blocks are needed for building
-CORE_EFL_CONFLICTS="
- !!dev-libs/ecore
- !!dev-libs/edbus
- !!dev-libs/eet
- !!dev-libs/eeze
- !!dev-libs/efreet
- !!dev-libs/eina
- !!dev-libs/eio
- !!dev-libs/embryo
- !!dev-libs/eobj
- !!dev-libs/ephysics
- !!media-libs/edje
- !!media-libs/emotion
- !!media-libs/ethumb
- !!media-libs/evas
-"
-
-DEPEND="
- ${CORE_EFL_CONFLICTS}
-
- ${RDEPEND}
- doc? ( app-doc/doxygen )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- enlightenment_src_prepare
-
- epatch "${FILESDIR}/${P}-gnutls-3.4.patch"
-
- # Remove stupid sleep command.
- # Also back out gnu make hack that causes regen of Makefiles.
- # Delete var setting that causes the build to abort.
- sed -i \
- -e '/sleep 10/d' \
- -e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
- -e '/BARF_OK=/s:=.*:=:' \
- configure || die
-
- # Upstream doesn't offer a configure flag. #611108
- if ! use unwind ; then
- sed -i \
- -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
- configure || die
- fi
-}
-
-src_configure() {
- if use ssl && use gnutls ; then
- einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
- einfo "gnutls has been selected for you."
- fi
- if use opengl && use gles ; then
- einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
- einfo "opengl has been selected for you."
- fi
-
- E_ECONF=(
- --with-profile=$(usex debug debug release)
- --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
- --with-x11=$(usex X xlib none)
- $(use_with X x)
- --with-opengl=$(usex opengl full $(usex gles es none))
- --with-glib=$(usex glib)
- --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
-
- $(use_enable bmp image-loader-bmp)
- $(use_enable bmp image-loader-wbmp)
- $(use_enable drm)
- $(use_enable doc)
- $(use_enable eet image-loader-eet)
- $(use_enable egl)
- $(use_enable fbcon fb)
- $(use_enable fontconfig)
- $(use_enable fribidi)
- $(use_enable gif image-loader-gif)
- $(use_enable gstreamer gstreamer1)
- $(use_enable harfbuzz)
- $(use_enable ico image-loader-ico)
- $(use_enable ibus)
- $(use_enable jpeg2k image-loader-jp2k)
- $(use_enable neon)
- $(use_enable nls)
- $(use_enable oldlua lua-old)
- $(use_enable physics)
- $(use_enable pixman)
- $(use_enable pixman pixman-font)
- $(use_enable pixman pixman-rect)
- $(use_enable pixman pixman-line)
- $(use_enable pixman pixman-poly)
- $(use_enable pixman pixman-image)
- $(use_enable pixman pixman-image-scale-sample)
- $(use_enable png image-loader-png)
- $(use_enable ppm image-loader-pmaps)
- $(use_enable psd image-loader-psd)
- $(use_enable pulseaudio)
- $(use_enable scim)
- $(use_enable sdl)
- $(use_enable sound audio)
- $(use_enable systemd)
- $(use_enable tga image-loader-tga)
- $(use_enable tiff image-loader-tiff)
- $(use_enable tslib)
- $(use_enable v4l v4l2)
- $(use_enable valgrind)
- $(use_enable wayland)
- $(use_enable webp image-loader-webp)
- $(use_enable xim)
- $(use_enable xine)
- $(use_enable xpm image-loader-xpm)
- --enable-cserve
- --enable-image-loader-generic
- --enable-image-loader-jpeg
-
- --disable-tizen
- --disable-gesture
- --disable-gstreamer
- --enable-xinput2
- --disable-xinput22
- --enable-libmount
-
- # external lz4 support currently broken because of unstable ABI/API
- #--enable-liblz4
- )
-
- enlightenment_src_configure
-}
-
-src_compile() {
- if host-is-pax && ! use oldlua ; then
- # We need to build the lua code first so we can pax-mark it. #547076
- local target='_e_built_sources_target_gogogo_'
- printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
- emake -C src "${target}"
- emake -C src bin/elua/elua
- pax-mark m src/bin/elua/.libs/elua
- fi
- enlightenment_src_compile
-}
-
-src_install() {
- MAKEOPTS+=" -j1"
-
- enlightenment_src_install
-}
diff --git a/dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch b/dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch
deleted file mode 100644
index 6c5f8eb757c..00000000000
--- a/dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6f42992b4f1110f44d2db57cd6fe42559cfffdc2 Mon Sep 17 00:00:00 2001
-From: Cedric BAIL <cedric@osg.samsung.com>
-Date: Wed, 21 Sep 2016 10:33:44 -0700
-Subject: [PATCH] eet: fix gnutls support with newer version.
-
----
- src/lib/eet/eet_cipher.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c
-index a34fdff..cf9ef71 100644
---- a/src/lib/eet/eet_cipher.c
-+++ b/src/lib/eet/eet_cipher.c
-@@ -679,7 +679,6 @@ eet_identity_check(const void *data_base,
- gnutls_datum_t datum;
- gnutls_datum_t signature;
- gnutls_pubkey_t pubkey;
-- gnutls_digest_algorithm_t hash_algo;
- unsigned char *hash;
- gcry_md_hd_t md;
- int err;
-@@ -717,10 +716,10 @@ eet_identity_check(const void *data_base,
- if (gnutls_pubkey_import_x509(pubkey, cert, 0) < 0)
- goto on_error;
-
-- if (gnutls_pubkey_get_verify_algorithm(pubkey, &signature, &hash_algo) < 0)
-- goto on_error;
--
-- if (gnutls_pubkey_verify_hash(pubkey, 0, &datum, &signature) < 0)
-+ if (gnutls_pubkey_verify_hash2(pubkey,
-+ gnutls_x509_crt_get_signature_algorithm(cert),
-+ 0,
-+ &datum, &signature) < 0)
- goto on_error;
-
- if (sha1)
---
-2.10.2
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/, dev-libs/efl/files/
@ 2019-08-24 5:45 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2019-08-24 5:45 UTC (permalink / raw
To: gentoo-commits
commit: fc73a813c9b0881bcea53e7a73ea671e4c145765
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 05:45:19 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 05:45:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc73a813
dev-libs/efl: clean old
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/efl/Manifest | 1 -
dev-libs/efl/efl-1.21.1-r3.ebuild | 276 ---------------------
.../efl-1.21.1-fix_evas_preload_segfault.patch | 10 -
3 files changed, 287 deletions(-)
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 0cad8da5972..fd0dad8d34c 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,2 +1 @@
-DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild
deleted file mode 100644
index 0efdcf3a723..00000000000
--- a/dev-libs/efl/efl-1.21.1-r3.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+bmp dds connman debug drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
-
-REQUIRED_USE="
- ?? ( gles2 opengl )
- fbcon? ( !tslib )
- gles2? (
- || ( wayland X )
- !sdl
- )
- ibus? ( glib )
- opengl? ( X )
- pulseaudio? ( sound )
- sdl? ( opengl )
- vnc? ( fbcon X )
- wayland? ( gles2 !opengl )
- xim? ( X )
- xpresent? ( X )
-"
-
-RDEPEND="
- net-misc/curl
- media-libs/libpng:0=
- sys-apps/dbus
- sys-apps/util-linux
- sys-libs/zlib:=
- virtual/jpeg:0=
- connman? ( net-misc/connman )
- drm? (
- dev-libs/libinput
- media-libs/mesa[gbm]
- x11-libs/libdrm
- x11-libs/libxkbcommon
- )
- fontconfig? ( media-libs/fontconfig )
- fribidi? ( dev-libs/fribidi )
- gif? ( media-libs/giflib:= )
- gles2? ( media-libs/mesa[egl,gles2] )
- glib? ( dev-libs/glib:2 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- harfbuzz? ( media-libs/harfbuzz )
- hyphen? ( dev-libs/hyphen )
- ibus? ( app-i18n/ibus )
- jpeg2k? ( media-libs/openjpeg:= )
- libuv? ( dev-libs/libuv )
- luajit? ( dev-lang/luajit:= )
- !luajit? ( dev-lang/lua:* )
- nls? ( sys-devel/gettext )
- pdf? ( app-text/poppler:=[cxx] )
- physics? ( sci-physics/bullet:= )
- postscript? ( app-text/libspectre )
- pulseaudio? ( media-sound/pulseaudio )
- raw? ( media-libs/libraw:= )
- scim? ( app-i18n/scim )
- sdl? (
- media-libs/libsdl2
- virtual/opengl
- )
- sound? ( media-libs/libsndfile )
- ssl? (
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- svg? (
- gnome-base/librsvg
- x11-libs/cairo
- )
- system-lz4? ( app-arch/lz4 )
- systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff:0= )
- tslib? ( x11-libs/tslib:= )
- unwind? ( sys-libs/libunwind )
- valgrind? ( dev-util/valgrind )
- vlc? ( media-video/vlc )
- vnc? ( net-libs/libvncserver )
- wayland? (
- dev-libs/wayland
- media-libs/mesa[gles2,wayland]
- x11-libs/libxkbcommon
- )
- webp? ( media-libs/libwebp:= )
- X? (
- media-libs/freetype
- x11-libs/libXcursor
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
- gles2? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
- opengl? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
- )
- xine? ( media-libs/xine-lib )
- xpm? ( x11-libs/libXpm )
- xpresent? ( x11-libs/libXpresent )
- zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix_evas_preload_segfault.patch"
-)
-
-src_prepare() {
- default
-
- # Upstream still doesnt offer a configure flag. #611108
- if ! use unwind ; then
- sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
- configure || die "Sedding configure file with unwind fix failed."
- fi
-
- xdg_environment_reset
-}
-
-src_configure() {
- local myconf=(
- --enable-cserve
- --enable-image-loader-generic
- --enable-image-loader-jpeg
- --enable-image-loader-png
- --enable-libeeze
- --enable-libmount
- --enable-xinput22
-
- --disable-doc
- --disable-eglfs
- --disable-gesture
- --disable-gstreamer
- --disable-image-loader-tgv
- --disable-tizen
- --disable-wayland-ivi-shell
-
- $(use_enable bmp image-loader-bmp)
- $(use_enable bmp image-loader-wbmp)
- $(use_enable dds image-loader-dds)
- $(use_enable drm)
- $(use_enable drm elput)
- $(use_enable eet image-loader-eet)
- $(use_enable examples always-build-examples)
- $(use_enable fbcon fb)
- $(use_enable fontconfig)
- $(use_enable fribidi)
- $(use_enable gif image-loader-gif)
- $(use_enable gles2 egl)
- $(use_enable gstreamer gstreamer1)
- $(use_enable harfbuzz)
- $(use_enable hyphen)
- $(use_enable ico image-loader-ico)
- $(use_enable ibus)
- $(use_enable jpeg2k image-loader-jp2k)
- $(use_enable libuv)
- $(use_enable !luajit lua-old)
- $(use_enable neon)
- $(use_enable nls)
- $(use_enable pdf poppler)
- $(use_enable physics)
- $(use_enable postscript spectre)
- $(use_enable ppm image-loader-pmaps)
- $(use_enable psd image-loader-psd)
- $(use_enable pulseaudio)
- $(use_enable raw libraw)
- $(use_enable scim)
- $(use_enable sdl)
- $(use_enable sound audio)
- $(use_enable static-libs static)
- $(use_enable svg librsvg)
- $(use_enable system-lz4 liblz4)
- $(use_enable systemd)
- $(use_enable tga image-loader-tga)
- $(use_enable tiff image-loader-tiff)
- $(use_enable tslib)
- $(use_enable v4l v4l2)
- $(use_enable valgrind)
- $(use_enable vlc libvlc)
- $(use_enable vnc vnc-server)
- $(use_enable wayland)
- $(use_enable webp image-loader-webp)
- $(use_enable xcf)
- $(use_enable xim)
- $(use_enable xine)
- $(use_enable xpm image-loader-xpm)
- $(use_enable xpresent)
- $(use_enable zeroconf avahi)
-
- --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
- --with-glib=$(usex glib)
- --with-js=none
- --with-net-control=$(usex connman connman none)
- --with-profile=$(usex debug debug release)
- --with-x11=$(usex X xlib none)
-
- $(use_with X x)
- )
-
- use drm && use wayland && myconf+=( --enable-gl-drm )
-
- if use opengl ; then
- myconf+=( --with-opengl=full )
- elif use gles2 ; then
- myconf+=( --with-opengl=es )
- elif use drm && use wayland ; then
- myconf+=( --with-opengl=es )
- else
- myconf+=( --with-opengl=none )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- if host-is-pax && use luajit ; then
- # We need to build the lua code first so we can pax-mark it. #547076
- local target='_e_built_sources_target_gogogo_'
- printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
- emake -C src "${target}"
- emake -C src bin/elua/elua
- pax-mark m src/bin/elua/.libs/elua
- fi
-
- V=1 emake || die "Compiling EFL failed."
-}
-
-src_install() {
- einstalldocs
-
- V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed."
-
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch b/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch
deleted file mode 100644
index 8d42cbb0f25..00000000000
--- a/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/lib/evas/cache/evas_cache_image.c 14:09:44.971119099 +0100
-+++ b/src/lib/evas/cache/evas_cache_image.c 14:10:21.521226043 +0100
-@@ -361,6 +361,7 @@
- cache = current->cache;
-
- if ((!current->flags.loaded) &&
-+ (current->info.loader) &&
- current->info.loader->threadable)
- {
- evas_module_task_register(evas_cache_image_cancelled, current);
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/, dev-libs/efl/files/
@ 2021-03-12 9:00 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2021-03-12 9:00 UTC (permalink / raw
To: gentoo-commits
commit: c0efae0033cfc8f1604758004da1ad6c49aa69d0
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 08:56:14 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 08:56:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0efae00
dev-libs/efl: patch avif to work again
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/efl/efl-1.25.1-r11.ebuild | 323 ++++++++++++++++++++++++
dev-libs/efl/files/efl-1.25.1-libavif-fix.patch | 71 ++++++
2 files changed, 394 insertions(+)
diff --git a/dev-libs/efl/efl-1.25.1-r11.ebuild b/dev-libs/efl/efl-1.25.1-r11.ebuild
new file mode 100644
index 00000000000..30a74e5dfdd
--- /dev/null
+++ b/dev-libs/efl/efl-1.25.1-r11.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="${S}/doc"
+
+LUA_REQ_USE="deprecated(+)"
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit docs lua-single meson python-any-r1 xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
+ +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
+ jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
+ sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
+ xim xpm xpresent zeroconf"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ ?? ( elogind systemd )
+ ?? ( gles2-only opengl )
+ ?? ( fbcon tslib )
+ ssl
+ drm? ( gles2-only )
+ examples? ( eet svg )
+ gles2-only? ( || ( wayland X ) )
+ ibus? ( glib )
+ pulseaudio? ( sound )
+ wayland? ( gles2-only !opengl )
+ xim? ( X )
+ xpresent? ( X )"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}
+ dev-libs/check
+ net-misc/curl
+ media-libs/giflib:=
+ media-libs/libpng:0=
+ sys-apps/dbus
+ sys-libs/zlib
+ virtual/jpeg:0=
+ X? (
+ media-libs/freetype
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/libXScrnSaver
+ wayland? ( x11-libs/libxkbcommon[X] )
+ )
+ avif? ( media-libs/libavif )
+ connman? ( net-misc/connman )
+ drm? (
+ dev-libs/libinput
+ dev-libs/wayland
+ media-libs/mesa[gbm]
+ x11-libs/libdrm
+ x11-libs/libxkbcommon
+ )
+ elogind? (
+ sys-auth/elogind
+ virtual/libudev
+ )
+ fontconfig? ( media-libs/fontconfig )
+ fribidi? ( dev-libs/fribidi )
+ gles2-only? (
+ media-libs/mesa[egl,gles2]
+ virtual/opengl
+ )
+ glib? ( dev-libs/glib:2 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ hyphen? ( dev-libs/hyphen )
+ ibus? ( app-i18n/ibus )
+ jpeg2k? ( media-libs/openjpeg:= )
+ json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
+ mono? ( dev-lang/mono )
+ opengl? ( virtual/opengl )
+ pdf? ( app-text/poppler:=[cxx] )
+ physics? ( sci-physics/bullet:= )
+ postscript? ( app-text/libspectre )
+ pulseaudio? ( media-sound/pulseaudio )
+ raw? ( media-libs/libraw:= )
+ scim? ( app-i18n/scim )
+ sdl? ( media-libs/libsdl2 )
+ sound? ( media-libs/libsndfile )
+ ssl? (
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ )
+ svg? ( gnome-base/librsvg )
+ system-lz4? ( app-arch/lz4 )
+ systemd? ( sys-apps/systemd:= )
+ tiff? ( media-libs/tiff:0= )
+ tslib? ( x11-libs/tslib:= )
+ unwind? ( sys-libs/libunwind )
+ v4l? ( media-libs/libv4l )
+ vnc? ( net-libs/libvncserver )
+ wayland? (
+ dev-libs/wayland
+ media-libs/mesa[gles2,wayland]
+ x11-libs/libxkbcommon
+ )
+ webp? ( media-libs/libwebp:= )
+ xpm? ( x11-libs/libXpm )
+ xpresent? ( x11-libs/libXpresent )
+ zeroconf? ( net-dns/avahi )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/efl-1.25.1-libavif-fix.patch )
+
+pkg_setup() {
+ # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
+ QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.1
+ /usr/$(get_libdir)/libefreet_mime.so.1.25.1"
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # Remove automagic unwind configure option, #743154
+ if ! use unwind; then
+ sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
+ die "Failed to remove libunwind dep"
+ fi
+
+ # Fixup Doxyfile
+ pushd "${DOCS_DIR}" || die
+ cp Doxyfile.in Doxyfile || die
+ sed -i \
+ -e "s/@PACKAGE_VERSION@/${PV}/g" \
+ -e "s/@top_builddir@/../g" \
+ -e "s/@top_srcdir@/../g" \
+ -e "s/@srcdir@/./g" \
+ Doxyfile || die
+ popd || die
+
+ # Fix python shebangs for python-exec[-native-symlinks], #764086
+ local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+ python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+ local emesonargs=(
+ --buildtype=release
+
+ -D buffer=false
+ -D cocoa=false
+ -D drm-deprecated=false
+ -D g-mainloop=false
+ -D mono-beta=false
+ -D dotnet=false
+ -D pixman=false
+ -D wl-deprecated=false
+ -D dotnet-stylecop-severity=Warning
+
+ -D edje-sound-and-video=true
+ -D eeze=true
+ -D install-eo-files=true
+ -D libmount=true
+ -D native-arch-optimization=true
+ -D xinput2=true
+ -D xinput22=true
+
+ $(meson_use X x11)
+ $(meson_use debug debug-threads)
+ $(meson_use drm)
+ $(meson_use examples build-examples)
+ $(meson_use fbcon fb)
+ $(meson_use fontconfig)
+ $(meson_use fribidi)
+ $(meson_use glib)
+ $(meson_use gstreamer)
+ $(meson_use harfbuzz)
+ $(meson_use hyphen)
+ $(meson_use lua_single_target_luajit elua)
+ $(meson_use nls)
+ $(meson_use physics)
+ $(meson_use pulseaudio)
+ $(meson_use sdl)
+ $(meson_use sound audio)
+ $(meson_use tslib)
+ $(meson_use v4l v4l2)
+ $(meson_use vnc vnc-server)
+ $(meson_use wayland wl)
+ $(meson_use xpresent)
+ $(meson_use zeroconf avahi)
+
+ $(meson_use !system-lz4 embedded-lz4)
+ )
+
+ if use elogind || use systemd; then
+ emesonargs+=( -D systemd=true )
+ else
+ emesonargs+=( -D systemd=false )
+ fi
+
+ if use opengl; then
+ emesonargs+=( -D opengl=full )
+ elif use gles2-only; then
+ emesonargs+=( -D opengl=es-egl )
+ else
+ emesonargs+=( -D opengl=none )
+ fi
+
+ if use gnutls; then
+ emesonargs+=( -D crypto=gnutls )
+ else
+ emesonargs+=( -D crypto=openssl )
+ fi
+
+ if use connman; then
+ emesonargs+=( -D network-backend=connman )
+ else
+ emesonargs+=( -D network-backend=none )
+ fi
+
+ local disabledEvasLoaders=""
+ ! use avif && disabledEvasLoaders="avif,"
+ ! use bmp && disabledEvasLoaders+="bmp,wbmp,"
+ ! use dds && disabledEvasLoaders+="dds,"
+ ! use eet && disabledEvasLoaders+="eet,"
+ ! use gstreamer && disabledEvasLoaders+="gst,"
+ ! use ico && disabledEvasLoaders+="ico,"
+ ! use jpeg2k && disabledEvasLoaders+="jp2k,"
+ ! use json && disabledEvasLoaders+="json,"
+ ! use pdf && disabledEvasLoaders+="pdf,"
+ ! use pmaps && disabledEvasLoaders+="pmaps,"
+ ! use postscript && disabledEvasLoaders+="ps,"
+ ! use psd && disabledEvasLoaders+="psd,"
+ ! use raw && disabledEvasLoaders+="raw,"
+ ! use svg && disabledEvasLoaders+="rsvg,svg,"
+ ! use tga && disabledEvasLoaders+="tga,"
+ ! use tgv && disabledEvasLoaders+="tgv,"
+ ! use tiff && disabledEvasLoaders+="tiff,"
+ ! use webp && disabledEvasLoaders+="webp,"
+ ! use xcf && disabledEvasLoaders+="xcf,"
+ ! use xpm && disabledEvasLoaders+="xpm,"
+ [[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
+ emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
+
+ local disabledImfLoaders=""
+ ! use ibus && disabledImfLoaders+="ibus,"
+ ! use scim && disabledImfLoaders+="scim,"
+ ! use xim && disabledImfLoaders+="xim,"
+ [[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
+ emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
+
+ local bindingsList="cxx,"
+ use lua_single_target_luajit && bindingsList+="lua,"
+ use mono && bindingsList+="mono,"
+ [[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
+ emesonargs+=( -D bindings="${bindingsList}" )
+
+ local luaChoice=""
+ if use lua_single_target_luajit; then
+ luaChoice+="luajit"
+ else
+ luaChoice+="lua"
+ fi
+ emesonargs+=( -D lua-interpreter="${luaChoice}" )
+
+ # Not all arm CPU's have neon instruction set, #722552
+ if use arm && ! use cpu_flags_arm_neon; then
+ emesonargs+=( -D native-arch-optimization=false )
+ fi
+
+ meson_src_configure
+}
+
+src_compile() {
+ docs_compile
+ meson_src_compile
+}
+
+src_install() {
+ meson_src_install
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples/
+ dodoc -r "${BUILD_DIR}"/src/examples/
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/files/efl-1.25.1-libavif-fix.patch b/dev-libs/efl/files/efl-1.25.1-libavif-fix.patch
new file mode 100644
index 00000000000..ab11790f1b7
--- /dev/null
+++ b/dev-libs/efl/files/efl-1.25.1-libavif-fix.patch
@@ -0,0 +1,71 @@
+From 00f5eed1d2390d204c83a2cb78a37531f6bbe49c Mon Sep 17 00:00:00 2001
+From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
+Date: Fri, 18 Dec 2020 11:16:38 +0000
+Subject: evas - avif - fix for 0.8.2 libavif that broke api
+
+also require 0.8.2 ... as well - no point trying to support older
+versions forever and this is still experimental.
+
+fixes T8844
+@fix
+---
+ src/modules/evas/image_loaders/avif/evas_image_load_avif.c | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+(limited to 'src/modules/evas/image_loaders/avif/evas_image_load_avif.c')
+
+diff --git a/src/modules/evas/image_loaders/avif/evas_image_load_avif.c b/src/modules/evas/image_loaders/avif/evas_image_load_avif.c
+index 34b6da9bd3..f7cfe0ef03 100644
+--- a/src/modules/evas/image_loaders/avif/evas_image_load_avif.c
++++ b/src/modules/evas/image_loaders/avif/evas_image_load_avif.c
+@@ -43,7 +43,6 @@ evas_image_load_file_head_avif_internal(Evas_Loader_Internal *loader,
+ int *error)
+ {
+ Evas_Image_Animated *animated;
+- avifROData raw;
+ avifDecoder *decoder;
+ avifResult res;
+ Eina_Bool ret;
+@@ -55,9 +54,6 @@ evas_image_load_file_head_avif_internal(Evas_Loader_Internal *loader,
+ prop->h = 0;
+ prop->alpha = EINA_FALSE;
+
+- raw.size = length;
+- raw.data = (const uint8_t *)map;
+-
+ decoder = avifDecoderCreate();
+ if (!decoder)
+ {
+@@ -65,7 +61,8 @@ evas_image_load_file_head_avif_internal(Evas_Loader_Internal *loader,
+ return ret;
+ }
+
+- res = avifDecoderParse(decoder, &raw);
++ avifDecoderSetIOMemory(decoder, (const uint8_t *)map, length);
++ res = avifDecoderParse(decoder);
+ if (res != AVIF_RESULT_OK)
+ {
+ ERR("avif file format invalid");
+@@ -141,7 +138,6 @@ evas_image_load_file_data_avif_internal(Evas_Loader_Internal *loader,
+ decoder = loader->decoder;
+ if (!decoder)
+ {
+- avifROData raw;
+ decoder = avifDecoderCreate();
+ if (!decoder)
+ {
+@@ -149,10 +145,8 @@ evas_image_load_file_data_avif_internal(Evas_Loader_Internal *loader,
+ return EINA_FALSE;
+ }
+
+- raw.size = length;
+- raw.data = (const uint8_t *)map;
+-
+- res = avifDecoderParse(decoder, &raw);
++ avifDecoderSetIOMemory(decoder, (const uint8_t *)map, length);
++ res = avifDecoderParse(decoder);
+ if (res != AVIF_RESULT_OK)
+ {
+ *error = EVAS_LOAD_ERROR_GENERIC;
+--
+cgit v1.2.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/, dev-libs/efl/files/
@ 2022-09-16 12:13 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2022-09-16 12:13 UTC (permalink / raw
To: gentoo-commits
commit: 86ce4a120539f0e049c6b13cb12810da9b2d0f0e
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 12:08:42 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 12:13:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ce4a12
dev-libs/efl: drop 1.25.1-r13
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/efl/Manifest | 1 -
dev-libs/efl/efl-1.25.1-r13.ebuild | 323 ------------------------
dev-libs/efl/files/efl-1.25.1-libavif-fix.patch | 71 ------
3 files changed, 395 deletions(-)
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 97087c514cb0..0a70299252bb 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,2 +1 @@
-DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
DIST efl-1.26.2.tar.xz 168537016 BLAKE2B b7ca59dbcd483edf31e68aae4df512a195a8239935febf8497ce039eb18696ca84e4f6d0206818c84f6e1f625abf3e730fc812304459e5615feca2c3fa07092c SHA512 d8478b6f197600c5abb7e2fcc030f8938e6726dde5e1947df4b042e6e9c77b0f31770b6b86a76ee2be52bf5354e02716bd7e5daf0771d149004d9447e432dc32
diff --git a/dev-libs/efl/efl-1.25.1-r13.ebuild b/dev-libs/efl/efl-1.25.1-r13.ebuild
deleted file mode 100644
index 05051ee3a39f..000000000000
--- a/dev-libs/efl/efl-1.25.1-r13.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="dev-texlive/texlive-fontutils"
-DOCS_DIR="${S}/doc"
-
-LUA_REQ_USE="deprecated(+)"
-LUA_COMPAT=( lua5-{1,2} luajit )
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit docs lua-single meson python-any-r1 xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
- +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico
- jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
- sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
- xim xpm xpresent zeroconf"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
- ?? ( elogind systemd )
- ?? ( gles2-only opengl )
- ?? ( fbcon tslib )
- ssl
- drm? ( gles2-only )
- examples? ( eet svg )
- gles2-only? ( || ( wayland X ) )
- ibus? ( glib )
- pulseaudio? ( sound )
- wayland? ( gles2-only !opengl )
- xim? ( X )
- xpresent? ( X )"
-
-# Requires everything to be enabled unconditionally.
-RESTRICT="test"
-
-RDEPEND="${LUA_DEPS}
- dev-libs/check
- net-misc/curl
- media-libs/giflib:=
- media-libs/libpng:0=
- sys-apps/dbus
- sys-libs/zlib
- virtual/jpeg:0=
- X? (
- media-libs/freetype
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
- wayland? ( x11-libs/libxkbcommon[X] )
- )
- avif? ( media-libs/libavif:= )
- connman? ( net-misc/connman )
- drm? (
- dev-libs/libinput
- dev-libs/wayland
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- x11-libs/libxkbcommon
- )
- elogind? (
- sys-auth/elogind
- virtual/libudev
- )
- fontconfig? ( media-libs/fontconfig )
- fribidi? ( dev-libs/fribidi )
- gles2-only? (
- media-libs/mesa[egl(+),gles2]
- virtual/opengl
- )
- glib? ( dev-libs/glib:2 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- hyphen? ( dev-libs/hyphen )
- ibus? ( app-i18n/ibus )
- jpeg2k? ( media-libs/openjpeg:= )
- json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
- mono? ( dev-lang/mono )
- opengl? ( virtual/opengl )
- pdf? ( app-text/poppler:=[cxx] )
- physics? ( sci-physics/bullet:= )
- postscript? ( app-text/libspectre )
- pulseaudio? ( media-sound/pulseaudio )
- raw? ( media-libs/libraw:= )
- scim? ( app-i18n/scim )
- sdl? ( media-libs/libsdl2 )
- sound? ( media-libs/libsndfile )
- ssl? (
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- dev-libs/openssl:0=
- )
- )
- svg? ( gnome-base/librsvg )
- system-lz4? ( app-arch/lz4 )
- systemd? ( sys-apps/systemd:= )
- tiff? ( media-libs/tiff:0= )
- tslib? ( x11-libs/tslib:= )
- unwind? ( sys-libs/libunwind )
- v4l? ( media-libs/libv4l )
- vnc? ( net-libs/libvncserver )
- wayland? (
- dev-libs/wayland
- media-libs/mesa[gles2,wayland]
- x11-libs/libxkbcommon
- )
- webp? ( media-libs/libwebp:= )
- xpm? ( x11-libs/libXpm )
- xpresent? ( x11-libs/libXpresent )
- zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/efl-1.25.1-libavif-fix.patch )
-
-pkg_setup() {
- # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
- QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.1
- /usr/$(get_libdir)/libefreet_mime.so.1.25.1"
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Remove automagic unwind configure option, #743154
- if ! use unwind; then
- sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
- die "Failed to remove libunwind dep"
- fi
-
- # Fixup Doxyfile
- pushd "${DOCS_DIR}" || die
- cp Doxyfile.in Doxyfile || die
- sed -i \
- -e "s/@PACKAGE_VERSION@/${PV}/g" \
- -e "s/@top_builddir@/../g" \
- -e "s/@top_srcdir@/../g" \
- -e "s/@srcdir@/./g" \
- Doxyfile || die
- popd || die
-
- # Fix python shebangs for python-exec[-native-symlinks], #764086
- local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
- python_fix_shebang -q ${shebangs[*]}
-}
-
-src_configure() {
- local emesonargs=(
- --buildtype=release
-
- -D buffer=false
- -D cocoa=false
- -D drm-deprecated=false
- -D g-mainloop=false
- -D mono-beta=false
- -D dotnet=false
- -D pixman=false
- -D wl-deprecated=false
- -D dotnet-stylecop-severity=Warning
-
- -D edje-sound-and-video=true
- -D eeze=true
- -D install-eo-files=true
- -D libmount=true
- -D native-arch-optimization=true
- -D xinput2=true
- -D xinput22=true
-
- $(meson_use X x11)
- $(meson_use debug debug-threads)
- $(meson_use drm)
- $(meson_use examples build-examples)
- $(meson_use fbcon fb)
- $(meson_use fontconfig)
- $(meson_use fribidi)
- $(meson_use glib)
- $(meson_use gstreamer)
- $(meson_use harfbuzz)
- $(meson_use hyphen)
- $(meson_use lua_single_target_luajit elua)
- $(meson_use nls)
- $(meson_use physics)
- $(meson_use pulseaudio)
- $(meson_use sdl)
- $(meson_use sound audio)
- $(meson_use tslib)
- $(meson_use v4l v4l2)
- $(meson_use vnc vnc-server)
- $(meson_use wayland wl)
- $(meson_use xpresent)
- $(meson_use zeroconf avahi)
-
- $(meson_use !system-lz4 embedded-lz4)
- )
-
- if use elogind || use systemd; then
- emesonargs+=( -D systemd=true )
- else
- emesonargs+=( -D systemd=false )
- fi
-
- if use opengl; then
- emesonargs+=( -D opengl=full )
- elif use gles2-only; then
- emesonargs+=( -D opengl=es-egl )
- else
- emesonargs+=( -D opengl=none )
- fi
-
- if use gnutls; then
- emesonargs+=( -D crypto=gnutls )
- else
- emesonargs+=( -D crypto=openssl )
- fi
-
- if use connman; then
- emesonargs+=( -D network-backend=connman )
- else
- emesonargs+=( -D network-backend=none )
- fi
-
- local disabledEvasLoaders=""
- ! use avif && disabledEvasLoaders="avif,"
- ! use bmp && disabledEvasLoaders+="bmp,wbmp,"
- ! use dds && disabledEvasLoaders+="dds,"
- ! use eet && disabledEvasLoaders+="eet,"
- ! use gstreamer && disabledEvasLoaders+="gst,"
- ! use ico && disabledEvasLoaders+="ico,"
- ! use jpeg2k && disabledEvasLoaders+="jp2k,"
- ! use json && disabledEvasLoaders+="json,"
- ! use pdf && disabledEvasLoaders+="pdf,"
- ! use pmaps && disabledEvasLoaders+="pmaps,"
- ! use postscript && disabledEvasLoaders+="ps,"
- ! use psd && disabledEvasLoaders+="psd,"
- ! use raw && disabledEvasLoaders+="raw,"
- ! use svg && disabledEvasLoaders+="rsvg,svg,"
- ! use tga && disabledEvasLoaders+="tga,"
- ! use tgv && disabledEvasLoaders+="tgv,"
- ! use tiff && disabledEvasLoaders+="tiff,"
- ! use webp && disabledEvasLoaders+="webp,"
- ! use xcf && disabledEvasLoaders+="xcf,"
- ! use xpm && disabledEvasLoaders+="xpm,"
- [[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
- emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
-
- local disabledImfLoaders=""
- ! use ibus && disabledImfLoaders+="ibus,"
- ! use scim && disabledImfLoaders+="scim,"
- ! use xim && disabledImfLoaders+="xim,"
- [[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
- emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
-
- local bindingsList="cxx,"
- use lua_single_target_luajit && bindingsList+="lua,"
- use mono && bindingsList+="mono,"
- [[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
- emesonargs+=( -D bindings="${bindingsList}" )
-
- local luaChoice=""
- if use lua_single_target_luajit; then
- luaChoice+="luajit"
- else
- luaChoice+="lua"
- fi
- emesonargs+=( -D lua-interpreter="${luaChoice}" )
-
- # Not all arm CPU's have neon instruction set, #722552
- if use arm && ! use cpu_flags_arm_neon; then
- emesonargs+=( -D native-arch-optimization=false )
- fi
-
- meson_src_configure
-}
-
-src_compile() {
- docs_compile
- meson_src_compile
-}
-
-src_install() {
- meson_src_install
-
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples/
- dodoc -r "${BUILD_DIR}"/src/examples/
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/files/efl-1.25.1-libavif-fix.patch b/dev-libs/efl/files/efl-1.25.1-libavif-fix.patch
deleted file mode 100644
index ab11790f1b79..000000000000
--- a/dev-libs/efl/files/efl-1.25.1-libavif-fix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 00f5eed1d2390d204c83a2cb78a37531f6bbe49c Mon Sep 17 00:00:00 2001
-From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
-Date: Fri, 18 Dec 2020 11:16:38 +0000
-Subject: evas - avif - fix for 0.8.2 libavif that broke api
-
-also require 0.8.2 ... as well - no point trying to support older
-versions forever and this is still experimental.
-
-fixes T8844
-@fix
----
- src/modules/evas/image_loaders/avif/evas_image_load_avif.c | 14 ++++----------
- 1 file changed, 4 insertions(+), 10 deletions(-)
-
-(limited to 'src/modules/evas/image_loaders/avif/evas_image_load_avif.c')
-
-diff --git a/src/modules/evas/image_loaders/avif/evas_image_load_avif.c b/src/modules/evas/image_loaders/avif/evas_image_load_avif.c
-index 34b6da9bd3..f7cfe0ef03 100644
---- a/src/modules/evas/image_loaders/avif/evas_image_load_avif.c
-+++ b/src/modules/evas/image_loaders/avif/evas_image_load_avif.c
-@@ -43,7 +43,6 @@ evas_image_load_file_head_avif_internal(Evas_Loader_Internal *loader,
- int *error)
- {
- Evas_Image_Animated *animated;
-- avifROData raw;
- avifDecoder *decoder;
- avifResult res;
- Eina_Bool ret;
-@@ -55,9 +54,6 @@ evas_image_load_file_head_avif_internal(Evas_Loader_Internal *loader,
- prop->h = 0;
- prop->alpha = EINA_FALSE;
-
-- raw.size = length;
-- raw.data = (const uint8_t *)map;
--
- decoder = avifDecoderCreate();
- if (!decoder)
- {
-@@ -65,7 +61,8 @@ evas_image_load_file_head_avif_internal(Evas_Loader_Internal *loader,
- return ret;
- }
-
-- res = avifDecoderParse(decoder, &raw);
-+ avifDecoderSetIOMemory(decoder, (const uint8_t *)map, length);
-+ res = avifDecoderParse(decoder);
- if (res != AVIF_RESULT_OK)
- {
- ERR("avif file format invalid");
-@@ -141,7 +138,6 @@ evas_image_load_file_data_avif_internal(Evas_Loader_Internal *loader,
- decoder = loader->decoder;
- if (!decoder)
- {
-- avifROData raw;
- decoder = avifDecoderCreate();
- if (!decoder)
- {
-@@ -149,10 +145,8 @@ evas_image_load_file_data_avif_internal(Evas_Loader_Internal *loader,
- return EINA_FALSE;
- }
-
-- raw.size = length;
-- raw.data = (const uint8_t *)map;
--
-- res = avifDecoderParse(decoder, &raw);
-+ avifDecoderSetIOMemory(decoder, (const uint8_t *)map, length);
-+ res = avifDecoderParse(decoder);
- if (res != AVIF_RESULT_OK)
- {
- *error = EVAS_LOAD_ERROR_GENERIC;
---
-cgit v1.2.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/, dev-libs/efl/files/
@ 2024-03-17 7:45 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2024-03-17 7:45 UTC (permalink / raw
To: gentoo-commits
commit: 56abc88dee4aa81e813f4f54662fc527ef34969b
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 07:42:12 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 07:42:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56abc88d
dev-libs/efl: drop 1.26.3-r2
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/efl/Manifest | 1 -
dev-libs/efl/efl-1.26.3-r2.ebuild | 318 ---------------------
.../efl/files/efl-1.26.3-gettext-0.22-fix.patch | 38 ---
dev-libs/efl/files/efl-1.26.3-libressl.patch | 191 -------------
4 files changed, 548 deletions(-)
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 033943ce171e..710720bed01d 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,2 +1 @@
-DIST efl-1.26.3.tar.xz 168540684 BLAKE2B aeb0215b9cdce9ca10550c698df4985ff9557c3c400c3a300887148d04a8900f04c7200473e5fce1d3021378be1e664e9364d171ec09c4fc488b4ec758722ea5 SHA512 9801ee8bc963786962d87af56d532d3f019bc18a91924d2ef84934dcd0ae30452d858db93c33964f2bff9af2f3c8feb9927f7281ead4a8993ed622cd0cf2c514
DIST efl-1.27.0.tar.xz 168543208 BLAKE2B 082f7089f1a017db8e62f36fb2a51e18c7d00b74b8e865a60d066e49921c69720101deb3184a125633a6c646e241b8765cccc038c906c00d4ca16ecb705faf6f SHA512 5dda2f630463a2504d9246be17449579bbc470904e137b02b3b5c44db033dec2688f6c477885de1485944d875ee62619b6e7c5d4d3657225951f6feaf83b4fa4
diff --git a/dev-libs/efl/efl-1.26.3-r2.ebuild b/dev-libs/efl/efl-1.26.3-r2.ebuild
deleted file mode 100644
index cce88319b526..000000000000
--- a/dev-libs/efl/efl-1.26.3-r2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="dev-texlive/texlive-fontutils"
-DOCS_DIR="${S}/doc"
-
-LUA_REQ_USE="deprecated(+)"
-LUA_COMPAT=( lua5-{1,2} luajit )
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit docs lua-single meson python-any-r1 xdg
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
- +fontconfig fribidi gif gnutls glib +gstreamer harfbuzz heif hyphen ibus ico
- jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
- sdl +sound +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
- xim xpm xpresent zeroconf"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
- ?? ( elogind systemd )
- ?? ( fbcon tslib )
- drm? ( wayland )
- examples? ( eet svg )
- ibus? ( glib )
- opengl? ( X )
- pulseaudio? ( sound )
- xim? ( X )
- xpresent? ( X )"
-
-# Requires everything to be enabled unconditionally.
-RESTRICT="test"
-
-RDEPEND="${LUA_DEPS}
- !x11-themes/e-flat-theme
- dev-libs/libinput:=
- net-misc/curl
- media-libs/giflib:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- sys-apps/dbus
- sys-libs/zlib
- X? (
- !opengl? ( media-libs/mesa[egl(+),gles2] )
- media-libs/freetype
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libxkbcommon
- wayland? ( x11-libs/libxkbcommon[X] )
- )
- avif? ( media-libs/libavif:= )
- connman? ( net-misc/connman )
- drm? (
- dev-libs/libinput:=
- dev-libs/wayland
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- x11-libs/libxkbcommon
- )
- elogind? (
- sys-auth/elogind
- virtual/libudev:=
- )
- fontconfig? ( media-libs/fontconfig )
- fribidi? ( dev-libs/fribidi )
- glib? ( dev-libs/glib:2 )
- gnutls? ( net-libs/gnutls:= )
- !gnutls? ( dev-libs/openssl:0= )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- harfbuzz? ( media-libs/harfbuzz:= )
- heif? ( media-libs/libheif:= )
- hyphen? ( dev-libs/hyphen )
- ibus? ( app-i18n/ibus )
- jpeg2k? ( media-libs/openjpeg:= )
- json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
- mono? ( dev-lang/mono )
- opengl? ( virtual/opengl )
- pdf? ( app-text/poppler:=[cxx] )
- physics? ( sci-physics/bullet:= )
- postscript? ( app-text/libspectre )
- pulseaudio? ( media-libs/libpulse )
- raw? ( media-libs/libraw:= )
- scim? ( app-i18n/scim )
- sdl? ( media-libs/libsdl2 )
- sound? ( media-libs/libsndfile )
- svg? ( gnome-base/librsvg:2 )
- system-lz4? ( app-arch/lz4:= )
- systemd? ( sys-apps/systemd:= )
- tiff? ( media-libs/tiff:= )
- tslib? ( x11-libs/tslib:= )
- unwind? ( sys-libs/libunwind:= )
- v4l? ( media-libs/libv4l )
- vnc? ( net-libs/libvncserver )
- wayland? (
- dev-libs/wayland
- media-libs/mesa[gles2,wayland]
- x11-libs/libxkbcommon
- )
- webp? ( media-libs/libwebp:= )
- xpm? ( x11-libs/libXpm )
- xpresent? ( x11-libs/libXpresent )
- zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )
- wayland? ( dev-libs/wayland-protocols )"
-BDEPEND="${PYTHON_DEPS}
- virtual/pkgconfig
- examples? ( sys-devel/gettext )
- nls? ( sys-devel/gettext )
- wayland? ( dev-util/wayland-scanner )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.26.3-libressl.patch #903001
- "${FILESDIR}"/efl-1.26.3-gettext-0.22-fix.patch
-)
-
-pkg_setup() {
- # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
- QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV}
- /usr/$(get_libdir)/libefreet_mime.so.${PV}"
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Remove automagic unwind configure option, #743154
- if ! use unwind; then
- sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
- die "Failed to remove libunwind dep"
- fi
-
- # Fixup Doxyfile
- pushd "${DOCS_DIR}" || die
- cp Doxyfile.in Doxyfile || die
- sed -i \
- -e "s/@PACKAGE_VERSION@/${PV}/g" \
- -e "s/@top_builddir@/../g" \
- -e "s/@top_srcdir@/../g" \
- -e "s/@srcdir@/./g" \
- Doxyfile || die
- popd || die
-
- # Fix python shebangs for python-exec[-native-symlinks], #764086
- local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
- python_fix_shebang -q ${shebangs[*]}
-}
-
-src_configure() {
- local emesonargs=(
- -Dbuildtype=plain
-
- -D buffer=false
- -D build-tests=false
- -D cocoa=false
- -D drm-deprecated=false
- -D g-mainloop=false
- -D mono-beta=false
- -D dotnet=false
- -D pixman=false
- -D wl-deprecated=false
- -D dotnet-stylecop-severity=Warning
-
- -D edje-sound-and-video=true
- -D eeze=true
- -D input=true
- -D install-eo-files=true
- -D libmount=true
- -D native-arch-optimization=true
- -D xinput2=true
- -D xinput22=true
-
- $(meson_use X x11)
- $(meson_use debug debug-threads)
- $(meson_use drm)
- $(meson_use examples build-examples)
- $(meson_use fbcon fb)
- $(meson_use fontconfig)
- $(meson_use fribidi)
- $(meson_use glib)
- $(meson_use gstreamer)
- $(meson_use harfbuzz)
- $(meson_use hyphen)
- $(meson_use lua_single_target_luajit elua)
- $(meson_use nls)
- $(meson_use physics)
- $(meson_use pulseaudio)
- $(meson_use sdl)
- $(meson_use sound audio)
- $(meson_use tslib)
- $(meson_use v4l v4l2)
- $(meson_use vnc vnc-server)
- $(meson_use wayland wl)
- $(meson_use xpresent)
- $(meson_use zeroconf avahi)
-
- $(meson_use !system-lz4 embedded-lz4)
- )
-
- if use elogind || use systemd; then
- emesonargs+=( -D systemd=true )
- else
- emesonargs+=( -D systemd=false )
- fi
-
- if use wayland; then
- emesonargs+=( -D opengl=es-egl )
- elif ! use wayland && use opengl; then
- emesonargs+=( -D opengl=full )
- elif ! use wayland && use X && ! use opengl; then
- emesonargs+=( -D opengl=es-egl )
- else
- emesonargs+=( -D opengl=none )
- fi
-
- if use gnutls; then
- emesonargs+=( -D crypto=gnutls )
- else
- emesonargs+=( -D crypto=openssl )
- fi
-
- if use connman; then
- emesonargs+=( -D network-backend=connman )
- else
- emesonargs+=( -D network-backend=none )
- fi
-
- local disabledEvasLoaders=""
- ! use avif && disabledEvasLoaders="avif,"
- ! use bmp && disabledEvasLoaders+="bmp,wbmp,"
- ! use dds && disabledEvasLoaders+="dds,"
- ! use eet && disabledEvasLoaders+="eet,"
- ! use gstreamer && disabledEvasLoaders+="gst,"
- ! use heif && disabledEvasLoaders+="heif,"
- ! use ico && disabledEvasLoaders+="ico,"
- ! use jpeg2k && disabledEvasLoaders+="jp2k,"
- ! use json && disabledEvasLoaders+="json,"
- ! use pdf && disabledEvasLoaders+="pdf,"
- ! use pmaps && disabledEvasLoaders+="pmaps,"
- ! use postscript && disabledEvasLoaders+="ps,"
- ! use psd && disabledEvasLoaders+="psd,"
- ! use raw && disabledEvasLoaders+="raw,"
- ! use svg && disabledEvasLoaders+="rsvg,svg,"
- ! use tga && disabledEvasLoaders+="tga,"
- ! use tgv && disabledEvasLoaders+="tgv,"
- ! use tiff && disabledEvasLoaders+="tiff,"
- ! use webp && disabledEvasLoaders+="webp,"
- ! use xcf && disabledEvasLoaders+="xcf,"
- ! use xpm && disabledEvasLoaders+="xpm,"
- [[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
- emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
-
- local disabledImfLoaders=""
- ! use ibus && disabledImfLoaders+="ibus,"
- ! use scim && disabledImfLoaders+="scim,"
- ! use xim && disabledImfLoaders+="xim,"
- [[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
- emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
-
- local bindingsList="cxx,"
- use lua_single_target_luajit && bindingsList+="lua,"
- use mono && bindingsList+="mono,"
- [[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
- emesonargs+=( -D bindings="${bindingsList}" )
-
- local luaChoice=""
- if use lua_single_target_luajit; then
- luaChoice+="luajit"
- else
- luaChoice+="lua"
- fi
- emesonargs+=( -D lua-interpreter="${luaChoice}" )
-
- # Not all arm CPU's have neon instruction set, #722552
- if use arm && ! use cpu_flags_arm_neon; then
- emesonargs+=( -D native-arch-optimization=false )
- fi
-
- meson_src_configure
-}
-
-src_compile() {
- docs_compile
- meson_src_compile
-}
-
-src_install() {
- meson_src_install
-
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples/
- dodoc -r "${BUILD_DIR}"/src/examples/
- fi
-}
diff --git a/dev-libs/efl/files/efl-1.26.3-gettext-0.22-fix.patch b/dev-libs/efl/files/efl-1.26.3-gettext-0.22-fix.patch
deleted file mode 100644
index 1bce74f76fec..000000000000
--- a/dev-libs/efl/files/efl-1.26.3-gettext-0.22-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 155842cf9e726009e9eb4ec04d8a176cd990fdcb Mon Sep 17 00:00:00 2001
-From: dimmus <dmitri.chudinov@gmail.com>
-Date: Mon, 14 Aug 2023 21:39:05 +0500
-Subject: [PATCH] examples: edje - add charset header to po files.
-
-Solved compilation error with novel gettext-0.22.
-@fix
----
- src/examples/edje/en_IN/domain_name.po | 5 +++++
- src/examples/edje/hi_IN/domain_name.po | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/src/examples/edje/en_IN/domain_name.po b/src/examples/edje/en_IN/domain_name.po
-index f461123404..131579ee36 100644
---- a/src/examples/edje/en_IN/domain_name.po
-+++ b/src/examples/edje/en_IN/domain_name.po
-@@ -1,3 +1,8 @@
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: UTF-8\n"
-+
- msgid "LOADING"
- msgstr "Loading..."
-
-diff --git a/src/examples/edje/hi_IN/domain_name.po b/src/examples/edje/hi_IN/domain_name.po
-index 809cf6f399..fcb0e85d00 100644
---- a/src/examples/edje/hi_IN/domain_name.po
-+++ b/src/examples/edje/hi_IN/domain_name.po
-@@ -1,3 +1,8 @@
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: UTF-8\n"
-+
- msgid "LOADING"
- msgstr "लोड हो रहा है..."
-
diff --git a/dev-libs/efl/files/efl-1.26.3-libressl.patch b/dev-libs/efl/files/efl-1.26.3-libressl.patch
deleted file mode 100644
index 6bb1b6bb83e3..000000000000
--- a/dev-libs/efl/files/efl-1.26.3-libressl.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-https://bugs.gentoo.org/903001
-https://git.enlightenment.org/enlightenment/efl/pulls/10
-https://git.enlightenment.org/enlightenment/efl/commit/bdd5b244e6a6161228f4a98210cefd9ef8a12e85
-https://git.enlightenment.org/enlightenment/efl/commit/0e22417f4579333a967fb5ce65ab339dfc066753
-
-From bdd5b244e6a6161228f4a98210cefd9ef8a12e85 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 4 Jul 2022 09:05:38 -0700
-Subject: [PATCH] Support LibreSSL 3.5.x
-
-LibreSSL 3.5.x now works with the standard OpenSSL code paths.
----
- src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++++++------
- src/lib/eet/eet_cipher.c | 8 ++++----
- src/lib/emile/emile_cipher_openssl.c | 14 +++++++-------
- 3 files changed, 17 insertions(+), 17 deletions(-)
-
-From 0e22417f4579333a967fb5ce65ab339dfc066753 Mon Sep 17 00:00:00 2001
-From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
-Date: Mon, 1 Aug 2022 17:35:52 +0100
-Subject: [PATCH] eet emile - cipher - add braces for if defines to be clear on
- order of op
-
----
- src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++++++------
- src/lib/eet/eet_cipher.c | 8 ++++----
- src/lib/emile/emile_cipher_openssl.c | 10 +++++-----
- 3 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
-index e59c6811c9..56c8a595eb 100644
---- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
-+++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
-@@ -27,7 +27,7 @@
- static int
- efl_net_socket_bio_create(BIO *b)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
- BIO_set_init(b, 1);
- BIO_set_data(b, NULL);
- BIO_set_flags(b, 0);
-@@ -44,7 +44,7 @@ static int
- efl_net_socket_bio_destroy(BIO *b)
- {
- if (!b) return 0;
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
- BIO_set_init(b, 0);
- BIO_set_data(b, NULL);
- BIO_set_flags(b, 0);
-@@ -63,7 +63,7 @@ efl_net_socket_bio_read(BIO *b, char *buf, int len)
- .mem = buf,
- .len = len
- };
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
- Eo *sock = BIO_get_data(b);
- #else
- Eo *sock = b->ptr;
-@@ -99,7 +99,7 @@ efl_net_socket_bio_write(BIO *b, const char *buf, int len)
- .mem = buf,
- .len = len
- };
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
- Eo *sock = BIO_get_data(b);
- #else
- Eo *sock = b->ptr;
-@@ -146,7 +146,7 @@ efl_net_socket_bio_puts(BIO *b, const char *str)
- static BIO_METHOD *
- __efl_net_socket_bio_get(void)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
- static BIO_METHOD *efl_net_socket_bio = NULL;
-
- if (efl_net_socket_bio) return efl_net_socket_bio;
-@@ -359,7 +359,7 @@ efl_net_ssl_conn_setup(Efl_Net_Ssl_Conn *conn, Eina_Bool is_dialer, Efl_Net_Sock
- conn->bio = BIO_new(__efl_net_socket_bio_get());
- EINA_SAFETY_ON_NULL_GOTO(conn->bio, error_bio);
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
- BIO_set_data(conn->bio, sock);
- #else
- conn->bio->ptr = sock;
-diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c
-index 025750cc98..30501b99e1 100644
---- a/src/lib/eet/eet_cipher.c
-+++ b/src/lib/eet/eet_cipher.c
-@@ -472,7 +472,7 @@ eet_identity_sign(FILE *fp,
- gnutls_datum_t signum = { NULL, 0 };
- gnutls_privkey_t privkey;
- # else /* ifdef HAVE_GNUTLS */
--# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+# if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
- EVP_MD_CTX *md_ctx;
- # else
- EVP_MD_CTX md_ctx;
-@@ -562,7 +562,7 @@ eet_identity_sign(FILE *fp,
- }
-
- /* Do the signature. */
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && (!defined(LIBRESSL_VERSION_NUMBER)))
- md_ctx = EVP_MD_CTX_new();
- if (!md_ctx)
- {
-@@ -756,7 +756,7 @@ eet_identity_check(const void *data_base,
- const unsigned char *tmp;
- EVP_PKEY *pkey;
- X509 *x509;
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
- EVP_MD_CTX *md_ctx;
- #else
- EVP_MD_CTX md_ctx;
-@@ -779,7 +779,7 @@ eet_identity_check(const void *data_base,
- }
-
- /* Verify the signature */
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
- md_ctx = EVP_MD_CTX_new();
- if (!md_ctx)
- {
-diff --git a/src/lib/emile/emile_cipher_openssl.c b/src/lib/emile/emile_cipher_openssl.c
-index e5a1ed4135..7fed417d3f 100644
---- a/src/lib/emile/emile_cipher_openssl.c
-+++ b/src/lib/emile/emile_cipher_openssl.c
-@@ -45,12 +45,12 @@ struct _Emile_SSL
- Eina_Bool
- _emile_cipher_init(void)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
- ERR_load_crypto_strings();
- SSL_library_init();
- SSL_load_error_strings();
- OpenSSL_add_all_algorithms();
--#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
-+#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL */
-
- return EINA_TRUE;
- }
-@@ -73,7 +73,7 @@ emile_binbuf_sha1(const Eina_Binbuf * data, unsigned char digest[20])
- {
- const EVP_MD *md = EVP_sha1();
- Eina_Slice slice = eina_binbuf_slice_get(data);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
- EVP_MD_CTX *ctx = EVP_MD_CTX_new();
- if (!ctx) return EINA_FALSE;
-
-@@ -196,7 +196,7 @@ on_error:
- memset(ik, 0, sizeof (ik));
-
- /* Openssl error */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
- if (ctx)
- EVP_CIPHER_CTX_cleanup(ctx);
- #else
-@@ -204,7 +204,7 @@ on_error:
- EVP_CIPHER_CTX_cleanup(ctx);
- EVP_CIPHER_CTX_free(ctx);
- }
--#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
-+#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL */
-
-
- free(buffer);
-@@ -331,7 +331,7 @@ emile_cipher_server_listen(Emile_Cipher_Type t)
- SSL_CTX_set_options(r->ssl_ctx,
- options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
- break;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
- case EMILE_TLSv1:
- r->ssl_ctx = SSL_CTX_new(TLSv1_server_method());
- break;
-@@ -780,7 +780,7 @@ emile_cipher_server_connect(Emile_Cipher_Type t)
- options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
- break;
- case EMILE_TLSv1:
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
- r->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
- break;
- #endif
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-17 7:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-17 7:45 [gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/, dev-libs/efl/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2022-09-16 12:13 Joonas Niilola
2021-03-12 9:00 Joonas Niilola
2019-08-24 5:45 Joonas Niilola
2018-08-30 15:21 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox