Hello community, here is the log from the commit of package libmlt for openSUSE:Factory checked in at 2012-08-27 16:15: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-08-13 14:45:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmlt.new/libmlt.changes 2012-08-27 16:15:11.000000000 +0200 @@ -1,0 +2,15 @@ +Sat Aug 25 14:33:18 UTC 2012 - reddwarf@opensuse.org + +- Make python-mlt require at least the same version of libmlt++ + +------------------------------------------------------------------- +Fri Aug 17 14:09:45 UTC 2012 - reddwarf@opensuse.org + +- Make vdpau support work without the need of the devel package + +------------------------------------------------------------------- +Thu Aug 16 12:27:53 UTC 2012 - reddwarf@opensuse.org + +- Package module specific data in the -modules subpackage + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmlt.spec ++++++ --- /var/tmp/diff_new_pack.wx0TST/_old 2012-08-27 16:15:16.000000000 +0200 +++ /var/tmp/diff_new_pack.wx0TST/_new 2012-08-27 16:15:16.000000000 +0200 @@ -145,10 +145,11 @@ Group: Productivity/Multimedia/Video/Editors and Convertors Requires: %{_bindir}/melt Requires: %{libname}%{soname} = %{version} -Requires: %{libname}%{soname}-data Recommends: frei0r-plugins %if %{with ffmpeg} Provides: mlt(%{soname})(avformat) +# I would recommend it, but to the best of my knowledge nobody but nvidia provides a backend +Suggests: %(rpm -qf $(readlink -e %{_libdir}/libvdpau.so) --qf '%{NAME}') %endif %description -n %{libname}%{soname}-modules @@ -176,7 +177,8 @@ Group: Development/Languages/Python BuildRequires: python-devel BuildRequires: swig -Requires: %{libname}%{soname} = %{version} +Requires: %{libname_pp}%{soname_pp} >= %{version} +Requires: %{libname}%{soname} >= %{version} %{py_requires} Provides: python-%{_name}%{soname} @@ -189,6 +191,11 @@ %patch1 %patch2 +# To complement libmlt-0.8.0-vdpau.patch. +# When vdpau support is not compiled it will break the code. Doesn't matter because the code will not be used anyway. +VDPAU_SONAME=$(objdump -p $(readlink -e %{_libdir}/libvdpau.so) | grep SONAME | sed 's/.*SONAME.* //' | tr -d '\n') +sed "s/__VDPAU_SONAME__/${VDPAU_SONAME}/" -i src/modules/avformat/vdpau.c + %build %configure --enable-gpl --enable-gpl3 \ %ifarch i586 @@ -206,6 +213,22 @@ 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' +# Get the modules that need data +for MODULE in %{buildroot}%{_libdir}/mlt-%{soname}/libmlt*.so; do + echo $MODULE + MODULEDIR=%{_datadir}/mlt-%{soname}/$(echo $MODULE | sed 's|%{buildroot}%{_libdir}/mlt-%{soname}/libmlt\(.*\).so|\1|') + echo $MODULEDIR + if [ -e %{buildroot}$MODULEDIR ]; then + echo Done $MODULEDIR + echo $MODULEDIR >> module_data.dirs + fi; +done + +# Pure data modules +for MODULE in feeds lumas; do + echo %{_datadir}/mlt-%{soname}/$MODULE >> module_data.dirs +done + %post -n %{libname}%{soname} -p /sbin/ldconfig %postun -n %{libname}%{soname} -p /sbin/ldconfig @@ -242,13 +265,17 @@ %attr(0755, root, root) %{_bindir}/melt %{_mandir}/man1/melt.1%{ext_man} -%files -n %{libname}%{soname}-modules +%files -n %{libname}%{soname}-modules -f module_data.dirs %defattr(0644, root, root, 0755) %{_libdir}/%{_name}-%{soname}/ +%dir %{_datadir}/%{_name}-%{soname}/ %files -n %{libname}%{soname}-data %defattr(0644, root, root, 0755) -%{_datadir}/%{_name}-%{soname}/ +%dir %{_datadir}/%{_name}-%{soname}/ +%{_datadir}/%{_name}-%{soname}/metaschema.yaml +%{_datadir}/%{_name}-%{soname}/profiles/ +%{_datadir}/%{_name}-%{soname}/presets/ %files -n python-%{_name} %defattr(0644, root, root, 0755) ++++++ libmlt-0.8.0-vdpau.patch ++++++ --- /var/tmp/diff_new_pack.wx0TST/_old 2012-08-27 16:15:16.000000000 +0200 +++ /var/tmp/diff_new_pack.wx0TST/_new 2012-08-27 16:15:16.000000000 +0200 @@ -11,7 +11,7 @@ - object = dlopen( "/usr/lib/libvdpau.so", flags ); - if ( !object ) - object = dlopen( "/usr/local/lib/libvdpau.so", flags ); -+ object = dlopen( "libvdpau.so", flags ); ++ object = dlopen( "__VDPAU_SONAME__", flags ); if ( object ) vdpau_device_create_x11 = dlsym( object, "vdp_device_create_x11" ); else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org