From 3bad17bbb189052935c4d2a609c97da1ebfcc22c Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 20 Oct 2019 03:21:43 +0200 Subject: [PATCH 1/4] efl: update to 1.23.1 --- srcpkgs/efl/patches/eina-debug.patch | 28 ++++++ srcpkgs/efl/template | 139 +++++++++++++++------------ 2 files changed, 108 insertions(+), 59 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 00000000000..c7370f3eb87 --- /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 62e330a58a4..b821028944c 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 [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -Dbuild-tests=true" + hostmakedepends+=" check-devel" +else + configure_args+=" -Dbuild-tests=false" +fi 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 - } + hostmakedepends+=" gettext-devel efl-devel" +fi + +# sanitize options +if [ -n "$build_option_wayland" -a -z "$build_option_drm" ]; then + broken="wayland requires drm" 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" +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 From 8ec4100077980839f84c57a7e4071ffee6cb94a3 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 20 Oct 2019 04:06:00 +0200 Subject: [PATCH 2/4] python3-efl: update to 1.23.0, drop python2 --- srcpkgs/python-efl/template | 24 ------------------------ srcpkgs/python3-efl | 1 - srcpkgs/python3-efl/template | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/python-efl/template delete mode 120000 srcpkgs/python3-efl create mode 100644 srcpkgs/python3-efl/template diff --git a/srcpkgs/python-efl/template b/srcpkgs/python-efl/template deleted file mode 100644 index a49e7d35847..00000000000 --- a/srcpkgs/python-efl/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'python-efl' -pkgname=python-efl -version=1.22.0 -revision=1 -build_style=python-module -pycompile_module="efl" -hostmakedepends="pkg-config python-devel python3-devel" -makedepends="efl-devel python-dbus-devel" -depends="python-dbus" -short_desc="Python2 bindings for Enlightenment Foundation Libraries" -maintainer="Orphaned " -license="LGPL-3" -homepage="http://enlightenment.org" -distfiles="http://download.enlightenment.org/rel/bindings/python/${pkgname}-${version}.tar.xz" -checksum=c368c0621ddcaf0badd4998101621421afee2109bf5c2bfaec4b6837d8301ee2 - -python3-efl_package() { - depends="python3-dbus" - pycompile_module="efl" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - } -} diff --git a/srcpkgs/python3-efl b/srcpkgs/python3-efl deleted file mode 120000 index d79626106dc..00000000000 --- a/srcpkgs/python3-efl +++ /dev/null @@ -1 +0,0 @@ -python-efl \ No newline at end of file diff --git a/srcpkgs/python3-efl/template b/srcpkgs/python3-efl/template new file mode 100644 index 00000000000..9825cb5fa5e --- /dev/null +++ b/srcpkgs/python3-efl/template @@ -0,0 +1,16 @@ +# Template file for 'python3-efl' +pkgname=python3-efl +version=1.23.0 +revision=1 +wrksrc=python-efl-${version} +build_style=python3-module +pycompile_module="efl" +hostmakedepends="pkg-config python-devel python3-devel" +makedepends="efl-devel python-dbus-devel" +depends="python-dbus" +short_desc="Python3 bindings for Enlightenment Foundation Libraries" +maintainer="q66 " +license="LGPL-3.0-only, LGPL-3.0-only" +homepage="http://enlightenment.org" +distfiles="http://download.enlightenment.org/rel/bindings/python/python-efl-${version}.tar.xz" +checksum=2bdef4153e3df2ed3edef9f1ebb4554054405425247a9fabb3c784b48232d69b From 7da65a16ae4a75d3132f4d2d553b621b55b30d73 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 20 Oct 2019 04:08:57 +0200 Subject: [PATCH 3/4] enlightenment: update to 0.23.1 --- srcpkgs/enlightenment/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index 4e73303db60..9cbc50b8019 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -1,23 +1,23 @@ # Template file for 'enlightenment' pkgname=enlightenment -version=0.22.4 +version=0.23.1 revision=1 -lib32disabled=yes -build_options="wayland" build_style=meson configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false - $(vopt_if wayland '-Dwayland=true' '-Dwayland=false')" + $(vopt_bool wayland wayland)" hostmakedepends="efl pkg-config" makedepends="efl-devel pam-devel xkeyboard-config $(vopt_if wayland 'libxkbcommon-devel MesaLib-devel wayland-devel')" depends="desktop-file-utils hicolor-icon-theme xkeyboard-config" conf_files="/etc/enlightenment/sysactions.conf" -homepage="http://enlightenment.org" -short_desc="Enlightenment desktop" -maintainer="Orphaned " +short_desc="Enlightenment desktop shell" +maintainer="q66 " license="BSD-2-Clause" +homepage="http://enlightenment.org" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=59f4997c8b59457142870e40f137bc08c9735c84368d32213dacf09c4342fe79 +checksum=e530590c09b560679621f4531d55c242cfafe8523309e0ae88fb267e00f52c34 +lib32disabled=yes +build_options="wayland" post_install() { # Use our native tools to shutdown/suspend. From d32ec139e1dc06784f9356bb79f853ffbaa9df5a Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 20 Oct 2019 04:09:58 +0200 Subject: [PATCH 4/4] econnman: bump, switch to git rev, move to python3 [ci skip] --- srcpkgs/econnman/template | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/srcpkgs/econnman/template b/srcpkgs/econnman/template index 5477f6fcf65..9568c2e2adf 100644 --- a/srcpkgs/econnman/template +++ b/srcpkgs/econnman/template @@ -1,18 +1,21 @@ # Template file for 'econnman' pkgname=econnman version=1.1.0 -revision=4 +revision=5 archs=noarch +_gitrev=18e7be6bf80df6b86965ba93391b205339fc7267 +wrksrc=${pkgname}-${_gitrev} build_style=gnu-configure -hostmakedepends="automake libtool pkg-config python efl-devel" -makedepends="efl-devel python-efl" -depends="python-efl connman desktop-file-utils" -homepage="http://enlightenment.org" +hostmakedepends="automake libtool pkg-config python3 efl-devel" +makedepends="efl-devel python3-efl" +depends="python3-efl python3-dbus connman desktop-file-utils" short_desc="Enlightenment ConnMan user interface" -maintainer="Orphaned " -license="LGPL-3" -distfiles="https://git.enlightenment.org/apps/econnman.git/snapshot/econnman-${version}.tar.gz" -checksum=5ffde515adc80c4f319b206ffbefc583efc0a5dd2a265c113c367c2bc14cc522 +maintainer="q66 " +license="LGPL-3.0-only" +homepage="http://enlightenment.org" +distfiles="https://git.enlightenment.org/apps/econnman.git/snapshot/econnman-${_gitrev}.tar.gz" +checksum=6188accebac2bb52466794c685f042f9f2bcc7d5d77b2417b30458e2e7265282 +python_version=3 pre_configure() { NOCONFIGURE=1 ./autogen.sh