Hello community,
here is the log from the commit of package libmlt for openSUSE:Factory checked
in at 2012-12-05 13:57:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libmlt (Old)
and /work/SRC/openSUSE:Factory/.libmlt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmlt", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/libmlt/libmlt.changes 2012-11-28
10:59:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libmlt.new/libmlt.changes 2012-12-05
13:57:10.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Nov 30 10:24:00 UTC 2012 - reddw...@opensuse.org
+
+- Make multiple versions of melt parallel installable
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libmlt.spec ++++++
--- /var/tmp/diff_new_pack.Gg4azN/_old 2012-12-05 13:57:11.000000000 +0100
+++ /var/tmp/diff_new_pack.Gg4azN/_new 2012-12-05 13:57:11.000000000 +0100
@@ -127,9 +127,24 @@
The functionality of the system is provided via an assortment of ready to use
tools, XML authoring components, and an extensible plug-in based API.
+%package -n melt%{soname}
+Summary: Multimedia framework designed and developed for television
broadcasting
+Group: Productivity/Multimedia/Video/Editors and Convertors
+Requires: melt
+
+%description -n melt%{soname}
+MLT is an open source multimedia framework, designed and developed for
+television broadcasting. It provides a toolkit for broadcasters, video editors,
+media players, transcoders, web streamers and many more types of applications.
+The functionality of the system is provided via an assortment of ready to use
+tools, XML authoring components, and an extensible plug-in based API.
+
%package -n melt
Summary: Multimedia framework designed and developed for television
broadcasting
Group: Productivity/Multimedia/Video/Editors and Convertors
+Requires: melt%{soname}
+Conflicts: melt > %{version}
+Conflicts: melt < %{version}
%description -n melt
MLT is an open source multimedia framework, designed and developed for
@@ -212,7 +227,8 @@
%install
%make_install
-install -Dpm 0644 docs/melt.1 '%{buildroot}%{_mandir}/man1/melt.1'
+install -Dpm 0644 docs/melt.1 %{buildroot}%{_mandir}/man1/melt%{soname}.1
+ln -s melt%{soname}.1 %{buildroot}%{_mandir}/man1/melt.1
install -Dpm 0644 src/swig/python/_%{_name}.so
'%{buildroot}%{python_sitearch}/_%{_name}.so'
install -Dpm 0644 src/swig/python/%{_name}.py
'%{buildroot}%{python_sitearch}/%{_name}.py'
@@ -232,6 +248,12 @@
echo %{_datadir}/mlt-%{soname}/$MODULE >> module_data.dirs
done
+# kdenlive links directly to libmlt, but then uses melt to do the rendering. If
+# the melt binary is linked against a different libmlt with a different formats
+# support things can get confusing.
+mv %{buildroot}/%{_bindir}/melt %{buildroot}/%{_bindir}/melt%{soname}
+ln -s melt%{soname} %{buildroot}/%{_bindir}/melt
+
%post -n %{libname}%{soname} -p /sbin/ldconfig
%postun -n %{libname}%{soname} -p /sbin/ldconfig
@@ -263,6 +285,11 @@
%{_includedir}/%{_name_pp}
%{_libdir}/pkgconfig/%{_name_pp}.pc
+%files -n melt%{soname}
+%defattr(0644, root, root, 0755)
+%attr(0755, root, root) %{_bindir}/melt%{soname}
+%{_mandir}/man1/melt%{soname}.1%{ext_man}
+
%files -n melt
%defattr(0644, root, root, 0755)
%attr(0755, root, root) %{_bindir}/melt
++++++ libmlt-0.8.0-versioned_dirs.patch ++++++
--- /var/tmp/diff_new_pack.Gg4azN/_old 2012-12-05 13:57:11.000000000 +0100
+++ /var/tmp/diff_new_pack.Gg4azN/_new 2012-12-05 13:57:11.000000000 +0100
@@ -11,16 +11,17 @@
) > config.mak
echo "#!/bin/sh" > mlt-config
-@@ -155,6 +157,8 @@ build_pkgconfig()
+@@ -155,6 +157,9 @@ build_pkgconfig()
echo version=$version
echo cflags=`grep ^framework packages.dat | cut -f 2`
echo libs=`grep ^framework packages.dat | cut -f 3`
+ echo moduledir=${libdir}/mlt-${soversion}
+ echo mltdatadir=${datadir}/mlt-${soversion}
++ echo meltbin=${prefix}/bin/melt${soversion}
) >> mlt-framework.pc
cat mlt-framework.pc.in >>mlt-framework.pc
-@@ -250,6 +254,9 @@ export LIBSUF
+@@ -253,6 +258,9 @@ export LIBSUF
[ "$datadir" = "" ] && datadir=$prefix/share
[ "$mandir" = "" ] && mandir=$prefix/share/man
@@ -72,7 +73,7 @@
===================================================================
--- src/modules/core/Makefile.orig
+++ src/modules/core/Makefile
-@@ -71,12 +71,12 @@ clean:
+@@ -77,12 +77,12 @@ clean:
rm -f $(OBJS) $(ASM_OBJS) $(TARGET)
install: all
@@ -321,7 +322,7 @@
===================================================================
--- src/modules/normalize/Makefile.orig
+++ src/modules/normalize/Makefile
-@@ -26,9 +26,9 @@ clean:
+@@ -27,9 +27,9 @@ clean:
rm -f $(OBJS) $(TARGET)
install: all
@@ -642,7 +643,7 @@
===================================================================
--- src/framework/Makefile.orig
+++ src/framework/Makefile
-@@ -84,7 +84,7 @@ OBJS += ../win32/win32.o
+@@ -79,7 +79,7 @@ OBJS += ../win32/win32.o
SRCS += ../win32/win32.c
endif
@@ -651,7 +652,7 @@
LDFLAGS += $(LIBDL) -lpthread
-@@ -119,8 +119,8 @@ install:
+@@ -114,8 +114,8 @@ install:
fi
install -d "$(DESTDIR)$(prefix)/include/mlt/framework"
install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/framework"
@@ -662,7 +663,7 @@
uninstall:
rm -f "$(DESTDIR)$(libdir)/$(TARGET)"
-@@ -129,7 +129,7 @@ uninstall:
+@@ -124,7 +124,7 @@ uninstall:
rm -f "$(DESTDIR)$(libdir)/$(NAME)" ; \
fi
rm -rf "$(DESTDIR)$(prefix)/include/mlt/framework"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
