cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to libvpx 1.1.0.

Browse Source 
Also patched to fix operation on strict alignment archs: this fixes
libvpx on alpha/arm/hppa/mips64/sparc/sparc64.

from Brad (maintainer)
This commit is contained in:
ajacoutot 2012-05-22 18:22:50 +00:00
parent 36e724c1eb
commit c323439945
10 changed files with 73 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
multimedia/libvpx/Makefile
View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.8 2012/02/28 12:28:29 dcoppa Exp $
# $OpenBSD: Makefile,v 1.9 2012/05/22 18:22:50 ajacoutot Exp $
COMMENT= Google VP8 video codec
V= 1.0.0
V= 1.1.0
DISTNAME= libvpx-v${V}
PKGNAME= libvpx-${V}
CATEGORIES= multimedia
MASTER_SITES= http://webm.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= vpx 3.0
SHARED_LIBS= vpx 4.0
HOMEPAGE= http://www.webmproject.org/

10
multimedia/libvpx/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libvpx-v1.0.0.tar.bz2) = 2Ye1FAQS7dN9LGsQwprUhA==
RMD160 (libvpx-v1.0.0.tar.bz2) = LuWi5/TLLxJsbQ2aNuhjZFX0KRU=
SHA1 (libvpx-v1.0.0.tar.bz2) = KRnhEHT+9y/GHvGnUWAFD/qtYHQ=
SHA256 (libvpx-v1.0.0.tar.bz2) = B87bChmkTm2B119S7qhk9Z7xDGxyXLhgQxvsZkHq/iE=
SIZE (libvpx-v1.0.0.tar.bz2) = 1641411
MD5 (libvpx-v1.1.0.tar.bz2) = euFjrDGWx57C8JBCgAeKRQ==
RMD160 (libvpx-v1.1.0.tar.bz2) = b0YsFCGlGvd9NAHqTB6vDb6vR5E=
SHA1 (libvpx-v1.1.0.tar.bz2) = NWr193DFDNAhxghjID2PMBZPYCE=
SHA256 (libvpx-v1.1.0.tar.bz2) = nOB0z0s7zZpJ/5PgVIW3HCc7/DaFowXlWg5/pRvrcsU=
SIZE (libvpx-v1.1.0.tar.bz2) = 1653485

8
multimedia/libvpx/patches/patch-build_make_configure_sh
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-build_make_configure_sh,v 1.4 2012/02/28 12:28:29 dcoppa Exp $
--- build/make/configure.sh.orig Fri Jan 27 13:36:39 2012
+++ build/make/configure.sh Sun Jan 29 21:13:12 2012
$OpenBSD: patch-build_make_configure_sh,v 1.5 2012/05/22 18:22:50 ajacoutot Exp $
--- build/make/configure.sh.orig Tue May 8 19:14:00 2012
+++ build/make/configure.sh Wed May 16 17:07:35 2012
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${BASH}
##
## configure.sh
##
@@ -1019,7 +1019,7 @@ EOF
@@ -1082,7 +1082,7 @@ EOF
case ${toolchain} in
*-win*);;
*-android-gcc);;

10
multimedia/libvpx/patches/patch-build_make_gen_asm_deps_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-build_make_gen_asm_deps_sh,v 1.2 2010/10/31 21:05:38 ckuethe Exp $
--- build/make/gen_asm_deps.sh.orig Thu Oct 28 09:14:14 2010
+++ build/make/gen_asm_deps.sh Thu Oct 28 21:59:18 2010
$OpenBSD: patch-build_make_gen_asm_deps_sh,v 1.3 2012/05/22 18:22:50 ajacoutot Exp $
--- build/make/gen_asm_deps.sh.orig Tue May 8 19:14:00 2012
+++ build/make/gen_asm_deps.sh Wed May 16 17:10:06 2012
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${BASH}
@ -11,8 +11,8 @@ $OpenBSD: patch-build_make_gen_asm_deps_sh,v 1.2 2010/10/31 21:05:38 ckuethe Exp
[ -n "$srcfile" ] || show_help
sfx=${sfx:-asm}
-includes=$(egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
+includes=$(egrep -i "include +\"*[a-z0-9_/]+\.${sfx}" $srcfile |
-includes=$(LC_ALL=C egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
+includes=$(LC_ALL=C egrep -i "include +\"*[a-z0-9_/]+\.${sfx}" $srcfile |
perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
#" restore editor state
for inc in ${includes}; do

12
multimedia/libvpx/patches/patch-configure
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-configure,v 1.6 2012/02/28 12:28:29 dcoppa Exp $
--- configure.orig Fri Jan 27 13:36:39 2012
+++ configure Sun Jan 29 21:11:03 2012
$OpenBSD: patch-configure,v 1.7 2012/05/22 18:22:50 ajacoutot Exp $
--- configure.orig Tue May 8 19:14:00 2012
+++ configure Wed May 16 17:07:35 2012
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${BASH}
##
## configure
##
@@ -101,6 +101,7 @@ all_platforms="${all_platforms} ppc32-linux-gcc"
@@ -103,6 +103,7 @@ all_platforms="${all_platforms} ppc32-linux-gcc"
all_platforms="${all_platforms} ppc64-darwin8-gcc"
all_platforms="${all_platforms} ppc64-darwin9-gcc"
all_platforms="${all_platforms} ppc64-linux-gcc"
@ -15,7 +15,7 @@ $OpenBSD: patch-configure,v 1.6 2012/02/28 12:28:29 dcoppa Exp $
all_platforms="${all_platforms} sparc-solaris-gcc"
all_platforms="${all_platforms} x86-darwin8-gcc"
all_platforms="${all_platforms} x86-darwin8-icc"
@@ -136,19 +137,6 @@ for t in ${all_targets}; do
@@ -145,19 +146,6 @@ for t in ${all_targets}; do
[ -f ${source_path}/${t}.mk ] && enable ${t}
done
@ -35,7 +35,7 @@ $OpenBSD: patch-configure,v 1.6 2012/02/28 12:28:29 dcoppa Exp $
# install everything except the sources, by default. sources will have
# to be enabled when doing dist builds, since that's no longer a common
# case.
@@ -433,12 +421,6 @@ EOF
@@ -449,12 +437,6 @@ EOF
}
process_detect() {

8
multimedia/libvpx/patches/patch-examples_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-examples_mk,v 1.1 2012/02/28 12:28:29 dcoppa Exp $
--- examples.mk.orig Thu Feb 23 10:30:34 2012
+++ examples.mk Thu Feb 23 10:31:11 2012
@@ -178,7 +178,7 @@ BINS-$(NOT_MSVS) += $(addprefix $(BUILD_PFX)
$OpenBSD: patch-examples_mk,v 1.2 2012/05/22 18:22:50 ajacoutot Exp $
--- examples.mk.orig Tue May 8 19:14:00 2012
+++ examples.mk Wed May 16 17:07:35 2012
@@ -179,7 +179,7 @@ BINS-$(NOT_MSVS) += $(addprefix $(BUILD_PFX)
# Instantiate linker template for all examples.
CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx)

12
multimedia/libvpx/patches/patch-libs_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libs_mk,v 1.4 2012/02/28 12:28:29 dcoppa Exp $
--- libs.mk.orig Fri Jan 27 13:36:39 2012
+++ libs.mk Thu Feb 23 15:00:49 2012
@@ -192,16 +192,11 @@ LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD
$OpenBSD: patch-libs_mk,v 1.5 2012/05/22 18:22:50 ajacoutot Exp $
--- libs.mk.orig Tue May 8 19:14:00 2012
+++ libs.mk Wed May 16 17:07:35 2012
@@ -193,16 +193,11 @@ LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD
$(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)
BUILD_LIBVPX_SO := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED))
@ -20,7 +20,7 @@ $OpenBSD: patch-libs_mk,v 1.4 2012/02/28 12:28:29 dcoppa Exp $
libvpx.ver: $(call enabled,CODEC_EXPORTS)
@echo " [CREATE] $@"
@@ -216,14 +211,6 @@ $(1): $(2)
@@ -217,14 +212,6 @@ $(1): $(2)
$(qexec)ln -sf $(LIBVPX_SO) $$@
endef
@ -35,7 +35,7 @@ $OpenBSD: patch-libs_mk,v 1.4 2012/02/28 12:28:29 dcoppa Exp $
INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBSUBDIR)/$(LIBVPX_SO)
LIBS-$(BUILD_LIBVPX) += vpx.pc
@@ -240,7 +227,7 @@ vpx.pc: config.mk libs.mk
@@ -241,7 +228,7 @@ vpx.pc: config.mk libs.mk
$(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
$(qexec)echo 'Requires:' >> $@
$(qexec)echo 'Conflicts:' >> $@

22
multimedia/libvpx/patches/patch-vp8_common_reconinter_c Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-vp8_common_reconinter_c,v 1.1 2012/05/22 18:22:50 ajacoutot Exp $
--- vp8/common/reconinter.c.orig Sun May 20 05:08:58 2012
+++ vp8/common/reconinter.c Sun May 20 05:17:36 2012
@@ -10,6 +10,7 @@
#include <limits.h>
+#include <sys/types.h>
#include "vpx_config.h"
#include "vpx_rtcd.h"
#include "vpx/vpx_integer.h"
@@ -17,6 +18,10 @@
#include "reconinter.h"
#if CONFIG_RUNTIME_CPU_DETECT
#include "onyxc_int.h"
+#endif
+
+#ifdef __STRICT_ALIGNMENT
+#define CONFIG_FAST_UNALIGNED 0
#endif
void vp8_copy_mem16x16_c(

17
multimedia/libvpx/patches/patch-vp8_common_sad_c_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-vp8_common_sad_c_c,v 1.1 2012/05/22 18:22:50 ajacoutot Exp $
--- vp8/common/sad_c.c.orig Sun May 20 05:16:18 2012
+++ vp8/common/sad_c.c Sun May 20 05:17:51 2012
@@ -10,8 +10,13 @@
#include <stdlib.h>
+#include <sys/types.h>
#include "vpx_config.h"
#include "vpx/vpx_integer.h"
+
+#ifdef __STRICT_ALIGNMENT
+#define CONFIG_FAST_UNALIGNED 0
+#endif
static
unsigned int sad_mx_n_c(

4
multimedia/libvpx/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2012/02/28 12:28:29 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.4 2012/05/22 18:22:50 ajacoutot Exp $
%%SHARED%%
@bin bin/vp8_scalable_patterns
@bin bin/vpxdec
@ -7,12 +7,10 @@ include/vpx/
include/vpx/vp8.h
include/vpx/vp8cx.h
include/vpx/vp8dx.h
include/vpx/vp8e.h
include/vpx/vpx_codec.h
include/vpx/vpx_codec_impl_bottom.h
include/vpx/vpx_codec_impl_top.h
include/vpx/vpx_decoder.h
include/vpx/vpx_decoder_compat.h
include/vpx/vpx_encoder.h
include/vpx/vpx_image.h
include/vpx/vpx_integer.h