| 1 |
aballier 14/07/27 09:08:11 |
| 2 |
|
| 3 |
Modified: ffmpeg-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
add samba useflag |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.166 media-video/ffmpeg/ffmpeg-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.166&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.166&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.165&r2=1.166 |
| 15 |
|
| 16 |
Index: ffmpeg-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v |
| 19 |
retrieving revision 1.165 |
| 20 |
retrieving revision 1.166 |
| 21 |
diff -u -r1.165 -r1.166 |
| 22 |
--- ffmpeg-9999.ebuild 27 Jul 2014 08:56:47 -0000 1.165 |
| 23 |
+++ ffmpeg-9999.ebuild 27 Jul 2014 09:08:11 -0000 1.166 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.165 2014/07/27 08:56:47 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.166 2014/07/27 09:08:11 aballier Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -34,7 +34,7 @@ |
| 33 |
fi |
| 34 |
FFMPEG_REVISION="${PV#*_p}" |
| 35 |
|
| 36 |
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )" |
| 37 |
+LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) ) samba? ( GPL-3 )" |
| 38 |
SLOT="0/${FFMPEG_SUBSLOT}" |
| 39 |
if [ "${PV#9999}" = "${PV}" ] ; then |
| 40 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 41 |
@@ -44,9 +44,9 @@ |
| 42 |
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r |
| 43 |
fribidi gme gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack |
| 44 |
jpeg2k ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal |
| 45 |
- opengl openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh |
| 46 |
- static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx |
| 47 |
- wavpack webp X x264 x265 xvid +zlib zvbi |
| 48 |
+ opengl openssl opus oss pic pulseaudio quvi rtmp samba schroedinger sdl |
| 49 |
+ speex ssh static-libs test theora threads truetype twolame v4l vaapi vdpau |
| 50 |
+ vorbis vpx wavpack webp X x264 x265 xvid +zlib zvbi |
| 51 |
" |
| 52 |
|
| 53 |
ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp" |
| 54 |
@@ -135,8 +135,9 @@ |
| 55 |
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) |
| 56 |
quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] ) |
| 57 |
rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) |
| 58 |
- sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) |
| 59 |
+ samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] ) |
| 60 |
schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) |
| 61 |
+ sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) |
| 62 |
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) |
| 63 |
ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) |
| 64 |
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) |
| 65 |
@@ -205,10 +206,11 @@ |
| 66 |
# or $(use_enable foo foo) if no :bar is set. |
| 67 |
local ffuse=( |
| 68 |
bzip2:bzlib cpudetection:runtime-cpudetect debug doc |
| 69 |
- gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi |
| 70 |
- vdpau X:xlib zlib |
| 71 |
+ gnutls hardcoded-tables iconv network openssl samba:libsmbclient |
| 72 |
+ sdl:ffplay vaapi vdpau X:xlib zlib |
| 73 |
) |
| 74 |
use openssl && myconf+=( --enable-nonfree ) |
| 75 |
+ use samba && myconf+=( --enable-version3 ) |
| 76 |
|
| 77 |
# Encoders |
| 78 |
if use encode |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.769 media-video/ffmpeg/ChangeLog |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.769&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.769&content-type=text/plain |
| 86 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.768&r2=1.769 |
| 87 |
|
| 88 |
Index: ChangeLog |
| 89 |
=================================================================== |
| 90 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v |
| 91 |
retrieving revision 1.768 |
| 92 |
retrieving revision 1.769 |
| 93 |
diff -u -r1.768 -r1.769 |
| 94 |
--- ChangeLog 27 Jul 2014 08:56:47 -0000 1.768 |
| 95 |
+++ ChangeLog 27 Jul 2014 09:08:11 -0000 1.769 |
| 96 |
@@ -1,6 +1,9 @@ |
| 97 |
# ChangeLog for media-video/ffmpeg |
| 98 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 99 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.768 2014/07/27 08:56:47 aballier Exp $ |
| 100 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.769 2014/07/27 09:08:11 aballier Exp $ |
| 101 |
+ |
| 102 |
+ 27 Jul 2014; Alexis Ballier <aballier@g.o> ffmpeg-9999.ebuild: |
| 103 |
+ add samba useflag |
| 104 |
|
| 105 |
27 Jul 2014; Alexis Ballier <aballier@g.o> ffmpeg-9999.ebuild: |
| 106 |
release notes is at the root of the repo, not under doc/ |
Archives