mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

- Update to 1.0.13

Browse Source 
- 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)

PR:		ports/156176
Submitted by:	Pan Tsu <inyaoo@gmail.com>
Approved by:	maintainer timeout (>2 months)
This commit is contained in:
Bernhard Froehlich 2011-06-17 13:48:08 +00:00
parent c79631b6ee
commit f7179d7a6e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=275725
7 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
multimedia/libva/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= libva
PORTVERSION= 1.0.10
PORTVERSION= 1.0.13
CATEGORIES= multimedia
MASTER_SITES= http://cgit.freedesktop.org/${PORTNAME}/snapshot/
@ -20,13 +20,14 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
USE_XORG= xext xfixes
USE_XORG= pciaccess xext xfixes
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>

4
multimedia/libva/distinfo
View File

@ -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

2
multimedia/libva/files/patch-i965_drv_video-Makefile.am
View File

@ -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 = \

20
multimedia/libva/files/patch-test-encode-h264encode.c
View File

@ -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 {

11
multimedia/libva/files/patch-test-encode-h264encode_x11.c Normal file
View File

@ -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"

2
multimedia/libva/files/patch-test-putsurface-Makefile.am
View File

@ -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)

1
multimedia/libva/pkg-plist
View File

@ -1,3 +1,4 @@
bin/vaavcenc
bin/vah264encode
bin/vainfo
bin/vampeg2vldemo