From b8adacb0f2818c0e592067c30c11ea7a8788a32f Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 2 Jan 2024 15:28:00 -0500 Subject: net-misc/freerdp: enable deprecated command-line options Bug: https://bugs.gentoo.org/921127 Signed-off-by: Mike Gilbert --- net-misc/freerdp/freerdp-3.0.0-r1.ebuild | 150 +++++++++++++++++++++++++++++++ net-misc/freerdp/freerdp-3.0.0.ebuild | 149 ------------------------------ net-misc/freerdp/freerdp-9999.ebuild | 3 +- 3 files changed, 152 insertions(+), 150 deletions(-) create mode 100644 net-misc/freerdp/freerdp-3.0.0-r1.ebuild delete mode 100644 net-misc/freerdp/freerdp-3.0.0.ebuild (limited to 'net-misc') diff --git a/net-misc/freerdp/freerdp-3.0.0-r1.ebuild b/net-misc/freerdp/freerdp-3.0.0-r1.ebuild new file mode 100644 index 000000000000..40f110ef9887 --- /dev/null +++ b/net-misc/freerdp/freerdp-3.0.0-r1.ebuild @@ -0,0 +1,150 @@ +# Copyright 2011-2024 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 ~ppc ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="0/3" +IUSE="aad alsa cpu_flags_arm_neon cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/openssl:0= + sys-libs/zlib:0 + aad? ( dev-libs/cJSON ) + 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= + ) + fuse? ( sys-fs/fuse:3 ) + 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 ) + sdl? ( + media-libs/libsdl2 + media-libs/sdl2-ttf + ) + 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? ( + dev-libs/pkcs11-helper + 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 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt +" + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + -DBUILD_TESTING=$(usex test ON OFF) + -DCHANNEL_URBDRC=$(usex usb ON OFF) + -DWITH_AAD=$(usex aad ON OFF) + -DWITH_ALSA=$(usex alsa ON OFF) + -DWITH_CCACHE=OFF + -DWITH_CLIENT_SDL=$(usex sdl ON OFF) + -DWITH_CUPS=$(usex cups ON OFF) + -DWITH_DEBUG_ALL=$(usex debug ON OFF) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(usex ffmpeg ON OFF) + -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON + -DWITH_SWSCALE=$(usex ffmpeg ON OFF) + -DWITH_CAIRO=$(usex ffmpeg OFF ON) + -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) + -DWITH_FUSE=$(usex fuse ON OFF) + -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) + -DWITH_JPEG=$(usex jpeg ON OFF) + -DWITH_KRB5=$(usex kerberos ON OFF) + -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) + -DWITH_OPENH264=$(usex openh264 ON OFF) + -DWITH_OSS=OFF + -DWITH_PCSC=$(usex smartcard ON OFF) + -DWITH_PKCS11=$(usex smartcard ON OFF) + -DWITH_PULSE=$(usex pulseaudio ON OFF) + -DWITH_SERVER=$(usex server ON OFF) + -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) + -DWITH_UNICODE_BUILTIN=$(usex icu OFF ON) + -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) + -DWITH_WEBVIEW=OFF + ) + cmake_src_configure +} + +src_test() { + local myctestargs=() + use elibc_musl && myctestargs+=( -E TestBacktrace ) + cmake_src_test +} diff --git a/net-misc/freerdp/freerdp-3.0.0.ebuild b/net-misc/freerdp/freerdp-3.0.0.ebuild deleted file mode 100644 index 92c6e545dcd1..000000000000 --- a/net-misc/freerdp/freerdp-3.0.0.ebuild +++ /dev/null @@ -1,149 +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 ~ppc ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="https://www.freerdp.com/" - -LICENSE="Apache-2.0" -SLOT="0/3" -IUSE="aad alsa cpu_flags_arm_neon cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib:0 - aad? ( dev-libs/cJSON ) - 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= - ) - fuse? ( sys-fs/fuse:3 ) - 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 ) - sdl? ( - media-libs/libsdl2 - media-libs/sdl2-ttf - ) - 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? ( - dev-libs/pkcs11-helper - 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 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt -" - -src_configure() { - # bug #881695 - filter-lto - - local mycmakeargs=( - -Wno-dev - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_AAD=$(usex aad ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) - -DWITH_CCACHE=OFF - -DWITH_CLIENT_SDL=$(usex sdl ON OFF) - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=ON - -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_FUSE=$(usex fuse ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_KRB5=$(usex kerberos ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_OSS=OFF - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_PKCS11=$(usex smartcard ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_UNICODE_BUILTIN=$(usex icu OFF ON) - -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) - -DWITH_WEBVIEW=OFF - ) - cmake_src_configure -} - -src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) - cmake_src_test -} diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 92c6e545dcd1..40f110ef9887 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2023 Gentoo Authors +# Copyright 2011-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -116,6 +116,7 @@ src_configure() { -DWITH_DEBUG_ALL=$(usex debug ON OFF) -DWITH_MANPAGES=ON -DWITH_FFMPEG=$(usex ffmpeg ON OFF) + -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON -DWITH_SWSCALE=$(usex ffmpeg ON OFF) -DWITH_CAIRO=$(usex ffmpeg OFF ON) -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) -- cgit v1.2.3-65-gdbad