commit libmlt.791 for openSUSE:12.2:Update

5 Sep 2012

Hello community,

here is the log from the commit of package libmlt.791 for openSUSE:12.2:Update checked in at 2012-09-05 11:15:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/libmlt.791 (Old)
 and      /work/SRC/openSUSE:12.2:Update/.libmlt.791.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libmlt.791", Maintainer is ""

Changes:
--------
New Changes file:

--- /dev/null	2012-08-23 02:41:28.555381587 +0200
+++ /work/SRC/openSUSE:12.2:Update/.libmlt.791.new/libmlt.changes	2012-09-05 11:15:30.000000000 +0200
@@ -0,0 +1,33 @@
+-------------------------------------------------------------------
+Thu Aug 16 13:16:57 UTC 2012 - reddwarf@opensuse.org
+
+- Package module specific data in the -modules subpackage (bnc#776168)
+- Add modules and data directories as variables in the .pc file (bnc#776168)
+- Version modules and data directories (bnc#776168)
+- Put the full python module in %python_sitearch
+- Added "mlt(%{soname})(avformat)" and "python-%{_name}%{soname}"
+  provides to help apps select the versions they needs (bnc#776168)
+- Compile the python binding with %{optflags}, getting debug
+  information on the way.
+- Fix VDPAU support 
+
+-------------------------------------------------------------------
+Tue Mar 27 12:25:23 UTC 2012 - idonmez@suse.com
+
+- Set license to GPLv3 for discussion in bnc#753622 
+
+-------------------------------------------------------------------
+Sat Mar 10 13:29:19 UTC 2012 - idonmez@suse.com
+
+- Drop swfdec dependency, swfdec is not maintained. 
+
+-------------------------------------------------------------------
+Thu Feb 23 12:22:47 UTC 2012 - reddwarf@opensuse.org
+
+- Update to 0.7.8
+
+-------------------------------------------------------------------
+Sun Jan  2 07:53:01 UTC 2011 - reddwarf@opensuse.org
+
+- Initial package
+

New:
----
  LICENSE.GPL3
  libmlt-0.8.0-optflags.patch
  libmlt-0.8.0-vdpau.patch
  libmlt-0.8.0-versioned_dirs.patch
  libmlt.changes
  libmlt.spec
  mlt-0.7.8.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libmlt.spec ++++++
#
# spec file for package libmlt
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


%bcond_with ffmpeg

%define _name mlt
%define libname lib%{_name}
%define soname 4

%define _name_pp %{_name}++
%define libname_pp lib%{_name_pp}
%define soname_pp 3

Name:           %{libname}
Version:        0.7.8
Release:        0
Summary:        Multimedia framework designed and developed for television broadcasting
License:        GPL-3.0+
Group:          System/Libraries
Url:            http://%{_name}.sourceforge.net/
Source0:        http://downloads.sourceforge.net/project/%{_name}/%{_name}/%{_name}-%{version}.tar.gz
# See bnc#753622 and http://sourceforge.net/mailarchive/forum.php?thread_name=CAJR5sYg76gcz5abiRue%3D1%2Bm%2BPDod6vTnv3Ur3V4Z6CKj-_t%3DyA%40mail.gmail.com&forum_name=mlt-devel
Source1:        LICENSE.GPL3
# PATCH-FIX-UPSTREAM libmlt-0.8.0-optflags.patch sf#3554425 reddwarf@opensuse.org -- Build the python binding with %{optflags}
Patch0:         libmlt-0.8.0-optflags.patch
# PATCH-FIX-UPSTREAM libmlt-0.8.0-vdpau.patch http://permalink.gmane.org/gmane.comp.video.mlt.devel/2392 reddwarf@opensuse.org -- Fix build with VDPAU support
Patch1:         libmlt-0.8.0-vdpau.patch
# PATCH-FIX-UPSTREAM libmlt-0.8.0-vdpau.patch sf#3555214 reddwarf@opensuse.org -- Install modules and data in versioned directories
Patch2:         libmlt-0.8.0-versioned_dirs.patch
BuildRequires:  gcc-c++
BuildRequires:  ladspa-devel
BuildRequires:  pkg-config
BuildRequires:  pkgconfig(QtCore)
BuildRequires:  pkgconfig(QtGui)
BuildRequires:  pkgconfig(QtSvg)
BuildRequires:  pkgconfig(QtXml)
BuildRequires:  pkgconfig(frei0r)
BuildRequires:  pkgconfig(gdk-2.0)
BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
BuildRequires:  pkgconfig(glib-2.0)
BuildRequires:  pkgconfig(gobject-2.0)
BuildRequires:  pkgconfig(jack)
BuildRequires:  pkgconfig(libdv)
BuildRequires:  pkgconfig(libquicktime)
BuildRequires:  pkgconfig(libxml-2.0)
BuildRequires:  pkgconfig(pango)
BuildRequires:  pkgconfig(pangoft2)
BuildRequires:  pkgconfig(samplerate)
BuildRequires:  pkgconfig(sdl)
BuildRequires:  pkgconfig(sox)
BuildRequires:  pkgconfig(vorbisfile)
%if %{with ffmpeg}
BuildRequires:  pkgconfig(libavcodec)
BuildRequires:  pkgconfig(libavdevice)
BuildRequires:  pkgconfig(libavformat)
BuildRequires:  pkgconfig(libavutil)
BuildRequires:  pkgconfig(libswscale)
BuildRequires:  pkgconfig(vdpau)
# VDPAU support requires it
BuildRequires:  pkgconfig(x11)
%endif

%description
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 %{libname}%{soname}
Summary:        Multimedia framework designed and developed for television broadcasting
Group:          System/Libraries
Recommends:     %{libname}%{soname}-data
Recommends:     %{libname}%{soname}-modules

%description -n %{libname}%{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 devel
Summary:        Multimedia framework designed and developed for television broadcasting
Group:          Development/Libraries/C and C++
Requires:       %{libname}%{soname} = %{version}

%description devel
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 %{libname_pp}%{soname_pp}
Summary:        Multimedia framework designed and developed for television broadcasting
Group:          System/Libraries

%description -n %{libname_pp}%{soname_pp}
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 %{libname_pp}-devel
Summary:        Multimedia framework designed and developed for television broadcasting
Group:          Development/Libraries/C and C++
Requires:       %{libname_pp}%{soname_pp} = %{version}
Requires:       %{libname}-devel = %{version}

%description -n %{libname_pp}-devel
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

%description -n melt
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 %{libname}%{soname}-modules
Summary:        Multimedia framework designed and developed for television broadcasting
Group:          Productivity/Multimedia/Video/Editors and Convertors
Requires:       %{_bindir}/melt
Requires:       %{libname}%{soname} = %{version}
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
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 %{libname}%{soname}-data
Summary:        Multimedia framework designed and developed for television broadcasting
Group:          Productivity/Multimedia/Video/Editors and Convertors
Requires:       %{libname}%{soname} = %{version}
BuildArch:      noarch

%description -n %{libname}%{soname}-data
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 python-%{_name}
Summary:        Python bindings for MLT
Group:          Development/Languages/Python
BuildRequires:  python-devel
BuildRequires:  swig
Requires:       %{libname}%{soname} = %{version}
%{py_requires}
Provides:       python-%{_name}%{soname}

%description -n python-%{_name}
This package is needed to use MLT from Python.

%prep
%setup -q -n %{_name}-%{version}
%patch0
%patch1
%patch2

cp %{S:1} .

# 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 \
%ifarch i586
--disable-mmx \
%endif
%if %{with ffmpeg}
--avformat-vdpau \
%endif
--swig-languages=python
make %{?_smp_mflags}

%install
%make_install
install -Dpm 0644 docs/melt.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'

# 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

%post -n %{libname_pp}%{soname_pp} -p /sbin/ldconfig

%postun -n %{libname_pp}%{soname_pp} -p /sbin/ldconfig

%files -n %{libname}%{soname}
%defattr(0644, root, root, 0755)
%doc AUTHORS ChangeLog COPYING GPL LICENSE.GPL3 NEWS README
%{_libdir}/lib%{_name}.so.%{soname}
%{_libdir}/lib%{_name}.so.%{version}

%files devel
%defattr(0644, root, root, 0755)
%{_libdir}/lib%{_name}.so
%{_includedir}/%{_name}
%{_libdir}/pkgconfig/%{_name}-framework.pc

%files -n %{libname_pp}%{soname_pp}
%defattr(0644, root, root, 0755)
%{_libdir}/lib%{_name_pp}.so.%{soname_pp}
%{_libdir}/lib%{_name_pp}.so.%{version}

%files -n %{libname_pp}-devel
%defattr(0644, root, root, 0755)
%{_libdir}/lib%{_name_pp}.so
%{_includedir}/%{_name_pp}
%{_libdir}/pkgconfig/%{_name_pp}.pc

%files -n melt
%defattr(0644, root, root, 0755)
%attr(0755, root, root) %{_bindir}/melt
%{_mandir}/man1/melt.1%{ext_man}

%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)
%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)
%{python_sitearch}/_%{_name}.so
%{python_sitearch}/%{_name}.py

%changelog
++++++ LICENSE.GPL3 ++++++
++++ 686 lines (skipped)

++++++ libmlt-0.8.0-optflags.patch ++++++
Index: src/swig/python/build
===================================================================
--- src/swig/python/build.orig
+++ src/swig/python/build
@@ -21,10 +21,10 @@ then
 	swig -c++ -I../../mlt++ -I../.. -python mlt.i || exit $?
 
 	# Compile the wrapper
-	g++ -fPIC -D_GNU_SOURCE -c -rdynamic -pthread -I../.. -I$PYTHON_INCLUDE mlt_wrap.cxx || exit $?
+	g++ -fPIC -D_GNU_SOURCE ${CXXFLAGS} -c -I../.. -I$PYTHON_INCLUDE mlt_wrap.cxx || exit $?
 
 	# Create the module
-	g++ -shared mlt_wrap.o -L../../mlt++ -lmlt++ -L../../framework -lmlt $(python-config --ldflags) -o _mlt.so || exit $?
+	g++ ${CXXFLAGS} -shared mlt_wrap.o -L../../mlt++ -lmlt++ -L../../framework -lmlt $(python-config --ldflags) -o _mlt.so || exit $?
 else
 	echo Python not installed.
 	exit 1
Index: src/swig/Makefile
===================================================================
--- src/swig/Makefile.orig
+++ src/swig/Makefile
@@ -6,7 +6,7 @@ all clean:
 	for subdir in $$list; do \
 		if [ -x $$subdir/build -a ! -f .$$subdir -o $@ = clean ] ; \
 		then echo -n Building $$subdir... ; \
-			cd $$subdir && output=`./build $@ 2>&1` ; \
+			cd $$subdir && output=`CXXFLAGS="$(CXXFLAGS)" ./build $@ 2>&1` ; \
 			if [ $$? -eq 0 ] ; \
 			then echo OK && touch ../.$$subdir ; \
 			else echo $$output && exit 1 ; \
++++++ libmlt-0.8.0-vdpau.patch ++++++
Index: src/modules/avformat/vdpau.c
===================================================================
--- src/modules/avformat/vdpau.c.orig
+++ src/modules/avformat/vdpau.c
@@ -70,11 +70,7 @@ static int vdpau_init( producer_avformat
 	if ( !vdpau_init_done )
 	{
 		int flags = RTLD_NOW;
-		object = dlopen( "/usr/lib64/libvdpau.so", flags );
-		if ( !object )
-			object = dlopen( "/usr/lib/libvdpau.so", flags );
-		if ( !object )
-			object = dlopen( "/usr/local/lib/libvdpau.so", flags );
+		object = dlopen( "__VDPAU_SONAME__", flags );
 		if ( object )
 			vdpau_device_create_x11 = dlsym( object, "vdp_device_create_x11" );
 		else
@@ -152,14 +148,12 @@ static int vdpau_get_buffer( AVCodecCont
 			frame->reordered_opaque = codec_context->reordered_opaque;
 			if ( frame->reference )
 			{
-				frame->age = self->vdpau->ip_age[0];
 				self->vdpau->ip_age[0] = self->vdpau->ip_age[1] + 1;
 				self->vdpau->ip_age[1] = 1;
 				self->vdpau->b_age++;
 			}
 			else
 			{
-				frame->age = self->vdpau->b_age;
 				self->vdpau->ip_age[0] ++;
 				self->vdpau->ip_age[1] ++;
 				self->vdpau->b_age = 1;
++++++ libmlt-0.8.0-versioned_dirs.patch ++++++
++++ 689 lines (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit libmlt.791 for openSUSE:12.2:Update

root＠hilbert.suse.de