diff options
Diffstat (limited to 'multimedia/libvpx')
| -rw-r--r-- | multimedia/libvpx/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/libvpx/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libvpx/files/patch-build_make_configure.sh | 43 | ||||
| -rw-r--r-- | multimedia/libvpx/files/patch-configure | 4 | ||||
| -rw-r--r-- | multimedia/libvpx/files/patch-nestegg_halloc_src | 31 | ||||
| -rw-r--r-- | multimedia/libvpx/pkg-plist | 12 |
6 files changed, 25 insertions, 72 deletions
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile index fb51d57c11fc..302556cfc9b1 100644 --- a/multimedia/libvpx/Makefile +++ b/multimedia/libvpx/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libvpx -PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= multimedia MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${DISTVERSION}.orig diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo index 6fe268345525..732957b50b60 100644 --- a/multimedia/libvpx/distinfo +++ b/multimedia/libvpx/distinfo @@ -1,2 +1,2 @@ -SHA256 (libvpx_1.3.0.orig.tar.bz2) = bd5af97b74d53a111b48852dfcd1791b2c758f1fe972833b363fe34a83a7750a -SIZE (libvpx_1.3.0.orig.tar.bz2) = 2077846 +SHA256 (libvpx_1.4.0.orig.tar.bz2) = f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4 +SIZE (libvpx_1.4.0.orig.tar.bz2) = 1807989 diff --git a/multimedia/libvpx/files/patch-build_make_configure.sh b/multimedia/libvpx/files/patch-build_make_configure.sh index 3744618cef45..6f6705559b47 100644 --- a/multimedia/libvpx/files/patch-build_make_configure.sh +++ b/multimedia/libvpx/files/patch-build_make_configure.sh @@ -1,31 +1,18 @@ ---- build/make/configure.sh.orig 2014-11-27 18:00:48 UTC +--- build/make/configure.sh.orig 2015-04-03 18:49:19 UTC +++ build/make/configure.sh -@@ -799,7 +799,6 @@ process_common_toolchain() { +@@ -379,6 +379,7 @@ write_common_config_banner() { + print_webm_license config.mk "##" "" + echo '# This file automatically generated by configure. Do not edit!' >> config.mk + echo "TOOLCHAIN := ${toolchain}" >> config.mk ++ echo "CLANG_NO_IAS=${CLANG_NO_IAS}" >> config.mk - case ${tgt_cc} in - gcc) -- CROSS=${CROSS:-arm-none-linux-gnueabi-} - link_with_cc=gcc - setup_gnu_toolchain - arch_int=${tgt_isa##armv} -$FreeBSD$ - ---- build/make/configure.sh.orig 2014-12-03 18:11:14.000000000 +0100 -+++ build/make/configure.sh 2014-12-03 20:20:00.000000000 +0100 -@@ -382,6 +382,7 @@ - print_webm_license config.mk "##" "" - echo '# This file automatically generated by configure. Do not edit!' >> config.mk - echo "TOOLCHAIN := ${toolchain}" >> config.mk -+ echo "CLANG_NO_IAS=${CLANG_NO_IAS}" >> config.mk + case ${toolchain} in + *-linux-rvct) +@@ -831,7 +832,6 @@ process_common_toolchain() { - case ${toolchain} in - *-linux-rvct) -@@ -1019,7 +1019,7 @@ EOF - bits=32 - enabled x86_64 && bits=64 - check_cpp <<EOF && bits=x32 --#ifndef __ILP32__ -+#if !defined(__ILP32__) || !defined(__x86_64__) - #error "not x32" - #endif - EOF + case ${tgt_cc} in + gcc) +- CROSS=${CROSS:-arm-none-linux-gnueabi-} + link_with_cc=gcc + setup_gnu_toolchain + arch_int=${tgt_isa##armv} diff --git a/multimedia/libvpx/files/patch-configure b/multimedia/libvpx/files/patch-configure index ee19d6047367..778cf700f478 100644 --- a/multimedia/libvpx/files/patch-configure +++ b/multimedia/libvpx/files/patch-configure @@ -1,9 +1,9 @@ --- configure.orig +++ configure -@@ -149,6 +149,7 @@ - all_platforms="${all_platforms} universal-darwin11-gcc" +@@ -164,6 +164,7 @@ all_platforms="${all_platforms} universa all_platforms="${all_platforms} universal-darwin12-gcc" all_platforms="${all_platforms} universal-darwin13-gcc" + all_platforms="${all_platforms} universal-darwin14-gcc" +all_platforms="${all_platforms} ia64-linux-gcc" all_platforms="${all_platforms} generic-gnu" diff --git a/multimedia/libvpx/files/patch-nestegg_halloc_src b/multimedia/libvpx/files/patch-nestegg_halloc_src deleted file mode 100644 index cfe19e7c7e36..000000000000 --- a/multimedia/libvpx/files/patch-nestegg_halloc_src +++ /dev/null @@ -1,31 +0,0 @@ - -$FreeBSD$ - -Fix build on modern gcc which defines max_align_t for C11 -It renames the locale definition to avoid the name clash. - ---- nestegg/halloc/src/align.h.orig -+++ nestegg/halloc/src/align.h -@@ -30,7 +30,7 @@ - void (*q)(void); - }; - --typedef union max_align max_align_t; -+typedef union max_align halloc_max_align_t; - - #endif - - -$FreeBSD$ - ---- nestegg/halloc/src/halloc.c.orig -+++ nestegg/halloc/src/halloc.c -@@ -30,7 +30,7 @@ - #endif - hlist_item_t siblings; /* 2 pointers */ - hlist_head_t children; /* 1 pointer */ -- max_align_t data[1]; /* not allocated, see below */ -+ halloc_max_align_t data[1]; /* not allocated, see below */ - - } hblock_t; - diff --git a/multimedia/libvpx/pkg-plist b/multimedia/libvpx/pkg-plist index cff948dfe8fa..099df59fd64a 100644 --- a/multimedia/libvpx/pkg-plist +++ b/multimedia/libvpx/pkg-plist @@ -1,19 +1,17 @@ bin/vpxdec bin/vpxenc -bin/vp8_scalable_patterns -bin/vp9_spatial_scalable_encoder -include/vpx/svc_context.h include/vpx/vp8.h include/vpx/vp8cx.h include/vpx/vp8dx.h include/vpx/vpx_codec.h include/vpx/vpx_decoder.h include/vpx/vpx_encoder.h +include/vpx/vpx_frame_buffer.h include/vpx/vpx_image.h include/vpx/vpx_integer.h lib/libvpx.a -libdata/pkgconfig/vpx.pc %%SHARED%%lib/libvpx.so -%%SHARED%%lib/libvpx.so.1 -%%SHARED%%lib/libvpx.so.1.3 -%%SHARED%%lib/libvpx.so.1.3.0 +%%SHARED%%lib/libvpx.so.2 +%%SHARED%%lib/libvpx.so.2.0 +%%SHARED%%lib/libvpx.so.2.0.0 +libdata/pkgconfig/vpx.pc |