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

Update to libvpx 1.2.0.

Browse Source 
ok sthen@
This commit is contained in:
brad 2014-03-17 14:01:08 +00:00
parent 4291ce340c
commit cfa02cc603
9 changed files with 40 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
multimedia/libvpx/Makefile
View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.12 2013/08/07 21:32:15 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2014/03/17 14:01:08 brad Exp $
COMMENT= Google VP8 video codec
V= 1.1.0
V= 1.2.0
DISTNAME= libvpx-v${V}
PKGNAME= libvpx-${V}
REVISION= 0
CATEGORIES= multimedia
MASTER_SITES= https://webm.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= vpx 4.0
SHARED_LIBS= vpx 4.1
HOMEPAGE= http://www.webmproject.org/
@ -35,7 +34,8 @@ MAKE_FLAGS= LIBVPX_VERSION=${LIBvpx_VERSION} verbose=yes
USE_GMAKE= Yes
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+=--prefix=${PREFIX} \
--disable-optimizations
--disable-optimizations \
--disable-unit-tests
CONFIGURE_ENV= LD="${CC}"
NO_TEST= Yes

7
multimedia/libvpx/distinfo
View File

@ -1,5 +1,2 @@
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
SHA256 (libvpx-v1.2.0.tar.bz2) = XvDGULLapiCF64EFp6QnPz6YfbU8Xsl/1R0bZRHlqgY=
SIZE (libvpx-v1.2.0.tar.bz2) = 1714121

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

@ -1,7 +1,7 @@
$OpenBSD: patch-build_make_Makefile,v 1.4 2012/08/28 13:04:01 fgsch Exp $
--- build/make/Makefile.orig Fri Jan 27 13:36:39 2012
+++ build/make/Makefile Sun Jan 29 21:11:03 2012
@@ -247,8 +247,7 @@ define so_template
$OpenBSD: patch-build_make_Makefile,v 1.5 2014/03/17 14:01:09 brad Exp $
--- build/make/Makefile.orig Mon Oct 14 14:16:36 2013
+++ build/make/Makefile Thu Dec 5 21:38:33 2013
@@ -251,8 +251,7 @@ define so_template
# This needs further abstraction for dealing with non-GNU linkers.
$(1):
$(if $(quiet),@echo " [LD] $$@")
@ -11,7 +11,7 @@ $OpenBSD: patch-build_make_Makefile,v 1.4 2012/08/28 13:04:01 fgsch Exp $
-Wl,--version-script,$$(SO_VERSION_SCRIPT) -o $$@ \
$$(filter %.o,$$?) $$(extralibs)
endef
@@ -316,7 +315,7 @@ LIBS=$(call enabled,LIBS)
@@ -320,7 +319,7 @@ LIBS=$(call enabled,LIBS)
.libs: $(LIBS)
@touch $@
$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))

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

@ -1,4 +1,4 @@
$OpenBSD: patch-build_make_gen_asm_deps_sh,v 1.3 2012/05/22 18:22:50 ajacoutot Exp $
$OpenBSD: patch-build_make_gen_asm_deps_sh,v 1.4 2014/03/17 14:01:09 brad 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 @@
@ -7,12 +7,3 @@ $OpenBSD: patch-build_make_gen_asm_deps_sh,v 1.3 2012/05/22 18:22:50 ajacoutot E
##
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
##
@@ -42,7 +42,7 @@ done
[ -n "$srcfile" ] || show_help
sfx=${sfx:-asm}
-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

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

@ -1,13 +1,13 @@
$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
$OpenBSD: patch-configure,v 1.8 2014/03/17 14:01:09 brad Exp $
--- configure.orig Mon Oct 14 14:16:36 2013
+++ configure Thu Dec 5 21:42:57 2013
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${BASH}
##
## configure
##
@@ -103,6 +103,7 @@ all_platforms="${all_platforms} ppc32-linux-gcc"
@@ -104,6 +104,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.7 2012/05/22 18:22:50 ajacoutot Exp $
all_platforms="${all_platforms} sparc-solaris-gcc"
all_platforms="${all_platforms} x86-darwin8-gcc"
all_platforms="${all_platforms} x86-darwin8-icc"
@@ -145,19 +146,6 @@ for t in ${all_targets}; do
@@ -146,19 +147,6 @@ for t in ${all_targets}; do
[ -f ${source_path}/${t}.mk ] && enable ${t}
done
@ -35,7 +35,7 @@ $OpenBSD: patch-configure,v 1.7 2012/05/22 18:22:50 ajacoutot 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.
@@ -449,12 +437,6 @@ EOF
@@ -452,18 +440,6 @@ EOF
}
process_detect() {
@ -43,7 +43,13 @@ $OpenBSD: patch-configure,v 1.7 2012/05/22 18:22:50 ajacoutot Exp $
- # Can only build shared libs on a subset of platforms. Doing this check
- # here rather than at option parse time because the target auto-detect
- # magic happens after the command line has been parsed.
- enabled linux || die "--enable-shared only supported on ELF for now"
- if ! enabled linux; then
- if enabled gnu; then
- echo "--enable-shared is only supported on ELF; assuming this is OK"
- else
- die "--enable-shared only supported on ELF for now"
- fi
- fi
- fi
if [ -z "$CC" ]; then
echo "Bypassing toolchain for environment detection."

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

@ -1,7 +1,7 @@
$OpenBSD: patch-libs_mk,v 1.6 2012/08/27 20:42:25 jasper Exp $
--- libs.mk.orig Tue May 8 19:14:00 2012
+++ libs.mk Thu Aug 16 18:54:05 2012
@@ -193,16 +193,11 @@ LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD
$OpenBSD: patch-libs_mk,v 1.7 2014/03/17 14:01:09 brad Exp $
--- libs.mk.orig Mon Oct 14 14:16:36 2013
+++ libs.mk Thu Dec 5 21:38:34 2013
@@ -181,16 +181,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.6 2012/08/27 20:42:25 jasper Exp $
libvpx.ver: $(call enabled,CODEC_EXPORTS)
@echo " [CREATE] $@"
@@ -217,14 +212,6 @@ $(1): $(2)
@@ -205,14 +200,6 @@ $(1): $(2)
$(qexec)ln -sf $(LIBVPX_SO) $$@
endef
@ -35,11 +35,3 @@ $OpenBSD: patch-libs_mk,v 1.6 2012/08/27 20:42:25 jasper Exp $
INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBSUBDIR)/$(LIBVPX_SO)
LIBS-$(BUILD_LIBVPX) += vpx.pc
@@ -242,6 +229,7 @@ vpx.pc: config.mk libs.mk
$(qexec)echo 'Requires:' >> $@
$(qexec)echo 'Conflicts:' >> $@
$(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
+ $(qexec)echo 'Libs.private: -lm -lpthread' >> $@
$(qexec)echo 'Cflags: -I$${includedir}' >> $@
INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc

14
multimedia/libvpx/patches/patch-vp8_common_sad_c_c
View File

@ -1,9 +1,9 @@
$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 @@
$OpenBSD: patch-vp8_common_sad_c_c,v 1.2 2014/03/17 14:01:09 brad Exp $
--- vp8/common/sad_c.c.orig Mon Oct 14 14:16:18 2013
+++ vp8/common/sad_c.c Thu Dec 5 21:38:34 2013
@@ -11,8 +11,13 @@
#include <limits.h>
#include <stdlib.h>
+#include <sys/types.h>
#include "vpx_config.h"
@ -13,5 +13,5 @@ $OpenBSD: patch-vp8_common_sad_c_c,v 1.1 2012/05/22 18:22:50 ajacoutot Exp $
+#define CONFIG_FAST_UNALIGNED 0
+#endif
static
unsigned int sad_mx_n_c(
static unsigned int sad_mx_n_c(const unsigned char *src_ptr, int src_stride,
const unsigned char *ref_ptr, int ref_stride,

2
multimedia/libvpx/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/10/04 23:56:16 ckuethe Exp $
@lib lib/libvpx.so.${LIBvpx_VERSION}

4
multimedia/libvpx/pkg/PLIST
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2012/05/22 18:22:50 ajacoutot Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.5 2014/03/17 14:01:09 brad Exp $
@bin bin/vp8_scalable_patterns
@bin bin/vpxdec
@bin bin/vpxenc
@ -15,5 +14,6 @@ include/vpx/vpx_encoder.h
include/vpx/vpx_image.h
include/vpx/vpx_integer.h
lib/libvpx.a
@lib lib/libvpx.so.${LIBvpx_VERSION}
lib/pkgconfig/
lib/pkgconfig/vpx.pc