Hello community, here is the log from the commit of package libmlt for openSUSE:Factory checked in at 2012-08-05 08:01:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-25 12:34:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmlt.new/libmlt.changes 2012-08-05 08:01:56.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Aug 4 17:26:43 UTC 2012 - [email protected] + +- Compile the python binding with %{optflags}, getting debug + information on the way. +- Fix VDPAU support + +------------------------------------------------------------------- New: ---- libmlt-0.8.0-optflags.patch libmlt-0.8.0-vdpau.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmlt.spec ++++++ --- /var/tmp/diff_new_pack.oX5EgV/_old 2012-08-05 08:01:58.000000000 +0200 +++ /var/tmp/diff_new_pack.oX5EgV/_new 2012-08-05 08:01:58.000000000 +0200 @@ -34,6 +34,10 @@ Group: System/Libraries Url: http://%{_name}.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/%{_name}/%{_name}/%{_name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM libmlt-0.8.0-optflags.patch sf#3554425 [email protected] -- 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 [email protected] -- Fix build with VDPAU support +Patch1: libmlt-0.8.0-vdpau.patch BuildRequires: gcc-c++ BuildRequires: ladspa-devel BuildRequires: pkg-config @@ -62,6 +66,7 @@ BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswscale) +BuildRequires: pkgconfig(vdpau) # VDPAU support requires it BuildRequires: pkgconfig(x11) %endif @@ -174,6 +179,8 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 +%patch1 %build %configure --enable-gpl --enable-gpl3 \ ++++++ 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( "libvdpau.so", 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; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
