Attachment 117184 Details for Bug 159249 – a.diff

[patch] a.diff

a.diff (text/plain), 4.89 KB, created by Test Rat on 2011-07-28 08:40:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Test Rat

Created: 2011-07-28 08:40:11 UTC

Size: 4.89 KB

patch

obsolete

>Index: multimedia/libva/Makefile
>===================================================================
>RCS file: /a/.cvsup/ports/multimedia/libva/Makefile,v
>retrieving revision 1.6
>diff -u -p -r1.6 Makefile
>--- multimedia/libva/Makefile	16 Jul 2011 05:37:50 -0000	1.6
>+++ multimedia/libva/Makefile	28 Jul 2011 06:58:20 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	libva
>-PORTVERSION=	1.0.13
>+PORTVERSION=	1.0.14
> CATEGORIES=	multimedia
> MASTER_SITES=	http://cgit.freedesktop.org/${PORTNAME}/snapshot/
> 
>@@ -27,7 +27,6 @@ ACLOCAL_ARGS=	-I.
> AUTOMAKE_ARGS=	--add-missing
> CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
> CONFIGURE_ARGS=	--program-prefix=va
>-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
> USE_LDCONFIG=	yes
> 
> CPPFLAGS+=	-isystem${LOCALBASE}/include
>@@ -43,7 +42,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-
> .endif
> 
> .if ${ARCH} == "sparc64"
>-BROKEN=		Does not install on sparc64
>+BROKEN=		glXCreateContext fails during configure
> .endif
> 
> .if !defined(WITH_DEBUG)
>@@ -64,4 +63,9 @@ post-patch:	.SILENT
> 		${WRKSRC}/test/vainfo/Makefile.am
> 	${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am
> 
>+post-configure:	.SILENT
>+	${REINPLACE_CMD} 's/-lpthread/${PTHREAD_LIBS}/' \
>+		${WRKSRC}/i965_drv_video/Makefile \
>+		${WRKSRC}/test/putsurface/Makefile
>+
> .include <bsd.port.post.mk>
>Index: multimedia/libva/distinfo
>===================================================================
>RCS file: /a/.cvsup/ports/multimedia/libva/distinfo,v
>retrieving revision 1.3
>diff -u -p -r1.3 distinfo
>--- multimedia/libva/distinfo	17 Jun 2011 13:48:08 -0000	1.3
>+++ multimedia/libva/distinfo	28 Jul 2011 06:24:56 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (libva-1.0.13.tar.bz2) = 4e192c1704e9b571dfcb1073d4ead6a2ccab81cc62e2a3759cad4338609d835b
>-SIZE (libva-1.0.13.tar.bz2) = 486709
>+SHA256 (libva-1.0.14.tar.bz2) = b15ab93b549651a07664ced831b20e559e0f7edabb57169af8049b3e761ea764
>+SIZE (libva-1.0.14.tar.bz2) = 769706
>Index: multimedia/libva/pkg-plist
>===================================================================
>RCS file: /a/.cvsup/ports/multimedia/libva/pkg-plist,v
>retrieving revision 1.3
>diff -u -p -r1.3 pkg-plist
>--- multimedia/libva/pkg-plist	17 Jun 2011 13:48:08 -0000	1.3
>+++ multimedia/libva/pkg-plist	28 Jul 2011 06:28:35 -0000
>@@ -3,17 +3,6 @@ bin/vah264encode
> bin/vainfo
> bin/vampeg2vldemo
> bin/vaputsurface
>-bin/vatest_01
>-bin/vatest_02
>-bin/vatest_03
>-bin/vatest_04
>-bin/vatest_05
>-bin/vatest_06
>-bin/vatest_07
>-bin/vatest_08
>-bin/vatest_09
>-bin/vatest_10
>-bin/vatest_11
> include/va/va.h
> include/va/va_backend.h
> include/va/va_backend_egl.h
>Index: multimedia/libva/files/patch-i965_drv_video-Makefile.am
>===================================================================
>RCS file: multimedia/libva/files/patch-i965_drv_video-Makefile.am
>diff -N multimedia/libva/files/patch-i965_drv_video-Makefile.am
>--- multimedia/libva/files/patch-i965_drv_video-Makefile.am	17 Jun 2011 13:48:08 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,13 +0,0 @@
>---- i965_drv_video/Makefile.am~
>-+++ i965_drv_video/Makefile.am
>-@@ -26,8 +26,8 @@ AM_CFLAGS = -Wall -I$(top_srcdir) -I$(to
>- 
>- i965_drv_video_la_LTLIBRARIES = i965_drv_video.la
>- 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_LIBS)
>-+i965_drv_video_la_LIBADD = ../va/libva-x11.la
>- 
>- i965_drv_video_la_SOURCES =	\
>- 	object_heap.c		\
>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
>--- multimedia/libva/files/patch-test-encode-h264encode_x11.c	17 Jun 2011 13:48:08 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- 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: multimedia/libva/files/patch-test-putsurface-Makefile.am
>diff -N multimedia/libva/files/patch-test-putsurface-Makefile.am
>--- multimedia/libva/files/patch-test-putsurface-Makefile.am	17 Jun 2011 13:48:08 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,13 +0,0 @@
>---- test/putsurface/Makefile.am~
>-+++ test/putsurface/Makefile.am
>-@@ -23,8 +23,9 @@
>- bin_PROGRAMS = putsurface
>- 
>- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
>-+AM_LDFLAGS = $(PTHREAD_LIBS)
>- 
>--TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
>-+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
>- 
>- putsurface_LDADD = $(TEST_LIBS)
>- putsurface_SOURCES = putsurface.c

Actions: View | Diff

Attachments on bug 159249: 117184