* [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-0.9.ebuild ffmpeg-9999.ebuild ChangeLog
@ 2011-12-15 12:07 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-15 12:07 UTC (permalink / raw
To: gentoo-commits
aballier 11/12/15 12:07:04
Modified: ffmpeg-0.9.ebuild ffmpeg-9999.ebuild ChangeLog
Log:
set optflags to cflags, just in case
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Revision Changes Path
1.2 media-video/ffmpeg/ffmpeg-0.9.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild?r1=1.1&r2=1.2
Index: ffmpeg-0.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-0.9.ebuild 15 Dec 2011 11:30:44 -0000 1.1
+++ ffmpeg-0.9.ebuild 15 Dec 2011 12:07:04 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v 1.1 2011/12/15 11:30:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v 1.2 2011/12/15 12:07:04 aballier Exp $
EAPI="4"
@@ -234,7 +234,7 @@
--mandir="${EPREFIX}/usr/share/man" \
--enable-shared \
--cc="$(tc-getCC)" \
- --optflags="" \
+ --optflags="${CFLAGS}" \
--extra-cflags="${CFLAGS}" \
--extra-cxxflags="${CXXFLAGS}" \
$(use_enable static-libs static) \
1.75 media-video/ffmpeg/ffmpeg-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.74&r2=1.75
Index: ffmpeg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ffmpeg-9999.ebuild 15 Dec 2011 11:46:01 -0000 1.74
+++ ffmpeg-9999.ebuild 15 Dec 2011 12:07:04 -0000 1.75
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.74 2011/12/15 11:46:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.75 2011/12/15 12:07:04 aballier Exp $
EAPI="4"
@@ -238,7 +238,7 @@
--cc="$(tc-getCC)" \
--cxx="$(tc-getCXX)" \
--ar="$(tc-getAR)" \
- --optflags="" \
+ --optflags="${CFLAGS}" \
--extra-cflags="${CFLAGS}" \
--extra-cxxflags="${CXXFLAGS}" \
$(use_enable static-libs static) \
1.513 media-video/ffmpeg/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.513&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.513&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.512&r2=1.513
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -r1.512 -r1.513
--- ChangeLog 15 Dec 2011 11:46:01 -0000 1.512
+++ ChangeLog 15 Dec 2011 12:07:04 -0000 1.513
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.512 2011/12/15 11:46:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.513 2011/12/15 12:07:04 aballier Exp $
+
+ 15 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.9.ebuild,
+ ffmpeg-9999.ebuild:
+ set optflags to cflags, just in case
15 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
no need to prebuild version.h these days
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-0.9.ebuild ffmpeg-9999.ebuild ChangeLog
@ 2011-12-17 13:42 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-17 13:42 UTC (permalink / raw
To: gentoo-commits
aballier 11/12/17 13:42:47
Modified: ffmpeg-0.9.ebuild ffmpeg-9999.ebuild ChangeLog
Log:
tests depend on encode and zlib, use eapi4 use constraints for this, fixes bug #356691
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Revision Changes Path
1.3 media-video/ffmpeg/ffmpeg-0.9.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild?r1=1.2&r2=1.3
Index: ffmpeg-0.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpeg-0.9.ebuild 15 Dec 2011 12:07:04 -0000 1.2
+++ ffmpeg-0.9.ebuild 17 Dec 2011 13:42:47 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v 1.2 2011/12/15 12:07:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v 1.3 2011/12/17 13:42:47 aballier Exp $
EAPI="4"
@@ -102,7 +102,8 @@
"
# faac is license-incompatible with ffmpeg
REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
- libv4l? ( v4l )"
+ libv4l? ( v4l )
+ test? ( encode zlib )"
S=${WORKDIR}/${P/_/-}
@@ -264,10 +265,6 @@
}
src_test() {
- if use encode ; then
- LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
- emake fate
- else
- ewarn "Tests fail without USE=encode, skipping"
- fi
+ LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+ emake fate
}
1.76 media-video/ffmpeg/ffmpeg-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.75&r2=1.76
Index: ffmpeg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ffmpeg-9999.ebuild 15 Dec 2011 12:07:04 -0000 1.75
+++ ffmpeg-9999.ebuild 17 Dec 2011 13:42:47 -0000 1.76
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.75 2011/12/15 12:07:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.76 2011/12/17 13:42:47 aballier Exp $
EAPI="4"
@@ -102,7 +102,8 @@
"
# faac is license-incompatible with ffmpeg
REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
- libv4l? ( v4l )"
+ libv4l? ( v4l )
+ test? ( encode zlib )"
S=${WORKDIR}/${P/_/-}
@@ -266,10 +267,6 @@
}
src_test() {
- if use encode ; then
- LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
- emake fate
- else
- ewarn "Tests fail without USE=encode, skipping"
- fi
+ LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+ emake fate
}
1.514 media-video/ffmpeg/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.514&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.514&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.513&r2=1.514
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -r1.513 -r1.514
--- ChangeLog 15 Dec 2011 12:07:04 -0000 1.513
+++ ChangeLog 17 Dec 2011 13:42:47 -0000 1.514
@@ -1,6 +1,11 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.513 2011/12/15 12:07:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.514 2011/12/17 13:42:47 aballier Exp $
+
+ 17 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.9.ebuild,
+ ffmpeg-9999.ebuild:
+ tests depend on encode and zlib, use eapi4 use constraints for this, fixes
+ bug #356691
15 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.9.ebuild,
ffmpeg-9999.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-0.9.ebuild ffmpeg-9999.ebuild ChangeLog
@ 2011-12-17 14:08 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-17 14:08 UTC (permalink / raw
To: gentoo-commits
aballier 11/12/17 14:08:12
Modified: ffmpeg-0.9.ebuild ffmpeg-9999.ebuild ChangeLog
Log:
search for libraries in libswresample too for tests
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Revision Changes Path
1.4 media-video/ffmpeg/ffmpeg-0.9.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild?r1=1.3&r2=1.4
Index: ffmpeg-0.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ffmpeg-0.9.ebuild 17 Dec 2011 13:42:47 -0000 1.3
+++ ffmpeg-0.9.ebuild 17 Dec 2011 14:08:12 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v 1.3 2011/12/17 13:42:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v 1.4 2011/12/17 14:08:12 aballier Exp $
EAPI="4"
@@ -265,6 +265,6 @@
}
src_test() {
- LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+ LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
emake fate
}
1.77 media-video/ffmpeg/ffmpeg-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.76&r2=1.77
Index: ffmpeg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ffmpeg-9999.ebuild 17 Dec 2011 13:42:47 -0000 1.76
+++ ffmpeg-9999.ebuild 17 Dec 2011 14:08:12 -0000 1.77
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.76 2011/12/17 13:42:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.77 2011/12/17 14:08:12 aballier Exp $
EAPI="4"
@@ -267,6 +267,6 @@
}
src_test() {
- LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+ LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
emake fate
}
1.515 media-video/ffmpeg/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.515&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.515&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.514&r2=1.515
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -r1.514 -r1.515
--- ChangeLog 17 Dec 2011 13:42:47 -0000 1.514
+++ ChangeLog 17 Dec 2011 14:08:12 -0000 1.515
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.514 2011/12/17 13:42:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.515 2011/12/17 14:08:12 aballier Exp $
+
+ 17 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.9.ebuild,
+ ffmpeg-9999.ebuild:
+ search for libraries in libswresample too for tests
17 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.9.ebuild,
ffmpeg-9999.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-17 14:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-17 13:42 [gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-0.9.ebuild ffmpeg-9999.ebuild ChangeLog Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2011-12-17 14:08 Alexis Ballier (aballier)
2011-12-15 12:07 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox