[SCM] lives packaging branch, master, updated. debian/1.1.8-2-16-g0312fee
quadrispro-guest at users.alioth.debian.org
quadrispro-guest at users.alioth.debian.org
Sun Feb 21 19:43:39 UTC 2010
The following commit has been merged in the master branch:
commit 1fa6959b764545b118713531a9084a79088197fa
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date: Sun Feb 21 20:42:21 2010 +0100
Refresh removepy.diff.
diff --git a/debian/patches/removepy.diff b/debian/patches/removepy.diff
index 128d8fb..6f5aff9 100644
--- a/debian/patches/removepy.diff
+++ b/debian/patches/removepy.diff
@@ -6,14 +6,14 @@ Description: This patch removes the py extensions from the marcos
to avoid conflicts with dirac.
Author: Harry Rickards <hrickards at l33tmyst.com>
---
- lives-plugins/marcos-encoders/Makefile.am | 16
- lives-plugins/marcos-encoders/Makefile.in | 16
- lives-plugins/plugins/encoders/multi_encoder | 60 -
- 3 files changed, 46 insertions(+), 46 deletions(-)
+ lives-plugins/marcos-encoders/Makefile.am | 32 +++++++-------
+ lives-plugins/marcos-encoders/Makefile.in | 32 +++++++-------
+ lives-plugins/plugins/encoders/multi_encoder | 60 +++++++++++++--------------
+ 3 files changed, 62 insertions(+), 62 deletions(-)
--- lives.orig/lives-plugins/marcos-encoders/Makefile.am
+++ lives/lives-plugins/marcos-encoders/Makefile.am
-@@ -2,14 +2,14 @@
+@@ -2,22 +2,22 @@
#
marcosencodersdir = $(bindir)
@@ -24,43 +24,34 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
-mng_encoder.py \
-mpeg_encoder.py \
-ogm_encoder.py \
--theora_encoder.py
-+marcosencoders_DATA = lives_dirac_encoder \
+-theora_encoder.py \
+-dirac_encoder3.py \
+-avi_encoder3.py \
+-gif_encoder3.py \
+-mkv_encoder3.py \
+-mng_encoder3.py \
+-mpeg_encoder3.py \
+-ogm_encoder3.py \
+-theora_encoder3.py
++marcosencoders_DATA = dirac_encoder \
+avi_encoder \
+gif_encoder \
+mkv_encoder \
+mng_encoder \
+mpeg_encoder \
+ogm_encoder \
-+theora_encoder
++theora_encoder \
++dirac_encoder3 \
++avi_encoder3 \
++gif_encoder3 \
++mkv_encoder3 \
++mng_encoder3 \
++mpeg_encoder3 \
++ogm_encoder3 \
++theora_encoder3
install-data-hook:
for encoder in $(marcosencoders_DATA) ; do chmod a+rx $(DESTDIR)$(marcosencodersdir)/$${encoder} ; done
---- lives.orig/lives-plugins/marcos-encoders/Makefile.in
-+++ lives/lives-plugins/marcos-encoders/Makefile.in
-@@ -293,14 +293,14 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- marcosencodersdir = $(bindir)
--marcosencoders_DATA = dirac_encoder.py \
--avi_encoder.py \
--gif_encoder.py \
--mkv_encoder.py \
--mng_encoder.py \
--mpeg_encoder.py \
--ogm_encoder.py \
--theora_encoder.py
-+marcosencoders_DATA = lives_dirac_encoder \
-+avi_encoder \
-+gif_encoder \
-+mkv_encoder \
-+mng_encoder \
-+mpeg_encoder \
-+ogm_encoder \
-+theora_encoder
-
- EXTRA_DIST = $(marcosencoders_DATA) README.multi_encoder
- all: all-am
--- lives.orig/lives-plugins/plugins/encoders/multi_encoder
+++ lives/lives-plugins/plugins/encoders/multi_encoder
@@ -10,14 +10,14 @@ multi_encoder
@@ -86,10 +77,10 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
See each *.py encoder for complete list of requirements
(you can type e.g. mpeg_encoder.py -C)
-@@ -30,14 +30,14 @@ See my vids at http://amv.reimeika.ca !
- """
+@@ -36,14 +36,14 @@ Copyright (C) 2008 - 2010 Salsaman (sals
+
- version = '0.2.11'
+ version = '0.2.12'
-mpeg = 'mpeg_encoder.py'
-ogm = 'ogm_encoder.py'
-mkv = 'mkv_encoder.py'
@@ -103,13 +94,13 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
+mkv = 'mkv_encoder'
+ogg = 'theora_encoder'
+avi = 'avi_encoder'
-+drc = 'lives_dirac_encoder'
++drc = 'dirac_encoder'
+mng = 'mng_encoder'
+gif = 'gif_encoder'
usage = \
"""
-@@ -51,14 +51,14 @@ SUMMARY (ver. %s):
+@@ -57,14 +57,14 @@ SUMMARY (ver. %s):
LiVES plugin which calls one of the following programs:
@@ -132,7 +123,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
in order to generate movies in one of the following formats:
-@@ -77,7 +77,7 @@ VCD/SVCD/DVD (NTSC and PAL video)
+@@ -83,7 +83,7 @@ VCD/SVCD/DVD (NTSC and PAL video)
MNG (no sound)
Animated GIF (no sound)
@@ -141,7 +132,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
ditribution and/or available from:
http://lives.reimeika.ca/lives_guide.html
-@@ -458,7 +458,7 @@ if __name__ == '__main__':
+@@ -483,7 +483,7 @@ if __name__ == '__main__':
quiet = '-q'
tonull = '2> /dev/null'
@@ -150,7 +141,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
outfile, '-w', tempdir, '-a', arc, \
'-f', fpsc, quiet, '-t', \
type, '-s ./audiodump.wav', \
-@@ -525,7 +525,7 @@ CHANGELOG:
+@@ -544,7 +544,7 @@ CHANGELOG:
02 Aug 2004 : 0.0.6 : added default extension to 'get_formats'.
changed 'format' to 'vformat' for clarity.
added support for 'debug' argument.
@@ -159,7 +150,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
(the latter HIGHLY EXPERIMENTAL).
no longer needs all encoders to work, it
will look for and offer the available
-@@ -536,10 +536,10 @@ CHANGELOG:
+@@ -555,10 +555,10 @@ CHANGELOG:
Ogg Theora file extension is now .ogg.
made vblock=16 (may need to be tweaked).
26 Oct 2004 : 0.1.0 : can use arbitrary frame rate for Ogg Theora.
@@ -172,7 +163,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
02 Nov 2004 : 0.1.4 : added xvid.
made descriptions clearer.
08 Nov 2004 : 0.1.5 : rm xvid-twopass.stats if present.
-@@ -558,7 +558,7 @@ CHANGELOG:
+@@ -577,7 +577,7 @@ CHANGELOG:
fps difference threshold can be controlled
through "fpst" variable.
06 Dec 2004 : 0.2.1 : set fpst to 0.0005.
@@ -181,3 +172,44 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
04 Jan 2005 : 0.2.3 : added h.264 options.
24 Feb 2005 : 0.2.4 : expanded allowed audio sample rates.
21 Mar 2005 : 0.2.5 : use env python (hopefully >= 2.3)
+--- lives.orig/lives-plugins/marcos-encoders/Makefile.in
++++ lives/lives-plugins/marcos-encoders/Makefile.in
+@@ -293,22 +293,22 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ marcosencodersdir = $(bindir)
+-marcosencoders_DATA = dirac_encoder.py \
+-avi_encoder.py \
+-gif_encoder.py \
+-mkv_encoder.py \
+-mng_encoder.py \
+-mpeg_encoder.py \
+-ogm_encoder.py \
+-theora_encoder.py \
+-dirac_encoder3.py \
+-avi_encoder3.py \
+-gif_encoder3.py \
+-mkv_encoder3.py \
+-mng_encoder3.py \
+-mpeg_encoder3.py \
+-ogm_encoder3.py \
+-theora_encoder3.py
++marcosencoders_DATA = dirac_encoder \
++avi_encoder \
++gif_encoder \
++mkv_encoder \
++mng_encoder \
++mpeg_encoder \
++ogm_encoder \
++theora_encoder \
++dirac_encoder3 \
++avi_encoder3 \
++gif_encoder3 \
++mkv_encoder3 \
++mng_encoder3 \
++mpeg_encoder3 \
++ogm_encoder3 \
++theora_encoder3
+
+ EXTRA_DIST = $(marcosencoders_DATA) README.multi_encoder
+ all: all-am
--
lives packaging
More information about the pkg-multimedia-commits
mailing list