[media-video/lives] Bump to development version 1.4.1.

Patch to fix typo in src/callback.c by me; accepted upstream.

4 files changed, 78 insertions, 1 deletions

diff --git a/media-video/lives/ChangeLog b/media-video/lives/ChangeLog
index fe8846d..32e3d25 100644
--- a/media-video/lives/ChangeLog
+++ b/media-video/lives/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*lives-1.4.1 (22 Mar 2011)
+
+  22 Mar 2011; Dustin Polke <dustin.polke@uni-siegen.de> +lives-1.4.1.ebuild,
+  +files/lives-1.4.1-fix-jackd-callback.patch:
+  Version bump to development version 1.4.1. Patch by me accepted upstream.
+
   22 Feb 2011; Dustin Polke <dustin.polke@uni-siegen.de> lives-1.0.10.ebuild:
   Pin gtk dep to slot 2.
 
diff --git a/media-video/lives/Manifest b/media-video/lives/Manifest
index 9697063..6dadf5f 100644
--- a/media-video/lives/Manifest
+++ b/media-video/lives/Manifest
@@ -1,4 +1,7 @@
+AUX lives-1.4.1-fix-jackd-callback.patch 502 RMD160 5cfcda71a6e9ebdf8643da1ecb3673e571d2f66f SHA1 6fe1679078f237e6308276fb35c115a7bd26611f SHA256 f9d6065d580ac1278d4a67ac8ef40b0352cf31fb846f7140a53241208ecce830
 DIST LiVES-1.0.10.tar.bz2 2465813 RMD160 b285ba8cf5b5bb01e699f602eb1418036e6ab0c1 SHA1 fea29e92a1991545e67d88ada228e5ad877e751e SHA256 f5ae1147c348197d1d18770d40143fac0cbc1d4653f605285477b0a788e584e3
+DIST LiVES-1.4.1.tar.bz2 3103370 RMD160 8515f6fc071e8c1158a0953d0fc791e4bedfa7d9 SHA1 8fcac646830b224239354af04d38faebe84d4cbe SHA256 9d18a38965803d6b3090d3c56423aba803aebecbba49a6b7ac6e06fbfd215da5
 EBUILD lives-1.0.10.ebuild 1497 RMD160 716d2300bedf44dcbad6a83cb3b45127eb2116a4 SHA1 4918cdc45b0c57c369db55ad137af4d4cd8194b6 SHA256 ede6ea6c377cbbdfa063050e050771e350232406f9557f281df215522155d7fa
-MISC ChangeLog 364 RMD160 8a782c3a2dbc15d30ccf3a213b926e0677e7ef89 SHA1 012a6ff4b8d6f3a9491959c18a3042692ac27396 SHA256 04dbf92defb47fd9aab540bea0797981b5e50fb310054ed248d1a3f34e9e531a
+EBUILD lives-1.4.1.ebuild 1549 RMD160 68e8ecdedd7922cf84726838928a2ba2a01a112a SHA1 b76846f1636d3ddd31d08be51c24bd6b7fb95479 SHA256 642f0e3bf12b5e483f790b0e59da403e59ea065cfd8684f84726e6afd705299a
+MISC ChangeLog 594 RMD160 1a380caeef19a56d201cfb969d7de2feb8cf6a8e SHA1 6e815cdd8a60fb47fd2fd123d3ee93f22a042ee0 SHA256 e8ed9f6e6d601e37dc0d33a2accea40b73ac33d8e046394121114faa21f054f1
 MISC metadata.xml 292 RMD160 99b9460990fb9335cfc60d28f55fecb70414886d SHA1 63315305798fde9c54274a8a9816ee1bd94f89bd SHA256 dbf564dce539afe281826d6b9732e24749c9f45ee36422e527915fcde110d879
diff --git a/media-video/lives/files/lives-1.4.1-fix-jackd-callback.patch b/media-video/lives/files/lives-1.4.1-fix-jackd-callback.patch
new file mode 100644
index 0000000..a518462
--- /dev/null
+++ b/media-video/lives/files/lives-1.4.1-fix-jackd-callback.patch
@@ -0,0 +1,11 @@
+--- src/callbacks.c.orig
++++ src/callbacks.c
+@@ -8363,7 +8363,7 @@ gboolean show_sync_callback (GtkAccelGro
+ 
+   if (prefs->audio_player==AUD_PLAYER_JACK) {
+ #ifdef ENABLE_JACK
+-    if (mainw->jackd!=NULL&&mainw->jackd->in_use) avsync=(gdouble)mainw->pulsed->seek_pos/cfile->arate/cfile->achans/cfile->asampsize*8;
++    if (mainw->jackd!=NULL&&mainw->jackd->in_use) avsync=(gdouble)mainw->jackd->seek_pos/cfile->arate/cfile->achans/cfile->asampsize*8;
+     else return FALSE;
+ #else
+     return FALSE;
diff --git a/media-video/lives/lives-1.4.1.ebuild b/media-video/lives/lives-1.4.1.ebuild
new file mode 100644
index 0000000..f47bd1e
--- /dev/null
+++ b/media-video/lives/lives-1.4.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+EAPI="2"
+
+inherit flag-o-matic
+
+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"
+	# sf.net only has rpms for this version
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="matroska ogg theora libvisual nls" #sdl jack dv"
+DEPEND=">=dev-lang/perl-5.8.0-r12
+	>=dev-lang/python-2.3.4
+	>=media-gfx/imagemagick-5.5.6
+	>=media-libs/jpeg-6b-r3
+	media-libs/libsdl
+	media-sound/jack-audio-connection-kit
+	>=media-sound/sox-12.17.3-r3
+	>=media-video/ffmpeg-0.4.8
+	>=media-video/mjpegtools-1.6.2
+	>=media-video/mplayer-0.90-r2[encode]
+	sys-libs/libavc1394
+	>=x11-libs/gtk+-2.10:2
+	virtual/cdrtools
+	libvisual? ( media-libs/libvisual )"
+RDEPEND="${DEPEND}
+	matroska? ( media-video/mkvtoolnix
+		media-libs/libmatroska )
+	ogg? ( media-sound/ogmtools )
+	theora? ( media-libs/libtheora )"
+
+src_prepare() {
+	# hardcoding -03 is wrong!
+	sed -i -e "s:-O3::g" \
+		"${S}"/{libweed,lives-plugins/{plugins/{decoders,playback/video},weed-plugins{,/gdk}},src}/Makefile.in || die
+	epatch "${FILESDIR}"/${P}-fix-jackd-callback.patch
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable libvisual) \
+		$(use_enable nls)
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS FEATURES GETTING.STARTED NEWS || die
+	# hack to circumvent bug #295293
+	insinto /usr/bin
+	dobin libOSC/sendOSC/sendOSC || die
+}