- started to work on plugin dir

diff --git a/cinelerra-plugindir.patch b/cinelerra-plugindir.patch
index bd254354d7718d005fe19ee80c588f61970a32bf..58416bffba6404b418fe3cb5178e425d242764ab 100644 (file)
--- a/cinelerra-plugindir.patch
+++ b/cinelerra-plugindir.patch
@@ -1,25 +1,21 @@
---- cinelerra-4/cinelerra/mwindow.inc.orig     2008-08-07 05:33:08.000000000 +0200
-+++ cinelerra-4/cinelerra/mwindow.inc  2008-08-29 07:04:50.966113358 +0200
-@@ -28,11 +28,11 @@
- #define CONFIG_FILE "Cinelerra_rc"
- #define PRESETS_FILE "Cinelerra_presets"
+--- cinelerra/preferences.inc.orig     2012-09-22 13:38:33.839435794 +0100
++++ cinelerra/preferences.inc  2012-09-22 13:38:36.049436001 +0100
+@@ -27,6 +27,12 @@
+ #define BACKUP_PATH BCASTDIR "backup.xml"
+ #define DEAMON_PORT 400
  
--// #ifdef __x86_64__
--// #define PLUGIN_DIR "/usr/lib64/cinelerra"
--// #else
--// #define PLUGIN_DIR "/usr/lib/cinelerra"
--// #endif
 +#if defined(__x86_64__) || defined(__arch64__) || defined(__powerpc64__) || defined(__s390x__)
 +#define PLUGIN_DIR "/usr/lib64/cinelerra"
 +#else
 +#define PLUGIN_DIR "/usr/lib/cinelerra"
 +#endif
- 
- // What to call silence in the EDL
- #define SILENCE "SILENCE"
---- cinelerra-4/cinelerra/preferences.C.orig   2008-08-07 05:33:08.000000000 +0200
-+++ cinelerra-4/cinelerra/preferences.C        2008-08-29 07:08:45.698118386 +0200
-@@ -61,7 +61,7 @@ Preferences::Preferences()
++
+ class Preferences;
+ class PlaybackConfig;
+ class AudioOutConfig;
+--- cinelerra/preferences.C.orig       2012-01-07 23:02:41.000000000 +0000
++++ cinelerra/preferences.C    2012-09-22 13:37:35.149430302 +0100
+@@ -62,7 +62,7 @@
  
  
  

diff --git a/cinelerra.spec b/cinelerra.spec
index 39f0646866f818e25f61cacfe61c834cccb2f1b5..0565b84fec5a9031f51a911bd7073a769c4e7473 100644 (file)
--- a/cinelerra.spec
+++ b/cinelerra.spec
@@ -2,9 +2,8 @@
 # imho, it is pointless to build this app with system libraries until we
 # start submitting patches to the author (is that possible with his
 # current development and release strategy?)... anyway, the todo follows
-# - make a patch for plugin dir in preferences.C, i.e.
-#       get_exe_path(plugin_dir); -> sprintf(plugin_dir, PLUGIN_DIR);
-#   or move plugins to %{_bindir}... otherwise you cannot run it 
+# - deal with fonts dir and plugins dir patches (cinelerra writes lists of
+#   plugins in plugins dir:/)
 # - review existing, but commented out patches
 # - send the existing patches to the author (so we do not have to maintain
 #   them forever)
@@ -33,6 +32,7 @@ Patch7:               %{name}-ffmpeg.patch
 Patch8:                %{name}-typo.patch
 # see speech_tools package
 Patch9:                %{name}-st.patch
+Patch10:       %{name}-plugindir.patch
 URL:           http://www.heroinewarrior.com/cinelerra.php
 BuildRequires: OpenEXR-devel >= 1.6.1
 BuildRequires: OpenGL-GLU-devel
@@ -112,6 +112,7 @@ Cinelerra była tworzona z myślą o zastąpieniu programu Broadcast 2000.
 #x#%patch7 -p1
 %patch8 -p1
 %patch9 -p0
+%patch10 -p0
 
 #x## assume we have <linux/videodev2.h> and <linux/dvb/*> (present in llh)
 #x#cat > hvirtual_config.h <<EOF
@@ -181,4 +182,3 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/cinelerra
 %dir %{_libdir}/cinelerra
 %attr(755,root,root) %{_libdir}/cinelerra/*.plugin
-%{_libdir}/cinelerra/Cinelerra_plugins