commit: 6e92d8b5ae50a4083d2d7e8e9b795c08bc90f0ec Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Jul 28 21:01:18 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Jul 28 21:03:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e92d8b5
net-misc/freerdp: bump to 2.0.0-rc0 Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1 net-misc/freerdp/Manifest | 1 + .../freerdp-Fix-gstreamer-1.0-detection.patch | 25 ++++++++++++++++++++++ ...reerdp-9999.ebuild => freerdp-2.0.0_rc0.ebuild} | 10 +++++---- net-misc/freerdp/freerdp-9999.ebuild | 9 ++++---- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index fe876660526..3e04a778e0c 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,3 +1,4 @@ +DIST FreeRDP-2.0.0-rc0.tar.gz 6486533 SHA256 b432d92f529646f3e914513c8202c66ce167405082ee5b9e6d15ba4321ff6664 SHA512 9bc9ee976c73f274a4258613409e242088bd077bcd1cc43f7941170374fc0f9deda7f2f7644506d0cdc2e029b6037abb21d848810dcce6aefa3c5f1642f19cb3 WHIRLPOOL ae0e5d0422a1a3bb95e351dcf9a8845d56eb39189cd94f1a33d27f6a8282d6901ba743f0e3dfda6f53e1915b506a596bac6812553bf5a42ec1fecfb8c5b875ea DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 SHA256 c0646f224ea30a485e165fb31eb8a039af2ca3f257cdf784b319e1b5c13e0425 SHA512 ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8 WHIRLPOOL 1ff6ce70d454a7e0cbb3cd4fbafe1fb4191dadc3b2f8a6dbff10d8c725b8fc2838a863837d9b01f6daa670483fe40266fb57569904ad8ac8503549d6605c9e64 DIST freerdp-2.0.0_pre20160722.tar.gz 6412437 SHA256 17d6b7b9ec6bcfbb78d72ecda034e1ed6bdae4f95a8100297096a5e5e095463a SHA512 3b67de8f31740ccba0ce59f0035328bda6c1602e6197a31008bdd5bcab15e85f473c6c4eca5cb87670b34fa174e4b0da21a7f75be99686df485bb7f9cda6f589 WHIRLPOOL b494070185435da954e9d998915fbe4b47286c803c03bc4839afa583082434fc4d51776b62db27255b9ba62ecb8ef9c95af96e2920414e0fff9b27dceecb4cd4 DIST freerdp-2.0.0_pre20161219.tar.gz 6425913 SHA256 b71aa5e99624f7bd4c28e69cb2bf3b7710696db121f67091de843c5c652194fd SHA512 ad1699f520df2fdc0719ca35623beaa7b24ca9325e3ed6f30a153a34a237606dc43af2d71068c003f56e4ecbb0bdc07651564d62ba26c792896cecd9065c019a WHIRLPOOL 80dda4d7f97854a19dec48d6169b2cca6bebcd28feab153ca2686faba67d9ae8ae6286661667567315a8e19e7d40bd45c97829171743489681f391236415b8cb diff --git a/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch b/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch new file mode 100644 index 00000000000..b63771d0818 --- /dev/null +++ b/net-misc/freerdp/files/freerdp-Fix-gstreamer-1.0-detection.patch @@ -0,0 +1,25 @@ +From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +Date: Fri, 28 Jul 2017 16:31:41 -0400 +Subject: [PATCH] Fix gstreamer-1.0 detection + +--- + cmake/FindGStreamer_1_0.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake +index 3aa8fc6dc..6fbc0ecc5 100644 +--- a/cmake/FindGStreamer_1_0.cmake ++++ b/cmake/FindGStreamer_1_0.cmake +@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library) + + string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}") + if ("${CMAKE_MATCH_2}" STREQUAL "") +- pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}") ++ pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GSTREAMER_1_0_MINIMUM_VERSION}") + else () + pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}) + endif () +-- +2.13.3 + diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild similarity index 90% copy from net-misc/freerdp/freerdp-9999.ebuild copy to net-misc/freerdp/freerdp-2.0.0_rc0.ebuild index c8427184b90..347d8debd63 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -6,10 +6,11 @@ EAPI="6" inherit cmake-utils if [[ ${PV} != 9999 ]]; then - COMMIT="" - SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + MY_PV="${PV/_/-}" + MY_P="FreeRDP-${MY_PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" - S="${WORKDIR}/FreeRDP-${COMMIT}" else inherit git-r3 SRC_URI="" @@ -88,6 +89,7 @@ DEPEND="${RDEPEND} " DOCS=( README ) +PATCHES=( "${FILESDIR}"/freerdp-Fix-gstreamer-1.0-detection.patch ) src_configure() { local mycmakeargs=( diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index c8427184b90..09de1872813 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -6,10 +6,11 @@ EAPI="6" inherit cmake-utils if [[ ${PV} != 9999 ]]; then - COMMIT="" - SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + MY_PV="${PV/_/-}" + MY_P="FreeRDP-${MY_PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" - S="${WORKDIR}/FreeRDP-${COMMIT}" else inherit git-r3 SRC_URI=""
