commit: 97619fe996cd0638683e3ad05cfe707b088cfb29
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 11:54:11 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 13:30:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97619fe9
media-video/libav: add libressl support
.../libav/{libav-11.9999.ebuild => libav-11.3-r1.ebuild} | 10 ++++++++--
media-video/libav/libav-11.9999.ebuild | 7 +++++--
media-video/libav/libav-9999.ebuild | 7 +++++--
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/media-video/libav/libav-11.9999.ebuild
b/media-video/libav/libav-11.3-r1.ebuild
similarity index 97%
copy from media-video/libav/libav-11.9999.ebuild
copy to media-video/libav/libav-11.3-r1.ebuild
index 98af3cc..4034d60 100644
--- a/media-video/libav/libav-11.9999.ebuild
+++ b/media-video/libav/libav-11.3-r1.ebuild
@@ -22,6 +22,7 @@ elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz";
else # Official release
SRC_URI="https://libav.org/releases/${P}.tar.xz";
+ SRC_URI+="
https://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz";
fi
# 9999 does not have fate-*.tar.xz
[[ ${PV%9999} != "" ]] && SRC_URI+=" test? (
https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
@@ -31,7 +32,7 @@ SLOT="0/11"
[[ ${PV} == *9999 ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
~x86-solaris"
IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc
+encode faac fdk
- frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+ frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k
libressl mp3
+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
static-libs test theora threads tools truetype twolame v4l vaapi vdpau
vorbis vpx X
wavpack webp x264 x265 xvid +zlib"
@@ -87,7 +88,10 @@ RDEPEND="
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
ssl? (
- openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ openssl? (
+ !libressl? (
>=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
)
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
@@ -150,6 +154,8 @@ src_unpack() {
src_prepare() {
epatch_user
+ epatch "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch"
+
# if we have snapshot then we need to hardcode the version
if [[ ${PV%_p*} != ${PV} ]]; then
sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
diff --git a/media-video/libav/libav-11.9999.ebuild
b/media-video/libav/libav-11.9999.ebuild
index 98af3cc..5970b53 100644
--- a/media-video/libav/libav-11.9999.ebuild
+++ b/media-video/libav/libav-11.9999.ebuild
@@ -31,7 +31,7 @@ SLOT="0/11"
[[ ${PV} == *9999 ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
~x86-solaris"
IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc
+encode faac fdk
- frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+ frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k
libressl mp3
+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
static-libs test theora threads tools truetype twolame v4l vaapi vdpau
vorbis vpx X
wavpack webp x264 x265 xvid +zlib"
@@ -87,7 +87,10 @@ RDEPEND="
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
ssl? (
- openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ openssl? (
+ !libressl? (
>=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
)
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
diff --git a/media-video/libav/libav-9999.ebuild
b/media-video/libav/libav-9999.ebuild
index 09447da..180b645 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -32,7 +32,7 @@ SLOT="0/12"
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~x64-solaris ~x86-solaris"
IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc
+encode faac fdk
- frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+ frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k
libressl mp3
+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
static-libs test theora threads tools truetype twolame v4l vaapi vdpau
vorbis vpx X
wavpack webp x264 x265 xvid +zlib"
@@ -88,7 +88,10 @@ RDEPEND="
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
ssl? (
- openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ openssl? (
+ !libressl? (
>=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
)
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
