| 1 |
commit: d7fca0d38ac6762b7f4655b275c11a8b4c2b19fa |
| 2 |
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 4 19:26:22 2015 +0000 |
| 4 |
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 4 19:26:22 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fca0d3 |
| 7 |
|
| 8 |
media-video/ffmpeg: add libressl support |
| 9 |
|
| 10 |
.../ffmpeg/{ffmpeg-9999.ebuild => ffmpeg-2.8-r1.ebuild} | 14 ++++++++------ |
| 11 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 7 +++++-- |
| 12 |
2 files changed, 13 insertions(+), 8 deletions(-) |
| 13 |
|
| 14 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-2.8-r1.ebuild |
| 15 |
similarity index 97% |
| 16 |
copy from media-video/ffmpeg/ffmpeg-9999.ebuild |
| 17 |
copy to media-video/ffmpeg/ffmpeg-2.8-r1.ebuild |
| 18 |
index 394941d..6f3904f 100644 |
| 19 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 20 |
+++ b/media-video/ffmpeg/ffmpeg-2.8-r1.ebuild |
| 21 |
@@ -13,7 +13,7 @@ EAPI="5" |
| 22 |
# changes its ABI then this package will be rebuilt needlessly. Hence, such a |
| 23 |
# package is free _not_ to := depend on FFmpeg but I would strongly encourage |
| 24 |
# doing so since such a case is unlikely. |
| 25 |
-FFMPEG_SUBSLOT=55.57.57 |
| 26 |
+FFMPEG_SUBSLOT=54.56.56 |
| 27 |
|
| 28 |
SCM="" |
| 29 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 30 |
@@ -55,7 +55,7 @@ LICENSE=" |
| 31 |
samba? ( GPL-3 ) |
| 32 |
" |
| 33 |
if [ "${PV#9999}" = "${PV}" ] ; then |
| 34 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 35 |
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 36 |
fi |
| 37 |
|
| 38 |
# Options to use as use_enable in the foo[:bar] form. |
| 39 |
@@ -80,7 +80,7 @@ FFMPEG_FLAG_MAP=( |
| 40 |
zvbi:libzvbi |
| 41 |
# libavfilter options |
| 42 |
bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa |
| 43 |
- libass truetype:libfreetype rubberband:librubberband |
| 44 |
+ libass truetype:libfreetype |
| 45 |
# libswresample options |
| 46 |
libsoxr |
| 47 |
# Threads; we only support pthread for now but ffmpeg supports more |
| 48 |
@@ -96,7 +96,7 @@ FFMPEG_ENCODER_FLAG_MAP=( |
| 49 |
) |
| 50 |
|
| 51 |
IUSE=" |
| 52 |
- alsa +encode examples jack oss pic static-libs test v4l |
| 53 |
+ alsa +encode examples jack libressl oss pic static-libs test v4l |
| 54 |
${FFMPEG_FLAG_MAP[@]%:*} |
| 55 |
${FFMPEG_ENCODER_FLAG_MAP[@]%:*} |
| 56 |
" |
| 57 |
@@ -205,12 +205,14 @@ RDEPEND=" |
| 58 |
modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) |
| 59 |
openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) |
| 60 |
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) |
| 61 |
- openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) |
| 62 |
+ openssl? ( |
| 63 |
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) |
| 64 |
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
| 65 |
+ ) |
| 66 |
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) |
| 67 |
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) |
| 68 |
quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] ) |
| 69 |
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) |
| 70 |
- rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) |
| 71 |
samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] ) |
| 72 |
schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) |
| 73 |
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) |
| 74 |
|
| 75 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 76 |
index 394941d..9808186 100644 |
| 77 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 78 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 79 |
@@ -96,7 +96,7 @@ FFMPEG_ENCODER_FLAG_MAP=( |
| 80 |
) |
| 81 |
|
| 82 |
IUSE=" |
| 83 |
- alsa +encode examples jack oss pic static-libs test v4l |
| 84 |
+ alsa +encode examples jack libressl oss pic static-libs test v4l |
| 85 |
${FFMPEG_FLAG_MAP[@]%:*} |
| 86 |
${FFMPEG_ENCODER_FLAG_MAP[@]%:*} |
| 87 |
" |
| 88 |
@@ -205,7 +205,10 @@ RDEPEND=" |
| 89 |
modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) |
| 90 |
openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) |
| 91 |
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) |
| 92 |
- openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) |
| 93 |
+ openssl? ( |
| 94 |
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) |
| 95 |
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
| 96 |
+ ) |
| 97 |
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) |
| 98 |
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) |
| 99 |
quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] ) |
Archives