gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 06:48:18 -07:00
Code Issues Projects Releases Wiki Activity

x11-wm/xpra: Version bumps (bug 618492, thanks Joe Stroller), remove old.

Browse Source 
Package-Manager: Portage-2.3.5, Repoman-2.3.2
This commit is contained in:
Michael Weber
2017-05-16 22:55:23 +02:00
parent 7f4aa1c261
commit f2aaf0e7d7
5 changed files with 39 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
x11-wm/xpra/Manifest
View File

@@ -1,4 +1,4 @@
DIST xpra-1.0.3.tar.xz 1888908 SHA256 f83c5946f67fe26eee8b44fba0fa30bca9fbc7aa58ee66b903b7385c2d332166 SHA512 3b6371d478147a5d932df1c8428e9132831fcbf17e51f48fb384c30548efee9758c94a6781c255b5fe211c5040993f30b054aa33f3fced85484fcc9d2ca009a1 WHIRLPOOL 989db8ac2caa3a5a0e1294754cabe6bc8cadb087a6ffa24de3039c674126886a41ecab930c46700dccdf3adc738572e04652123c9523512c050ffdff3d295b02
DIST xpra-1.0.4.tar.xz 1890404 SHA256 c841940957761e60454eac44c955d174b3d864c853f28b387e784a6d85fc9924 SHA512 85dad598a167a7c9cbf2d0e7d4cde0b7c0fd75b5e1cc515ea78261f4a33d6d864863f98746f7537b202a08c7f225f002d9abbbb5c2773acd63e3a1b37c4d68d9 WHIRLPOOL e426a258b70dcb1dff9f39980fd74221ab5793ea4f8cea2b838dfcd40b152785ef7028219f0024ef4650bb9e6fae10e9d26c1b1e58f0b4efb481a7562f6ee4eb
DIST xpra-1.0.6.tar.xz 1892736 SHA256 2ba9212333ee5dc437955ce95d15eb8a9713cf4881914b1d2fe30b1fce188c2d SHA512 d99cceca56c226f8d52d3992e790337fa9e785671c6e2ae00f119492df402c350218bb7c60e1ecd8ccd02e379d59e99bb5601bd35d433095d4a04024ec0f99b4 WHIRLPOOL 6380e2748db3aeaf532e30b70e1956036823f505540c4339a62e0576f8ff108cd5e8f33631dedfdcd5b6d01695e9f2bd11c6287485ecb1c8f0c659073002bfbb
DIST xpra-2.0.1.tar.xz 1926292 SHA256 685553c0f7cdeadde3d5a7ba48f3cd9d0feaa755e0debbdf198355223c8bc287 SHA512 2f9a8f5f3c1980c822233c3b010511d7ac63983eff330222e7375257834dfd6c840fe4b4aba61b966fb3b14debfed05eb1cd724f502a7c7b7ee9fbc86becbac3 WHIRLPOOL e5ef03c29988fa5cf10bb83eb010ac0464a95c4511d7e7ec08349ee5a53f2391f69c95fd3b5d8bb19fe29dec29ec40a273dc35d992912722594972864bd983e4
DIST xpra-2.0.tar.xz 1925080 SHA256 ca9e9622a9d435f9591bf60baec50ea02ebad4e0c0017e1df43dfddd6616e807 SHA512 1f95ecf27c1ef37989c2152a1b2b838f5246a6e3711feaa2150d55b040a41ee0de1d475eb68900b974ee9f7b3f3cf143d53802420f31de60980658cd6da132c6 WHIRLPOOL 3f72416011e35513a0acd62980f49af286d2411446452a4a336746a94c813f7f0b316061fcb854efe377d7bc77152e5eb7930d7b3afb863ea30f9e01186e4efe
DIST xpra-2.0.2.tar.xz 1926876 SHA256 4341bb6652d6e7784dddc02c63a634019c782332e9af1c08f4b8ec24f57a1f26 SHA512 4b36cf9cf96f094011412214368bc452ed597f1927f6488d6856ad80b575d7f37273cf49b8682fdbc137cf581d5a88b17a9241d508278e45e48f9451ba628b68 WHIRLPOOL d8919e8b9d40539a1c59dba2b1455924f276e5233e3674fd756e833c6bf2a132a5a27c9686cabdff2f4dc05b616245cdf0d06ce215ceb615c7c4c04861cfc41a

2
x11-wm/xpra/metadata.xml
View File

@@ -12,7 +12,6 @@
<flag name="client">Build client-side code</flag>
<flag name="clipboard">Enable clipboard support</flag>
<flag name="csc">Enable csc softscaler support</flag>
<flag name="dec_av2">Enable dec_avcodec2 support</flag>
<flag name="dec_avcodec2">Enable avcodec2 decoder support</flag>
<flag name="enc_ffmpeg">Enable advanced ffmpeg/libav encoder support</flag>
<flag name="enc_x264">Enable x264 encoder support</flag>
@@ -23,6 +22,5 @@
<flag name="vpx">Enable vpx image format support</flag>
<flag name="webp">Enable webp image format support</flag>
<flag name="webcam">Enable webcam support via opencv</flag>
<flag name="x265">Enable x265 encoder support</flag>
</use>
</pkgmetadata>

147
x11-wm/xpra/xpra-1.0.3-r1.ebuild
View File

@@ -1,147 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 eutils flag-o-matic user tmpfiles
DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
SRC_URI="http://xpra.org/src/${P}.tar.xz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="+client +clipboard csc cups dec_av2 enc_ffmpeg libav +lz4 lzo opengl pulseaudio server sound vpx webcam webp x264 x265"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
clipboard? ( || ( server client ) )
opengl? ( client )
|| ( client server )
client? ( x264? ( dec_av2 ) x265? ( dec_av2 ) )"
# x264/old-libav.path situation see bug 459218
COMMON_DEPEND=""${PYTHON_DEPS}"
dev-python/pygobject:2[${PYTHON_USEDEP}]
dev-python/pygtk:2[${PYTHON_USEDEP}]
x11-libs/gtk+:2
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXfixes
x11-libs/libXrandr
x11-libs/libXtst
csc? (
!libav? ( >=media-video/ffmpeg-1.2.2:0= )
libav? ( media-video/libav:0= )
)
dec_av2? (
!libav? ( >=media-video/ffmpeg-2:0= )
libav? ( media-video/libav:0= )
)
enc_ffmpeg? (
!libav? ( >=media-video/ffmpeg-3.2.2:0= )
libav? ( media-video/libav:0= )
)
opengl? ( dev-python/pygtkglext )
pulseaudio? ( media-sound/pulseaudio )
sound? ( media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
dev-python/gst-python:1.0 )
vpx? ( media-libs/libvpx virtual/ffmpeg )
webp? ( media-libs/libwebp )
x264? ( media-libs/x264
!libav? ( >=media-video/ffmpeg-1.0.4:0= )
libav? ( media-video/libav:0= )
)
x265? ( media-libs/x265
!libav? ( >=media-video/ffmpeg-2:0= )
libav? ( media-video/libav:0= )
)"
RDEPEND="${COMMON_DEPEND}
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/ipython[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/rencode[${PYTHON_USEDEP}]
virtual/ssh
x11-apps/xmodmap
cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
opengl? (
client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
)
server? ( x11-base/xorg-server[-minimal,xvfb]
x11-drivers/xf86-input-void
x11-drivers/xf86-video-dummy
)
webcam? ( media-libs/opencv[python]
dev-python/pyinotify[${PYTHON_USEDEP}] )"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
"${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch )
pkg_postinst() {
enewgroup ${PN}
tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
}
python_prepare_all() {
rm -rf rencode || die
sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
-i tmpfiles.d/xpra.conf
if use libav ; then
if ! has_version ">=media-video/libav-9" ; then
epatch patches/old-libav.patch
fi
fi
if ! use pulseaudio ; then #bug 608126
sed -e '/pulseaudio/s:bstr(not OSX and not WIN32):bstr(False):' \
-i setup.py || die
fi
distutils-r1_python_prepare_all
}
python_configure_all() {
mydistutilsargs=(
$(use_with client)
$(use_with clipboard)
$(use_with csc csc_swscale)
$(use_with cups printing)
$(use_with dec_av2 dec_avcodec2)
$(use_with enc_ffmpeg)
$(use_with opengl)
$(use_with server shadow)
$(use_with server)
$(use_with sound)
$(use_with vpx)
$(use_with webp)
$(use_with x264 enc_x264)
$(use_with x265 enc_x265)
$(use_with webcam)
--with-Xdummy
--with-gtk2
--without-gtk3
--with-strict
--with-warn
--with-x11
--without-PIC
--without-debug )
# see https://www.xpra.org/trac/ticket/1080
# and http://trac.cython.org/ticket/395
append-cflags -fno-strict-aliasing
export XPRA_SOCKET_DIRS="${EROOT}run/xpra"
}

78
x11-wm/xpra/xpra-1.0.4.ebuild → x11-wm/xpra/xpra-1.0.6.ebuild
View File

@@ -14,15 +14,15 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+client +clipboard csc cups dec_av2 enc_ffmpeg libav +lz4 lzo opengl pulseaudio server sound vpx webcam webp x264 x265"
IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
clipboard? ( || ( server client ) )
cups? ( dbus )
opengl? ( client )
|| ( client server )
client? ( x264? ( dec_av2 ) x265? ( dec_av2 ) )"
client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
# x264/old-libav.path situation see bug 459218
COMMON_DEPEND=""${PYTHON_DEPS}"
dev-python/pygobject:2[${PYTHON_USEDEP}]
dev-python/pygtk:2[${PYTHON_USEDEP}]
@@ -37,7 +37,7 @@ COMMON_DEPEND=""${PYTHON_DEPS}"
!libav? ( >=media-video/ffmpeg-1.2.2:0= )
libav? ( media-video/libav:0= )
)
dec_av2? (
dec_avcodec2? (
!libav? ( >=media-video/ffmpeg-2:0= )
libav? ( media-video/libav:0= )
)
@@ -45,6 +45,13 @@ COMMON_DEPEND=""${PYTHON_DEPS}"
!libav? ( >=media-video/ffmpeg-3.2.2:0= )
libav? ( media-video/libav:0= )
)
enc_x264? ( media-libs/x264
!libav? ( >=media-video/ffmpeg-1.0.4:0= )
libav? ( media-video/libav:0= )
)
enc_x265? ( media-libs/x265
!libav? ( >=media-video/ffmpeg-2:0= )
libav? ( media-video/libav:0= )
opengl? ( dev-python/pygtkglext )
pulseaudio? ( media-sound/pulseaudio )
sound? ( media-libs/gstreamer:1.0
@@ -52,41 +59,35 @@ COMMON_DEPEND=""${PYTHON_DEPS}"
dev-python/gst-python:1.0 )
vpx? ( media-libs/libvpx virtual/ffmpeg )
webp? ( media-libs/libwebp )
x264? ( media-libs/x264
!libav? ( >=media-video/ffmpeg-1.0.4:0= )
libav? ( media-video/libav:0= )
)
x265? ( media-libs/x265
!libav? ( >=media-video/ffmpeg-2:0= )
libav? ( media-video/libav:0= )
)"
RDEPEND="${COMMON_DEPEND}
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/ipython[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/netifaces[${PYTHON_USEDEP}]
dev-python/rencode[${PYTHON_USEDEP}]
virtual/ssh
x11-apps/xmodmap
cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
opengl? (
client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
)
pillow? ( dev-python/pillow[${PYTHON_USEDEP}] )
server? ( x11-base/xorg-server[-minimal,xvfb]
x11-drivers/xf86-input-void
x11-drivers/xf86-video-dummy
)
webcam? ( media-libs/opencv[python]
webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
media-libs/opencv[python]
dev-python/pyinotify[${PYTHON_USEDEP}] )"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
"${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch )
"${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
"${FILESDIR}"/${PN}-1.0.4-suid-warning.patch )
pkg_postinst() {
enewgroup ${PN}
@@ -94,50 +95,45 @@ pkg_postinst() {
}
python_prepare_all() {
rm -rf rencode || die
sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
-i tmpfiles.d/xpra.conf
if use libav ; then
if ! has_version ">=media-video/libav-9" ; then
epatch patches/old-libav.patch
fi
fi
if ! use pulseaudio ; then #bug 608126
sed -e '/pulseaudio/s:bstr(not OSX and not WIN32):bstr(False):' \
-i setup.py || die
fi
distutils-r1_python_prepare_all
}
python_configure_all() {
sed -e "/'pulseaudio'/s:not OSX and not WIN32:$(usex pulseaudio True False):" \
-i setup.py || die
mydistutilsargs=(
--without-PIC
--without-Xdummy
$(use_with client)
$(use_with clipboard)
$(use_with csc csc_swscale)
$(use_with cups printing)
$(use_with dec_av2 dec_avcodec2)
--without-debug
$(use_with dbus)
$(use_with dec_avcodec2)
$(use_with enc_ffmpeg)
$(use_with enc_x264)
$(use_with enc_x265)
--with-gtk2
--without-gtk3
--without-html5
--without-mdns
--without-minify
$(use_with opengl)
$(use_with server shadow)
$(use_with server)
$(use_with sound)
$(use_with vpx)
$(use_with webp)
$(use_with x264 enc_x264)
$(use_with x265 enc_x265)
$(use_with webcam)
--with-Xdummy
--with-gtk2
--without-gtk3
--with-strict
$(use_with vpx)
--with-warn
$(use_with webcam)
$(use_with webp)
--with-x11
--without-PIC
--without-debug )
)
# see https://www.xpra.org/trac/ticket/1080
# and http://trac.cython.org/ticket/395

0
x11-wm/xpra/xpra-2.0.ebuild → x11-wm/xpra/xpra-2.0.2.ebuild
View File