From 192bfb8ab2e7b530f8a2dbf8e075f78ba8c01c32 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 20 Oct 2019 03:21:43 +0200 Subject: [PATCH] efl: update to 1.23.1 --- srcpkgs/efl/patches/eina-debug.patch | 28 ++++++ srcpkgs/efl/template | 141 +++++++++++++++------------ 2 files changed, 109 insertions(+), 60 deletions(-) create mode 100644 srcpkgs/efl/patches/eina-debug.patch diff --git a/srcpkgs/efl/patches/eina-debug.patch b/srcpkgs/efl/patches/eina-debug.patch new file mode 100644 index 0000000000..c7370f3eb8 --- /dev/null +++ b/srcpkgs/efl/patches/eina-debug.patch @@ -0,0 +1,28 @@ +Use release-type parameters even with buildtype=plain. + +--- src/lib/eina/meson.build ++++ src/lib/eina/meson.build +@@ -205,7 +205,7 @@ if get_option('buildtype') == 'debug' + debug_threads=true + default_mempool=true + want_cow_magic=true +-elif get_option('buildtype') == 'release' ++else + with_max_log_level=3 + stringshare_usage=false + use_valgrind=false +@@ -213,14 +213,6 @@ elif get_option('buildtype') == 'release' + debug_threads=false + default_mempool=false + want_cow_magic=false +- else +- with_max_log_level=-1 +- stringshare_usage=false +- use_valgrind=true +- debug_malloc=false +- debug_threads=false +- default_mempool=false +- want_cow_magic=false + endif + + if with_max_log_level != -1 diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 62e330a58a..b821028944 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,80 +1,101 @@ # Template file for 'efl' pkgname=efl -version=1.22.2 -revision=2 -build_style=gnu-configure -configure_args="CXX= --disable-systemd --enable-liblz4 - --enable-multisense --enable-image-loader-webp - $(vopt_enable gstreamer gstreamer1) $(vopt_enable vlc libvlc) - $(vopt_enable framebuffer fb) $(vopt_enable pulseaudio) - $(vopt_enable harfbuzz) $(vopt_if opengl '--with-opengl=full') - $(vopt_if gles2 '--enable-egl --with-opengl=es') - $(vopt_if drm '--enable-drm --enable-elput') - $(vopt_if wayland '--enable-wayland --enable-wayland-ivi-shell') - $(vopt_if x11 '--enable-xinput22 --with-x11=xlib --enable-xpresent') - $(vopt_if elogind '--enable-elput --enable-elogind')" +version=1.23.1 +revision=1 +build_style=meson +configure_args=" + -Dsystemd=false + -Dopengl=$(vopt_if opengl full $(vopt_if gles2 es-egl none)) + -Dembedded-lz4=false + -Dcrypto=openssl + -Dnetwork-backend=none + -Devas-loaders-disabler=[] + -Decore-imf-loaders-disabler=scim + -Demotion-loaders-disabler=$(vopt_if gstreamer '' gstreamer1,)$(vopt_if vlc '' libvlc,)gstreamer,xine + -Demotion-generic-loaders-disabler=vlc + $(vopt_bool elogind elogind) + $(vopt_bool x11 x11) + $(vopt_bool x11 xpresent) + $(vopt_bool x11 xinput2) $(vopt_bool x11 xinput22) + $(vopt_bool framebuffer fb) + $(vopt_bool wayland wl) + $(vopt_bool drm drm) + $(vopt_bool gstreamer gstreamer) + $(vopt_bool pulseaudio pulseaudio) + $(vopt_bool harfbuzz harfbuzz) + $(vopt_bool simd native-arch-optimization)" hostmakedepends="pkg-config" makedepends=" - liblz4-devel libressl-devel glib-devel libjpeg-turbo-devel fontconfig-devel - fribidi-devel giflib-devel libpng-devel tiff-devel libwebp-devel - avahi-libs-devel eudev-libudev-devel bullet-devel - alsa-lib-devel libsndfile-devel libmount-devel LuaJIT-devel poppler-cpp-devel + gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel + fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel) + libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel + rlottie-devel avahi-libs-devel eudev-libudev-devel bullet-devel + libsndfile-devel libmount-devel LuaJIT-devel poppler-cpp-devel librsvg-devel libspectre-devel libraw-devel - $(vopt_if gstreamer gst-plugins-base1-devel) $(vopt_if opengl MesaLib-devel) - $(vopt_if vlc vlc-devel) $(vopt_if elogind 'elogind-devel libinput-devel libxkbcommon-devel') - $(vopt_if gles2 'libinput-devel libxkbcommon-devel MesaLib-devel') - $(vopt_if wayland 'libxkbcommon-devel wayland-protocols wayland-devel libinput-devel') + $(vopt_if drm 'libdrm-devel libinput-devel libxkbcommon-devel') + $(vopt_if elogind elogind-devel) + $(vopt_if gstreamer gst-plugins-base1-devel) + $(vopt_if opengl MesaLib-devel) + $(vopt_if gles2 MesaLib-devel) + $(vopt_if vlc vlc-devel) + $(vopt_if wayland 'wayland-protocols wayland-devel') $(vopt_if x11 'libXcomposite-devel libXcursor-devel libXp-devel - libXrandr-devel libXScrnSaver-devel libXdamage-devel - libXrender-devel libXi-devel libXinerama-devel libXpresent-devel - xcb-util-devel xcb-util-keysyms-devel xcb-util-image-devel - xcb-util-renderutil-devel xcb-util-wm-devel xorgproto') - $(vopt_if harfbuzz harfbuzz-devel) $(vopt_if pulseaudio pulseaudio-devel)" + libXrandr-devel libXScrnSaver-devel libXdamage-devel + libXrender-devel libXi-devel libXinerama-devel libXpresent-devel + xcb-util-devel xcb-util-keysyms-devel xcb-util-image-devel + xcb-util-renderutil-devel xcb-util-wm-devel xorgproto') + $(vopt_if pulseaudio pulseaudio-devel)" short_desc="Enlightenment Foundation Libraries" -maintainer="Orphaned " +maintainer="q66 " license="LGPL-2.1-only" -homepage="http://enlightenment.org" -changelog="https://raw.githubusercontent.com/Enlightenment/efl/master/NEWS" -distfiles="http://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.xz" -checksum=1699891f825911622de0aa77fe1140eff7335aba619d2352485e54dcff6b1cd0 +homepage="https://enlightenment.org" +changelog="https://git.enlightenment.org/core/efl.git/plain/NEWS" +distfiles="https://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.xz" +checksum=d62220cca16d434c18b36fe3acffa0f5c0e669da4931b133524183308f242f61 -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" automake gettext-devel libtool efl-devel" - configure_args+=" --with-eolian-cxx=/usr/bin/eolian_cxx" - configure_args+=" --with-eolian-gen=/usr/bin/eolian_gen" - configure_args+=" --with-edje-cc=/usr/bin/edje_cc" - configure_args+=" --with-elua=/usr/bin/elua" - configure_args+=" --with-eet-eet=/usr/bin/eet" - configure_args+=" --with-eldbus_codegen=/usr/bin/eldbus_codegen" - configure_args+=" --with-elementary-codegen=/usr/bin/elementary_codegen" - configure_args+=" --with-elm-prefs-cc=/usr/bin/elm_prefs_cc" - pre_configure() { - autoreconf -fi - } +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -Dbuild-tests=true" + hostmakedepends+=" check-devel" +else + configure_args+=" -Dbuild-tests=false" fi -# Package build options -build_options="elogind drm framebuffer gles2 gstreamer harfbuzz opengl pulseaudio vlc wayland x11" -desc_option_gst="Enable support for video previews via gstreamer" -desc_option_vlc="Enable support for video previews via VLC" -# Enable gstreamer, harfbuzz, pulseaudio and x11 by default. -build_options_default="gstreamer harfbuzz pulseaudio x11" +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" gettext-devel efl-devel" +fi +# sanitize options +if [ -n "$build_option_wayland" -a -z "$build_option_drm" ]; then + broken="wayland requires drm" +fi + +build_options="elogind harfbuzz pulseaudio gstreamer vlc x11 wayland + opengl gles2 drm framebuffer simd" +build_options_default="elogind harfbuzz pulseaudio gstreamer x11 wayland drm" +desc_option_simd="Enable support for SSE3/NEON/AltiVec" +desc_option_vlc="Enable support for VLC multimedia backend" + +# OpenGL acceleration support case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*|ppc64*) - # Enable opengl by default on x86/ppc64. + i686*|x86_64*|ppc*) + # Enable desktop OpenGL on x86/ppc systems build_options_default+=" opengl" ;; - armv6l*) - # Disable neon. - configure_args+=" --disable-neon" + aarch64*|armv7l*) + # Enable OpenGL ES on modern ARM systems + build_options_default+=" gles2" ;; - armv7l*) - # XXX disable neon... the code is utterly broken. - configure_args+=" --disable-neon" +esac + +# Architecture optimizations +case "$XBPS_TARGET_MACHINE" in + aarch64*|ppc64*) + # Enable NEON (ARM) or AltiVec (PowerPC) + build_options_default+=" simd" ;; - aarch64*) - broken="lt-edje_cc: Critical. Compiling script code not clean." + *) + # Do not enable on x86 because it requires SSE3 + # Do not enable on 32-bit ARM by default either ;; esac