From owner-freebsd-multimedia@FreeBSD.ORG Thu Jul 4 18:13:30 2013 Return-Path: Delivered-To: multimedia@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0015F749; Thu, 4 Jul 2013 18:13:29 +0000 (UTC) (envelope-from nox@jelal.kn-bremen.de) Received: from smtp.kn-bremen.de (gelbbaer.kn-bremen.de [78.46.108.116]) by mx1.freebsd.org (Postfix) with ESMTP id 89C47173D; Thu, 4 Jul 2013 18:13:28 +0000 (UTC) Received: by smtp.kn-bremen.de (Postfix, from userid 10) id C02851E007B3; Thu, 4 Jul 2013 20:13:21 +0200 (CEST) Received: from triton8.kn-bremen.de (noident@localhost [127.0.0.1]) by triton8.kn-bremen.de (8.14.5/8.14.4) with ESMTP id r64IA3cT023835; Thu, 4 Jul 2013 20:10:03 +0200 (CEST) (envelope-from nox@triton8.kn-bremen.de) Received: (from nox@localhost) by triton8.kn-bremen.de (8.14.5/8.14.3/Submit) id r64IA3Sa023834; Thu, 4 Jul 2013 20:10:03 +0200 (CEST) (envelope-from nox) Date: Thu, 4 Jul 2013 20:10:03 +0200 (CEST) From: Juergen Lock Message-Id: <201307041810.r64IA3Sa023834@triton8.kn-bremen.de> To: madpilot@FreeBSD.org Subject: Re: Fixes for vlc and gnash after libva upgrade X-Newsgroups: local.list.freebsd.multimedia In-Reply-To: <51CE08AC.6090706@FreeBSD.org> Organization: Cc: dinoex@FreeBSD.org, multimedia@FreeBSD.org X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jul 2013 18:13:30 -0000 In article <51CE08AC.6090706@FreeBSD.org> you write: >Hi! Hi! > >I'm the maintainer of the multimedia/libva port. > >I updated it yesterday but there IS an API breakage in the new version I >noticed too late. > >Sorry for the mistake! > >After some work I narrowed down the breakage to these two ports, when >the LIBVA option is turned on (by default in gnash). > >Here's a patch attached which fixes the problem. > >ABI compatibility should not be compromised and was not in my tests with >vlc, since libva has code to maintain that. > >I'd like to get approval to commit these two in one go. > >Thanks in advance, and again sorry for the breakage! Hmm according to http://www.freebsd.org/cgi/query-pr.cgi?pr=180118 (which mentions http://cgit.freedesktop.org/libva/commit/?id=824a70ae1ef79458e65079374209a0cb16b65c31 ) vaCreateSurfaces args have been shuffled around too, not only two new ones added. Can you confirm? Other than that I think yes this should go in... Thanx, Juergen > >-- >Guido Falsi > >--------------000204050607010204090802 >Content-Type: text/x-patch; > name="libva-fix.diff" >Content-Transfer-Encoding: 7bit >Content-Disposition: attachment; > filename="libva-fix.diff" > >Index: graphics/gnash/Makefile >=================================================================== >--- graphics/gnash/Makefile (revision 321990) >+++ graphics/gnash/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= gnash > PORTVERSION= 0.8.10 >-PORTREVISION= 5 >+PORTREVISION= 6 > CATEGORIES= graphics > MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/ > >Index: graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp >=================================================================== >--- graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp (revision 0) >+++ graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp (working copy) >@@ -0,0 +1,11 @@ >+--- libdevice/vaapi/VaapiSurface.cpp.orig 2012-01-19 20:17:48.000000000 +0100 >++++ libdevice/vaapi/VaapiSurface.cpp 2013-06-28 15:47:31.190987198 +0200 >+@@ -63,7 +63,7 @@ >+ VASurfaceID surface_id; >+ status = vaCreateSurfaces(gvactx->display(), >+ width, height, VA_RT_FORMAT_YUV420, >+- 1, &surface_id); >++ 1, &surface_id, NULL, 0); >+ if (!vaapi_check_status(status, "vaCreateSurfaces()")) { >+ return; >+ } > >Property changes on: graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: multimedia/vlc/files/patch-modules-codec-avcodec-vaapi.c >=================================================================== >--- multimedia/vlc/files/patch-modules-codec-avcodec-vaapi.c (revision 0) >+++ multimedia/vlc/files/patch-modules-codec-avcodec-vaapi.c (working copy) >@@ -0,0 +1,11 @@ >+--- modules/codec/avcodec/vaapi.c.orig 2013-01-22 10:51:40.000000000 +0100 >++++ modules/codec/avcodec/vaapi.c 2013-06-28 15:09:40.898143870 +0200 >+@@ -247,7 +247,7 @@ >+ /* Create surfaces */ >+ VASurfaceID pi_surface_id[p_va->i_surface_count]; >+ if( vaCreateSurfaces( p_va->p_display, i_width, i_height, VA_RT_FORMAT_YUV420, >+- p_va->i_surface_count, pi_surface_id ) ) >++ p_va->i_surface_count, pi_surface_id, NULL, 0 ) ) >+ { >+ for( int i = 0; i < p_va->i_surface_count; i++ ) >+ p_va->p_surface[i].i_id = VA_INVALID_SURFACE; > >Property changes on: multimedia/vlc/files/patch-modules-codec-avcodec-vaapi.c >___________________________________________________________________ >[...]