* [gentoo-commits] gentoo-x86 commit in media-video/lives: ChangeLog lives-1.4.6.ebuild
@ 2011-09-30 19:13 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-09-30 19:13 UTC (permalink / raw
To: gentoo-commits
ssuominen 11/09/30 19:13:53
Modified: ChangeLog
Added: lives-1.4.6.ebuild
Log:
Version bump wrt #376367 by tman, including upstream patch for building against libv4l instead of v4l1 from linux-headers wrt #361943 by Jouni Rinne. Use python2 instead of python wrt #315053 by Arfrever Frehtes Taifersar Arahesis. Fix imagemagick vs. graphicsmagick dependencies wrt #314337 by Wojciech Porczyk.
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Revision Changes Path
1.32 media-video/lives/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/ChangeLog?r1=1.31&r2=1.32
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog 4 Apr 2011 13:05:26 -0000 1.31
+++ ChangeLog 30 Sep 2011 19:13:53 -0000 1.32
@@ -1,6 +1,15 @@
# ChangeLog for media-video/lives
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.31 2011/04/04 13:05:26 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.32 2011/09/30 19:13:53 ssuominen Exp $
+
+*lives-1.4.6 (30 Sep 2011)
+
+ 30 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> +lives-1.4.6.ebuild:
+ Version bump wrt #376367 by tman, including upstream patch for building
+ against libv4l instead of v4l1 from linux-headers wrt #361943 by Jouni Rinne.
+ Use python2 instead of python wrt #315053 by Arfrever Frehtes Taifersar
+ Arahesis. Fix imagemagick vs. graphicsmagick dependencies wrt #314337 by
+ Wojciech Porczyk.
*lives-1.4.2 (04 Apr 2011)
1.1 media-video/lives/lives-1.4.6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/lives-1.4.6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/lives-1.4.6.ebuild?rev=1.1&content-type=text/plain
Index: lives-1.4.6.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.4.6.ebuild,v 1.1 2011/09/30 19:13:53 ssuominen Exp $
EAPI=4
inherit eutils
MY_P=LiVES-${PV}
DESCRIPTION="LiVES is a Video Editing System"
HOMEPAGE="http://lives.sf.net"
SRC_URI="http://www.xs4all.nl/~salsaman/lives/current/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="libvisual matroska nls ogg theora" # static-libs
# FIXME (incomplete workaround in place):
# !!<${CATEGORY}/${PF} is because if you have lives installed, the bundled
# libweed never gets installed in second emerge
# See also bug 295293
RDEPEND="media-video/mplayer
|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
dev-lang/perl
>=dev-libs/glib-2.14
>=x11-libs/gtk+-2.16:2
media-libs/libsdl
media-libs/libv4l
virtual/ffmpeg
virtual/jpeg
media-sound/sox
virtual/cdrtools
|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
media-plugins/frei0r-plugins
media-sound/jack-audio-connection-kit
>=media-video/mjpegtools-1.6.2
sys-libs/libavc1394
libvisual? ( media-libs/libvisual )
matroska? ( media-video/mkvtoolnix )
ogg? ( media-sound/ogmtools )
theora? ( media-libs/libtheora )
!!<${CATEGORY}/${PF}"
DEPEND="${DEPEND}
dev-util/pkgconfig
nls? ( sys-devel/gettext )"
DOCS=( AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED NEWS README )
src_prepare() {
esvn_clean
# Use python 2.x as per reference in plugins
sed -i \
-e '/#!.*env/s:python:python2:' \
lives-plugins/plugins/encoders/multi_encoder* \
lives-plugins/marcos-encoders/lives_*_encoder* || die
}
src_configure() {
# $(use_enable static-libs static)
econf \
--disable-static \
$(use_enable libvisual) \
$(use_enable nls)
}
src_install() {
default
find "${ED}"usr -name '*.la' -exec rm -f {} +
# use static-libs ||
rm -f "${ED}"usr/lib*/libweed-*.a
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/lives: ChangeLog lives-1.4.6.ebuild
@ 2011-10-06 17:25 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-10-06 17:25 UTC (permalink / raw
To: gentoo-commits
ssuominen 11/10/06 17:25:07
Modified: ChangeLog lives-1.4.6.ebuild
Log:
Don't try to detect installed copies of libweed and sendOSC wrt #295293 by Dustin Polke and Juergen Rose. Fix absolute path to symlink (with rm and dosym) wrt #384727 by Thomas Rausch.
(Portage version: 2.2.0_alpha61/cvs/Linux x86_64)
Revision Changes Path
1.34 media-video/lives/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/ChangeLog?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/ChangeLog?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/ChangeLog?r1=1.33&r2=1.34
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog 30 Sep 2011 19:26:38 -0000 1.33
+++ ChangeLog 6 Oct 2011 17:25:07 -0000 1.34
@@ -1,6 +1,11 @@
# ChangeLog for media-video/lives
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.33 2011/09/30 19:26:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.34 2011/10/06 17:25:07 ssuominen Exp $
+
+ 06 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> lives-1.4.6.ebuild:
+ Don't try to detect installed copies of libweed and sendOSC wrt #295293 by
+ Dustin Polke and Juergen Rose. Fix absolute path to symlink (with rm and
+ dosym) wrt #384727 by Thomas Rausch.
30 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> -lives-1.0.0.ebuild,
-lives-1.4.2.ebuild:
1.2 media-video/lives/lives-1.4.6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/lives-1.4.6.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/lives-1.4.6.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/lives-1.4.6.ebuild?r1=1.1&r2=1.2
Index: lives-1.4.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.4.6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lives-1.4.6.ebuild 30 Sep 2011 19:13:53 -0000 1.1
+++ lives-1.4.6.ebuild 6 Oct 2011 17:25:07 -0000 1.2
@@ -1,9 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.4.6.ebuild,v 1.1 2011/09/30 19:13:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.4.6.ebuild,v 1.2 2011/10/06 17:25:07 ssuominen Exp $
EAPI=4
-inherit eutils
+inherit autotools eutils
MY_P=LiVES-${PV}
@@ -16,10 +16,6 @@
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="libvisual matroska nls ogg theora" # static-libs
-# FIXME (incomplete workaround in place):
-# !!<${CATEGORY}/${PF} is because if you have lives installed, the bundled
-# libweed never gets installed in second emerge
-# See also bug 295293
RDEPEND="media-video/mplayer
|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
dev-lang/perl
@@ -50,12 +46,17 @@
src_prepare() {
esvn_clean
+ # Don't try to detect installed copies wrt #295293
+ sed -i -e '/^PKG_CHECK_MODULES(WEED/s:true:false:' configure.in || die
+ sed -i -e '/test/s:sendOSC:dIsAbLeAuToMaGiC:' libOSC/sendOSC/Makefile.am || die
+
# Use python 2.x as per reference in plugins
sed -i \
-e '/#!.*env/s:python:python2:' \
lives-plugins/plugins/encoders/multi_encoder* \
lives-plugins/marcos-encoders/lives_*_encoder* || die
+ AT_M4DIR="mk/autoconf" eautoreconf # for the seds
}
src_configure() {
@@ -68,6 +69,10 @@
src_install() {
default
+
+ rm -f "${ED}"usr/bin/lives #384727
+ dosym lives-exe /usr/bin/lives
+
find "${ED}"usr -name '*.la' -exec rm -f {} +
# use static-libs ||
rm -f "${ED}"usr/lib*/libweed-*.a
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/lives: ChangeLog lives-1.4.6.ebuild
@ 2012-05-05 8:58 Jeff Horelick (jdhore)
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Horelick (jdhore) @ 2012-05-05 8:58 UTC (permalink / raw
To: gentoo-commits
jdhore 12/05/05 08:58:57
Modified: ChangeLog lives-1.4.6.ebuild
Log:
dev-util/pkgconfig -> virtual/pkgconfig
(Portage version: 2.2.0_alpha101/cvs/Linux i686)
Revision Changes Path
1.36 media-video/lives/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/ChangeLog?r1=1.35&r2=1.36
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog 6 Oct 2011 17:31:35 -0000 1.35
+++ ChangeLog 5 May 2012 08:58:57 -0000 1.36
@@ -1,6 +1,9 @@
# ChangeLog for media-video/lives
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.35 2011/10/06 17:31:35 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.36 2012/05/05 08:58:57 jdhore Exp $
+
+ 05 May 2012; Jeff Horelick <jdhore@gentoo.org> lives-1.4.6.ebuild:
+ dev-util/pkgconfig -> virtual/pkgconfig
06 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> lives-1.4.6.ebuild:
Don't try to detect installed copies of libweed and sendOSC wrt #295293 by
1.4 media-video/lives/lives-1.4.6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/lives-1.4.6.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/lives-1.4.6.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lives/lives-1.4.6.ebuild?r1=1.3&r2=1.4
Index: lives-1.4.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.4.6.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lives-1.4.6.ebuild 6 Oct 2011 17:28:01 -0000 1.3
+++ lives-1.4.6.ebuild 5 May 2012 08:58:57 -0000 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.4.6.ebuild,v 1.3 2011/10/06 17:28:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-1.4.6.ebuild,v 1.4 2012/05/05 08:58:57 jdhore Exp $
EAPI=4
inherit autotools eutils
@@ -37,7 +37,7 @@
ogg? ( media-sound/ogmtools )
theora? ( media-libs/libtheora )"
DEPEND="${DEPEND}
- dev-util/pkgconfig
+ virtual/pkgconfig
nls? ( sys-devel/gettext )"
DOCS=( AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED NEWS README )
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-05 9:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-06 17:25 [gentoo-commits] gentoo-x86 commit in media-video/lives: ChangeLog lives-1.4.6.ebuild Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2012-05-05 8:58 Jeff Horelick (jdhore)
2011-09-30 19:13 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox