| 1 |
commit: 1e11fa59470968bb02b533f31d191e93e4298c20 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 26 08:17:05 2020 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 26 08:17:59 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e11fa59 |
| 7 |
|
| 8 |
x11-wm/xpra: migrate from libav |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-wm/xpra/xpra-3.0.2.ebuild | 24 ++++++------------------ |
| 14 |
x11-wm/xpra/xpra-3.0.5.ebuild | 12 +++--------- |
| 15 |
2 files changed, 9 insertions(+), 27 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2.ebuild |
| 18 |
index 1b1afa0b121..87c56d0e4a4 100644 |
| 19 |
--- a/x11-wm/xpra/xpra-3.0.2.ebuild |
| 20 |
+++ b/x11-wm/xpra/xpra-3.0.2.ebuild |
| 21 |
@@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz" |
| 22 |
LICENSE="GPL-2 BSD" |
| 23 |
SLOT="0" |
| 24 |
KEYWORDS="amd64 x86" |
| 25 |
-IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp" |
| 26 |
+IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp" |
| 27 |
|
| 28 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 29 |
clipboard? ( || ( server client ) ) |
| 30 |
@@ -33,25 +33,13 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 31 |
x11-libs/libXrandr |
| 32 |
x11-libs/libXtst |
| 33 |
x11-libs/libxkbfile |
| 34 |
- csc? ( |
| 35 |
- !libav? ( >=media-video/ffmpeg-1.2.2:0= ) |
| 36 |
- libav? ( media-video/libav:0= ) |
| 37 |
- ) |
| 38 |
- dec_avcodec2? ( |
| 39 |
- !libav? ( >=media-video/ffmpeg-2:0=[x264,x265] ) |
| 40 |
- libav? ( media-video/libav:0=[x264,x265] ) |
| 41 |
- ) |
| 42 |
- enc_ffmpeg? ( |
| 43 |
- !libav? ( >=media-video/ffmpeg-3.2.2:0= ) |
| 44 |
- libav? ( media-video/libav:0= ) |
| 45 |
- ) |
| 46 |
+ csc? ( >=media-video/ffmpeg-1.2.2:0= ) |
| 47 |
+ dec_avcodec2? ( >=media-video/ffmpeg-2:0=[x264,x265] ) |
| 48 |
+ enc_ffmpeg? ( >=media-video/ffmpeg-3.2.2:0= ) |
| 49 |
enc_x264? ( media-libs/x264 |
| 50 |
- !libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] ) |
| 51 |
- libav? ( media-video/libav:0=[x264] ) |
| 52 |
- ) |
| 53 |
+ >=media-video/ffmpeg-1.0.4:0=[x264] ) |
| 54 |
enc_x265? ( media-libs/x265 |
| 55 |
- !libav? ( >=media-video/ffmpeg-2:0=[x264] ) |
| 56 |
- libav? ( media-video/libav:0=[x264] ) ) |
| 57 |
+ >=media-video/ffmpeg-2:0=[x264] ) |
| 58 |
jpeg? ( media-libs/libjpeg-turbo ) |
| 59 |
opengl? ( dev-python/pyopengl ) |
| 60 |
pulseaudio? ( media-sound/pulseaudio ) |
| 61 |
|
| 62 |
diff --git a/x11-wm/xpra/xpra-3.0.5.ebuild b/x11-wm/xpra/xpra-3.0.5.ebuild |
| 63 |
index f76f7a9fc36..d7d1465aea4 100644 |
| 64 |
--- a/x11-wm/xpra/xpra-3.0.5.ebuild |
| 65 |
+++ b/x11-wm/xpra/xpra-3.0.5.ebuild |
| 66 |
@@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz" |
| 67 |
LICENSE="GPL-2 BSD" |
| 68 |
SLOT="0" |
| 69 |
KEYWORDS="~amd64 ~x86" |
| 70 |
-IUSE="+client +clipboard csc cups dbus ffmpeg jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp" |
| 71 |
+IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp" |
| 72 |
|
| 73 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 74 |
|| ( client server ) |
| 75 |
@@ -32,14 +32,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 76 |
x11-libs/libXrandr |
| 77 |
x11-libs/libXtst |
| 78 |
x11-libs/libxkbfile |
| 79 |
- csc? ( |
| 80 |
- !libav? ( >=media-video/ffmpeg-1.2.2:0= ) |
| 81 |
- libav? ( media-video/libav:0= ) |
| 82 |
- ) |
| 83 |
- ffmpeg? ( |
| 84 |
- !libav? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) |
| 85 |
- libav? ( media-video/libav:0=[x264,x265] ) |
| 86 |
- ) |
| 87 |
+ csc? ( >=media-video/ffmpeg-1.2.2:0= ) |
| 88 |
+ ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) |
| 89 |
jpeg? ( media-libs/libjpeg-turbo ) |
| 90 |
opengl? ( dev-python/pyopengl ) |
| 91 |
pulseaudio? ( media-sound/pulseaudio ) |
Archives