Author: jasw Date: Tue Mar 8 08:46:37 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to 0.9.5-pre1
---- Files affected:
SOURCES:
LiVES-Makefile.in-path.patch (1.1 -> 1.2) , LiVES-plugins-python.patch (1.1
-> 1.2)
---- Diffs:
================================================================
Index: SOURCES/LiVES-Makefile.in-path.patch
diff -u SOURCES/LiVES-Makefile.in-path.patch:1.1
SOURCES/LiVES-Makefile.in-path.patch:1.2
--- SOURCES/LiVES-Makefile.in-path.patch:1.1 Thu Nov 25 20:15:01 2004
+++ SOURCES/LiVES-Makefile.in-path.patch Tue Mar 8 09:46:32 2005
@@ -1,15 +1,11 @@
---- LiVES-0.9.1-pre6.org/Makefile.in 2004-11-25 17:07:36.418818264 +0100
-+++ LiVES-0.9.1-pre6/Makefile.in 2004-11-25 17:13:52.379663528 +0100
-@@ -377,9 +377,9 @@
-
-
- install-exec-am:
-- cp -pf smogrify $(bindir)
-- cp -pf build-lives-rfx-plugin* $(bindir)
-- ln -fs $(bindir)/lives-exe $(bindir)/lives
-+ cp -pf smogrify $(DESTDIR)/$(bindir)
-+ cp -pf build-lives-rfx-plugin* $(DESTDIR)/$(bindir)
-+ ln -fs $(bindir)/lives-exe $(DESTDIR)/$(bindir)/lives
-
- install-data-local:
+--- lives-0.9.5-pre1.org/Makefile.in 2005-03-07 23:50:18.213084552 +0100
++++ lives-0.9.5-pre1/Makefile.in 2005-03-08 00:26:40.668300928 +0100
+@@ -708,7 +708,7 @@
+ install-exec-local:
+ rm -rf $(DESTDIR)/$(bindir)/lives
+- $(LN_S) $(DESTDIR)/$(bindir)/lives-exe $(DESTDIR)/$(bindir)/lives
++ $(LN_S) $(bindir)/lives-exe ${DESTDIR}/$(bindir)/lives
+ cp -f $(srcdir)/smogrify $(DESTDIR)/$(bindir) && chmod +rx
$(DESTDIR)/$(bindir)/smogrify
+ cp -f $(srcdir)/midistart $(DESTDIR)/$(bindir) && chmod +rx
$(DESTDIR)/$(bindir)/midistart
+ cp -f $(srcdir)/midistop $(DESTDIR)/$(bindir) && chmod +rx
$(DESTDIR)/$(bindir)/midistop
================================================================
Index: SOURCES/LiVES-plugins-python.patch
diff -u SOURCES/LiVES-plugins-python.patch:1.1
SOURCES/LiVES-plugins-python.patch:1.2
--- SOURCES/LiVES-plugins-python.patch:1.1 Thu Nov 25 20:15:01 2004
+++ SOURCES/LiVES-plugins-python.patch Tue Mar 8 09:46:32 2005
@@ -1,15 +1,81 @@
-diff -urN plugins.org/encoders/multi_encoder plugins/encoders/multi_encoder
---- plugins.org/encoders/multi_encoder 2004-11-25 19:01:16.138063352 +0100
-+++ plugins/encoders/multi_encoder 2004-11-25 19:01:27.427347120 +0100
+diff -ruN
lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/README.multi_encoder
lives-0.9.5-pre1/lives-plugins/marcos-encoders/README.multi_encoder
+--- lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/README.multi_encoder
2005-03-07 23:50:18.166091696 +0100
++++ lives-0.9.5-pre1/lives-plugins/marcos-encoders/README.multi_encoder
2005-03-08 01:23:38.956020896 +0100
+@@ -46,7 +46,7 @@
+ libs are missing (e.g. xvidcore). If the above fails because
+ Python is not found change the first line of the encoder scripts
+
+-#!/usr/bin/python2.3
++#!/usr/bin/python
+
+ to point to the correct executable.
+
+diff -ruN lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/dirac_encoder.py
lives-0.9.5-pre1/lives-plugins/marcos-encoders/dirac_encoder.py
+--- lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/dirac_encoder.py
2005-03-07 23:50:18.166091696 +0100
++++ lives-0.9.5-pre1/lives-plugins/marcos-encoders/dirac_encoder.py
2005-03-08 01:23:38.964019680 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.3
++#!/usr/bin/python
+
+ """
+ dirac_encoder.py
+diff -ruN lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/gif_encoder.py
lives-0.9.5-pre1/lives-plugins/marcos-encoders/gif_encoder.py
+--- lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/gif_encoder.py
2005-03-07 23:50:18.162092304 +0100
++++ lives-0.9.5-pre1/lives-plugins/marcos-encoders/gif_encoder.py
2005-03-08 01:23:38.972018464 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.3
++#!/usr/bin/python
+
+ """
+ gif_encoder.py
+diff -ruN lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/mkv_encoder.py
lives-0.9.5-pre1/lives-plugins/marcos-encoders/mkv_encoder.py
+--- lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/mkv_encoder.py
2005-03-07 23:50:18.163092152 +0100
++++ lives-0.9.5-pre1/lives-plugins/marcos-encoders/mkv_encoder.py
2005-03-08 01:23:38.980017248 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.3
++#!/usr/bin/python
+
+ """
+ mkv_encoder.py
+diff -ruN lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/mng_encoder.py
lives-0.9.5-pre1/lives-plugins/marcos-encoders/mng_encoder.py
+--- lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/mng_encoder.py
2005-03-07 23:50:18.162092304 +0100
++++ lives-0.9.5-pre1/lives-plugins/marcos-encoders/mng_encoder.py
2005-03-08 01:23:38.988016032 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.3
++#!/usr/bin/python
+
+ """
+ mng_encoder.py
+diff -ruN lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/mpeg_encoder.py
lives-0.9.5-pre1/lives-plugins/marcos-encoders/mpeg_encoder.py
+--- lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/mpeg_encoder.py
2005-03-07 23:50:18.165091848 +0100
++++ lives-0.9.5-pre1/lives-plugins/marcos-encoders/mpeg_encoder.py
2005-03-08 01:23:38.995014968 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.3
++#!/usr/bin/python
+
+ """
+ mpeg_encoder.py
+diff -ruN lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/ogm_encoder.py
lives-0.9.5-pre1/lives-plugins/marcos-encoders/ogm_encoder.py
+--- lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/ogm_encoder.py
2005-03-07 23:50:18.163092152 +0100
++++ lives-0.9.5-pre1/lives-plugins/marcos-encoders/ogm_encoder.py
2005-03-08 01:23:39.003013752 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.3
++#!/usr/bin/python
+
+ """
+ ogm_encoder.py
+diff -ruN lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/theora_encoder.py
lives-0.9.5-pre1/lives-plugins/marcos-encoders/theora_encoder.py
+--- lives-0.9.5-pre1.org/lives-plugins/marcos-encoders/theora_encoder.py
2005-03-07 23:50:18.165091848 +0100
++++ lives-0.9.5-pre1/lives-plugins/marcos-encoders/theora_encoder.py
2005-03-08 01:23:39.011012536 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3
+#!/usr/bin/python
"""
- multi_encoder
-diff -urN plugins.org/encoders/multi_encoder~ plugins/encoders/multi_encoder~
---- plugins.org/encoders/multi_encoder~ 2004-11-25 19:01:16.138063352
+0100
-+++ plugins/encoders/multi_encoder~ 2004-11-25 19:01:32.389592744 +0100
+ theora_encoder.py
+diff -ruN lives-0.9.5-pre1.org/lives-plugins/plugins/encoders/multi_encoder
lives-0.9.5-pre1/lives-plugins/plugins/encoders/multi_encoder
+--- lives-0.9.5-pre1.org/lives-plugins/plugins/encoders/multi_encoder
2005-03-07 23:50:18.209085160 +0100
++++ lives-0.9.5-pre1/lives-plugins/plugins/encoders/multi_encoder
2005-03-07 23:55:11.489499760 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3
+#!/usr/bin/python
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/LiVES-Makefile.in-path.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/LiVES-plugins-python.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
