commit: d05a4c3e53d6bfb1b71c16f31d7028b6b37b44be Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Dec 21 20:48:18 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Dec 21 20:49:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d05a4c3e
net-misc/freerdp: drop 2.10.0-r3, 2.11.0-r1 Bug: https://bugs.gentoo.org/918546 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-misc/freerdp/Manifest | 2 - .../freerdp/files/freerdp-2.10.0-ffmpeg-6.patch | 37 ------ net-misc/freerdp/freerdp-2.10.0-r3.ebuild | 137 --------------------- net-misc/freerdp/freerdp-2.11.0-r1.ebuild | 137 --------------------- 4 files changed, 313 deletions(-) diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 6190d97c3e83..2f956fab7642 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,5 +1,3 @@ -DIST freerdp-2.10.0.tar.gz 7321489 BLAKE2B 92b4b45670a5ed3b41713d1e036d41a9ef5714ddf9273a4b88fadf5c8435a467a53144f42bd969a44e641995a7f94b6c7b43b85f0ede738b1a1213e3bada9788 SHA512 a5749e3140d74c66d51869b405852bdaa776ca7d82e50a1e3ed19ccf56ed91a4ad9c3ce2c8ee6ff0abbb29d915c2e7278a1fcea04d73fd5ba4014f6590484477 -DIST freerdp-2.11.0.tar.gz 7325731 BLAKE2B 7cf2805065b870d959461a41b2b5cc7a5d00121078c0a5f51db0f2d83c4a5eb64aba75d0c1e184edf3546b4df87150b30f81ad88b301366ccaeaec59120085ca SHA512 97ce19f392e2b197830e22f12870e787fce85a7d9342cd7b7043c1efc45f5773410901b27de11bf1b70ca36dd6d7d102b3dd34eace813892a72d44dc290a8703 DIST freerdp-2.11.1.tar.gz 7325835 BLAKE2B 2b6e62cd46627c60c3e815216711d3c5c9839d232aa5cb8653d92870bb46d93c40f2f44e0abf7ef6e5f44d92239541ae44d37366f343a1992fdbc8f09452fba0 SHA512 efd9d44bdc15047322600046fdcd17e37f14c84d75badc77e8ea53da6e065f33725be2f3c03e02031867124b62b32ad9deeabf8cc8f79321e7a866f552e63f2d DIST freerdp-2.11.2.tar.gz 7326213 BLAKE2B 5d044d660df1e5115ffde13389be79e852711161ad1969017a9ba662e5f278fc98b86efbc59a24c3ea32a137c24ed308ef5c9eb89db1c24f37f1b8b41bfd3c45 SHA512 2e0e74cba22ed0b33fd6453dd76f6a1ffb3107d1868276faf3eea25bd58d3d869c2ce7c6c467896ecc94ca71c0582beb029a0d44f50df38cc26661f85d0822fb DIST freerdp-3.0.0-beta3.tar.gz 8950651 BLAKE2B f5171d76da635bd05b4a267383ffb150b4c214820b79624b1988d297e44a4bfd3d7b34fbc4ac88f79d973e6eb4372700fe53910078eaf36ea7fc553cc6ed6e4f SHA512 a9e61c30254ba5e894c70b981fae4d6311d20546d4352e5a584361b3b7232f6cc075bf7d7c1e9e5a52c820c36a185120f095306ec36ff72489f7dce0cb7e0fbb diff --git a/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch b/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch deleted file mode 100644 index 586ae641b58e..000000000000 --- a/net-misc/freerdp/files/freerdp-2.10.0-ffmpeg-6.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bugs.gentoo.org/901003 -https://github.com/FreeRDP/FreeRDP/issues/8686 -https://github.com/FreeRDP/FreeRDP/commit/7f55c97d60453738323e0ecafe6d357019528227 - -From 7f55c97d60453738323e0ecafe6d357019528227 Mon Sep 17 00:00:00 2001 -From: akallabeth <akallab...@posteo.net> -Date: Tue, 14 Feb 2023 07:48:54 +0100 -Subject: [PATCH] Fixed #8686: Update h264 to use new FFMPEG API - ---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -@@ -235,8 +235,10 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYP - } - } - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100) - if (mdecoder->codec->capabilities & AV_CODEC_CAP_TRUNCATED) - mdecoder->codec_context->flags |= AV_CODEC_FLAG_TRUNCATED; -+#endif - - return TRUE; - } ---- a/libfreerdp/codec/h264_ffmpeg.c -+++ b/libfreerdp/codec/h264_ffmpeg.c -@@ -529,10 +529,12 @@ static BOOL libavcodec_init(H264_CONTEXT* h264) - goto EXCEPTION; - } - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100) - if (sys->codecDecoder->capabilities & AV_CODEC_CAP_TRUNCATED) - { - sys->codecDecoderContext->flags |= AV_CODEC_FLAG_TRUNCATED; - } -+#endif - - #ifdef WITH_VAAPI - diff --git a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild b/net-misc/freerdp/freerdp-2.10.0-r3.ebuild deleted file mode 100644 index ca7d9504ea65..000000000000 --- a/net-misc/freerdp/freerdp-2.10.0-r3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 2011-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"; - case ${PV} in - 2.*) EGIT_BRANCH="stable-2.0";; - esac -else - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"; - KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="https://www.freerdp.com/"; - -LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib:0 - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr - ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - kerberos? ( virtual/krb5 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-libs/libpulse ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND=" - ${RDEPEND} - valgrind? ( dev-util/valgrind ) -" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" - -PATCHES=( - "${FILESDIR}"/${P}-ffmpeg-6.patch -) - -src_configure() { - # bug #881695 - filter-lto - - local mycmakeargs=( - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) - -DWITH_CCACHE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=$(usex doc ON OFF) - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_GSSAPI=$(usex kerberos ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) - ) - cmake_src_configure -} - -src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) - cmake_src_test -} diff --git a/net-misc/freerdp/freerdp-2.11.0-r1.ebuild b/net-misc/freerdp/freerdp-2.11.0-r1.ebuild deleted file mode 100644 index 2a906f8c6a0d..000000000000 --- a/net-misc/freerdp/freerdp-2.11.0-r1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 2011-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"; - case ${PV} in - 2.*) EGIT_BRANCH="stable-2.0";; - esac -else - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="https://www.freerdp.com/"; - -LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib:0 - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr - ) - icu? ( dev-libs/icu:0= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - kerberos? ( virtual/krb5 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-libs/libpulse ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND=" - ${RDEPEND} - valgrind? ( dev-util/valgrind ) -" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" - -src_configure() { - # bug #881695 - filter-lto - - local mycmakeargs=( - -Wno-dev - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) - -DWITH_CCACHE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=$(usex doc ON OFF) - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_ICU=$(usex icu ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_GSSAPI=$(usex kerberos ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_OSS=OFF - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) - ) - cmake_src_configure -} - -src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) - cmake_src_test -}
