diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-06-01 12:01:52 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-06-01 12:01:52 +0000 |
| commit | 06ccdab7d048e1f716d6741e72b7f717cd187cc1 (patch) | |
| tree | 40d9298f27d3fb3ee1687791b32ea0b2adbc6076 | |
| parent | 2023-06-01 11:18:45 UTC (diff) | |
| parent | sys-libs/native-uuid: marked ~arm64-macos (diff) | |
| download | gentoo-06ccdab7d048e1f716d6741e72b7f717cd187cc1.tar.gz gentoo-06ccdab7d048e1f716d6741e72b7f717cd187cc1.tar.bz2 gentoo-06ccdab7d048e1f716d6741e72b7f717cd187cc1.zip | |
Merge updates from master
| -rw-r--r-- | media-gfx/ueberzugpp/Manifest | 1 | ||||
| -rw-r--r-- | media-gfx/ueberzugpp/ueberzugpp-2.8.5.ebuild | 67 | ||||
| -rw-r--r-- | profiles/package.mask | 8 | ||||
| -rw-r--r-- | sys-libs/native-uuid/native-uuid-1.0.ebuild | 2 |
4 files changed, 1 insertions, 77 deletions
diff --git a/media-gfx/ueberzugpp/Manifest b/media-gfx/ueberzugpp/Manifest index 92e0be3d2c9f..e96cf779fca8 100644 --- a/media-gfx/ueberzugpp/Manifest +++ b/media-gfx/ueberzugpp/Manifest @@ -1,3 +1,2 @@ DIST ueberzugpp-2.8.4.tar.gz 43906 BLAKE2B db36ea8dc74713673ac7ea9f62f12fd9d4f77e12030db3920eb193523599f6bd6f520faa821cacb18192c699439cae35f18bb208056f4c92d6f50b02f5fac014 SHA512 402887a8734bb034c3cd0975ddd6e584f865f6545726d5bf033f59552e0a026883dd845080cccee5340217d1782c70fb2e309bfda36207627d0455c5cc7b75db -DIST ueberzugpp-2.8.5.tar.gz 48985 BLAKE2B 046e72786f51c0ece068a1046532ea7e5acfa01ee4880a9db8c9dd38aed229b66f56ee18831e82efd84fef20183bea160dc7f3194507e253aa46cad85f76a280 SHA512 f4d1ad45d121521ae158fe5c7ff845a7ac0150b4effdd0d856f9cab69c0f5bfeb34648113323a3c98412630c945c96825132e805b2bacb037a8c88762dd799ea DIST ueberzugpp-2.8.6.tar.gz 51156 BLAKE2B 8eb661f86c55a0dcd0bc78e70437a59df4783919769e8e3514fa385e30ee44c8bdf58e47824882d11eb9bf94be2836c44b983b8d67bc2e576f60432a65dcb70d SHA512 86f10e593277d240d5d348acd81ffdf23814250d694fd34f06bd461c908fba81cfdfdb1b3b104a851b3703a1e186ef57f5bf14eda9a59a9305894e8998247fb3 diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.8.5.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.8.5.ebuild deleted file mode 100644 index 076a995df926..000000000000 --- a/media-gfx/ueberzugpp/ueberzugpp-2.8.5.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Drop in replacement for ueberzug written in C++" -HOMEPAGE="https://github.com/jstkdng/ueberzugpp/" -SRC_URI="https://github.com/jstkdng/ueberzugpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="X opencv wayland" - -RDEPEND=" - dev-cpp/tbb:= - dev-libs/glib:2 - dev-libs/libfmt:= - dev-libs/openssl:= - dev-libs/spdlog:= - media-gfx/chafa - media-libs/libsixel - media-libs/vips:= - sys-apps/util-linux - X? ( - x11-libs/libxcb:= - x11-libs/xcb-util-image - ) - opencv? ( media-libs/opencv:= ) - wayland? ( dev-libs/wayland ) - !media-gfx/ueberzug" -DEPEND=" - ${RDEPEND} - dev-cpp/cli11 - dev-cpp/ms-gsl - dev-cpp/nlohmann_json - X? ( x11-base/xorg-proto ) - wayland? ( dev-libs/wayland-protocols )" -BDEPEND=" - wayland? ( - dev-util/wayland-scanner - kde-frameworks/extra-cmake-modules - )" - -src_configure() { - CMAKE_BUILD_TYPE=Release # install target wants this - - local mycmakeargs=( - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_SWAY=$(usex wayland) - -DENABLE_TURBOBASE64=no # not packaged - -DENABLE_X11=$(usex X) - -DFETCHCONTENT_FULLY_DISCONNECTED=yes - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - # not handled by cmake, but upstream creates the pp symlink in their - # self-maintained AUR package and some scripts like ytfzf look for it - dosym ueberzug /usr/bin/${PN} -} diff --git a/profiles/package.mask b/profiles/package.mask index c68238805d23..7704618c49ea 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -43,14 +43,6 @@ dev-python/http-parser # Masked until enough reverse dependencies are fixed, bug #901257. =media-video/ffmpeg-6* -# Ionen Wolkens <ionen@gentoo.org> (2023-05-28) -# Both versions are affected by notable regressions, i.e. 2.8.5 -# leaves 100% cpu processes behind, and 2.8.6 has broken positioning -# and scaling. Use 2.8.4 unless need the sway/hyprland support. -# Under active development and releases are a bit experimental. -=media-gfx/ueberzugpp-2.8.5 -=media-gfx/ueberzugpp-2.8.6 - # Andreas K. Hüttel <dilfridge@gentoo.org> (2023-05-28) # Causes only problems, at negligible gain. Removal in 30days. # Bugs 880573, 864157, 885471, 870454, 884571 diff --git a/sys-libs/native-uuid/native-uuid-1.0.ebuild b/sys-libs/native-uuid/native-uuid-1.0.ebuild index 18481a52211c..fc152909b641 100644 --- a/sys-libs/native-uuid/native-uuid-1.0.ebuild +++ b/sys-libs/native-uuid/native-uuid-1.0.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://prefix.gentoo.org/" LICENSE="BSD" SLOT="0" -KEYWORDS="~ppc-macos ~x64-macos" +KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos" DEPEND="!!sys-libs/libuuid !!sys-apps/util-linux" |