Refactored timeline tools, they now use a decorator pattern.

svn path=/trunk/kdenlive/; revision=232

Refactored timeline tools, they now use a decorator pattern.
svn path=/trunk/kdenlive/; revision=232
e6ab0722 · Jason Wood · 552b57b9 · e6ab0722 · e6ab0722 · e6ab0722
Commit e6ab0722 authored Jul 13, 2003 by Jason Wood
Hide whitespace changes
Inline Side-by-side

Showing with 64 additions and 25 deletions

acinclude.m4 acinclude.m4 +43 -10

configure.in configure.in +1 -1

configure.in.in configure.in.in +1 -1

kdenlive.spec kdenlive.spec +19 -13

No files found.
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2606,7 +2606,7 @@ AC_DEFUN(AC_FIND_JASPER,
 [
 AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 AC_REQUIRE([AC_FIND_JPEG])
-AC_MSG_CHECKING([for jasper 1.600])
+AC_MSG_CHECKING([for jasper])
 AC_CACHE_VAL(ac_cv_jasper,
 [
 kde_save_LIBS="$LIBS"
@@ -2619,7 +2619,7 @@ AC_TRY_LINK(dnl
    #include<jasper/jasper.h>
    ],
    [
-    return( jas_init() && JAS_IMAGE_CS_RGB );
+    return( jas_init() );
    ],
    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
    eval "ac_cv_jasper=no"
@@ -4218,10 +4218,14 @@ fi

 AC_DEFUN(KDE_CHECK_PYTHON,
 [
-  KDE_CHECK_PYTHON_INTERN("2.2", 
-    [KDE_CHECK_PYTHON_INTERN("2.1", 
-      [KDE_CHECK_PYTHON_INTERN("2.0", [ KDE_CHECK_PYTHON_INTERN($1, $2) ])
-  ])])
+  KDE_CHECK_PYTHON_INTERN("2.3", 
+   [KDE_CHECK_PYTHON_INTERN("2.2", 
+     [KDE_CHECK_PYTHON_INTERN("2.1", 
+       [KDE_CHECK_PYTHON_INTERN("2.0", 
+         [KDE_CHECK_PYTHON_INTERN($1, $2) ])
+       ])
+     ])
+   ])
 ])

 AC_DEFUN(KDE_CHECK_STL_SGI,
@@ -4942,9 +4946,9 @@ m4_define([mm_car], [[$1]])
 m4_define([mm_car2], [[$@]])
 m4_define([_mm_foreach],
 [m4_if(m4_quote($2), [], [],
-       [m4_define([$1], [mm_car($2)])$3[]_mm_foreach([$1],
-                                                     mm_car2(m4_shift($2)),
-                                                     [$3])])])
+       [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1],
+                                                   mm_car2(m4_shift($2)),
+                                                   [$3])])])
 m4_define([AC_FOREACH],
 [mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])])

@@ -5401,6 +5405,12 @@ AC_DEFUN(KDE_CHECK_BINUTILS,
  echo "{ local: extern \"C++\" { foo }; };" > conftest.map
  AC_TRY_LINK([int foo;],
 [
+#ifdef __INTEL_COMPILER
+icc apparently does not support libtools version-info and version-script
+at the same time. Dunno where the bug is, but until somebody figured out,
+better disable the optional version scripts.
+#endif
+
  foo = 42;
 ], kde_supports_versionmaps=yes, kde_supports_versionmaps=no)
  LDFLAGS="$kde_save_LDFLAGS"
@@ -5633,7 +5643,6 @@ test -z "$pic_mode" && pic_mode=default
 # Use C for the default configuration in the libtool script
 tagname=
 AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
 ])# AC_LIBTOOL_SETUP


@@ -8139,6 +8148,16 @@ case $host_os in
 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 	;;
+      icpc)
+	# Intel C++
+	with_gnu_ld=yes
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	;;
      cxx)
 	# Compaq C++
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -9462,6 +9481,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
+	  icpc)
+	    # Intel C++
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
 	  cxx)
 	    # Compaq C++
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -9671,6 +9696,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
      ;;

+    linux*)
+      if test "$CC" = "icc"; then
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+      fi
+      ;;
+
    osf3* | osf4* | osf5*)
      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
      # All OSF/1 code is PIC.

--- a/configure.in
+++ b/configure.in
@@ -36,7 +36,7 @@ dnl Perform program name transformation
 AC_ARG_PROGRAM

 dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kdenlive, 0.2.0) dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kdenlive, 0.2.2) dnl searches for some needed programs

 KDE_SET_PREFIX


--- a/configure.in.in
+++ b/configure.in.in
 #MIN_CONFIG(3)

-AM_INIT_AUTOMAKE(kdenlive,0.2.0)
+AM_INIT_AUTOMAKE(kdenlive,0.2.2)

 dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
 dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__

--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -4,29 +4,27 @@

 Name: kdenlive
 Version: 0.2.2
-Release: 26/4/2003
-Vendor: 
+Release: 1jmw
 Copyright: GPL
-Summary: A non-linear video editor
-Group: 
+Summary: A non-linear video editing application for KDE
 Packager: Jason Wood <jasonwood@blueyonder.co.uk>
+Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-root
 Source: kdenlive-0.2.2.tar.gz
+Requires: piave >= 0.2.2, libqt3 >= 3.0.0, kdebase >= 3.0.0

 %description
 Kdenlive is a non-linear vdeo editor for KDE. It relies on a seperate renderer, piave, to handle it's rendering. Kdenlive supports multitrack editing.

 %prep
+rm -rf $RPM_BUILD_ROOT
 %setup
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
--target=i386

 %build
-%configure
-make
+./configure --prefix=%_prefix
+%make

 %install
-rm -rf %{buildroot}
 %makeinstall

 %clean
@@ -36,10 +34,18 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING ChangeLog README TODO INSTALL
 %{_bindir}/*
-%{_libdir}/*.so.*
-%{_datadir}/%{name}
-%{_mandir}/man8/*
+%{_datadir}/apps/%{name}
+%{_datadir}/applnk/Multimedia/%{name}.desktop
+%{_datadir}/doc/HTML/en/%{name}/index.cache.bz2
+%{_datadir}/doc/HTML/en/%{name}/index.docbook
+%{_datadir}/icons/locolor/16x16/apps/%{name}.png
+%{_datadir}/icons/locolor/32x32/apps/%{name}.png
+%{_datadir}/locale/fr/LC_MESSAGES/%{name}.mo
+
 %changelog

+* Sun Apr 27 2003 Jason Wood <jasonwood@blueyonder.co.uk> 0.2.2-1mdk
+- First stab at an RPM package.
+- This is taken from kdenlive-0.2.2 source package.