diff options
| -rw-r--r-- | multimedia/libva/Makefile | 16 | ||||
| -rw-r--r-- | multimedia/libva/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libva/files/patch-i965_drv_video-Makefile.am | 13 | ||||
| -rw-r--r-- | multimedia/libva/files/patch-test-encode-h264encode_x11.c | 11 | ||||
| -rw-r--r-- | multimedia/libva/files/patch-test-putsurface-Makefile.am | 13 | ||||
| -rw-r--r-- | multimedia/libva/pkg-plist | 11 |
6 files changed, 12 insertions, 56 deletions
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index 97d716ca320e..f2ba5878dccb 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -6,19 +6,19 @@ # PORTNAME= libva -PORTVERSION= 1.0.13 +PORTVERSION= 1.0.14 CATEGORIES= multimedia MASTER_SITES= http://cgit.freedesktop.org/${PORTNAME}/snapshot/ MAINTAINER= swell.k@gmail.com COMMENT= VAAPI wrapper and dummy driver -BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= drm.2:${PORTSDIR}/graphics/libdrm - LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat +LIB_DEPENDS= drm.2:${PORTSDIR}/graphics/libdrm + USE_BZIP2= yes USE_XORG= pciaccess xext xfixes USE_GL= gl @@ -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-va-va_trace.c .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> diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo index 9956f4ac3627..e4c56b41ec65 100644 --- a/multimedia/libva/distinfo +++ b/multimedia/libva/distinfo @@ -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 diff --git a/multimedia/libva/files/patch-i965_drv_video-Makefile.am b/multimedia/libva/files/patch-i965_drv_video-Makefile.am deleted file mode 100644 index 3026e2123068..000000000000 --- a/multimedia/libva/files/patch-i965_drv_video-Makefile.am +++ /dev/null @@ -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 \ diff --git a/multimedia/libva/files/patch-test-encode-h264encode_x11.c b/multimedia/libva/files/patch-test-encode-h264encode_x11.c deleted file mode 100644 index ce4c6e696f05..000000000000 --- a/multimedia/libva/files/patch-test-encode-h264encode_x11.c +++ /dev/null @@ -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" diff --git a/multimedia/libva/files/patch-test-putsurface-Makefile.am b/multimedia/libva/files/patch-test-putsurface-Makefile.am deleted file mode 100644 index 05be22a85587..000000000000 --- a/multimedia/libva/files/patch-test-putsurface-Makefile.am +++ /dev/null @@ -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 diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist index eec732ae718d..d4ef1a4b849f 100644 --- a/multimedia/libva/pkg-plist +++ b/multimedia/libva/pkg-plist @@ -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 |