diff options
Diffstat (limited to 'net-libs/libvncserver')
4 files changed, 92 insertions, 2 deletions
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest index b095fb204c54..ee19c715fc6f 100644 --- a/net-libs/libvncserver/Manifest +++ b/net-libs/libvncserver/Manifest @@ -7,8 +7,10 @@ AUX libvncserver-0.9.12-fix-tight-raw-decoding.patch 1486 BLAKE2B 6baf50393a728e AUX libvncserver-0.9.12-libgcrypt.patch 1526 BLAKE2B 83e042ff875844cced2cb1416477c9fa255f84e6cc40b9d1d5e7dfa3e2467effb3481155b5eeeb29835cf29c0a6aa0ed381862fc184e4070b149b3a1bfc84c9e SHA512 2b2aba010104b2206eab7bec1bc6a258edb28d43da2a376d03e063d9d5e7236d690388da8ccd501b22d3181b966d2b6ee1e6752153c1ff78ab498a59355fb385 AUX libvncserver-0.9.12-pkgconfig-libdir.patch 1241 BLAKE2B 7ac16afc86204a320253c4b0b819e4c66c44c6112ac5a9bfbae13bd567391f137d1c4f786f43e5023663fcccb7d45aed628459301dd0859361a7b01f41a98d29 SHA512 37d15eb01f6c89d012c47fff885c2405ead2b7e18798b3fa68fb72bffff9caf084652e1d29fbb11263800c69e875d9442fdef660ea69b146361690820035f056 AUX libvncserver-0.9.12-sparc-unaligned.patch 1463 BLAKE2B 66ab54a68026de0c9ce5eb04333b24ae104bc24b2fcacf5c1aad2a7d019f94feef46b4588166d8063bd3e5c616b40092309306600328eb8e7597efba5e35952e SHA512 c2d26ca2a570de3fdbabef723cfe3cb6208aabe9d7222feb6f0128fba55370e0dff0b520ac84abdc6d1dc6c0762092d36dea21eccff68432cb1c6e5b1e3b79df +AUX libvncserver-0.9.13-test-fix-includetest.patch 1626 BLAKE2B 1a2bab37cc2716a0c3912a2d1b76329c81bc8c3c6b9a881a0813ab035e05a06683a908cb0ca55af94d8682ef6e0153c25d93dd09381ef1079c93808a0f7d529c SHA512 7cb35e32245152e0fdc10fd6ca80221bfe1d5a75ed9407e9d69a3082bba24cbf8868db5dc36390943e09f0beeb3a366f994ecde62c6f9d7e7688ba749249bf3d +AUX libvncserver-0.9.13-test-fix-tjunittest.patch 989 BLAKE2B 2ebe6a5bf1f04bdb188ed9a3ca965a697e995268f2e65fb7de37da663cef91672111ba0eaa1d25c4309e3f600240042e773d342996168b8b9f2dac808004b140 SHA512 6ccee0741778ae7d504acf250bffdc2231556dbc1357fd08bf54fd769e73159c3c27714c512775266f0e1cdd145a61e029645a6676b198dbc8aa6bf7ad0ca04d DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8 DIST LibVNCServer-0.9.13.tar.gz 567491 BLAKE2B 138c7ca63f8cd30a21dc1b58aafa744e12a1a9eca503ffec18a63d18791d7a5df4eef176d7e4e797a2aadda1dd04d1b051abfd76bf5c6806d558c09ffee78cce SHA512 18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643 EBUILD libvncserver-0.9.12-r5.ebuild 2343 BLAKE2B 9c344e34f6774f49fd93013c88dc2b64c6d0c62beebc7e31c9ebae1a587b9da3dfe29a3cd6b05b671fcb33f9f0925e65b73b82dab7e34eb866c5a2dd9795d610 SHA512 419c2a377644d3997c315a6e4e3e68f7ec52773eea06be9b8f7b8fc2b91cc6129f263b7b151f91b76892eced64af26997ad84c73ef8f59871217814418202406 -EBUILD libvncserver-0.9.13.ebuild 2044 BLAKE2B 97b48ab16cdbe30eaa9b55ae75ecb0ccca7af5ab2a098b21cd8990d823e14b0cd7be384604fd08d5563a2ae61c0e398eb127e445fbf02c92f732f3b2e3ad2951 SHA512 7d26b8df9881233a7bafba8eab51c1309770e935efad8280771c3e62de6c3ed0acce0649aab61e0e758c4f9617a668abcda7908d0ef3017632aa576e1a591ac0 +EBUILD libvncserver-0.9.13.ebuild 2142 BLAKE2B f07c954ca65b929c33136c95e40bd5f5a545e7611c700c227317996088a023ef54d8a26a204cf2edc01a1cbf2b705c5ac8b1aedf24ce94d9d498e8795c1318db SHA512 0a63092ec09675eb0893e9f1e4d39a6a252913d0781b42cacff4fc302c86b08b916c87794e128aeb22481a3f207684d5cd3b6c148df40a39fd3c52fa3993c98c MISC metadata.xml 1047 BLAKE2B 28c16623c5e871d4099bc17de390cfce4b791c88884e0acdb22d31e6b05e164427d133dd22159778a50117cb41cf0008916c8dd899afa1aef03656b8adaf809e SHA512 3284ae298ac2262fd92d24aee84bee384d149ee7b6929738c0c5fab5ff41f9a1d72605bc26178339c2aec3b91b2aada2654f2daa5d495a158ea2d495d21d4927 diff --git a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch new file mode 100644 index 000000000000..767708288830 --- /dev/null +++ b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch @@ -0,0 +1,54 @@ +From 39cff3dd6b5d9ebcf86f01e2c7e0bef62abd9d6f Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexander@tsoy.me> +Date: Thu, 25 Jun 2020 11:35:04 +0300 +Subject: [PATCH 1/2] test: fix includetest to use CMAKE_MAKE_PROGRAM (#431) + +includetest currently fais if, for example, ninja is used as a CMake +generator. Fix it by using CMAKE_MAKE_PROGRAM in the test. +--- + CMakeLists.txt | 2 +- + test/includetest.sh | 7 ++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b6228a2..290deb38 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -680,7 +680,7 @@ endif(LIBVNCSERVER_WITH_WEBSOCKETS) + + add_test(NAME cargs COMMAND test_cargstest) + if(UNIX) +- add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) ++ add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_MAKE_PROGRAM}) + endif(UNIX) + if(FOUND_LIBJPEG_TURBO) + add_test(NAME turbojpeg COMMAND test_tjunittest) +diff --git a/test/includetest.sh b/test/includetest.sh +index 23d602e6..6b064208 100755 +--- a/test/includetest.sh ++++ b/test/includetest.sh +@@ -5,10 +5,11 @@ + + # expects install prefix like /usr as an argument + PREFIX=$1 ++CMAKE_MAKE_PROGRAM=$2 + + TMPDIR=$(mktemp -d) + +-make install DESTDIR=$TMPDIR ++DESTDIR="$TMPDIR" $CMAKE_MAKE_PROGRAM install + + echo \ + " +@@ -19,6 +20,6 @@ int main() + { + return 0; + } +-" > $TMPDIR/includetest.c ++" > "$TMPDIR"/includetest.c + +-cc -I $TMPDIR/$PREFIX $TMPDIR/includetest.c ++cc -I "$TMPDIR/$PREFIX" "$TMPDIR"/includetest.c +-- +2.26.2 + diff --git a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch new file mode 100644 index 000000000000..98e3a654b471 --- /dev/null +++ b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch @@ -0,0 +1,29 @@ +From 8244fab5421fd14d4c75ce488ad18d38b7a6edb4 Mon Sep 17 00:00:00 2001 +From: Christian Beier <info@christianbeier.net> +Date: Thu, 25 Jun 2020 12:21:50 +0200 +Subject: [PATCH 2/2] CMake: only add turbojpeg test if configured WITH_JPEG + +Closes #430 +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 290deb38..fdca4d81 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -682,9 +682,9 @@ add_test(NAME cargs COMMAND test_cargstest) + if(UNIX) + add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_MAKE_PROGRAM}) + endif(UNIX) +-if(FOUND_LIBJPEG_TURBO) ++if(WITH_JPEG AND FOUND_LIBJPEG_TURBO) + add_test(NAME turbojpeg COMMAND test_tjunittest) +-endif(FOUND_LIBJPEG_TURBO) ++endif(WITH_JPEG AND FOUND_LIBJPEG_TURBO) + if(LIBVNCSERVER_WITH_WEBSOCKETS) + add_test(NAME wstest COMMAND test_wstest) + endif(LIBVNCSERVER_WITH_WEBSOCKETS) +-- +2.26.2 + diff --git a/net-libs/libvncserver/libvncserver-0.9.13.ebuild b/net-libs/libvncserver/libvncserver-0.9.13.ebuild index 6a10ad068579..c513bda1f85d 100644 --- a/net-libs/libvncserver/libvncserver-0.9.13.ebuild +++ b/net-libs/libvncserver/libvncserver-0.9.13.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}" LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT" # no sub slot wanted (yet), see #578958 SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib" # https://bugs.gentoo.org/690202 # https://bugs.gentoo.org/435326 @@ -48,6 +48,11 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS ChangeLog NEWS.md README.md TODO.md ) +PATCHES=( + "${FILESDIR}"/${P}-test-fix-includetest.patch + "${FILESDIR}"/${P}-test-fix-tjunittest.patch +) + src_configure() { local mycmakeargs=( -DWITH_FFMPEG=OFF |