ports/156176: [patch] multimedia/libva: update to 1.0.12

Sun Jun 12 03:10:14 UTC 2011

The following reply was made to PR ports/156176; it has been noted by GNATS.

From: Pan Tsu <inyaoo at gmail.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/156176: [patch] multimedia/libva: update to 1.0.12
Date: Sun, 12 Jun 2011 07:07:55 +0400

 - bump version to 1.0.13
 - prune CPPFLAGS from CONFIGURE_ENV after ports/153625
 - replace double -pthread substitution with make variable passed from MAKE_ENV
 - remove gcc45 hack: don't pass -Wl,-lc explicitly for -module (gcc46 safe)

 It should still work with current multimedia/vdpau-video port.

 --- a.diff begins here ---
 Index: multimedia/libva/Makefile
 ===================================================================
 RCS file: /a/.cvsup/ports/multimedia/libva/Makefile,v
 retrieving revision 1.4
 diff -u -p -r1.4 Makefile
 --- multimedia/libva/Makefile	11 Mar 2011 12:51:56 -0000	1.4
 +++ multimedia/libva/Makefile	12 Jun 2011 02:53:59 -0000
 @@ -6,7 +6,7 @@
  #

  PORTNAME=	libva
 -PORTVERSION=	1.0.10
 +PORTVERSION=	1.0.13
  CATEGORIES=	multimedia
  MASTER_SITES=	http://cgit.freedesktop.org/${PORTNAME}/snapshot/

 @@ -25,8 +25,9 @@ USE_GL=		gl
  USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
  ACLOCAL_ARGS=	-I.
  AUTOMAKE_ARGS=	--add-missing
 -CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 +CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
  CONFIGURE_ARGS=	--program-prefix=va
 +MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
  USE_LDCONFIG=	yes

  CPPFLAGS+=	-isystem${LOCALBASE}/include
 @@ -58,11 +59,5 @@ post-patch:	.SILENT
  	${REINPLACE_CMD} 's/va\(info\)/\1/' \
  		${WRKSRC}/test/vainfo/Makefile.am
  	${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am
 -	${REINPLACE_CMD} 's/LDFLAGS.*/& -Wl,-lc/' \
 -		${WRKSRC}/dummy_drv_video/Makefile.am \
 -		${WRKSRC}/i965_drv_video/Makefile.am
 -	${REINPLACE_CMD} 's/-pthread/${PTHREAD_LIBS}/' \
 -		${WRKSRC}/i965_drv_video/Makefile.am \
 -		${WRKSRC}/test/putsurface/Makefile.am

  .include <bsd.port.post.mk>
 Index: multimedia/libva/distinfo
 ===================================================================
 RCS file: /a/.cvsup/ports/multimedia/libva/distinfo,v
 retrieving revision 1.2
 diff -u -p -r1.2 distinfo
 --- multimedia/libva/distinfo	9 Mar 2011 16:49:36 -0000	1.2
 +++ multimedia/libva/distinfo	12 Jun 2011 02:11:40 -0000
 @@ -1,2 +1,2 @@
 -SHA256 (libva-1.0.10.tar.bz2) = 05f757f0043dce9f753d354d15e0cb772b1240cc9d29d26bbb5526285a203693
 -SIZE (libva-1.0.10.tar.bz2) = 459017
 +SHA256 (libva-1.0.13.tar.bz2) = 4e192c1704e9b571dfcb1073d4ead6a2ccab81cc62e2a3759cad4338609d835b
 +SIZE (libva-1.0.13.tar.bz2) = 486709
 Index: multimedia/libva/pkg-plist
 ===================================================================
 RCS file: /a/.cvsup/ports/multimedia/libva/pkg-plist,v
 retrieving revision 1.2
 diff -u -p -r1.2 pkg-plist
 --- multimedia/libva/pkg-plist	9 Mar 2011 16:49:36 -0000	1.2
 +++ multimedia/libva/pkg-plist	12 Jun 2011 02:13:21 -0000
 @@ -1,3 +1,4 @@
 +bin/vaavcenc
  bin/vah264encode
  bin/vainfo
  bin/vampeg2vldemo
 Index: multimedia/libva/files/patch-i965_drv_video-Makefile.am
 ===================================================================
 RCS file: /a/.cvsup/ports/multimedia/libva/files/patch-i965_drv_video-Makefile.am,v
 retrieving revision 1.1
 diff -u -p -r1.1 patch-i965_drv_video-Makefile.am
 --- multimedia/libva/files/patch-i965_drv_video-Makefile.am	13 Jan 2011 11:02:02 -0000	1.1
 +++ multimedia/libva/files/patch-i965_drv_video-Makefile.am	12 Jun 2011 02:45:02 -0000
 @@ -6,7 +6,7 @@
   i965_drv_video_ladir = @LIBVA_DRIVERS_PATH@
  -i965_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined @DRM_LIBS@ -ldrm_intel
  -i965_drv_video_la_LIBADD = ../va/libva-x11.la -lpthread
 -+i965_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined @DRM_LIBS@ -ldrm_intel -pthread
 ++i965_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined @DRM_LIBS@ -ldrm_intel $(PTHREAD_LIBS)
  +i965_drv_video_la_LIBADD = ../va/libva-x11.la

   i965_drv_video_la_SOURCES =	\
 Index: multimedia/libva/files/patch-test-encode-h264encode.c
 ===================================================================
 RCS file: multimedia/libva/files/patch-test-encode-h264encode.c
 diff -N multimedia/libva/files/patch-test-encode-h264encode.c
 --- multimedia/libva/files/patch-test-encode-h264encode.c	9 Mar 2011 16:49:36 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,20 +0,0 @@
 ---- test/encode/h264encode.c~
 -+++ test/encode/h264encode.c
 -@@ -144,7 +144,7 @@ static int save_coded_buf(VABufferID cod
 -         printf("(SKipped)");
 -     printf("                                    ");
 - 
 --    return;
 -+    return 0;
 - }
 - 
 - 
 -@@ -188,7 +188,7 @@ static int display_surface(int frame_id,
 -         }	
 -     }	
 - 
 --    return;
 -+    return 0;
 - }
 - 
 - enum {
 Index: multimedia/libva/files/patch-test-encode-h264encode_x11.c
 ===================================================================
 RCS file: multimedia/libva/files/patch-test-encode-h264encode_x11.c
 diff -N multimedia/libva/files/patch-test-encode-h264encode_x11.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ multimedia/libva/files/patch-test-encode-h264encode_x11.c	12 Jun 2011 02:33:06 -0000
 @@ -0,0 +1,11 @@
 +--- test/encode/h264encode_x11.c~
 ++++ test/encode/h264encode_x11.c
 +@@ -93,7 +93,7 @@ static int display_surface(int frame_id,
 +         }	
 +     }	
 + 
 +-    return;
 ++    return 0;
 + }
 + 
 + #include "h264encode_common.c"
 Index: multimedia/libva/files/patch-test-putsurface-Makefile.am
 ===================================================================
 RCS file: /a/.cvsup/ports/multimedia/libva/files/patch-test-putsurface-Makefile.am,v
 retrieving revision 1.2
 diff -u -p -r1.2 patch-test-putsurface-Makefile.am
 --- multimedia/libva/files/patch-test-putsurface-Makefile.am	15 Jan 2011 22:30:26 -0000	1.2
 +++ multimedia/libva/files/patch-test-putsurface-Makefile.am	12 Jun 2011 02:43:34 -0000
 @@ -4,7 +4,7 @@
   bin_PROGRAMS = putsurface

   AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
 -+AM_LDFLAGS = -pthread
 ++AM_LDFLAGS = $(PTHREAD_LIBS)

  -TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
  +TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
 --- a.diff ends here ---